eqmk/qmk_firmware
1
0
Fork 0
forked from mfulz_github/qmk_firmware
Code Issues Pull Requests Projects Releases Wiki Activity

Fix broken USART SPI driver for the AVR8 architecture.

Browse Source
This commit is contained in:
Dean Camera 2013-08-12 16:27:06 +02:00
parent 5558b2f221
commit a4a6958524
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
LUFA/DoxygenPages/ChangeLog.txt
View File

@ -40,6 +40,7 @@
* - Fixed Pipe_GetBoundEndpointAddress() returning invalid endpoint directions on AVR8 architecture devices (thanks to decerri) * - Fixed Pipe_GetBoundEndpointAddress() returning invalid endpoint directions on AVR8 architecture devices (thanks to decerri)
* under some circumstances * under some circumstances
* - Fixed incorrect USB device state set when a suspended LUFA device is woken while addressed but not configured (thanks to Balaji Krishnan) * - Fixed incorrect USB device state set when a suspended LUFA device is woken while addressed but not configured (thanks to Balaji Krishnan)
* - Fixed broken USART SPI driver for the AVR8 architecture due to incorrect initialization
* - Library Applications: * - Library Applications:
* - Added handler for SCSI_CMD_START_STOP_UNIT in demos using the Mass Storage class, to prevent ejection errors on *nix systems due to an * - Added handler for SCSI_CMD_START_STOP_UNIT in demos using the Mass Storage class, to prevent ejection errors on *nix systems due to an
* unknown SCSI command * unknown SCSI command

8
LUFA/Drivers/Peripheral/AVR8/SerialSPI_AVR8.h
View File

@ -133,13 +133,13 @@
static inline void SerialSPI_Init(const uint8_t SPIOptions, static inline void SerialSPI_Init(const uint8_t SPIOptions,
const uint32_t BaudRate) const uint32_t BaudRate)
{ {
UBRR1 = SERIAL_SPI_UBBRVAL(BaudRate); DDRD |= ((1 << 3) | (1 << 5));
PORTD |= (1 << 2);
UCSR1C = ((1 << UMSEL11) | (1 << UMSEL10) | SPIOptions); UCSR1C = ((1 << UMSEL11) | (1 << UMSEL10) | SPIOptions);
UCSR1B = ((1 << TXEN1) | (1 << RXEN1)); UCSR1B = ((1 << TXEN1) | (1 << RXEN1));
DDRD |= (1 << 3); UBRR1 = SERIAL_SPI_UBBRVAL(BaudRate);
PORTD |= (1 << 2);
} }
/** Turns off the USART driver, disabling and returning used hardware to their default configuration. */ /** Turns off the USART driver, disabling and returning used hardware to their default configuration. */
@ -151,7 +151,7 @@
UBRR1 = 0; UBRR1 = 0;
DDRD &= ~(1 << 3); DDRD &= ~((1 << 3) | (1 << 5));
PORTD &= ~(1 << 2); PORTD &= ~(1 << 2);
} }