Update KallistiOS and fix build.

Also added some exports.

Author: DC-SWAT

exports.txt

@@ -1598,7 +1598,9 @@ plx_fcxt_destroy
 plx_fcxt_char_metrics
 plx_fcxt_str_metrics
 plx_fcxt_setsize
+plx_fcxt_getsize
 plx_fcxt_setpos_pnt
+plx_fcxt_setcolor4f
 plx_fcxt_setpos
 plx_fcxt_getpos
 plx_fcxt_begin
@@ -1695,6 +1697,7 @@ div
 getenv
 setenv
 labs
+llabs
 ldiv
 mblen
 mbstowcs
@@ -1867,6 +1870,7 @@ signal
 gethostname
 __locale_mb_cur_max
 random
+aligned_alloc
 #
 # File System
 opendir
@@ -1971,6 +1975,7 @@ net_icmp_echo_cb
 cond_init
 mutex_init
 sem_init
+mutex_unlock_as_thread
 #
 kthread_key_next
 kthread_key_create
@@ -2054,7 +2059,6 @@ vid_builtin
 #
 arch_main
 arch_set_exit_path
-arch_real_exit
 arch_return
 arch_shutdown
 #
@@ -2196,3 +2200,4 @@ oneshot_timer_setup
 oneshot_timer_start
 oneshot_timer_stop
 oneshot_timer_destroy
+__dreamcast_get_ticks

include/utils.h

@@ -87,10 +87,6 @@ void *memcpy_sh4(void *dest, const void *src, size_t count);
 void *memmove_sh4(void *dest, const void *src, size_t count);
 void *memset_sh4(void *dest, uint32 val, size_t count);
 
-#define memcpy  memcpy_sh4
-#define memmove memmove_sh4
-#define memset  memset_sh4
-
 #ifndef strcasestr
 char *strcasestr(const char *str1, const char *str2);
 #endif

lib/SDL/src/video/dc/60hz.h

@@ -755,7 +755,7 @@ static void __ask_60hz_fade16(unsigned short n)
 			b=0;
 		buff[i+j*640]=((r<<rs) | (g<<gs) | (b<<bs));
 	}
-	timer_spin_sleep(10);
+	thd_sleep(10);
 }
 
 static int __ask_60hz_wait(void)
@@ -779,7 +779,7 @@ static int __ask_60hz_wait(void)
 	for(i=0;i<200;i++)
 	{
 		if (cond && cond->buttons & CONT_Y) return !sdl_dc_default_60hz;
-		timer_spin_sleep(10);
+		thd_sleep(10);
 	}
 
 	return sdl_dc_default_60hz;

modules/bflash/bflash.c

@@ -75,7 +75,7 @@ static void send_cmd(bflash_dev_t *dev, uint16 cmd) {
 			case CMD_MANUFACTURER_UNLOCK_DATA:
 				send_unlock_jedec(dev);
 				flashport[dev->unlock[0]] = cmd;
-				timer_spin_sleep(10); // Same as jedec_delay(10000);
+				thd_sleep(10); // Same as jedec_delay(10000);
 				break;
 			case CMD_RESET_DATA:
 				send_unlock_jedec(dev);

modules/dreameye/dreameye.c

@@ -330,7 +330,8 @@ static void dreameye_get_video_frame_cb(maple_state_t *st, maple_frame_t *frame)
               */
             if(first_state->format == DREAMEYE_FRAME_FMT_YUYV422) {
                 if(first_state->width >= 320) {
-                    timer_spin_sleep(7);
+                    uint64_t timeout = timer_ms_gettime64() + 7;
+                    while(timer_ms_gettime64() < timeout);
                 }
             }
         }

sdk/doc/KallistiOS.txt

@@ -1 +1 @@
-3348accdbc8a4869ef6eeaf7799067d84af64466
+8fb6ea27eb3fd8f6f1d08bdafffa627883b17185

src/drivers/sd.c

@@ -245,7 +245,7 @@ int sdc_init(void) {
 		return -1;
 	}
 
-	timer_spin_sleep(20);
+	thd_sleep(20);
 	SELECT();
 
 	/* 80 dummy clocks */
@@ -258,7 +258,7 @@ int sdc_init(void) {
 #ifdef SD_DEBUG
 		dbglog(DBG_DEBUG, "%s: Enter Idle state\n", __func__);
 #endif
-		timer_spin_sleep(20);
+		thd_sleep(20);
 
 		i = 0;
 

src/utils.c

@@ -38,7 +38,7 @@ int snd_init_firmware(const char *filename) {
 
 	/* Enable the AICA and give it a few ms to start up */
 	spu_enable();
-	timer_spin_sleep(10);
+	thd_sleep(10);
 
 	/* Initialize the RAM allocator */
 	snd_mem_init(AICA_RAM_START);