diff options
| author | thompsa <thompsa@FreeBSD.org> | 2009-01-13 19:05:51 +0000 |
|---|---|---|
| committer | thompsa <thompsa@FreeBSD.org> | 2009-01-13 19:05:51 +0000 |
| commit | 1e73be02295e106de73cab06713effed5248bf7d (patch) | |
| tree | 8e212f7502abefc2cc8df337b9ff42f6873dd776 | |
| parent | 0e58bf639ce5ca1bdfd862fb1ceff6799909703f (diff) | |
| download | FreeBSD-src-1e73be02295e106de73cab06713effed5248bf7d.zip FreeBSD-src-1e73be02295e106de73cab06713effed5248bf7d.tar.gz | |
MFp4: //depot/projects/usb@156055
Compile fix for AVR-GCC
Submitted by: Hans Petter Selasky
| -rw-r--r-- | sys/dev/usb2/controller/at91dci.c | 2 | ||||
| -rw-r--r-- | sys/dev/usb2/controller/uss820dci.c | 2 | ||||
| -rw-r--r-- | sys/dev/usb2/core/usb2_mbuf.h | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/sys/dev/usb2/controller/at91dci.c b/sys/dev/usb2/controller/at91dci.c index 4b53051..3c4b430 100644 --- a/sys/dev/usb2/controller/at91dci.c +++ b/sys/dev/usb2/controller/at91dci.c @@ -1776,7 +1776,7 @@ static const struct usb2_hub_descriptor_min at91dci_hubd = { .wHubCharacteristics[0] = (UHD_PWR_NO_SWITCH | UHD_OC_INDIVIDUAL) & 0xFF, .wHubCharacteristics[1] = - (UHD_PWR_NO_SWITCH | UHD_OC_INDIVIDUAL) >> 16, + (UHD_PWR_NO_SWITCH | UHD_OC_INDIVIDUAL) >> 8, .bPwrOn2PwrGood = 50, .bHubContrCurrent = 0, .DeviceRemovable = {0}, /* port is removable */ diff --git a/sys/dev/usb2/controller/uss820dci.c b/sys/dev/usb2/controller/uss820dci.c index 328bc3e..58208d2 100644 --- a/sys/dev/usb2/controller/uss820dci.c +++ b/sys/dev/usb2/controller/uss820dci.c @@ -1794,7 +1794,7 @@ static const struct usb2_hub_descriptor_min uss820dci_hubd = { .wHubCharacteristics[0] = (UHD_PWR_NO_SWITCH | UHD_OC_INDIVIDUAL) & 0xFF, .wHubCharacteristics[1] = - (UHD_PWR_NO_SWITCH | UHD_OC_INDIVIDUAL) >> 16, + (UHD_PWR_NO_SWITCH | UHD_OC_INDIVIDUAL) >> 8, .bPwrOn2PwrGood = 50, .bHubContrCurrent = 0, .DeviceRemovable = {0}, /* port is removable */ diff --git a/sys/dev/usb2/core/usb2_mbuf.h b/sys/dev/usb2/core/usb2_mbuf.h index 91f6a0c..109340c 100644 --- a/sys/dev/usb2/core/usb2_mbuf.h +++ b/sys/dev/usb2/core/usb2_mbuf.h @@ -38,8 +38,9 @@ struct usb2_mbuf { struct usb2_mbuf *usb2_next; uint32_t cur_data_len; - uint32_t max_data_len:31; - uint32_t last_packet:1; + uint32_t max_data_len; + uint8_t last_packet:1; + uint8_t unused:7; }; /* |
