From b8ad9ad8809ac4ad7b4879880594c76d5c3bfd92 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Mon, 16 Apr 2018 11:17:21 +0200 Subject: [PATCH] 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 --- repos/libports/ports/fatfs.hash | 2 +- repos/libports/ports/fatfs.port | 8 ++--- repos/libports/src/lib/fatfs/integer.patch | 36 ---------------------- 3 files changed, 4 insertions(+), 42 deletions(-) delete mode 100644 repos/libports/src/lib/fatfs/integer.patch diff --git a/repos/libports/ports/fatfs.hash b/repos/libports/ports/fatfs.hash index cbf780c471..7e737d7fe7 100644 --- a/repos/libports/ports/fatfs.hash +++ b/repos/libports/ports/fatfs.hash @@ -1 +1 @@ -819dcca8a2acf0b63c6b316e0b799445aa922ffe +d92b7f32968c8a74dcaf89a47027ade8a4068090 diff --git a/repos/libports/ports/fatfs.port b/repos/libports/ports/fatfs.port index c271db24b8..027ab80376 100644 --- a/repos/libports/ports/fatfs.port +++ b/repos/libports/ports/fatfs.port @@ -1,13 +1,11 @@ LICENSE := BSD -VERSION := 0.13a +VERSION := 0.13b DOWNLOADS := fatfs.archive -URL(fatfs) := http://www.elm-chan.org/fsw/ff/arc/ff13a.zip -SHA(fatfs) := 0c74176ccf0c20b66e55b700c9ba826b43815b8b +URL(fatfs) := http://www.elm-chan.org/fsw/ff/arc/ff13b.zip +SHA(fatfs) := b54f5187c827310b860b758cc5c736f7d728d3fd DIR(fatfs) := src/lib/fatfs -PATCHES := src/lib/fatfs/integer.patch - DIRS := include/fatfs DIR_CONTENT(include/fatfs) := \ $(addprefix src/lib/fatfs/source/, ff.h diskio.h integer.h ffconf.h) diff --git a/repos/libports/src/lib/fatfs/integer.patch b/repos/libports/src/lib/fatfs/integer.patch deleted file mode 100644 index bd0ea1e426..0000000000 --- a/repos/libports/src/lib/fatfs/integer.patch +++ /dev/null @@ -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 -+ - /* 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 -