From 852ed2f1ad9ca7aeddd44f603a000522a5eae513 Mon Sep 17 00:00:00 2001
From: UncleRus <unclerus@gmail.com>
Date: Thu, 20 Apr 2017 01:35:38 +0500
Subject: [PATCH] Fixes unaligned writes to SPI data register
---
core/esp_spi.c | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
diff --git a/core/esp_spi.c b/core/esp_spi.c
index 4645adb..47dcd66 100644
--- a/core/esp_spi.c
+++ b/core/esp_spi.c
@@ -159,6 +159,22 @@ inline static void _start(uint8_t bus)
SPI(bus).CMD |= SPI_CMD_USR;
}
+inline static void _store_data(uint8_t bus, const void *data, size_t len)
+{
+ uint8_t words = len / 4;
+ uint8_t tail = len % 4;
+
+ memcpy((void *)SPI(bus).W, data, len - tail);
+
+ if (!tail) return;
+
+ uint32_t last = 0;
+ uint8_t *offs = (uint8_t *)data + len - tail;
+ for (uint8_t i = 0; i < tail; i++)
+ last = last | (offs[i] << (i * 8));
+ SPI(bus).W[words] = last;
+}
+
inline static uint32_t _swap_bytes(uint32_t value)
{
return (value << 24) | ((value << 8) & 0x00ff0000) | ((value >> 8) & 0x0000ff00) | (value >> 24);
@@ -189,9 +205,7 @@ static void _spi_buf_transfer(uint8_t bus, const void *out_data, void *in_data,
_wait(bus);
size_t bytes = len * (uint8_t)word_size;
_set_size(bus, bytes);
- memcpy((void *)SPI(bus).W, out_data, bytes); // FIXME: It's buggy when bytes = 2 or 3
-// for (uint8_t i = 0; i < bytes; i ++)
-// ((uint8_t *)SPI(bus).W)[i] = ((uint8_t *)out_data)[i];
+ _store_data(bus, out_data, bytes);
_spi_buf_prepare(bus, len, e, word_size);
_start(bus);
_wait(bus);
@@ -269,7 +283,7 @@ size_t spi_transfer(uint8_t bus, const void *out_data, void *in_data, size_t len
size_t offset = i * _SPI_BUF_SIZE;
_spi_buf_transfer(bus, (const uint8_t *)out_data + offset,
in_data ? (uint8_t *)in_data + offset : NULL, buf_size, e, word_size);
- if (blocks) _rearm_extras_bit(bus, false);
+ _rearm_extras_bit(bus, false);
}
uint8_t tail = len % buf_size;