From b29e0b945ddad9e915a59ca2b8f89a4363641c0d Mon Sep 17 00:00:00 2001
From: "S.J.R. van Schaik" <stephan@whiteboxsystems.nl>
Date: Tue, 19 Sep 2017 14:16:21 +0200
Subject: [PATCH] tbm: fix minor issues during compilation

---
 include/console.h              | 4 ++++
 include/mufs.h                 | 2 ++
 source/core/flash.c            | 4 ++--
 source/drivers/sandbox_flash.c | 2 +-
 source/ftl/map.c               | 2 +-
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/include/console.h b/include/console.h
index 4677b24..ad83fd0 100644
--- a/include/console.h
+++ b/include/console.h
@@ -2,6 +2,10 @@
 
 #include <stdio.h>
 
+#if HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
 struct console {
 	FILE *fp;
 };
diff --git a/include/mufs.h b/include/mufs.h
index 378cc3b..c3a7102 100644
--- a/include/mufs.h
+++ b/include/mufs.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <stdint.h>
+
 struct flash_dev;
 struct mufs;
 struct mufs_dir;
diff --git a/source/core/flash.c b/source/core/flash.c
index 412754c..9b86489 100644
--- a/source/core/flash.c
+++ b/source/core/flash.c
@@ -5,9 +5,9 @@
 #include <flash.h>
 #include <macros.h>
 
-static int default_flash_is_val(struct flash_dev *dev, uint32_t addr, char val)
+static int default_flash_is_val(struct flash_dev *dev, uint32_t addr, uint8_t val)
 {
-	char data[32];
+	uint8_t data[32];
 	size_t i, nbytes, len = 1 << dev->log2_block_size;
 
 	addr <<= dev->log2_block_size;
diff --git a/source/drivers/sandbox_flash.c b/source/drivers/sandbox_flash.c
index 21f9ea6..5a252e8 100644
--- a/source/drivers/sandbox_flash.c
+++ b/source/drivers/sandbox_flash.c
@@ -32,7 +32,7 @@ static struct flash_ops stdio_flash_ops = {
 	.read = stdio_flash_read,
 	.write = stdio_flash_write,
 	.copy = default_flash_copy,
-	.is_erased = default_flash_is_erased,
+	.is_erased = default_flash_is_one,
 	.erase = stdio_flash_erase,
 };
 
diff --git a/source/ftl/map.c b/source/ftl/map.c
index 8778d91..34f9ede 100644
--- a/source/ftl/map.c
+++ b/source/ftl/map.c
@@ -14,7 +14,7 @@
  */
 static int is_group_erased(struct ftl_map *map, uint32_t group)
 {
-	char data[32];
+	uint8_t data[32];
 	struct flash_dev *dev = map->dev;
 	uint32_t addr = group << (map->log2_pages_per_group + map->log2_page_size);
 	size_t i, nbytes, len = 1 << (map->log2_pages_per_group + map->log2_page_size);