diff options
| author | Barry Wardell <rockbox@barrywardell.net> | 2006-10-25 00:54:06 +0000 |
|---|---|---|
| committer | Barry Wardell <rockbox@barrywardell.net> | 2006-10-25 00:54:06 +0000 |
| commit | 73c0cfa6321e077c45d0a72882a3ad2ce9a453fd (patch) | |
| tree | 0828b8c7e6181ab9c9e99fe50a3e246594333453 /apps | |
| parent | 64baf574080ff3a69aeae935c35f7b6bf5092bc4 (diff) | |
| download | rockbox-73c0cfa6321e077c45d0a72882a3ad2ce9a453fd.zip rockbox-73c0cfa6321e077c45d0a72882a3ad2ce9a453fd.tar.gz rockbox-73c0cfa6321e077c45d0a72882a3ad2ce9a453fd.tar.bz2 rockbox-73c0cfa6321e077c45d0a72882a3ad2ce9a453fd.tar.xz | |
Make the UI simulator compile on OSX again. dbg_flash_id() really shouldn't be compiled for the sim anyway.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11328 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/debug_menu.c | 9 | ||||
| -rw-r--r-- | apps/plugins/bitmaps/mono/SOURCES | 3 | ||||
| -rw-r--r-- | apps/plugins/bitmaps/mono/osx.dummy.bmp | bin | 0 -> 66 bytes | |||
| -rw-r--r-- | apps/plugins/bitmaps/remote_mono/SOURCES | 3 | ||||
| -rw-r--r-- | apps/plugins/bitmaps/remote_mono/osx.dummy.bmp | bin | 0 -> 66 bytes | |||
| -rw-r--r-- | apps/plugins/bitmaps/remote_native/SOURCES | 3 | ||||
| -rw-r--r-- | apps/plugins/bitmaps/remote_native/osx.dummy.bmp | bin | 0 -> 66 bytes |
7 files changed, 11 insertions, 7 deletions
diff --git a/apps/debug_menu.c b/apps/debug_menu.c index 9f6bc98..5243519 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c @@ -384,6 +384,7 @@ static unsigned flash_read_word(unsigned addr) { #endif +#ifndef SIMULATOR /* Tool function to read the flash manufacturer and type, if available. Only chips which could be reprogrammed in system will return values. (The mode switch addresses vary between flash manufacturers, hence addr1/2) */ @@ -395,7 +396,6 @@ bool dbg_flash_id(unsigned* p_manufacturer, unsigned* p_device, unsigned addr1, unsigned addr2) { -#ifndef SIMULATOR #if (CONFIG_CPU == PP5002) || (CONFIG_CPU == PP5020) /* TODO: Implement for iPod */ (void)p_manufacturer; @@ -463,14 +463,9 @@ bool dbg_flash_id(unsigned* p_manufacturer, unsigned* p_device, return true; /* success */ } #endif -#else - (void) p_manufacturer; - (void) p_device; - (void) addr1; - (void) addr2; -#endif return false; /* fail */ } +#endif /* !SIMULATOR */ #ifndef SIMULATOR #ifdef HAVE_LCD_BITMAP diff --git a/apps/plugins/bitmaps/mono/SOURCES b/apps/plugins/bitmaps/mono/SOURCES index fde3255..96e4c2b 100644 --- a/apps/plugins/bitmaps/mono/SOURCES +++ b/apps/plugins/bitmaps/mono/SOURCES @@ -44,3 +44,6 @@ flipit_cursor.16x13x1.bmp #endif #endif /* HAVE_LCD_BITMAP */ +#if defined(SIMULATOR) && defined(__APPLE__) +osx.dummy.bmp +#endif diff --git a/apps/plugins/bitmaps/mono/osx.dummy.bmp b/apps/plugins/bitmaps/mono/osx.dummy.bmp Binary files differnew file mode 100644 index 0000000..f09bec7 --- /dev/null +++ b/apps/plugins/bitmaps/mono/osx.dummy.bmp diff --git a/apps/plugins/bitmaps/remote_mono/SOURCES b/apps/plugins/bitmaps/remote_mono/SOURCES index e69de29..c59aab6 100644 --- a/apps/plugins/bitmaps/remote_mono/SOURCES +++ b/apps/plugins/bitmaps/remote_mono/SOURCES @@ -0,0 +1,3 @@ +#if defined(SIMULATOR) && defined(__APPLE__) +osx.dummy.bmp +#endif diff --git a/apps/plugins/bitmaps/remote_mono/osx.dummy.bmp b/apps/plugins/bitmaps/remote_mono/osx.dummy.bmp Binary files differnew file mode 100644 index 0000000..f09bec7 --- /dev/null +++ b/apps/plugins/bitmaps/remote_mono/osx.dummy.bmp diff --git a/apps/plugins/bitmaps/remote_native/SOURCES b/apps/plugins/bitmaps/remote_native/SOURCES index e69de29..c59aab6 100644 --- a/apps/plugins/bitmaps/remote_native/SOURCES +++ b/apps/plugins/bitmaps/remote_native/SOURCES @@ -0,0 +1,3 @@ +#if defined(SIMULATOR) && defined(__APPLE__) +osx.dummy.bmp +#endif diff --git a/apps/plugins/bitmaps/remote_native/osx.dummy.bmp b/apps/plugins/bitmaps/remote_native/osx.dummy.bmp Binary files differnew file mode 100644 index 0000000..f09bec7 --- /dev/null +++ b/apps/plugins/bitmaps/remote_native/osx.dummy.bmp |
