From 80da8b141c4672ca4380d66094976b6342ed5071 Mon Sep 17 00:00:00 2001 From: Tomasz Malesinski Date: Sun, 26 Nov 2006 18:31:41 +0000 Subject: FS#6357, patch 1: let iramcopy and bss share the same space in codecs and plugins. Currently, in case of plugins using IRAM bss is cleared twice, once in the loader, once in PLUGIN_IRAM_INIT. For codecs, bss is cleared only during codec initialization. Also, removed double variables in codecs storing a pointer to codec_api. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11606 a1c6a512-1295-4272-9138-f99709370657 --- apps/codecs/flac.c | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) (limited to 'apps/codecs/flac.c') diff --git a/apps/codecs/flac.c b/apps/codecs/flac.c index 4f5f0b1eaa..b3cba32c82 100644 --- a/apps/codecs/flac.c +++ b/apps/codecs/flac.c @@ -22,17 +22,6 @@ CODEC_HEADER -#ifdef USE_IRAM -extern char iramcopy[]; -extern char iramstart[]; -extern char iramend[]; -extern char iedata[]; -extern char iend[]; -#endif - -struct codec_api* rb; -struct codec_api* ci; - /* The output buffers containing the decoded samples (channels 0 and 1) */ int32_t decoded0[MAX_BLOCKSIZE] IBSS_ATTR_FLAC_DECODED0; int32_t decoded1[MAX_BLOCKSIZE] IBSS_ATTR; @@ -423,7 +412,7 @@ bool flac_seek_offset(FLACContext* fc, uint32_t offset) { } /* this is the codec entry point */ -enum codec_status codec_start(struct codec_api* api) +enum codec_status codec_main(void) { int8_t *buf; FLACContext fc; @@ -436,14 +425,6 @@ enum codec_status codec_start(struct codec_api* api) int retval; /* Generic codec initialisation */ - rb = api; - ci = api; - -#ifdef USE_IRAM - ci->memcpy(iramstart, iramcopy, iramend-iramstart); - ci->memset(iedata, 0, iend - iedata); -#endif - ci->configure(CODEC_SET_FILEBUF_WATERMARK, (int *)(1024*512)); ci->configure(CODEC_SET_FILEBUF_CHUNKSIZE, (int *)(1024*128)); @@ -455,7 +436,7 @@ enum codec_status codec_start(struct codec_api* api) /* Need to save offset for later use (cleared indirectly by flac_init) */ samplesdone=ci->id3->offset; - if (codec_init(api)) { + if (codec_init()) { LOGF("FLAC: Error initialising codec\n"); retval = CODEC_ERROR; goto exit; -- cgit v1.2.3