From 06813f8d0b15a67455c4ee9f6750fa9236a96db0 Mon Sep 17 00:00:00 2001
From: Rahix <rahix@rahix.de>
Date: Tue, 16 Jul 2019 09:53:53 +0200
Subject: [PATCH] fix(epicardium): Move fatfs into modules subdir
Signed-off-by: Rahix <rahix@rahix.de>
---
epicardium/fatfs.h | 7 -------
epicardium/main.c | 1 -
epicardium/meson.build | 1 -
epicardium/{ => modules}/fatfs.c | 0
epicardium/modules/meson.build | 1 +
epicardium/modules/modules.h | 3 +++
6 files changed, 4 insertions(+), 9 deletions(-)
delete mode 100644 epicardium/fatfs.h
rename epicardium/{ => modules}/fatfs.c (100%)
diff --git a/epicardium/fatfs.h b/epicardium/fatfs.h
deleted file mode 100644
index 18891f43f..000000000
--- a/epicardium/fatfs.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef EPICARDIUM_FATFS_INCLUDED
-#define EPICARDIUM_FATFS_INCLUDED
-
-void fatfs_init(void);
-
-#endif//EPICARDIUM_FATFS_INCLUDED
-
diff --git a/epicardium/main.c b/epicardium/main.c
index 760901400..e61f533c2 100644
--- a/epicardium/main.c
+++ b/epicardium/main.c
@@ -4,7 +4,6 @@
#include "max32665.h"
#include "uart.h"
#include "cdcacm.h"
-#include "fatfs.h"
#include "card10.h"
#include "pmic.h"
diff --git a/epicardium/meson.build b/epicardium/meson.build
index 0e6d4988f..26f36cd47 100644
--- a/epicardium/meson.build
+++ b/epicardium/meson.build
@@ -67,7 +67,6 @@ subdir('modules/')
elf = executable(
name + '.elf',
'cdcacm.c',
- 'fatfs.c',
'main.c',
'support.c',
module_sources,
diff --git a/epicardium/fatfs.c b/epicardium/modules/fatfs.c
similarity index 100%
rename from epicardium/fatfs.c
rename to epicardium/modules/fatfs.c
diff --git a/epicardium/modules/meson.build b/epicardium/modules/meson.build
index 9f2d2c070..d77973ad7 100644
--- a/epicardium/modules/meson.build
+++ b/epicardium/modules/meson.build
@@ -1,4 +1,5 @@
module_sources = files(
+ 'fatfs.c',
'leds.c',
'pmic.c',
'serial.c',
diff --git a/epicardium/modules/modules.h b/epicardium/modules/modules.h
index a66d8285c..8fe73d597 100644
--- a/epicardium/modules/modules.h
+++ b/epicardium/modules/modules.h
@@ -1,6 +1,9 @@
#ifndef MODULES_H
#define MODULES_H
+/* FatFS */
+void fatfs_init(void);
+
/* ---------- Serial ------------------------------------------------------- */
#define SERIAL_READ_BUFFER_SIZE 128
void vSerialTask(void *pvParameters);
--
GitLab