author | Raymond Chen <Raymond.Chen@Oracle.COM> |
Tue, 26 Apr 2016 18:36:36 -0700 | |
changeset 5851 | 9f4a6f531294 |
permissions | -rw-r--r-- |
5851
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
1 |
Fix unnecessary free(), active config value and descriptor, and identifier. |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
2 |
|
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
3 |
--- libusb-1.0.20/libusb/os/sunos_usb.h 2016-04-06 20:05:55.785721970 -0700 |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
4 |
+++ libusb/libusb/os/sunos_usb.h 2016-04-06 20:02:21.487553309 -0700 |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
5 |
@@ -1,6 +1,6 @@ |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
6 |
/* |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
7 |
* |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
8 |
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
9 |
+ * Copyright (c) 2016, Oracle and/or its affiliates. |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
10 |
* |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
11 |
* This library is free software; you can redistribute it and/or |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
12 |
* modify it under the terms of the GNU Lesser General Public |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
13 |
@@ -17,8 +17,8 @@ |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
14 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
15 |
*/ |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
16 |
|
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
17 |
-#ifndef __SUNOS_H__ |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
18 |
-#define __SUNOS_H__ |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
19 |
+#ifndef LIBUSB_SUNOS_H |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
20 |
+#define LIBUSB_SUNOS_H |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
21 |
|
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
22 |
#include <libdevinfo.h> |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
23 |
#include <pthread.h> |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
24 |
@@ -71,4 +71,4 @@ |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
25 |
struct aiocb aiocb; |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
26 |
}; |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
27 |
|
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
28 |
-#endif /* __SUNOS_H__ */ |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
29 |
+#endif /* LIBUSB_SUNOS_H */ |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
30 |
--- libusb-1.0.20/libusb/os/sunos_usb.c 2016-04-06 20:05:55.785428005 -0700 |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
31 |
+++ libusb/libusb/os/sunos_usb.c 2016-04-06 20:02:21.487451492 -0700 |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
32 |
@@ -1,6 +1,6 @@ |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
33 |
/* |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
34 |
* |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
35 |
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
36 |
+ * Copyright (c) 2016, Oracle and/or its affiliates. |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
37 |
* |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
38 |
* This library is free software; you can redistribute it and/or |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
39 |
* modify it under the terms of the GNU Lesser General Public |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
40 |
@@ -122,6 +122,8 @@ |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
41 |
return (LIBUSB_ERROR_NO_MEM); |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
42 |
} else { |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
43 |
bcopy(rdata, dpriv->raw_cfgdescr, proplen); |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
44 |
+ dpriv->cfgvalue = ((struct libusb_config_descriptor *) |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
45 |
+ rdata)->bConfigurationValue; |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
46 |
} |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
47 |
|
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
48 |
n = di_prop_lookup_ints(DDI_DEV_T_ANY, node, "reg", &port_prop); |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
49 |
@@ -651,12 +653,40 @@ |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
50 |
{ |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
51 |
sunos_dev_priv_t *dpriv = (sunos_dev_priv_t *)dev->os_priv; |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
52 |
struct libusb_config_descriptor *cfg; |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
53 |
+ int proplen; |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
54 |
+ di_node_t node; |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
55 |
+ uint8_t *rdata; |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
56 |
+ |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
57 |
+ /* |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
58 |
+ * Keep raw configuration descriptors updated, in case config |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
59 |
+ * has ever been changed through setCfg. |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
60 |
+ */ |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
61 |
+ if ((node = di_init(dpriv->phypath, DINFOCPYALL)) == DI_NODE_NIL) { |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
62 |
+ usbi_dbg("di_int() failed: %s", strerror(errno)); |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
63 |
+ return (LIBUSB_ERROR_IO); |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
64 |
+ } |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
65 |
+ proplen = di_prop_lookup_bytes(DDI_DEV_T_ANY, node, |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
66 |
+ "usb-raw-cfg-descriptors", &rdata); |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
67 |
+ if (proplen <= 0) { |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
68 |
+ usbi_dbg("can't find raw config descriptors"); |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
69 |
+ |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
70 |
+ return (LIBUSB_ERROR_IO); |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
71 |
+ } |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
72 |
+ dpriv->raw_cfgdescr = realloc(dpriv->raw_cfgdescr, proplen); |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
73 |
+ if (dpriv->raw_cfgdescr == NULL) { |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
74 |
+ return (LIBUSB_ERROR_NO_MEM); |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
75 |
+ } else { |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
76 |
+ bcopy(rdata, dpriv->raw_cfgdescr, proplen); |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
77 |
+ dpriv->cfgvalue = ((struct libusb_config_descriptor *) |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
78 |
+ rdata)->bConfigurationValue; |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
79 |
+ } |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
80 |
+ di_fini(node); |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
81 |
|
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
82 |
cfg = (struct libusb_config_descriptor *)dpriv->raw_cfgdescr; |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
83 |
len = MIN(len, libusb_le16_to_cpu(cfg->wTotalLength)); |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
84 |
memcpy(buf, dpriv->raw_cfgdescr, len); |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
85 |
*host_endian = 0; |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
86 |
- usbi_dbg("len %d", len); |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
87 |
+ usbi_dbg("path:%s len %d", dpriv->phypath, len); |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
88 |
|
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
89 |
return (len); |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
90 |
} |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
91 |
@@ -685,7 +715,10 @@ |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
92 |
sunos_set_configuration(struct libusb_device_handle *handle, int config) |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
93 |
{ |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
94 |
sunos_dev_priv_t *dpriv = (sunos_dev_priv_t *)handle->dev->os_priv; |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
95 |
+ sunos_dev_handle_priv_t *hpriv; |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
96 |
+ |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
97 |
usbi_dbg("bConfigurationValue %d", config); |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
98 |
+ hpriv = (sunos_dev_handle_priv_t *)handle->os_priv; |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
99 |
|
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
100 |
if (dpriv->ugenpath == NULL) |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
101 |
return (LIBUSB_ERROR_NOT_SUPPORTED); |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
102 |
@@ -694,6 +727,7 @@ |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
103 |
return (LIBUSB_ERROR_INVALID_PARAM); |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
104 |
|
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
105 |
dpriv->cfgvalue = config; |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
106 |
+ hpriv->config_index = config - 1; |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
107 |
|
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
108 |
return (LIBUSB_SUCCESS); |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
109 |
} |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
110 |
@@ -797,7 +831,6 @@ |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
111 |
|
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
112 |
/* async notification */ |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
113 |
usbi_signal_transfer_completion(LIBUSB_TRANSFER_TO_USBI_TRANSFER(xfer)); |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
114 |
- free(aiocb); |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
115 |
} |
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
116 |
|
9f4a6f531294
22978185 libusb 1.0 manpage
Raymond Chen <Raymond.Chen@Oracle.COM>
parents:
diff
changeset
|
117 |
static int |