X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Ftimer.c;h=0186269afd35639475cd50513e3217483ce5e679;hb=4b7f19c51325601d7e7569e6101c7bfcdf984ef7;hp=e0a8d700320a755b6a01f8594d727cda482c5c5d;hpb=4bc3ee757b44d3e466fd89e348106c47fa5511ee;p=palacios.git

diff --git a/palacios/src/devices/timer.c b/palacios/src/devices/timer.c
index e0a8d70..0186269 100644
--- a/palacios/src/devices/timer.c
+++ b/palacios/src/devices/timer.c
@@ -17,9 +17,9 @@
  * 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
 
@@ -30,27 +30,22 @@ struct timer_state {
 
 /*
   static int irq_handler(uint_t irq, struct vm_device * dev) {
-  PrintDebug("Timer interrupt\n");
+  PrintDebug(info->vm_info, info, "Timer interrupt\n");
   return 0;
 
   }
 */
 
-static int timer_init(struct vm_device * dev) {
-    //dev_hook_irq(dev, TIMER_IRQ, &irq_handler);
 
-    return 0;
-}
 
-static int timer_deinit(struct vm_device * dev) {
+static int timer_free(struct vm_device * dev) {
 
     return 0;
 }
 
 
-static struct vm_device_ops dev_ops = {
-    .init = timer_init,
-    .deinit = timer_deinit,
+static struct v3_device_ops dev_ops = {
+    .free = timer_free,
     .reset = NULL,
     .start = NULL,
     .stop = NULL,
@@ -58,13 +53,27 @@ static struct vm_device_ops dev_ops = {
 };
 
 
-struct vm_device * v3_create_timer() {
+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_create_device("Timer", &dev_ops, timer);
-  
-    return dev;
+    if (!timer) {
+	PrintError(info->vm_info, info, "Cannot allocate in init\n");
+	return -1;
+    }
+
+    struct vm_device * dev = v3_allocate_device("TIMER", &dev_ops, timer);
+    
+    if (v3_attach_device(vm, dev) == -1) {
+	PrintError(info->vm_info, info, "Could not attach device %s\n", "TIMER");
+        return -1;
+    }
+
+
+
+    return -1;
 
 }
+
+
+device_register("TIMER", timer_init)