From 63a8f66d92b5d7018a4d962f4f7b23774a621771 Mon Sep 17 00:00:00 2001
From: Dean Camera <dean@fourwalledcubicle.com>
Date: Wed, 6 May 2009 07:50:34 +0000
Subject: Changed HWB board driver to Buttons driver, to allow for the support
 of future boards with more than one mounted GPIO button.

---
 Demos/Host/MassStorageHost/MassStorageHost.c | 8 ++++----
 Demos/Host/MassStorageHost/MassStorageHost.h | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'Demos/Host')

diff --git a/Demos/Host/MassStorageHost/MassStorageHost.c b/Demos/Host/MassStorageHost/MassStorageHost.c
index 15006d336..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))
diff --git a/Demos/Host/MassStorageHost/MassStorageHost.h b/Demos/Host/MassStorageHost/MassStorageHost.h
index d4b9947bb..216065970 100644
--- a/Demos/Host/MassStorageHost/MassStorageHost.h
+++ b/Demos/Host/MassStorageHost/MassStorageHost.h
@@ -52,7 +52,7 @@
 		#include <LUFA/Drivers/USB/USB.h>                        // USB Functionality
 		#include <LUFA/Drivers/Peripheral/SerialStream.h>        // Serial stream driver
 		#include <LUFA/Drivers/Board/LEDs.h>                     // LEDs driver
-		#include <LUFA/Drivers/Board/HWB.h>                      // Hardware Button driver
+		#include <LUFA/Drivers/Board/Buttons.h>                  // Board Buttons driver
 		#include <LUFA/Scheduler/Scheduler.h>                    // Simple scheduler for task management
 
 	/* Enums: */
-- 
cgit v1.2.3