riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #16412 from benpicco/pkg/fatfs-r0.14b

Browse Source 
pkg/fatfs: bump version to r0.14b
This commit is contained in:
Alexandre Abadie 2022-01-03 19:09:37 +01:00 committed by GitHub
commit 07e46cef0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 36 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/fatfs/Makefile
View File

@ -2,7 +2,7 @@ PKG_NAME=fatfs
# upstream server is very unreliable, instead host the extracted
# .zip file on GitHub and apply only the upstream patches
PKG_URL=https://github.com/RIOT-OS/FatFS
PKG_VERSION=fb99d00924fd17c2d9c0789510852c2c286403ab # R0.14a
PKG_VERSION=246c97b1eb7f1900eb00d5ed7e3bf4cdb4558039 # r0.14b
PKG_LICENSE=BSD-1-Clause
include $(RIOTBASE)/pkg/pkg.mk

61
pkg/fatfs/patches/0001-remove-ffconf.h.patch
View File

@ -1,24 +1,24 @@
From af647820a330eae463fdf073908dc6f79014481d Mon Sep 17 00:00:00 2001
From 6ff7b277e8f148784c5f2fcbabaf651b45ce6873 Mon Sep 17 00:00:00 2001
From: Benjamin Valentin <benpicco@googlemail.com>
Date: Sun, 31 Jan 2021 20:00:17 +0100
Date: Thu, 29 Apr 2021 10:12:36 +0200
Subject: [PATCH 1/2] remove ffconf.h
---
source/ffconf.h | 298 ------------------------------------------------
1 file changed, 298 deletions(-)
source/ffconf.h | 301 ------------------------------------------------
1 file changed, 301 deletions(-)
delete mode 100644 source/ffconf.h
diff --git a/source/ffconf.h b/source/ffconf.h
deleted file mode 100644
index 632736b..0000000
index 3eefdf4..0000000
--- a/source/ffconf.h
+++ /dev/null
@@ -1,298 +0,0 @@
@@ -1,301 +0,0 @@
-/*---------------------------------------------------------------------------/
-/ FatFs Functional Configurations
-/---------------------------------------------------------------------------*/
-
-#define FFCONF_DEF 80196 /* Revision ID */
-#define FFCONF_DEF 86631 /* Revision ID */
-
-/*---------------------------------------------------------------------------/
-/ Function Configurations
@ -41,14 +41,6 @@ index 632736b..0000000
-/ 3: f_lseek() function is removed in addition to 2. */
-
-
-#define FF_USE_STRFUNC 0
-/* This option switches string functions, f_gets(), f_putc(), f_puts() and f_printf().
-/
-/ 0: Disable string functions.
-/ 1: Enable without LF-CRLF conversion.
-/ 2: Enable with LF-CRLF conversion. */
-
-
-#define FF_USE_FIND 0
-/* This option switches filtered directory read functions, f_findfirst() and
-/ f_findnext(). (0:Disable, 1:Enable 2:Enable with matching altname[] too) */
@ -80,6 +72,30 @@ index 632736b..0000000
-/* This option switches f_forward() function. (0:Disable or 1:Enable) */
-
-
-#define FF_USE_STRFUNC 0
-#define FF_PRINT_LLI 0
-#define FF_PRINT_FLOAT 0
-#define FF_STRF_ENCODE 0
-/* FF_USE_STRFUNC switches string functions, f_gets(), f_putc(), f_puts() and
-/ f_printf().
-/
-/ 0: Disable. FF_PRINT_LLI, FF_PRINT_FLOAT and FF_STRF_ENCODE have no effect.
-/ 1: Enable without LF-CRLF conversion.
-/ 2: Enable with LF-CRLF conversion.
-/
-/ FF_PRINT_LLI = 1 makes f_printf() support long long argument and FF_PRINT_FLOAT = 1/2
- makes f_printf() support floating point argument. These features want C99 or later.
-/ When FF_LFN_UNICODE >= 1 with LFN enabled, string functions convert the character
-/ encoding in it. FF_STRF_ENCODE selects assumption of character encoding ON THE FILE
-/ to be read/written via those functions.
-/
-/ 0: ANSI/OEM in current CP
-/ 1: Unicode in UTF-16LE
-/ 2: Unicode in UTF-16BE
-/ 3: Unicode in UTF-8
-*/
-
-
-/*---------------------------------------------------------------------------/
-/ Locale and Namespace Configurations
-/---------------------------------------------------------------------------*/
@ -153,19 +169,6 @@ index 632736b..0000000
-/ on character encoding. When LFN is not enabled, these options have no effect. */
-
-
-#define FF_STRF_ENCODE 3
-/* When FF_LFN_UNICODE >= 1 with LFN enabled, string I/O functions, f_gets(),
-/ f_putc(), f_puts and f_printf() convert the character encoding in it.
-/ This option selects assumption of character encoding ON THE FILE to be
-/ read/written via those functions.
-/
-/ 0: ANSI/OEM in current CP
-/ 1: Unicode in UTF-16LE
-/ 2: Unicode in UTF-16BE
-/ 3: Unicode in UTF-8
-*/
-
-
-#define FF_FS_RPATH 0
-/* This option configures support for relative path.
-/
@ -210,7 +213,7 @@ index 632736b..0000000
-#define FF_MAX_SS 512
-/* This set of options configures the range of sector size to be supported. (512,
-/ 1024, 2048 or 4096) Always set both 512 for most systems, generic memory card and
-/ harddisk. But a larger value may be required for on-board flash memory and some
-/ harddisk, but a larger value may be required for on-board flash memory and some
-/ type of optical media. When FF_MAX_SS is larger than FF_MIN_SS, FatFs is configured
-/ for variable sector size mode and disk_ioctl() function needs to implement
-/ GET_SECTOR_SIZE command. */

4
pkg/fatfs/patches/0002-remove-diskio.c.patch
View File

@ -1,6 +1,6 @@
From 8b62c5ed1cc74007497baf3a93920bf9ebabf068 Mon Sep 17 00:00:00 2001
From 743850dca90d01697e5829ec7179ef577dcad2de Mon Sep 17 00:00:00 2001
From: Benjamin Valentin <benpicco@googlemail.com>
Date: Sun, 31 Jan 2021 20:00:38 +0100
Date: Thu, 29 Apr 2021 10:12:49 +0200
Subject: [PATCH 2/2] remove diskio.c
---

2
pkg/fatfs/vendor/include/ffconf.h vendored
View File

@ -2,7 +2,7 @@
/ FatFs - Configuration file
/---------------------------------------------------------------------------*/
#define FFCONF_DEF 80196 /* Revision ID */
#define FFCONF_DEF 86631 /* Revision ID */
/*---------------------------------------------------------------------------/
/ Function Configurations