Ticket #7629: joystickpatch.diff

src/add-ons/kernel/drivers/input/usb_hid/JoystickProtocolHandler.cpp

@@ -136 +136 @@
     if (*numBytes < sizeof(extended_joystick))
         return B_BUFFER_OVERFLOW;
 
-    while (RingBufferReadable() == 0) {
+    if(RingBufferReadable() == 0) {
         status_t result = _ReadReport();
         if (result != B_OK)
             return result;
@@ -209 +209 @@
 status_t
 JoystickProtocolHandler::_ReadReport()
 {
-    status_t result = fReport.WaitForReport(B_INFINITE_TIMEOUT);
+    status_t result = fReport.WaitForReport(0);
     if (result != B_OK) {
         if (fReport.Device()->IsRemoved()) {
             TRACE("device has been removed\n");
@@ -223 +223 @@
         }
 
         // signal that we simply want to try again
-        return B_OK;
+        if(result != B_TIMED_OUT) return B_OK;
     }
 
     extended_joystick info;
@@ -246 +246 @@
             info.buttons |= (button->Data() & 1) << (button->UsageID() - 1);
     }
 
-    fReport.DoneProcessing();
+    if(result != B_TIMED_OUT) fReport.DoneProcessing();
     TRACE("got joystick report\n");
 
     info.timestamp = system_time();

src/kits/device/Joystick.cpp

@@ -58 +58 @@
 
     fBeBoxMode(false),
     fFD(-1),
-    fDevices(new(std::nothrow) BList),
+    fDevices(NULL),
     fJoystickInfo(new(std::nothrow) joystick_info),
     fExtendedJoystick(new(std::nothrow) BList)
 {
@@ -187 +187 @@
 BJoystick::ScanDevices(bool useDisabled)
 {
     CALLED();
+    if(fDevices == NULL) fDevices = new(std::nothrow) BList;
     if (useDisabled) {
         _BJoystickTweaker joystickTweaker(*this);
         joystickTweaker.scan_including_disabled();
@@ -200 +201 @@
     CALLED();
 
     // Refresh devices list
-    ScanDevices(true);
+    if(fDevices == NULL) ScanDevices(true);
 
     int32 count = 0;
     if (fDevices != NULL)
@@ -215 +216 @@
 BJoystick::GetDeviceName(int32 index, char *name, size_t bufSize)
 {
     CALLED();
-    if (fDevices == NULL)
-        return B_NO_INIT;
+    //if (fDevices == NULL)
+        //return B_NO_INIT;
+    if(fDevices == NULL) ScanDevices(true);
 
     if (index >= fDevices->CountItems())
         return B_BAD_INDEX;