X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2F8254.c;h=1a44399569fdd8c7dbcc84939a5661b83ecc1663;hb=ff3728843f8471d39cf2ea3511267feb83f14678;hp=e01eeda68e2c78a961ef4178fe79d7050913a97d;hpb=94f67717b6461df514dc225ed84f03b44c44061b;p=palacios.git diff --git a/palacios/src/devices/8254.c b/palacios/src/devices/8254.c index e01eeda..1a44399 100644 --- a/palacios/src/devices/8254.c +++ b/palacios/src/devices/8254.c @@ -54,8 +54,8 @@ */ typedef enum {NOT_RUNNING, PENDING, RUNNING} channel_run_state_t; typedef enum {NOT_WAITING, WAITING_LOBYTE, WAITING_HIBYTE} channel_access_state_t; -typedef enum {LATCH_COUNT, LOBYTE_ONLY, HIBYTE_ONLY, LOBYTE_HIBYTE} channel_access_mode_t; -typedef enum {IRQ_ON_TERM_CNT, ONE_SHOT, RATE_GEN, SQR_WAVE, SW_STROBE, HW_STROBE} channel_op_mode_t; +typedef enum {LATCH_COUNT = 0, LOBYTE_ONLY = 1, HIBYTE_ONLY = 2, LOBYTE_HIBYTE = 3} channel_access_mode_t; +typedef enum {IRQ_ON_TERM_CNT = 0, ONE_SHOT = 1, RATE_GEN = 2, SQR_WAVE = 3, SW_STROBE = 4, HW_STROBE = 5} channel_op_mode_t; struct channel { @@ -133,7 +133,8 @@ static int handle_crystal_tics(struct pit * pit, struct channel * ch, uint_t osc 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; @@ -158,11 +159,13 @@ static int handle_crystal_tics(struct pit * pit, struct channel * ch, uint_t osc 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; } @@ -184,23 +187,33 @@ static int handle_crystal_tics(struct pit * pit, struct channel * ch, uint_t osc 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: @@ -216,6 +229,7 @@ static int handle_crystal_tics(struct pit * pit, struct channel * ch, uint_t osc output_changed = 1; } + break; case SW_STROBE: @@ -300,21 +314,19 @@ static void pit_update_timer(struct guest_info * info, ullong_t cpu_cycles, ullo 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; } @@ -430,11 +442,21 @@ static int handle_speaker_write(uint8_t *speaker, struct channel * ch, char val) } static int handle_channel_cmd(struct channel * ch, struct pit_cmd_word cmd) { - ch->op_mode = cmd.op_mode; - 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 (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: @@ -660,65 +682,39 @@ static int pit_free(void * private_data) { 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 };