Bit more error checking and a few bug fixes

TODO

@@ -41,16 +41,10 @@ $ dput my-ppa xboxdrv_0.6.4_source.changes
 Stuff to do before 0.6.5 release:
 =================================
 
-* dpad mapping is messed up
-
-
-Stuff to do before 0.6.6 release:
-=================================
-
 * added return value checking to:
 
-  libusb_open
-  libusb_interrupt_transfer
+  libusb_open [done]
+  libusb_interrupt_transfer [done]
   libusb_control_transfer
   make sure libusb_control_transfer has proper endpoint number
 

VERSION

@@ -1 +1 @@
-0.6.4
+0.6.5

src/chatpad.cpp

@@ -185,8 +185,12 @@ Chatpad::read_thread()
   while(!m_quit_thread)
   {
     int len = 0;
-    libusb_interrupt_transfer(m_handle, LIBUSB_ENDPOINT_IN | 6,
-                              data, sizeof(data), &len, 0);
+    int ret = libusb_interrupt_transfer(m_handle, LIBUSB_ENDPOINT_IN | 6,
+                                        data, sizeof(data), &len, 0);
+    if (ret != LIBUSB_SUCCESS)
+    {
+      throw std::runtime_error("-- failure --"); // FIXME
+    }
 
     if (len < 0)
     {

src/headset.cpp

@@ -96,11 +96,10 @@ Headset::write_thread(const std::string& filename)
     }
     else
     {
-      int len = 0;
-      const int ret = libusb_interrupt_transfer(m_handle, 
-                                                LIBUSB_ENDPOINT_OUT | 4,
+      int transferred = 0;
+      const int ret = libusb_interrupt_transfer(m_handle, LIBUSB_ENDPOINT_OUT | 4,
                                                 data, sizeof(data),
-                                                &len, 0);
+                                                &transferred, 0);
       if (ret != LIBUSB_SUCCESS)
       {
         std::ostringstream out;

src/xbox360_controller.cpp

@@ -55,7 +55,7 @@ Xbox360Controller::Xbox360Controller(libusb_device* dev_,
     std::cout << "EP(OUT): " << endpoint_out << std::endl;
   }
 
-  libusb_open(dev, &handle);
+  int ret = libusb_open(dev, &handle);
 
   if (0)
   {
@@ -69,7 +69,7 @@ Xbox360Controller::Xbox360Controller(libusb_device* dev_,
     }
   }
 
-  if (!handle)
+  if (ret != LIBUSB_SUCCESS)
   {
     throw std::runtime_error("Error opening Xbox360 controller");
   }
@@ -110,7 +110,8 @@ Xbox360Controller::Xbox360Controller(libusb_device* dev_,
           }
 
           uint8_t data[32];
-          int ret = libusb_interrupt_transfer(handle, LIBUSB_ENDPOINT_IN | endpoint_in, reinterpret_cast<char*>(data), sizeof(data), 20);
+          int ret = libusb_interrupt_transfer(handle, LIBUSB_ENDPOINT_IN | endpoint_in, 
+                                              reinterpret_cast<char*>(data), sizeof(data), 20);
           print_raw_data(std::cout, data, ret);
         }
       }

src/xbox360_wireless_controller.cpp

@@ -120,7 +120,7 @@ Xbox360WirelessController::read(XboxGenericMsg& msg, bool verbose, int timeout)
   }
   else
   {
-    ret = libusb_interrupt_transfer(handle, LIBUSB_ENDPOINT_OUT | endpoint, 
+    ret = libusb_interrupt_transfer(handle, LIBUSB_ENDPOINT_IN | endpoint, 
                                     data, sizeof(data), 
                                     &len, timeout);
   }