Palacios Public Git Repository

To checkout Palacios execute 

  git clone http://v3vee.org/palacios/palacios.web/palacios.git
This will give you the master branch. You probably want the devel branch or one of the release branches. To switch to the devel branch, simply execute 
  cd palacios
  git checkout --track -b devel origin/devel
The other branches are similar.

projects / palacios.git / commitdiff
? search: re
summary | shortlog | log | commit | commitdiff | tree
raw (parent: c06353f)
formatting
Jack Lange [Tue, 16 Sep 2008 22:22:27 +0000 (22:22 +0000)]
palacios/src/devices/keyboard.c patch | blob | history

diff --git a/palacios/src/devices/keyboard.c b/palacios/src/devices/keyboard.c
index fe4e443..fa00d74 100644 (file)
--- a/palacios/src/devices/keyboard.c
+++ b/palacios/src/devices/keyboard.c
@@ -81,7 +81,7 @@
 
 
 // The currently targetted keyboard
-static struct vm_device *thekeyboard = NULL;
+static struct vm_device * thekeyboard = NULL;
 
 //#define QUEUE_SIZE          32
 
@@ -196,7 +196,7 @@ struct keyboard_internal {
 // push item onto outputqueue, optionally overwriting if there is no room
 // returns 0 if successful
 //
-static int PushToOutputQueue(struct vm_device *dev, uchar_t value, uchar_t overwrite, uchar_t cmd, uchar_t mouse) 
+static int PushToOutputQueue(struct vm_device * dev, uchar_t value, uchar_t overwrite, uchar_t cmd, uchar_t mouse) 
 {
   struct keyboard_internal *state = (struct keyboard_internal *)(dev->private_data);
   
@@ -232,11 +232,11 @@ static int PushToOutputQueue(struct vm_device *dev, uchar_t value, uchar_t overw
 // pull item from outputqueue 
 // returns 0 if successful
 //
-static int PullFromOutputQueue(struct vm_device *dev, uchar_t *value) 
+static int PullFromOutputQueue(struct vm_device * dev, uchar_t * value) 
 {
   struct keyboard_internal *state = (struct keyboard_internal *)(dev->private_data);
 
-  if (1 || state->output_queue_len == 1) { 
+  if (1 || (state->output_queue_len == 1)) { 
 
     *value = state->output_queue;
     state->output_queue_len = 0;
@@ -267,7 +267,7 @@ static int PullFromOutputQueue(struct vm_device *dev, uchar_t *value)
 // push item onto inputqueue, optionally overwriting if there is no room
 // returns 0 if successful
 //
-static int PushToInputQueue(struct vm_device *dev, uchar_t value, uchar_t overwrite) 
+static int PushToInputQueue(struct vm_device * dev, uchar_t value, uchar_t overwrite) 
 {
   struct keyboard_internal *state = (struct keyboard_internal *)(dev->private_data);
 
@@ -290,7 +290,7 @@ static int PushToInputQueue(struct vm_device *dev, uchar_t value, uchar_t overwr
 //
 static int PullFromInputQueue(struct vm_device *dev, uchar_t *value) 
 {
-  struct keyboard_internal *state = (struct keyboard_internal *)(dev->private_data);
+  struct keyboard_internal * state = (struct keyboard_internal *)(dev->private_data);
 
   if (state->input_queue_len == 1) { 
 
@@ -343,12 +343,13 @@ void deliver_key_to_vmm(uchar_t status, uchar_t scancode)
 
 void deliver_mouse_to_vmm(uchar_t data[3])
 {
-  struct vm_device *dev = demultiplex_injected_mouse(data);
-  struct keyboard_internal *state = (struct keyboard_internal *)(dev->private_data);
+  struct vm_device * dev = demultiplex_injected_mouse(data);
+  struct keyboard_internal * state = (struct keyboard_internal *)(dev->private_data);
 
-  PrintDebug("keyboard: injected mouse packet 0x %x %x %x\n",data[0],data[1],data[2]);
+  PrintDebug("keyboard: injected mouse packet 0x %x %x %x\n",
+            data[0], data[1], data[2]);
   
-  memcpy(state->mouse_packet,data,3);
+  memcpy(state->mouse_packet, data, 3);
   
   state->status_byte |= STATUS_MOUSE_BUFFER_FULL;
   
@@ -358,7 +359,7 @@ void deliver_mouse_to_vmm(uchar_t data[3])
   case STREAM2:
   case STREAM3:
     if (!(state->cmd_byte & CMD_MOUSE_DISABLE)) { 
-      keyboard_interrupt(MOUSE_IRQ,dev);
+      keyboard_interrupt(MOUSE_IRQ, dev);
     }
     break;
   default:
@@ -375,24 +376,23 @@ int keyboard_reset_device(struct vm_device * dev)
   memset(data, 0, sizeof(struct keyboard_internal));
 
   data->state = NORMAL;
-  data->mouse_state=STREAM1;
+  data->mouse_state = STREAM1;
 
-  data->cmd_byte =   
-      CMD_INTR        // interrupts on
+  data->cmd_byte =  
+    CMD_INTR          // interrupts on
     | CMD_MOUSE_INTR  // mouse interupts on
     | CMD_SYSTEM ;    // self test passed
                       // PS2, keyboard+mouse enabled, generic translation    
   
   data->status_byte = 
-      STATUS_SYSTEM     // self-tests passed
+    STATUS_SYSTEM       // self-tests passed
     | STATUS_ENABLED ;  // keyboard ready
                         // buffers empty, no errors
 
   data->output_byte = 0;  //  ?
 
-  data->input_byte = 
-    INPUT_RAM ;            // we have some
-                           // also display=color, jumper 0, keyboard enabled 
+  data->input_byte = INPUT_RAM;  // we have some
+                                 // also display=color, jumper 0, keyboard enabled 
 
   
 
@@ -423,7 +423,8 @@ int mouse_read_input(struct vm_device *dev)
   struct keyboard_internal *state = (struct keyboard_internal *)(dev->private_data);
 
   if (state->mouse_needs_ack) { 
-    state->mouse_needs_ack=0;
+    state->mouse_needs_ack = 0;
+
     // the ack has been stuffed previously
     if (state->mouse_done_after_ack) { 
       return 1;
@@ -433,78 +434,103 @@ int mouse_read_input(struct vm_device *dev)
   }
 
   switch (state->mouse_state) { 
+
   case RESET1: // requesting the BAT code
-    PushToOutputQueue(dev,0xaa,OVERWRITE,DATA,MOUSE) ;  // BAT successful
+    PushToOutputQueue(dev, 0xaa, OVERWRITE, DATA, MOUSE) ;  // BAT successful
     PrintDebug(" mouse sent BAT code (sucesssful) ");
-    state->mouse_state=RESET2;
+    state->mouse_state = RESET2;
+
     return 0;  // not done with mouse processing yet
     break;
+
   case RESET2: // requesting the device id
-    PushToOutputQueue(dev,0x00,OVERWRITE,DATA,MOUSE) ;  // normal mouse type
+    PushToOutputQueue(dev, 0x00, OVERWRITE, DATA, MOUSE) ;  // normal mouse type
     PrintDebug(" mouse sent device id ");
-    state->mouse_state=STREAM1;
+    state->mouse_state = STREAM1;
+
     return 1;  // done with mouse processing 
     break;
+
   case STREAM1: // send data
-    PushToOutputQueue(dev,state->mouse_packet[0],OVERWRITE,DATA,MOUSE); 
+    PushToOutputQueue(dev, state->mouse_packet[0], OVERWRITE, DATA, MOUSE); 
     PrintDebug(" mouse sent stream data1 ");
-    state->mouse_state=STREAM2;
+    state->mouse_state = STREAM2;
+
     return 0;
     break;
+
   case STREAM2: // send data
-    PushToOutputQueue(dev,state->mouse_packet[1],OVERWRITE,DATA,MOUSE); 
+    PushToOutputQueue(dev, state->mouse_packet[1], OVERWRITE, DATA, MOUSE); 
     PrintDebug(" mouse sent stream data2 ");
-    state->mouse_state=STREAM3;
+    state->mouse_state = STREAM3;
+
     return 0;
     break;
+
   case STREAM3: // send data
-    PushToOutputQueue(dev,state->mouse_packet[2],OVERWRITE,DATA,MOUSE); 
+    PushToOutputQueue(dev, state->mouse_packet[2], OVERWRITE, DATA, MOUSE); 
     PrintDebug(" mouse sent stream data3 ");
-    state->mouse_state=STREAM1;
+    state->mouse_state = STREAM1;
+
     return 1; // now done
     break;
+
   case REMOTE1: // send data
-    PushToOutputQueue(dev,state->mouse_packet[0],OVERWRITE,DATA,MOUSE); 
+    PushToOutputQueue(dev, state->mouse_packet[0], OVERWRITE, DATA, MOUSE); 
     PrintDebug(" mouse sent remote data1 ");
-    state->mouse_state=REMOTE2;
+    state->mouse_state = REMOTE2;
+
     return 0;
     break;
+
   case REMOTE2: // send data
-    PushToOutputQueue(dev,state->mouse_packet[1],OVERWRITE,DATA,MOUSE); 
+    PushToOutputQueue(dev, state->mouse_packet[1], OVERWRITE, DATA, MOUSE); 
     PrintDebug(" mouse sent remote data2 ");
-    state->mouse_state=REMOTE3;
+    state->mouse_state = REMOTE3;
+
     return 0;
     break;
+
   case REMOTE3: // send data
-    PushToOutputQueue(dev,state->mouse_packet[2],OVERWRITE,DATA,MOUSE); 
+    PushToOutputQueue(dev, state->mouse_packet[2], OVERWRITE, DATA, MOUSE); 
     PrintDebug(" mouse sent remote data3 ");
-    state->mouse_state=REMOTE1;
+    state->mouse_state = REMOTE1;
+
     return 1; // now done
     break;
+
   case STATUS1: // send data
-    PushToOutputQueue(dev,0x0,OVERWRITE,DATA,MOUSE); 
+    PushToOutputQueue(dev, 0x0, OVERWRITE, DATA, MOUSE); 
     PrintDebug(" mouse sent status data1 ");
-    state->mouse_state=STATUS2;
+    state->mouse_state = STATUS2;
+
     return 0;
     break;
+
   case STATUS2: // send data
-    PushToOutputQueue(dev,0x0,OVERWRITE,DATA,MOUSE); 
+    PushToOutputQueue(dev, 0x0, OVERWRITE, DATA, MOUSE); 
     PrintDebug(" mouse sent status data2 ");
-    state->mouse_state=STATUS3;
+    state->mouse_state = STATUS3;
+
     return 0;
     break;
+
   case STATUS3: // send data
-    PushToOutputQueue(dev,0x0,OVERWRITE,DATA,MOUSE); 
+    PushToOutputQueue(dev, 0x0, OVERWRITE, DATA, MOUSE); 
     PrintDebug(" mouse sent status data3 ");
-    state->mouse_state=STREAM1;
+    state->mouse_state = STREAM1;
+
     return 1; // now done
     break;
+
   case DEVICE1: // send device id
-    PushToOutputQueue(dev,0x0,OVERWRITE,DATA,MOUSE); 
+    PushToOutputQueue(dev, 0x0, OVERWRITE, DATA, MOUSE); 
     PrintDebug(" mouse sent device id ");
-    state->mouse_state=STREAM1;
+    state->mouse_state = STREAM1;
+
     return 1; // now done
     break;
+
   default:
     PrintDebug(" mouse has no data ");
     return 1; // done
@@ -512,9 +538,9 @@ int mouse_read_input(struct vm_device *dev)
   }
 }
 
-int mouse_write_output(struct vm_device *dev, uchar_t data)
+int mouse_write_output(struct vm_device * dev, uchar_t data)
 {
-  struct keyboard_internal *state = (struct keyboard_internal *)(dev->private_data);
+  struct keyboard_internal * state = (struct keyboard_internal *)(dev->private_data);
 
   switch (state->mouse_state) { 
   case STREAM1:
@@ -526,8 +552,9 @@ int mouse_write_output(struct vm_device *dev, uchar_t data)
     switch (data) {
 
     case 0xff: //reset
-      PushToOutputQueue(dev,0xfe,OVERWRITE,DATA,MOUSE) ;   // no mouse!
+      PushToOutputQueue(dev, 0xfe, OVERWRITE, DATA, MOUSE) ;   // no mouse!
       PrintDebug(" mouse reset begins (no mouse) ");
+
       return 1;  // not done;
       break;
 
@@ -542,149 +569,149 @@ int mouse_write_output(struct vm_device *dev, uchar_t data)
       break;
       */
     case 0xfe: //resend
-      PushToOutputQueue(dev,0xfa,OVERWRITE,DATA,MOUSE) ; 
+      PushToOutputQueue(dev, 0xfa, OVERWRITE, DATA, MOUSE) ; 
       PrintDebug(" mouse resend begins ");
-      state->mouse_done_after_ack=0;
-      state->mouse_needs_ack=0;
-      state->mouse_state=STREAM1;
+      state->mouse_done_after_ack = 0;
+      state->mouse_needs_ack = 0;
+      state->mouse_state = STREAM1;
       return 0;  // not done
       break;
       
     case 0xf6: // set defaults
-      PushToOutputQueue(dev,0xfa,OVERWRITE,DATA,MOUSE) ; 
+      PushToOutputQueue(dev, 0xfa, OVERWRITE, DATA, MOUSE) ; 
       PrintDebug(" mouse set defaults ");
-      state->mouse_done_after_ack=1;
-      state->mouse_needs_ack=1;
-      state->mouse_state=STREAM1;
+      state->mouse_done_after_ack = 1;
+      state->mouse_needs_ack = 1;
+      state->mouse_state = STREAM1;
       return 0; // not done
       break;
       
     case 0xf5: // disable data reporting 
-      PushToOutputQueue(dev,0xfa,OVERWRITE,DATA,MOUSE) ; 
-      state->mouse_done_after_ack=1;
-      state->mouse_needs_ack=1;
+      PushToOutputQueue(dev, 0xfa, OVERWRITE, DATA, MOUSE) ; 
+      state->mouse_done_after_ack = 1;
+      state->mouse_needs_ack = 1;
       PrintDebug(" mouse disable data reporting ");
-      state->mouse_state=STREAM1;
+      state->mouse_state = STREAM1;
       return 0; // not done
       break;
       
     case 0xf4: // enable data reporting 
-      PushToOutputQueue(dev,0xfa,OVERWRITE,DATA,MOUSE) ; 
-      state->mouse_done_after_ack=1;
-      state->mouse_needs_ack=1;
+      PushToOutputQueue(dev, 0xfa, OVERWRITE, DATA, MOUSE) ; 
+      state->mouse_done_after_ack = 1;
+      state->mouse_needs_ack = 1;
       PrintDebug(" mouse enable data reporting ");
-      state->mouse_state=STREAM1;
+      state->mouse_state = STREAM1;
       return 0; // not done
       break;
       
     case 0xf3: // set sample rate
-      PushToOutputQueue(dev,0xfa,OVERWRITE,DATA,MOUSE) ; 
-      state->mouse_done_after_ack=0;
-      state->mouse_needs_ack=1;
+      PushToOutputQueue(dev, 0xfa, OVERWRITE, DATA, MOUSE) ; 
+      state->mouse_done_after_ack = 0;
+      state->mouse_needs_ack = 1;
       PrintDebug(" mouse set sample rate begins ");
-      state->mouse_state=SAMPLE1;
+      state->mouse_state = SAMPLE1;
       return 0; // not done
       break;
       
     case 0xf2: // get device id
-      PushToOutputQueue(dev,0xfa,OVERWRITE,DATA,MOUSE) ; 
-      state->mouse_done_after_ack=0;
-      state->mouse_needs_ack=1;
+      PushToOutputQueue(dev, 0xfa, OVERWRITE, DATA, MOUSE) ; 
+      state->mouse_done_after_ack = 0;
+      state->mouse_needs_ack = 1;
       PrintDebug(" mouse get device id begins ");
-      state->mouse_state=DEVICE1;
+      state->mouse_state = DEVICE1;
       return 0; // not done
       break;
       
     case 0xf0: // set remote mode
-      PushToOutputQueue(dev,0xfa,OVERWRITE,DATA,MOUSE) ; 
-      state->mouse_done_after_ack=1;
-      state->mouse_needs_ack=1;
+      PushToOutputQueue(dev, 0xfa, OVERWRITE, DATA, MOUSE) ; 
+      state->mouse_done_after_ack = 1;
+      state->mouse_needs_ack = 1;
       PrintDebug(" mouse set remote mode  ");
-      state->mouse_state=REMOTE1;
+      state->mouse_state = REMOTE1;
       return 0; // not done
       break;
 
     case 0xee: // set wrap mode
-      PushToOutputQueue(dev,0xfa,OVERWRITE,DATA,MOUSE) ; 
-      state->mouse_done_after_ack=1;
-      state->mouse_needs_ack=1;
+      PushToOutputQueue(dev, 0xfa, OVERWRITE, DATA, MOUSE) ; 
+      state->mouse_done_after_ack = 1;
+      state->mouse_needs_ack = 1;
       PrintDebug(" mouse set wrap mode (ignored)  ");
-      state->mouse_state=STREAM1;
+      state->mouse_state = STREAM1;
       return 0; // not done
       break;
 
     case 0xec: // reset wrap mode
-      PushToOutputQueue(dev,0xfa,OVERWRITE,DATA,MOUSE) ; 
-      state->mouse_done_after_ack=1;
-      state->mouse_needs_ack=1;
+      PushToOutputQueue(dev, 0xfa, OVERWRITE, DATA, MOUSE) ; 
+      state->mouse_done_after_ack = 1;
+      state->mouse_needs_ack = 1;
       PrintDebug(" mouse reset wrap mode (ignored)  ");
-      state->mouse_state=STREAM1;
+      state->mouse_state = STREAM1;
       return 0; // done
       break;
 
     case 0xeb: // read data
-      PushToOutputQueue(dev,0xfa,OVERWRITE,DATA,MOUSE) ; 
-      state->mouse_done_after_ack=0;
-      state->mouse_needs_ack=1;
+      PushToOutputQueue(dev, 0xfa, OVERWRITE, DATA, MOUSE) ; 
+      state->mouse_done_after_ack = 0;
+      state->mouse_needs_ack = 1;
       PrintDebug(" mouse switch to wrap mode (ignored)  ");
-      state->mouse_state=REMOTE1;
+      state->mouse_state = REMOTE1;
       return 0; // not done
       break;
       
     case 0xea: // set stream mode
-      PushToOutputQueue(dev,0xfa,OVERWRITE,DATA,MOUSE) ; 
-      state->mouse_done_after_ack=1;
-      state->mouse_needs_ack=1;
+      PushToOutputQueue(dev, 0xfa, OVERWRITE, DATA, MOUSE) ; 
+      state->mouse_done_after_ack = 1;
+      state->mouse_needs_ack = 1;
       PrintDebug(" mouse set stream mode  ");
-      state->mouse_state=STREAM1;
+      state->mouse_state = STREAM1;
       return 0; // not done
       break;
 
     case 0xe9: // status request
-      PushToOutputQueue(dev,0xfa,OVERWRITE,DATA,MOUSE) ; 
-      state->mouse_done_after_ack=0;
-      state->mouse_needs_ack=1;
+      PushToOutputQueue(dev, 0xfa, OVERWRITE, DATA, MOUSE) ; 
+      state->mouse_done_after_ack = 0;
+      state->mouse_needs_ack = 1;
       PrintDebug(" mouse status request begins  ");
-      state->mouse_state=STATUS1;
+      state->mouse_state = STATUS1;
       return 0; // notdone
       break;
 
     case 0xe8: // set resolution
-      PushToOutputQueue(dev,0xfa,OVERWRITE,DATA,MOUSE) ; 
-      state->mouse_done_after_ack=0;
-      state->mouse_needs_ack=1;
+      PushToOutputQueue(dev, 0xfa, OVERWRITE, DATA, MOUSE) ; 
+      state->mouse_done_after_ack = 0;
+      state->mouse_needs_ack = 1;
       PrintDebug(" mouse set resolution begins  ");
-      state->mouse_state=SETRES1;
+      state->mouse_state = SETRES1;
       return 0; // notdone
       break;
 
     case 0xe7: // set scaling 2:1
-      PushToOutputQueue(dev,0xfa,OVERWRITE,DATA,MOUSE) ; 
-      state->mouse_done_after_ack=1;
-      state->mouse_needs_ack=1;
+      PushToOutputQueue(dev, 0xfa, OVERWRITE, DATA, MOUSE) ; 
+      state->mouse_done_after_ack = 1;
+      state->mouse_needs_ack = 1;
       PrintDebug(" mouse set scaling 2:1 ");
-      state->mouse_state=STREAM1;
+      state->mouse_state = STREAM1;
       return 0; // not done
       break;
 
     case 0xe6: // set scaling 1:1
-      PushToOutputQueue(dev,0xfa,OVERWRITE,DATA,MOUSE) ; 
-      state->mouse_done_after_ack=1;
-      state->mouse_needs_ack=1;
+      PushToOutputQueue(dev, 0xfa, OVERWRITE, DATA, MOUSE) ; 
+      state->mouse_done_after_ack = 1;
+      state->mouse_needs_ack = 1;
       PrintDebug(" mouse set scaling 1:1 ");
-      state->mouse_state=STREAM1;
+      state->mouse_state = STREAM1;
       return 0; // done
       break;
       
     default:
-      PrintDebug(" receiving unknown mouse command (0x%x) in acceptable state ",data);
+      PrintDebug(" receiving unknown mouse command (0x%x) in acceptable state ", data);
       return 1; // done
       break;
 
     }
     
   default:
-    PrintDebug(" receiving mouse output in unhandled state (0x%x) ",state->mouse_state);
+    PrintDebug(" receiving mouse output in unhandled state (0x%x) ", state->mouse_state);
     break;
     return 1; // done?
     break;
@@ -766,7 +793,7 @@ int keyboard_write_command(ushort_t port,
   case 0x20:  // READ COMMAND BYTE (returned in 60h)
     PushToOutputQueue(dev, state->cmd_byte, OVERWRITE, COMMAND,KEYBOARD);
     state->state = NORMAL;  // the next read on 0x60 will get the right data
-    PrintDebug("keyboard: command byte 0x%x returned\n",state->cmd_byte);
+    PrintDebug("keyboard: command byte 0x%x returned\n", state->cmd_byte);
     break;
 
   case 0x60:  // WRITE COMMAND BYTE (read from 60h)
@@ -777,14 +804,14 @@ int keyboard_write_command(ushort_t port,
   // case 0x90-9f - write to output port  (?)
 
   case 0xa1: // Get version number
-    PushToOutputQueue(dev, 0, OVERWRITE, COMMAND,KEYBOARD);
+    PushToOutputQueue(dev, 0, OVERWRITE, COMMAND, KEYBOARD);
     state->state = NORMAL;
     PrintDebug("keyboard: version number 0x0 returned\n");
     break;
 
   case 0xa4:  // is password installed?  send result to 0x60
     // we don't support passwords
-    PushToOutputQueue(dev, 0xf1, OVERWRITE, COMMAND,KEYBOARD);
+    PushToOutputQueue(dev, 0xf1, OVERWRITE, COMMAND, KEYBOARD);
     PrintDebug("keyboard: password not installed\n");
     state->state = NORMAL;
     break;
@@ -815,19 +842,19 @@ int keyboard_write_command(ushort_t port,
     break;
 
   case 0xa9:  // mouse interface test  (always succeeds)
-    PushToOutputQueue(dev, 0, OVERWRITE,COMMAND,KEYBOARD);
+    PushToOutputQueue(dev, 0, OVERWRITE, COMMAND, KEYBOARD);
     PrintDebug("keyboard: mouse interface test succeeded\n");
     state->state = NORMAL;
     break;
 
   case 0xaa:  // controller self test (always succeeds)
-    PushToOutputQueue(dev, 0x55, OVERWRITE, COMMAND,KEYBOARD);
+    PushToOutputQueue(dev, 0x55, OVERWRITE, COMMAND, KEYBOARD);
     PrintDebug("keyboard: controller self test succeeded\n");
     state->state = NORMAL;
     break;
 
   case 0xab:  // keyboard interface test (always succeeds)
-    PushToOutputQueue(dev, 0, OVERWRITE, COMMAND,KEYBOARD);
+    PushToOutputQueue(dev, 0, OVERWRITE, COMMAND, KEYBOARD);
     state->state = NORMAL;
     PrintDebug("keyboard: keyboard interface test succeeded\n");
     break;
@@ -845,15 +872,15 @@ int keyboard_write_command(ushort_t port,
     break;
 
   case 0xaf:  // get version
-    PushToOutputQueue(dev, 0x00, OVERWRITE, COMMAND,KEYBOARD);
+    PushToOutputQueue(dev, 0x00, OVERWRITE, COMMAND, KEYBOARD);
     state->state = NORMAL;
     PrintDebug("keyboard: version 0 returned \n");
     break;
 
   case 0xd0: // return microcontroller output on 60h
-    PushToOutputQueue(dev,state->output_byte,OVERWRITE,COMMAND,KEYBOARD);
+    PushToOutputQueue(dev, state->output_byte, OVERWRITE, COMMAND, KEYBOARD);
     state->state = NORMAL;
-    PrintDebug("keyboard: output byte 0x%x returned\n",state->output_byte);
+    PrintDebug("keyboard: output byte 0x%x returned\n", state->output_byte);
     break;
 
   case 0xd1: // request to write next byte on 60h to the microcontroller output port
@@ -877,29 +904,29 @@ int keyboard_write_command(ushort_t port,
     break;
 
   case 0xc0: //  read input port 
-    PushToOutputQueue(dev,state->input_byte,OVERWRITE,COMMAND,KEYBOARD);
-    state->state=NORMAL;
-    PrintDebug("keyboard: input byte 0x%x returned\n",state->input_byte);
+    PushToOutputQueue(dev, state->input_byte, OVERWRITE, COMMAND, KEYBOARD);
+    state->state = NORMAL;
+    PrintDebug("keyboard: input byte 0x%x returned\n", state->input_byte);
     break;
 
   case 0xc1:  //copy input port lsn to status msn
     state->status_byte &= 0x0f;
-    state->status_byte |= (state->input_byte & 0xf)<<4;
-    state->state=NORMAL;
+    state->status_byte |= (state->input_byte & 0xf) << 4;
+    state->state = NORMAL;
     PrintDebug("keyboard: copied input byte lsn to status msn\n");
     break;
 
   case 0xc2: // copy input port msn to status msn
     state->status_byte &= 0x0f;
     state->status_byte |= (state->input_byte & 0xf0);
-    state->state=NORMAL;
+    state->state = NORMAL;
     PrintDebug("keyboard: copied input byte msn to status msn\n");
     break;
     
   case 0xe0: // read test port
-    PushToOutputQueue(dev,state->output_byte>>6,OVERWRITE,COMMAND,KEYBOARD);
-    state->state=NORMAL;
-    PrintDebug("keyboard: read 0x%x from test port\n",state->output_byte>>6);
+    PushToOutputQueue(dev, state->output_byte >> 6, OVERWRITE, COMMAND, KEYBOARD);
+    state->state = NORMAL;
+    PrintDebug("keyboard: read 0x%x from test port\n", state->output_byte >> 6);
     break;
 
    
@@ -920,8 +947,8 @@ int keyboard_write_command(ushort_t port,
   case 0xfe:
   case 0xff:
   
-    PrintDebug("keyboard: ignoring pulse of 0x%x (low=pulsed) on output port\n",cmd&0xf);
-    state->state=NORMAL;
+    PrintDebug("keyboard: ignoring pulse of 0x%x (low=pulsed) on output port\n", (cmd & 0xf));
+    state->state = NORMAL;
     break;
    
 
@@ -978,26 +1005,26 @@ int keyboard_write_output(ushort_t port,
   case WRITING_CMD_BYTE:
     state->cmd_byte = data;
     state->state = NORMAL;
-    PrintDebug("keyboard: wrote new command byte 0x%x\n",state->cmd_byte);
+    PrintDebug("keyboard: wrote new command byte 0x%x\n", state->cmd_byte);
     break;
   case WRITING_OUTPUT_PORT:
     state->output_byte = data;
     state->state = NORMAL;
-    PrintDebug("keyboard: wrote new output byte 0x%x\n",state->output_byte);
+    PrintDebug("keyboard: wrote new output byte 0x%x\n", state->output_byte);
     break;
   case INJECTING_KEY:
-    PushToOutputQueue(dev,data,OVERWRITE,COMMAND,KEYBOARD);  // probably should be a call to deliver_key_to_vmm()
+    PushToOutputQueue(dev, data, OVERWRITE, COMMAND, KEYBOARD);  // probably should be a call to deliver_key_to_vmm()
     state->state = NORMAL;
-    PrintDebug("keyboard: injected key 0x%x\n",data);
+    PrintDebug("keyboard: injected key 0x%x\n", data);
     break;
   case INJECTING_MOUSE:
-    PrintDebug("keyboard: ignoring injected mouse event 0x%x\n",data);
+    PrintDebug("keyboard: ignoring injected mouse event 0x%x\n", data);
     state->state = NORMAL;
     break;
   case IN_MOUSE:
     PrintDebug("keyboard: mouse action: ");
-    if (mouse_write_output(dev,data)) { 
-      state->state=NORMAL;
+    if (mouse_write_output(dev, data)) { 
+      state->state = NORMAL;
     }
     PrintDebug("\n");
     break;
@@ -1016,14 +1043,14 @@ int keyboard_write_output(ushort_t port,
       // command is being sent to keyboard controller
       switch (data) { 
       case 0xff: // reset
-       PushToOutputQueue(dev, 0xfa, OVERWRITE, COMMAND,KEYBOARD); // ack
+       PushToOutputQueue(dev, 0xfa, OVERWRITE, COMMAND, KEYBOARD); // ack
        state->state = RESET;
-       PrintDebug("keyboard: reset complete and acked\n",data);
+       PrintDebug("keyboard: reset complete and acked\n", data);
        break;
       case 0xf5: // disable scanning
       case 0xf4: // enable scanning
        // ack
-       PushToOutputQueue(dev, 0xfa, OVERWRITE, COMMAND,KEYBOARD);
+       PushToOutputQueue(dev, 0xfa, OVERWRITE, COMMAND, KEYBOARD);
        // should do something here... PAD
        state->state = NORMAL;
        PrintDebug("keyboard: %s scanning done and acked\n",data==0xf5 ? "disable" : "enable", data);
@@ -1067,10 +1094,10 @@ int keyboard_read_input(ushort_t port,
 
     PrintDebug("keyboard: read from input (60h): ");
 
-    if (state->state==IN_MOUSE) { 
-      done_mouse=mouse_read_input(dev);
+    if (state->state == IN_MOUSE) { 
+      done_mouse = mouse_read_input(dev);
       if (done_mouse) { 
-       state->state=NORMAL;
+       state->state = NORMAL;
       }
     } 
       
@@ -1079,7 +1106,7 @@ int keyboard_read_input(ushort_t port,
     if (state->state == RESET) { 
       // We just delivered the ack for the reset
       // now we will ready ourselves to deliver the BAT code (success)
-      PushToOutputQueue(dev, 0xaa, OVERWRITE,COMMAND,KEYBOARD);
+      PushToOutputQueue(dev, 0xaa, OVERWRITE, COMMAND, KEYBOARD);
       state->state = NORMAL;
       PrintDebug(" (in reset, pushing BAT test code 0xaa) ");
     }
@@ -1098,7 +1125,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);
+  PrintDebug("keyboard: interrupt 0x%x\n", irq);
 
   dev->vm->vm_ops.raise_irq(dev->vm, irq);
 
Public Palacios Development Repository for the V3VEE Project