diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2005-02-03 10:06:02 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2005-02-03 10:06:02 +0000 |
| commit | 7030e29abb02a741ab46e341269736ff8d7f3ff6 (patch) | |
| tree | 1b23e3ca9adcfae1b4d10c7aae0e8f81287168cd /apps/plugin.c | |
| parent | 8ef88a1815cab2cee4cd31688c01f749ac88afd2 (diff) | |
fix a mismatch between the .h and .c for non-MAS players, and fixed some
warnings too
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5760 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugin.c')
| -rw-r--r-- | apps/plugin.c | 8 |
1 files changed, 4 insertions, 4 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 = { mpeg_set_pitch, #endif +#if !defined(SIMULATOR) && (CONFIG_HWCODEC != MASNONE) /* MAS communication */ -#ifndef SIMULATOR -#if CONFIG_HWCODEC != MASNONE mas_readmem, mas_writemem, mas_readreg, @@ -228,8 +227,7 @@ static const struct plugin_api rockbox_api = { mas_codec_writereg, mas_codec_readreg, #endif -#endif /* HWCODEC != MASNONE */ -#endif +#endif /* !simulator and HWCODEC != MASNONE */ /* misc */ 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 */ IPRD = (IPRD & 0xFF0F) | prio << 4; /* interrupt priority */ or_b(0x10, &TSTR); /* start timer 4 */ +#else + pfn_timer = timer_callback; #endif return cycles * prescale; /* return the actual period, in CPU clocks */ } |