reload_val -= reload_val % 2;
}
- // TODO: Check this....
- // Is this correct???
if (reload_val == 0) {
- reload_val = 1;
+ // This means the value is being set to 0x10000
+ // but due to the tick after the reload, it wraps
+ // down to 0xffff
+ reload_val = 0xffff;
}
channel_cycles += oscillations / reload_val;
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);
+#ifdef V3_CONFIG_CHECKPOINT
- v3_keyed_stream_key_t ks;
+#include <palacios/vmm_sprintf.h>
- ks = v3_keyed_stream_open_key(stream,dev->name);
+#define KEY_MAX 128
+#define MAKE_KEY(x) snprintf(key,KEY_MAX,"PIT_CH%d_%s",i,x)
- if (!ks) {
- return -1;
- }
+static int pit_save(struct v3_chkpt_ctx * ctx, void * private_data) {
+ struct pit * pit_state = (struct pit *)private_data;
+ int i;
+ char key[KEY_MAX];
- 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_CHKPT_SAVE(ctx, "PIT_COUNTER", pit_state->pit_counter,savefailout);
+ V3_CHKPT_SAVE(ctx, "PIT_RELOAD", pit_state->pit_reload,savefailout);
- v3_keyed_stream_close_key(stream,ks);
+ for (i=0;i<3;i++) {
+ struct channel *c;
+ uint8_t pins;
+
+ if (i==0) {
+ c=&(pit_state->ch_0);
+ } else if (i==1) {
+ c=&(pit_state->ch_1);
+ } else {
+ c=&(pit_state->ch_2);
+ }
+
+ MAKE_KEY("ACCESS_MODE");
+ V3_CHKPT_SAVE(ctx, key, c->access_mode, savefailout);
+ MAKE_KEY("ACCESS_STATE");
+ V3_CHKPT_SAVE(ctx, key, c->access_state, savefailout);
+ MAKE_KEY("RUN_STATE");
+ V3_CHKPT_SAVE(ctx, key, c->run_state, savefailout);
+ MAKE_KEY("OP_MODE");
+ V3_CHKPT_SAVE(ctx, key, c->op_mode, savefailout);
+ MAKE_KEY("COUNTER");
+ V3_CHKPT_SAVE(ctx, key, c->counter, savefailout);
+ MAKE_KEY("RELOAD_VALUE");
+ V3_CHKPT_SAVE(ctx, key, c->reload_value, savefailout);
+ MAKE_KEY("LATCH_STATE");
+ V3_CHKPT_SAVE(ctx, key, c->latch_state, savefailout);
+ MAKE_KEY("READ_STATE");
+ V3_CHKPT_SAVE(ctx, key, c->read_state, savefailout);
+
+ pins = (c->output_pin) | (c->gate_input_pin << 1);
+ MAKE_KEY("PINS");
+ V3_CHKPT_SAVE(ctx, key, pins, savefailout);
+ }
+
+ V3_CHKPT_SAVE(ctx, "PIT_SPEAKER", pit_state->speaker,savefailout);
return 0;
-
+ savefailout:
+ PrintError("Failed to save pit\n");
+ return -1;
}
-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);
-
- if (!ks) {
- return -1;
+static int pit_load(struct v3_chkpt_ctx * ctx, void * private_data) {
+ struct pit * pit_state = (struct pit *)private_data;
+ int i;
+ char key[KEY_MAX];
+
+ V3_CHKPT_LOAD(ctx, "PIT_COUNTER", pit_state->pit_counter,loadfailout);
+ V3_CHKPT_LOAD(ctx, "PIT_RELOAD", pit_state->pit_reload,loadfailout);
+
+ for (i=0;i<3;i++) {
+ struct channel *c;
+ uint8_t pins;
+
+ if (i==0) {
+ c=&(pit_state->ch_0);
+ } else if (i==1) {
+ c=&(pit_state->ch_1);
+ } else {
+ c=&(pit_state->ch_2);
+ }
+
+ MAKE_KEY("ACCESS_MODE");
+ V3_CHKPT_LOAD(ctx, key, c->access_mode, loadfailout);
+ MAKE_KEY("ACCESS_STATE");
+ V3_CHKPT_LOAD(ctx, key, c->access_state, loadfailout);
+ MAKE_KEY("RUN_STATE");
+ V3_CHKPT_LOAD(ctx, key, c->run_state, loadfailout);
+ MAKE_KEY("OP_MODE");
+ V3_CHKPT_LOAD(ctx, key, c->op_mode, loadfailout);
+ MAKE_KEY("COUNTER");
+ V3_CHKPT_LOAD(ctx, key, c->counter, loadfailout);
+ MAKE_KEY("RELOAD_VALUE");
+ V3_CHKPT_LOAD(ctx, key, c->reload_value, loadfailout);
+ MAKE_KEY("LATCH_STATE");
+ V3_CHKPT_LOAD(ctx, key, c->latch_state, loadfailout);
+ MAKE_KEY("READ_STATE");
+ V3_CHKPT_LOAD(ctx, key, c->read_state, loadfailout);
+
+ pins = (c->output_pin) | (c->gate_input_pin << 1);
+ MAKE_KEY("PINS");
+ V3_CHKPT_LOAD(ctx, key, pins, loadfailout);
}
-
- 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;
+ V3_CHKPT_LOAD(ctx, "PIT_SPEAKER", pit_state->speaker,loadfailout);
+ return 0;
+ loadfailout:
+ PrintError("Failed to load pit\n");
+ return -1;
}
#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
};
pit_state = (struct pit *)V3_Malloc(sizeof(struct pit));
- V3_ASSERT(pit_state != NULL);
+ if (!pit_state) {
+ PrintError("Cannot allocate in init\n");
+ return -1;
+ }
+
pit_state->speaker = 0;
pit_state->vm = vm;