Device mode class driver callbacks are now fired before the control request status...

[pub/USBasp.git] / Demos / Device / ClassDriver / MassStorageKeyboard / makefile

diff --git a/Demos/Device/ClassDriver/MassStorageKeyboard/makefile b/Demos/Device/ClassDriver/MassStorageKeyboard/makefile
index 30efdea..5d1d85c 100644 (file)
--- a/Demos/Device/ClassDriver/MassStorageKeyboard/makefile
+++ b/Demos/Device/ClassDriver/MassStorageKeyboard/makefile
@@ -63,7 +63,7 @@
 MCU = at90usb1287\r
 \r
 \r
 MCU = at90usb1287\r
 \r
 \r

-# Target board (see library "Board Types" documentation, USER or blank for projects not requiring\r
+# Target board (see library "Board Types" documentation, NONE 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


@@ -123,8 +123,7 @@ LUFA_PATH = ../../../..
 \r
 \r
 # LUFA library compile-time options\r
 \r
 \r
 # LUFA library compile-time options\r

-LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
-LUFA_OPTS += -D USB_DEVICE_ONLY\r
+LUFA_OPTS  = -D USB_DEVICE_ONLY\r

 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
 LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1\r
 LUFA_OPTS += -D USE_FLASH_DESCRIPTORS\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
 LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1\r
 LUFA_OPTS += -D USE_FLASH_DESCRIPTORS\r


@@ -132,6 +131,7 @@ LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENAB
 LUFA_OPTS += -D INTERRUPT_CONTROL_ENDPOINT\r
 \r
 \r
 LUFA_OPTS += -D INTERRUPT_CONTROL_ENDPOINT\r
 \r
 \r

+\r

 # List C source files here. (C dependencies are automatically generated.)\r
 SRC = $(TARGET).c                                                 \\r
          Descriptors.c                                               \\r
 # List C source files here. (C dependencies are automatically generated.)\r
 SRC = $(TARGET).c                                                 \\r
          Descriptors.c                                               \\r


@@ -143,10 +143,10 @@ SRC = $(TARGET).c                                                 \
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/HostChapter9.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/LowLevel/HostChapter9.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/LowLevel/USBInterrupt.c       \\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.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/USBTask.c           \\r

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

          $(LUFA_PATH)/LUFA/Drivers/USB/Class/Device/MassStorage.c    \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/Class/Device/HID.c            \\r
 \r
          $(LUFA_PATH)/LUFA/Drivers/USB/Class/Device/MassStorage.c    \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/Class/Device/HID.c            \\r
 \r