diff options
| author | Dan McDonald <danmcd@joyent.com> | 2021-02-05 00:21:19 -0500 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2021-02-05 00:21:21 -0500 |
| commit | 4d320273bce348b033c83d1742ce873c351c16d4 (patch) | |
| tree | 3334438c3d25e918c9b2761ece90ef6b820ea62e /usr/src/uts/common/io | |
| parent | fc716b10604146af1eb12bfb4f10a04ab2946fd4 (diff) | |
| parent | 3c2328bf3bf6527c6b28445336d32183a277b1e1 (diff) | |
| download | illumos-joyent-4d320273bce348b033c83d1742ce873c351c16d4.tar.gz | |
[illumos-gate merge]
commit 3c2328bf3bf6527c6b28445336d32183a277b1e1
13471 zoneadmd should infer zone.max-processes
13472 Man pages missing the max-processes resource control
commit 6d177d7a4a2c4b126a6f5ecc7a226e1dcac383ed
13390 clean up libdlpi warning gags
commit f915e6d33fea11e547f382c9f44614aa99739ba5
13467 Update tzdata to 2021a
commit 602e131c272200d35797cbad3554783e0c0fdb04
13493 usba: multiply-defined symbols
commit f6ef42236c2f60c5f16c454c9b574a4dc35e1cab
13092 ZFS I/O pipeline should use the pageout_reserve pool
commit 2d9166aee5315081107056f3d663e4adee4c1c2a
13097 improve VM tunables for modern systems
13107 pageout should use hrtime instead of lbolt
commit 3770e1fa2763b08d66814eeb974a28a87198fee1
13490 4133 missed Makefile.asthdr
commit 475b46fedca96b852acd24d70191d29fb444a008
13486 cmd/ast should use fewer FRC dependencies
commit 6960cd891105f9a002a0327e31a6182f9c6de88e
13379 bhyve upstream sync 2020 Dec
Conflicts:
git add usr/src/uts/common/os/vm_pageout.c
git add usr/src/cmd/zoneadmd/vplat.c
git add usr/src/man/man5/resource_controls.5
vm_pageout.c conflict resolution by Andy Fiddaman <omnios@citrus-it.co.uk>
Diffstat (limited to 'usr/src/uts/common/io')
| -rw-r--r-- | usr/src/uts/common/io/usb/usba/usbai.c | 12 |
1 files changed, 7 insertions, 5 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]; |