summaryrefslogtreecommitdiffstats
path: root/uisimulator
diff options
context:
space:
mode:
authorDaniel Ankers <dan@weirdo.org.uk>2006-09-03 21:00:19 +0000
committerDaniel Ankers <dan@weirdo.org.uk>2006-09-03 21:00:19 +0000
commit8300d8c194d66384d376c951cef1159438e28f0f (patch)
tree748d7983179b81b4e4e44bccb997ecf33d85d941 /uisimulator
parent9bb312823528b0ee3203adc1856e62db59fc5d06 (diff)
downloadrockbox-8300d8c194d66384d376c951cef1159438e28f0f.tar.gz
rockbox-8300d8c194d66384d376c951cef1159438e28f0f.tar.bz2
rockbox-8300d8c194d66384d376c951cef1159438e28f0f.zip
Oops - fix warnings and add a simulator version of remove_thread_on_core()
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10876 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'uisimulator')
-rw-r--r--uisimulator/common/stubs.c24
-rw-r--r--uisimulator/sdl/thread-sdl.c12
2 files changed, 21 insertions, 15 deletions
diff --git a/uisimulator/common/stubs.c b/uisimulator/common/stubs.c
index b06c812772..05031caba2 100644
--- a/uisimulator/common/stubs.c
+++ b/uisimulator/common/stubs.c
@@ -1,10 +1,10 @@
/***************************************************************************
- * __________ __ ___.
- * Open \______ \ ____ ____ | | _\_ |__ _______ ___
- * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
- * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
- * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
- * \/ \/ \/ \/ \/
+ * __________ __ ___.
+ * Open \______ \ ____ ____ | | _\_ |__ _______ ___
+ * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
+ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
+ * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
+ * \/ \/ \/ \/ \/
* $Id$
*
* Copyright (C) 2002 by Björn Stenberg <bjorn@haxx.se>
@@ -51,7 +51,7 @@ int ata_write_sectors(IF_MV2(int drive,)
const void* buf)
{
int i;
-
+
for (i=0; i<count; i++ ) {
FILE* f;
char name[32];
@@ -72,7 +72,7 @@ int ata_read_sectors(IF_MV2(int drive,)
void* buf)
{
int i;
-
+
for (i=0; i<count; i++ ) {
FILE* f;
char name[32];
@@ -241,7 +241,7 @@ int talk_number(int n, bool enqueue)
return 0;
}
-int talk_spell(char* spell, bool enqueue)
+int talk_spell(char* spell, bool enqueue)
{
(void)spell;
(void)enqueue;
@@ -259,6 +259,12 @@ void remove_thread(int threadnum)
(void)threadnum;
}
+void remove_thread_on_core(unsigned int core, int threadnum)
+{
+ (void)core;
+ (void)threadnum;
+}
+
/* assure an unused place to direct virtual pointers to */
#define VIRT_SIZE 0xFFFF /* more than enough for our string ID range */
unsigned char vp_dummy[VIRT_SIZE];
diff --git a/uisimulator/sdl/thread-sdl.c b/uisimulator/sdl/thread-sdl.c
index 0ddf37a5a0..041ca3153d 100644
--- a/uisimulator/sdl/thread-sdl.c
+++ b/uisimulator/sdl/thread-sdl.c
@@ -58,12 +58,6 @@ int runthread(void *data)
return 0;
}
-int create_thread_on_core(void (*core)(void), void (*fp)(void), void* sp, int stk_size)
-{
- (void)core;
- return create_thread(fp, sp, stk_size);
-}
-
int create_thread(void (*fp)(void), void* sp, int stk_size)
{
/** Avoid compiler warnings */
@@ -81,6 +75,12 @@ int create_thread(void (*fp)(void), void* sp, int stk_size)
return 0;
}
+int create_thread_on_core(void (*core)(void), void (*fp)(void), void* sp, int stk_size)
+{
+ (void)core;
+ return create_thread(fp, sp, stk_size);
+}
+
void init_threads(void)
{
m = SDL_CreateMutex();