projects
/
pub
/
USBasp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Minor documentation improvements. Remove AS4 project generator script as it is buggy...
[pub/USBasp.git]
/
LUFA
/
Drivers
/
Board
/
AVR8
/
EVK527
/
Dataflash.h
diff --git
a/LUFA/Drivers/Board/AVR8/EVK527/Dataflash.h
b/LUFA/Drivers/Board/AVR8/EVK527/Dataflash.h
index
5424dc7
..
20625d0
100644
(file)
--- a/
LUFA/Drivers/Board/AVR8/EVK527/Dataflash.h
+++ b/
LUFA/Drivers/Board/AVR8/EVK527/Dataflash.h
@@
-1,13
+1,13
@@
/*
LUFA Library
/*
LUFA Library
- Copyright (C) Dean Camera, 201
1
.
+ Copyright (C) Dean Camera, 201
2
.
dean [at] fourwalledcubicle [dot] com
www.lufa-lib.org
*/
/*
dean [at] fourwalledcubicle [dot] com
www.lufa-lib.org
*/
/*
- Copyright 201
1
Dean Camera (dean [at] fourwalledcubicle [dot] com)
+ Copyright 201
2
Dean Camera (dean [at] fourwalledcubicle [dot] com)
Permission to use, copy, modify, distribute, and sell this
software and its documentation for any purpose is hereby granted
Permission to use, copy, modify, distribute, and sell this
software and its documentation for any purpose is hereby granted
@@
-42,6
+42,11
@@
*
* Board specific Dataflash driver header for the Atmel EVK527.
*
*
* Board specific Dataflash driver header for the Atmel EVK527.
*
+ * <table>
+ * <tr><th>Name</th><th>Info</th><th>Select Pin</th><th>SPI Port</th></tr>
+ * <tr><td>DATAFLASH_CHIP1</td><td>AT45DB321C (4MB)</td><td>PORTE.6</td><td>SPI0</td></tr>
+ * </table>
+ *
* @{
*/
* @{
*/
@@
-51,6
+56,7
@@
/* Includes: */
#include "../../../../Common/Common.h"
#include "../../../Misc/AT45DB321C.h"
/* Includes: */
#include "../../../../Common/Common.h"
#include "../../../Misc/AT45DB321C.h"
+ #include "../../../Peripheral/SPI.h"
/* Preprocessor Checks: */
#if !defined(__INCLUDE_FROM_DATAFLASH_H)
/* Preprocessor Checks: */
#if !defined(__INCLUDE_FROM_DATAFLASH_H)
@@
-60,7
+66,7
@@
/* Private Interface - For use in library only: */
#if !defined(__DOXYGEN__)
/* Macros: */
/* Private Interface - For use in library only: */
#if !defined(__DOXYGEN__)
/* Macros: */
- #define DATAFLASH_CHIPCS_MASK
(1 << 6)
+ #define DATAFLASH_CHIPCS_MASK
DATAFLASH_CHIP1
#define DATAFLASH_CHIPCS_DDR DDRE
#define DATAFLASH_CHIPCS_PORT PORTE
#endif
#define DATAFLASH_CHIPCS_DDR DDRE
#define DATAFLASH_CHIPCS_PORT PORTE
#endif
@@
-71,10
+77,10
@@
#define DATAFLASH_TOTALCHIPS 1
/** Mask for no dataflash chip selected. */
#define DATAFLASH_TOTALCHIPS 1
/** Mask for no dataflash chip selected. */
- #define DATAFLASH_NO_CHIP
DATAFLASH_CHIPCS_MASK
+ #define DATAFLASH_NO_CHIP
0
/** Mask for the first dataflash chip selected. */
/** Mask for the first dataflash chip selected. */
- #define DATAFLASH_CHIP1
0
+ #define DATAFLASH_CHIP1
(1 << 6)
/** Internal main memory page size for the board's dataflash IC. */
#define DATAFLASH_PAGE_SIZE 512
/** Internal main memory page size for the board's dataflash IC. */
#define DATAFLASH_PAGE_SIZE 512
@@
-94,7
+100,7
@@
/** Sends a byte to the currently selected dataflash IC, and returns a byte from the dataflash.
*
/** Sends a byte to the currently selected dataflash IC, and returns a byte from the dataflash.
*
- * \param[in] Byte of data to send to the dataflash
+ * \param[in] Byte
Byte
of data to send to the dataflash
*
* \return Last response byte from the dataflash
*/
*
* \return Last response byte from the dataflash
*/
@@
-106,7
+112,7
@@
/** Sends a byte to the currently selected dataflash IC, and ignores the next byte from the dataflash.
*
/** Sends a byte to the currently selected dataflash IC, and ignores the next byte from the dataflash.
*
- * \param[in] Byte of data to send to the dataflash
+ * \param[in] Byte
Byte
of data to send to the dataflash
*/
static inline void Dataflash_SendByte(const uint8_t Byte) ATTR_ALWAYS_INLINE;
static inline void Dataflash_SendByte(const uint8_t Byte)
*/
static inline void Dataflash_SendByte(const uint8_t Byte) ATTR_ALWAYS_INLINE;
static inline void Dataflash_SendByte(const uint8_t Byte)
@@
-127,23
+133,23
@@
/** Determines the currently selected dataflash chip.
*
* \return Mask of the currently selected Dataflash chip, either \ref DATAFLASH_NO_CHIP if no chip is selected
/** 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)
{
*/
static inline uint8_t Dataflash_GetSelectedChip(void) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
static inline uint8_t Dataflash_GetSelectedChip(void)
{
- return (DATAFLASH_CHIPCS_PORT & DATAFLASH_CHIPCS_MASK);
+ return (
~
DATAFLASH_CHIPCS_PORT & DATAFLASH_CHIPCS_MASK);
}
/** Selects the given dataflash chip.
*
}
/** Selects the given dataflash chip.
*
- * \param[in] ChipMask Mask of the Dataflash IC to select, in the form of DATAFLASH_CHIPn mask (where n is
+ * \param[in] ChipMask Mask of the Dataflash IC to select, in the form of
a \c
DATAFLASH_CHIPn mask (where n is
* the chip number).
*/
static inline void Dataflash_SelectChip(const uint8_t ChipMask) ATTR_ALWAYS_INLINE;
static inline void Dataflash_SelectChip(const uint8_t ChipMask)
{
* the chip number).
*/
static inline void Dataflash_SelectChip(const uint8_t ChipMask) ATTR_ALWAYS_INLINE;
static inline void Dataflash_SelectChip(const uint8_t ChipMask)
{
- DATAFLASH_CHIPCS_PORT = ((DATAFLASH_CHIPCS_PORT
& ~DATAFLASH_CHIPCS_MASK) |
ChipMask);
+ DATAFLASH_CHIPCS_PORT = ((DATAFLASH_CHIPCS_PORT
| DATAFLASH_CHIPCS_MASK) & ~
ChipMask);
}
/** Deselects the current dataflash chip, so that no dataflash is selected. */
}
/** Deselects the current dataflash chip, so that no dataflash is selected. */
projects / pub / USBasp.git / blobdiff