len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-09 13:12:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rockbox as an application: Replace many occurences of #ifdef SIMULATOR with #if (CONFIG_PLATFORM & PLATFORM_HOSTED) (or equivalently).

Browse source 
The simulator defines PLATFORM_HOSTED, as RaaA will do (RaaA will not define SIMULATOR).
The new define is to (de-)select code to compile on hosted platforms generally.

Should be no functional change to targets or the simulator.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27019 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2010-06-21 16:53:00 +00:00
parent 02e04585bd
commit 35e8b1429a
81 changed files with 233 additions and 209 deletions
Download patch file Download diff file Expand all files Collapse all files

4
firmware/include/dbgcheck.h
View file

@ -4,7 +4,7 @@
#include <stdbool.h>
#ifdef DEBUG
#ifndef SIMULATOR
#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
/* check whether a function is inside the valid memory location */
#define IS_FUNCPTR(fp) ({/
extern char _text[];/
@ -21,4 +21,4 @@
#endif
#endif // #ifndef __DBGCHECK_H__
#endif // #ifndef __DBGCHECK_H__

6
firmware/include/dir_uncached.h
View file

@ -32,7 +32,7 @@
#define ATTR_ARCHIVE 0x20
#define ATTR_VOLUME 0x40 /* this is a volume, not a real directory */
#ifdef SIMULATOR
#if (CONFIG_PLATFORM & PLATFORM_HOSTED)
#define dirent_uncached sim_dirent
#define DIR_UNCACHED SIM_DIR
#define opendir_uncached sim_opendir
@ -57,7 +57,7 @@ struct dirent_uncached {
#include "fat.h"
typedef struct {
#ifndef SIMULATOR
#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
bool busy;
long startcluster;
struct fat_dir fatdir;
@ -66,7 +66,7 @@ typedef struct {
int volumecounter; /* running counter for faked volume entries */
#endif
#else
/* simulator: */
/* simulator/application: */
void *dir; /* actually a DIR* dir */
char *name;
#endif

2
firmware/include/dircache.h
View file

@ -36,7 +36,7 @@ struct travel_data {
struct dircache_entry *first;
struct dircache_entry *ce;
struct dircache_entry *down_entry;
#ifdef SIMULATOR
#if (CONFIG_PLATFORM & PLATFORM_HOSTED)
DIR_UNCACHED *dir, *newdir;
struct dirent_uncached *entry;
#else

5
firmware/include/file.h
View file

@ -26,6 +26,7 @@
#define MAX_PATH 260
#include <sys/types.h>
#include "config.h"
#include "_ansi.h"
#define MAX_OPEN_FILES 11
@ -49,7 +50,7 @@
#define O_TRUNC 0x10
#endif
#if defined(SIMULATOR) && !defined(PLUGIN) && !defined(CODEC)
#if (CONFIG_PLATFORM & PLATFORM_HOSTED) && !defined(PLUGIN) && !defined(CODEC)
#define open(x, ...) sim_open(x, __VA_ARGS__)
#define creat(x,m) sim_creat(x,m)
#define remove(x) sim_remove(x)
@ -78,7 +79,7 @@ extern int fsync(int fd);
extern ssize_t read(int fd, void *buf, size_t count);
extern off_t lseek(int fildes, off_t offset, int whence);
extern int file_creat(const char *pathname);
#ifndef SIMULATOR
#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
/* posix compatibility function */
static inline int creat(const char *pathname, mode_t mode)
{