aboutsummaryrefslogtreecommitdiffstats
path: root/LUFA/Drivers/Board/Dataflash.h
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2010-02-24 06:58:23 +0000
committerDean Camera <dean@fourwalledcubicle.com>2010-02-24 06:58:23 +0000
commit071fd8ce536522ca6365580d64cd465e4c18a031 (patch)
tree604c4881c36b11f37d0203f9466d6078080847b7 /LUFA/Drivers/Board/Dataflash.h
parenta7aaa45ec4c3f415bf6073a5cc016635d5ecf77d (diff)
downloadlufa-071fd8ce536522ca6365580d64cd465e4c18a031.tar.gz
lufa-071fd8ce536522ca6365580d64cd465e4c18a031.tar.bz2
lufa-071fd8ce536522ca6365580d64cd465e4c18a031.zip
Revert changes made for the partial port to the AVR32 architecture.
Diffstat (limited to 'LUFA/Drivers/Board/Dataflash.h')
-rw-r--r--LUFA/Drivers/Board/Dataflash.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/LUFA/Drivers/Board/Dataflash.h b/LUFA/Drivers/Board/Dataflash.h
index dfd8cd6e9..762142c33 100644
--- a/LUFA/Drivers/Board/Dataflash.h
+++ b/LUFA/Drivers/Board/Dataflash.h
@@ -127,7 +127,7 @@
static inline uint8_t Dataflash_TransferByte(const uint8_t Byte) ATTR_ALWAYS_INLINE;
static inline uint8_t Dataflash_TransferByte(const uint8_t Byte)
{
- return SPI_Transfer(Byte);
+ return SPI_TransferByte(Byte);
}
/** Sends a byte to the currently selected dataflash IC, and ignores the next byte from the dataflash.
@@ -137,7 +137,7 @@
static inline void Dataflash_SendByte(const uint8_t Byte) ATTR_ALWAYS_INLINE;
static inline void Dataflash_SendByte(const uint8_t Byte)
{
- SPI_Send(Byte);
+ SPI_SendByte(Byte);
}
/** Sends a dummy byte to the currently selected dataflash IC, and returns the next byte from the dataflash.
@@ -147,7 +147,7 @@
static inline uint8_t Dataflash_ReceiveByte(void) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
static inline uint8_t Dataflash_ReceiveByte(void)
{
- return SPI_Receive();
+ return SPI_ReceiveByte();
}
/* Includes: */
@@ -167,8 +167,6 @@
#include "EVK527/Dataflash.h"
#elif (BOARD == BOARD_USER)
#include "Board/Dataflash.h"
- #elif (BOARD = BOARD_EVK1101)
- #include "EVK1101/Dataflash.h"
#else
#error The selected board does not contain a dataflash IC.
#endif