X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2F8254.c;h=e01eeda68e2c78a961ef4178fe79d7050913a97d;hb=9b42eba2271981b4642c83cb520b68fe15f270fb;hp=3472669f0bbefdc468ce624c0815332667d390be;hpb=fbe9ba34153fdfd6c67a59b5284b2d23de70e878;p=palacios-OLD.git diff --git a/palacios/src/devices/8254.c b/palacios/src/devices/8254.c index 3472669..e01eeda 100644 --- a/palacios/src/devices/8254.c +++ b/palacios/src/devices/8254.c @@ -27,7 +27,7 @@ #include -#ifndef CONFIG_DEBUG_PIT +#ifndef V3_CONFIG_DEBUG_PIT #undef PrintDebug #define PrintDebug(fmt, args...) #endif @@ -660,6 +660,7 @@ 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); @@ -711,12 +712,14 @@ static int pit_restore(struct vm_device *dev, v3_keyed_stream_t stream) } - +#endif static struct v3_device_ops dev_ops = { .free = (int (*)(void *))pit_free, +#ifdef V3_CONFIG_KEYED_STREAMS .checkpoint = pit_checkpoint, .restore = pit_restore, +#endif }; #include @@ -760,7 +763,7 @@ static int pit_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { return -1; } -#ifdef CONFIG_DEBUG_PIT +#ifdef V3_CONFIG_DEBUG_PIT PrintDebug("8254 PIT: OSC_HZ=%d, reload_val=", OSC_HZ); //PrintTrace(reload_val); PrintDebug("\n"); @@ -786,7 +789,7 @@ static int pit_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { init_channel(&(pit_state->ch_1)); init_channel(&(pit_state->ch_2)); -#ifdef CONFIG_DEBUG_PIT +#ifdef V3_CONFIG_DEBUG_PIT PrintDebug("8254 PIT: CPU MHZ=%d -- pit count=", cpu_khz / 1000); //PrintTraceLL(pit_state->pit_counter); PrintDebug("\n");