q = &(state->kbd_queue);
}
- if (q->count == QUEUE_SIZE) {
+ if (q->count >= QUEUE_SIZE) {
return 0;
}
state->status.cmd = 0;
}
- q->queue[q->end++] = value;
+ q->queue[q->end] = value;
+
+ if (q->end >= (QUEUE_SIZE - 1)) {
+ q->end = 0;
+ } else {
+ q->end++;
+ }
+
q->count++;
return 0;
}
- *value = q->queue[q->start++];
+ *value = q->queue[q->start];
+
+ if (q->start >= (QUEUE_SIZE - 1)) {
+ q->start = 0;
+ } else {
+ q->start++;
+ }
+
q->count--;
#endif
#ifdef CONFIG_SYMMOD
else if (evt->scan_code == 0x40) { // F6 Test symmod load
- v3_load_sym_module(vm, "test_32");
+ v3_load_sym_capsule(vm, "lnx_test");
}
#endif
state->state = SET_LEDS;
break;
+ case 0xee: // echo, used by FreeBSD to probe controller
+ push_to_output_queue(dev, 0xee, COMMAND, KEYBOARD);
+ break;
+
case 0xfe: // resend
case 0xfd: // set key type make
case 0xfc: // set key typ make/break
static int keyboard_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
struct keyboard_internal * keyboard_state = NULL;
- char * name = v3_cfg_val(cfg, "name");
+ char * dev_id = v3_cfg_val(cfg, "ID");
PrintDebug("keyboard: init_device\n");
keyboard_state = (struct keyboard_internal *)V3_Malloc(sizeof(struct keyboard_internal));
+ memset(keyboard_state, 0, sizeof(struct keyboard_internal));
+
keyboard_state->mouse_queue.start = 0;
keyboard_state->mouse_queue.end = 0;
keyboard_state->mouse_queue.count = 0;
keyboard_state->mouse_enabled = 0;
- struct vm_device * dev = v3_allocate_device(name, &dev_ops, keyboard_state);
+ struct vm_device * dev = v3_allocate_device(dev_id, &dev_ops, keyboard_state);
if (v3_attach_device(vm, dev) == -1) {
- PrintError("Could not attach device %s\n", name);
+ PrintError("Could not attach device %s\n", dev_id);
return -1;
}