Update FatFS port to v0.13b
Remove integer patch. The tests pass without applying it, and better to use unmodified upstream code whenever practical. Fix #2766
This commit is contained in:
parent
1afbc7f952
commit
b8ad9ad880
|
@ -1 +1 @@
|
||||||
819dcca8a2acf0b63c6b316e0b799445aa922ffe
|
d92b7f32968c8a74dcaf89a47027ade8a4068090
|
||||||
|
|
|
@ -1,13 +1,11 @@
|
||||||
LICENSE := BSD
|
LICENSE := BSD
|
||||||
VERSION := 0.13a
|
VERSION := 0.13b
|
||||||
DOWNLOADS := fatfs.archive
|
DOWNLOADS := fatfs.archive
|
||||||
|
|
||||||
URL(fatfs) := http://www.elm-chan.org/fsw/ff/arc/ff13a.zip
|
URL(fatfs) := http://www.elm-chan.org/fsw/ff/arc/ff13b.zip
|
||||||
SHA(fatfs) := 0c74176ccf0c20b66e55b700c9ba826b43815b8b
|
SHA(fatfs) := b54f5187c827310b860b758cc5c736f7d728d3fd
|
||||||
DIR(fatfs) := src/lib/fatfs
|
DIR(fatfs) := src/lib/fatfs
|
||||||
|
|
||||||
PATCHES := src/lib/fatfs/integer.patch
|
|
||||||
|
|
||||||
DIRS := include/fatfs
|
DIRS := include/fatfs
|
||||||
DIR_CONTENT(include/fatfs) := \
|
DIR_CONTENT(include/fatfs) := \
|
||||||
$(addprefix src/lib/fatfs/source/, ff.h diskio.h integer.h ffconf.h)
|
$(addprefix src/lib/fatfs/source/, ff.h diskio.h integer.h ffconf.h)
|
||||||
|
|
|
@ -1,36 +0,0 @@
|
||||||
--- src/lib/fatfs/source/integer.h 2017-05-21 13:10:48.000000000 -0500
|
|
||||||
+++ src/lib/fatfs/source/integer.h 2017-07-22 10:59:54.856013544 -0500
|
|
||||||
@@ -14,24 +14,26 @@
|
|
||||||
|
|
||||||
#else /* Embedded platform */
|
|
||||||
|
|
||||||
+#include <base/fixed_stdint.h>
|
|
||||||
+
|
|
||||||
/* These types MUST be 16-bit or 32-bit */
|
|
||||||
typedef int INT;
|
|
||||||
typedef unsigned int UINT;
|
|
||||||
|
|
||||||
/* This type MUST be 8-bit */
|
|
||||||
-typedef unsigned char BYTE;
|
|
||||||
+typedef genode_uint8_t BYTE;
|
|
||||||
|
|
||||||
/* These types MUST be 16-bit */
|
|
||||||
-typedef short SHORT;
|
|
||||||
-typedef unsigned short WORD;
|
|
||||||
-typedef unsigned short WCHAR;
|
|
||||||
+typedef genode_int16_t SHORT;
|
|
||||||
+typedef genode_uint16_t WORD;
|
|
||||||
+typedef genode_uint16_t WCHAR;
|
|
||||||
|
|
||||||
/* These types MUST be 32-bit */
|
|
||||||
-typedef long LONG;
|
|
||||||
-typedef unsigned long DWORD;
|
|
||||||
+typedef genode_int32_t LONG;
|
|
||||||
+typedef genode_uint32_t DWORD;
|
|
||||||
|
|
||||||
/* This type MUST be 64-bit (Remove this for ANSI C (C89) compatibility) */
|
|
||||||
-typedef unsigned long long QWORD;
|
|
||||||
+typedef genode_uint64_t QWORD;
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user