From 6db80020b45ae22b19524b01f60d0653d70ac7ca Mon Sep 17 00:00:00 2001
From: Michael Sevakis <jethead71@rockbox.org>
Date: Sun, 12 Mar 2017 22:05:44 -0400
Subject: Do some housekeeping with fat.h and SECTOR_SIZE

Many includes of fat.h are pointless. Some includes are just for
SECTOR_SIZE. Add a file 'firmware/include/fs_defines.h' for that
and to define tuneable values that were scattered amongst various
headers.

Remove some local definitions of SECTOR_SIZE since they have to be
in agreement with the rest of the fs code anyway.

(We'll see what's in fact pointless in a moment ;)

Change-Id: I9ba183bf58bd87f5c45eba7bd675c7e2c1c18ed5
---
 firmware/target/arm/as3525/sd-as3525.c                 | 2 +-
 firmware/target/arm/as3525/sd-as3525v2.c               | 2 +-
 firmware/target/arm/ata-nand-telechips.c               | 3 +--
 firmware/target/arm/imx233/nand-imx233.c               | 2 +-
 firmware/target/arm/imx233/sdmmc-imx233.c              | 1 -
 firmware/target/arm/pnx0101/iriver-ifp7xx/usb-ifp7xx.c | 1 -
 firmware/target/arm/pp/ata-sd-pp.c                     | 2 +-
 firmware/target/arm/tms320dm320/sdmmc-dm320.c          | 2 --
 8 files changed, 5 insertions(+), 10 deletions(-)

(limited to 'firmware/target/arm')

diff --git a/firmware/target/arm/as3525/sd-as3525.c b/firmware/target/arm/as3525/sd-as3525.c
index 4530d5d763..e65a7525b6 100644
--- a/firmware/target/arm/as3525/sd-as3525.c
+++ b/firmware/target/arm/as3525/sd-as3525.c
@@ -23,7 +23,7 @@
 /* Driver for the ARM PL180 SD/MMC controller inside AS3525 SoC */
 
 #include "config.h" /* for HAVE_MULTIDRIVE & AMS_OF_SIZE */
-#include "fat.h"
+#include "fs_defines.h"
 #include "thread.h"
 #include "led.h"
 #include "sdmmc.h"
diff --git a/firmware/target/arm/as3525/sd-as3525v2.c b/firmware/target/arm/as3525/sd-as3525v2.c
index dec36a520d..3f39629e0b 100644
--- a/firmware/target/arm/as3525/sd-as3525v2.c
+++ b/firmware/target/arm/as3525/sd-as3525v2.c
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #include "config.h" /* for HAVE_MULTIVOLUME */
-#include "fat.h"
+#include "fs_defines.h"
 #include "thread.h"
 #include "gcc_extensions.h"
 #include "led.h"
diff --git a/firmware/target/arm/ata-nand-telechips.c b/firmware/target/arm/ata-nand-telechips.c
index b8e572068c..869a53c1ef 100644
--- a/firmware/target/arm/ata-nand-telechips.c
+++ b/firmware/target/arm/ata-nand-telechips.c
@@ -28,8 +28,7 @@
 #include "panic.h"
 #include "nand_id.h"
 #include "storage.h"
-
-#define SECTOR_SIZE 512
+#include "fs_defines.h"
 
 /* ECC on read is implemented on the assumption that MLC-style 4-bit correction
    is always used regardless of NAND chip type. This assumption is true for at
diff --git a/firmware/target/arm/imx233/nand-imx233.c b/firmware/target/arm/imx233/nand-imx233.c
index 22c4fc2748..a7afba7d43 100644
--- a/firmware/target/arm/imx233/nand-imx233.c
+++ b/firmware/target/arm/imx233/nand-imx233.c
@@ -23,7 +23,7 @@
 #include "gpmi-imx233.h"
 #include "pinctrl-imx233.h"
 #include "button-target.h"
-#include "fat.h"
+#include "fs_defines.h"
 #include "disk.h"
 #include "usb.h"
 #include "debug.h"
diff --git a/firmware/target/arm/imx233/sdmmc-imx233.c b/firmware/target/arm/imx233/sdmmc-imx233.c
index 28310fbfd1..d3dabafecb 100644
--- a/firmware/target/arm/imx233/sdmmc-imx233.c
+++ b/firmware/target/arm/imx233/sdmmc-imx233.c
@@ -27,7 +27,6 @@
 #include "pinctrl-imx233.h"
 #include "partitions-imx233.h"
 #include "button-target.h"
-#include "fat.h"
 #include "disk.h"
 #include "usb.h"
 #include "debug.h"
diff --git a/firmware/target/arm/pnx0101/iriver-ifp7xx/usb-ifp7xx.c b/firmware/target/arm/pnx0101/iriver-ifp7xx/usb-ifp7xx.c
index 2f3c4189e5..0bfcdf3b1a 100644
--- a/firmware/target/arm/pnx0101/iriver-ifp7xx/usb-ifp7xx.c
+++ b/firmware/target/arm/pnx0101/iriver-ifp7xx/usb-ifp7xx.c
@@ -25,7 +25,6 @@
 #include "system.h"
 #include "debug.h"
 #include "ata.h"
-#include "fat.h"
 #include "disk.h"
 #include "panic.h"
 #include "lcd.h"
diff --git a/firmware/target/arm/pp/ata-sd-pp.c b/firmware/target/arm/pp/ata-sd-pp.c
index 2a11b40fee..edb806ab96 100644
--- a/firmware/target/arm/pp/ata-sd-pp.c
+++ b/firmware/target/arm/pp/ata-sd-pp.c
@@ -35,8 +35,8 @@
 #include "usb.h"
 #include "sd.h"
 #include "storage.h"
+#include "fs_defines.h"
 
-#define SECTOR_SIZE     512
 #define BLOCKS_PER_BANK 0x7a7800
 
 /* Comparing documentations of various MMC/SD controllers revealed, */
diff --git a/firmware/target/arm/tms320dm320/sdmmc-dm320.c b/firmware/target/arm/tms320dm320/sdmmc-dm320.c
index d46dbf5e40..a6e261bcfa 100644
--- a/firmware/target/arm/tms320dm320/sdmmc-dm320.c
+++ b/firmware/target/arm/tms320dm320/sdmmc-dm320.c
@@ -43,7 +43,6 @@
 #endif
 #include "sdmmc.h"
 #include "disk.h"
-#include "fat.h"
 #include "system-target.h"
 
 /* The configuration method is not very flexible. */
@@ -72,7 +71,6 @@
 #define UNALIGNED_NUM_SECTORS   10
 #define MAX_TRANSFER_ERRORS     10
 
-#define SECTOR_SIZE        512
 #define BLOCKS_PER_BANK    0x7A7800
 
 /* command flags for send_cmd */
-- 
cgit v1.2.3