diff options
| author | William Wilgus <wilgus.william@gmail.com> | 2022-03-03 20:38:57 -0500 |
|---|---|---|
| committer | William Wilgus <wilgus.william@gmail.com> | 2022-03-03 20:38:57 -0500 |
| commit | c7bbd5b0902d7efc2fd204f2aa4ac8881c5a97be (patch) | |
| tree | 4076bf1932112e1e158d10bc56e187fa8ecd0218 | |
| parent | 0ddac1fdaff248cd16810c4152f2da9d46d9df17 (diff) | |
| download | rockbox-c7bbd5b090.tar.gz rockbox-c7bbd5b090.zip | |
Fix Red SDL, Android mounting root directory, and all the yellow too
Change-Id: Ic5077140fdcb1e3168111336bc428c27a782123c
| -rw-r--r-- | firmware/include/dircache_redirect.h | 7 | ||||
| -rw-r--r-- | firmware/target/hosted/android/filesystem-android.h | 27 | ||||
| -rw-r--r-- | firmware/target/hosted/sdl/filesystem-sdl.h | 3 |
3 files changed, 6 insertions, 31 deletions
diff --git a/firmware/include/dircache_redirect.h b/firmware/include/dircache_redirect.h index d7b9626c01..171954a135 100644 --- a/firmware/include/dircache_redirect.h +++ b/firmware/include/dircache_redirect.h @@ -24,7 +24,12 @@ #include "pathfuncs.h" #include "dir.h" #include "dircache.h" - +#ifndef RB_ROOT_VOL_HIDDEN +#define RB_ROOT_VOL_HIDDEN(v) (0 == 0) +#endif +#ifndef RB_ROOT_CONTENTS_DIR +#define RB_ROOT_CONTENTS_DIR "/" +#endif /*** ** Internal redirects that depend upon whether or not dircache is made ** diff --git a/firmware/target/hosted/android/filesystem-android.h b/firmware/target/hosted/android/filesystem-android.h deleted file mode 100644 index 34b558f482..0000000000 --- a/firmware/target/hosted/android/filesystem-android.h +++ /dev/null @@ -1,27 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2014 by Michael Sevakis - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ -#ifndef _FILESYSTEM_ANDROID_H_ -#define _FILESYSTEM_ANDROID_H_ - -#define RB_ROOT_VOL_HIDDEN(v) (0 == 0) -#define RB_ROOT_CONTENTS_DIR "/" /* NOT USED YET */ - -#endif /* _FILESYSTEM_ANDROID_H_ */ diff --git a/firmware/target/hosted/sdl/filesystem-sdl.h b/firmware/target/hosted/sdl/filesystem-sdl.h index 044be2ccfe..934b43b34b 100644 --- a/firmware/target/hosted/sdl/filesystem-sdl.h +++ b/firmware/target/hosted/sdl/filesystem-sdl.h @@ -34,7 +34,4 @@ ssize_t os_sdl_readwrite(int osfd, void *buf, size_t nbyte, bool dowrite); #endif /* HAVE_SDL_THREADS */ -#define RB_ROOT_VOL_HIDDEN(v) (0 == 0) -#define RB_ROOT_CONTENTS_DIR "/" /* NOT USED YET */ - #endif /* _FILESYSTEM_SDL_H_ */ |