Fixed LowLevel MassStorage demo broken on the U2 AVRs due to double-banked endpoints.

diff --git a/Demos/Device/LowLevel/MassStorage/MassStorage.c b/Demos/Device/LowLevel/MassStorage/MassStorage.c
index cb43b19..fc9a97d 100644 (file)
--- a/Demos/Device/LowLevel/MassStorage/MassStorage.c
+++ b/Demos/Device/LowLevel/MassStorage/MassStorage.c
@@ -113,14 +113,14 @@ void EVENT_USB_Device_ConfigurationChanged(void)
        /* Setup Mass Storage In and Out Endpoints */\r
        if (!(Endpoint_ConfigureEndpoint(MASS_STORAGE_IN_EPNUM, EP_TYPE_BULK,\r
                                             ENDPOINT_DIR_IN, MASS_STORAGE_IO_EPSIZE,\r
        /* Setup Mass Storage In and Out Endpoints */\r
        if (!(Endpoint_ConfigureEndpoint(MASS_STORAGE_IN_EPNUM, EP_TYPE_BULK,\r
                                             ENDPOINT_DIR_IN, MASS_STORAGE_IO_EPSIZE,\r

-                                        ENDPOINT_BANK_DOUBLE)))\r
+                                        ENDPOINT_BANK_SINGLE)))\r

        {\r
                LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
        }\r
        \r
        if (!(Endpoint_ConfigureEndpoint(MASS_STORAGE_OUT_EPNUM, EP_TYPE_BULK,\r
                                             ENDPOINT_DIR_OUT, MASS_STORAGE_IO_EPSIZE,\r
        {\r
                LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
        }\r
        \r
        if (!(Endpoint_ConfigureEndpoint(MASS_STORAGE_OUT_EPNUM, EP_TYPE_BULK,\r
                                             ENDPOINT_DIR_OUT, MASS_STORAGE_IO_EPSIZE,\r

-                                        ENDPOINT_BANK_DOUBLE)))\r
+                                        ENDPOINT_BANK_SINGLE)))\r

        {\r
                LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
        }                                                          \r
        {\r
                LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
        }                                                          \r

diff --git a/Demos/Device/LowLevel/MassStorage/MassStorage.h b/Demos/Device/LowLevel/MassStorage/MassStorage.h
index 7ebb06d..4430208 100644 (file)
--- a/Demos/Device/LowLevel/MassStorage/MassStorage.h
+++ b/Demos/Device/LowLevel/MassStorage/MassStorage.h
@@ -82,19 +82,19 @@
                #define COMMAND_DIRECTION_DATA_IN  (1 << 7)\r
 \r
                /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */\r
                #define COMMAND_DIRECTION_DATA_IN  (1 << 7)\r
 \r
                /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */\r

-               #define LEDMASK_USB_NOTREADY      LEDS_LED1\r
+               #define LEDMASK_USB_NOTREADY       LEDS_LED1\r

 \r
                /** LED mask for the library LED driver, to indicate that the USB interface is enumerating. */\r
 \r
                /** LED mask for the library LED driver, to indicate that the USB interface is enumerating. */\r

-               #define LEDMASK_USB_ENUMERATING  (LEDS_LED2 | LEDS_LED3)\r
+               #define LEDMASK_USB_ENUMERATING   (LEDS_LED2 | LEDS_LED3)\r

 \r
                /** LED mask for the library LED driver, to indicate that the USB interface is ready. */\r
 \r
                /** LED mask for the library LED driver, to indicate that the USB interface is ready. */\r

-               #define LEDMASK_USB_READY        (LEDS_LED2 | LEDS_LED4)\r
+               #define LEDMASK_USB_READY         (LEDS_LED2 | LEDS_LED4)\r

 \r
                /** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */\r
 \r
                /** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */\r

-               #define LEDMASK_USB_ERROR        (LEDS_LED1 | LEDS_LED3)\r
+               #define LEDMASK_USB_ERROR         (LEDS_LED1 | LEDS_LED3)\r

 \r
                /** LED mask for the library LED driver, to indicate that the USB interface is busy. */\r
 \r
                /** LED mask for the library LED driver, to indicate that the USB interface is busy. */\r

-               #define LEDMASK_USB_BUSY          LEDS_LED2\r
+               #define LEDMASK_USB_BUSY           LEDS_LED2\r

                \r
        /* Type defines: */\r
                /** Type define for a Command Block Wrapper, used in the Mass Storage Bulk-Only Transport protocol. */\r
                \r
        /* Type defines: */\r
                /** Type define for a Command Block Wrapper, used in the Mass Storage Bulk-Only Transport protocol. */\r

diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index 2840630..4e6b7c5 100644 (file)
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -26,6 +26,7 @@
   *  - Fixed ADC routines not correctly returning the last result when multiple channels were read\r
   *  - Fixed ADC routines failing to read the extended channels (Channels 8 to 13, Internal Temperature Sensor) on the\r
   *    U4 series USB AVR parts\r
   *  - Fixed ADC routines not correctly returning the last result when multiple channels were read\r
   *  - Fixed ADC routines failing to read the extended channels (Channels 8 to 13, Internal Temperature Sensor) on the\r
   *    U4 series USB AVR parts\r

+  *  - Fixed LowLevel MassStorage demo broken on the U2 AVRs due to double-banked endpoints\r

   *\r
   *  \section Sec_ChangeLog100219 Version 100219\r
   *\r
   *\r
   *  \section Sec_ChangeLog100219 Version 100219\r
   *\r