diff options
| author | Nils Wallménius <nils@rockbox.org> | 2007-06-13 15:35:07 +0000 |
|---|---|---|
| committer | Nils Wallménius <nils@rockbox.org> | 2007-06-13 15:35:07 +0000 |
| commit | c7f9ca4067f26ba3d0471d50ed3f06b047171b50 (patch) | |
| tree | 9bfaf2d5019c075ad97540a2beed8d68277ca021 /firmware | |
| parent | f50bd1151a65b1aeefaeab545187fba29881b800 (diff) | |
Accept FS#7264 'Build with -Os switch for coldfire targets'.
Introduces MEM_FUNCTION_WRAPPERS(api) macro which adds wrappers
functions to a plugin to make plugins link correctly when gcc
calls mem* functions directly.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13625 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/export/mp3_playback.h | 2 | ||||
| -rw-r--r-- | firmware/mp3_playback.c | 6 | ||||
| -rw-r--r-- | firmware/mpeg.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/firmware/export/mp3_playback.h b/firmware/export/mp3_playback.h index 772eafe971..d766608aec 100644 --- a/firmware/export/mp3_playback.h +++ b/firmware/export/mp3_playback.h @@ -39,7 +39,7 @@ void demand_irq_enable(bool on); /* new functions, exported to plugin API */ void mp3_play_init(void); void mp3_play_data(const unsigned char* start, int size, - void (*get_more)(unsigned char** start, int* size) /* callback fn */ + void (*get_more)(unsigned char** start, size_t* size) /* callback fn */ ); void mp3_play_pause(bool play); bool mp3_pause_done(void); diff --git a/firmware/mp3_playback.c b/firmware/mp3_playback.c index 68fa96d619..c5c747ac2c 100644 --- a/firmware/mp3_playback.c +++ b/firmware/mp3_playback.c @@ -61,7 +61,7 @@ static long playstart_tick; static long cumulative_ticks; /* the registered callback function to ask for more mp3 data */ -static void (*callback_for_more)(unsigned char**, int*); +static void (*callback_for_more)(unsigned char**, size_t*); #endif /* #ifndef SIMULATOR */ /* list of tracks in memory */ @@ -167,7 +167,7 @@ void DEI3(void) __attribute__((interrupt_handler)); void DEI3(void) { unsigned char* start; - int size = 0; + size_t size = 0; if (callback_for_more != NULL) { @@ -502,7 +502,7 @@ void mp3_play_init(void) } void mp3_play_data(const unsigned char* start, int size, - void (*get_more)(unsigned char** start, int* size) /* callback fn */ + void (*get_more)(unsigned char** start, size_t* size) /* callback fn */ ) { /* init DMA */ diff --git a/firmware/mpeg.c b/firmware/mpeg.c index a66a4d0f01..0299d4d557 100644 --- a/firmware/mpeg.c +++ b/firmware/mpeg.c @@ -810,7 +810,7 @@ static void reset_mp3_buffer(void) } /* DMA transfer end interrupt callback */ -static void transfer_end(unsigned char** ppbuf, int* psize) +static void transfer_end(unsigned char** ppbuf, size_t* psize) { if(playing && !paused) { |