Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move VOL_NAMES definition to mv.h

Browse source 
Fits better and including dir.h is more messy for some places.

Change-Id: I3ec30dcc1ac2734ad3844c903238b6cc2f4e134c
This commit is contained in:
Thomas Martitz 2014-02-18 07:11:11 +01:00
parent 3f116769fd
commit 706e6b7a75
4 changed files with 16 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/playlist.c
View file

@ -75,7 +75,7 @@
#include "ata_idle_notify.h"
#include "file.h"
#include "action.h"
#include "dir.h"
#include "mv.h"
#include "debug.h"
#include "audio.h"
#include "lcd.h"

2
apps/root_menu.c
View file

@ -41,7 +41,7 @@
#ifdef HAVE_HOTSWAP
#include "storage.h"
#include "dir.h"
#include "mv.h"
#endif
/* gui api */
#include "list.h"

17
firmware/export/mv.h
View file

@ -37,18 +37,29 @@
#define IF_MD(x...)
#define IF_MD_NONVOID(x...) void
#define IF_MD_DRV(d) 0
#endif
#endif /* HAVE_MULTIDRIVE */
/* Volumes mean things that have filesystems on them, like partitions */
#ifdef HAVE_MULTIVOLUME
#define IF_MV(x...) x /* valist contents or empty */
#define IF_MV_NONVOID(x...) x /* valist contents or 'void' */
#define IF_MV_VOL(v) v /* volume argument or '0' */
/* how to name volumes, first char must be outside of legal file names,
a number gets appended to enumerate, if applicable */
#if (CONFIG_STORAGE & STORAGE_MMC)
#define VOL_NAMES "<MMC%d>"
#define VOL_ENUM_POS 4 /* position of %d, to avoid runtime calculation */
#elif (CONFIG_STORAGE & STORAGE_SD)
#define VOL_NAMES "<microSD%d>"
#define VOL_ENUM_POS 8 /* position of %d, to avoid runtime calculation */
#else
#define VOL_NAMES "<HD%d>"
#define VOL_ENUM_POS 3
#endif /* CONFIG_STORAGE */
#else /* empty definitions if no multi-volume */
#define IF_MV(x...)
#define IF_MV_NONVOID(x...) void
#define IF_MV_VOL(v) 0
#endif
#endif /* HAVE_MULTIVOLUME */
#endif /* __MV_H__ */

17
firmware/include/dir.h
View file

@ -24,23 +24,6 @@
#include "config.h"
#ifdef HAVE_MULTIVOLUME
/* how to name volumes, first char must be outside of legal file names,
a number gets appended to enumerate, if applicable */
#if (CONFIG_STORAGE & STORAGE_MMC)
#define VOL_NAMES "<MMC%d>"
#define VOL_ENUM_POS 4 /* position of %d, to avoid runtime calculation */
#elif (CONFIG_STORAGE & STORAGE_SD)
#define VOL_NAMES "<microSD%d>"
#define VOL_ENUM_POS 8 /* position of %d, to avoid runtime calculation */
#else
#define VOL_NAMES "<HD%d>"
#define VOL_ENUM_POS 3
#endif
#endif
#define ATTR_READ_ONLY 0x01
#define ATTR_HIDDEN 0x02
#define ATTR_SYSTEM 0x04