tsiry-sandratraina.com
A modern Music Player Daemon based on Rockbox open source high quality audio player
libadwaita
audio
rust
zig
deno
mpris
rockbox
mpd
Do some housekeeping with fat.h and SECTOR_SIZE
Many includes of fat.h are pointless. Some includes are just for
SECTOR_SIZE. Add a file 'firmware/include/fs_defines.h' for that
and to define tuneable values that were scattered amongst various
headers.
Remove some local definitions of SECTOR_SIZE since they have to be
in agreement with the rest of the fs code anyway.
(We'll see what's in fact pointless in a moment ;)
Change-Id: I9ba183bf58bd87f5c45eba7bd675c7e2c1c18ed5
-1
bootloader/gigabeat.c
-1
bootloader/gigabeat.c
-1
bootloader/ipod.c
-1
bootloader/ipod.c
-1
bootloader/ipod6g.c
-1
bootloader/ipod6g.c
-1
bootloader/ipodnano2g.c
-1
bootloader/ipodnano2g.c
-1
bootloader/meizu_m3.c
-1
bootloader/meizu_m3.c
-1
bootloader/meizu_m6sl.c
-1
bootloader/meizu_m6sl.c
-1
bootloader/meizu_m6sp.c
-1
bootloader/meizu_m6sp.c
-1
bootloader/mini2440.c
-1
bootloader/mini2440.c
-1
bootloader/mrobe500.c
-1
bootloader/mrobe500.c
-1
bootloader/sansaview.c
-1
bootloader/sansaview.c
-1
bootloader/telechips.c
-1
bootloader/telechips.c
-1
bootloader/tpj1022.c
-1
bootloader/tpj1022.c
+1
-1
firmware/common/disk_cache.c
+1
-1
firmware/common/disk_cache.c
+1
-2
firmware/drivers/ata.c
+1
-2
firmware/drivers/ata.c
-8
firmware/export/fat.h
-8
firmware/export/fat.h
···
48
48
#define FAT_MAX_TRANSFER_SIZE 256
49
49
#endif
50
50
51
-
/* still experimental? */
52
-
/* increasing this will increase the total memory used by the cache; the
53
-
cache, as noted in disk_cache.h, has other minimum requirements that may
54
-
prevent reducing its number of entries in order to compensate */
55
-
#ifndef SECTOR_SIZE
56
-
#define SECTOR_SIZE 512
57
-
#endif
58
-
59
51
/**
60
52
****************************************************************************/
61
53
-23
firmware/include/disk_cache.h
-23
firmware/include/disk_cache.h
···
21
21
#ifndef DISK_CACHE_H
22
22
#define DISK_CACHE_H
23
23
24
-
/* This needs enough for all file handles to have a buffer in the worst case
25
-
* plus at least one reserved exclusively for the cache client and a couple
26
-
* for other file system code. The buffers are put to use by the cache if not
27
-
* taken for another purpose (meaning nothing is wasted sitting fallow).
28
-
*
29
-
* One map per volume is maintained in order to avoid collisions between
30
-
* volumes that would slow cache probing. DC_MAP_NUM_ENTRIES is the number
31
-
* for each map per volume. The buffers themselves are shared.
32
-
*/
33
-
#if MEMORYSIZE < 8
34
-
#define DC_NUM_ENTRIES 32
35
-
#define DC_MAP_NUM_ENTRIES 128
36
-
#elif MEMORYSIZE <= 32
37
-
#define DC_NUM_ENTRIES 48
38
-
#define DC_MAP_NUM_ENTRIES 128
39
-
#else /* MEMORYSIZE > 32 */
40
-
#define DC_NUM_ENTRIES 64
41
-
#define DC_MAP_NUM_ENTRIES 256
42
-
#endif /* MEMORYSIZE */
43
-
44
-
/* this _could_ be larger than a sector if that would ever be useful */
45
-
#define DC_CACHE_BUFSIZE SECTOR_SIZE
46
-
47
24
#include "mutex.h"
48
25
#include "mv.h"
49
26
+1
-42
firmware/include/file_internal.h
+1
-42
firmware/include/file_internal.h
···
28
28
#include "mutex.h"
29
29
#include "mrsw_lock.h"
30
30
#include "fs_attr.h"
31
+
#include "fs_defines.h"
31
32
#include "fat.h"
32
33
#ifdef HAVE_DIRCACHE
33
34
#include "dircache.h"
34
35
#endif
35
36
36
-
/** Tuneable parameters **/
37
-
38
-
/* limits for number of open descriptors - if you increase these values, make
39
-
certain that the disk cache has enough available buffers */
40
-
#define MAX_OPEN_FILES 11
41
-
#define MAX_OPEN_DIRS 12
42
37
#define MAX_OPEN_HANDLES (MAX_OPEN_FILES+MAX_OPEN_DIRS)
43
-
44
-
/* internal functions open streams as well; make sure they don't fail if all
45
-
user descs are busy; this needs to be at least the greatest quantity needed
46
-
at once by all internal functions */
47
-
#ifdef HAVE_DIRCACHE
48
-
#define AUX_FILEOBJS 3
49
-
#else
50
-
#define AUX_FILEOBJS 2
51
-
#endif
52
-
53
-
/* number of components statically allocated to handle the vast majority
54
-
of path depths; should maybe be tuned for >= 90th percentile but for now,
55
-
imma just guessing based on something like:
56
-
root + 'Music' + 'Artist' + 'Album' + 'Disc N' + filename */
57
-
#define STATIC_PATHCOMP_NUM 6
58
-
59
-
#define MAX_COMPNAME 260
60
-
61
-
/* unsigned value that will also hold the off_t range we need without
62
-
overflow */
63
-
#define file_size_t uint32_t
64
-
65
-
#ifdef __USE_FILE_OFFSET64
66
-
/* if we want, we can deal with files up to 2^32-1 bytes-- the full FAT16/32
67
-
range */
68
-
#define FILE_SIZE_MAX (0xffffffffu)
69
-
#else
70
-
/* file contents and size will be preserved by the APIs so long as ftruncate()
71
-
isn't used; bytes passed 2^31-1 will not accessible nor will writes succeed
72
-
that would extend the file beyond the max for a 32-bit off_t */
73
-
#define FILE_SIZE_MAX (0x7fffffffu)
74
-
#endif
75
-
76
-
/* if file is "large(ish)", then get rid of the contents now rather than
77
-
lazily when the file is synced or closed in order to free-up space */
78
-
#define O_TRUNC_THRESH 65536
79
38
80
39
/* default attributes when creating new files and directories */
81
40
#define ATTR_NEW_FILE (ATTR_ARCHIVE)
+108
firmware/include/fs_defines.h
+108
firmware/include/fs_defines.h
···
1
+
/***************************************************************************
2
+
* __________ __ ___.
3
+
* Open \______ \ ____ ____ | | _\_ |__ _______ ___
4
+
* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
5
+
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
6
+
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
7
+
* \/ \/ \/ \/ \/
8
+
* $Id$
9
+
*
10
+
* Copyright (C) 2017 by Michael Sevakis
11
+
*
12
+
* This program is free software; you can redistribute it and/or
13
+
* modify it under the terms of the GNU General Public License
14
+
* as published by the Free Software Foundation; either version 2
15
+
* of the License, or (at your option) any later version.
16
+
*
17
+
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
18
+
* KIND, either express or implied.
19
+
*
20
+
****************************************************************************/
21
+
#ifndef FS_DEFINES_H
22
+
#define FS_DEFINES_H
23
+
24
+
/** Tuneable parameters **/
25
+
26
+
#if 0
27
+
/* Define this just in case you're doing something that may crash a lot and
28
+
want less write caching */
29
+
#define FS_MIN_WRITECACHING
30
+
#endif
31
+
32
+
#ifndef MAX_PATH
33
+
#define MAX_PATH 260
34
+
#endif
35
+
36
+
#define MAX_COMPNAME 260
37
+
38
+
/* still experimental? */
39
+
/* increasing this will increase the total memory used by the cache; the
40
+
cache, as noted in disk_cache.h, has other minimum requirements that may
41
+
prevent reducing its number of entries in order to compensate */
42
+
#ifndef SECTOR_SIZE
43
+
#define SECTOR_SIZE 512
44
+
#endif
45
+
46
+
/* limits for number of open descriptors - if you increase these values, make
47
+
certain that the disk cache has enough available buffers */
48
+
#define MAX_OPEN_FILES 11
49
+
#define MAX_OPEN_DIRS 12
50
+
51
+
/* internal functions open streams as well; make sure they don't fail if all
52
+
user descs are busy; this needs to be at least the greatest quantity needed
53
+
at once by all internal functions */
54
+
#ifdef HAVE_DIRCACHE
55
+
#define AUX_FILEOBJS 3
56
+
#else
57
+
#define AUX_FILEOBJS 2
58
+
#endif
59
+
60
+
/* number of components statically allocated to handle the vast majority
61
+
of path depths; should maybe be tuned for >= 90th percentile but for now,
62
+
imma just guessing based on something like:
63
+
root + 'Music' + 'Artist' + 'Album' + 'Disc N' + filename */
64
+
#define STATIC_PATHCOMP_NUM 6
65
+
66
+
/* unsigned value that will also hold the off_t range we need without
67
+
overflow */
68
+
#define file_size_t uint32_t
69
+
70
+
#ifdef __USE_FILE_OFFSET64
71
+
/* if we want, we can deal with files up to 2^32-1 bytes-- the full FAT16/32
72
+
range */
73
+
#define FILE_SIZE_MAX (0xffffffffu)
74
+
#else
75
+
/* file contents and size will be preserved by the APIs so long as ftruncate()
76
+
isn't used; bytes passed 2^31-1 will not accessible nor will writes succeed
77
+
that would extend the file beyond the max for a 32-bit off_t */
78
+
#define FILE_SIZE_MAX (0x7fffffffu)
79
+
#endif
80
+
81
+
/* if file is "large(ish)", then get rid of the contents now rather than
82
+
lazily when the file is synced or closed in order to free-up space */
83
+
#define O_TRUNC_THRESH 65536
84
+
85
+
/* This needs enough for all file handles to have a buffer in the worst case
86
+
* plus at least one reserved exclusively for the cache client and a couple
87
+
* for other file system code. The buffers are put to use by the cache if not
88
+
* taken for another purpose (meaning nothing is wasted sitting fallow).
89
+
*
90
+
* One map per volume is maintained in order to avoid collisions between
91
+
* volumes that would slow cache probing. IOC_MAP_NUM_ENTRIES is the number
92
+
* for each map per volume. The buffers themselves are shared.
93
+
*/
94
+
#if MEMORYSIZE < 8
95
+
#define DC_NUM_ENTRIES 32
96
+
#define DC_MAP_NUM_ENTRIES 128
97
+
#elif MEMORYSIZE <= 32
98
+
#define DC_NUM_ENTRIES 48
99
+
#define DC_MAP_NUM_ENTRIES 128
100
+
#else /* MEMORYSIZE > 32 */
101
+
#define DC_NUM_ENTRIES 64
102
+
#define DC_MAP_NUM_ENTRIES 256
103
+
#endif /* MEMORYSIZE */
104
+
105
+
/* this _could_ be larger than a sector if that would ever be useful */
106
+
#define DC_CACHE_BUFSIZE SECTOR_SIZE
107
+
108
+
#endif /* FS_DEFINES_H */
+1
-1
firmware/target/arm/as3525/sd-as3525.c
+1
-1
firmware/target/arm/as3525/sd-as3525.c
+1
-1
firmware/target/arm/as3525/sd-as3525v2.c
+1
-1
firmware/target/arm/as3525/sd-as3525v2.c
+1
-2
firmware/target/arm/ata-nand-telechips.c
+1
-2
firmware/target/arm/ata-nand-telechips.c
···
28
28
#include "panic.h"
29
29
#include "nand_id.h"
30
30
#include "storage.h"
31
-
32
-
#define SECTOR_SIZE 512
31
+
#include "fs_defines.h"
33
32
34
33
/* ECC on read is implemented on the assumption that MLC-style 4-bit correction
35
34
is always used regardless of NAND chip type. This assumption is true for at
+1
-1
firmware/target/arm/imx233/nand-imx233.c
+1
-1
firmware/target/arm/imx233/nand-imx233.c
-1
firmware/target/arm/imx233/sdmmc-imx233.c
-1
firmware/target/arm/imx233/sdmmc-imx233.c
-1
firmware/target/arm/pnx0101/iriver-ifp7xx/usb-ifp7xx.c
-1
firmware/target/arm/pnx0101/iriver-ifp7xx/usb-ifp7xx.c
+1
-1
firmware/target/arm/pp/ata-sd-pp.c
+1
-1
firmware/target/arm/pp/ata-sd-pp.c
-2
firmware/target/arm/tms320dm320/sdmmc-dm320.c
-2
firmware/target/arm/tms320dm320/sdmmc-dm320.c
···
43
43
#endif
44
44
#include "sdmmc.h"
45
45
#include "disk.h"
46
-
#include "fat.h"
47
46
#include "system-target.h"
48
47
49
48
/* The configuration method is not very flexible. */
···
72
71
#define UNALIGNED_NUM_SECTORS 10
73
72
#define MAX_TRANSFER_ERRORS 10
74
73
75
-
#define SECTOR_SIZE 512
76
74
#define BLOCKS_PER_BANK 0x7A7800
77
75
78
76
/* command flags for send_cmd */
-1
firmware/usb.c
-1
firmware/usb.c
+1
-5
firmware/usbstack/usb_storage.c
+1
-5
firmware/usbstack/usb_storage.c
···
27
27
#include "logf.h"
28
28
#include "storage.h"
29
29
#include "disk.h"
30
-
#include "fat.h"
30
+
#include "fs_defines.h"
31
31
/* Needed to get at the audio buffer */
32
32
#include "audio.h"
33
33
#include "usb_storage.h"
···
39
39
40
40
#ifdef USB_USE_RAMDISK
41
41
#define RAMDISK_SIZE 2048
42
-
#endif
43
-
44
-
#ifndef SECTOR_SIZE
45
-
#define SECTOR_SIZE 512
46
42
#endif
47
43
48
44
/* These defaults allow the operation */