Fixed bug in RNDISEthernet and DualCDC demos not using the correct USB_ControlRequest...

[pub/USBasp.git] / Demos / Host / MassStorageHost / MassStorageHost.c

diff --git a/Demos/Host/MassStorageHost/MassStorageHost.c b/Demos/Host/MassStorageHost/MassStorageHost.c
index 9056c05..d06e3a6 100644 (file)
--- a/Demos/Host/MassStorageHost/MassStorageHost.c
+++ b/Demos/Host/MassStorageHost/MassStorageHost.c
@@ -63,7 +63,7 @@ int main(void)
        /* Hardware Initialization */\r
        SerialStream_Init(9600, false);\r
        LEDs_Init();\r
        /* Hardware Initialization */\r
        SerialStream_Init(9600, false);\r
        LEDs_Init();\r

-       HWB_Init();\r
+       Buttons_Init();\r

        \r
        /* Indicate USB not ready */\r
        UpdateStatus(Status_USBNotReady);\r
        \r
        /* Indicate USB not ready */\r
        UpdateStatus(Status_USBNotReady);\r


@@ -319,10 +319,10 @@ TASK(USB_MassStore_Host)
                                puts_P(PSTR("\r\n"));\r
                        }\r
                        \r
                                puts_P(PSTR("\r\n"));\r
                        }\r
                        \r

-                       puts_P(PSTR("\r\n\r\nPress HWB to read entire ASCII contents of disk...\r\n\r\n"));\r
+                       puts_P(PSTR("\r\n\r\nPress board button to read entire ASCII contents of disk...\r\n\r\n"));\r

                        \r
                        \r

-                       /* Wait for HWB to be pressed */\r
-                       while (!(HWB_GetStatus()))\r
+                       /* Wait for the board button to be pressed */\r
+                       while (!(Buttons_GetStatus() & BUTTONS_BUTTON1))\r

                        {\r
                                /* Abort if device removed */\r
                                if (!(USB_IsConnected))\r
                        {\r
                                /* Abort if device removed */\r
                                if (!(USB_IsConnected))\r


@@ -408,7 +408,7 @@ void UpdateStatus(uint8_t CurrentStatus)
  */\r
 void ShowDiskReadError(char* CommandString, bool FailedAtSCSILayer, uint8_t ErrorCode)\r
 {\r
  */\r
 void ShowDiskReadError(char* CommandString, bool FailedAtSCSILayer, uint8_t ErrorCode)\r
 {\r

-       if (CommandFailed)\r
+       if (FailedAtSCSILayer)\r

        {\r
                /* Display the error code */\r
                printf_P(PSTR(ESC_BG_RED "SCSI command error (%S).\r\n"), CommandString);\r
        {\r
                /* Display the error code */\r
                printf_P(PSTR(ESC_BG_RED "SCSI command error (%S).\r\n"), CommandString);\r