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

fix a mismatch between the .h and .c for non-MAS players, and fixed some

Browse source 
warnings too


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5760 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Daniel Stenberg 2005-02-03 10:06:02 +00:00
parent 8ef88a1815
commit 7030e29abb
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
apps/plugin.c
View file

@ -217,9 +217,8 @@ static const struct plugin_api rockbox_api = {
mpeg_set_pitch, mpeg_set_pitch,
#endif #endif
#if !defined(SIMULATOR) && (CONFIG_HWCODEC != MASNONE)
/* MAS communication */ /* MAS communication */
#ifndef SIMULATOR
#if CONFIG_HWCODEC != MASNONE
mas_readmem, mas_readmem,
mas_writemem, mas_writemem,
mas_readreg, mas_readreg,
@ -228,8 +227,7 @@ static const struct plugin_api rockbox_api = {
mas_codec_writereg, mas_codec_writereg,
mas_codec_readreg, mas_codec_readreg,
#endif #endif
#endif /* HWCODEC != MASNONE */ #endif /* !simulator and HWCODEC != MASNONE */
#endif
/* misc */ /* misc */
srand, srand,
@ -454,6 +452,8 @@ int plugin_register_timer(int cycles, int prio, void (*timer_callback)(void))
TCR4 = 0x20 | phi; /* clear at GRA match, set prescaler */ TCR4 = 0x20 | phi; /* clear at GRA match, set prescaler */
IPRD = (IPRD & 0xFF0F) | prio << 4; /* interrupt priority */ IPRD = (IPRD & 0xFF0F) | prio << 4; /* interrupt priority */
or_b(0x10, &TSTR); /* start timer 4 */ or_b(0x10, &TSTR); /* start timer 4 */
#else
pfn_timer = timer_callback;
#endif #endif
return cycles * prescale; /* return the actual period, in CPU clocks */ return cycles * prescale; /* return the actual period, in CPU clocks */
} }

2
apps/plugin.h
View file

@ -247,7 +247,7 @@ struct plugin_api {
#endif #endif
/* MAS communication */ /* MAS communication */
#ifndef SIMULATOR #if !defined(SIMULATOR) && (CONFIG_HWCODEC != MASNONE)
int (*mas_readmem)(int bank, int addr, unsigned long* dest, int len); int (*mas_readmem)(int bank, int addr, unsigned long* dest, int len);
int (*mas_writemem)(int bank, int addr, const unsigned long* src, int len); int (*mas_writemem)(int bank, int addr, const unsigned long* src, int len);
int (*mas_readreg)(int reg); int (*mas_readreg)(int reg);