X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/58e42c6ca92c4e6181967f83e40d9dea1ea48259..e0985b995009d71b80d214a66944e76f4e41aadb:/Demos/Host/MassStorageHost/MassStorageHost.c

diff --git a/Demos/Host/MassStorageHost/MassStorageHost.c b/Demos/Host/MassStorageHost/MassStorageHost.c
index 9056c0578..d06e3a63a 100644
--- a/Demos/Host/MassStorageHost/MassStorageHost.c
+++ b/Demos/Host/MassStorageHost/MassStorageHost.c
@@ -63,7 +63,7 @@ int main(void)
 	/* Hardware Initialization */
 	SerialStream_Init(9600, false);
 	LEDs_Init();
-	HWB_Init();
+	Buttons_Init();
 	
 	/* Indicate USB not ready */
 	UpdateStatus(Status_USBNotReady);
@@ -319,10 +319,10 @@ TASK(USB_MassStore_Host)
 				puts_P(PSTR("\r\n"));
 			}
 			
-			puts_P(PSTR("\r\n\r\nPress HWB to read entire ASCII contents of disk...\r\n\r\n"));
+			puts_P(PSTR("\r\n\r\nPress board button to read entire ASCII contents of disk...\r\n\r\n"));
 			
-			/* Wait for HWB to be pressed */
-			while (!(HWB_GetStatus()))
+			/* Wait for the board button to be pressed */
+			while (!(Buttons_GetStatus() & BUTTONS_BUTTON1))
 			{
 				/* Abort if device removed */
 				if (!(USB_IsConnected))
@@ -408,7 +408,7 @@ void UpdateStatus(uint8_t CurrentStatus)
  */
 void ShowDiskReadError(char* CommandString, bool FailedAtSCSILayer, uint8_t ErrorCode)
 {
-	if (CommandFailed)
+	if (FailedAtSCSILayer)
 	{
 		/* Display the error code */
 		printf_P(PSTR(ESC_BG_RED "SCSI command error (%S).\r\n"), CommandString);