uint_t channel_cycles = 0;
uint_t output_changed = 0;
- // PrintDebug("8254 PIT: %d crystal tics\n", oscillations);
+ // PrintDebug("8254 PIT (channel %d): %d crystal tics\n",
+ // ch - pit->ch0, oscillations);
if (ch->run_state == PENDING) {
oscillations--;
ch->counter = ch->reload_value;
if (ch->counter > oscillations) {
ch->counter -= oscillations;
+ //PrintDebug("8254 PIT: Counter at %u after %u oscillations.\n",
+ // (unsigned int)ch->counter, oscillations);
return output_changed;
} else {
ushort_t reload_val = ch->reload_value;
- if (ch->op_mode == SW_STROBE) {
+ if ((ch->op_mode == SW_STROBE) || (ch->op_mode == IRQ_ON_TERM_CNT)) {
reload_val = 0xffff;
}
oscillations = oscillations % reload_val;
ch->counter = reload_val - oscillations;
+ // PrintDebug("8254 PIT: Counter reset to %u.\n",
+ // (unsigned int)ch->counter);
+
}
- // PrintDebug("8254 PIT: Channel Cycles: %d\n", channel_cycles);
+ //PrintDebug("8254 PIT: Channel %ld (mode = %u) Cycles: %d\n",
+ //(ch - &pit->ch_0), ch->op_mode, channel_cycles);
-
-
switch (ch->op_mode) {
case IRQ_ON_TERM_CNT:
- if ((channel_cycles > 0) && (ch->output_pin == 0)) {
- ch->output_pin = 1;
- output_changed = 1;
+ if (channel_cycles > 0) {
+ if (ch->output_pin == 0) {
+ ch->output_pin = 1;
+ output_changed = 1;
+ } else {
+ // PrintDebug("8254: Output not changed in TERM_CNT mode.\n");
+ }
}
break;
case ONE_SHOT:
- if ((channel_cycles > 0) && (ch->output_pin == 0)) {
- ch->output_pin = 1;
- output_changed = 1;
+ if (channel_cycles > 0) {
+ if ((ch->output_pin == 0)) {
+ ch->output_pin = 1;
+ output_changed = 1;
+ } else {
+ // PrintDebug("8254: Output not changed in ONE_SHOT mode.\n");
+ }
}
break;
case RATE_GEN:
output_changed = 1;
}
+
break;
case SW_STROBE:
state->pit_counter = state->pit_reload - cpu_cycles;
if (oscillations) {
- PrintDebug("8254 PIT: Handling %d crystal tics\n", oscillations);
- }
+ // PrintDebug("8254 PIT: Handling %d crystal tics\n", oscillations);
- if (handle_crystal_tics(state, &(state->ch_0), oscillations) == 1) {
- // raise interrupt
- // PrintDebug("8254 PIT: Injecting Timer interrupt to guest\n");
- v3_raise_irq(info->vm_info, 0);
- }
+ if (handle_crystal_tics(state, &(state->ch_0), oscillations) == 1) {
+ // raise interrupt
+ PrintDebug("8254 PIT: Injecting Timer interrupt to guest (run_state = %d)\n",
+ state->ch_0.run_state);
+ v3_raise_irq(info->vm_info, 0);
+ }
- //handle_crystal_tics(state, &(state->ch_1), oscillations);
- handle_crystal_tics(state, &(state->ch_2), oscillations);
+ //handle_crystal_tics(state, &(state->ch_1), oscillations);
+ handle_crystal_tics(state, &(state->ch_2), oscillations);
+ }
}
-
-
-
return;
}
static int handle_channel_cmd(struct channel * ch, struct pit_cmd_word cmd) {
- ch->access_mode = cmd.access_mode;
+ if (cmd.op_mode != ch->op_mode) {
+ PrintDebug("8254 PIT: Changing channel from op mode %d to op mode %d.\n",
+ ch->op_mode, cmd.op_mode);
+ }
- if (ch->access_mode != 0) {
- ch->op_mode = cmd.op_mode;
+ if (cmd.access_mode != 0) {
+ ch->op_mode = cmd.op_mode;
}
+ if (cmd.access_mode != ch->access_mode) {
+ PrintDebug("8254 PIT: Changing channel from access mode %d to access mode %d.\n",
+ ch->access_mode, cmd.access_mode);
+ }
+ ch->access_mode = cmd.access_mode;
switch (cmd.access_mode) {
case LATCH_COUNT:
return 0;
}
-#ifdef V3_CONFIG_KEYED_STREAMS
-static int pit_checkpoint(struct vm_device *dev, v3_keyed_stream_t stream)
-{
- struct pit *p = (struct pit *) (dev->private_data);
-
- v3_keyed_stream_key_t ks;
-
- ks = v3_keyed_stream_open_key(stream,dev->name);
+#ifdef V3_CONFIG_CHECKPOINT
+static int pit_save(struct v3_chkpt_ctx * ctx, void * private_data) {
+ struct pit * pit_state = (struct pit *)private_data;
- if (!ks) {
- return -1;
- }
-
- STD_SAVE(stream,ks,p->pit_counter);
- STD_SAVE(stream,ks,p->pit_reload);
- STD_SAVE(stream,ks,p->ch_0);
- STD_SAVE(stream,ks,p->ch_1);
- STD_SAVE(stream,ks,p->ch_2);
- STD_SAVE(stream,ks,p->speaker);
-
- v3_keyed_stream_close_key(stream,ks);
+ V3_CHKPT_STD_SAVE(ctx, pit_state->pit_counter);
+ V3_CHKPT_STD_SAVE(ctx, pit_state->pit_reload);
+ V3_CHKPT_STD_SAVE(ctx, pit_state->ch_0);
+ V3_CHKPT_STD_SAVE(ctx, pit_state->ch_1);
+ V3_CHKPT_STD_SAVE(ctx, pit_state->ch_2);
+ V3_CHKPT_STD_SAVE(ctx, pit_state->speaker);
return 0;
-
-
}
-static int pit_restore(struct vm_device *dev, v3_keyed_stream_t stream)
-{
- struct pit *p = (struct pit *) (dev->private_data);
-
- v3_keyed_stream_key_t ks;
-
- ks = v3_keyed_stream_open_key(stream,dev->name);
+static int pit_load(struct v3_chkpt_ctx * ctx, void * private_data) {
+ struct pit * pit_state = (struct pit *)private_data;
- if (!ks) {
- return -1;
- }
+ V3_CHKPT_STD_LOAD(ctx, pit_state->pit_counter);
+ V3_CHKPT_STD_LOAD(ctx, pit_state->pit_reload);
+ V3_CHKPT_STD_LOAD(ctx, pit_state->ch_0);
+ V3_CHKPT_STD_LOAD(ctx, pit_state->ch_1);
+ V3_CHKPT_STD_LOAD(ctx, pit_state->ch_2);
+ V3_CHKPT_STD_LOAD(ctx, pit_state->speaker);
- STD_LOAD(stream,ks,p->pit_counter);
- STD_LOAD(stream,ks,p->pit_reload);
- STD_LOAD(stream,ks,p->ch_0);
- STD_LOAD(stream,ks,p->ch_1);
- STD_LOAD(stream,ks,p->ch_2);
- STD_LOAD(stream,ks,p->speaker);
-
- v3_keyed_stream_close_key(stream,ks);
-
return 0;
-
-
}
#endif
static struct v3_device_ops dev_ops = {
.free = (int (*)(void *))pit_free,
-#ifdef V3_CONFIG_KEYED_STREAMS
- .checkpoint = pit_checkpoint,
- .restore = pit_restore,
+#ifdef V3_CONFIG_CHECKPOINT
+ .save = pit_save,
+ .load = pit_load,
#endif
};