From a0023ce1c5b9699cf9f84274430811f08e45ced4 Mon Sep 17 00:00:00 2001 From: KrahJohlito Date: Wed, 18 Sep 2024 12:40:55 +0930 Subject: [PATCH] printf --- Makefile | 8 +++++++- include/extern_irx.h | 2 ++ modules/iopcore/cdvdman/device-bdm.c | 6 ++++++ modules/iopcore/cdvdman/ioops.c | 2 ++ modules/usbmass_bd_mini_single.irx | Bin 0 -> 7920 bytes modules/usbmass_bd_single.irx | Bin 0 -> 12596 bytes src/bdmsupport.c | 6 +++--- src/opl.c | 1 + src/system.c | 6 ++++-- 9 files changed, 25 insertions(+), 6 deletions(-) create mode 100644 modules/usbmass_bd_mini_single.irx create mode 100644 modules/usbmass_bd_single.irx diff --git a/Makefile b/Makefile index cb8ec1008..181fdc635 100644 --- a/Makefile +++ b/Makefile @@ -68,7 +68,7 @@ FRONTEND_OBJS = pad.o xparam.o fntsys.o renderman.o menusys.o OSDHistory.o syste appsupport.o gui.o guigame.o textures.o opl.o atlas.o nbns.o httpclient.o gsm.o cheatman.o sound.o ps2cnf.o IOP_OBJS = iomanx.o filexio.o ps2fs.o usbd.o bdmevent.o \ - bdm.o bdmfs_fatfs.o usbmass_bd.o iLinkman.o IEEE1394_bd.o mx4sio_bd.o \ + bdm.o bdmfs_fatfs.o usbmass_bd.o usbmass_bd_single.o iLinkman.o IEEE1394_bd.o mx4sio_bd.o \ ps2atad.o hdpro_atad.o poweroff.o ps2hdd.o xhdd.o genvmc.o lwnbdsvr.o \ ps2dev9.o smsutils.o ps2ip.o smap.o isofs.o nbns-iop.o \ sio2man.o padman.o mcman.o mcserv.o \ @@ -520,6 +520,9 @@ ifeq ($(DEBUG),1) $(EE_ASM_DIR)usbmass_bd.c: $(PS2SDK)/iop/irx/usbmass_bd.irx | $(EE_ASM_DIR) $(BIN2C) $< $@ $(*F)_irx +$(EE_ASM_DIR)usbmass_bd_single.c: modules/usbmass_bd_single.irx | $(EE_ASM_DIR) + $(BIN2C) $< $@ $(*F)_irx + $(EE_ASM_DIR)IEEE1394_bd.c: $(PS2SDK)/iop/irx/IEEE1394_bd.irx | $(EE_ASM_DIR) $(BIN2C) $< $@ $(*F)_irx @@ -530,6 +533,9 @@ else $(EE_ASM_DIR)usbmass_bd.c: $(PS2SDK)/iop/irx/usbmass_bd_mini.irx | $(EE_ASM_DIR) $(BIN2C) $< $@ $(*F)_irx +$(EE_ASM_DIR)usbmass_bd_single.c: modules/usbmass_bd_mini_single.irx | $(EE_ASM_DIR) + $(BIN2C) $< $@ $(*F)_irx + $(EE_ASM_DIR)IEEE1394_bd.c: $(PS2SDK)/iop/irx/IEEE1394_bd_mini.irx | $(EE_ASM_DIR) $(BIN2C) $< $@ $(*F)_irx diff --git a/include/extern_irx.h b/include/extern_irx.h index 04bea09b1..d855762a0 100644 --- a/include/extern_irx.h +++ b/include/extern_irx.h @@ -132,6 +132,8 @@ IMPORT_BIN2C(usbd_irx); IMPORT_BIN2C(usbmass_bd_irx); +IMPORT_BIN2C(usbmass_bd_single_irx); + IMPORT_BIN2C(usb_pademu_irx); IMPORT_BIN2C(xhdd_irx); diff --git a/modules/iopcore/cdvdman/device-bdm.c b/modules/iopcore/cdvdman/device-bdm.c index f3754e3b5..d595919db 100644 --- a/modules/iopcore/cdvdman/device-bdm.c +++ b/modules/iopcore/cdvdman/device-bdm.c @@ -134,6 +134,9 @@ void bdm_readSector(unsigned int lba, unsigned short int nsectors, unsigned char { DPRINTF("%s\n", __func__); + if (g_bd == NULL) + return; + WaitSema(bdm_io_sema); g_bd->read(g_bd, lba, buffer, nsectors); SignalSema(bdm_io_sema); @@ -143,6 +146,9 @@ void bdm_writeSector(unsigned int lba, unsigned short int nsectors, const unsign { DPRINTF("%s\n", __func__); + if (g_bd == NULL) + return; + WaitSema(bdm_io_sema); g_bd->write(g_bd, lba, buffer, nsectors); SignalSema(bdm_io_sema); diff --git a/modules/iopcore/cdvdman/ioops.c b/modules/iopcore/cdvdman/ioops.c index c3e1f7f57..8e8bfe351 100644 --- a/modules/iopcore/cdvdman/ioops.c +++ b/modules/iopcore/cdvdman/ioops.c @@ -267,6 +267,8 @@ static int cdrom_read(iop_file_t *f, void *buf, int size) unsigned int offset, nsectors, nbytes; int rpos; + DPRINTF("unit=%d, name=%s!!!!!!\n", f->unit, f->device->name); + WaitSema(cdrom_io_sema); WaitEventFlag(cdvdman_stat.intr_ef, 1, WEF_AND, NULL); diff --git a/modules/usbmass_bd_mini_single.irx b/modules/usbmass_bd_mini_single.irx new file mode 100644 index 0000000000000000000000000000000000000000..b492efe589ef9419b853bfeb93574ebad6be166d GIT binary patch literal 7920 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 literal 0 HcmV?d00001 diff --git a/modules/usbmass_bd_single.irx b/modules/usbmass_bd_single.irx new file mode 100644 index 0000000000000000000000000000000000000000..77ed02983a4ef14cc72d237a49c9485e17cd10ab GIT binary patch literal 12596 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 UZuTARYaZW|SZ^+z1Q^cwFPP#uDF6Tf literal 0 HcmV?d00001 diff --git a/src/bdmsupport.c b/src/bdmsupport.c index c353fbe26..27710d91f 100644 --- a/src/bdmsupport.c +++ b/src/bdmsupport.c @@ -571,7 +571,7 @@ static int bdmGetIconId(item_list_t *itemList) static void bdmCleanUp(item_list_t *itemList, int exception) { if (itemList->enabled) { - LOG("BDMSUPPORT CleanUp\n"); + printf("BDMSUPPORT CleanUp %d\n", itemList->mode); bdm_device_data_t *pDeviceData = (bdm_device_data_t *)itemList->priv; free(pDeviceData->bdmGames); @@ -588,7 +588,7 @@ static void bdmShutdown(item_list_t *itemList) { char path[16]; - LOG("BDMSUPPORT Shutdown\n"); + printf("BDMSUPPORT Shutdown %d\n", itemList->mode); // Format the device path. // Getting the device number is only relevant per module ie usb0 and mx40 will result in both being massDeviceIndex = 0 or mass0, use mode to determine instead. @@ -599,7 +599,7 @@ static void bdmShutdown(item_list_t *itemList) fileXioDevctl(path, USBMASS_DEVCTL_STOP_ALL, NULL, 0, NULL, 0); if (itemList->enabled) { - LOG("BDMSUPPORT Shutdown free data\n"); + printf("BDMSUPPORT Shutdown free data %d\n", itemList->mode); // Free device data. free(pDeviceData->bdmGames); diff --git a/src/opl.c b/src/opl.c index c105e3597..09b7fb48a 100644 --- a/src/opl.c +++ b/src/opl.c @@ -412,6 +412,7 @@ void initSupport(item_list_t *itemList, int mode, int force_reinit) if (((force_reinit) && (mod->support->enabled)) || (startMode == START_MODE_AUTO && !mod->support->enabled)) { mod->support->itemInit(mod->support); moduleUpdateMenuInternal(mod, 0, 0); + printf("initSupport %d\n", mode); ioPutRequest(IO_MENU_UPDATE_DEFFERED, &list_support[mode].support->mode); // can't use mode as the variable will die at end of execution } diff --git a/src/system.c b/src/system.c index b1bbcdd1c..20c9bee65 100644 --- a/src/system.c +++ b/src/system.c @@ -507,8 +507,10 @@ static unsigned int sendIrxKernelRAM(const char *startup, const char *mode_str, irxptr_tab[modcount++].ptr = (void *)&usbd_irx; } if (modules & CORE_IRX_USB) { - irxptr_tab[modcount].info = size_usbmass_bd_irx | SET_OPL_MOD_ID(OPL_MODULE_ID_USBMASSBD); - irxptr_tab[modcount++].ptr = (void *)&usbmass_bd_irx; + //irxptr_tab[modcount].info = size_usbmass_bd_irx | SET_OPL_MOD_ID(OPL_MODULE_ID_USBMASSBD); + //irxptr_tab[modcount++].ptr = (void *)&usbmass_bd_irx; + irxptr_tab[modcount].info = size_usbmass_bd_single_irx | SET_OPL_MOD_ID(OPL_MODULE_ID_USBMASSBD); + irxptr_tab[modcount++].ptr = (void *)&usbmass_bd_single_irx; } if (modules & CORE_IRX_ILINK) { irxptr_tab[modcount].info = size_iLinkman_irx | SET_OPL_MOD_ID(OPL_MODULE_ID_ILINK);