diff options
-rw-r--r-- | apps/plugin.c | 8 | ||||
-rw-r--r-- | apps/plugin.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/apps/plugin.c b/apps/plugin.c index e05a54d4ac..6c92364a0e 100644 --- a/apps/plugin.c +++ b/apps/plugin.c | |||
@@ -217,9 +217,8 @@ static const struct plugin_api rockbox_api = { | |||
217 | mpeg_set_pitch, | 217 | mpeg_set_pitch, |
218 | #endif | 218 | #endif |
219 | 219 | ||
220 | #if !defined(SIMULATOR) && (CONFIG_HWCODEC != MASNONE) | ||
220 | /* MAS communication */ | 221 | /* MAS communication */ |
221 | #ifndef SIMULATOR | ||
222 | #if CONFIG_HWCODEC != MASNONE | ||
223 | mas_readmem, | 222 | mas_readmem, |
224 | mas_writemem, | 223 | mas_writemem, |
225 | mas_readreg, | 224 | mas_readreg, |
@@ -228,8 +227,7 @@ static const struct plugin_api rockbox_api = { | |||
228 | mas_codec_writereg, | 227 | mas_codec_writereg, |
229 | mas_codec_readreg, | 228 | mas_codec_readreg, |
230 | #endif | 229 | #endif |
231 | #endif /* HWCODEC != MASNONE */ | 230 | #endif /* !simulator and HWCODEC != MASNONE */ |
232 | #endif | ||
233 | 231 | ||
234 | /* misc */ | 232 | /* misc */ |
235 | srand, | 233 | srand, |
@@ -454,6 +452,8 @@ int plugin_register_timer(int cycles, int prio, void (*timer_callback)(void)) | |||
454 | TCR4 = 0x20 | phi; /* clear at GRA match, set prescaler */ | 452 | TCR4 = 0x20 | phi; /* clear at GRA match, set prescaler */ |
455 | IPRD = (IPRD & 0xFF0F) | prio << 4; /* interrupt priority */ | 453 | IPRD = (IPRD & 0xFF0F) | prio << 4; /* interrupt priority */ |
456 | or_b(0x10, &TSTR); /* start timer 4 */ | 454 | or_b(0x10, &TSTR); /* start timer 4 */ |
455 | #else | ||
456 | pfn_timer = timer_callback; | ||
457 | #endif | 457 | #endif |
458 | return cycles * prescale; /* return the actual period, in CPU clocks */ | 458 | return cycles * prescale; /* return the actual period, in CPU clocks */ |
459 | } | 459 | } |
diff --git a/apps/plugin.h b/apps/plugin.h index 9d3ef8e366..3e72248ebc 100644 --- a/apps/plugin.h +++ b/apps/plugin.h | |||
@@ -247,7 +247,7 @@ struct plugin_api { | |||
247 | #endif | 247 | #endif |
248 | 248 | ||
249 | /* MAS communication */ | 249 | /* MAS communication */ |
250 | #ifndef SIMULATOR | 250 | #if !defined(SIMULATOR) && (CONFIG_HWCODEC != MASNONE) |
251 | int (*mas_readmem)(int bank, int addr, unsigned long* dest, int len); | 251 | int (*mas_readmem)(int bank, int addr, unsigned long* dest, int len); |
252 | int (*mas_writemem)(int bank, int addr, const unsigned long* src, int len); | 252 | int (*mas_writemem)(int bank, int addr, const unsigned long* src, int len); |
253 | int (*mas_readreg)(int reg); | 253 | int (*mas_readreg)(int reg); |