[fw-isoldr] Added new parameter for GPIO usage.

Also minor fixes for SD card.

Author: DC-SWAT

firmware/isoldr/loader/syscalls.c

@@ -15,6 +15,7 @@
 #include <arch/cache.h>
 #include <arch/timer.h>
 #include <arch/gdb.h>
+#include <arch/irq.h>
 
 #ifdef DEV_TYPE_SD
 #include <sd/spi.h>
@@ -706,7 +707,7 @@ static int init_cmd() {
 # ifdef HAVE_GDB
 
 		gdb_init();
-		
+
 	} else {
 
 		int old = irq_disable();
@@ -870,7 +871,7 @@ void gdcMainLoop(void) {
 		}
 #endif
 
-		if(gpio_read_pin(GPIO_PIN_RESET_BUTTON) == 0) {
+		if(IsoInfo->use_gpio && gpio_read_pin(GPIO_PIN_RESET_BUTTON) == 0) {
 			menu_exit();
 		}
 
@@ -1057,7 +1058,7 @@ int gdcGetDrvStat(uint32 *status) {
 	}
 #endif
 
-	if(gpio_read_pin(GPIO_PIN_RESET_BUTTON) == 0) {
+	if(IsoInfo->use_gpio && gpio_read_pin(GPIO_PIN_RESET_BUTTON) == 0) {
 		menu_exit();
 	}
 
@@ -1150,8 +1151,9 @@ void gdcInitSystem(void) {
 	}
 #endif
 
-    gpio_set_as_input(GPIO_PIN_RESET_BUTTON);
-
+	if(IsoInfo->use_gpio) {
+    	gpio_set_as_input(GPIO_PIN_RESET_BUTTON);
+	}
 	reset_GDS(GDS);
 	gdcMainLoop();
 }
@@ -1247,7 +1249,7 @@ int gdcReqDmaTrans(int gd_chn, int *dmabuf) {
 	GDS->requested -= dmabuf[1];
 
 	if(fs_dma_enabled() == FS_DMA_STREAM) {
-#ifdef _FS_ASYNC
+#if defined(_FS_ASYNC) && !defined(DEV_TYPE_SD)
 		if(read_async(iso_fd, (uint8 *)dmabuf[0], dmabuf[1], data_transfer_cb) < 0) {
 			return -1;
 		}
@@ -1279,21 +1281,20 @@ int gdcCheckDmaTrans(int gd_chn, int *size) {
 		LOGF("ERROR: %d != %d\n", gd_chn, GDS->req_count);
 		return -1;
 	}
-
 	if(GDS->status != CMD_STAT_STREAMING) {
 		LOGF("ERROR: status = %s\n", stat_name[GDS->status + 1]);
 		return -1;
 	}
-#ifdef _FS_ASYNC
+#if defined(_FS_ASYNC) && !defined(DEV_TYPE_SD)
 	if(fs_dma_enabled() == FS_DMA_STREAM) {
 		do {} while(poll(iso_fd) > 1);
 	}
-#endif
 	if(pre_read_xfer_busy()) {
 		*size = pre_read_xfer_size();
 		LOGFF("%d busy s=%ld\n", gd_chn, pre_read_xfer_size());
 		return 1;
 	}
+#endif
 	*size = GDS->requested;
 	LOGFF("%d done s=%d r=%ld\n", gd_chn, pre_read_xfer_size(), GDS->requested);
 	return 0;

include/isoldr.h

@@ -1,7 +1,7 @@
 /** 
  * \file    isoldr.h
  * \brief   DreamShell ISO loader
- * \date    2009-2024
+ * \date    2009-2025
  * \author  SWAT www.dc-swat.ru
  */
 
@@ -171,8 +171,9 @@ typedef struct isoldr_info {
 	uint32 scr_hotkey;                  /* Creating screenshots by hotkey (zero for disabled). */
 	uint32 bleem;                       /* Memory address for Bleem! binary or 1 for auto load. */
 	uint32 alt_read;                    /* Use alternative reading without aborting. */
+	uint32 use_gpio;                    /* Use GPIO-0 as button for IGR. */
 
-	uint32 cdda_offset[43];             /* CDDA tracks offset, only for CDI images */
+	uint32 cdda_offset[42];             /* CDDA tracks offset, only for CDI images */
 
 } isoldr_info_t;
 

modules/isoldr/Makefile

@@ -1,6 +1,6 @@
 #
 # ISO Loader module for DreamShell
-# Copyright (C) 2009-2024 SWAT
+# Copyright (C) 2009-2025 SWAT
 #
 
 TARGET_NAME = isoldr
@@ -10,7 +10,7 @@ EXPORTS_FILE = exports.txt
 
 VER_MAJOR = 0
 VER_MINOR = 8
-VER_MICRO = 1
+VER_MICRO = 4
 
 all: rm-elf
 

modules/isoldr/module.c

@@ -639,6 +639,7 @@ int builtin_isoldr_cmd(int argc, char *argv[]) {
 	uint32 bin_type = BIN_TYPE_AUTO, fast_boot = 0, verbose = 0;
 	uint32 cdda_mode = CDDA_MODE_DISABLED, use_irq = 0, emu_vmu = 0;
 	uint32 low_level = 0, scr_hotkey = 0, bleem = 0, alt_read = 0;
+	uint32 use_gpio = 0;
 	int fspart = -1;
 	isoldr_info_t *info;
 
@@ -665,6 +666,7 @@ int builtin_isoldr_cmd(int argc, char *argv[]) {
 		{"scrhotkey", 'k', NULL, CFG_ULONG, (void *) &scr_hotkey,  0},
 		{"bleem",     'u', NULL, CFG_ULONG, (void *) &bleem,       0},
 		{"altread",   'y', NULL, CFG_BOOL,  (void *) &alt_read,    0},
+		{"gpio",     '\0', NULL, CFG_BOOL,  (void *) &use_gpio,    0},
 		{"pa1",      '\0', NULL, CFG_ULONG, (void *) &p_addr[0],   0},
 		{"pa2",      '\0', NULL, CFG_ULONG, (void *) &p_addr[1],   0},
 		{"pv1",      '\0', NULL, CFG_ULONG, (void *) &p_value[0],  0},
@@ -737,6 +739,7 @@ int builtin_isoldr_cmd(int argc, char *argv[]) {
 	info->scr_hotkey = scr_hotkey;
 	info->bleem = bleem;
 	info->alt_read = alt_read;
+	info->use_gpio = use_gpio;
 
 	if (cdda_mode > CDDA_MODE_DISABLED) {
 		info->emu_cdda  = cdda_mode;
@@ -789,24 +792,29 @@ int builtin_isoldr_cmd(int argc, char *argv[]) {
 		          "Address: 0x%08lx\n"
 		          "DMA: %d\n"
 		          "IRQ: %d\n"
-		          "Heap: %lx\n",
+		          "Heap: 0x%08lx\n",
+				  "Bypass pre-read: %d\n",
 		          info->fs_dev,
 		          info->fs_dev[0] != '\0' ? info->fs_type : "normal",
 		          info->fs_part,
 		          lex,
 		          info->use_dma,
 		          info->use_irq,
-		          info->heap);
+		          info->heap,
+				  info->alt_read);
+
 		ds_printf("Emu async: %d\n"
 		          "Emu CDDA: 0x%08lx\n"
 		          "Emu VMU: %d\n"
-		          "Syscalls: %lx\n",
-		          "Bleem: %lx\n\n",
+		          "Syscalls: 0x%08lx\n",
+		          "Bleem: 0x%08lx\n",
+				  "GPIO: %d\n\n",
 		          info->emu_async,
 		          info->emu_cdda,
 		          info->emu_vmu,
 		          info->syscalls,
-		          info->bleem);
+		          info->bleem,
+				  info->use_gpio);
 	}
 
 	isoldr_exec(info, lex);