devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

RaaA: Move directory related stuff from filesystem-unix.c into rbpaths.c.

Browse source 
Part of this change is to align sdlapp builds to other application targets
in that the sim_* wrappers are not used anymore (except for sim_read/write).
Path mangling is now done in rbpaths.c as well.

Change-Id: I9726da73b50a83d9e1a1840288de16ec01ea029d
This commit is contained in:
Thomas Martitz 2014-02-11 15:27:23 +01:00
parent cbc57af0f3
commit 0f928f8785
10 changed files with 216 additions and 357 deletions
Download patch file Download diff file Expand all files Collapse all files

32
firmware/include/dir_uncached.h
View file

@ -33,7 +33,7 @@ struct dirinfo {
#include <stdbool.h>
#include "file.h"
#if (CONFIG_PLATFORM & (PLATFORM_SDL|PLATFORM_MAEMO|PLATFORM_PANDORA)) || defined(__PCTOOL__)
#if defined(SIMULATOR) || defined(__PCTOOL__)
# define dirent_uncached sim_dirent
# define DIR_UNCACHED SIM_DIR
# define opendir_uncached sim_opendir
@ -41,10 +41,21 @@ struct dirinfo {
# define closedir_uncached sim_closedir
# define mkdir_uncached sim_mkdir
# define rmdir_uncached sim_rmdir
#elif defined(APPLICATION)
# include "rbpaths.h"
# define DIRENT_DEFINED
# define DIR_DEFINED
# define dirent_uncached dirent
# define DIR_UNCACHED DIR
# define opendir_uncached app_opendir
# define readdir_uncached app_readdir
# define closedir_uncached app_closedir
# define mkdir_uncached app_mkdir
# define rmdir_uncached app_rmdir
#endif
#ifndef DIRENT_DEFINED
#ifndef DIRENT_DEFINED
struct dirent_uncached {
unsigned char d_name[MAX_PATH];
struct dirinfo info;
@ -72,23 +83,6 @@ typedef struct {
} DIR_UNCACHED CACHEALIGN_ATTR;
#endif
#if defined(APPLICATION) && !defined(__PCTOOL__)
#if (CONFIG_PLATFORM & PLATFORM_ANDROID) || defined(SAMSUNG_YPR0) || defined(SAMSUNG_YPR1)
#include "dir-target.h"
#endif
# undef opendir_uncached
# define opendir_uncached app_opendir
# undef mkdir_uncached
# define mkdir_uncached app_mkdir
# undef rmdir_uncached
# define rmdir_uncached app_rmdir
/* defined in rbpaths.c */
extern DIR_UNCACHED* app_opendir(const char* name);
extern int app_rmdir(const char* name);
extern int app_mkdir(const char* name);
#endif
#ifdef HAVE_HOTSWAP
char *get_volume_name(int volume);
#endif