X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fkeyboard.c;h=3d52f4e9bd16405d89b6f8f7f577473f2567ece0;hb=a46778669bb94bcf6b0a05646123ff748cfe86be;hp=4173bdad41b14ea911f390bd2f2c6b3b24cdbbfc;hpb=4ff30ea8c58054ae54c8f3eaf7ce35020dcc6d1f;p=palacios.git diff --git a/palacios/src/devices/keyboard.c b/palacios/src/devices/keyboard.c index 4173bda..3d52f4e 100644 --- a/palacios/src/devices/keyboard.c +++ b/palacios/src/devices/keyboard.c @@ -1,17 +1,34 @@ +/* + * 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 + * Copyright (c) 2008, The V3VEE Project + * All rights reserved. + * + * Author: Peter Dinda + * + * This is free software. You are permitted to use, + * redistribute, and modify it as specified in the file "V3VEE_LICENSE". + */ + #include -#include #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 @@ -81,8 +98,6 @@ #define MOUSE 1 -// The currently targetted keyboard -static struct vm_device *thekeyboard = NULL; //#define QUEUE_SIZE 32 @@ -197,7 +212,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); @@ -223,7 +238,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; } } @@ -233,11 +248,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; @@ -257,7 +272,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; } } @@ -268,7 +283,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); @@ -280,7 +295,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; } } @@ -291,7 +306,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) { @@ -301,56 +316,59 @@ 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; } } #endif -static struct vm_device *demultiplex_injected_key(uchar_t status, uchar_t scancode) -{ - // this currently does nothing - return thekeyboard; -} -static struct vm_device *demultiplex_injected_mouse(uchar_t mouse_packet[3]) -{ - // this currently does nothing - return thekeyboard; + + +int keyboard_interrupt(struct vm_device * dev, uint_t irq) { + PrintDebug("keyboard: interrupt 0x%x\n", irq); + + v3_raise_irq(dev->vm, irq); + + return 0; + } -int keyboard_interrupt(uint_t irq, struct vm_device * dev); -void deliver_key_to_vmm(uchar_t status, uchar_t scancode) -{ - struct vm_device *dev = demultiplex_injected_key(status, scancode); + +int key_event_handler(struct guest_info * info, + struct v3_keyboard_event * evt, + void * private_data) { + struct vm_device * dev = (struct vm_device *)private_data; 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", evt->status, evt->scan_code); if ( (state->status_byte & STATUS_ENABLED) // onboard is enabled && (!(state->cmd_byte & CMD_DISABLE)) ) { // keyboard is enabled - - PushToOutputQueue(dev, scancode, OVERWRITE, DATA, KEYBOARD); - + + PushToOutputQueue(dev, evt->scan_code, OVERWRITE, DATA, KEYBOARD); + if (state->cmd_byte & CMD_INTR) { - keyboard_interrupt(KEYBOARD_IRQ, dev); + keyboard_interrupt(dev, KEYBOARD_IRQ); } - } + + return 0; } -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); +int mouse_event_handler(struct guest_info * info, + struct v3_mouse_event * evt, + void * private_data) { + struct vm_device * dev = (struct vm_device *)private_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", + evt->data[0], evt->data[1], evt->data[2]); - memcpy(state->mouse_packet,data,3); + memcpy(state->mouse_packet, evt->data, 3); state->status_byte |= STATUS_MOUSE_BUFFER_FULL; @@ -360,13 +378,15 @@ 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(dev, MOUSE_IRQ); } break; default: + return -1; break; } + return 0; } @@ -377,28 +397,27 @@ 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 - KEYBOARD_DEBUG_PRINT("keyboard: reset device\n"); + PrintDebug("keyboard: reset device\n"); return 0; @@ -408,14 +427,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; } @@ -425,7 +444,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; @@ -435,88 +455,113 @@ 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) "); - state->mouse_state=RESET2; + PushToOutputQueue(dev, 0xaa, OVERWRITE, DATA, MOUSE) ; // BAT successful + 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 "); - state->mouse_state=STREAM1; + PushToOutputQueue(dev, 0x00, OVERWRITE, DATA, MOUSE) ; // normal mouse type + 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 "); - state->mouse_state=STREAM2; + PushToOutputQueue(dev, state->mouse_packet[0], OVERWRITE, DATA, MOUSE); + 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 "); - state->mouse_state=STREAM3; + PushToOutputQueue(dev, state->mouse_packet[1], OVERWRITE, DATA, MOUSE); + 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 "); - state->mouse_state=STREAM1; + PushToOutputQueue(dev, state->mouse_packet[2], OVERWRITE, DATA, MOUSE); + 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 "); - state->mouse_state=REMOTE2; + PushToOutputQueue(dev, state->mouse_packet[0], OVERWRITE, DATA, MOUSE); + 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 "); - state->mouse_state=REMOTE3; + PushToOutputQueue(dev, state->mouse_packet[1], OVERWRITE, DATA, MOUSE); + 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 "); - state->mouse_state=REMOTE1; + PushToOutputQueue(dev, state->mouse_packet[2], OVERWRITE, DATA, MOUSE); + 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 "); - state->mouse_state=STATUS2; + PushToOutputQueue(dev, 0x0, OVERWRITE, DATA, MOUSE); + 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 "); - state->mouse_state=STATUS3; + PushToOutputQueue(dev, 0x0, OVERWRITE, DATA, MOUSE); + 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 "); - state->mouse_state=STREAM1; + PushToOutputQueue(dev, 0x0, OVERWRITE, DATA, MOUSE); + 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 "); - state->mouse_state=STREAM1; + PushToOutputQueue(dev, 0x0, OVERWRITE, DATA, MOUSE); + 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; } } -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: @@ -528,15 +573,16 @@ int mouse_write_output(struct vm_device *dev, uchar_t data) switch (data) { case 0xff: //reset - PushToOutputQueue(dev,0xfe,OVERWRITE,DATA,MOUSE) ; // no mouse! - KEYBOARD_DEBUG_PRINT(" mouse reset begins (no mouse) "); + PushToOutputQueue(dev, 0xfe, OVERWRITE, DATA, MOUSE) ; // 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; @@ -544,155 +590,155 @@ int mouse_write_output(struct vm_device *dev, uchar_t data) break; */ case 0xfe: //resend - PushToOutputQueue(dev,0xfa,OVERWRITE,DATA,MOUSE) ; - KEYBOARD_DEBUG_PRINT(" mouse resend begins "); - state->mouse_done_after_ack=0; - state->mouse_needs_ack=0; - state->mouse_state=STREAM1; + 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; return 0; // not done break; case 0xf6: // set defaults - PushToOutputQueue(dev,0xfa,OVERWRITE,DATA,MOUSE) ; - KEYBOARD_DEBUG_PRINT(" mouse set defaults "); - state->mouse_done_after_ack=1; - state->mouse_needs_ack=1; - state->mouse_state=STREAM1; + 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; 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; - KEYBOARD_DEBUG_PRINT(" mouse disable data reporting "); - state->mouse_state=STREAM1; + 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; 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; - KEYBOARD_DEBUG_PRINT(" mouse enable data reporting "); - state->mouse_state=STREAM1; + 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; 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; - KEYBOARD_DEBUG_PRINT(" mouse set sample rate begins "); - state->mouse_state=SAMPLE1; + 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; 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; - KEYBOARD_DEBUG_PRINT(" mouse get device id begins "); - state->mouse_state=DEVICE1; + 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; 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; - KEYBOARD_DEBUG_PRINT(" mouse set remote mode "); - state->mouse_state=REMOTE1; + 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; 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; - KEYBOARD_DEBUG_PRINT(" mouse set wrap mode (ignored) "); - state->mouse_state=STREAM1; + 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; 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; - KEYBOARD_DEBUG_PRINT(" mouse reset wrap mode (ignored) "); - state->mouse_state=STREAM1; + 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; 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; - KEYBOARD_DEBUG_PRINT(" mouse switch to wrap mode (ignored) "); - state->mouse_state=REMOTE1; + 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; 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; - KEYBOARD_DEBUG_PRINT(" mouse set stream mode "); - state->mouse_state=STREAM1; + 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; 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; - KEYBOARD_DEBUG_PRINT(" mouse status request begins "); - state->mouse_state=STATUS1; + 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; 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; - KEYBOARD_DEBUG_PRINT(" mouse set resolution begins "); - state->mouse_state=SETRES1; + 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; 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; - KEYBOARD_DEBUG_PRINT(" mouse set scaling 2:1 "); - state->mouse_state=STREAM1; + 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; 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; - KEYBOARD_DEBUG_PRINT(" mouse set scaling 1:1 "); - state->mouse_state=STREAM1; + 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; 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 +752,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; } @@ -723,13 +769,13 @@ int keyboard_read_delay(ushort_t port, { if (length == 1) { - *((uchar_t*)dest) = In_Byte(port); + *((uchar_t*)dest) = v3_inb(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,49 +797,49 @@ 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 (?) case 0xa1: // Get version number - PushToOutputQueue(dev, 0, OVERWRITE, COMMAND,KEYBOARD); + 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"); + PushToOutputQueue(dev, 0xf1, OVERWRITE, COMMAND, KEYBOARD); + 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 +847,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"); + 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); - KEYBOARD_DEBUG_PRINT("keyboard: controller self test succeeded\n"); + 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; - 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); + 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); + 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); + 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; - KEYBOARD_DEBUG_PRINT("keyboard: copied input byte lsn to status msn\n"); + 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; - KEYBOARD_DEBUG_PRINT("keyboard: copied input byte msn to status msn\n"); + 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; - KEYBOARD_DEBUG_PRINT("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; @@ -922,14 +968,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); - state->state=NORMAL; + 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 +993,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 +1014,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() + 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: "); - if (mouse_write_output(dev,data)) { - state->state=NORMAL; + 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: @@ -1018,17 +1064,17 @@ 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; - 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 // ack - PushToOutputQueue(dev, 0xfa, OVERWRITE, COMMAND,KEYBOARD); + 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 +1086,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,12 +1113,12 @@ 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); + if (state->state == IN_MOUSE) { + done_mouse = mouse_read_input(dev); if (done_mouse) { - state->state=NORMAL; + state->state = NORMAL; } } @@ -1081,32 +1127,24 @@ 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; - 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); - - dev->vm->vm_ops.raise_irq(dev->vm, irq); - return 0; - -} int keyboard_init_device(struct vm_device * dev) @@ -1114,7 +1152,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 @@ -1124,6 +1162,10 @@ int keyboard_init_device(struct vm_device * dev) dev_hook_io(dev, KEYBOARD_64H, &keyboard_read_status, &keyboard_write_command); dev_hook_io(dev, KEYBOARD_60H, &keyboard_read_input, &keyboard_write_output); + v3_hook_host_event(dev->vm, HOST_KEYBOARD_EVT, V3_HOST_EVENT_HANDLER(key_event_handler), dev); + v3_hook_host_event(dev->vm, HOST_MOUSE_EVT, V3_HOST_EVENT_HANDLER(mouse_event_handler), dev); + + #if KEYBOARD_DEBUG_80H dev_hook_io(dev, KEYBOARD_DELAY_80H, &keyboard_read_delay, &keyboard_write_delay); #endif @@ -1165,16 +1207,12 @@ 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"); - } - - struct keyboard_internal * keyboard_state = (struct keyboard_internal *)V3_Malloc(sizeof(struct keyboard_internal)); + struct keyboard_internal * keyboard_state = NULL; + + keyboard_state = (struct keyboard_internal *)V3_Malloc(sizeof(struct keyboard_internal)); struct vm_device *device = create_device("KEYBOARD", &dev_ops, keyboard_state); - thekeyboard = device; - + return device; }