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

Clean up places that use #if defined(CPU_ARM | CPU_COLDFIRE | CPU_MIPS)

Browse source 
Since that encompasses _all_ of our native targets in a post-archos world,
either replace it with #if (CONFIG_PLATFORM & PLATFORM_NATIVE) or
delete it altogher as appropriate.

Change-Id: I9128a456e850d5c96a9e05806aad3acd923f90c5
This commit is contained in:
Solomon Peachy 2021-03-04 08:59:17 -05:00
parent 15b4d22913
commit 2628155fc9
3 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
firmware/rolo.c
View file

@ -219,7 +219,6 @@ extern unsigned long loadaddress;
* Filename must be a fully defined filename including the path and extension * Filename must be a fully defined filename including the path and extension
* *
***************************************************************************/ ***************************************************************************/
#if defined(CPU_COLDFIRE) || defined(CPU_ARM) || defined(CPU_MIPS)
int rolo_load(const char* filename) int rolo_load(const char* filename)
{ {
unsigned char* ramstart = (void*)&loadaddress; unsigned char* ramstart = (void*)&loadaddress;
@ -323,7 +322,7 @@ int rolo_load(const char* filename)
/* never reached */ /* never reached */
return 0; return 0;
} }
#endif /* CPU_COLDFIRE | CPU_ARM | CPU_MIPS */
#else /* !defined(IRIVER_IFP7XX_SERIES) */ #else /* !defined(IRIVER_IFP7XX_SERIES) */
int rolo_load(const char* filename) int rolo_load(const char* filename)
{ {

2
lib/rbcodec/codecs/libtremor/oggmalloc.c
View file

@ -1,7 +1,7 @@
#include "os_types.h" #include "os_types.h"
#include <tlsf.h> #include <tlsf.h>
#if defined(CPU_ARM) || defined(CPU_COLDFIRE) || defined(CPU_MIPS) #if (CONFIG_PLATFORM & PLATFORM_NATIVE)
#include <setjmp.h> #include <setjmp.h>
extern jmp_buf rb_jump_buf; extern jmp_buf rb_jump_buf;
#define LONGJMP(x) longjmp(rb_jump_buf, x) #define LONGJMP(x) longjmp(rb_jump_buf, x)

4
lib/rbcodec/codecs/vorbis.c
View file

@ -28,7 +28,7 @@
CODEC_HEADER CODEC_HEADER
#if defined(CPU_ARM) || defined(CPU_COLDFIRE) || defined(CPU_MIPS) #if (CONFIG_PLATFORM & PLATFORM_NATIVE)
#include <setjmp.h> #include <setjmp.h>
jmp_buf rb_jump_buf; jmp_buf rb_jump_buf;
#endif #endif
@ -135,7 +135,7 @@ enum codec_status codec_run(void)
ogg_int64_t vf_pcmlengths[2]; ogg_int64_t vf_pcmlengths[2];
intptr_t param; intptr_t param;
#if defined(CPU_ARM) || defined(CPU_COLDFIRE) || defined(CPU_MIPS) #if (CONFIG_PLATFORM & PLATFORM_NATIVE)
if (setjmp(rb_jump_buf) != 0) { if (setjmp(rb_jump_buf) != 0) {
/* malloc failed; finish with this track */ /* malloc failed; finish with this track */
goto done; goto done;