Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Add handling for B_INTERRUPTED so USB keyboards can work again

Browse Source 
* Beginnings of devfs interaction to properly publish/unpublish under Haiku

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23412 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Lotz 2008-01-11 18:53:39 +00:00
parent 795beb75d2
commit b8859c2a29
2 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/add-ons/kernel/drivers/input/usb_hid/Jamfile
View File

@ -4,6 +4,7 @@ SetSubDirSupportedPlatformsBeOSCompatible ;
SubDirSysHdrs $(HAIKU_TOP) headers os drivers ;
UsePrivateHeaders [ FDirName kernel util ] input ;
UsePrivateHeaders kernel ;
local buffer_impl = ;
if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {

32
src/add-ons/kernel/drivers/input/usb_hid/hid.c
View File

@ -21,6 +21,9 @@
#include <string.h>
#include <unistd.h>
#ifdef HAIKU_TARGET_PLATFORM_HAIKU
#include <fs/devfs.h>
#endif
#define MAX_BUTTONS 16
@ -878,6 +881,9 @@ hid_device_removed(void *cookie)
device->active = false;
}
#ifdef HAIKU_TARGET_PLATFORM_HAIKU
devfs_unpublish_device(device->name, true);
#endif
return B_OK;
}
@ -971,6 +977,8 @@ hid_device_control(driver_cookie *cookie, uint32 op, void *arg, size_t length)
err = handle_interrupt_transfer(device);
if (err != B_OK)
return err;
} else if (err == B_INTERRUPTED) {
continue;
} else {
return err;
}
@ -985,22 +993,32 @@ hid_device_control(driver_cookie *cookie, uint32 op, void *arg, size_t length)
case KB_SET_LEDS:
set_leds(device, (uint8 *)arg);
return B_OK;
default:
/* not implemented */
return B_ERROR;
}
} else {
switch (op) {
case MS_READ:
while (ring_buffer_readable(device->rbuf) == 0) {
err = schedule_interrupt_transfer(device);
if (err != B_OK)
return err;
// NOTE: this thread is now blocking until
// the semaphore will be released from the
// call_back function
if (!device->transfer_scheduled) {
err = schedule_interrupt_transfer(device);
if (err != B_OK)
return err;
device->transfer_scheduled = true;
// NOTE: this thread is now blocking until
// the semaphore will be released from the
// call_back function
}
err = acquire_sem_etc(device->sem_cb, 1, B_CAN_INTERRUPT, 0LL);
if (err != B_OK)
if (err == B_INTERRUPTED)
continue;
else if (err != B_OK)
return err;
device->transfer_scheduled = false;
err = handle_interrupt_transfer(device);
if (err != B_OK)
return err;