Move new Class Driver powered demos to a new ClassDriver subdirectory, re-add old...

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

diff --git a/Demos/Host/MassStorageHost/makefile b/Demos/Host/MassStorageHost/makefile
index 5d853e4..f50f598 100644 (file)
--- a/Demos/Host/MassStorageHost/makefile
+++ b/Demos/Host/MassStorageHost/makefile
@@ -63,7 +63,7 @@
 MCU = at90usb1287\r
 \r
 \r
 MCU = at90usb1287\r
 \r
 \r

-# Target board (see library BoardTypes.h documentation, USER or blank for projects not requiring\r
+# Target board (see library "Board Types" documentation, USER or blank for projects not requiring\r

 # LUFA board drivers). If USER is selected, put custom board drivers in a directory called \r
 # "Board" inside the application directory.\r
 BOARD  = USBKEY\r
 # LUFA board drivers). If USER is selected, put custom board drivers in a directory called \r
 # "Board" inside the application directory.\r
 BOARD  = USBKEY\r


@@ -125,18 +125,21 @@ LUFA_PATH = ../../..
 # List C source files here. (C dependencies are automatically generated.)\r
 SRC = $(TARGET).c                                                 \\r
          ConfigDescriptor.c                                          \\r
 # List C source files here. (C dependencies are automatically generated.)\r
 SRC = $(TARGET).c                                                 \\r
          ConfigDescriptor.c                                          \\r

-         MassStoreCommands.c                                         \\r
+         Lib/MassStoreCommands.c                                     \\r

          $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c                     \\r
          $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c                     \\r

-         $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial_Stream.c        \\r
-         $(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial.c               \\r
-         $(LUFA_PATH)/LUFA/Drivers/USB/Class/ConfigDescriptor.c      \\r
-         $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c           \\r
-         $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c               \\r
+         $(LUFA_PATH)/LUFA/Drivers/Peripheral/SerialStream.c         \\r
+         $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c               \\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c        \\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c           \\r

          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c               \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/HostChapter9.c       \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c               \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/HostChapter9.c       \\r

-         $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c           \\r
-         $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c           \\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c               \\r

          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/Events.c            \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/Events.c            \\r

+         $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c           \\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c  \\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/Class/HIDParser.c             \\r

 \r
 \r
 # List C++ source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C++ source files here. (C dependencies are automatically generated.)\r


@@ -504,7 +507,7 @@ sizeafter:
 checkhooks: build\r
        @echo\r
        @echo ------- Unhooked LUFA Events -------\r
 checkhooks: build\r
        @echo\r
        @echo ------- Unhooked LUFA Events -------\r

-       @$(shell) (grep -s '^Event.*LUFA/.*\\.o' $(TARGET).map | \\r
+       @$(shell) (grep -s '^EVENT_.*LUFA/.*\\.o' $(TARGET).map | \\r

                   cut -d' ' -f1 | cut -d'_' -f2- | grep ".*") || \\r
                           echo "(None)"\r
        @echo ------------------------------------\r
                   cut -d' ' -f1 | cut -d'_' -f2- | grep ".*") || \\r
                           echo "(None)"\r
        @echo ------------------------------------\r