PERFORCE change 167135 for review

[Sylvestre Gallon]

http://perforce.freebsd.org/chv.cgi?CH=167135

Change 167135 by syl at syl_twoflowers on 2009/08/09 15:21:38

	Modify flags order to allow softc aggregation.

Affected files ...

.. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/at91dci.h#4 edit
.. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/atmegadci.h#4 edit
.. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/avr32dci.h#3 edit
.. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/ehci.h#4 edit
.. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/musb_otg.h#4 edit
.. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/ohci.h#4 edit
.. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/s3c24xxdci.h#13 edit
.. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/uhci.h#4 edit
.. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/uss820dci.h#4 edit
.. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_roothub_exec.c#3 edit

Differences ...

==== //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/at91dci.h#4 (text+ko) ====


==== //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/atmegadci.h#4 (text+ko) ====


==== //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/avr32dci.h#3 (text+ko) ====


==== //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/ehci.h#4 (text+ko) ====


==== //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/musb_otg.h#4 (text+ko) ====

@@ -352,13 +352,13 @@
 	uint8_t	status_suspend:1;	/* set if suspended */
 	uint8_t	status_vbus:1;		/* set if present */
 	uint8_t	status_bus_reset:1;	/* set if reset complete */
-	uint8_t	status_high_speed:1;	/* set if High Speed is selected */
 	uint8_t	remote_wakeup:1;
 	uint8_t	self_powered:1;
 	uint8_t	clocks_off:1;
 	uint8_t	port_powered:1;
 	uint8_t	port_enabled:1;
 	uint8_t	d_pulled_up:1;
+	uint8_t	status_high_speed:1;	/* set if High Speed is selected */
 };
 
 struct musbotg_softc {

==== //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/ohci.h#4 (text+ko) ====


==== //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/s3c24xxdci.h#13 (text+ko) ====


==== //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/uhci.h#4 (text+ko) ====


==== //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/uss820dci.h#4 (text+ko) ====

@@ -317,6 +317,7 @@
 	uint8_t	status_suspend:1;	/* set if suspended */
 	uint8_t	status_vbus:1;		/* set if present */
 	uint8_t	status_bus_reset:1;	/* set if reset complete */
+	uint8_t dummy_entry:1;
 	uint8_t	clocks_off:1;
 	uint8_t	port_powered:1;
 	uint8_t	port_enabled:1;

==== //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_roothub_exec.c#3 (text+ko) ====

@@ -61,7 +61,17 @@
 #include <dev/usb/usb_bus.h>
 
 struct usb_generic_flags {
-
+	uint8_t change_connect:1;
+	uint8_t change_suspend:1;
+	uint8_t status_suspend:1;
+	uint8_t status_vbus:1;
+	uint8_t status_bus_reset:1;
+	uint8_t remote_wakeup:1;
+	uint8_t self_powered:1;
+	uint8_t clocks_off:1;
+	uint8_t port_powered:1;
+	uint8_t port_enabled:1;
+	uint8_t d_pulled_up:1;
 };
 
 struct usb_generic_hub_temp {
@@ -80,7 +90,7 @@
 };
 
 static usb_error_t
-genric_roothub_exec(struct usb_device *udev,
+genric_roothub_exec(struct usb_device *udev, struct usb_generic_softc *sc,
     struct usb_device_request *req, const void **pptr, uint16_t *plength)
 {
 	const void *ptr;
@@ -88,4 +98,5 @@
 	uint16_t value;
 	uint16_t index;
 	usb_error_t err;
+
 }