X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/10448970e5c4c5ad374f0887532fedc0daf97c42..3642ea0b9715cdf0196b10c9fc97898940eaefa6:/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/Dataflash.h

diff --git a/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/Dataflash.h b/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/Dataflash.h
index 143fbbffc..15f267c4f 100644
--- a/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/Dataflash.h
+++ b/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/Dataflash.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2013.
+     Copyright (C) Dean Camera, 2015.
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
-  Copyright 2013  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2015  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
@@ -89,7 +89,7 @@
 
 		/* Inline Functions: */
 			/** Initializes the dataflash driver so that commands and data may be sent to an attached dataflash IC.
-			 *  The microcontroller's SPI driver MUST be initialized before any of the dataflash commands are used.
+			 *  The appropriate SPI interface will be automatically configured.
 			 */
 			static inline void Dataflash_Init(void)
 			{
@@ -97,6 +97,12 @@
 
 				PORTCFG.MPCMASK                = DATAFLASH_CHIPCS_MASK;
 				DATAFLASH_CHIPCS_PORT.PIN0CTRL = PORT_INVEN_bm;
+
+				SerialSPI_Init(&USARTD0, (USART_SPI_SCK_LEAD_RISING | USART_SPI_SAMPLE_LEADING | USART_SPI_ORDER_MSB_FIRST), (F_CPU / 2));
+
+				PORTD.DIRSET   = PIN3_bm | PIN1_bm;
+				PORTD.DIRCLR   = PIN2_bm;
+				PORTC.PIN2CTRL = PORT_OPC_PULLUP_gc;
 			}
 
 			/** Sends a byte to the currently selected dataflash IC, and returns a byte from the dataflash.