diff options
| author | Toomas Soome <tsoome@me.com> | 2020-05-13 20:34:38 +0300 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2021-02-03 22:56:26 +0200 |
| commit | 602e131c272200d35797cbad3554783e0c0fdb04 (patch) | |
| tree | 21cd2fe4b93758abb09fe92a9af6d6d09b5a7e0f | |
| parent | f6ef42236c2f60c5f16c454c9b574a4dc35e1cab (diff) | |
| download | illumos-joyent-602e131c272200d35797cbad3554783e0c0fdb04.tar.gz | |
13493 usba: multiply-defined symbols
Reviewed by: Robert Mustacchi <rm@fingolfin.org>
Reviewed by: Andy Fiddaman <andy@omnios.org>
Approved by: Dan McDonald <danmcd@joyent.com>
| -rw-r--r-- | usr/src/uts/common/io/usb/usba/usbai.c | 12 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/usb/usba/usba_impl.h | 4 |
2 files changed, 9 insertions, 7 deletions
diff --git a/usr/src/uts/common/io/usb/usba/usbai.c b/usr/src/uts/common/io/usb/usba/usbai.c index e1a6b4dfcd..9ba8e53cd0 100644 --- a/usr/src/uts/common/io/usb/usba/usbai.c +++ b/usr/src/uts/common/io/usb/usba/usbai.c @@ -78,6 +78,8 @@ static char *usba_debug_buf = NULL; /* The debug buf */ static char *usba_buf_sptr, *usba_buf_eptr; static hrtime_t usba_last_timestamp; /* last time stamp in trace */ +usb_dev_cap_t usb_cap; + /* USBA framework initializations */ void usba_usbai_initialization() @@ -690,7 +692,7 @@ static int usba_handle_device_remote_wakeup(dev_info_t *dip, int cmd) { int rval; - uint8_t bmRequest = USB_DEV_REQ_HOST_TO_DEV; + uint8_t bmRequest = USB_DEV_REQ_HOST_TO_DEV; uchar_t bRequest; uint16_t wIndex = 0; usb_cr_t completion_reason = 0; @@ -752,7 +754,7 @@ int usb_handle_remote_wakeup(dev_info_t *dip, int cmd) { usb_cfg_descr_t cfg_descr; - uchar_t *usb_cfg; /* buf for config descriptor */ + uchar_t *usb_cfg; /* buf for config descriptor */ size_t cfg_length; int rval; @@ -789,15 +791,15 @@ usb_handle_remote_wakeup(dev_info_t *dip, int cmd) int usb_create_pm_components(dev_info_t *dip, uint_t *pwr_states) { - uchar_t *usb_cfg; /* buf for config descriptor */ + uchar_t *usb_cfg; /* buf for config descriptor */ usb_cfg_descr_t cfg_descr; size_t cfg_length; usba_cfg_pwr_descr_t confpwr_descr; usba_if_pwr_descr_t ifpwr_descr; - uint8_t cfg_attrib; + uint8_t cfg_attrib; int i, lvl, rval; int n_prop = 0; - uint8_t *ptr; + uint8_t *ptr; char *drvname; char str[USBA_POWER_STR_SIZE]; char *pm_comp[USBA_N_PMCOMP]; diff --git a/usr/src/uts/common/sys/usb/usba/usba_impl.h b/usr/src/uts/common/sys/usb/usba/usba_impl.h index ddb6f7346d..8ad72b4f05 100644 --- a/usr/src/uts/common/sys/usb/usba/usba_impl.h +++ b/usr/src/uts/common/sys/usb/usba/usba_impl.h @@ -327,7 +327,7 @@ void usba_free_binary_object_store(usba_device_t *); #define DPRINT_MASK_REGISTER 0x00000040 #define DPRINT_MASK_DEVDB 0x00000080 #define DPRINT_MASK_WHCDI 0x00000100 -#define DPRINT_MASK_ALL 0xFFFFFFFF +#define DPRINT_MASK_ALL 0xFFFFFFFF typedef struct usba_log_handle_impl { dev_info_t *lh_dip; @@ -445,7 +445,7 @@ typedef struct usb_dev_cap { usb_dev_driver_callback_t usba_dev_driver_cb; } usb_dev_cap_t; -usb_dev_cap_t usb_cap; +extern usb_dev_cap_t usb_cap; _NOTE(SCHEME_PROTECTS_DATA("unique device capture data", usb_cap)) #ifdef __cplusplus |