Update Studio Integration DLL, to include package logging.

[pub/USBasp.git] / 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 0b1b16d..15f267c 100644 (file)
--- 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, 2012.
+     Copyright (C) Dean Camera, 2015.
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
-  Copyright 2012  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
@@ -29,18 +29,18 @@
 */
 
 /** \file
- *  \brief Board specific Dataflash driver header for the Atmel XMEGA B1 Xplained.
- *  \copydetails Group_Dataflash_B1_XPLAINED
+ *  \brief Board specific Dataflash driver header for the Atmel XMEGA A3BU Xplained.
+ *  \copydetails Group_Dataflash_A3BU_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_B1_XPLAINED B1_XPLAINED
- *  \brief Board specific Dataflash driver header for the Atmel XMEGA B1 Xplained.
+ *  \defgroup Group_Dataflash_A3BU_XPLAINED A3BU_XPLAINED
+ *  \brief Board specific Dataflash driver header for the Atmel XMEGA A3BU Xplained.
  *
- *  Board specific Dataflash driver header for the Atmel XMEGA B1 Xplained board.
+ *  Board specific Dataflash driver header for the Atmel XMEGA A3BU Xplained board.
  *
  *  <table>
  *    <tr><th>Name</th><th>Info</th><th>Select Pin</th><th>SPI Port</th></tr>
@@ -50,8 +50,8 @@
  *  @{
  */
 
-#ifndef __DATAFLASH_B1_XPLAINED_H__
-#define __DATAFLASH_B1_XPLAINED_H__
+#ifndef __DATAFLASH_A3BU_XPLAINED_H__
+#define __DATAFLASH_A3BU_XPLAINED_H__
 
        /* Includes: */
                #include "../../../../Common/Common.h"
@@ -89,14 +89,20 @@
 
                /* 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)
                        {
                                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;
+
+                               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.