Various fixes for the Haiku port

- Use native API for getting full configuration descriptors instead of
  using a raw request
- Implement some callbacks that are mandatory and result in crashes if
  not available

Closes #565

Signed-off-by: Nathan Hjelm <hjelmn@me.com>

diff --git a/libusb/libusbi.h b/libusb/libusbi.h
index d2adfebc547bbc00b3e15c48f95c833319f878fd..f0512b54188804be4ff73e2002400cc5492d25fe 100644 (file)
--- a/libusb/libusbi.h
+++ b/libusb/libusbi.h
@@ -47,7 +47,7 @@
 #else
 #define PTR_ALIGNED __declspec(align(4))
 #endif
-#elif defined(__GNUC__)
+#elif defined(__GNUC__) && (__GNUC__ >= 3)
 #define PTR_ALIGNED __attribute__((aligned(sizeof(void *))))
 #else
 #define PTR_ALIGNED

diff --git a/libusb/os/haiku_usb.h b/libusb/os/haiku_usb.h
index d51ae9eae8fa07ed27be8ad6b0e135c672a9eabe..f15e58e70342cf66525012e84dd6dd04b8aae8e1 100644 (file)
--- a/libusb/os/haiku_usb.h
+++ b/libusb/os/haiku_usb.h
@@ -69,6 +69,7 @@ public:
        int                     ReleaseInterface(int);
        int                     SetConfiguration(int);
        int                     SetAltSetting(int, int);
+       int                     ClearHalt(int);
        status_t                SubmitTransfer(struct usbi_transfer *);
        status_t                CancelTransfer(USBTransfer *);
        bool                    InitCheck();

diff --git a/libusb/os/haiku_usb_backend.cpp b/libusb/os/haiku_usb_backend.cpp
index 01fba25e1ab600735a1f9b8f4974e3e5ef9282ad..539a996ca4c2157e6029b21e30126aa35aa3a781 100644 (file)
--- a/libusb/os/haiku_usb_backend.cpp
+++ b/libusb/os/haiku_usb_backend.cpp
@@ -310,6 +310,23 @@ USBDeviceHandle::SetAltSetting(int inumber, int alt)
 }
 
 
+int
+USBDevice::ClearHalt(int endpoint)
+{
+       usb_raw_command command;
+       command.control.request_type = USB_REQTYPE_ENDPOINT_OUT;
+       command.control.request = USB_REQUEST_CLEAR_FEATURE;
+       command.control.value = USB_FEATURE_ENDPOINT_HALT;
+       command.control.index = endpoint;
+       command.control.length = 0;
+
+       if (ioctl(fRawFD, B_USB_RAW_COMMAND_CONTROL_TRANSFER, &command, sizeof(command)) ||
+                       command.control.status != B_USB_RAW_STATUS_SUCCESS) {
+               return _errno_to_libusb(command.control.status);
+       }
+}
+
+
 USBDevice::USBDevice(const char *path)
        :
        fPath(NULL),
@@ -458,18 +475,17 @@ USBDevice::Initialise()           //Do we need more error checking, etc? How to report?
                }
                fConfigToIndex[tmp_config.configuration_value] = i;
                fConfigurationDescriptors[i] = new(std::nothrow) unsigned char[tmp_config.total_length];
-               command.control.request_type = 128;
-               command.control.request = 6;
-               command.control.value = (2 << 8) | i;
-               command.control.index = 0;
-               command.control.length = tmp_config.total_length;
-               command.control.data = fConfigurationDescriptors[i];
-               if (ioctl(fRawFD, B_USB_RAW_COMMAND_CONTROL_TRANSFER, &command, sizeof(command)) ||
-                               command.control.status!=B_USB_RAW_STATUS_SUCCESS) {
+
+               command.config_etc.descriptor = (usb_configuration_descriptor*)fConfigurationDescriptors[i];
+               command.config_etc.length = tmp_config.total_length;
+               command.config_etc.config_index = i;
+               if (ioctl(fRawFD, B_USB_COMMAND_GET_CONFIGURATION_DESCRIPTOR_ETC, &command, sizeof(command)) ||
+                               command.config_etc.status != B_USB_RAW_STATUS_SUCCESS) {
                        usbi_err(NULL, "failed retrieving full configuration descriptor");
                        close(fRawFD);
                        return B_ERROR;
                }
+
                for (int j = 0; j < tmp_config.number_interfaces; j++) {
                        command.alternate.config_index = i;
                        command.alternate.interface_index = j;

diff --git a/libusb/os/haiku_usb_raw.cpp b/libusb/os/haiku_usb_raw.cpp
index 7c399d19d3e84fa6048be56de7bd94f4fe990739..67b270d07c3c84c58843f0421042698e6da0bf89 100644 (file)
--- a/libusb/os/haiku_usb_raw.cpp
+++ b/libusb/os/haiku_usb_raw.cpp
@@ -127,6 +127,20 @@ haiku_set_altsetting(struct libusb_device_handle *dev_handle, int interface_numb
        return handle->SetAltSetting(interface_number, altsetting);
 }
 
+static int
+haiku_clear_halt(struct libusb_device_handle *dev_handle, unsigned char endpoint)
+{
+       USBDeviceHandle *handle = *((USBDeviceHandle **)dev_handle->os_priv);
+       return handle->ClearHalt(endpoint);
+}
+
+static int
+haiku_reset_device(struct libusb_device_handle *dev_handle)
+{
+       /* TODO */
+       return LIBUSB_ERROR_NOT_SUPPORTED;
+}
+
 static int
 haiku_release_interface(struct libusb_device_handle *dev_handle, int interface_number)
 {
@@ -218,8 +232,8 @@ const struct usbi_os_backend usbi_backend = {
        .release_interface = haiku_release_interface,
 
        .set_interface_altsetting = haiku_set_altsetting,
-       .clear_halt = NULL,
-       .reset_device = NULL,
+       .clear_halt = haiku_clear_halt,
+       .reset_device = haiku_reset_device,
 
        .alloc_streams = NULL,
        .free_streams = NULL,

diff --git a/libusb/os/haiku_usb_raw.h b/libusb/os/haiku_usb_raw.h
index 5baf53d7c9104769029bb164d53946ae9e4acd2c..d371f018bcabad6c3b012785500b5d0b3160df27 100644 (file)
--- a/libusb/os/haiku_usb_raw.h
+++ b/libusb/os/haiku_usb_raw.h
@@ -25,6 +25,7 @@ typedef enum {
        B_USB_RAW_COMMAND_GET_INTERFACE_DESCRIPTOR_ETC,
        B_USB_RAW_COMMAND_GET_ENDPOINT_DESCRIPTOR_ETC,
        B_USB_RAW_COMMAND_GET_GENERIC_DESCRIPTOR_ETC,
+       B_USB_RAW_COMMAND_GET_CONFIGURATION_DESCRIPTOR_ETC,
 
        B_USB_RAW_COMMAND_SET_CONFIGURATION = 0x3000,
        B_USB_RAW_COMMAND_SET_FEATURE,
@@ -74,6 +75,13 @@ typedef union {
                uint32 config_index;
        } config;
 
+       struct {
+               status_t status;
+               usb_configuration_descriptor *descriptor;
+               uint32 config_index;
+               size_t length;
+       } config_etc;
+
        struct {
                status_t status;
                uint32 alternate_info;

diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index 1d136150ba4ea29c5b2673521ec31e8500e54b38..b4336b6018abd9fcc68ee7db247312bd4075df87 100644 (file)
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 11376
+#define LIBUSB_NANO 11377