diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2012-09-19 19:12:52 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2012-09-19 19:12:52 +0000 |
| commit | f3049d958e4ef6cc919ff5f1302c1b384fed6bbf (patch) | |
| tree | d8d628c9c8ce0f861c5af3056bfa65b5ab44e8d2 /LUFA/Drivers/Board/XMEGA | |
| parent | 7fd2349e1a66b7bd9ece5bf9099b35eed03e97fd (diff) | |
| download | lufa-f3049d958e4ef6cc919ff5f1302c1b384fed6bbf.tar.gz lufa-f3049d958e4ef6cc919ff5f1302c1b384fed6bbf.tar.bz2 lufa-f3049d958e4ef6cc919ff5f1302c1b384fed6bbf.zip | |
Fixed incorrect Dataflash functionality in the USBKEY board if the driver is modified for a single Dataflash chip (thanks to Jonathan Oakley).
Diffstat (limited to 'LUFA/Drivers/Board/XMEGA')
| -rw-r--r-- | LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/Dataflash.h | 4 | ||||
| -rw-r--r-- | LUFA/Drivers/Board/XMEGA/B1_XPLAINED/Dataflash.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/Dataflash.h b/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/Dataflash.h index 14274ae61..6d84d0bd2 100644 --- a/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/Dataflash.h +++ b/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/Dataflash.h @@ -66,7 +66,7 @@ /* Private Interface - For use in library only: */ #if !defined(__DOXYGEN__) /* Macros: */ - #define DATAFLASH_CHIPCS_MASK (1 << 4) + #define DATAFLASH_CHIPCS_MASK DATAFLASH_CHIP1 #define DATAFLASH_CHIPCS_PORT PORTF #endif @@ -134,7 +134,7 @@ /** Determines the currently selected dataflash chip. * * \return Mask of the currently selected Dataflash chip, either \ref DATAFLASH_NO_CHIP if no chip is selected - * or a DATAFLASH_CHIPn mask (where n is the chip number). + * or a DATAFLASH_CHIPn mask (where n is the chip number). */ static inline uint8_t Dataflash_GetSelectedChip(void) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT; static inline uint8_t Dataflash_GetSelectedChip(void) diff --git a/LUFA/Drivers/Board/XMEGA/B1_XPLAINED/Dataflash.h b/LUFA/Drivers/Board/XMEGA/B1_XPLAINED/Dataflash.h index f8997d2d6..90b3bb651 100644 --- a/LUFA/Drivers/Board/XMEGA/B1_XPLAINED/Dataflash.h +++ b/LUFA/Drivers/Board/XMEGA/B1_XPLAINED/Dataflash.h @@ -66,7 +66,7 @@ /* Private Interface - For use in library only: */ #if !defined(__DOXYGEN__) /* Macros: */ - #define DATAFLASH_CHIPCS_MASK (1 << 2) + #define DATAFLASH_CHIPCS_MASK DATAFLASH_CHIP1 #define DATAFLASH_CHIPCS_PORT PORTD #endif @@ -136,7 +136,7 @@ /** Determines the currently selected dataflash chip. * * \return Mask of the currently selected Dataflash chip, either \ref DATAFLASH_NO_CHIP if no chip is selected - * or a DATAFLASH_CHIPn mask (where n is the chip number). + * or a DATAFLASH_CHIPn mask (where n is the chip number). */ static inline uint8_t Dataflash_GetSelectedChip(void) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT; static inline uint8_t Dataflash_GetSelectedChip(void) |