Get rid of a committed #define from kernel.h that didn't make the final cut. Put voice_wait in voice_thread.h where it ought.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29787 a1c6a512-1295-4272-9138-f99709370657

4 files changed, 4 insertions, 2 deletions

diff --git a/apps/misc.c b/apps/misc.c
index e4a5c42d0d..55fd7f5f51 100644
--- a/apps/misc.c
+++ b/apps/misc.c
@@ -83,6 +83,9 @@
 #include "bookmark.h"
 #include "wps.h"
 #include "playback.h"
+#if CONFIG_CODEC == SWCODEC
+#include "voice_thread.h"
+#endif
 
 #ifdef BOOTFILE
 #if !defined(USB_NONE) && !defined(USB_HANDLED_BY_OF) \
diff --git a/apps/playback.h b/apps/playback.h
index 225946cfaf..ea8718089f 100644
--- a/apps/playback.h
+++ b/apps/playback.h
@@ -70,7 +70,6 @@ struct bufopen_bitmap_data {
 #endif
 
 /* Functions */
-void voice_wait(void);
 bool audio_is_thread_ready(void);
 int audio_track_count(void);
 long audio_filebufused(void);
diff --git a/apps/voice_thread.h b/apps/voice_thread.h
index 0d13ac293e..4359825dd7 100644
--- a/apps/voice_thread.h
+++ b/apps/voice_thread.h
@@ -27,6 +27,7 @@ void mp3_play_stop(void);
 void mp3_play_pause(bool play);
 bool mp3_is_playing(void);
 
+void voice_wait(void);
 void voice_stop(void);
 void voice_thread_init(void);
 void voice_thread_resume(void);
diff --git a/firmware/export/kernel.h b/firmware/export/kernel.h
index 54a53f3607..76ed96bd14 100644
--- a/firmware/export/kernel.h
+++ b/firmware/export/kernel.h
@@ -86,7 +86,6 @@
 #define SYS_VOLUME_CHANGED        MAKE_SYS_EVENT(SYS_EVENT_CLS_MISC, 5)
 
 #define IS_SYSEVENT(ev)           ((ev & SYS_EVENT) == SYS_EVENT)
-#define EVENT_RESERVED            (~0)
 
 #ifndef TIMEOUT_BLOCK
 #define TIMEOUT_BLOCK   -1