core: Kill the 'host_endian' argument for most functions

The 'host_endian' argument exists only for a special case in the Linux
backend, that being when the device descriptor is read using usbfs
rather than sysfs. It does not apply to any other descriptor types nor
any other backends, so remove it.

Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>

8 files changed, 31 insertions, 62 deletions

diff --git a/libusb/os/darwin_usb.c b/libusb/os/darwin_usb.c
index 9c639c1..bbac912 100644
--- a/libusb/os/darwin_usb.c
+++ b/libusb/os/darwin_usb.c
@@ -75,7 +75,7 @@ static const char *darwin_device_class = kIOUSBDeviceClassName;
 /* async event thread */
 static pthread_t libusb_darwin_at;
 
-static int darwin_get_config_descriptor(struct libusb_device *dev, uint8_t config_index, unsigned char *buffer, size_t len, int *host_endian);
+static int darwin_get_config_descriptor(struct libusb_device *dev, uint8_t config_index, unsigned char *buffer, size_t len);
 static int darwin_claim_interface(struct libusb_device_handle *dev_handle, int iface);
 static int darwin_release_interface(struct libusb_device_handle *dev_handle, int iface);
 static int darwin_reset_device(struct libusb_device_handle *dev_handle);
@@ -667,8 +667,6 @@ static int darwin_get_device_descriptor(struct libusb_device *dev, unsigned char
   /* return cached copy */
   memmove (buffer, &(priv->dev_descriptor), LIBUSB_DT_DEVICE_SIZE);
 
-  *host_endian = 0;
-
   return LIBUSB_SUCCESS;
 }
 
@@ -694,7 +692,7 @@ static int get_configuration_index (struct libusb_device *dev, int config_value)
   return LIBUSB_ERROR_NOT_FOUND;
 }
 
-static int darwin_get_active_config_descriptor(struct libusb_device *dev, unsigned char *buffer, size_t len, int *host_endian) {
+static int darwin_get_active_config_descriptor(struct libusb_device *dev, unsigned char *buffer, size_t len) {
   struct darwin_cached_device *priv = DARWIN_CACHED_DEVICE(dev);
   int config_index;
 
@@ -706,10 +704,10 @@ static int darwin_get_active_config_descriptor(struct libusb_device *dev, unsign
     return config_index;
 
   assert(config_index >= 0 && config_index <= UINT8_MAX);
-  return darwin_get_config_descriptor (dev, (UInt8)config_index, buffer, len, host_endian);
+  return darwin_get_config_descriptor (dev, (UInt8)config_index, buffer, len);
 }
 
-static int darwin_get_config_descriptor(struct libusb_device *dev, uint8_t config_index, unsigned char *buffer, size_t len, int *host_endian) {
+static int darwin_get_config_descriptor(struct libusb_device *dev, uint8_t config_index, unsigned char *buffer, size_t len) {
   struct darwin_cached_device *priv = DARWIN_CACHED_DEVICE(dev);
   IOUSBConfigurationDescriptorPtr desc;
   IOReturn kresult;
@@ -725,9 +723,6 @@ static int darwin_get_config_descriptor(struct libusb_device *dev, uint8_t confi
       len = libusb_le16_to_cpu(desc->wTotalLength);
 
     memmove (buffer, desc, len);
-
-    /* GetConfigurationDescriptorPtr returns the descriptor in USB bus order */
-    *host_endian = 0;
   }
 
   ret = darwin_to_libusb (kresult);
diff --git a/libusb/os/haiku_usb_raw.cpp b/libusb/os/haiku_usb_raw.cpp
index 087b227..e0a8c9a 100644
--- a/libusb/os/haiku_usb_raw.cpp
+++ b/libusb/os/haiku_usb_raw.cpp
@@ -30,7 +30,7 @@ USBRoster gUsbRoster;
 int32 gInitCount = 0;
 
 static int haiku_get_config_descriptor(struct libusb_device *, uint8_t,
-    unsigned char *, size_t, int *);
+    unsigned char *, size_t);
 
 static int
 haiku_init(struct libusb_context *ctx)
@@ -79,19 +79,18 @@ haiku_get_device_descriptor(struct libusb_device *device, unsigned char *buffer,
 {
 	USBDevice *dev = *((USBDevice **)usbi_get_device_priv(device));
 	memcpy(buffer, dev->Descriptor(), LIBUSB_DT_DEVICE_SIZE);
-	*host_endian = 0;
 	return LIBUSB_SUCCESS;
 }
 
 static int
-haiku_get_active_config_descriptor(struct libusb_device *device, unsigned char *buffer, size_t len, int *host_endian)
+haiku_get_active_config_descriptor(struct libusb_device *device, unsigned char *buffer, size_t len)
 {
 	USBDevice *dev = *((USBDevice **)usbi_get_device_priv(device));
-	return haiku_get_config_descriptor(device, dev->ActiveConfigurationIndex(), buffer, len, host_endian);
+	return haiku_get_config_descriptor(device, dev->ActiveConfigurationIndex(), buffer, len);
 }
 
 static int
-haiku_get_config_descriptor(struct libusb_device *device, uint8_t config_index, unsigned char *buffer, size_t len, int *host_endian)
+haiku_get_config_descriptor(struct libusb_device *device, uint8_t config_index, unsigned char *buffer, size_t len)
 {
 	USBDevice *dev = *((USBDevice **)usbi_get_device_priv(device));
 	const usb_configuration_descriptor *config = dev->ConfigurationDescriptor(config_index);
@@ -103,7 +102,6 @@ haiku_get_config_descriptor(struct libusb_device *device, uint8_t config_index,
 		len = config->total_length;
 	}
 	memcpy(buffer, config, len);
-	*host_endian = 0;
 	return len;
 }
 
diff --git a/libusb/os/linux_usbfs.c b/libusb/os/linux_usbfs.c
index a1662e4..435a38b 100644
--- a/libusb/os/linux_usbfs.c
+++ b/libusb/os/linux_usbfs.c
@@ -694,7 +694,7 @@ static int seek_to_next_config(struct libusb_device *dev,
 }
 
 static int op_get_config_descriptor_by_value(struct libusb_device *dev,
-	uint8_t value, unsigned char **buffer, int *host_endian)
+	uint8_t value, unsigned char **buffer)
 {
 	struct linux_device_priv *priv = usbi_get_device_priv(dev);
 	unsigned char *descriptors = priv->descriptors;
@@ -702,8 +702,6 @@ static int op_get_config_descriptor_by_value(struct libusb_device *dev,
 	struct usbi_configuration_descriptor *config;
 
 	*buffer = NULL;
-	/* Unlike the device desc. config descs. are always in raw format */
-	*host_endian = 0;
 
 	/* Skip device header */
 	descriptors += LIBUSB_DT_DEVICE_SIZE;
@@ -726,7 +724,7 @@ static int op_get_config_descriptor_by_value(struct libusb_device *dev,
 }
 
 static int op_get_active_config_descriptor(struct libusb_device *dev,
-	unsigned char *buffer, size_t len, int *host_endian)
+	unsigned char *buffer, size_t len)
 {
 	struct linux_device_priv *priv = usbi_get_device_priv(dev);
 	int r, config;
@@ -743,8 +741,7 @@ static int op_get_active_config_descriptor(struct libusb_device *dev,
 	if (config == -1)
 		return LIBUSB_ERROR_NOT_FOUND;
 
-	r = op_get_config_descriptor_by_value(dev, config, &config_desc,
-					      host_endian);
+	r = op_get_config_descriptor_by_value(dev, config, &config_desc);
 	if (r < 0)
 		return r;
 
@@ -754,15 +751,12 @@ static int op_get_active_config_descriptor(struct libusb_device *dev,
 }
 
 static int op_get_config_descriptor(struct libusb_device *dev,
-	uint8_t config_index, unsigned char *buffer, size_t len, int *host_endian)
+	uint8_t config_index, unsigned char *buffer, size_t len)
 {
 	struct linux_device_priv *priv = usbi_get_device_priv(dev);
 	unsigned char *descriptors = priv->descriptors;
 	int i, r, size = priv->descriptors_len;
 
-	/* Unlike the device desc. config descs. are always in raw format */
-	*host_endian = 0;
-
 	/* Skip device header */
 	descriptors += LIBUSB_DT_DEVICE_SIZE;
 	size -= LIBUSB_DT_DEVICE_SIZE;
diff --git a/libusb/os/netbsd_usb.c b/libusb/os/netbsd_usb.c
index 49f4439..dab7692 100644
--- a/libusb/os/netbsd_usb.c
+++ b/libusb/os/netbsd_usb.c
@@ -55,9 +55,9 @@ static void netbsd_close(struct libusb_device_handle *);
 static int netbsd_get_device_descriptor(struct libusb_device *, unsigned char *,
     int *);
 static int netbsd_get_active_config_descriptor(struct libusb_device *,
-    unsigned char *, size_t, int *);
+    unsigned char *, size_t);
 static int netbsd_get_config_descriptor(struct libusb_device *, uint8_t,
-    unsigned char *, size_t, int *);
+    unsigned char *, size_t);
 
 static int netbsd_get_configuration(struct libusb_device_handle *, int *);
 static int netbsd_set_configuration(struct libusb_device_handle *, int);
@@ -230,14 +230,12 @@ netbsd_get_device_descriptor(struct libusb_device *dev, unsigned char *buf,
 
 	memcpy(buf, &dpriv->ddesc, LIBUSB_DT_DEVICE_SIZE);
 
-	*host_endian = 0;
-
 	return (LIBUSB_SUCCESS);
 }
 
 int
 netbsd_get_active_config_descriptor(struct libusb_device *dev,
-    unsigned char *buf, size_t len, int *host_endian)
+    unsigned char *buf, size_t len)
 {
 	struct device_priv *dpriv = usbi_get_device_priv(dev);
 	usb_config_descriptor_t *ucd;
@@ -249,14 +247,12 @@ netbsd_get_active_config_descriptor(struct libusb_device *dev,
 
 	memcpy(buf, dpriv->cdesc, len);
 
-	*host_endian = 0;
-
 	return len;
 }
 
 int
 netbsd_get_config_descriptor(struct libusb_device *dev, uint8_t idx,
-    unsigned char *buf, size_t len, int *host_endian)
+    unsigned char *buf, size_t len)
 {
 	struct device_priv *dpriv = usbi_get_device_priv(dev);
 	struct usb_full_desc ufd;
@@ -287,8 +283,6 @@ netbsd_get_config_descriptor(struct libusb_device *dev, uint8_t idx,
 	if (dpriv->fd < 0)
 		close(fd);
 
-	*host_endian = 0;
-
 	return len;
 }
 
diff --git a/libusb/os/null_usb.c b/libusb/os/null_usb.c
index 7893b0c..bb6d981 100644
--- a/libusb/os/null_usb.c
+++ b/libusb/os/null_usb.c
@@ -45,14 +45,14 @@ null_get_device_descriptor(struct libusb_device *dev, unsigned char *buf,
 
 static int
 null_get_active_config_descriptor(struct libusb_device *dev,
-    unsigned char *buf, size_t len, int *host_endian)
+    unsigned char *buf, size_t len)
 {
 	return LIBUSB_ERROR_NOT_SUPPORTED;
 }
 
 static int
 null_get_config_descriptor(struct libusb_device *dev, uint8_t idx,
-    unsigned char *buf, size_t len, int *host_endian)
+    unsigned char *buf, size_t len)
 {
 	return LIBUSB_ERROR_NOT_SUPPORTED;
 }
diff --git a/libusb/os/openbsd_usb.c b/libusb/os/openbsd_usb.c
index 55db699..e10d656 100644
--- a/libusb/os/openbsd_usb.c
+++ b/libusb/os/openbsd_usb.c
@@ -55,9 +55,9 @@ static void obsd_close(struct libusb_device_handle *);
 static int obsd_get_device_descriptor(struct libusb_device *, unsigned char *,
     int *);
 static int obsd_get_active_config_descriptor(struct libusb_device *,
-    unsigned char *, size_t, int *);
+    unsigned char *, size_t);
 static int obsd_get_config_descriptor(struct libusb_device *, uint8_t,
-    unsigned char *, size_t, int *);
+    unsigned char *, size_t);
 
 static int obsd_get_configuration(struct libusb_device_handle *, int *);
 static int obsd_set_configuration(struct libusb_device_handle *, int);
@@ -265,14 +265,12 @@ obsd_get_device_descriptor(struct libusb_device *dev, unsigned char *buf,
 
 	memcpy(buf, &dpriv->ddesc, LIBUSB_DT_DEVICE_SIZE);
 
-	*host_endian = 0;
-
 	return (LIBUSB_SUCCESS);
 }
 
 int
 obsd_get_active_config_descriptor(struct libusb_device *dev,
-    unsigned char *buf, size_t len, int *host_endian)
+    unsigned char *buf, size_t len)
 {
 	struct device_priv *dpriv = usbi_get_device_priv(dev);
 	usb_config_descriptor_t *ucd = (usb_config_descriptor_t *)dpriv->cdesc;
@@ -283,14 +281,12 @@ obsd_get_active_config_descriptor(struct libusb_device *dev,
 
 	memcpy(buf, dpriv->cdesc, len);
 
-	*host_endian = 0;
-
 	return (len);
 }
 
 int
 obsd_get_config_descriptor(struct libusb_device *dev, uint8_t idx,
-    unsigned char *buf, size_t len, int *host_endian)
+    unsigned char *buf, size_t len)
 {
 	struct usb_device_fdesc udf;
 	int fd, err;
@@ -313,8 +309,6 @@ obsd_get_config_descriptor(struct libusb_device *dev, uint8_t idx,
 	}
 	close(fd);
 
-	*host_endian = 0;
-
 	return (len);
 }
 
diff --git a/libusb/os/sunos_usb.c b/libusb/os/sunos_usb.c
index bc66859..0d8198f 100644
--- a/libusb/os/sunos_usb.c
+++ b/libusb/os/sunos_usb.c
@@ -63,11 +63,11 @@ static int sunos_get_device_list(struct libusb_context *,
 static int sunos_open(struct libusb_device_handle *);
 static void sunos_close(struct libusb_device_handle *);
 static int sunos_get_device_descriptor(struct libusb_device *,
-    uint8_t*, int *);
+    uint8_t *, int *);
 static int sunos_get_active_config_descriptor(struct libusb_device *,
-    uint8_t*, size_t, int *);
+    uint8_t *, size_t);
 static int sunos_get_config_descriptor(struct libusb_device *, uint8_t,
-    uint8_t*, size_t, int *);
+    uint8_t *, size_t);
 static int sunos_get_configuration(struct libusb_device_handle *, int *);
 static int sunos_set_configuration(struct libusb_device_handle *, int);
 static int sunos_claim_interface(struct libusb_device_handle *, int);
@@ -1026,14 +1026,13 @@ sunos_get_device_descriptor(struct libusb_device *dev, uint8_t *buf,
 	sunos_dev_priv_t *dpriv = usbi_get_device_priv(dev);
 
 	memcpy(buf, &dpriv->dev_descr, LIBUSB_DT_DEVICE_SIZE);
-	*host_endian = 0;
 
 	return (LIBUSB_SUCCESS);
 }
 
 int
 sunos_get_active_config_descriptor(struct libusb_device *dev,
-    uint8_t *buf, size_t len, int *host_endian)
+    uint8_t *buf, size_t len)
 {
 	sunos_dev_priv_t *dpriv = usbi_get_device_priv(dev);
 	struct libusb_config_descriptor *cfg;
@@ -1070,7 +1069,6 @@ sunos_get_active_config_descriptor(struct libusb_device *dev,
 	cfg = (struct libusb_config_descriptor *)dpriv->raw_cfgdescr;
 	len = MIN(len, libusb_le16_to_cpu(cfg->wTotalLength));
 	memcpy(buf, dpriv->raw_cfgdescr, len);
-	*host_endian = 0;
 	usbi_dbg("path:%s len %" PRIuPTR, dpriv->phypath, len);
 
 	return (len);
@@ -1078,10 +1076,10 @@ sunos_get_active_config_descriptor(struct libusb_device *dev,
 
 int
 sunos_get_config_descriptor(struct libusb_device *dev, uint8_t idx,
-    uint8_t *buf, size_t len, int *host_endian)
+    uint8_t *buf, size_t len)
 {
 	/* XXX */
-	return(sunos_get_active_config_descriptor(dev, buf, len, host_endian));
+	return(sunos_get_active_config_descriptor(dev, buf, len));
 }
 
 int
diff --git a/libusb/os/windows_common.c b/libusb/os/windows_common.c
index 418b6b7..3d1175d 100644
--- a/libusb/os/windows_common.c
+++ b/libusb/os/windows_common.c
@@ -602,31 +602,27 @@ static int windows_get_device_descriptor(struct libusb_device *dev,
 	unsigned char *buffer, int *host_endian)
 {
 	struct windows_context_priv *priv = usbi_get_context_priv(DEVICE_CTX(dev));
-	*host_endian = 0;
 	return priv->backend->get_device_descriptor(dev, buffer);
 }
 
 static int windows_get_active_config_descriptor(struct libusb_device *dev,
-	unsigned char *buffer, size_t len, int *host_endian)
+	unsigned char *buffer, size_t len)
 {
 	struct windows_context_priv *priv = usbi_get_context_priv(DEVICE_CTX(dev));
-	*host_endian = 0;
 	return priv->backend->get_active_config_descriptor(dev, buffer, len);
 }
 
 static int windows_get_config_descriptor(struct libusb_device *dev,
-	uint8_t config_index, unsigned char *buffer, size_t len, int *host_endian)
+	uint8_t config_index, unsigned char *buffer, size_t len)
 {
 	struct windows_context_priv *priv = usbi_get_context_priv(DEVICE_CTX(dev));
-	*host_endian = 0;
 	return priv->backend->get_config_descriptor(dev, config_index, buffer, len);
 }
 
 static int windows_get_config_descriptor_by_value(struct libusb_device *dev,
-	uint8_t bConfigurationValue, unsigned char **buffer, int *host_endian)
+	uint8_t bConfigurationValue, unsigned char **buffer)
 {
 	struct windows_context_priv *priv = usbi_get_context_priv(DEVICE_CTX(dev));
-	*host_endian = 0;
 	return priv->backend->get_config_descriptor_by_value(dev, bConfigurationValue, buffer);
 }