USB Consolidate descriptor definitions

[oweals/u-boot.git] / cpu / ppc4xx / usbdev.c

diff --git a/cpu/ppc4xx/usbdev.c b/cpu/ppc4xx/usbdev.c
index faf7f0878ff150f70184eff5ac4d18e37dcf9665..fe398afc02b7c7dfb7dbddce604a057bbf71b77b 100644 (file)
--- a/cpu/ppc4xx/usbdev.c
+++ b/cpu/ppc4xx/usbdev.c
@@ -21,7 +21,7 @@ void process_endpoints(unsigned short usb2d0_intrin)
 {
        /*will hold the packet received */
        struct usb_device_descriptor usb_device_packet;
-       struct usb_config_descriptor usb_config_packet;
+       struct usb_configuration_descriptor usb_config_packet;
        struct usb_string_descriptor usb_string_packet;
        struct devrequest setup_packet;
        unsigned int *setup_packet_pt;
@@ -99,7 +99,7 @@ void process_endpoints(unsigned short usb2d0_intrin)
                                usb_config_packet.bConfigurationValue = 1;
                                usb_config_packet.iConfiguration = 0;
                                usb_config_packet.bmAttributes = 0x40;
-                               usb_config_packet.MaxPower = 0;
+                               usb_config_packet.bMaxPower = 0;
 
                                /*put packet in fifo */
                                packet_pt = (unsigned char *)&usb_config_packet;
@@ -206,14 +206,14 @@ void usb_dev_init()
 #ifdef USB_2_0_DEVICE
        printf("USB 2.0 Device init\n");
        /*select 2.0 device */
-       mtsdr(sdr_usb0, 0x0);   /* 2.0 */
+       mtsdr(SDR0_USB0, 0x0);  /* 2.0 */
 
        /*usb dev init */
        *(unsigned char *)USB2D0_POWER_8 = 0xa1;        /* 2.0 */
 #else
        printf("USB 1.1 Device init\n");
        /*select 1.1 device */
-       mtsdr(sdr_usb0, 0x2);   /* 1.1 */
+       mtsdr(SDR0_USB0, 0x2);  /* 1.1 */
 
        /*usb dev init */
        *(unsigned char *)USB2D0_POWER_8 = 0xc0;        /* 1.1 */