From 73788ae5e60056f19cf5ba350c4f106ea8b5a64e Mon Sep 17 00:00:00 2001
From: "S.J.R. van Schaik" <stephan@whiteboxsystems.nl>
Date: Thu, 27 Jul 2017 15:24:34 +0200
Subject: [PATCH] flash: consistently use char instead of uint8_t

---
 source/drivers/spi_flash.c | 24 +++++++++++++-----------
 source/fs/mufs/tree.c      |  2 +-
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/source/drivers/spi_flash.c b/source/drivers/spi_flash.c
index efc62d4..c888436 100644
--- a/source/drivers/spi_flash.c
+++ b/source/drivers/spi_flash.c
@@ -35,11 +35,11 @@ static void spi_flash_addr(char *cmd, uint32_t addr)
 	cmd[3] = addr;
 }
 
-static uint8_t spi_flash_get_status1(struct flash_dev *dev)
+static char spi_flash_get_status1(struct flash_dev *dev)
 {
 	struct spi_dev *spi_dev = dev->priv;
-	uint8_t cmd = SPI_FLASH_READ_SR1;
-	uint8_t ret;
+	char cmd = SPI_FLASH_READ_SR1;
+	char ret;
 
 	spi_tx_rx(spi_dev, &ret, sizeof ret, &cmd, sizeof cmd);
 
@@ -69,11 +69,11 @@ static void spi_flash_write_disable(struct flash_dev *dev)
 	spi_tx_rx(spi_dev, NULL, 0, cmd, sizeof cmd);
 }
 
-static size_t spi_flash_get_jedec_id(struct flash_dev *dev, uint8_t *jedec_id,
+static size_t spi_flash_get_jedec_id(struct flash_dev *dev, char *jedec_id,
 	size_t len)
 {
-	uint8_t cmd[1] = { SPI_FLASH_JEDEC_ID };
-	uint8_t buf[3];
+	char cmd[1] = { SPI_FLASH_JEDEC_ID };
+	char buf[3];
 	struct spi_dev *spi_dev = dev->priv;
 
 	spi_tx_rx(spi_dev, buf, sizeof buf, cmd, sizeof cmd);
@@ -85,7 +85,7 @@ static size_t spi_flash_get_jedec_id(struct flash_dev *dev, uint8_t *jedec_id,
 
 static size_t spi_flash_get_size(struct flash_dev *dev)
 {
-	uint8_t jedec_id[4];
+	char jedec_id[4];
 
 	spi_flash_get_jedec_id(dev, jedec_id, sizeof jedec_id);
 
@@ -96,6 +96,7 @@ static size_t spi_flash_read(struct flash_dev *dev, uint32_t addr, void *data,
 	size_t len)
 {
 	char cmd[4];
+	char *buf = data;
 	struct spi_dev *spi_dev = dev->priv;
 	size_t nbytes, ret = 0;
 
@@ -105,10 +106,10 @@ static size_t spi_flash_read(struct flash_dev *dev, uint32_t addr, void *data,
 
 		nbytes = min(len, 32);
 
-		spi_tx_rx(spi_dev, data, len, cmd, sizeof cmd);
+		spi_tx_rx(spi_dev, buf, len, cmd, sizeof cmd);
 
 		addr += nbytes;
-		data += nbytes;
+		buf += nbytes;
 		len -= nbytes;
 		ret += nbytes;
 	}
@@ -120,6 +121,7 @@ static size_t spi_flash_write(struct flash_dev *dev, uint32_t addr,
 	const void *data, size_t len)
 {
 	char cmd[4 + 32];
+	const char *buf = data;
 	struct spi_dev *spi_dev = dev->priv;
 	size_t nbytes, ret = 0;
 
@@ -132,12 +134,12 @@ static size_t spi_flash_write(struct flash_dev *dev, uint32_t addr,
 		nbytes = min(len, 32);
 		nbytes = min(nbytes, align_up(addr + 1, ilog2(256)) - addr);
 
-		memmove(cmd + 4, data, nbytes);
+		memmove(cmd + 4, buf, nbytes);
 		spi_tx_rx(spi_dev, NULL, 0, cmd, 4 + nbytes);
 		spi_flash_wait(dev);
 
 		addr += nbytes;
-		data += nbytes;
+		buf += nbytes;
 		len -= nbytes;
 		ret += nbytes;
 	}
diff --git a/source/fs/mufs/tree.c b/source/fs/mufs/tree.c
index aeead8e..c489542 100644
--- a/source/fs/mufs/tree.c
+++ b/source/fs/mufs/tree.c
@@ -234,7 +234,7 @@ static size_t mufs_do_read(struct mufs_tree *tree, void *data, uint32_t va,
 
 size_t mufs_tree_read(struct mufs_tree *tree, void *data, uint32_t va, size_t len)
 {
-	uint8_t *buf = data;
+	char *buf = data;
 	size_t ret, nbytes = 0;
 
 	while (len) {