i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* The driver needs to register itself with the correct name in order to be reloaded

Browse Source 
on demand - device detection should now work as expected (not yet tested, as I
  didn't want to reboot yet :-)).
* Some more cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18283 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2006-07-26 17:29:33 +00:00
parent 05c0dde554
commit 82bb1bb302
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/input/usb_hid/hid.c
+9 -7
View File
@@ -34,7 +34,6 @@ typedef struct driver_cookie {
} driver_cookie; } driver_cookie;
int32 api_version = B_CUR_DRIVER_API_VERSION; int32 api_version = B_CUR_DRIVER_API_VERSION;
const char *hid_driver_name = "hid";
static usb_notify_hooks sNotifyHooks = { static usb_notify_hooks sNotifyHooks = {
hid_device_added, hid_device_removed hid_device_added, hid_device_removed
@@ -274,6 +273,8 @@ const uint32 key_table[] = {
usb_module_info *usb; usb_module_info *usb;
static const char *kDriverName = "usb_hid";
static int sKeyboardDeviceNumber = 0; static int sKeyboardDeviceNumber = 0;
static int sMouseDeviceNumber = 0; static int sMouseDeviceNumber = 0;
static const char *sKeyboardBaseName = "input/keyboard/usb/"; static const char *sKeyboardBaseName = "input/keyboard/usb/";
@@ -580,15 +581,16 @@ interpret_mouse_buffer(hid_device_info *device)
*/ */
static void static void
usb_callback(void *cookie, uint32 busStatus, usb_callback(void *cookie, uint32 busStatus,
void *data, uint32 actual_len) void *data, uint32 actualLength)
{ {
hid_device_info *device = cookie; hid_device_info *device = cookie;
status_t status; status_t status;
assert(cookie != NULL); if (device == NULL)
return;
acquire_sem(device->sem_lock); acquire_sem(device->sem_lock);
device->actual_length = actual_len; device->actual_length = actualLength;
device->bus_status = busStatus; /* B_USB_STATUS_* */ device->bus_status = busStatus; /* B_USB_STATUS_* */
if (busStatus != B_USB_STATUS_SUCCESS) { if (busStatus != B_USB_STATUS_SUCCESS) {
/* request failed */ /* request failed */
@@ -1029,9 +1031,9 @@ init_driver(void)
return gDeviceListLock; return gDeviceListLock;
} }
usb->register_driver(hid_driver_name, sSupportedDevices, usb->register_driver(kDriverName, sSupportedDevices,
SUPPORTED_DEVICES, NULL); SUPPORTED_DEVICES, NULL);
usb->install_notify(hid_driver_name, &sNotifyHooks); usb->install_notify(kDriverName, &sNotifyHooks);
DPRINTF_INFO((MY_ID "init_driver() OK\n")); DPRINTF_INFO((MY_ID "init_driver() OK\n"));
return B_OK; return B_OK;
@@ -1042,7 +1044,7 @@ void
uninit_driver(void) uninit_driver(void)
{ {
DPRINTF_INFO((MY_ID "uninit_driver()\n")); DPRINTF_INFO((MY_ID "uninit_driver()\n"));
usb->uninstall_notify(hid_driver_name); usb->uninstall_notify(kDriverName);
delete_sem(gDeviceListLock); delete_sem(gDeviceListLock);
put_module(B_USB_MODULE_NAME); put_module(B_USB_MODULE_NAME);