From 0b1f33e2a26091714982447132b251496d5a48b2 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Sun, 10 Mar 2013 09:35:43 +0000 Subject: [PATCH] Move out the Mass Storage class bootloader to the main Bootloader directory now that it is functional. --- Bootloaders/{Incomplete => }/MassStorage/BootloaderAPI.c | 0 Bootloaders/{Incomplete => }/MassStorage/BootloaderAPI.h | 0 Bootloaders/{Incomplete => }/MassStorage/BootloaderAPITable.S | 0 .../{Incomplete => }/MassStorage/BootloaderMassStorage.c | 0 .../{Incomplete => }/MassStorage/BootloaderMassStorage.h | 0 .../{Incomplete => }/MassStorage/BootloaderMassStorage.txt | 0 Bootloaders/{Incomplete => }/MassStorage/Config/LUFAConfig.h | 0 Bootloaders/{Incomplete => }/MassStorage/Descriptors.c | 0 Bootloaders/{Incomplete => }/MassStorage/Descriptors.h | 0 Bootloaders/{Incomplete => }/MassStorage/Doxygen.conf | 0 Bootloaders/{Incomplete => }/MassStorage/Lib/SCSI.c | 0 Bootloaders/{Incomplete => }/MassStorage/Lib/SCSI.h | 0 Bootloaders/{Incomplete => }/MassStorage/Lib/VirtualFAT.c | 0 Bootloaders/{Incomplete => }/MassStorage/Lib/VirtualFAT.h | 0 Bootloaders/{Incomplete => }/MassStorage/makefile | 2 +- 15 files changed, 1 insertion(+), 1 deletion(-) rename Bootloaders/{Incomplete => }/MassStorage/BootloaderAPI.c (100%) rename Bootloaders/{Incomplete => }/MassStorage/BootloaderAPI.h (100%) rename Bootloaders/{Incomplete => }/MassStorage/BootloaderAPITable.S (100%) rename Bootloaders/{Incomplete => }/MassStorage/BootloaderMassStorage.c (100%) rename Bootloaders/{Incomplete => }/MassStorage/BootloaderMassStorage.h (100%) rename Bootloaders/{Incomplete => }/MassStorage/BootloaderMassStorage.txt (100%) rename Bootloaders/{Incomplete => }/MassStorage/Config/LUFAConfig.h (100%) rename Bootloaders/{Incomplete => }/MassStorage/Descriptors.c (100%) rename Bootloaders/{Incomplete => }/MassStorage/Descriptors.h (100%) rename Bootloaders/{Incomplete => }/MassStorage/Doxygen.conf (100%) rename Bootloaders/{Incomplete => }/MassStorage/Lib/SCSI.c (100%) rename Bootloaders/{Incomplete => }/MassStorage/Lib/SCSI.h (100%) rename Bootloaders/{Incomplete => }/MassStorage/Lib/VirtualFAT.c (100%) rename Bootloaders/{Incomplete => }/MassStorage/Lib/VirtualFAT.h (100%) rename Bootloaders/{Incomplete => }/MassStorage/makefile (96%) diff --git a/Bootloaders/Incomplete/MassStorage/BootloaderAPI.c b/Bootloaders/MassStorage/BootloaderAPI.c similarity index 100% rename from Bootloaders/Incomplete/MassStorage/BootloaderAPI.c rename to Bootloaders/MassStorage/BootloaderAPI.c diff --git a/Bootloaders/Incomplete/MassStorage/BootloaderAPI.h b/Bootloaders/MassStorage/BootloaderAPI.h similarity index 100% rename from Bootloaders/Incomplete/MassStorage/BootloaderAPI.h rename to Bootloaders/MassStorage/BootloaderAPI.h diff --git a/Bootloaders/Incomplete/MassStorage/BootloaderAPITable.S b/Bootloaders/MassStorage/BootloaderAPITable.S similarity index 100% rename from Bootloaders/Incomplete/MassStorage/BootloaderAPITable.S rename to Bootloaders/MassStorage/BootloaderAPITable.S diff --git a/Bootloaders/Incomplete/MassStorage/BootloaderMassStorage.c b/Bootloaders/MassStorage/BootloaderMassStorage.c similarity index 100% rename from Bootloaders/Incomplete/MassStorage/BootloaderMassStorage.c rename to Bootloaders/MassStorage/BootloaderMassStorage.c diff --git a/Bootloaders/Incomplete/MassStorage/BootloaderMassStorage.h b/Bootloaders/MassStorage/BootloaderMassStorage.h similarity index 100% rename from Bootloaders/Incomplete/MassStorage/BootloaderMassStorage.h rename to Bootloaders/MassStorage/BootloaderMassStorage.h diff --git a/Bootloaders/Incomplete/MassStorage/BootloaderMassStorage.txt b/Bootloaders/MassStorage/BootloaderMassStorage.txt similarity index 100% rename from Bootloaders/Incomplete/MassStorage/BootloaderMassStorage.txt rename to Bootloaders/MassStorage/BootloaderMassStorage.txt diff --git a/Bootloaders/Incomplete/MassStorage/Config/LUFAConfig.h b/Bootloaders/MassStorage/Config/LUFAConfig.h similarity index 100% rename from Bootloaders/Incomplete/MassStorage/Config/LUFAConfig.h rename to Bootloaders/MassStorage/Config/LUFAConfig.h diff --git a/Bootloaders/Incomplete/MassStorage/Descriptors.c b/Bootloaders/MassStorage/Descriptors.c similarity index 100% rename from Bootloaders/Incomplete/MassStorage/Descriptors.c rename to Bootloaders/MassStorage/Descriptors.c diff --git a/Bootloaders/Incomplete/MassStorage/Descriptors.h b/Bootloaders/MassStorage/Descriptors.h similarity index 100% rename from Bootloaders/Incomplete/MassStorage/Descriptors.h rename to Bootloaders/MassStorage/Descriptors.h diff --git a/Bootloaders/Incomplete/MassStorage/Doxygen.conf b/Bootloaders/MassStorage/Doxygen.conf similarity index 100% rename from Bootloaders/Incomplete/MassStorage/Doxygen.conf rename to Bootloaders/MassStorage/Doxygen.conf diff --git a/Bootloaders/Incomplete/MassStorage/Lib/SCSI.c b/Bootloaders/MassStorage/Lib/SCSI.c similarity index 100% rename from Bootloaders/Incomplete/MassStorage/Lib/SCSI.c rename to Bootloaders/MassStorage/Lib/SCSI.c diff --git a/Bootloaders/Incomplete/MassStorage/Lib/SCSI.h b/Bootloaders/MassStorage/Lib/SCSI.h similarity index 100% rename from Bootloaders/Incomplete/MassStorage/Lib/SCSI.h rename to Bootloaders/MassStorage/Lib/SCSI.h diff --git a/Bootloaders/Incomplete/MassStorage/Lib/VirtualFAT.c b/Bootloaders/MassStorage/Lib/VirtualFAT.c similarity index 100% rename from Bootloaders/Incomplete/MassStorage/Lib/VirtualFAT.c rename to Bootloaders/MassStorage/Lib/VirtualFAT.c diff --git a/Bootloaders/Incomplete/MassStorage/Lib/VirtualFAT.h b/Bootloaders/MassStorage/Lib/VirtualFAT.h similarity index 100% rename from Bootloaders/Incomplete/MassStorage/Lib/VirtualFAT.h rename to Bootloaders/MassStorage/Lib/VirtualFAT.h diff --git a/Bootloaders/Incomplete/MassStorage/makefile b/Bootloaders/MassStorage/makefile similarity index 96% rename from Bootloaders/Incomplete/MassStorage/makefile rename to Bootloaders/MassStorage/makefile index 6387843862e..68b26b1bd57 100644 --- a/Bootloaders/Incomplete/MassStorage/makefile +++ b/Bootloaders/MassStorage/makefile @@ -19,7 +19,7 @@ F_USB = $(F_CPU) OPTIMIZATION = s TARGET = BootloaderMassStorage SRC = $(TARGET).c Descriptors.c BootloaderAPI.c BootloaderAPITable.S Lib/SCSI.c Lib/VirtualFAT.c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS) -LUFA_PATH = ../../../LUFA +LUFA_PATH = ../../LUFA CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/ -DBOOT_START_ADDR=$(BOOT_START_OFFSET) LD_FLAGS = -Wl,--section-start=.text=$(BOOT_START_OFFSET) $(BOOT_API_LD_FLAGS)