X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fkeyboard.c;h=48c50d921b40f780268415bedc7cfaafff9bc358;hb=6a526b07791595d4cb052359672bcf21703ff9a4;hp=16fdda6b25d3b581a8865a321d8340faa01c259f;hpb=1610994b51177352af2e8f7c326d968d8974632a;p=palacios.git diff --git a/palacios/src/devices/keyboard.c b/palacios/src/devices/keyboard.c index 16fdda6..48c50d9 100644 --- a/palacios/src/devices/keyboard.c +++ b/palacios/src/devices/keyboard.c @@ -5,78 +5,293 @@ #define KEYBOARD_DEBUG 1 +#define KEYBOARD_DEBUG_80H 1 + #if KEYBOARD_DEBUG -#define KEYBOARD_DEBUG_PRINT(first, rest...) do { SerialPrint(first, ## rest ); } while (0) +#define KEYBOARD_DEBUG_PRINT(first, rest...) PrintDebug(first, ##rest) #else #define KEYBOARD_DEBUG_PRINT(first, rest...) #endif -extern struct vmm_os_hooks *os_hooks; +#define KEYBOARD_60H 0x60 // keyboard microcontroller +#define KEYBOARD_64H 0x64 // onboard microcontroller + +#define KEYBOARD_DELAY_80H 0x80 // written for timing + +#define KEYBOARD_IRQ 0x1 + + +// extract bits for status byte +#define STATUS_OUTPUT_BUFFER_FULL 0x01 // 1=full (data for system) +#define STATUS_INPUT_BUFFER_FULL 0x02 // 1=full (data for 8042) +#define STATUS_SYSTEM 0x04 // 1=self-test-passed +#define STATUS_COMMAND_DATA_AVAIL 0x08 // internal: 0=data on 60h, 0=cmd on 64h +#define STATUS_ENABLED 0x10 // 1=keyboard is enabled +#define STATUS_MOUSE_BUFFER_FULL 0x20 // 1= mouse output buffer full +#define STATUS_TIMEOUT 0x40 // 1=timeout of keybd +#define STATUS_PARITY 0x80 // 1=parity error + +// bits for cmd byte + +#define CMD_INTR 0x01 // 1=interrupts enabled +#define CMD_MOUSE_INTR 0x02 // 1=interrupts enabled for mouse +#define CMD_SYSTEM 0x04 // 1= self test passed +#define CMD_OVERRIDE 0x08 // FORCE 0 for PS2 +#define CMD_DISABLE 0x10 // 1=disabled keyboard +#define CMD_MOUSE_DISABLE 0x20 // 1=disabled mouse +#define CMD_SCANCODE_XLATE 0x40 // 1=translate to set 1 scancodes +#define CMD_RESERVED 0x80 // should be zero -extern void SerialPrint(const char *format, ...); +// bits for the output port +#define OUTPUT_RESET 0x01 // System reset on 0 +#define OUTPUT_A20 0x02 // A20 gate (1= A20 is gated) +#define OUTPUT_RES1 0x04 // reserved +#define OUTPUT_RES2 0x08 // reserved +#define OUTPUT_OUTPUT_FULL 0x10 // output buffer full +#define OUTPUT_INPUT_EMPTY 0x20 // input buffer empty +#define OUTPUT_KBD_CLOCK 0x40 // keyboard clock (?) +#define OUTPUT_KBD_DATA 0x80 // keyboard data -#define KEYBOARD_DATA_REG 0x60 -#define KEYBOARD_CONTROL_REG 0x64 +// bits for the input port -#define KEYBOARD_IRQ 0x1 +#define INPUT_RES0 0x01 // reserved +#define INPUT_RES1 0x02 // reserved +#define INPUT_RES2 0x04 // reserved +#define INPUT_RES3 0x08 // reserved +#define INPUT_RAM 0x10 // set to 1 if RAM exists? +#define INPUT_JUMPER 0x20 // manufacturing jumper? +#define INPUT_DISPLAY 0x40 // 0=color, 1=mono +#define INPUT_KBD_INHIBIT 0x80 // 1=inhibit keyboard ? +#define QUEUE 0 +#define OVERWRITE 1 +#define DATA 0 +#define COMMAND 1 + // The currently targetted keyboard -static struct vm_device *thekeyboard=NULL; +static struct vm_device *thekeyboard = NULL; struct keyboard_internal { - // read* is what is seen when reads are done from the VM - uchar_t read_status; - uchar_t read_scancode; - // write* is where we put the writes from the VM - uchar_t write_status; - uchar_t write_scancode; - - uchar_t status_byte; // for on-board uC - - uchar_t input_queue; // input queue is for communication *to* the on-board uC - uint_t input_queue_len; // num items queued - uchar_t output_queue; // output queue is for communcation *from* the on-board uC - uint_t output_queue_len; // num items queued + // + // 0x60 is the port for the keyboard microcontroller + // writes are commands + // reads from it usually return scancodes + // however, it can also return other data + // depending on the state of the onboard microcontroller + // + // 0x64 is the port for the onboard microcontroller + // writes are commands + // reads are status + // + + // state of the onboard microcontroller + // this is needed because sometimes 0x60 reads come + // from the onboard microcontroller + enum {// Normal mode measn we deliver keys + // to the vm and accept commands from it + NORMAL, + // after receiving cmd 0x60 + // keybaord uC cmd will subsequently arrive + WRITING_CMD_BYTE, + // after recieving 0xa5 + // password arrives on data port, null terminated + TRANSMIT_PASSWD, + // after having reset sent to 0x60 + // we immediately ack, and then + // push BAT success (0xaa) after the ack + RESET, + // after having a d1 sent to 64 + // we wait for a new output byte on 60 + WRITING_OUTPUT_PORT, + // after having a d2 sent to 64 + // we wait for a new output byte on 60 + // then make it available as a keystroke + INJECTING_KEY, + // after having a d3 sent to 64 + // we wait for a new output byte on 60 + // then make it available as a mouse event + INJECTING_MOUSE, + // after having a d4 sent to 64 + // we wait for a new output byte on 60 + // then send it to the mouse + WRITING_MOUSE_CMD, + } state; + + + + uchar_t cmd_byte; // for keyboard uC - read/written + // via read/write cmd byte command + uchar_t status_byte; // for on-board uC - read via 64h + + uchar_t output_byte; // output port of onboard uC (e.g. A20) + + uchar_t input_byte; // input port of onboard uC + + // Data for 8042 + uchar_t input_queue; // + uint_t input_queue_len; // + // Data for system + uchar_t output_queue; // + uint_t output_queue_len; // }; +// +// 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) +{ + struct keyboard_internal *state = (struct keyboard_internal *)(dev->private_data); + + if ((state->output_queue_len == 0) || overwrite) { + + state->output_queue = value; + state->output_queue_len = 1; + state->status_byte |= STATUS_OUTPUT_BUFFER_FULL; + + if (cmd) { + state->status_byte |= STATUS_COMMAND_DATA_AVAIL; + } else { + state->status_byte &= ~STATUS_COMMAND_DATA_AVAIL; + } + + return 0; + } else { + KEYBOARD_DEBUG_PRINT("keyboard: PushToOutputQueue Failed - Queue Full\n"); + return -1; + } +} + +#if 1 +// +// pull item from outputqueue +// returns 0 if successful +// +static int PullFromOutputQueue(struct vm_device *dev, uchar_t *value) +{ + struct keyboard_internal *state = (struct keyboard_internal *)(dev->private_data); + + if (state->output_queue_len == 1) { + + *value = state->output_queue; + state->output_queue_len = 0; + state->status_byte &= ~STATUS_OUTPUT_BUFFER_FULL; + + if (state->status_byte & STATUS_COMMAND_DATA_AVAIL) { + state->status_byte &= ~STATUS_COMMAND_DATA_AVAIL; + } // reset to data + + return 0; + } else { + KEYBOARD_DEBUG_PRINT("keyboard: PullFromOutputQueue Failed - Queue Empty\n"); + return -1; + } +} +#endif + +#if 0 +// +// 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) +{ + struct keyboard_internal *state = (struct keyboard_internal *)(dev->private_data); + + if ((state->input_queue_len == 0) || overwrite) { + + state->input_queue = value; + state->input_queue_len = 1; + state->status_byte |= STATUS_INPUT_BUFFER_FULL; + + return 0; + } else { + KEYBOARD_DEBUG_PRINT("keyboard: PushToOutputQueue Failed - Queue Full\n"); + return -1; + } +} + +// +// pull item from inputqueue +// returns 0 if successful +// +static int PullFromInputQueue(struct vm_device *dev, uchar_t *value) +{ + struct keyboard_internal *state = (struct keyboard_internal *)(dev->private_data); + + if (state->input_queue_len == 1) { + + *value = state->input_queue; + state->input_queue_len = 0; + state->status_byte &= ~STATUS_INPUT_BUFFER_FULL; + + return 0; + } else { + KEYBOARD_DEBUG_PRINT("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; } -int keyboard_interrupt(uint_t irq,struct vm_device * dev); +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); + struct vm_device *dev = demultiplex_injected_key(status, scancode); + struct keyboard_internal *state = (struct keyboard_internal *)(dev->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); + KEYBOARD_DEBUG_PRINT("keyboard: injected status 0x%x, and scancode 0x%x\n", status, scancode); - // This is wrong - the read status should be some combination of the - // status/scancode within the VM, and that of the actual device - state->read_status=status; - state->read_scancode=scancode; + if ( (state->status_byte & STATUS_ENABLED) // onboard is enabled + && (!(state->cmd_byte & CMD_DISABLE)) ) { // keyboard is enabled - keyboard_interrupt(KEYBOARD_IRQ,dev); + PushToOutputQueue(dev, scancode, OVERWRITE, DATA); + if (state->cmd_byte & CMD_INTR) { + keyboard_interrupt(KEYBOARD_IRQ, dev); + } + + } } int keyboard_reset_device(struct vm_device * dev) { - struct keyboard_internal *data = (struct keyboard_internal *) dev->private_data; + struct keyboard_internal *data = (struct keyboard_internal *)(dev->private_data); - memset(data,0,sizeof(struct keyboard_internal)); + memset(data, 0, sizeof(struct keyboard_internal)); + + 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_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 + KEYBOARD_DEBUG_PRINT("keyboard: reset device\n"); return 0; @@ -85,8 +300,6 @@ int keyboard_reset_device(struct vm_device * dev) - - int keyboard_start_device(struct vm_device *dev) { KEYBOARD_DEBUG_PRINT("keyboard: start device\n"); @@ -101,91 +314,397 @@ int keyboard_stop_device(struct vm_device *dev) } +#if KEYBOARD_DEBUG_80H +int keyboard_write_delay(ushort_t port, + void * src, + uint_t length, + struct vm_device * dev) +{ + + if (length == 1) { + KEYBOARD_DEBUG_PRINT("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)); + return length; + } +} -int keyboard_write_control_port(ushort_t port, - void * src, - uint_t length, - struct vm_device * dev) +int keyboard_read_delay(ushort_t port, + void * dest, + uint_t length, + struct vm_device * dev) { - struct keyboard_internal *state = (struct keyboard_internal *) dev->private_data; - if (length==1) { - uchar_t data = *((uchar_t*)src); - KEYBOARD_DEBUG_PRINT("keyboard: write of 0x%x to control port\n",data); - state->write_status=data; + if (length == 1) { + *((uchar_t*)dest) = In_Byte(port); + + KEYBOARD_DEBUG_PRINT("keyboard: read of 0x%x from 80h\n", *((uchar_t*)dest)); + return 1; } else { - KEYBOARD_DEBUG_PRINT("keyboard: unknown size write to control port!\n"); + KEYBOARD_DEBUG_PRINT("keyboard: read of >1 byte from 80h\n"); + + return length; + } +} +#endif + + + + + +int keyboard_write_command(ushort_t port, + void * src, + uint_t length, + struct vm_device * dev) +{ + struct keyboard_internal *state = (struct keyboard_internal *)(dev->private_data); + uchar_t cmd; + + // Should always be single byte write + + if (length != 1) { + KEYBOARD_DEBUG_PRINT("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"); + } + + KEYBOARD_DEBUG_PRINT("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); + 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); + 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"); + break; + + // case 0x90-9f - write to output port (?) + + case 0xa1: // Get version number + PushToOutputQueue(dev, 0, OVERWRITE, COMMAND); + state->state = NORMAL; + KEYBOARD_DEBUG_PRINT("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_DEBUG_PRINT("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"); + break; + + case 0xa6: // check passwd; + // since we do not support passwords, we will simply ignore this + // the implication is that any password check immediately succeeds + // with a blank password + state->state = NORMAL; + KEYBOARD_DEBUG_PRINT("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"); + break; + + case 0xa8: // enable mouse + state->cmd_byte &= ~CMD_MOUSE_DISABLE; + state->state = NORMAL; + KEYBOARD_DEBUG_PRINT("keyboard: mouse enabled\n"); + break; + + case 0xa9: // mouse interface test (always succeeds) + PushToOutputQueue(dev, 0, OVERWRITE,COMMAND); + KEYBOARD_DEBUG_PRINT("keyboard: mouse interface test succeeded\n"); + state->state = NORMAL; + break; + + case 0xaa: // controller self test (always succeeds) + PushToOutputQueue(dev, 0x55, OVERWRITE, COMMAND); + KEYBOARD_DEBUG_PRINT("keyboard: controller self test succeeded\n"); + state->state = NORMAL; + break; + + case 0xab: // keyboard interface test (always succeeds) + PushToOutputQueue(dev, 0, OVERWRITE, COMMAND); + state->state = NORMAL; + KEYBOARD_DEBUG_PRINT("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"); + break; + + case 0xae: // enable keyboard + state->cmd_byte &= ~CMD_DISABLE; + state->state = NORMAL; + KEYBOARD_DEBUG_PRINT("keyboard: keyboard enabled\n"); + break; + + case 0xaf: // get version + PushToOutputQueue(dev, 0x00, OVERWRITE, COMMAND); + state->state = NORMAL; + KEYBOARD_DEBUG_PRINT("keyboard: version 0 returned \n"); + break; + + case 0xd0: // return microcontroller output on 60h + PushToOutputQueue(dev,state->output_byte,OVERWRITE,COMMAND); + state->state = NORMAL; + KEYBOARD_DEBUG_PRINT("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"); + break; + + case 0xd2: // write keyboard buffer (inject key) + state->state = INJECTING_KEY; + KEYBOARD_DEBUG_PRINT("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"); + break; + + case 0xd4: // write mouse device (command to mouse?) + state->state = WRITING_MOUSE_CMD; + KEYBOARD_DEBUG_PRINT("keyboard: prepare to inject mouse command\n"); + break; + + case 0xc0: // read input port + PushToOutputQueue(dev,state->input_byte,OVERWRITE,COMMAND); + state->state=NORMAL; + KEYBOARD_DEBUG_PRINT("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"); + 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"); + break; + + case 0xe0: // read test port + PushToOutputQueue(dev,state->output_byte>>6,OVERWRITE,COMMAND); + state->state=NORMAL; + KEYBOARD_DEBUG_PRINT("keyboard: read 0x%x from test port\n",state->output_byte>>6); + break; + + case 0xf0: // pulse output port + case 0xf1: // this should pulse 0..3 of cmd_byte on output port + case 0xf2: // instead of what is currently in output_byte (I think) + case 0xf3: // main effect is taht if bit zero is zero + case 0xf4: // should cause reset + case 0xf5: // I doubt anything more recent than a 286 running + case 0xf6: // OS2 with the penalty box will care + case 0xf7: + case 0xf8: + case 0xf9: + case 0xfa: + case 0xfb: + case 0xfc: + case 0xfd: + case 0xfe: + case 0xff: + KEYBOARD_DEBUG_PRINT("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"); + state->state = NORMAL; + break; + } + + return 1; + } -int keyboard_read_control_port(ushort_t port, - void * dest, - uint_t length, - struct vm_device * dev) +int keyboard_read_status(ushort_t port, + void * dest, + uint_t length, + struct vm_device * dev) { - struct keyboard_internal *state = (struct keyboard_internal *) dev->private_data; + struct keyboard_internal *state = (struct keyboard_internal *)(dev->private_data); + + if (length == 1) { + + KEYBOARD_DEBUG_PRINT("keyboard: read status (64h): "); + + *((uchar_t*)dest) = state->status_byte; + + KEYBOARD_DEBUG_PRINT("0x%x\n", *((uchar_t*)dest)); - if (length==1) { - uchar_t data; - KEYBOARD_DEBUG_PRINT("keyboard: read from control port: "); - data=state->read_status; - KEYBOARD_DEBUG_PRINT("0x%x\n",data); - memcpy(dest,&data,length); return 1; } else { - KEYBOARD_DEBUG_PRINT("keyboard: unknown size read from control port!\n"); + KEYBOARD_DEBUG_PRINT("keyboard: >1 byte read for status (64h)\n"); return -1; } } -int keyboard_write_data_port(ushort_t port, - void * src, - uint_t length, - struct vm_device * dev) +int keyboard_write_output(ushort_t port, + void * src, + uint_t length, + struct vm_device * dev) { - struct keyboard_internal *state = (struct keyboard_internal *) dev->private_data; + struct keyboard_internal *state = (struct keyboard_internal *)(dev->private_data); - if (length==1) { - uchar_t data = *((uchar_t*)src); - KEYBOARD_DEBUG_PRINT("keyboard: write of 0x%x to data port\n",data); - state->write_scancode=data; - return 1; - } else { - KEYBOARD_DEBUG_PRINT("keyboard: unknown size write to data port!\n"); + if (length != 1) { + KEYBOARD_DEBUG_PRINT("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); + + 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); + 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); + break; + case INJECTING_KEY: + PushToOutputQueue(dev,data,OVERWRITE,DATA); // probably should be a call to deliver_key_to_vmm() + state->state = NORMAL; + KEYBOARD_DEBUG_PRINT("keyboard: injected key 0x%x\n",data); + break; + case INJECTING_MOUSE: + KEYBOARD_DEBUG_PRINT("keyboard: ignoring injected mouse event 0x%x\n",data); + state->state = NORMAL; + break; + case WRITING_MOUSE_CMD: + KEYBOARD_DEBUG_PRINT("keyboard: ignoring injected mouse command 0x%x\n",data); + state->state = NORMAL; + break; + case TRANSMIT_PASSWD: + if (data) { + //ignore passwd + KEYBOARD_DEBUG_PRINT("keyboard: ignoring password character 0x%x\n",data); + } else { + // end of password + state->state = NORMAL; + KEYBOARD_DEBUG_PRINT("keyboard: done with password\n"); + } + break; + case NORMAL: + { + // command is being sent to keyboard controller + switch (data) { + case 0xff: // reset + PushToOutputQueue(dev, 0xfa, OVERWRITE, COMMAND); // ack + state->state = RESET; + KEYBOARD_DEBUG_PRINT("keyboard: reset complete and acked\n",data); + break; + case 0xf5: // disable scanning + case 0xf4: // enable scanning + // ack + PushToOutputQueue(dev, 0xfa, OVERWRITE, COMMAND); + // should do something here... PAD + state->state = NORMAL; + KEYBOARD_DEBUG_PRINT("keyboard: %s scanning done and acked\n",data==0xf5 ? "disable" : "enable", data); + break; + case 0xfe: // resend + case 0xfd: // set key type make + case 0xfc: // set key typ make/break + case 0xfb: // set key type typematic + case 0xfa: // set all typematic make/break/typematic + case 0xf9: // set all make + case 0xf8: // set all make/break + 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); + break; + default: + KEYBOARD_DEBUG_PRINT("keyboard: unhandled unknown command 0x%x on output buffer (60h)\n", data); + break; + } + break; + } + default: + KEYBOARD_DEBUG_PRINT("keyboard: unknown state %x on command 0x%x on output buffer (60h)\n", state->state, data); + } + + return 1; } -int keyboard_read_data_port(ushort_t port, - void * dest, - uint_t length, - struct vm_device * dev) +int keyboard_read_input(ushort_t port, + void * dest, + uint_t length, + struct vm_device * dev) { - struct keyboard_internal *state = (struct keyboard_internal *) dev->private_data; + struct keyboard_internal *state = (struct keyboard_internal *)(dev->private_data); - if (length==1) { + if (length == 1) { uchar_t data; - KEYBOARD_DEBUG_PRINT("keyboard: read from data port: "); - data=state->read_scancode; - KEYBOARD_DEBUG_PRINT("0x%x\n",data); - memcpy(dest,&data,1); + + KEYBOARD_DEBUG_PRINT("keyboard: read from input (60h): "); + + PullFromOutputQueue(dev, &data); + + 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); + state->state = NORMAL; + KEYBOARD_DEBUG_PRINT(" (in reset, pushing BAT test code 0xaa) "); + } + + KEYBOARD_DEBUG_PRINT("0x%x\n", data); + + *((uchar_t*)dest) = data; + return 1; } else { - KEYBOARD_DEBUG_PRINT("keyboard: unknown size read from data port!\n"); + KEYBOARD_DEBUG_PRINT("keyboard: unknown size read from input (60h)\n"); return -1; } } -int keyboard_interrupt(uint_t irq, - struct vm_device * dev) +int keyboard_interrupt(uint_t irq, struct vm_device * dev) { KEYBOARD_DEBUG_PRINT("keyboard: interrupt\n"); - dev->vm->vm_ops.raise_irq(dev->vm,irq); + dev->vm->vm_ops.raise_irq(dev->vm, irq); return 0; @@ -204,8 +723,13 @@ int keyboard_init_device(struct vm_device * dev) keyboard_reset_device(dev); // hook ports - dev_hook_io(dev, KEYBOARD_DATA_REG, &keyboard_read_data_port, &keyboard_write_data_port); - dev_hook_io(dev, KEYBOARD_CONTROL_REG, &keyboard_read_control_port, &keyboard_write_control_port); + dev_hook_io(dev, KEYBOARD_64H, &keyboard_read_status, &keyboard_write_command); + dev_hook_io(dev, KEYBOARD_60H, &keyboard_read_input, &keyboard_write_output); + +#if KEYBOARD_DEBUG_80H + dev_hook_io(dev, KEYBOARD_DELAY_80H, &keyboard_read_delay, &keyboard_write_delay); +#endif + // // We do not hook the IRQ here. Instead, the underlying device driver @@ -218,9 +742,11 @@ int keyboard_init_device(struct vm_device * dev) int keyboard_deinit_device(struct vm_device *dev) { - dev_unhook_io(dev, KEYBOARD_DATA_REG); - dev_unhook_io(dev, KEYBOARD_CONTROL_REG); - + dev_unhook_io(dev, KEYBOARD_60H); + dev_unhook_io(dev, KEYBOARD_64H); +#if KEYBOARD_DEBUG_80H + dev_unhook_io(dev, KEYBOARD_DELAY_80H); +#endif keyboard_reset_device(dev); return 0; } @@ -242,15 +768,15 @@ static struct vm_device_ops dev_ops = { struct vm_device *create_keyboard() { - if (thekeyboard!=NULL) { + if (thekeyboard != NULL) { KEYBOARD_DEBUG_PRINT("keyboard: creating >1 keyboard device. This will probably fail!\n"); } - struct keyboard_internal * keyboard_state = os_hooks->malloc(sizeof(struct keyboard_internal)); + struct keyboard_internal * keyboard_state = (struct keyboard_internal *)V3_Malloc(sizeof(struct keyboard_internal)); struct vm_device *device = create_device("KEYBOARD", &dev_ops, keyboard_state); - thekeyboard=device; + thekeyboard = device; return device; }