#include <palacios/vmm.h>
#include <palacios/vmm_types.h>
-#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
return 0;
} else {
- KEYBOARD_DEBUG_PRINT("keyboard: PushToOutputQueue Failed - Queue Full\n");
+ PrintError("keyboard: PushToOutputQueue Failed - Queue Full\n");
return -1;
}
}
return 0;
} else {
- KEYBOARD_DEBUG_PRINT("keyboard: PullFromOutputQueue Failed - Queue Empty\n");
+ PrintError("keyboard: PullFromOutputQueue Failed - Queue Empty\n");
return -1;
}
}
return 0;
} else {
- KEYBOARD_DEBUG_PRINT("keyboard: PushToOutputQueue Failed - Queue Full\n");
+ PrintError("keyboard: PushToOutputQueue Failed - Queue Full\n");
return -1;
}
}
return 0;
} else {
- KEYBOARD_DEBUG_PRINT("keyboard: PullFromInputQueue Failed - Queue Empty\n");
-
+ PrintError("keyboard: PullFromInputQueue Failed - Queue Empty\n");
return -1;
}
}
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
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);
- KEYBOARD_DEBUG_PRINT("keyboard: reset device\n");
+ PrintDebug("keyboard: reset device\n");
return 0;
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;
}
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;
}
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;
*/
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;
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;
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;
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;
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;
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;
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;
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;
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;
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;
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;
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;
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;
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;
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
}
{
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;
}
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;
}
// 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 (?)
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;
// 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;
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;
}
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;
}
}
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:
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
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
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;
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);
// 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;
}
}
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);
// 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
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));
*host_pa = (addr_t)(os_hooks)->vaddr_to_paddr((void *)host_va);
if (*host_pa == 0) {
- PrintDebug("In HVA->HPA: Invalid HVA(%x)->HPA lookup\n", host_va);
+ PrintError("In HVA->HPA: Invalid HVA(%x)->HPA lookup\n", host_va);
return -1;
}
} else {
- PrintDebug("In HVA->HPA: os_hooks not defined\n");
+ PrintError("In HVA->HPA: os_hooks not defined\n");
return -1;
}
return 0;
*host_va = (addr_t)(os_hooks)->paddr_to_vaddr((void *)host_pa);
if (*host_va == 0) {
- PrintDebug("In HPA->HVA: Invalid HPA(%x)->HVA lookup\n", host_pa);
+ PrintError("In HPA->HVA: Invalid HPA(%x)->HVA lookup\n", host_pa);
return -1;
}
} else {
- PrintDebug("In HPA->HVA: os_hooks not defined\n");
+ PrintError("In HPA->HVA: os_hooks not defined\n");
return -1;
}
return 0;
int guest_pa_to_host_pa(struct guest_info * guest_info, addr_t guest_pa, addr_t * host_pa) {
// we use the shadow map here...
if (lookup_shadow_map_addr(&(guest_info->mem_map), guest_pa, host_pa) != HOST_REGION_PHYSICAL_MEMORY) {
- PrintDebug("In GPA->HPA: Could not find address in shadow map (addr=%x)\n", guest_pa);
+ PrintError("In GPA->HPA: Could not find address in shadow map (addr=%x)\n", guest_pa);
return -1;
}
//
int host_pa_to_guest_pa(struct guest_info * guest_info, addr_t host_pa, addr_t * guest_pa) {
*guest_pa = 0;
- PrintDebug("ERROR!!! HPA->GPA currently not implemented!!!\n");
+ PrintError("ERROR!!! HPA->GPA currently not implemented!!!\n");
return -1;
}
*guest_pa = 0;
if (host_va_to_host_pa(host_va, &host_pa) != 0) {
- PrintDebug("In HVA->GPA: Invalid HVA(%x)->HPA lookup\n", host_va);
+ PrintError("In HVA->GPA: Invalid HVA(%x)->HPA lookup\n", host_va);
return -1;
}
if (host_pa_to_guest_pa(guest_info, host_pa, guest_pa) != 0) {
- PrintDebug("In HVA->GPA: Invalid HPA(%x)->GPA lookup\n", host_pa);
+ PrintError("In HVA->GPA: Invalid HPA(%x)->GPA lookup\n", host_pa);
return -1;
}
*host_va = 0;
if (guest_pa_to_host_pa(guest_info, guest_pa, &host_pa) != 0) {
- PrintDebug("In GPA->HVA: Invalid GPA(%x)->HPA lookup\n", guest_pa);
+ PrintError("In GPA->HVA: Invalid GPA(%x)->HPA lookup\n", guest_pa);
return -1;
}
if (host_pa_to_host_va(host_pa, host_va) != 0) {
- PrintDebug("In GPA->HVA: Invalid HPA(%x)->HVA lookup\n", host_pa);
+ PrintError("In GPA->HVA: Invalid HPA(%x)->HVA lookup\n", host_pa);
return -1;
}
}
if (guest_pa_to_host_va(guest_info, guest_pde, (addr_t *)&pde) == -1) {
- PrintDebug("In GVA->GPA: Invalid GPA(%x)->HVA PDE32 lookup\n", guest_pde);
+ PrintError("In GVA->GPA: Invalid GPA(%x)->HVA PDE32 lookup\n", guest_pde);
return -1;
}
if (guest_pa_to_host_va(guest_info, tmp_pa, (addr_t*)&pte) == -1) {
- PrintDebug("In GVA->GPA: Invalid GPA(%x)->HVA PTE32 lookup\n", guest_pa);
+ PrintError("In GVA->GPA: Invalid GPA(%x)->HVA PTE32 lookup\n", guest_pa);
return -1;
}
- PrintDebug("PTE host addr=%x, GVA=%x, GPA=%x(should be 0)\n", pte, guest_va, *guest_pa);
-
+ //PrintDebug("PTE host addr=%x, GVA=%x, GPA=%x(should be 0)\n", pte, guest_va, *guest_pa);
+
if (pte32_lookup(pte, guest_va, guest_pa) != 0) {
- PrintDebug("In GVA->GPA: PTE32 Lookup failure GVA=%x; PTE=%x\n", guest_va, pte);
+ PrintError("In GVA->GPA: PTE32 Lookup failure GVA=%x; PTE=%x\n", guest_va, pte);
// PrintPT32(PDE32_INDEX(guest_va) << 22, pte);
return -1;
}
*/
int guest_pa_to_guest_va(struct guest_info * guest_info, addr_t guest_pa, addr_t * guest_va) {
*guest_va = 0;
- PrintDebug("ERROR!!: GPA->GVA Not Implemented!!\n");
+ PrintError("ERROR!!: GPA->GVA Not Implemented!!\n");
return -1;
}
*host_pa = 0;
if (guest_va_to_guest_pa(guest_info, guest_va, &guest_pa) != 0) {
- PrintDebug("In GVA->HPA: Invalid GVA(%x)->GPA lookup\n", guest_va);
+ PrintError("In GVA->HPA: Invalid GVA(%x)->GPA lookup\n", guest_va);
return -1;
}
if (guest_pa_to_host_pa(guest_info, guest_pa, host_pa) != 0) {
- PrintDebug("In GVA->HPA: Invalid GPA(%x)->HPA lookup\n", guest_pa);
+ PrintError("In GVA->HPA: Invalid GPA(%x)->HPA lookup\n", guest_pa);
return -1;
}
*guest_va = 0;
if (host_pa_to_guest_pa(guest_info, host_pa, &guest_pa) != 0) {
- PrintDebug("In HPA->GVA: Invalid HPA(%x)->GPA lookup\n", host_pa);
+ PrintError("In HPA->GVA: Invalid HPA(%x)->GPA lookup\n", host_pa);
return -1;
}
if (guest_pa_to_guest_va(guest_info, guest_pa, guest_va) != 0) {
- PrintDebug("In HPA->GVA: Invalid GPA(%x)->GVA lookup\n", guest_pa);
+ PrintError("In HPA->GVA: Invalid GPA(%x)->GVA lookup\n", guest_pa);
return -1;
}
*host_va = 0;
if (guest_va_to_guest_pa(guest_info, guest_va, &guest_pa) != 0) {
- PrintDebug("In GVA->HVA: Invalid GVA(%x)->GPA lookup\n", guest_va);
+ PrintError("In GVA->HVA: Invalid GVA(%x)->GPA lookup\n", guest_va);
return -1;
}
if (guest_pa_to_host_pa(guest_info, guest_pa, &host_pa) != 0) {
- PrintDebug("In GVA->HVA: Invalid GPA(%x)->HPA lookup\n", guest_pa);
+ PrintError("In GVA->HVA: Invalid GPA(%x)->HPA lookup\n", guest_pa);
return -1;
}
if (host_pa_to_host_va(host_pa, host_va) != 0) {
- PrintDebug("In GVA->HVA: Invalid HPA(%x)->HVA lookup\n", host_pa);
+ PrintError("In GVA->HVA: Invalid HPA(%x)->HVA lookup\n", host_pa);
return -1;
}
*guest_va = 0;
if (host_va_to_host_pa(host_va, &host_pa) != 0) {
- PrintDebug("In HVA->GVA: Invalid HVA(%x)->HPA lookup\n", host_va);
+ PrintError("In HVA->GVA: Invalid HVA(%x)->HPA lookup\n", host_va);
return -1;
}
if (host_pa_to_guest_pa(guest_info, host_pa, &guest_pa) != 0) {
- PrintDebug("In HVA->GVA: Invalid HPA(%x)->GPA lookup\n", host_va);
+ PrintError("In HVA->GVA: Invalid HPA(%x)->GPA lookup\n", host_va);
return -1;
}
if (guest_pa_to_guest_va(guest_info, guest_pa, guest_va) != 0) {
- PrintDebug("In HVA->GVA: Invalid GPA(%x)->GVA lookup\n", guest_pa);
+ PrintError("In HVA->GVA: Invalid GPA(%x)->GVA lookup\n", guest_pa);
return -1;
}
int bytes_to_copy = (dist_to_pg_edge > count) ? count : dist_to_pg_edge;
addr_t host_addr = 0;
-
-
- /* JRL FIXME:
- * This should be somewhere else....
- */
- /*
- addr_t tmp_addr;
-
- addr_t shadow_pde = CR3_TO_PDE32(guest_info->shdw_pg_state.shadow_cr3);
-
- // Check the Shadow Page Tables first (Virtual TLB)
- if (pt32_lookup((pde32_t *)shadow_pde, cursor, &tmp_addr) == 0) {
- host_addr = tmp_addr;
-
- if (host_pa_to_host_va(tmp_addr, &host_addr) != 0) {
- return bytes_read;
- }
- } else {
-
- // No entry in the VTLB, do a guest page table walk
-
- if (guest_va_to_host_va(guest_info, cursor, &host_addr) != 0) {
- PrintDebug("Invalid GVA(%x)->HVA lookup\n", cursor);
- return bytes_read;
- }
- }
-*/
- /* JRL: END GRUESOME HACK */
-
-
if (guest_va_to_host_va(guest_info, cursor, &host_addr) != 0) {
PrintDebug("Invalid GVA(%x)->HVA lookup\n", cursor);
