integrated new configuration system

[palacios.git] / palacios / src / devices / 8254.c

diff --git a/palacios/src/devices/8254.c b/palacios/src/devices/8254.c
index 1de80e9..4b2f4c0 100644 (file)
--- a/palacios/src/devices/8254.c
+++ b/palacios/src/devices/8254.c
@@ -17,15 +17,16 @@
  * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
  */
 
-#include <devices/8254.h>
+
 #include <palacios/vmm.h>
+#include <palacios/vmm_dev_mgr.h>
 #include <palacios/vmm_time.h>
 #include <palacios/vmm_util.h>
 #include <palacios/vmm_intr.h>
+#include <palacios/vmm_config.h>
 
 
-
-#ifndef DEBUG_PIT
+#ifndef CONFIG_DEBUG_PIT
 #undef PrintDebug
 #define PrintDebug(fmt, args...)
 #endif
@@ -613,67 +614,74 @@ static void init_channel(struct channel * ch) {
 }
 
 
-static int pit_init(struct vm_device * dev) {
-    struct pit * state = (struct pit *)dev->private_data;
+
+
+static int pit_free(struct vm_device * dev) {
+
+    return 0;
+}
+
+
+static struct v3_device_ops dev_ops = {
+    .free = pit_free,
+    .reset = NULL,
+    .start = NULL,
+    .stop = NULL,
+
+};
+
+
+static int pit_init(struct guest_info * info, v3_cfg_tree_t * cfg) {
+    struct pit * pit_state = NULL;
+    struct vm_device * dev = NULL;
+    char * name = v3_cfg_val(cfg, "name");
+
     uint_t cpu_khz = V3_CPU_KHZ();
     ullong_t reload_val = (ullong_t)cpu_khz * 1000;
 
+    pit_state = (struct pit *)V3_Malloc(sizeof(struct pit));
+    V3_ASSERT(pit_state != NULL);
+
+    dev = v3_allocate_device(name, &dev_ops, pit_state);
+
+    if (v3_attach_device(info, dev) == -1) {
+       PrintError("Could not attach device %s\n", name);
+       return -1;
+    }
+
     v3_dev_hook_io(dev, CHANNEL0_PORT, &pit_read_channel, &pit_write_channel);
     v3_dev_hook_io(dev, CHANNEL1_PORT, &pit_read_channel, &pit_write_channel);
     v3_dev_hook_io(dev, CHANNEL2_PORT, &pit_read_channel, &pit_write_channel);
     v3_dev_hook_io(dev, COMMAND_PORT, NULL, &pit_write_command);
 
-#ifdef DEBUG_PIT
+#ifdef CONFIG_DEBUG_PIT
     PrintDebug("8254 PIT: OSC_HZ=%d, reload_val=", OSC_HZ);
     PrintTraceLL(reload_val);
     PrintDebug("\n");
 #endif
 
-    v3_add_timer(dev->vm, &timer_ops, dev);
+    v3_add_timer(info, &timer_ops, dev);
 
     // Get cpu frequency and calculate the global pit oscilattor counter/cycle
 
     do_divll(reload_val, OSC_HZ);
-    state->pit_counter = reload_val;
-    state->pit_reload = reload_val;
+    pit_state->pit_counter = reload_val;
+    pit_state->pit_reload = reload_val;
 
 
 
-    init_channel(&(state->ch_0));
-    init_channel(&(state->ch_1));
-    init_channel(&(state->ch_2));
+    init_channel(&(pit_state->ch_0));
+    init_channel(&(pit_state->ch_1));
+    init_channel(&(pit_state->ch_2));
 
-#ifdef DEBUG_PIT
+#ifdef CONFIG_DEBUG_PIT
     PrintDebug("8254 PIT: CPU MHZ=%d -- pit count=", cpu_khz / 1000);
-    PrintTraceLL(state->pit_counter);
+    PrintTraceLL(pit_state->pit_counter);
     PrintDebug("\n");
 #endif
 
     return 0;
 }
 
-static int pit_deinit(struct vm_device * dev) {
 
-    return 0;
-}
-
-
-static struct vm_device_ops dev_ops = {
-    .init = pit_init,
-    .deinit = pit_deinit,
-    .reset = NULL,
-    .start = NULL,
-    .stop = NULL,
-
-};
-
-
-struct vm_device * v3_create_pit() {
-    struct pit * pit_state = NULL;
-    pit_state = (struct pit *)V3_Malloc(sizeof(struct pit));
-    V3_ASSERT(pit_state != NULL);
-
-    struct vm_device * dev = v3_create_device("PIT", &dev_ops, pit_state);
-  
-    return dev;
-}
+device_register("8254_PIT", pit_init);