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

diff --git a/palacios/src/devices/timer.c b/palacios/src/devices/timer.c
index 59198ba..e0a8d70 100644
--- a/palacios/src/devices/timer.c
+++ b/palacios/src/devices/timer.c
@@ -1,5 +1,21 @@
-/* Northwestern University */
-/* (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> */
+/*
+ * This file is part of the Palacios Virtual Machine Monitor developed
+ * by the V3VEE Project with funding from the United States National 
+ * Science Foundation and the Department of Energy.  
+ *
+ * The V3VEE Project is a joint project between Northwestern University
+ * and the University of New Mexico.  You can find out more at 
+ * http://www.v3vee.org
+ *
+ * Copyright (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> 
+ * Copyright (c) 2008, The V3VEE Project <http://www.v3vee.org> 
+ * All rights reserved.
+ *
+ * Author: Jack Lange <jarusl@cs.northwestern.edu>
+ *
+ * This is free software.  You are permitted to use,
+ * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
+ */
 
 #include <devices/timer.h>
 #include <palacios/vmm.h>
@@ -8,46 +24,47 @@
 #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);
+static int timer_init(struct vm_device * dev) {
+    //dev_hook_irq(dev, TIMER_IRQ, &irq_handler);
 
-  return 0;
+    return 0;
 }
 
-int timer_deinit(struct vm_device * dev) {
+static int timer_deinit(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,
+    .init = timer_init,
+    .deinit = timer_deinit,
+    .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);
+struct vm_device * v3_create_timer() {
+    struct timer_state * timer = NULL;
+    timer = (struct timer_state *)V3_Malloc( sizeof(struct timer_state));
+    V3_ASSERT(timer != NULL);
 
-  struct vm_device * dev = create_device("Timer", &dev_ops, timer);
+    struct vm_device * dev = v3_create_device("Timer", &dev_ops, timer);
   
-  return dev;
+    return dev;
 
 }