Index: uspace/drv/ohci/hc.c =================================================================== --- uspace/drv/ohci/hc.c (revision 9528537818083d8908d40cf32ab9e77e2559f9f6) +++ uspace/drv/ohci/hc.c (revision 1866945c7da7a2ddfebcb5abd73e1b4f8cd1c987) @@ -49,5 +49,4 @@ static int interrupt_emulator(hc_t *instance); static void hc_gain_control(hc_t *instance); -static void hc_init_hw(hc_t *instance); static int hc_init_transfer_lists(hc_t *instance); static int hc_init_memory(hc_t *instance); @@ -92,4 +91,5 @@ usb_log_error("Failed add root hub match-id.\n"); } + ret = ddf_fun_bind(hub_fun); return ret; } @@ -111,4 +111,5 @@ ret, str_error(ret)); + list_initialize(&instance->pending_batches); usb_device_keeper_init(&instance->manager); ret = usb_endpoint_manager_init(&instance->ep_manager, @@ -117,9 +118,12 @@ str_error(ret)); - hc_gain_control(instance); ret = hc_init_memory(instance); CHECK_RET_RETURN(ret, "Failed to create OHCI memory structures: %s.\n", str_error(ret)); - hc_init_hw(instance); +#undef CHECK_RET_RETURN + + +// hc_init_hw(instance); + hc_gain_control(instance); fibril_mutex_initialize(&instance->guard); @@ -132,6 +136,4 @@ } - list_initialize(&instance->pending_batches); -#undef CHECK_RET_RETURN return EOK; } @@ -287,5 +289,5 @@ { assert(instance); - usb_log_debug("OHCI interrupt: %x.\n", status); + usb_log_debug("OHCI(%p) interrupt: %x.\n", instance, status); if ((status & ~I_SF) == 0) /* ignore sof status */ return; @@ -339,6 +341,9 @@ (uint32_t*)((char*)instance->registers + 0x100); usb_log_debug("OHCI legacy register %p: %x.\n", - ohci_emulation_reg, *ohci_emulation_reg); - *ohci_emulation_reg &= ~0x1; + ohci_emulation_reg, *ohci_emulation_reg); + /* Do not change A20 state */ + *ohci_emulation_reg &= 0x100; + usb_log_debug("OHCI legacy register %p: %x.\n", + ohci_emulation_reg, *ohci_emulation_reg); /* Interrupt routing enabled => smm driver is active */ @@ -350,4 +355,6 @@ } usb_log_info("SMM driver: Ownership taken.\n"); + instance->registers->control &= (C_HCFS_RESET << C_HCFS_SHIFT); + async_usleep(50000); return; } @@ -375,5 +382,5 @@ } /*----------------------------------------------------------------------------*/ -void hc_init_hw(hc_t *instance) +void hc_start_hw(hc_t *instance) { /* OHCI guide page 42 */ @@ -474,4 +481,6 @@ { assert(instance); + + bzero(&instance->rh, sizeof(instance->rh)); /* Init queues */ hc_init_transfer_lists(instance); Index: uspace/drv/ohci/hc.h =================================================================== --- uspace/drv/ohci/hc.h (revision 9528537818083d8908d40cf32ab9e77e2559f9f6) +++ uspace/drv/ohci/hc.h (revision 1866945c7da7a2ddfebcb5abd73e1b4f8cd1c987) @@ -80,4 +80,6 @@ uintptr_t regs, size_t reg_size, bool interrupts); +void hc_start_hw(hc_t *instance); + /** Safely dispose host controller internal structures * Index: uspace/drv/ohci/main.c =================================================================== --- uspace/drv/ohci/main.c (revision 9528537818083d8908d40cf32ab9e77e2559f9f6) +++ uspace/drv/ohci/main.c (revision 1866945c7da7a2ddfebcb5abd73e1b4f8cd1c987) @@ -75,5 +75,6 @@ return ret; } - device->driver_data = ohci; +// device->driver_data = ohci; + hc_register_hub(&ohci->hc, ohci->rh_fun); usb_log_info("Controlling new OHCI device `%s'.\n", device->name); @@ -93,5 +94,4 @@ { usb_log_enable(USB_LOG_LEVEL_DEFAULT, NAME); - sleep(5); return ddf_driver_main(&ohci_driver); } Index: uspace/drv/ohci/ohci.c =================================================================== --- uspace/drv/ohci/ohci.c (revision 9528537818083d8908d40cf32ab9e77e2559f9f6) +++ uspace/drv/ohci/ohci.c (revision 1866945c7da7a2ddfebcb5abd73e1b4f8cd1c987) @@ -54,4 +54,5 @@ { assert(dev); + assert(dev->driver_data); hc_t *hc = &((ohci_t*)dev->driver_data)->hc; uint16_t status = IPC_GET_ARG1(*call); @@ -152,8 +153,4 @@ usb_log_debug("Memory mapped regs at %p (size %zu), IRQ %d.\n", (void *) mem_reg_base, mem_reg_size, irq); - - ret = pci_disable_legacy(device); - CHECK_RET_DEST_FUN_RETURN(ret, - "Failed(%d) to disable legacy USB: %s.\n", ret, str_error(ret)); bool interrupts = false; @@ -212,12 +209,11 @@ "Failed(%d) to create root hub function.\n", ret); - hc_register_hub(&instance->hc, instance->rh_fun); instance->rh_fun->ops = &rh_ops; instance->rh_fun->driver_data = NULL; - ret = ddf_fun_bind(instance->rh_fun); - CHECK_RET_FINI_RETURN(ret, - "Failed(%d) to register OHCI root hub.\n", ret); - + + device->driver_data = instance; + + hc_start_hw(&instance->hc); return EOK; #undef CHECK_RET_FINI_RETURN Index: uspace/drv/ohci/pci.c =================================================================== --- uspace/drv/ohci/pci.c (revision 9528537818083d8908d40cf32ab9e77e2559f9f6) +++ uspace/drv/ohci/pci.c (revision 1866945c7da7a2ddfebcb5abd73e1b4f8cd1c987) @@ -136,16 +136,4 @@ return enabled ? EOK : EIO; } -/*----------------------------------------------------------------------------*/ -/** Implements BIOS handoff routine as decribed in OHCI spec - * - * @param[in] device Device asking for interrupts - * @return Error code. - */ -int pci_disable_legacy(ddf_dev_t *device) -{ - /* TODO: implement */ - return EOK; -} -/*----------------------------------------------------------------------------*/ /** * @} Index: uspace/drv/usbhid/generic/hiddev.c =================================================================== --- uspace/drv/usbhid/generic/hiddev.c (revision 9528537818083d8908d40cf32ab9e77e2559f9f6) +++ uspace/drv/usbhid/generic/hiddev.c (revision 1866945c7da7a2ddfebcb5abd73e1b4f8cd1c987) @@ -39,4 +39,5 @@ #include #include +#include #include @@ -64,4 +65,6 @@ size_t size, size_t *act_size, unsigned int flags); +static int usb_generic_hid_client_connected(ddf_fun_t *fun); + /*----------------------------------------------------------------------------*/ @@ -72,5 +75,6 @@ static ddf_dev_ops_t usb_generic_hid_ops = { - .interfaces[USBHID_DEV_IFACE] = &usb_generic_iface + .interfaces[USBHID_DEV_IFACE] = &usb_generic_iface, + .open = usb_generic_hid_client_connected }; @@ -104,10 +108,25 @@ /*! @todo This should probably be atomic. */ - memcpy(buffer, hid_dev->input_report, hid_dev->input_report_size); - *act_size = hid_dev->input_report_size; + if (usb_hid_report_ready()) { + memcpy(buffer, hid_dev->input_report, + hid_dev->input_report_size); + *act_size = hid_dev->input_report_size; + usb_hid_report_received(); + } // clear the buffer so that it will not be received twice - memset(hid_dev->input_report, 0, hid_dev->input_report_size); + //memset(hid_dev->input_report, 0, hid_dev->input_report_size); + // note that we already received this report +// report_received = true; + + return EOK; +} + +/*----------------------------------------------------------------------------*/ + +static int usb_generic_hid_client_connected(ddf_fun_t *fun) +{ + usb_hid_report_received(); return EOK; } Index: uspace/drv/usbhid/kbd/kbddev.c =================================================================== --- uspace/drv/usbhid/kbd/kbddev.c (revision 9528537818083d8908d40cf32ab9e77e2559f9f6) +++ uspace/drv/usbhid/kbd/kbddev.c (revision 1866945c7da7a2ddfebcb5abd73e1b4f8cd1c987) @@ -255,4 +255,6 @@ if (hid_dev == NULL || hid_dev->data == NULL) { + usb_log_debug("default_connection_handler: " + "Missing parameter.\n"); async_answer_0(icallid, EINVAL); return; @@ -267,4 +269,6 @@ if (kbd_dev->console_phone != -1) { + usb_log_debug("default_connection_handler: " + "console phone already set\n"); async_answer_0(icallid, ELIMIT); return; @@ -272,8 +276,11 @@ kbd_dev->console_phone = callback; + + usb_log_debug("default_connection_handler: OK\n"); async_answer_0(icallid, EOK); return; } + usb_log_debug("default_connection_handler: Wrong function.\n"); async_answer_0(icallid, EINVAL); } @@ -555,8 +562,8 @@ usb_log_debug2("Key pressed: %d (keycode: %d)\n", key, kbd_dev->keys[i]); - usb_kbd_push_ev(hid_dev, kbd_dev, KEY_PRESS, key); if (!usb_kbd_is_lock(key)) { usb_kbd_repeat_start(kbd_dev, key); } + usb_kbd_push_ev(hid_dev, kbd_dev, KEY_PRESS, key); } else { // found, nothing happens Index: uspace/drv/usbhid/mouse/mousedev.c =================================================================== --- uspace/drv/usbhid/mouse/mousedev.c (revision 9528537818083d8908d40cf32ab9e77e2559f9f6) +++ uspace/drv/usbhid/mouse/mousedev.c (revision 1866945c7da7a2ddfebcb5abd73e1b4f8cd1c987) @@ -43,4 +43,8 @@ #include #include +#include + +#include +#include #include "mousedev.h" @@ -61,5 +65,7 @@ const char *HID_MOUSE_FUN_NAME = "mouse"; +const char *HID_MOUSE_WHEEL_FUN_NAME = "mouse-wheel"; const char *HID_MOUSE_CLASS_NAME = "mouse"; +const char *HID_MOUSE_WHEEL_CLASS_NAME = "keyboard"; /** Default idle rate for mouses. */ @@ -119,4 +125,6 @@ if (hid_dev == NULL || hid_dev->data == NULL) { + usb_log_debug("default_connection_handler: Missing " + "parameters.\n"); async_answer_0(icallid, EINVAL); return; @@ -127,13 +135,19 @@ usb_mouse_t *mouse_dev = (usb_mouse_t *)hid_dev->data; + int *phone = (str_cmp(fun->name, HID_MOUSE_FUN_NAME) == 0) + ? &mouse_dev->mouse_phone : &mouse_dev->wheel_phone; + if (method == IPC_M_CONNECT_TO_ME) { int callback = IPC_GET_ARG5(*icall); - if (mouse_dev->console_phone != -1) { + if (*phone != -1) { + usb_log_debug("default_connection_handler: Console " + "phone to mouse already set.\n"); async_answer_0(icallid, ELIMIT); + //async_answer_0(icallid, EOK); return; } - mouse_dev->console_phone = callback; + *phone = callback; usb_log_debug("Console phone to mouse set ok (%d).\n", callback); async_answer_0(icallid, EOK); @@ -141,4 +155,5 @@ } + usb_log_debug("default_connection_handler: Invalid function.\n"); async_answer_0(icallid, EINVAL); } @@ -152,5 +167,6 @@ return NULL; } - mouse->console_phone = -1; + mouse->mouse_phone = -1; + mouse->wheel_phone = -1; return mouse; @@ -164,6 +180,10 @@ // hangup phone to the console - if ((*mouse_dev)->console_phone >= 0) { - async_hangup((*mouse_dev)->console_phone); + if ((*mouse_dev)->mouse_phone >= 0) { + async_hangup((*mouse_dev)->mouse_phone); + } + + if ((*mouse_dev)->wheel_phone >= 0) { + async_hangup((*mouse_dev)->wheel_phone); } @@ -174,6 +194,36 @@ /*----------------------------------------------------------------------------*/ -static bool usb_mouse_process_boot_report(usb_hid_dev_t *hid_dev, - uint8_t *buffer, size_t buffer_size) +static void usb_mouse_send_wheel(const usb_mouse_t *mouse_dev, int wheel) +{ + console_event_t ev; + + ev.type = KEY_PRESS; + ev.key = (wheel > 0) ? KC_UP : (wheel < 0) ? KC_DOWN : 0; + ev.mods = 0; + ev.c = 0; + + if (mouse_dev->wheel_phone < 0) { + usb_log_warning( + "Connection to console not ready, key discarded.\n"); + return; + } + + int count = (wheel < 0) ? -wheel : wheel; + int i; + + for (i = 0; i < count * 3; ++i) { + usb_log_debug2("Sending key %d to the console\n", ev.key); + async_msg_4(mouse_dev->wheel_phone, KBD_EVENT, ev.type, + ev.key, ev.mods, ev.c); + // send key release right away + async_msg_4(mouse_dev->wheel_phone, KBD_EVENT, KEY_RELEASE, + ev.key, ev.mods, ev.c); + } +} + +/*----------------------------------------------------------------------------*/ + +static bool usb_mouse_process_report(usb_hid_dev_t *hid_dev, uint8_t *buffer, + size_t buffer_size) { usb_mouse_t *mouse_dev = (usb_mouse_t *)hid_dev->data; @@ -182,5 +232,5 @@ usb_debug_str_buffer(buffer, buffer_size, 0)); - if (mouse_dev->console_phone < 0) { + if (mouse_dev->mouse_phone < 0) { usb_log_error(NAME " No console phone.\n"); return false; // ?? @@ -252,7 +302,35 @@ if ((shift_x != 0) || (shift_y != 0)) { - async_req_2_0(mouse_dev->console_phone, + async_req_2_0(mouse_dev->mouse_phone, MEVENT_MOVE, shift_x, shift_y); } + + /* + * Wheel + */ + int wheel = 0; + + path = usb_hid_report_path(); + usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_GENERIC_DESKTOP, + USB_HIDUT_USAGE_GENERIC_DESKTOP_WHEEL); + + usb_hid_report_path_set_report_id(path, report_id); + + field = usb_hid_report_get_sibling( + hid_dev->report, NULL, path, USB_HID_PATH_COMPARE_END, + USB_HID_REPORT_TYPE_INPUT); + + if (field != NULL) { + usb_log_debug(NAME " VALUE(%X) USAGE(%X)\n", field->value, + field->usage); + wheel = field->value; + } + + usb_hid_report_path_free(path); + + // send arrow up for positive direction and arrow down for negative + // direction; three arrows for difference of 1 + usb_mouse_send_wheel(mouse_dev, wheel); + /* @@ -274,5 +352,5 @@ if (mouse_dev->buttons[field->usage - field->usage_minimum] == 0 && field->value != 0) { - async_req_2_0(mouse_dev->console_phone, + async_req_2_0(mouse_dev->mouse_phone, MEVENT_BUTTON, field->usage, 1); mouse_dev->buttons[field->usage - field->usage_minimum] @@ -281,5 +359,5 @@ mouse_dev->buttons[field->usage - field->usage_minimum] != 0 && field->value == 0) { - async_req_2_0(mouse_dev->console_phone, + async_req_2_0(mouse_dev->mouse_phone, MEVENT_BUTTON, field->usage, 0); mouse_dev->buttons[field->usage - field->usage_minimum] @@ -337,4 +415,42 @@ } + /* + * Special function for acting as keyboard (wheel) + */ + usb_log_debug("Creating DDF function %s...\n", + HID_MOUSE_WHEEL_FUN_NAME); + fun = ddf_fun_create(hid_dev->usb_dev->ddf_dev, fun_exposed, + HID_MOUSE_WHEEL_FUN_NAME); + if (fun == NULL) { + usb_log_error("Could not create DDF function node.\n"); + return ENOMEM; + } + + /* + * Store the initialized HID device and HID ops + * to the DDF function. + */ + fun->ops = &hid_dev->ops; + fun->driver_data = hid_dev; // TODO: maybe change to hid_dev->data + + rc = ddf_fun_bind(fun); + if (rc != EOK) { + usb_log_error("Could not bind DDF function: %s.\n", + str_error(rc)); + ddf_fun_destroy(fun); + return rc; + } + + usb_log_debug("Adding DDF function to class %s...\n", + HID_MOUSE_WHEEL_CLASS_NAME); + rc = ddf_fun_add_to_class(fun, HID_MOUSE_WHEEL_CLASS_NAME); + if (rc != EOK) { + usb_log_error( + "Could not add DDF function to class %s: %s.\n", + HID_MOUSE_WHEEL_CLASS_NAME, str_error(rc)); + ddf_fun_destroy(fun); + return rc; + } + return EOK; } @@ -407,5 +523,5 @@ } - return usb_mouse_process_boot_report(hid_dev, buffer, buffer_size); + return usb_mouse_process_report(hid_dev, buffer, buffer_size); } Index: uspace/drv/usbhid/mouse/mousedev.h =================================================================== --- uspace/drv/usbhid/mouse/mousedev.h (revision 9528537818083d8908d40cf32ab9e77e2559f9f6) +++ uspace/drv/usbhid/mouse/mousedev.h (revision 1866945c7da7a2ddfebcb5abd73e1b4f8cd1c987) @@ -48,5 +48,6 @@ //suseconds_t poll_interval_us; /** IPC phone to console (consumer). */ - int console_phone; + int mouse_phone; + int wheel_phone; int32_t *buttons; Index: uspace/drv/usbhid/subdrivers.c =================================================================== --- uspace/drv/usbhid/subdrivers.c (revision 9528537818083d8908d40cf32ab9e77e2559f9f6) +++ uspace/drv/usbhid/subdrivers.c (revision 1866945c7da7a2ddfebcb5abd73e1b4f8cd1c987) @@ -36,9 +36,16 @@ #include "subdrivers.h" #include "usb/classes/hidut.h" +#include "usb/classes/hidpath.h" #include "lgtch-ultrax/lgtch-ultrax.h" +#include "mouse/mousedev.h" static usb_hid_subdriver_usage_t path_kbd[] = { {USB_HIDUT_PAGE_KEYBOARD, 0}, + {0, 0} +}; + +static usb_hid_subdriver_usage_t path_mouse2[] = { + {USB_HIDUT_PAGE_GENERIC_DESKTOP, USB_HIDUT_USAGE_GENERIC_DESKTOP_X}, {0, 0} }; @@ -79,4 +86,18 @@ } }, + { + path_mouse2, + -1, + USB_HID_PATH_COMPARE_END + | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, + -1, + -1, + { + .init = usb_mouse_init, + .deinit = usb_mouse_deinit, + .poll = usb_mouse_polling_callback, + .poll_end = NULL + } + }, {NULL, -1, 0, -1, -1, {NULL, NULL, NULL, NULL}} }; Index: uspace/drv/usbhid/usbhid.c =================================================================== --- uspace/drv/usbhid/usbhid.c (revision 9528537818083d8908d40cf32ab9e77e2559f9f6) +++ uspace/drv/usbhid/usbhid.c (revision 1866945c7da7a2ddfebcb5abd73e1b4f8cd1c987) @@ -63,4 +63,6 @@ static const int USB_HID_MAX_SUBDRIVERS = 10; +static fibril_local bool report_received; + /*----------------------------------------------------------------------------*/ @@ -412,7 +414,5 @@ } - // TODO: remove the mouse hack - if (hid_dev->poll_pipe_index == USB_HID_MOUSE_POLL_EP_NO || - fallback) { + if (fallback) { // fall back to boot protocol switch (hid_dev->poll_pipe_index) { @@ -509,4 +509,5 @@ free(input_old); } + usb_hid_new_report(); } } @@ -589,4 +590,25 @@ /*----------------------------------------------------------------------------*/ +void usb_hid_new_report(void) +{ + report_received = false; +} + +/*----------------------------------------------------------------------------*/ + +void usb_hid_report_received(void) +{ + report_received = true; +} + +/*----------------------------------------------------------------------------*/ + +bool usb_hid_report_ready(void) +{ + return !report_received; +} + +/*----------------------------------------------------------------------------*/ + void usb_hid_free(usb_hid_dev_t **hid_dev) { Index: uspace/drv/usbhid/usbhid.h =================================================================== --- uspace/drv/usbhid/usbhid.h (revision 9528537818083d8908d40cf32ab9e77e2559f9f6) +++ uspace/drv/usbhid/usbhid.h (revision 1866945c7da7a2ddfebcb5abd73e1b4f8cd1c987) @@ -44,4 +44,5 @@ #include #include +#include struct usb_hid_dev; @@ -128,4 +129,10 @@ //const char *usb_hid_get_class_name(const usb_hid_dev_t *hid_dev); +void usb_hid_new_report(void); + +void usb_hid_report_received(void); + +bool usb_hid_report_ready(void); + void usb_hid_free(usb_hid_dev_t **hid_dev); Index: uspace/drv/vhc/transfer.c =================================================================== --- uspace/drv/vhc/transfer.c (revision 9528537818083d8908d40cf32ab9e77e2559f9f6) +++ uspace/drv/vhc/transfer.c (revision 1866945c7da7a2ddfebcb5abd73e1b4f8cd1c987) @@ -135,5 +135,4 @@ if (transfer->direction == USB_DIRECTION_IN) { rc = usbvirt_ipc_send_control_read(phone, - transfer->endpoint, transfer->setup_buffer, transfer->setup_buffer_size, transfer->data_buffer, transfer->data_buffer_size, @@ -142,5 +141,4 @@ assert(transfer->direction == USB_DIRECTION_OUT); rc = usbvirt_ipc_send_control_write(phone, - transfer->endpoint, transfer->setup_buffer, transfer->setup_buffer_size, transfer->data_buffer, transfer->data_buffer_size);