From 7030e29abb02a741ab46e341269736ff8d7f3ff6 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 3 Feb 2005 10:06:02 +0000 Subject: 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 --- apps/plugin.c | 8 ++++---- 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 = { 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 */ } 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 { #endif /* MAS communication */ -#ifndef SIMULATOR +#if !defined(SIMULATOR) && (CONFIG_HWCODEC != MASNONE) 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_readreg)(int reg); -- cgit v1.2.3