[fw-isoldr]Added NAOMI hardware support.

Also minor improvements.

Author: DC-SWAT

firmware/isoldr/loader/dev/sd/sci.c

@@ -359,14 +359,15 @@ sci_result_t sci_init(uint32_t baud_rate, sci_mode_t mode, sci_clock_t clock_src
     else if(mode == SCI_MODE_SPI) {
         /* Use 512 bytes DMA buffer for SPI operations by default,
             because it's sector size of SD cards. */
-#ifdef __DREAMCAST__
-        /* On Dreamcast, we use GPIO for CS (anyway need soldering all pins),
-           because RTS can be used for VS-link cable */
-        sci_configure_spi(SCI_SPI_CS_GPIO, 512);
-#else
-        /* On Naomi, we use SCIF RTS for CS, because no GPIO pins on CN1 connector */
-        sci_configure_spi(SCI_SPI_CS_RTS, 512);
-#endif
+        if(is_dreamcast()) {
+            /* On Dreamcast, we use GPIO for CS (anyway need soldering all pins),
+                because RTS can be used for VS-link cable */
+            sci_configure_spi(SCI_SPI_CS_GPIO, 512);
+        }
+        else {
+            /* On NAOMI, we use SCIF RTS for CS, because no GPIO pins on CN1 connector */
+            sci_configure_spi(SCI_SPI_CS_RTS, 512);
+        }
         /* Set CA bit for 8-bit synchronous mode */
         scsmr1 |= SCSMR_CA;
     }

firmware/isoldr/loader/include/main.h

@@ -68,6 +68,7 @@
 #define HOLLY_REV_VA1 0x10
 #define HOLLY_REV_VA0 0x0b
 #define holly_revision() (*(vuint32 *)NONCACHED_ADDR(0x005f689c))
+#define is_dreamcast() (*(vuint32 *)NONCACHED_ADDR(0x005f74b0) == 0)
 
 #define GPIO_PIN_RESET_BUTTON 0
 
@@ -94,7 +95,7 @@ char *relative_filename(char *filename);
 void descramble(uint8 *source, uint8 *dest, uint32 size);
 
 void *search_memory(const uint8 *key, uint32 key_size);
-int patch_memory(const uint32 key, const uint32 val);
+int patch_memory(const uint32 key, const uint32 val, const uint32 range);
 void apply_patch_list();
 void rom_memcpy(void* dst, void* src, size_t cnt);
 

firmware/isoldr/loader/main.c

@@ -1,6 +1,6 @@
 /**
  * DreamShell ISO Loader
- * (c)2009-2024 SWAT <http://www.dc-swat.ru>
+ * (c)2009-2025 SWAT <http://www.dc-swat.ru>
  */
 
 #include <main.h>
@@ -40,7 +40,7 @@ int main(int argc, char *argv[]) {
 	timer_ns_enable();
 #endif
 
-	int emu_all_sc = 0;
+	int emu_all_sc = is_dreamcast() ? 0 : 1;
 
 	if (IsoInfo->syscalls == 0) {
 		if(loader_addr < ISOLDR_DEFAULT_ADDR_LOW
@@ -136,6 +136,13 @@ int main(int argc, char *argv[]) {
 		gdc_syscall_patch();
 	}
 
+	if(!is_dreamcast() && IsoInfo->exec.type == BIN_TYPE_KATANA) {
+		argc = patch_memory(0xff800030, (uint32)(&IsoInfo->cdda_offset[0]), 0);
+		LOGF("Patch GPIO register: %d\n", argc);
+		argc = patch_memory(0xffe80000, (uint32)(&IsoInfo->cdda_offset[1]), 0);
+		LOGF("Patch SCIF register: %d\n", argc);
+	}
+
 #ifdef HAVE_EXPT
 	if(IsoInfo->exec.type == BIN_TYPE_WINCE && IsoInfo->use_irq) {
 		uint32 vbr_offset = *((uint32 *)NONCACHED_ADDR(IsoInfo->exec.addr + 0x0c)) + 0x30;

firmware/isoldr/loader/syscalls.c

@@ -742,6 +742,11 @@ static int init_cmd() {
 		spi_init();
 	}
 #endif
+
+	if(!is_dreamcast() && IsoInfo->exec.type == BIN_TYPE_KATANA) {
+		patch_memory(0xff800030, (uint32)(&IsoInfo->cdda_offset[0]), 5 << 20);
+		patch_memory(0xffe80000, (uint32)(&IsoInfo->cdda_offset[1]), 0);
+	}
 	return CMD_STAT_COMPLETED;
 }
 
@@ -1587,6 +1592,6 @@ void gdc_syscall_patch(void) {
 		size += second_offset;
 		icache_flush_range(CACHED_ADDR(SYSCALLS_FW_GDC_ADDR), size);
 	} else {
-		patch_memory(CACHED_ADDR(SYSCALLS_FW_GDC_ENTRY_ADDR), (uint32)gdc_redir);
+		patch_memory(CACHED_ADDR(SYSCALLS_FW_GDC_ENTRY_ADDR), (uint32)gdc_redir, 0);
 	}
 }

firmware/isoldr/loader/utils.c

@@ -168,6 +168,8 @@ uint Load_BootBin() {
 }
 
 void rom_memcpy(void* dst, void* src, size_t cnt) {
+	irq_disable_scoped();
+
 #if defined(DEV_TYPE_IDE) || defined(DEV_TYPE_GD)
 	do {} while(pre_read_xfer_busy());
 #endif
@@ -400,11 +402,10 @@ void *search_memory(const uint8 *key, uint32 key_size) {
 	return NULL;
 }
 
-
-int patch_memory(const uint32 key, const uint32 val) {
+int patch_memory(const uint32 key, const uint32 val, const uint32 range) {
 
 	uint32 exec_addr = NONCACHED_ADDR(IsoInfo->exec.addr);
-	uint32 end_loc = exec_addr + IsoInfo->exec.size;
+	uint32 end_loc = exec_addr + (range ? range : IsoInfo->exec.size);
 	uint8 *k = (uint8 *)&key;
 	uint8 *v = (uint8 *)&val;
 	int count = 0;
@@ -423,7 +424,6 @@ int patch_memory(const uint32 key, const uint32 val) {
 	return count;
 }
 
-
 void apply_patch_list() {
 	if(!IsoInfo->patch_addr[0]) {
 		return;