projects
/
pub
/
USBasp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add architecture guards to all architecture-specific files, so that they can be bulk...
[pub/USBasp.git]
/
LUFA
/
Drivers
/
Board
/
AVR8
/
XPLAIN
/
Dataflash.h
diff --git
a/LUFA/Drivers/Board/AVR8/XPLAIN/Dataflash.h
b/LUFA/Drivers/Board/AVR8/XPLAIN/Dataflash.h
index
ebbd211
..
c9bdbdc
100644
(file)
--- a/
LUFA/Drivers/Board/AVR8/XPLAIN/Dataflash.h
+++ b/
LUFA/Drivers/Board/AVR8/XPLAIN/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
@@
-35,7
+35,7
@@
* \note This file should not be included directly. It is automatically included as needed by the dataflash driver
* dispatch header located in LUFA/Drivers/Board/Dataflash.h.
*/
* \note This file should not be included directly. It is automatically included as needed by the dataflash driver
* dispatch header located in LUFA/Drivers/Board/Dataflash.h.
*/
-
+
/** \ingroup Group_Dataflash
* \defgroup Group_Dataflash_XPLAIN_REV1 XPLAIN_REV1
* \brief Board specific Dataflash driver header for the original Atmel XPLAIN, revision 1.
/** \ingroup Group_Dataflash
* \defgroup Group_Dataflash_XPLAIN_REV1 XPLAIN_REV1
* \brief Board specific Dataflash driver header for the original Atmel XPLAIN, revision 1.
@@
-60,6
+60,7
@@
/* Includes: */
#include "../../../../Common/Common.h"
#include "../../../Misc/AT45DB642D.h"
/* Includes: */
#include "../../../../Common/Common.h"
#include "../../../Misc/AT45DB642D.h"
+ #include "../../../Peripheral/SPI.h"
/* Preprocessor Checks: */
#if !defined(__INCLUDE_FROM_DATAFLASH_H)
/* Preprocessor Checks: */
#if !defined(__INCLUDE_FROM_DATAFLASH_H)
@@
-109,7
+110,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
*/
@@
-121,7
+122,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)