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

diff --git a/palacios/src/devices/timer.c b/palacios/src/devices/timer.c
index 59198ba..5ed434b 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>
@@ -12,20 +28,21 @@ struct timer_state {
 };
 
 
-
-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) {
+static 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_deinit(struct vm_device * dev) {
 
   return 0;
 }
@@ -41,12 +58,12 @@ static struct vm_device_ops dev_ops = {
 };
 
 
-struct vm_device * create_timer() {
+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;