svn commit: r187183 - in head/sys/dev/usb2: controller core

Andrew Thompson thompsa at FreeBSD.org
Tue Jan 13 13:12:43 PST 2009


On Tue, Jan 13, 2009 at 01:49:51PM -0700, M. Warner Losh wrote:
> In message: <200901131905.n0DJ5pHh012960 at svn.freebsd.org>
>             Andrew Thompson <thompsa at FreeBSD.org> writes:
> : Author: thompsa
> : Date: Tue Jan 13 19:05:51 2009
> : New Revision: 187183
> : URL: http://svn.freebsd.org/changeset/base/187183
> : 
> : Log:
> :   MFp4: //depot/projects/usb at 156055
> :   
> :   	Compile fix for AVR-GCC
> :   
> :   Submitted by: Hans Petter Selasky
> : 
> : Modified:
> :   head/sys/dev/usb2/controller/at91dci.c
> :   head/sys/dev/usb2/controller/uss820dci.c
> :   head/sys/dev/usb2/core/usb2_mbuf.h
> : 
> : Modified: head/sys/dev/usb2/controller/at91dci.c
> : ==============================================================================
> : --- head/sys/dev/usb2/controller/at91dci.c	Tue Jan 13 19:05:20 2009	(r187182)
> : +++ head/sys/dev/usb2/controller/at91dci.c	Tue Jan 13 19:05:51 2009	(r187183)
> : @@ -1776,7 +1776,7 @@ static const struct usb2_hub_descriptor_
> :  	.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 */
> : 
> : Modified: head/sys/dev/usb2/controller/uss820dci.c
> : ==============================================================================
> : --- head/sys/dev/usb2/controller/uss820dci.c	Tue Jan 13 19:05:20 2009	(r187182)
> : +++ head/sys/dev/usb2/controller/uss820dci.c	Tue Jan 13 19:05:51 2009	(r187183)
> : @@ -1794,7 +1794,7 @@ static const struct usb2_hub_descriptor_
> :  	.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 */
> 
> These changes look to be unrelated to the description above...

Correct.

> : Modified: head/sys/dev/usb2/core/usb2_mbuf.h
> : ==============================================================================
> : --- head/sys/dev/usb2/core/usb2_mbuf.h	Tue Jan 13 19:05:20 2009	(r187182)
> : +++ head/sys/dev/usb2/core/usb2_mbuf.h	Tue Jan 13 19:05:51 2009	(r187183)
> : @@ -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;
> 
> This looks like the avr gcc tweak...

This is how the change was in p4, I havnt modified anything. I forgot to
fix it when syncing everything up.

http://p4web.freebsd.org/@md=d&cd=//&c=Rct@/156055?ac=10

Andrew


More information about the svn-src-all mailing list