Mirror
/
klipper-dgus
mirror of https://github.com/Desuuuu/klipper.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

stm32: fix spi_transfer for stm32f0 

The current code accesses the DR as 32 bit. This enabled data packing mode,
effectively adding a 00 byte between each sent byte. The receive side had
similar problems.
To prevent this, all accesses are 8 bit now, even though this is not
necessary on stmf[14].

Signed-off-by: Arne Jansen <arne@die-jansens.de>
This commit is contained in:
Arne Jansen 2020-01-18 20:02:06 +00:00 committed by KevinOConnor
parent b3c3b61387
commit ce35ee45d6
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/stm32/spi.c
View File

@ -4,6 +4,7 @@
// //
// This file may be distributed under the terms of the GNU GPLv3 license. // This file may be distributed under the terms of the GNU GPLv3 license.
#include "board/io.h" // readb, writeb
#include "command.h" // shutdown #include "command.h" // shutdown
#include "gpio.h" // spi_setup #include "gpio.h" // spi_setup
#include "internal.h" // gpio_peripheral #include "internal.h" // gpio_peripheral
@ -53,6 +54,11 @@ spi_setup(uint32_t bus, uint8_t mode, uint32_t rate)
gpio_peripheral(spi_bus[bus].miso_pin, spi_bus[bus].function, 1); gpio_peripheral(spi_bus[bus].miso_pin, spi_bus[bus].function, 1);
gpio_peripheral(spi_bus[bus].mosi_pin, spi_bus[bus].function, 0); gpio_peripheral(spi_bus[bus].mosi_pin, spi_bus[bus].function, 0);
gpio_peripheral(spi_bus[bus].sck_pin, spi_bus[bus].function, 0); gpio_peripheral(spi_bus[bus].sck_pin, spi_bus[bus].function, 0);
// Configure CR2 on stm32f0
#if CONFIG_MACH_STM32F0
spi->CR2 = SPI_CR2_FRXTH | (7 << SPI_CR2_DS_Pos);
#endif
} }
// Calculate CR1 register // Calculate CR1 register
@ -79,10 +85,10 @@ spi_transfer(struct spi_config config, uint8_t receive_data,
{ {
SPI_TypeDef *spi = config.spi; SPI_TypeDef *spi = config.spi;
while (len--) { while (len--) {
spi->DR = *data; writeb((void *)&spi->DR, *data);
while (!(spi->SR & SPI_SR_RXNE)) while (!(spi->SR & SPI_SR_RXNE))
; ;
uint8_t rdata = spi->DR; uint8_t rdata = readb((void *)&spi->DR);
if (receive_data) if (receive_data)
*data = rdata; *data = rdata;
data++; data++;