Change all references of FireWire to iLink/ILK

ps2homebrew · Sep 2, 2021 · 0630e35 · 0630e35
1 parent 670da84
commit 0630e35
Show file tree

Hide file tree

Showing 15 changed files with 23 additions and 23 deletions.
diff --git a/.github/ISSUE_TEMPLATE/issue-report.yml b/.github/ISSUE_TEMPLATE/issue-report.yml
@@ -63,7 +63,7 @@ body:
         - USB
         - SMB
         - HDD
-        - Firewire
+        - iLink
         - MX4SIO
 
   - type: textarea

diff --git a/gfx/ilk_bd.png b/gfx/ilk_bd.png
diff --git a/include/config.h b/include/config.h
@@ -87,7 +87,7 @@ enum CONFIG_INDEX {
 #define CONFIG_OPL_HDD_MODE             "hdd_mode"
 #define CONFIG_OPL_ETH_MODE             "eth_mode"
 #define CONFIG_OPL_APP_MODE             "app_mode"
-#define CONFIG_OPL_ENABLE_FW            "enable_firewire"
+#define CONFIG_OPL_ENABLE_ILINK         "enable_ilink"
 #define CONFIG_OPL_ENABLE_MX4SIO        "enable_mx4sio"
 #define CONFIG_OPL_SWAP_SEL_BUTTON      "swap_select_btn"
 #define CONFIG_OPL_PARENTAL_LOCK_PWD    "parental_lock_password"

diff --git a/include/dialogs.h b/include/dialogs.h
@@ -34,7 +34,7 @@ enum UI_ITEMS {
     CFG_HDDMODE,
     CFG_ETHMODE,
     CFG_APPMODE,
-    CFG_ENABLEFW,
+    CFG_ENABLEILK,
     CFG_ENABLEMX4SIO,
     CFG_LASTPLAYED,
     CFG_LBL_AUTOSTARTLAST,

diff --git a/include/lang.h b/include/lang.h
@@ -283,7 +283,7 @@ enum _STR_IDS {
     _STR_HINT_BDM_START,
     _STR_HINT_BLOCK_DEVICES,
     _STR_USB_GAMES,
-    _STR_FIREWIRE_GAMES,
+    _STR_ILINK_GAMES,
     _STR_MX4SIO_GAMES,
 
     LANG_STR_COUNT

diff --git a/include/opl.h b/include/opl.h
@@ -116,7 +116,7 @@ extern int gHDDStartMode;
 extern int gETHStartMode;
 extern int gAPPStartMode;
 
-extern int gEnableFW;
+extern int gEnableILK;
 extern int gEnableMX4SIO;
 
 extern int gAutosort;

diff --git a/include/textures.h b/include/textures.h
@@ -12,7 +12,7 @@ enum INTERNAL_TEXTURE {
     LOAD7_ICON,
     BDM_ICON,
     USB_ICON,
-    FIREWIRE_ICON,
+    ILINK_ICON,
     MX4SIO_ICON,
     HDD_ICON,
     ETH_ICON,

diff --git a/lng/lang_English.lng b/lng/lang_English.lng
@@ -300,5 +300,5 @@ Controller Settings
 Turn on/off Block Device Manager.
 Turn on/off Block Devices (e.g. USB).
 USB Games
-FireWire Games
+iLink Games
 MX4SIO Games
diff --git a/lng/lang_Spanish.lng b/lng/lang_Spanish.lng
@@ -278,4 +278,4 @@ Descripción
 Dispositivos de bloque
 Configuración del mando
 Activa/Desactiva el Gestor de Dispositivos de Bloque (Block Device Manager)
-Selecciona dispositivos de bloque (Ejemplo: USB, Firewire, MX4SIO)
+Selecciona dispositivos de bloque (Ejemplo: USB, iLink, MX4SIO)
diff --git a/src/bdmsupport.c b/src/bdmsupport.c
@@ -23,7 +23,7 @@ static int bdmGameCount = 0;
 static base_game_info_t *bdmGames;
 static char bdmDriver[5];
 
-static int fireWireModLoaded = 0;
+static int iLinkModLoaded = 0;
 static int mx4sioModLoaded = 0;
 
 // forward declaration
@@ -72,12 +72,12 @@ static void bdmEventHandler(void *packet, void *opt)
 
 static void bdmLoadBlockDeviceModules(void)
 {
-    if (gEnableFW && !fireWireModLoaded) {
+    if (gEnableILK && !iLinkModLoaded) {
         // Load iLink Block Device drivers
         sysLoadModuleBuffer(&iLinkman_irx, size_iLinkman_irx, 0, NULL);
         sysLoadModuleBuffer(&IEEE1394_bd_irx, size_IEEE1394_bd_irx, 0, NULL);
 
-        fireWireModLoaded = 1;
+        iLinkModLoaded = 1;
     }
 
     if (gEnableMX4SIO && !mx4sioModLoaded) {
@@ -419,7 +419,7 @@ static int bdmGetTextId(void)
     if (!strcmp(bdmDriver, "usb"))
         mode = _STR_USB_GAMES;
     else if (!strcmp(bdmDriver, "sd") && strlen(bdmDriver) == 2)
-        mode = _STR_FIREWIRE_GAMES;
+        mode = _STR_ILINK_GAMES;
     else if (!strcmp(bdmDriver, "sdc") && strlen(bdmDriver) == 3)
         mode = _STR_MX4SIO_GAMES;
 
@@ -433,7 +433,7 @@ static int bdmGetIconId(void)
     if (!strcmp(bdmDriver, "usb"))
         mode = USB_ICON;
     else if (!strcmp(bdmDriver, "sd") && strlen(bdmDriver) == 2)
-        mode = FIREWIRE_ICON;
+        mode = ILINK_ICON;
     else if (!strcmp(bdmDriver, "sdc") && strlen(bdmDriver) == 3)
         mode = MX4SIO_ICON;
 

diff --git a/src/dialogs.c b/src/dialogs.c
@@ -145,9 +145,9 @@ struct UIItem diaBlockDevicesConfig[] = {
     {UI_LABEL, 0, 1, 1, -1, -40, 0, {.label = {NULL, _STR_ON}}},
     {UI_BREAK},
 
-    {UI_LABEL, 0, 1, 1, -1, -40, 0, {.label = {"FireWire", -1}}},
+    {UI_LABEL, 0, 1, 1, -1, -40, 0, {.label = {"iLink", -1}}},
     {UI_SPACER},
-    {UI_BOOL, CFG_ENABLEFW, 1, 1, -1, 0, 0, {.intvalue = {0, 0}}},
+    {UI_BOOL, CFG_ENABLEILK, 1, 1, -1, 0, 0, {.intvalue = {0, 0}}},
     {UI_BREAK},
 
     {UI_LABEL, 0, 1, 1, -1, -40, 0, {.label = {"MX4SIO", -1}}},

diff --git a/src/gui.c b/src/gui.c
@@ -439,12 +439,12 @@ static void guiShowBlockDeviceConfig(void)
 {
     int ret;
 
-    diaSetInt(diaBlockDevicesConfig, CFG_ENABLEFW, gEnableFW);
+    diaSetInt(diaBlockDevicesConfig, CFG_ENABLEILK, gEnableILK);
     diaSetInt(diaBlockDevicesConfig, CFG_ENABLEMX4SIO, gEnableMX4SIO);
 
     ret = diaExecuteDialog(diaBlockDevicesConfig, -1, 1, NULL);
     if (ret) {
-        diaGetInt(diaBlockDevicesConfig, CFG_ENABLEFW, &gEnableFW);
+        diaGetInt(diaBlockDevicesConfig, CFG_ENABLEILK, &gEnableILK);
         diaGetInt(diaBlockDevicesConfig, CFG_ENABLEMX4SIO, &gEnableMX4SIO);
     }
 }

diff --git a/src/lang.c b/src/lang.c
@@ -287,7 +287,7 @@ static char *internalEnglish[LANG_STR_COUNT] = {
     "Turn on/off Block Device Manager.",
     "Turn on/off Block Devices (e.g. USB).",
     "USB Games",
-    "FireWire Games",
+    "iLink Games",
     "MX4SIO Games",
 };
 

diff --git a/src/opl.c b/src/opl.c
@@ -144,7 +144,7 @@ int gBDMStartMode;
 int gHDDStartMode;
 int gETHStartMode;
 int gAPPStartMode;
-int gEnableFW;
+int gEnableILK;
 int gEnableMX4SIO;
 int gAutosort;
 int gAutoRefresh;
@@ -858,7 +858,7 @@ static void _loadConfig()
             configGetInt(configOPL, CONFIG_OPL_HDD_MODE, &gHDDStartMode);
             configGetInt(configOPL, CONFIG_OPL_ETH_MODE, &gETHStartMode);
             configGetInt(configOPL, CONFIG_OPL_APP_MODE, &gAPPStartMode);
-            configGetInt(configOPL, CONFIG_OPL_ENABLE_FW, &gEnableFW);
+            configGetInt(configOPL, CONFIG_OPL_ENABLE_ILINK, &gEnableILK);
             configGetInt(configOPL, CONFIG_OPL_ENABLE_MX4SIO, &gEnableMX4SIO);
             configGetInt(configOPL, CONFIG_OPL_SFX, &gEnableSFX);
             configGetInt(configOPL, CONFIG_OPL_BOOT_SND, &gEnableBootSND);
@@ -1009,7 +1009,7 @@ static void _saveConfig()
         configSetInt(configOPL, CONFIG_OPL_HDD_MODE, gHDDStartMode);
         configSetInt(configOPL, CONFIG_OPL_ETH_MODE, gETHStartMode);
         configSetInt(configOPL, CONFIG_OPL_APP_MODE, gAPPStartMode);
-        configSetInt(configOPL, CONFIG_OPL_ENABLE_FW, gEnableFW);
+        configSetInt(configOPL, CONFIG_OPL_ENABLE_ILINK, gEnableILK);
         configSetInt(configOPL, CONFIG_OPL_ENABLE_MX4SIO, gEnableMX4SIO);
         configSetInt(configOPL, CONFIG_OPL_SFX, gEnableSFX);
         configSetInt(configOPL, CONFIG_OPL_BOOT_SND, gEnableBootSND);
@@ -1602,7 +1602,7 @@ static void setDefaults(void)
     gETHStartMode = START_MODE_DISABLED;
     gAPPStartMode = START_MODE_DISABLED;
 
-    gEnableFW = 0;
+    gEnableILK = 0;
     gEnableMX4SIO = 0;
 
     frameCounter = 0;

diff --git a/src/textures.c b/src/textures.c
@@ -116,7 +116,7 @@ static texture_t internalDefault[TEXTURES_COUNT] = {
     {LOAD7_ICON, "load7", &load7_png},
     {BDM_ICON, "usb", &usb_png},
     {USB_ICON, "usb_bd", &usb_bd_png},
-    {FIREWIRE_ICON, "ilk_bd", &ilk_bd_png},
+    {ILINK_ICON, "ilk_bd", &ilk_bd_png},
     {MX4SIO_ICON, "m4s_bd", &m4s_bd_png},
     {HDD_ICON, "hdd", &hdd_png},
     {ETH_ICON, "eth", &eth_png},