From 33915be7bee853d329741025d55a1c056f008494 Mon Sep 17 00:00:00 2001
From: schneider <schneider@blinkenlichts.net>
Date: Wed, 17 Jul 2019 19:42:06 +0200
Subject: [PATCH] fix(lib): give mx25lba its own meson file
---
lib/card10/meson.build | 27 ---------------------------
lib/meson.build | 1 +
lib/mx25lba/meson.build | 25 +++++++++++++++++++++++++
lib/{card10 => mx25lba}/mx25lba.c | 11 -----------
lib/{card10 => mx25lba}/mx25lba.h | 0
5 files changed, 26 insertions(+), 38 deletions(-)
create mode 100644 lib/mx25lba/meson.build
rename lib/{card10 => mx25lba}/mx25lba.c (94%)
rename lib/{card10 => mx25lba}/mx25lba.h (100%)
diff --git a/lib/card10/meson.build b/lib/card10/meson.build
index 085e8992..5c51f5f1 100644
--- a/lib/card10/meson.build
+++ b/lib/card10/meson.build
@@ -35,30 +35,3 @@ libcard10 = declare_dependency(
dependencies: deps,
)
-##########################################################
-
-includes = include_directories(
- './',
-)
-
-sources = files(
- 'mx25lba.c',
-)
-
-deps = [
- board_card10,
- periphdriver,
-]
-
-lib = static_library(
- 'mx25lba',
- sources,
- include_directories: includes,
- dependencies: deps,
-)
-
-mx25lba = declare_dependency(
- include_directories: includes,
- link_with: lib,
- dependencies: deps,
-)
diff --git a/lib/meson.build b/lib/meson.build
index ff090b24..e43c62db 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -12,4 +12,5 @@ subdir('./FreeRTOS-Plus/')
subdir('./micropython/')
subdir('./card10/')
+subdir('./mx25lba/')
subdir('./ff13/')
diff --git a/lib/mx25lba/meson.build b/lib/mx25lba/meson.build
new file mode 100644
index 00000000..50a24510
--- /dev/null
+++ b/lib/mx25lba/meson.build
@@ -0,0 +1,25 @@
+includes = include_directories(
+ './',
+)
+
+sources = files(
+ 'mx25lba.c',
+)
+
+deps = [
+ board_card10,
+ periphdriver,
+]
+
+lib = static_library(
+ 'mx25lba',
+ sources,
+ include_directories: includes,
+ dependencies: deps,
+)
+
+mx25lba = declare_dependency(
+ include_directories: includes,
+ link_with: lib,
+ dependencies: deps,
+)
diff --git a/lib/card10/mx25lba.c b/lib/mx25lba/mx25lba.c
similarity index 94%
rename from lib/card10/mx25lba.c
rename to lib/mx25lba/mx25lba.c
index df13bc1e..c0af3557 100644
--- a/lib/card10/mx25lba.c
+++ b/lib/mx25lba/mx25lba.c
@@ -35,17 +35,6 @@
*******************************************************************************
*/
-/**
- * @file mscmem.h
- * @brief Memory routines used by the USB Mass Storage Class example.
- * See the msc_mem_t structure in msc.h for function details.
- * @details Functions are provided for using the internal RAM of the
- * device or the external SPI flash memory. Use the SPIXF_DISK
- * and RAM_DISK defines to select the desired memory at compile
- * time.
- */
-
-#include "mscmem.h"
#include <string.h>
#include <stdio.h>
#include "mx25.h"
diff --git a/lib/card10/mx25lba.h b/lib/mx25lba/mx25lba.h
similarity index 100%
rename from lib/card10/mx25lba.h
rename to lib/mx25lba/mx25lba.h
--
GitLab