summaryrefslogtreecommitdiff
path: root/apps/plugins/midi
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2010-05-06 21:04:40 +0000
committerThomas Martitz <kugel@rockbox.org>2010-05-06 21:04:40 +0000
commit50a6ca39ad4ed01922aa4f755f0ca579788226cf (patch)
treec7881b015b220558167310345b162324c96be15a /apps/plugins/midi
parentadb506df14aded06ed6e9ebf8540e6fd383ffd6a (diff)
downloadrockbox-50a6ca39ad4ed01922aa4f755f0ca579788226cf.tar.gz
rockbox-50a6ca39ad4ed01922aa4f755f0ca579788226cf.zip
Move c/h files implementing/defining standard library stuff into a new libc directory, also standard'ify some parts of the code base (almost entirely #include fixes).
This is to a) to cleanup firmware/common and firmware/include a bit, but also b) for Rockbox as an application which should use the host system's c library and headers, separating makes it easy to exclude our files from the build. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25850 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/midi')
-rw-r--r--apps/plugins/midi/midiplay.c2
-rw-r--r--apps/plugins/midi/midiutil.c5
-rw-r--r--apps/plugins/midi/midiutil.h3
3 files changed, 4 insertions, 6 deletions
diff --git a/apps/plugins/midi/midiplay.c b/apps/plugins/midi/midiplay.c
index b225014fce..2c685f2e4b 100644
--- a/apps/plugins/midi/midiplay.c
+++ b/apps/plugins/midi/midiplay.c
@@ -450,6 +450,8 @@ static int midimain(const void * filename)
450enum plugin_status plugin_start(const void* parameter) 450enum plugin_status plugin_start(const void* parameter)
451{ 451{
452 int retval; 452 int retval;
453 PLUGINLIB_EXIT_INIT;
454
453 PLUGIN_IRAM_INIT(rb) 455 PLUGIN_IRAM_INIT(rb)
454 456
455 if (parameter == NULL) 457 if (parameter == NULL)
diff --git a/apps/plugins/midi/midiutil.c b/apps/plugins/midi/midiutil.c
index f1b6668be2..87e0f9d9a4 100644
--- a/apps/plugins/midi/midiutil.c
+++ b/apps/plugins/midi/midiutil.c
@@ -163,8 +163,3 @@ int printf(const char *fmt, ...)
163 return 1; 163 return 1;
164} 164}
165 165
166void exit(int code)
167{
168 code = code; /* Stub function, kill warning for now */
169}
170
diff --git a/apps/plugins/midi/midiutil.h b/apps/plugins/midi/midiutil.h
index f984e71aff..b1ed6569b7 100644
--- a/apps/plugins/midi/midiutil.h
+++ b/apps/plugins/midi/midiutil.h
@@ -21,6 +21,8 @@
21 21
22#define FRACTSIZE 12 22#define FRACTSIZE 12
23 23
24#include "lib/pluginlib_exit.h"
25
24#define BUF_SIZE 16384 /* 64 kB output buffers */ 26#define BUF_SIZE 16384 /* 64 kB output buffers */
25#define NBUF 2 27#define NBUF 2
26 28
@@ -145,7 +147,6 @@ int readFourBytes(int file);
145int readVarData(int file); 147int readVarData(int file);
146int eof(int fd); 148int eof(int fd);
147unsigned char * readData(int file, int len); 149unsigned char * readData(int file, int len);
148void exit(int code);
149 150
150#define malloc(n) my_malloc(n) 151#define malloc(n) my_malloc(n)
151void * my_malloc(int size); 152void * my_malloc(int size);