summaryrefslogtreecommitdiff
path: root/uisimulator
diff options
context:
space:
mode:
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 @@
1/*************************************************************************** 1/***************************************************************************
2 * __________ __ ___. 2 * __________ __ ___.
3 * Open \______ \ ____ ____ | | _\_ |__ _______ ___ 3 * Open \______ \ ____ ____ | | _\_ |__ _______ ___
4 * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / 4 * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
5 * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < 5 * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
6 * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ 6 * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
7 * \/ \/ \/ \/ \/ 7 * \/ \/ \/ \/ \/
8 * $Id$ 8 * $Id$
9 * 9 *
10 * Copyright (C) 2002 by Björn Stenberg <bjorn@haxx.se> 10 * Copyright (C) 2002 by Björn Stenberg <bjorn@haxx.se>
@@ -51,7 +51,7 @@ int ata_write_sectors(IF_MV2(int drive,)
51 const void* buf) 51 const void* buf)
52{ 52{
53 int i; 53 int i;
54 54
55 for (i=0; i<count; i++ ) { 55 for (i=0; i<count; i++ ) {
56 FILE* f; 56 FILE* f;
57 char name[32]; 57 char name[32];
@@ -72,7 +72,7 @@ int ata_read_sectors(IF_MV2(int drive,)
72 void* buf) 72 void* buf)
73{ 73{
74 int i; 74 int i;
75 75
76 for (i=0; i<count; i++ ) { 76 for (i=0; i<count; i++ ) {
77 FILE* f; 77 FILE* f;
78 char name[32]; 78 char name[32];
@@ -241,7 +241,7 @@ int talk_number(int n, bool enqueue)
241 return 0; 241 return 0;
242} 242}
243 243
244int talk_spell(char* spell, bool enqueue) 244int talk_spell(char* spell, bool enqueue)
245{ 245{
246 (void)spell; 246 (void)spell;
247 (void)enqueue; 247 (void)enqueue;
@@ -259,6 +259,12 @@ void remove_thread(int threadnum)
259 (void)threadnum; 259 (void)threadnum;
260} 260}
261 261
262void remove_thread_on_core(unsigned int core, int threadnum)
263{
264 (void)core;
265 (void)threadnum;
266}
267
262/* assure an unused place to direct virtual pointers to */ 268/* assure an unused place to direct virtual pointers to */
263#define VIRT_SIZE 0xFFFF /* more than enough for our string ID range */ 269#define VIRT_SIZE 0xFFFF /* more than enough for our string ID range */
264unsigned char vp_dummy[VIRT_SIZE]; 270unsigned 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)
58 return 0; 58 return 0;
59} 59}
60 60
61int create_thread_on_core(void (*core)(void), void (*fp)(void), void* sp, int stk_size)
62{
63 (void)core;
64 return create_thread(fp, sp, stk_size);
65}
66
67int create_thread(void (*fp)(void), void* sp, int stk_size) 61int create_thread(void (*fp)(void), void* sp, int stk_size)
68{ 62{
69 /** Avoid compiler warnings */ 63 /** Avoid compiler warnings */
@@ -81,6 +75,12 @@ int create_thread(void (*fp)(void), void* sp, int stk_size)
81 return 0; 75 return 0;
82} 76}
83 77
78int create_thread_on_core(void (*core)(void), void (*fp)(void), void* sp, int stk_size)
79{
80 (void)core;
81 return create_thread(fp, sp, stk_size);
82}
83
84void init_threads(void) 84void init_threads(void)
85{ 85{
86 m = SDL_CreateMutex(); 86 m = SDL_CreateMutex();