[core] Updated KallistiOS and fixed RTC driver.

Also some other minor fixes and removed sd_loader_with.bios

Author: DC-SWAT

exports.txt

@@ -1873,6 +1873,7 @@ fs_pty_shutdown
 fs_shutdown
 thd_shutdown
 rtc_shutdown
+ubc_shutdown
 _arch_old_stack
 _arch_old_sr
 _arch_old_vbr

modules/isoldr/exec.c

@@ -64,7 +64,7 @@ static void isoldr_arch_shutdown() {
     dbglog(DBG_CRITICAL, "arch: shutting down kernel\n");
 
     /* Turn off UBC breakpoints, if any */
-    ubc_disable_all();
+    ubc_shutdown();
 
     /* Do auto-shutdown */
     isoldr_arch_auto_shutdown();

modules/luaKOS/KOS.pkg

@@ -569,8 +569,7 @@ void * sq_set32(void *s, uint32 c, int n);
 #define PM_RGB0888  3       /**< \brief RGB0888 pixel mode (32-bit) */
 #define PM_RGB888   PM_RGB0888 /**< \brief Backwards compatibility support */
 
-//-----------------------------------------------------------------------------
-// More specific modes (and actual indeces into the mode table)
+#define DM_MULTIBUFFER  0x2000
 
 typedef enum vid_display_mode {
     DM_INVALID = 0,                 /**< \brief Invalid display mode */
@@ -585,16 +584,6 @@ typedef enum vid_display_mode {
     DM_768x576_PAL_IL,              /**< \brief 768x576 PAL Interlaced 50Hz */
     DM_768x480_PAL_IL,              /**< \brief 768x480 PAL Interlaced 50Hz */
     DM_320x240_PAL,                 /**< \brief 320x240 PAL 50Hz */
-    DM_320x240_VGA_MB,              /**< \brief 320x240 VGA 60Hz, 4FBs */
-    DM_320x240_NTSC_MB,             /**< \brief 320x240 NTSC 60Hz, 4FBs */
-    DM_640x480_VGA_MB,              /**< \brief 640x480 VGA 60Hz, 4FBs */
-    DM_640x480_NTSC_IL_MB,          /**< \brief 640x480 NTSC IL 60Hz, 4FBs */
-    DM_640x480_PAL_IL_MB,           /**< \brief 640x480 PAL IL 50Hz, 4FBs */
-    DM_256x256_PAL_IL_MB,           /**< \brief 256x256 PAL IL 50Hz, 4FBs */
-    DM_768x480_NTSC_IL_MB,          /**< \brief 768x480 NTSC IL 60Hz, 4FBs */
-    DM_768x576_PAL_IL_MB,           /**< \brief 768x576 PAL IL 50Hz, 4FBs */
-    DM_768x480_PAL_IL_MB,           /**< \brief 768x480 PAL IL 50Hz, 4FBs */
-    DM_320x240_PAL_MB,              /**< \brief 320x240 PAL 50Hz, 4FBs */
     // The below is only for counting..
     DM_SENTINEL,                    /**< \brief Sentinel value, for counting */
     DM_MODE_COUNT                   /**< \brief Number of modes */

resources/firmware/bios/ds/sd_loader_with.bios

@@ -1 +1 @@
-95a16abc543b202cdbe3597883df441e93c06ab4
+6220f330c91a02f4def0126aa27c2abc972f73eb

sdk/doc/KallistiOS.txt

@@ -1,7 +1,7 @@
 /* DreamShell ##version##
 
    rtc.c
-   Copyright (C) 2015-2016 SWAT
+   Copyright (C) 2015-2016, 2024 SWAT
    Copyright (C) 2016 Megavolt85
 */
 
@@ -19,6 +19,7 @@
 #define AICA_RTC_SECS_H   0xa0710000
 #define AICA_RTC_SECS_L   0xa0710004
 #define AICA_RTC_WRITE_EN 0xa0710008
+#define AICA_RTC_CTRL_ADDR 0xa0710008
 
 #define AICA_RTC_ATTEMPTS_COUNT 10
 
@@ -48,11 +49,12 @@ int rtc_settime(time_t time) {
 	time_t secs = time + TWENTY_YEARS;
 	int i = 0;
 
+	g2_write_32(AICA_RTC_WRITE_EN, 1);
+
 	do {
 
-		g2_write_32(1, AICA_RTC_WRITE_EN);
-		g2_write_32((secs & 0xffff0000) >> 16, AICA_RTC_SECS_H);
-		g2_write_32((secs & 0xffff), AICA_RTC_SECS_L);
+		g2_write_32(AICA_RTC_SECS_H, (secs & 0xffff0000) >> 16);
+		g2_write_32(AICA_RTC_SECS_L, (secs & 0xffff));
 
 		val1 = ((g2_read_32(AICA_RTC_SECS_H) & 0xffff) << 16) | (g2_read_32(AICA_RTC_SECS_L) & 0xffff);
 		val2 = ((g2_read_32(AICA_RTC_SECS_H) & 0xffff) << 16) | (g2_read_32(AICA_RTC_SECS_L) & 0xffff);
@@ -63,6 +65,7 @@ int rtc_settime(time_t time) {
 
 	} while ((val1 != val2) && ((val1 & 0xffffff80) != (secs & 0xffffff80)));
 
+	g2_write_32(AICA_RTC_CTRL_ADDR, 0);
 	return 0;
 }
 

src/drivers/rtc.c

@@ -484,8 +484,8 @@ void ShutdownVideo() {
 	}
 
 	if(plx_cursor_txr) {
-		plx_txr_destroy(plx_screen_txr);
-		plx_screen_txr = NULL;
+		plx_txr_destroy(plx_cursor_txr);
+		plx_cursor_txr = NULL;
 	}
 
 	if (plx_cxt) {