Skip to content

Commit

Permalink
BDM: replace USB and add iLink support
Browse files Browse the repository at this point in the history 
Add support for the Block Device Manager. This allows for multiple block
devices to be added, while sharing the same filesystem and reducing a
lot of duplicated code.
  • Loading branch information
@rickgaiser
rickgaiser committed May 9, 2021
1 parent 4480105 commit 17c4a62
Show file tree
Hide file tree
Showing 51 changed files with 923 additions and 2,170 deletions.
65 changes: 44 additions & 21 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ endif
endif

FRONTEND_OBJS = pad.o fntsys.o renderman.o menusys.o OSDHistory.o system.o lang.o config.o hdd.o dialogs.o \
dia.o ioman.o texcache.o themes.o supportbase.o usbsupport.o ethsupport.o hddsupport.o \
dia.o ioman.o texcache.o themes.o supportbase.o bdmsupport.o ethsupport.o hddsupport.o \
appsupport.o gui.o guigame.o textures.o opl.o atlas.o nbns.o httpclient.o gsm.o cheatman.o sound.o ps2cnf.o

GFX_OBJS = usb_icon.o hdd_icon.o eth_icon.o app_icon.o \
Expand All @@ -83,18 +83,19 @@ GFX_OBJS = usb_icon.o hdd_icon.o eth_icon.o app_icon.o \
MISC_OBJS = icon_sys_A.o icon_sys_J.o icon_sys_C.o conf_theme_OPL.o \
boot.o cancel.o confirm.o cursor.o message.o transition.o

IOP_OBJS = iomanx.o filexio.o ps2fs.o usbd.o usbhdfsd.o usbhdfsdfsv.o \
IOP_OBJS = iomanx.o filexio.o ps2fs.o usbd.o bdmevent.o \
bdm.o bdmfs_vfat.o usbmass_bd.o iLinkman.o IEEE1394_bd.o \
ps2atad.o hdpro_atad.o poweroff.o ps2hdd.o xhdd.o genvmc.o hdldsvr.o \
ps2dev9.o smsutils.o ps2ip.o smap.o isofs.o nbns-iop.o \
sio2man.o padman.o mcman.o mcserv.o \
httpclient-iop.o netman.o ps2ips.o \
usb_mcemu.o hdd_mcemu.o smb_mcemu.o \
bdm_mcemu.o hdd_mcemu.o smb_mcemu.o \
iremsndpatch.o apemodpatch.o f2techioppatch.o cleareffects.o resetspu.o \
libsd.o audsrv.o

EECORE_OBJS = ee_core.o ioprp.o util.o \
elfldr.o udnl.o imgdrv.o eesync.o \
usb_cdvdman.o IOPRP_img.o smb_cdvdman.o \
bdm_cdvdman.o IOPRP_img.o smb_cdvdman.o \
hdd_cdvdman.o hdd_hdpro_cdvdman.o cdvdfsv.o \
ingame_smstcpip.o smap_ingame.o smbman.o smbinit.o

Expand Down Expand Up @@ -242,7 +243,7 @@ clean:
echo " -eesync"
$(MAKE) -C modules/iopcore/eesync clean
echo " -cdvdman"
$(MAKE) -C modules/iopcore/cdvdman USE_USB=1 clean
$(MAKE) -C modules/iopcore/cdvdman USE_BDM=1 clean
$(MAKE) -C modules/iopcore/cdvdman USE_SMB=1 clean
$(MAKE) -C modules/iopcore/cdvdman USE_HDD=1 clean
$(MAKE) -C modules/iopcore/cdvdman USE_HDPRO=1 clean
Expand All @@ -261,8 +262,8 @@ clean:
$(MAKE) -C modules/iopcore/patches/cleareffects clean
echo " -isofs"
$(MAKE) -C modules/isofs clean
echo " -usbhdfsdfsv"
$(MAKE) -C modules/usb/usbhdfsdfsv clean
echo " -bdmevent"
$(MAKE) -C modules/bdmevent clean
echo " -SMSUTILS"
$(MAKE) -C modules/network/SMSUTILS clean
echo " -SMSTCPIP"
Expand All @@ -278,7 +279,7 @@ clean:
echo " -xhdd"
$(MAKE) -C modules/hdd/xhdd clean
echo " -mcemu"
$(MAKE) -C modules/mcemu USE_USB=1 clean
$(MAKE) -C modules/mcemu USE_BDM=1 clean
$(MAKE) -C modules/mcemu USE_HDD=1 clean
$(MAKE) -C modules/mcemu USE_SMB=1 clean
echo " -genvmc"
Expand Down Expand Up @@ -381,11 +382,11 @@ modules/iopcore/eesync/eesync.irx: modules/iopcore/eesync
$(EE_ASM_DIR)eesync.s: modules/iopcore/eesync/eesync.irx | $(EE_ASM_DIR)
$(BIN2S) $< $@ eesync_irx

modules/iopcore/cdvdman/usb_cdvdman.irx: modules/iopcore/cdvdman
$(MAKE) $(CDVDMAN_PS2LOGO_FLAGS) $(CDVDMAN_DEBUG_FLAGS) USE_USB=1 -C $< all
modules/iopcore/cdvdman/bdm_cdvdman.irx: modules/iopcore/cdvdman
$(MAKE) $(CDVDMAN_PS2LOGO_FLAGS) $(CDVDMAN_DEBUG_FLAGS) USE_BDM=1 -C $< all

$(EE_ASM_DIR)usb_cdvdman.s: modules/iopcore/cdvdman/usb_cdvdman.irx | $(EE_ASM_DIR)
$(BIN2S) $< $@ usb_cdvdman_irx
$(EE_ASM_DIR)bdm_cdvdman.s: modules/iopcore/cdvdman/bdm_cdvdman.irx | $(EE_ASM_DIR)
$(BIN2S) $< $@ bdm_cdvdman_irx

modules/iopcore/cdvdman/smb_cdvdman.irx: modules/iopcore/cdvdman
$(MAKE) $(CDVDMAN_PS2LOGO_FLAGS) $(CDVDMAN_DEBUG_FLAGS) USE_SMB=1 -C $< all
Expand Down Expand Up @@ -441,11 +442,11 @@ modules/iopcore/resetspu/resetspu.irx: modules/iopcore/resetspu
$(EE_ASM_DIR)resetspu.s: modules/iopcore/resetspu/resetspu.irx | $(EE_ASM_DIR)
$(BIN2S) $< $@ resetspu_irx

modules/mcemu/usb_mcemu.irx: modules/mcemu
$(MAKE) $(MCEMU_DEBUG_FLAGS) $(PADEMU_FLAGS) USE_USB=1 -C $< all
modules/mcemu/bdm_mcemu.irx: modules/mcemu
$(MAKE) $(MCEMU_DEBUG_FLAGS) $(PADEMU_FLAGS) USE_BDM=1 -C $< all

$(EE_ASM_DIR)usb_mcemu.s: modules/mcemu/usb_mcemu.irx
$(BIN2S) $< $@ usb_mcemu_irx
$(EE_ASM_DIR)bdm_mcemu.s: modules/mcemu/bdm_mcemu.irx
$(BIN2S) $< $@ bdm_mcemu_irx

modules/mcemu/hdd_mcemu.irx: modules/mcemu
$(MAKE) $(MCEMU_DEBUG_FLAGS) $(PADEMU_FLAGS) USE_HDD=1 -C $< all
Expand Down Expand Up @@ -510,14 +511,36 @@ modules/pademu/usb_pademu.irx: modules/pademu
$(EE_ASM_DIR)usb_pademu.s: modules/pademu/usb_pademu.irx
$(BIN2S) $< $@ usb_pademu_irx

$(EE_ASM_DIR)usbhdfsd.s: $(PS2SDK)/iop/irx/usbhdfsd.irx | $(EE_ASM_DIR)
$(BIN2S) $< $@ usbhdfsd_irx
$(EE_ASM_DIR)bdm.s: $(PS2SDK)/iop/irx/bdm.irx | $(EE_ASM_DIR)
$(BIN2S) $< $@ bdm_irx

modules/usb/usbhdfsdfsv/usbhdfsdfsv.irx: modules/usb/usbhdfsdfsv
$(EE_ASM_DIR)bdmfs_vfat.s: $(PS2SDK)/iop/irx/bdmfs_vfat.irx | $(EE_ASM_DIR)
$(BIN2S) $< $@ bdmfs_vfat_irx

$(EE_ASM_DIR)iLinkman.s: $(PS2SDK)/iop/irx/iLinkman.irx | $(EE_ASM_DIR)
$(BIN2S) $< $@ iLinkman_irx

ifeq ($(DEBUG),1)
# block device drivers with printf's
$(EE_ASM_DIR)usbmass_bd.s: $(PS2SDK)/iop/irx/usbmass_bd.irx | $(EE_ASM_DIR)
$(BIN2S) $< $@ usbmass_bd_irx

$(EE_ASM_DIR)IEEE1394_bd.s: $(PS2SDK)/iop/irx/IEEE1394_bd.irx | $(EE_ASM_DIR)
$(BIN2S) $< $@ IEEE1394_bd_irx
else
# block device drivers without printf's
$(EE_ASM_DIR)usbmass_bd.s: $(PS2SDK)/iop/irx/usbmass_bd_mini.irx | $(EE_ASM_DIR)
$(BIN2S) $< $@ usbmass_bd_irx

$(EE_ASM_DIR)IEEE1394_bd.s: $(PS2SDK)/iop/irx/IEEE1394_bd_mini.irx | $(EE_ASM_DIR)
$(BIN2S) $< $@ IEEE1394_bd_irx
endif

modules/bdmevent/bdmevent.irx: modules/bdmevent
$(MAKE) -C $<

$(EE_ASM_DIR)usbhdfsdfsv.s: modules/usb/usbhdfsdfsv/usbhdfsdfsv.irx | $(EE_ASM_DIR)
$(BIN2S) $< $@ usbhdfsdfsv_irx
$(EE_ASM_DIR)bdmevent.s: modules/bdmevent/bdmevent.irx | $(EE_ASM_DIR)
$(BIN2S) $< $@ bdmevent_irx

$(EE_ASM_DIR)ps2dev9.s: $(PS2SDK)/iop/irx/ps2dev9.irx | $(EE_ASM_DIR)
$(BIN2S) $< $@ ps2dev9_irx
Expand Down
9 changes: 6 additions & 3 deletions ee_core/include/ee_core.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,12 @@ extern u32 g_compat_mask;

extern char GameID[16];
extern int GameMode;
#define USB_MODE 0
#define ETH_MODE 1
#define HDD_MODE 2
enum GAME_MODE {
BDM_ILK_MODE,
BDM_USB_MODE,
ETH_MODE,
HDD_MODE,
};

extern char ExitPath[32];
extern int HDDSpindown;
Expand Down
5 changes: 5 additions & 0 deletions ee_core/include/modules.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ enum OPL_MODULE_ID {

//USB mode modules
OPL_MODULE_ID_USBD,
OPL_MODULE_ID_USBMASSBD,

//iLink mode modules
OPL_MODULE_ID_ILINK,
OPL_MODULE_ID_ILINKBD,

//SMB mode modules
OPL_MODULE_ID_SMSTCPIP,
Expand Down
24 changes: 18 additions & 6 deletions ee_core/src/iopmgr.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,16 +98,28 @@ static void ResetIopSpecial(const char *args, unsigned int arglen)
#else
#define PADEMU_ARG
#endif
if (GameMode == USB_MODE PADEMU_ARG) {
if (GameMode == BDM_USB_MODE PADEMU_ARG) {
LoadOPLModule(OPL_MODULE_ID_USBD, 0, 11, "thpri=2,3");
}
if (GameMode == ETH_MODE) {

switch (GameMode) {
case BDM_USB_MODE:
LoadOPLModule(OPL_MODULE_ID_USBMASSBD, 0, 0, NULL);
break;
case ETH_MODE:
#ifndef __LOAD_DEBUG_MODULES
LoadOPLModule(OPL_MODULE_ID_SMSTCPIP, 0, 0, NULL);
LoadOPLModule(OPL_MODULE_ID_SMAP, 0, g_ipconfig_len, g_ipconfig);
LoadOPLModule(OPL_MODULE_ID_SMSTCPIP, 0, 0, NULL);
LoadOPLModule(OPL_MODULE_ID_SMAP, 0, g_ipconfig_len, g_ipconfig);
#endif
LoadOPLModule(OPL_MODULE_ID_SMBINIT, 0, 0, NULL);
}
LoadOPLModule(OPL_MODULE_ID_SMBINIT, 0, 0, NULL);
break;
case HDD_MODE:
break;
case BDM_ILK_MODE:
LoadOPLModule(OPL_MODULE_ID_ILINK, 0, 0, NULL);
LoadOPLModule(OPL_MODULE_ID_ILINKBD, 0, 0, NULL);
break;
};
}

/*----------------------------------------------------------------------------------------*/
Expand Down
6 changes: 4 additions & 2 deletions ee_core/src/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,10 @@ static int eecoreInit(int argc, char **argv)
DPRINTF("OPL EE core start!\n");

p = _strtok(argv[i], " ");
if (!_strncmp(p, "USB_MODE", 8))
GameMode = USB_MODE;
if (!_strncmp(argv[i], "BDM_ILK_MODE", 12))
GameMode = BDM_ILK_MODE;
else if (!_strncmp(p, "BDM_USB_MODE", 12))
GameMode = BDM_USB_MODE;
else if (!_strncmp(p, "ETH_MODE", 8))
GameMode = ETH_MODE;
else if (!_strncmp(p, "HDD_MODE", 8))
Expand Down
39 changes: 23 additions & 16 deletions ee_core/src/patches.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#include "modmgr.h"

#define ALL_MODE -1
#define BDM_MODE -2

typedef struct
{
Expand Down Expand Up @@ -48,23 +49,23 @@ typedef struct
#define PATCH_HARVEST_MOON_AWL 0xFF025421

static const patchlist_t patch_list[] = {
{"SLES_524.58", USB_MODE, {PATCH_GENERIC_NIS, 0x00000000, 0x00000000}}, // Disgaea Hour of Darkness PAL - disable cdvd timeout stuff
{"SLUS_206.66", USB_MODE, {PATCH_GENERIC_NIS, 0x00000000, 0x00000000}}, // Disgaea Hour of Darkness NTSC U - disable cdvd timeout stuff
{"SLPS_202.51", USB_MODE, {PATCH_GENERIC_NIS, 0x00000000, 0x00000000}}, // Makai Senki Disgaea NTSC J - disable cdvd timeout stuff
{"SLPS_202.50", USB_MODE, {PATCH_GENERIC_NIS, 0x00000000, 0x00000000}}, // Makai Senki Disgaea (limited edition) NTSC J - disable cdvd timeout stuff
{"SLPS_731.03", USB_MODE, {PATCH_GENERIC_NIS, 0x00000000, 0x00000000}}, // Makai Senki Disgaea (PlayStation2 the Best) NTSC J - disable cdvd timeout stuff
{"SLES_529.51", USB_MODE, {PATCH_GENERIC_NIS, 0x00000000, 0x00000000}}, // Phantom Brave PAL - disable cdvd timeout stuff
{"SLUS_209.55", USB_MODE, {PATCH_GENERIC_NIS, 0x00000000, 0x00000000}}, // Phantom Brave NTSC U - disable cdvd timeout stuff
{"SLPS_203.45", USB_MODE, {PATCH_GENERIC_NIS, 0x00000000, 0x00000000}}, // Phantom Brave NTSC J - disable cdvd timeout stuff
{"SLPS_203.44", USB_MODE, {PATCH_GENERIC_NIS, 0x00000000, 0x00000000}}, // Phantom Brave (limited edition) NTSC J - disable cdvd timeout stuff
{"SLPS_731.08", USB_MODE, {PATCH_GENERIC_NIS, 0x00000000, 0x00000000}}, // Phantom Brave: 2-shuume Hajime Mashita (PlayStation 2 the Best) NTSC J - disable cdvd timeout stuff
{"SLES_524.58", BDM_MODE, {PATCH_GENERIC_NIS, 0x00000000, 0x00000000}}, // Disgaea Hour of Darkness PAL - disable cdvd timeout stuff
{"SLUS_206.66", BDM_MODE, {PATCH_GENERIC_NIS, 0x00000000, 0x00000000}}, // Disgaea Hour of Darkness NTSC U - disable cdvd timeout stuff
{"SLPS_202.51", BDM_MODE, {PATCH_GENERIC_NIS, 0x00000000, 0x00000000}}, // Makai Senki Disgaea NTSC J - disable cdvd timeout stuff
{"SLPS_202.50", BDM_MODE, {PATCH_GENERIC_NIS, 0x00000000, 0x00000000}}, // Makai Senki Disgaea (limited edition) NTSC J - disable cdvd timeout stuff
{"SLPS_731.03", BDM_MODE, {PATCH_GENERIC_NIS, 0x00000000, 0x00000000}}, // Makai Senki Disgaea (PlayStation2 the Best) NTSC J - disable cdvd timeout stuff
{"SLES_529.51", BDM_MODE, {PATCH_GENERIC_NIS, 0x00000000, 0x00000000}}, // Phantom Brave PAL - disable cdvd timeout stuff
{"SLUS_209.55", BDM_MODE, {PATCH_GENERIC_NIS, 0x00000000, 0x00000000}}, // Phantom Brave NTSC U - disable cdvd timeout stuff
{"SLPS_203.45", BDM_MODE, {PATCH_GENERIC_NIS, 0x00000000, 0x00000000}}, // Phantom Brave NTSC J - disable cdvd timeout stuff
{"SLPS_203.44", BDM_MODE, {PATCH_GENERIC_NIS, 0x00000000, 0x00000000}}, // Phantom Brave (limited edition) NTSC J - disable cdvd timeout stuff
{"SLPS_731.08", BDM_MODE, {PATCH_GENERIC_NIS, 0x00000000, 0x00000000}}, // Phantom Brave: 2-shuume Hajime Mashita (PlayStation 2 the Best) NTSC J - disable cdvd timeout stuff
{"SLUS_213.17", ALL_MODE, {PATCH_GENERIC_CAPCOM, 0x00149210, 0x00000000}}, // SFA anthology US
{"SLES_540.85", ALL_MODE, {PATCH_GENERIC_CAPCOM, 0x00148db0, 0x00000000}}, // SFA anthology EUR
{"SLPM_664.09", ALL_MODE, {PATCH_GENERIC_CAPCOM, 0x00149210, 0x00000000}}, // SFZ Generation JP
{"SLPM_659.98", ALL_MODE, {PATCH_GENERIC_CAPCOM, 0x00146fd0, 0x00000000}}, // Vampire: Darkstakers collection JP
{"SLUS_212.00", USB_MODE, {PATCH_GENERIC_AC9B, 0x00000000, 0x00000000}}, // Armored Core Nine Breaker NTSC U - skip failing case on binding a RPC server
{"SLES_538.19", USB_MODE, {PATCH_GENERIC_AC9B, 0x00000000, 0x00000000}}, // Armored Core Nine Breaker PAL - skip failing case on binding a RPC server
{"SLPS_254.08", USB_MODE, {PATCH_GENERIC_AC9B, 0x00000000, 0x00000000}}, // Armored Core Nine Breaker NTSC J - skip failing case on binding a RPC server
{"SLUS_212.00", BDM_MODE, {PATCH_GENERIC_AC9B, 0x00000000, 0x00000000}}, // Armored Core Nine Breaker NTSC U - skip failing case on binding a RPC server
{"SLES_538.19", BDM_MODE, {PATCH_GENERIC_AC9B, 0x00000000, 0x00000000}}, // Armored Core Nine Breaker PAL - skip failing case on binding a RPC server
{"SLPS_254.08", BDM_MODE, {PATCH_GENERIC_AC9B, 0x00000000, 0x00000000}}, // Armored Core Nine Breaker NTSC J - skip failing case on binding a RPC server
{"SLUS_210.05", ALL_MODE, {PATCH_GENERIC_SLOW_READS, 0x00110000, 0x001ac514}}, // Kingdom Hearts 2 US - [Gummi mission freezing fix (check addr is where to patch,
{"SLES_541.14", ALL_MODE, {PATCH_GENERIC_SLOW_READS, 0x00110000, 0x001ac60c}}, // Kingdom Hearts 2 UK - val is the amount of delay cycles)]
{"SLES_542.32", ALL_MODE, {PATCH_GENERIC_SLOW_READS, 0x00110000, 0x001ac60c}}, // Kingdom Hearts 2 FR
Expand Down Expand Up @@ -120,8 +121,8 @@ static const patchlist_t patch_list[] = {
{"SLUS_204.13", ALL_MODE, {PATCH_SHADOW_MAN_2, 0x00000001, 0x00000000}}, // Shadow Man: 2econd Coming (NTSC-U/C)
{"SLES_504.46", ALL_MODE, {PATCH_SHADOW_MAN_2, 0x00000002, 0x00000000}}, // Shadow Man: 2econd Coming (PAL)
{"SLES_506.08", ALL_MODE, {PATCH_SHADOW_MAN_2, 0x00000003, 0x00000000}}, // Shadow Man: 2econd Coming (PAL German)
{"SLUS_200.02", USB_MODE, {0x002c7758, 0x0000182d, 0x8c436d18}}, // Ridge Racer V (NTSC-U/C) - workaround disabling (bugged?) streaming code in favour of processing all data at once, for USB devices.
{"SCES_500.00", USB_MODE, {0x002c9760, 0x0000182d, 0x8c43a2f8}}, // Ridge Racer V (PAL) - workaround by disabling (bugged?) streaming code in favour of processing all data at once, for USB devices.
{"SLUS_200.02", BDM_MODE, {0x002c7758, 0x0000182d, 0x8c436d18}}, // Ridge Racer V (NTSC-U/C) - workaround disabling (bugged?) streaming code in favour of processing all data at once, for USB devices.
{"SCES_500.00", BDM_MODE, {0x002c9760, 0x0000182d, 0x8c43a2f8}}, // Ridge Racer V (PAL) - workaround by disabling (bugged?) streaming code in favour of processing all data at once, for USB devices.
{"SLUS_205.82", ALL_MODE, {PATCH_EUTECHNYX_WU_TID, 0x0033b534, 0x00000000}}, // SRS: Street Racing Syndicate (NTSC-U/C)
{"SLES_530.45", ALL_MODE, {PATCH_EUTECHNYX_WU_TID, 0x0033fbfc, 0x00000000}}, // SRS: Street Racing Syndicate (PAL)
{"SLUS_214.49", ALL_MODE, {PATCH_EUTECHNYX_WU_TID, 0x00361dfc, 0x00000000}}, // The Fast and the Furious (NTSC-U/C)
Expand Down Expand Up @@ -844,10 +845,16 @@ static void HarvestMoonAWLPatch(int region)
void apply_patches(const char *path)
{
const patchlist_t *p;
int mode;

if ((GameMode == HDD_MODE) || (GameMode == ETH_MODE))
mode = GameMode;
else
mode = BDM_MODE;

// if there are patches matching game name/mode then fill the patch table
for (p = patch_list; p->game; p++) {
if ((!_strcmp(GameID, p->game)) && ((p->mode == ALL_MODE) || (GameMode == p->mode))) {
if ((!_strcmp(GameID, p->game)) && ((p->mode == ALL_MODE) || (mode == p->mode))) {
switch (p->patch.addr) {
case PATCH_GENERIC_NIS:
NIS_generic_patches();
Expand Down
25 changes: 25 additions & 0 deletions include/bdmsupport.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#ifndef __BDM_SUPPORT_H
#define __BDM_SUPPORT_H

#include "include/iosupport.h"

#define BDM_MODE_UPDATE_DELAY MENU_UPD_DELAY_GENREFRESH

#include "include/mcemu.h"

typedef struct
{
int active; /* Activation flag */
u32 start_sector; /* Start sector of vmc file */
int flags; /* Card flag */
vmc_spec_t specs; /* Card specifications */
} bdm_vmc_infos_t;

#define MAX_BDM_DEVICES 5

void bdmInit();
item_list_t *bdmGetObject(int initOnly);
int bdmFindPartition(char *target, const char *name, int write);
void bdmLoadModules(void);

#endif
4 changes: 2 additions & 2 deletions include/config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,11 @@ enum CONFIG_INDEX {
#define CONFIG_OPL_DEFAULT_DEVICE "default_device"
#define CONFIG_OPL_ENABLE_WRITE "enable_delete_rename"
#define CONFIG_OPL_HDD_SPINDOWN "hdd_spindown"
#define CONFIG_OPL_USB_PREFIX "usb_prefix"
#define CONFIG_OPL_BDM_PREFIX "usb_prefix" // Leave this "usb" for compatibility
#define CONFIG_OPL_ETH_PREFIX "eth_prefix"
#define CONFIG_OPL_REMEMBER_LAST "remember_last"
#define CONFIG_OPL_AUTOSTART_LAST "autostart_last"
#define CONFIG_OPL_USB_MODE "usb_mode"
#define CONFIG_OPL_BDM_MODE "usb_mode" // Leave this "usb" for compatibility
#define CONFIG_OPL_HDD_MODE "hdd_mode"
#define CONFIG_OPL_ETH_MODE "eth_mode"
#define CONFIG_OPL_APP_MODE "app_mode"
Expand Down
4 changes: 2 additions & 2 deletions include/dialogs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ enum UI_ITEMS {
CFG_HDDGAMELISTCACHE,
CFG_EXITTO,
CFG_DEFDEVICE,
CFG_USBMODE,
CFG_BDMMODE,
CFG_HDDMODE,
CFG_ETHMODE,
CFG_APPMODE,
Expand All @@ -39,7 +39,7 @@ enum UI_ITEMS {
CFG_AUTOSTARTLAST,
CFG_SELECTBUTTON,
CFG_ENWRITEOP,
CFG_USBPREFIX,
CFG_BDMPREFIX,
CFG_ETHPREFIX,
CFG_HDDSPINDOWN,

Expand Down
Loading

0 comments on commit 17c4a62

Please sign in to comment.