X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fkeyboard.c;h=fe4e44344c93ab4f3eb9d8ca210d56e518ab91c7;hp=4173bdad41b14ea911f390bd2f2c6b3b24cdbbfc;hb=9dd0a80f28ca47a1fb69992dcd96e7526bf5175c;hpb=cbf35ad72de3a7a1f6eee3e8b2b35d7f31df22a5 diff --git a/palacios/src/devices/keyboard.c b/palacios/src/devices/keyboard.c index 4173bda..fe4e443 100644 --- a/palacios/src/devices/keyboard.c +++ b/palacios/src/devices/keyboard.c @@ -3,15 +3,14 @@ #include #include -#define KEYBOARD_DEBUG 1 + +#ifndef DEBUG_KEYBOARD +#undef PrintDebug +#define PrintDebug(fmt, args...) +#endif #define KEYBOARD_DEBUG_80H 0 -#if KEYBOARD_DEBUG -#define KEYBOARD_DEBUG_PRINT(first, rest...) PrintDebug(first, ##rest) -#else -#define KEYBOARD_DEBUG_PRINT(first, rest...) -#endif #define KEYBOARD_60H 0x60 // keyboard microcontroller @@ -223,7 +222,7 @@ static int PushToOutputQueue(struct vm_device *dev, uchar_t value, uchar_t overw return 0; } else { - KEYBOARD_DEBUG_PRINT("keyboard: PushToOutputQueue Failed - Queue Full\n"); + PrintError("keyboard: PushToOutputQueue Failed - Queue Full\n"); return -1; } } @@ -257,7 +256,7 @@ static int PullFromOutputQueue(struct vm_device *dev, uchar_t *value) return 0; } else { - KEYBOARD_DEBUG_PRINT("keyboard: PullFromOutputQueue Failed - Queue Empty\n"); + PrintError("keyboard: PullFromOutputQueue Failed - Queue Empty\n"); return -1; } } @@ -280,7 +279,7 @@ static int PushToInputQueue(struct vm_device *dev, uchar_t value, uchar_t overwr return 0; } else { - KEYBOARD_DEBUG_PRINT("keyboard: PushToOutputQueue Failed - Queue Full\n"); + PrintError("keyboard: PushToOutputQueue Failed - Queue Full\n"); return -1; } } @@ -301,8 +300,7 @@ static int PullFromInputQueue(struct vm_device *dev, uchar_t *value) return 0; } else { - KEYBOARD_DEBUG_PRINT("keyboard: PullFromInputQueue Failed - Queue Empty\n"); - + PrintError("keyboard: PullFromInputQueue Failed - Queue Empty\n"); return -1; } } @@ -328,7 +326,7 @@ void deliver_key_to_vmm(uchar_t status, uchar_t scancode) struct vm_device *dev = demultiplex_injected_key(status, scancode); struct keyboard_internal *state = (struct keyboard_internal *)(dev->private_data); - KEYBOARD_DEBUG_PRINT("keyboard: injected status 0x%x, and scancode 0x%x\n", status, scancode); + PrintDebug("keyboard: injected status 0x%x, and scancode 0x%x\n", status, scancode); if ( (state->status_byte & STATUS_ENABLED) // onboard is enabled && (!(state->cmd_byte & CMD_DISABLE)) ) { // keyboard is enabled @@ -348,7 +346,7 @@ 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); - KEYBOARD_DEBUG_PRINT("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); @@ -398,7 +396,7 @@ int keyboard_reset_device(struct vm_device * dev) - KEYBOARD_DEBUG_PRINT("keyboard: reset device\n"); + PrintDebug("keyboard: reset device\n"); return 0; @@ -408,14 +406,14 @@ int keyboard_reset_device(struct vm_device * dev) int keyboard_start_device(struct vm_device *dev) { - KEYBOARD_DEBUG_PRINT("keyboard: start device\n"); + PrintDebug("keyboard: start device\n"); return 0; } int keyboard_stop_device(struct vm_device *dev) { - KEYBOARD_DEBUG_PRINT("keyboard: stop device\n"); + PrintDebug("keyboard: stop device\n"); return 0; } @@ -437,78 +435,78 @@ 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 - KEYBOARD_DEBUG_PRINT(" mouse sent BAT code (sucesssful) "); + PrintDebug(" mouse sent BAT code (sucesssful) "); 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 - KEYBOARD_DEBUG_PRINT(" mouse sent device id "); + PrintDebug(" mouse sent device id "); state->mouse_state=STREAM1; return 1; // done with mouse processing break; case STREAM1: // send data PushToOutputQueue(dev,state->mouse_packet[0],OVERWRITE,DATA,MOUSE); - KEYBOARD_DEBUG_PRINT(" mouse sent stream data1 "); + PrintDebug(" mouse sent stream data1 "); state->mouse_state=STREAM2; return 0; break; case STREAM2: // send data PushToOutputQueue(dev,state->mouse_packet[1],OVERWRITE,DATA,MOUSE); - KEYBOARD_DEBUG_PRINT(" mouse sent stream data2 "); + PrintDebug(" mouse sent stream data2 "); state->mouse_state=STREAM3; return 0; break; case STREAM3: // send data PushToOutputQueue(dev,state->mouse_packet[2],OVERWRITE,DATA,MOUSE); - KEYBOARD_DEBUG_PRINT(" mouse sent stream data3 "); + PrintDebug(" mouse sent stream data3 "); state->mouse_state=STREAM1; return 1; // now done break; case REMOTE1: // send data PushToOutputQueue(dev,state->mouse_packet[0],OVERWRITE,DATA,MOUSE); - KEYBOARD_DEBUG_PRINT(" mouse sent remote data1 "); + PrintDebug(" mouse sent remote data1 "); state->mouse_state=REMOTE2; return 0; break; case REMOTE2: // send data PushToOutputQueue(dev,state->mouse_packet[1],OVERWRITE,DATA,MOUSE); - KEYBOARD_DEBUG_PRINT(" mouse sent remote data2 "); + PrintDebug(" mouse sent remote data2 "); state->mouse_state=REMOTE3; return 0; break; case REMOTE3: // send data PushToOutputQueue(dev,state->mouse_packet[2],OVERWRITE,DATA,MOUSE); - KEYBOARD_DEBUG_PRINT(" mouse sent remote data3 "); + PrintDebug(" mouse sent remote data3 "); state->mouse_state=REMOTE1; return 1; // now done break; case STATUS1: // send data PushToOutputQueue(dev,0x0,OVERWRITE,DATA,MOUSE); - KEYBOARD_DEBUG_PRINT(" mouse sent status data1 "); + PrintDebug(" mouse sent status data1 "); state->mouse_state=STATUS2; return 0; break; case STATUS2: // send data PushToOutputQueue(dev,0x0,OVERWRITE,DATA,MOUSE); - KEYBOARD_DEBUG_PRINT(" mouse sent status data2 "); + PrintDebug(" mouse sent status data2 "); state->mouse_state=STATUS3; return 0; break; case STATUS3: // send data PushToOutputQueue(dev,0x0,OVERWRITE,DATA,MOUSE); - KEYBOARD_DEBUG_PRINT(" mouse sent status data3 "); + PrintDebug(" mouse sent status data3 "); state->mouse_state=STREAM1; return 1; // now done break; case DEVICE1: // send device id PushToOutputQueue(dev,0x0,OVERWRITE,DATA,MOUSE); - KEYBOARD_DEBUG_PRINT(" mouse sent device id "); + PrintDebug(" mouse sent device id "); state->mouse_state=STREAM1; return 1; // now done break; default: - KEYBOARD_DEBUG_PRINT(" mouse has no data "); + PrintDebug(" mouse has no data "); return 1; // done break; } @@ -529,14 +527,14 @@ int mouse_write_output(struct vm_device *dev, uchar_t data) case 0xff: //reset PushToOutputQueue(dev,0xfe,OVERWRITE,DATA,MOUSE) ; // no mouse! - KEYBOARD_DEBUG_PRINT(" mouse reset begins (no mouse) "); + PrintDebug(" mouse reset begins (no mouse) "); return 1; // not done; break; /* case 0xff: //reset PushToOutputQueue(dev,0xfa,OVERWRITE,DATA,MOUSE) ; - KEYBOARD_DEBUG_PRINT(" mouse reset begins "); + PrintDebug(" mouse reset begins "); state->mouse_done_after_ack=0; state->mouse_needs_ack=1; state->mouse_state=RESET1; @@ -545,7 +543,7 @@ int mouse_write_output(struct vm_device *dev, uchar_t data) */ case 0xfe: //resend PushToOutputQueue(dev,0xfa,OVERWRITE,DATA,MOUSE) ; - KEYBOARD_DEBUG_PRINT(" mouse resend begins "); + PrintDebug(" mouse resend begins "); state->mouse_done_after_ack=0; state->mouse_needs_ack=0; state->mouse_state=STREAM1; @@ -554,7 +552,7 @@ int mouse_write_output(struct vm_device *dev, uchar_t data) case 0xf6: // set defaults PushToOutputQueue(dev,0xfa,OVERWRITE,DATA,MOUSE) ; - KEYBOARD_DEBUG_PRINT(" mouse set defaults "); + PrintDebug(" mouse set defaults "); state->mouse_done_after_ack=1; state->mouse_needs_ack=1; state->mouse_state=STREAM1; @@ -565,7 +563,7 @@ int mouse_write_output(struct vm_device *dev, uchar_t data) PushToOutputQueue(dev,0xfa,OVERWRITE,DATA,MOUSE) ; state->mouse_done_after_ack=1; state->mouse_needs_ack=1; - KEYBOARD_DEBUG_PRINT(" mouse disable data reporting "); + PrintDebug(" mouse disable data reporting "); state->mouse_state=STREAM1; return 0; // not done break; @@ -574,7 +572,7 @@ int mouse_write_output(struct vm_device *dev, uchar_t data) PushToOutputQueue(dev,0xfa,OVERWRITE,DATA,MOUSE) ; state->mouse_done_after_ack=1; state->mouse_needs_ack=1; - KEYBOARD_DEBUG_PRINT(" mouse enable data reporting "); + PrintDebug(" mouse enable data reporting "); state->mouse_state=STREAM1; return 0; // not done break; @@ -583,7 +581,7 @@ int mouse_write_output(struct vm_device *dev, uchar_t data) PushToOutputQueue(dev,0xfa,OVERWRITE,DATA,MOUSE) ; state->mouse_done_after_ack=0; state->mouse_needs_ack=1; - KEYBOARD_DEBUG_PRINT(" mouse set sample rate begins "); + PrintDebug(" mouse set sample rate begins "); state->mouse_state=SAMPLE1; return 0; // not done break; @@ -592,7 +590,7 @@ int mouse_write_output(struct vm_device *dev, uchar_t data) PushToOutputQueue(dev,0xfa,OVERWRITE,DATA,MOUSE) ; state->mouse_done_after_ack=0; state->mouse_needs_ack=1; - KEYBOARD_DEBUG_PRINT(" mouse get device id begins "); + PrintDebug(" mouse get device id begins "); state->mouse_state=DEVICE1; return 0; // not done break; @@ -601,7 +599,7 @@ int mouse_write_output(struct vm_device *dev, uchar_t data) PushToOutputQueue(dev,0xfa,OVERWRITE,DATA,MOUSE) ; state->mouse_done_after_ack=1; state->mouse_needs_ack=1; - KEYBOARD_DEBUG_PRINT(" mouse set remote mode "); + PrintDebug(" mouse set remote mode "); state->mouse_state=REMOTE1; return 0; // not done break; @@ -610,7 +608,7 @@ int mouse_write_output(struct vm_device *dev, uchar_t data) PushToOutputQueue(dev,0xfa,OVERWRITE,DATA,MOUSE) ; state->mouse_done_after_ack=1; state->mouse_needs_ack=1; - KEYBOARD_DEBUG_PRINT(" mouse set wrap mode (ignored) "); + PrintDebug(" mouse set wrap mode (ignored) "); state->mouse_state=STREAM1; return 0; // not done break; @@ -619,7 +617,7 @@ int mouse_write_output(struct vm_device *dev, uchar_t data) PushToOutputQueue(dev,0xfa,OVERWRITE,DATA,MOUSE) ; state->mouse_done_after_ack=1; state->mouse_needs_ack=1; - KEYBOARD_DEBUG_PRINT(" mouse reset wrap mode (ignored) "); + PrintDebug(" mouse reset wrap mode (ignored) "); state->mouse_state=STREAM1; return 0; // done break; @@ -628,7 +626,7 @@ int mouse_write_output(struct vm_device *dev, uchar_t data) PushToOutputQueue(dev,0xfa,OVERWRITE,DATA,MOUSE) ; state->mouse_done_after_ack=0; state->mouse_needs_ack=1; - KEYBOARD_DEBUG_PRINT(" mouse switch to wrap mode (ignored) "); + PrintDebug(" mouse switch to wrap mode (ignored) "); state->mouse_state=REMOTE1; return 0; // not done break; @@ -637,7 +635,7 @@ int mouse_write_output(struct vm_device *dev, uchar_t data) PushToOutputQueue(dev,0xfa,OVERWRITE,DATA,MOUSE) ; state->mouse_done_after_ack=1; state->mouse_needs_ack=1; - KEYBOARD_DEBUG_PRINT(" mouse set stream mode "); + PrintDebug(" mouse set stream mode "); state->mouse_state=STREAM1; return 0; // not done break; @@ -646,7 +644,7 @@ int mouse_write_output(struct vm_device *dev, uchar_t data) PushToOutputQueue(dev,0xfa,OVERWRITE,DATA,MOUSE) ; state->mouse_done_after_ack=0; state->mouse_needs_ack=1; - KEYBOARD_DEBUG_PRINT(" mouse status request begins "); + PrintDebug(" mouse status request begins "); state->mouse_state=STATUS1; return 0; // notdone break; @@ -655,7 +653,7 @@ int mouse_write_output(struct vm_device *dev, uchar_t data) PushToOutputQueue(dev,0xfa,OVERWRITE,DATA,MOUSE) ; state->mouse_done_after_ack=0; state->mouse_needs_ack=1; - KEYBOARD_DEBUG_PRINT(" mouse set resolution begins "); + PrintDebug(" mouse set resolution begins "); state->mouse_state=SETRES1; return 0; // notdone break; @@ -664,7 +662,7 @@ int mouse_write_output(struct vm_device *dev, uchar_t data) PushToOutputQueue(dev,0xfa,OVERWRITE,DATA,MOUSE) ; state->mouse_done_after_ack=1; state->mouse_needs_ack=1; - KEYBOARD_DEBUG_PRINT(" mouse set scaling 2:1 "); + PrintDebug(" mouse set scaling 2:1 "); state->mouse_state=STREAM1; return 0; // not done break; @@ -673,26 +671,26 @@ int mouse_write_output(struct vm_device *dev, uchar_t data) PushToOutputQueue(dev,0xfa,OVERWRITE,DATA,MOUSE) ; state->mouse_done_after_ack=1; state->mouse_needs_ack=1; - KEYBOARD_DEBUG_PRINT(" mouse set scaling 1:1 "); + PrintDebug(" mouse set scaling 1:1 "); state->mouse_state=STREAM1; return 0; // done break; default: - KEYBOARD_DEBUG_PRINT(" 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: - KEYBOARD_DEBUG_PRINT(" 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; } - KEYBOARD_DEBUG_PRINT(" HUH? "); + PrintDebug(" HUH? "); return 1; // done } @@ -706,11 +704,11 @@ int keyboard_write_delay(ushort_t port, { if (length == 1) { - KEYBOARD_DEBUG_PRINT("keyboard: write of 0x%x to 80h\n", *((uchar_t*)src)); + PrintDebug("keyboard: write of 0x%x to 80h\n", *((uchar_t*)src)); return 1; } else { - KEYBOARD_DEBUG_PRINT("keyboard: write of >1 byte to 80h\n", *((uchar_t*)src)); + PrintDebug("keyboard: write of >1 byte to 80h\n", *((uchar_t*)src)); return length; } @@ -725,11 +723,11 @@ int keyboard_read_delay(ushort_t port, if (length == 1) { *((uchar_t*)dest) = In_Byte(port); - KEYBOARD_DEBUG_PRINT("keyboard: read of 0x%x from 80h\n", *((uchar_t*)dest)); + PrintDebug("keyboard: read of 0x%x from 80h\n", *((uchar_t*)dest)); return 1; } else { - KEYBOARD_DEBUG_PRINT("keyboard: read of >1 byte from 80h\n"); + PrintDebug("keyboard: read of >1 byte from 80h\n"); return length; } @@ -751,29 +749,29 @@ int keyboard_write_command(ushort_t port, // Should always be single byte write if (length != 1) { - KEYBOARD_DEBUG_PRINT("keyboard: write of >1 bytes (%d) to 64h\n", length); + PrintError("keyboard: write of >1 bytes (%d) to 64h\n", length); return -1; } cmd = *((uchar_t*)src); if (state->state != NORMAL) { - KEYBOARD_DEBUG_PRINT("keyboard: warning - receiving command on 64h but state != NORMAL\n"); + PrintDebug("keyboard: warning - receiving command on 64h but state != NORMAL\n"); } - KEYBOARD_DEBUG_PRINT("keyboard: command 0x%x on 64h\n", cmd); + PrintDebug("keyboard: command 0x%x on 64h\n", cmd); switch (cmd) { 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 - KEYBOARD_DEBUG_PRINT("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) state->state = WRITING_CMD_BYTE; // we need to make sure we send the next 0x60 byte appropriately - KEYBOARD_DEBUG_PRINT("keyboard: prepare to write command byte\n"); + PrintDebug("keyboard: prepare to write command byte\n"); break; // case 0x90-9f - write to output port (?) @@ -781,19 +779,19 @@ int keyboard_write_command(ushort_t port, case 0xa1: // Get version number PushToOutputQueue(dev, 0, OVERWRITE, COMMAND,KEYBOARD); state->state = NORMAL; - KEYBOARD_DEBUG_PRINT("keyboard: version number 0x0 returned\n"); + 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); - KEYBOARD_DEBUG_PRINT("keyboard: password not installed\n"); + PrintDebug("keyboard: password not installed\n"); state->state = NORMAL; break; case 0xa5: // new password will arrive on 0x60 state->state = TRANSMIT_PASSWD; - KEYBOARD_DEBUG_PRINT("keyboard: pepare to transmit password\n"); + PrintDebug("keyboard: pepare to transmit password\n"); break; case 0xa6: // check passwd; @@ -801,107 +799,107 @@ int keyboard_write_command(ushort_t port, // the implication is that any password check immediately succeeds // with a blank password state->state = NORMAL; - KEYBOARD_DEBUG_PRINT("keyboard: password check succeeded\n"); + PrintDebug("keyboard: password check succeeded\n"); break; case 0xa7: // disable mouse state->cmd_byte |= CMD_MOUSE_DISABLE; state->state = NORMAL; - KEYBOARD_DEBUG_PRINT("keyboard: mouse disabled\n"); + PrintDebug("keyboard: mouse disabled\n"); break; case 0xa8: // enable mouse state->cmd_byte &= ~CMD_MOUSE_DISABLE; state->state = NORMAL; - KEYBOARD_DEBUG_PRINT("keyboard: mouse enabled\n"); + PrintDebug("keyboard: mouse enabled\n"); break; case 0xa9: // mouse interface test (always succeeds) PushToOutputQueue(dev, 0, OVERWRITE,COMMAND,KEYBOARD); - KEYBOARD_DEBUG_PRINT("keyboard: mouse interface test succeeded\n"); + PrintDebug("keyboard: mouse interface test succeeded\n"); state->state = NORMAL; break; case 0xaa: // controller self test (always succeeds) PushToOutputQueue(dev, 0x55, OVERWRITE, COMMAND,KEYBOARD); - KEYBOARD_DEBUG_PRINT("keyboard: controller self test succeeded\n"); + PrintDebug("keyboard: controller self test succeeded\n"); state->state = NORMAL; break; case 0xab: // keyboard interface test (always succeeds) PushToOutputQueue(dev, 0, OVERWRITE, COMMAND,KEYBOARD); state->state = NORMAL; - KEYBOARD_DEBUG_PRINT("keyboard: keyboard interface test succeeded\n"); + PrintDebug("keyboard: keyboard interface test succeeded\n"); break; case 0xad: // disable keyboard state->cmd_byte |= CMD_DISABLE; state->state = NORMAL; - KEYBOARD_DEBUG_PRINT("keyboard: keyboard disabled\n"); + PrintDebug("keyboard: keyboard disabled\n"); break; case 0xae: // enable keyboard state->cmd_byte &= ~CMD_DISABLE; state->state = NORMAL; - KEYBOARD_DEBUG_PRINT("keyboard: keyboard enabled\n"); + PrintDebug("keyboard: keyboard enabled\n"); break; case 0xaf: // get version PushToOutputQueue(dev, 0x00, OVERWRITE, COMMAND,KEYBOARD); state->state = NORMAL; - KEYBOARD_DEBUG_PRINT("keyboard: version 0 returned \n"); + PrintDebug("keyboard: version 0 returned \n"); break; case 0xd0: // return microcontroller output on 60h PushToOutputQueue(dev,state->output_byte,OVERWRITE,COMMAND,KEYBOARD); state->state = NORMAL; - KEYBOARD_DEBUG_PRINT("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 state->state = WRITING_OUTPUT_PORT; - KEYBOARD_DEBUG_PRINT("keyboard: prepare to write output byte\n"); + PrintDebug("keyboard: prepare to write output byte\n"); break; case 0xd2: // write keyboard buffer (inject key) state->state = INJECTING_KEY; - KEYBOARD_DEBUG_PRINT("keyboard: prepare to inject key\n"); + PrintDebug("keyboard: prepare to inject key\n"); break; case 0xd3: // write mouse buffer (inject mouse) state->state = INJECTING_MOUSE; - KEYBOARD_DEBUG_PRINT("keyboard: prepare to inject mouse\n"); + PrintDebug("keyboard: prepare to inject mouse\n"); break; case 0xd4: // write mouse device (command to mouse?) state->state = IN_MOUSE; - KEYBOARD_DEBUG_PRINT("keyboard: prepare to inject mouse command\n"); + PrintDebug("keyboard: prepare to inject mouse command\n"); break; case 0xc0: // read input port PushToOutputQueue(dev,state->input_byte,OVERWRITE,COMMAND,KEYBOARD); state->state=NORMAL; - KEYBOARD_DEBUG_PRINT("keyboard: input byte 0x%x returned\n",state->input_byte); + 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; - KEYBOARD_DEBUG_PRINT("keyboard: copied input byte lsn to status msn\n"); + 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; - KEYBOARD_DEBUG_PRINT("keyboard: copied input byte msn to status msn\n"); + 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; - KEYBOARD_DEBUG_PRINT("keyboard: read 0x%x from test port\n",state->output_byte>>6); + PrintDebug("keyboard: read 0x%x from test port\n",state->output_byte>>6); break; @@ -922,14 +920,14 @@ int keyboard_write_command(ushort_t port, case 0xfe: case 0xff: - KEYBOARD_DEBUG_PRINT("keyboard: ignoring pulse of 0x%x (low=pulsed) on output port\n",cmd&0xf); + PrintDebug("keyboard: ignoring pulse of 0x%x (low=pulsed) on output port\n",cmd&0xf); state->state=NORMAL; break; // case ac diagonstic - returns 16 bytes from keyboard microcontroler on 60h default: - KEYBOARD_DEBUG_PRINT("keyboard: ignoring command (unimplemented)\n"); + PrintDebug("keyboard: ignoring command (unimplemented)\n"); state->state = NORMAL; break; } @@ -947,15 +945,15 @@ int keyboard_read_status(ushort_t port, if (length == 1) { - KEYBOARD_DEBUG_PRINT("keyboard: read status (64h): "); + PrintDebug("keyboard: read status (64h): "); *((uchar_t*)dest) = state->status_byte; - KEYBOARD_DEBUG_PRINT("0x%x\n", *((uchar_t*)dest)); + PrintDebug("0x%x\n", *((uchar_t*)dest)); return 1; } else { - KEYBOARD_DEBUG_PRINT("keyboard: >1 byte read for status (64h)\n"); + PrintError("keyboard: >1 byte read for status (64h)\n"); return -1; } } @@ -968,49 +966,49 @@ int keyboard_write_output(ushort_t port, struct keyboard_internal *state = (struct keyboard_internal *)(dev->private_data); if (length != 1) { - KEYBOARD_DEBUG_PRINT("keyboard: write of 60h with >1 byte\n"); + PrintError("keyboard: write of 60h with >1 byte\n"); return -1; } uchar_t data = *((uchar_t*)src); - KEYBOARD_DEBUG_PRINT("keyboard: output 0x%x on 60h\n", data); + PrintDebug("keyboard: output 0x%x on 60h\n", data); switch (state->state) { case WRITING_CMD_BYTE: state->cmd_byte = data; state->state = NORMAL; - KEYBOARD_DEBUG_PRINT("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; - KEYBOARD_DEBUG_PRINT("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() state->state = NORMAL; - KEYBOARD_DEBUG_PRINT("keyboard: injected key 0x%x\n",data); + PrintDebug("keyboard: injected key 0x%x\n",data); break; case INJECTING_MOUSE: - KEYBOARD_DEBUG_PRINT("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: - KEYBOARD_DEBUG_PRINT("keyboard: mouse action: "); + PrintDebug("keyboard: mouse action: "); if (mouse_write_output(dev,data)) { state->state=NORMAL; } - KEYBOARD_DEBUG_PRINT("\n"); + PrintDebug("\n"); break; case TRANSMIT_PASSWD: if (data) { //ignore passwd - KEYBOARD_DEBUG_PRINT("keyboard: ignoring password character 0x%x\n",data); + PrintDebug("keyboard: ignoring password character 0x%x\n",data); } else { // end of password state->state = NORMAL; - KEYBOARD_DEBUG_PRINT("keyboard: done with password\n"); + PrintDebug("keyboard: done with password\n"); } break; case NORMAL: @@ -1020,7 +1018,7 @@ int keyboard_write_output(ushort_t port, case 0xff: // reset PushToOutputQueue(dev, 0xfa, OVERWRITE, COMMAND,KEYBOARD); // ack state->state = RESET; - KEYBOARD_DEBUG_PRINT("keyboard: reset complete and acked\n",data); + PrintDebug("keyboard: reset complete and acked\n",data); break; case 0xf5: // disable scanning case 0xf4: // enable scanning @@ -1028,7 +1026,7 @@ int keyboard_write_output(ushort_t port, PushToOutputQueue(dev, 0xfa, OVERWRITE, COMMAND,KEYBOARD); // should do something here... PAD state->state = NORMAL; - KEYBOARD_DEBUG_PRINT("keyboard: %s scanning done and acked\n",data==0xf5 ? "disable" : "enable", data); + PrintDebug("keyboard: %s scanning done and acked\n",data==0xf5 ? "disable" : "enable", data); break; case 0xfe: // resend case 0xfd: // set key type make @@ -1040,17 +1038,17 @@ int keyboard_write_output(ushort_t port, case 0xf7: // set all typemaktic case 0xf6: // set defaults case 0xf3: // set typematic delay/rate - KEYBOARD_DEBUG_PRINT("keyboard: unhandled known command 0x%x on output buffer (60h)\n", data); + PrintDebug("keyboard: unhandled known command 0x%x on output buffer (60h)\n", data); break; default: - KEYBOARD_DEBUG_PRINT("keyboard: unhandled unknown command 0x%x on output buffer (60h)\n", data); + PrintDebug("keyboard: unhandled unknown command 0x%x on output buffer (60h)\n", data); state->status_byte |= 0x1; break; } break; } default: - KEYBOARD_DEBUG_PRINT("keyboard: unknown state %x on command 0x%x on output buffer (60h)\n", state->state, data); + PrintDebug("keyboard: unknown state %x on command 0x%x on output buffer (60h)\n", state->state, data); } return 1; @@ -1067,7 +1065,7 @@ int keyboard_read_input(ushort_t port, uchar_t data; int done_mouse; - KEYBOARD_DEBUG_PRINT("keyboard: read from input (60h): "); + PrintDebug("keyboard: read from input (60h): "); if (state->state==IN_MOUSE) { done_mouse=mouse_read_input(dev); @@ -1083,16 +1081,16 @@ int keyboard_read_input(ushort_t port, // now we will ready ourselves to deliver the BAT code (success) PushToOutputQueue(dev, 0xaa, OVERWRITE,COMMAND,KEYBOARD); state->state = NORMAL; - KEYBOARD_DEBUG_PRINT(" (in reset, pushing BAT test code 0xaa) "); + PrintDebug(" (in reset, pushing BAT test code 0xaa) "); } - KEYBOARD_DEBUG_PRINT("0x%x\n", data); + PrintDebug("0x%x\n", data); *((uchar_t*)dest) = data; return 1; } else { - KEYBOARD_DEBUG_PRINT("keyboard: unknown size read from input (60h)\n"); + PrintError("keyboard: unknown size read from input (60h)\n"); return -1; } } @@ -1100,7 +1098,7 @@ int keyboard_read_input(ushort_t port, int keyboard_interrupt(uint_t irq, struct vm_device * dev) { - KEYBOARD_DEBUG_PRINT("keyboard: interrupt 0x%x\n",irq); + PrintDebug("keyboard: interrupt 0x%x\n",irq); dev->vm->vm_ops.raise_irq(dev->vm, irq); @@ -1114,7 +1112,7 @@ int keyboard_init_device(struct vm_device * dev) // struct keyboard_internal *data = (struct keyboard_internal *) dev->private_data; - KEYBOARD_DEBUG_PRINT("keyboard: init_device\n"); + PrintDebug("keyboard: init_device\n"); // Would read state here @@ -1167,7 +1165,7 @@ static struct vm_device_ops dev_ops = { struct vm_device *create_keyboard() { if (thekeyboard != NULL) { - KEYBOARD_DEBUG_PRINT("keyboard: creating >1 keyboard device. This will probably fail!\n"); + PrintDebug("keyboard: creating >1 keyboard device. This will probably fail!\n"); } struct keyboard_internal * keyboard_state = (struct keyboard_internal *)V3_Malloc(sizeof(struct keyboard_internal));