diff options
author | Dean Camera <dean@fourwalledcubicle.com> | 2013-05-20 00:06:37 +0200 |
---|---|---|
committer | Dean Camera <dean@fourwalledcubicle.com> | 2013-05-20 00:06:37 +0200 |
commit | 10448970e5c4c5ad374f0887532fedc0daf97c42 (patch) | |
tree | f96ba6b077091517d61ef5801d6a1f2b989d4ae7 /LUFA/Drivers/Board/XMEGA/B1_XPLAINED/Dataflash.h | |
parent | e51c0c84d61b8f35a5a93610e9dafc9b67aced1c (diff) | |
parent | fdf50e941126140cdb1f87296ea05079ab25e5f7 (diff) | |
download | lufa-10448970e5c4c5ad374f0887532fedc0daf97c42.tar.gz lufa-10448970e5c4c5ad374f0887532fedc0daf97c42.tar.bz2 lufa-10448970e5c4c5ad374f0887532fedc0daf97c42.zip |
Merge branch 'master' into XMEGA-Demo-Ports-ClockOnly
Diffstat (limited to 'LUFA/Drivers/Board/XMEGA/B1_XPLAINED/Dataflash.h')
-rw-r--r-- | LUFA/Drivers/Board/XMEGA/B1_XPLAINED/Dataflash.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/LUFA/Drivers/Board/XMEGA/B1_XPLAINED/Dataflash.h b/LUFA/Drivers/Board/XMEGA/B1_XPLAINED/Dataflash.h index 7a9c03ebe..28c79f197 100644 --- a/LUFA/Drivers/Board/XMEGA/B1_XPLAINED/Dataflash.h +++ b/LUFA/Drivers/Board/XMEGA/B1_XPLAINED/Dataflash.h @@ -29,29 +29,29 @@ */ /** \file - * \brief Board specific Dataflash driver header for the Atmel XMEGA A3BU Xplained. - * \copydetails Group_Dataflash_A3BU_XPLAINED + * \brief Board specific Dataflash driver header for the Atmel XMEGA B1 Xplained. + * \copydetails Group_Dataflash_B1_XPLAINED * * \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_A3BU_XPLAINED A3BU_XPLAINED - * \brief Board specific Dataflash driver header for the Atmel XMEGA A3BU Xplained. + * \defgroup Group_Dataflash_B1_XPLAINED B1_XPLAINED + * \brief Board specific Dataflash driver header for the Atmel XMEGA B1 Xplained. * - * Board specific Dataflash driver header for the Atmel XMEGA A3BU Xplained board. + * Board specific Dataflash driver header for the Atmel XMEGA B1 Xplained board. * * <table> * <tr><th>Name</th><th>Info</th><th>Select Pin</th><th>SPI Port</th></tr> * <tr><td>DATAFLASH_CHIP1</td><td>AT45DB642D (8MB)</td><td>PORTD.2</td><td>USARTC0 (In SPI Mode, Remapped)</td></tr> - * </table> + * </table> * * @{ */ -#ifndef __DATAFLASH_A3BU_XPLAINED_H__ -#define __DATAFLASH_A3BU_XPLAINED_H__ +#ifndef __DATAFLASH_B1_XPLAINED_H__ +#define __DATAFLASH_B1_XPLAINED_H__ /* Includes: */ #include "../../../../Common/Common.h" @@ -94,10 +94,10 @@ static inline void Dataflash_Init(void) { DATAFLASH_CHIPCS_PORT.DIRSET = DATAFLASH_CHIPCS_MASK; - + PORTCFG.MPCMASK = DATAFLASH_CHIPCS_MASK; - DATAFLASH_CHIPCS_PORT.PIN0CTRL = PORT_INVEN_bm; - + DATAFLASH_CHIPCS_PORT.PIN0CTRL = PORT_INVEN_bm; + PORTC.REMAP |= PORT_USART0_bm; } |