From c86491af8b24679984a3fc5effc7675779652e4c Mon Sep 17 00:00:00 2001
From: Dean Camera <dean@fourwalledcubicle.com>
Date: Tue, 11 Aug 2009 09:12:29 +0000
Subject: Add new functions to the HID host class driver, refine HID interface
 protocol matching.

Remove stray state variable from the CDC host class driver.
---
 Demos/Host/ClassDriver/CDCHost/CDCHost.h     |  3 ++-
 Demos/Host/ClassDriver/MouseHost/MouseHost.c |  1 -
 Demos/Host/ClassDriver/MouseHost/MouseHost.h |  2 +-
 Demos/Host/ClassDriver/makefile              | 25 +++++++++++++++++++++++++
 4 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 Demos/Host/ClassDriver/makefile

(limited to 'Demos/Host')

diff --git a/Demos/Host/ClassDriver/CDCHost/CDCHost.h b/Demos/Host/ClassDriver/CDCHost/CDCHost.h
index ab31a5793..d666b73d6 100644
--- a/Demos/Host/ClassDriver/CDCHost/CDCHost.h
+++ b/Demos/Host/ClassDriver/CDCHost/CDCHost.h
@@ -47,7 +47,8 @@
 		#include <LUFA/Drivers/Misc/TerminalCodes.h>
 		#include <LUFA/Drivers/Peripheral/SerialStream.h>
 		#include <LUFA/Drivers/Board/LEDs.h>
-		#include <LUFA/Drivers/USB/USB.h>\
+		#include <LUFA/Drivers/USB/USB.h>
+		#include <LUFA/Drivers/USB/Class/CDC.h>
 		
 	/* Macros: */
 		/** LED mask for the library LED driver, to indicate that the USB interface is not ready. */
diff --git a/Demos/Host/ClassDriver/MouseHost/MouseHost.c b/Demos/Host/ClassDriver/MouseHost/MouseHost.c
index cf2997bcd..9f76bc754 100644
--- a/Demos/Host/ClassDriver/MouseHost/MouseHost.c
+++ b/Demos/Host/ClassDriver/MouseHost/MouseHost.c
@@ -47,7 +47,6 @@ USB_ClassInfo_HID_Host_t Mouse_HID_Interface =
 				.DataINPipeNumber       = 1,
 				.DataOUTPipeNumber      = 2,
 				
-				.MatchInterfaceProtocol = true,
 				.HIDInterfaceProtocol   = 0x02,
 			},
 	};
diff --git a/Demos/Host/ClassDriver/MouseHost/MouseHost.h b/Demos/Host/ClassDriver/MouseHost/MouseHost.h
index 9f92be086..c6b2974bd 100644
--- a/Demos/Host/ClassDriver/MouseHost/MouseHost.h
+++ b/Demos/Host/ClassDriver/MouseHost/MouseHost.h
@@ -48,7 +48,7 @@
 		#include <LUFA/Drivers/Peripheral/SerialStream.h>
 		#include <LUFA/Drivers/Board/LEDs.h>
 		#include <LUFA/Drivers/USB/USB.h>
-		#include <LUFA/Drivers/USB/Class/Host/HID.h>
+		#include <LUFA/Drivers/USB/Class/HID.h>
 		
 	/* Macros: */
 		/** LED mask for the library LED driver, to indicate that the USB interface is not ready. */
diff --git a/Demos/Host/ClassDriver/makefile b/Demos/Host/ClassDriver/makefile
new file mode 100644
index 000000000..993fe8b59
--- /dev/null
+++ b/Demos/Host/ClassDriver/makefile
@@ -0,0 +1,25 @@
+#
+#             LUFA Library
+#     Copyright (C) Dean Camera, 2009.
+#              
+#  dean [at] fourwalledcubicle [dot] com
+#      www.fourwalledcubicle.com
+#
+
+# Makefile to build all the LUFA Host Demos. Call with "make all" to
+# rebuild all Host demos.
+
+# Projects are pre-cleaned before each one is built, to ensure any
+# custom LUFA library build options are reflected in the compiled
+# code.
+
+all:
+	make -C CDCHost clean
+	make -C CDCHost all	
+
+	make -C MouseHost clean
+	make -C MouseHost all	
+
+%:
+	make -C CDCHost $@
+	make -C MouseHost $@
-- 
cgit v1.2.3