X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/10448970e5c4c5ad374f0887532fedc0daf97c42..1e9e7bc8b88af32f466f7438a06fb8dc96b3035d:/LUFA/Drivers/Board/XMEGA/B1_XPLAINED/Dataflash.h diff --git a/LUFA/Drivers/Board/XMEGA/B1_XPLAINED/Dataflash.h b/LUFA/Drivers/Board/XMEGA/B1_XPLAINED/Dataflash.h index 28c79f197..aefa0d6d6 100644 --- a/LUFA/Drivers/Board/XMEGA/B1_XPLAINED/Dataflash.h +++ b/LUFA/Drivers/Board/XMEGA/B1_XPLAINED/Dataflash.h @@ -1,13 +1,13 @@ /* LUFA Library - Copyright (C) Dean Camera, 2013. + Copyright (C) Dean Camera, 2018. dean [at] fourwalledcubicle [dot] com www.lufa-lib.org */ /* - Copyright 2013 Dean Camera (dean [at] fourwalledcubicle [dot] com) + Copyright 2018 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) { @@ -98,7 +98,12 @@ PORTCFG.MPCMASK = DATAFLASH_CHIPCS_MASK; DATAFLASH_CHIPCS_PORT.PIN0CTRL = PORT_INVEN_bm; - PORTC.REMAP |= PORT_USART0_bm; + SerialSPI_Init(&USARTC0, (USART_SPI_SCK_LEAD_RISING | USART_SPI_SAMPLE_LEADING | USART_SPI_ORDER_MSB_FIRST), (F_CPU / 2)); + + PORTC.REMAP |= PORT_USART0_bm; + PORTC.DIRSET = PIN7_bm | PIN5_bm; + PORTC.DIRCLR = PIN6_bm; + PORTC.PIN6CTRL = PORT_OPC_PULLUP_gc; } /** Sends a byte to the currently selected dataflash IC, and returns a byte from the dataflash.