X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Ftimer.c;h=31c47de0b09663ce7df08f3df01ff0eceb88c9e9;hp=87dcdfa9dbd89f5e2b86750b48c57388631d7a2d;hb=571979dad8fc2138a7e11c4fe61e812a0a0b17d1;hpb=e70e95962c26832628d586e07f9cd1a2e1852d72

diff --git a/palacios/src/devices/timer.c b/palacios/src/devices/timer.c
index 87dcdfa..31c47de 100644
--- a/palacios/src/devices/timer.c
+++ b/palacios/src/devices/timer.c
@@ -17,53 +17,59 @@
  * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
  */
 
-#include <devices/timer.h>
-#include <palacios/vmm.h>
 
+#include <palacios/vmm.h>
+#include <palacios/vmm_dev_mgr.h>
 
 #define TIMER_IRQ 32
 
 struct timer_state {
-  int foo;
+    int foo;
 };
 
 
-
-int irq_handler(uint_t irq, struct vm_device * dev) {
+/*
+  static int irq_handler(uint_t irq, struct vm_device * dev) {
   PrintDebug("Timer interrupt\n");
   return 0;
 
-}
+  }
+*/
 
-int timer_init(struct vm_device * dev) {
-  //dev_hook_irq(dev, TIMER_IRQ, &irq_handler);
 
-  return 0;
-}
 
-int timer_deinit(struct vm_device * dev) {
+static int timer_free(struct vm_device * dev) {
 
-  return 0;
+    return 0;
 }
 
 
-static struct vm_device_ops dev_ops = {
-  .init = timer_init,
-  .deinit = timer_deinit,
-  .reset = NULL,
-  .start = NULL,
-  .stop = NULL,
+static struct v3_device_ops dev_ops = {
+    .free = timer_free,
+    .reset = NULL,
+    .start = NULL,
+    .stop = NULL,
 
 };
 
 
-struct vm_device * create_timer() {
-  struct timer_state * timer = NULL;
-  timer = (struct timer_state *)V3_Malloc( sizeof(struct timer_state));
-  V3_ASSERT(timer != NULL);
+static int timer_init(struct guest_info * vm, void * cfg_data) {
+    struct timer_state * timer = NULL;
+    timer = (struct timer_state *)V3_Malloc( sizeof(struct timer_state));
+    V3_ASSERT(timer != NULL);
+
+    struct vm_device * dev = v3_allocate_device("TIMER", &dev_ops, timer);
+    
+    if (v3_attach_device(vm, dev) == -1) {
+	PrintError("Could not attach device %s\n", "TIMER");
+        return -1;
+    }
+
 
-  struct vm_device * dev = create_device("Timer", &dev_ops, timer);
-  
-  return dev;
+
+    return -1;
 
 }
+
+
+device_register("TIMER", timer_init)