diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2014-09-14 11:45:02 +1000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2014-09-14 11:45:02 +1000 |
| commit | 41634c45303643e3756b3af9d0123095942481bb (patch) | |
| tree | f39030c861b8ff9225f31d0fecd5639934b68988 /Projects | |
| parent | 6c8ebd70c763790c3550be9b9e8b81aa1e225415 (diff) | |
| download | lufa-41634c45303643e3756b3af9d0123095942481bb.tar.gz lufa-41634c45303643e3756b3af9d0123095942481bb.tar.bz2 lufa-41634c45303643e3756b3af9d0123095942481bb.zip | |
Obsolete the old MACROS and MACROE convenience macros.
Diffstat (limited to 'Projects')
| -rw-r--r-- | Projects/AVRISP-MKII/Config/AppConfig.h | 2 | ||||
| -rw-r--r-- | Projects/AVRISP-MKII/makefile | 6 | ||||
| -rw-r--r-- | Projects/TempDataLogger/Lib/SCSI.h | 6 | ||||
| -rw-r--r-- | Projects/Webserver/Lib/SCSI.h | 6 |
4 files changed, 10 insertions, 10 deletions
diff --git a/Projects/AVRISP-MKII/Config/AppConfig.h b/Projects/AVRISP-MKII/Config/AppConfig.h index 066480699..979b354c4 100644 --- a/Projects/AVRISP-MKII/Config/AppConfig.h +++ b/Projects/AVRISP-MKII/Config/AppConfig.h @@ -63,7 +63,7 @@ // #define XCK_RESCUE_CLOCK_ENABLE // #define INVERTED_ISP_MISO -// #define LIBUSB_DRIVER_COMPAT + #define LIBUSB_DRIVER_COMPAT // #define RESET_TOGGLES_LIBUSB_COMPAT // #define FIRMWARE_VERSION_MINOR 0x11 diff --git a/Projects/AVRISP-MKII/makefile b/Projects/AVRISP-MKII/makefile index bf6ca316f..c89648d5a 100644 --- a/Projects/AVRISP-MKII/makefile +++ b/Projects/AVRISP-MKII/makefile @@ -11,10 +11,10 @@ # Run "make help" for target help. -MCU = at90usb162 +MCU = at90usb1287 ARCH = AVR8 -BOARD = USBTINYMKII -F_CPU = 16000000 +BOARD = USBKEY +F_CPU = 8000000 F_USB = $(F_CPU) OPTIMIZATION = s TARGET = AVRISP-MKII diff --git a/Projects/TempDataLogger/Lib/SCSI.h b/Projects/TempDataLogger/Lib/SCSI.h index 1a01a55ea..ec9c3e2a4 100644 --- a/Projects/TempDataLogger/Lib/SCSI.h +++ b/Projects/TempDataLogger/Lib/SCSI.h @@ -56,9 +56,9 @@ * \param[in] Acode New SCSI additional sense key to set the additional sense code to * \param[in] Aqual New SCSI additional sense key qualifier to set the additional sense qualifier code to */ - #define SCSI_SET_SENSE(Key, Acode, Aqual) MACROS{ SenseData.SenseKey = (Key); \ - SenseData.AdditionalSenseCode = (Acode); \ - SenseData.AdditionalSenseQualifier = (Aqual); }MACROE + #define SCSI_SET_SENSE(Key, Acode, Aqual) do { SenseData.SenseKey = (Key); \ + SenseData.AdditionalSenseCode = (Acode); \ + SenseData.AdditionalSenseQualifier = (Aqual); } while (0) /** Macro for the \ref SCSI_Command_ReadWrite_10() function, to indicate that data is to be read from the storage medium. */ #define DATA_READ true diff --git a/Projects/Webserver/Lib/SCSI.h b/Projects/Webserver/Lib/SCSI.h index b4eca1dd5..53274dd89 100644 --- a/Projects/Webserver/Lib/SCSI.h +++ b/Projects/Webserver/Lib/SCSI.h @@ -54,9 +54,9 @@ * \param[in] Acode New SCSI additional sense key to set the additional sense code to * \param[in] Aqual New SCSI additional sense key qualifier to set the additional sense qualifier code to */ - #define SCSI_SET_SENSE(Key, Acode, Aqual) MACROS{ SenseData.SenseKey = (Key); \ - SenseData.AdditionalSenseCode = (Acode); \ - SenseData.AdditionalSenseQualifier = (Aqual); }MACROE + #define SCSI_SET_SENSE(Key, Acode, Aqual) do { SenseData.SenseKey = (Key); \ + SenseData.AdditionalSenseCode = (Acode); \ + SenseData.AdditionalSenseQualifier = (Aqual); } while (0) /** Macro for the \ref SCSI_Command_ReadWrite_10() function, to indicate that data is to be read from the storage medium. */ #define DATA_READ true |