X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fkeyboard.c;h=ed00282f6c6b07de4f65ba172fdbc577aec83635;hb=82cceefa66b1f05d8f9d5bfcb2fb7214755e1904;hp=39accf54c0de81dad7041bae79a03cd1d5749c53;hpb=4f7c3b759e3889870c5b5e7d09b3ffcc168e5632;p=palacios.git

diff --git a/palacios/src/devices/keyboard.c b/palacios/src/devices/keyboard.c
index 39accf5..ed00282 100644
--- a/palacios/src/devices/keyboard.c
+++ b/palacios/src/devices/keyboard.c
@@ -1,8 +1,23 @@
-/* Northwestern University */
-/* (c) 2008, Peter Dinda <pdinda@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, Peter Dinda <pdinda@northwestern.edu> 
+ * Copyright (c) 2008, The V3VEE Project <http://www.v3vee.org> 
+ * All rights reserved.
+ *
+ * Author: Peter Dinda <pdinda@northwestern.edu>
+ *
+ * This is free software.  You are permitted to use,
+ * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
+ */
 
 #include <devices/keyboard.h>
-#include <geekos/io.h>
 #include <palacios/vmm.h>
 #include <palacios/vmm_types.h>
 
@@ -322,7 +337,15 @@ static struct vm_device *demultiplex_injected_mouse(uchar_t mouse_packet[3])
   return thekeyboard;
 }
 
-int keyboard_interrupt(uint_t irq, struct vm_device * dev);
+
+int keyboard_interrupt(uint_t irq, struct vm_device * dev) {
+  PrintDebug("keyboard: interrupt 0x%x\n", irq);
+
+  dev->vm->vm_ops.raise_irq(dev->vm, irq);
+
+  return 0;
+
+}
 
 void deliver_key_to_vmm(uchar_t status, uchar_t scancode)
 {
@@ -751,7 +774,7 @@ int keyboard_read_delay(ushort_t port,
 {
 
   if (length == 1) { 
-    *((uchar_t*)dest) = In_Byte(port);
+    *((uchar_t*)dest) = v3_inb(port);
 
     PrintDebug("keyboard: read of 0x%x from 80h\n", *((uchar_t*)dest));
 
@@ -1126,15 +1149,7 @@ int keyboard_read_input(ushort_t port,
 }
 
 
-int keyboard_interrupt(uint_t irq, struct vm_device * dev) 
-{
-  PrintDebug("keyboard: interrupt 0x%x\n", irq);
-
-  dev->vm->vm_ops.raise_irq(dev->vm, irq);
 
-  return 0;
-
-}
 
 
 int keyboard_init_device(struct vm_device * dev)