Merge pull request #415 from bignaux/nbd

Replace broken HDL server with NBD server

Makefile

@@ -85,7 +85,7 @@ MISC_OBJS =	icon_sys_A.o icon_sys_J.o icon_sys_C.o conf_theme_OPL.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 \
+		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 \
 		httpclient-iop.o netman.o ps2ips.o \
@@ -284,8 +284,8 @@ clean:
 	$(MAKE) -C modules/mcemu USE_SMB=1 clean
 	echo " -genvmc"
 	$(MAKE) -C modules/vmc/genvmc clean
-	echo " -hdldsvr"
-	$(MAKE) -C modules/hdd/hdldsvr clean
+	echo " -lwnbdsvr"
+	$(MAKE) -C modules/network/lwnbdsvr clean
 	echo " -udptty-ingame"
 	$(MAKE) -C modules/debug/udptty-ingame clean
 	echo " -ioptrap"
@@ -611,11 +611,11 @@ modules/vmc/genvmc/genvmc.irx: modules/vmc/genvmc
 $(EE_ASM_DIR)genvmc.s: modules/vmc/genvmc/genvmc.irx | $(EE_ASM_DIR)
 	$(BIN2S) $< $@ genvmc_irx
 
-modules/hdd/hdldsvr/hdldsvr.irx: modules/hdd/hdldsvr
+modules/network/lwnbdsvr/lwnbdsvr.irx: modules/network/lwnbdsvr
 	$(MAKE) -C $<
 
-$(EE_ASM_DIR)hdldsvr.s: modules/hdd/hdldsvr/hdldsvr.irx | $(EE_ASM_DIR)
-	$(BIN2S) $< $@ hdldsvr_irx
+$(EE_ASM_DIR)lwnbdsvr.s: modules/network/lwnbdsvr/lwnbdsvr.irx | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ lwnbdsvr_irx
 
 $(EE_ASM_DIR)udptty.s: $(PS2SDK)/iop/irx/udptty.irx | $(EE_ASM_DIR)
 	$(BIN2S) $< $@ udptty_irx

include/extern_irx.h

@@ -61,8 +61,8 @@ extern int size_hdd_cdvdman_irx;
 extern void *hdd_hdpro_cdvdman_irx;
 extern int size_hdd_hdpro_cdvdman_irx;
 
-extern void *hdldsvr_irx;
-extern int size_hdldsvr_irx;
+extern void *lwnbdsvr_irx;
+extern int size_lwnbdsvr_irx;
 
 extern void *hdd_mcemu_irx;
 extern int size_hdd_mcemu_irx;

include/lang.h

@@ -71,11 +71,11 @@ enum _STR_IDS {
     _STR_APPMODE,
     _STR_AUTO,
     _STR_MANUAL,
-    _STR_STARTHDL,
-    _STR_STARTINGHDL,
-    _STR_RUNNINGHDL,
-    _STR_STARTFAILHDL,
-    _STR_UNLOADHDL,
+    _STR_STARTNBD,
+    _STR_STARTINGNBD,
+    _STR_RUNNINGNBD,
+    _STR_STARTFAILNBD,
+    _STR_UNLOADNBD,
     _STR_EXITTO,
     _STR_BGCOLOR,
     _STR_TXTCOLOR,

include/opl.h

@@ -73,7 +73,7 @@ int saveConfig(int types, int showUI);
 void applyConfig(int themeID, int langID);
 void menuDeferredUpdate(void *data);
 void moduleUpdateMenu(int mode, int themeChanged, int langChanged);
-void handleHdlSrv();
+void handleLwnbdSrv();
 void deinit(int exception, int modeSelected);
 
 extern char *gBaseMCDir;

labs/hdldsvrlab/Makefile → labs/lwnbdsvr/Makefile

@@ -1,6 +1,6 @@
 
-EE_BIN = hdldsvrlab.elf
-EE_OBJS = hdldsvrlab.o discid.o poweroff.o ps2dev9.o smsutils.o smstcpip.o smsmap.o ps2atad.o ps2hdd.o hdldsvr.o iomanx.o filexio.o
+EE_BIN = lwnbdsvrlab.elf
+EE_OBJS = lwnbdsvrlab.o discid.o poweroff.o ps2dev9.o smsutils.o smstcpip.o smsmap.o ps2atad.o ps2hdd.o lwnbdsvr.o iomanx.o filexio.o
 
 EE_LIBS = -lfileXio -lpatches -ldebug -lc -lkernel
 EE_CFLAGS = -g
@@ -19,7 +19,7 @@ clean:
 	$(MAKE) -C ../../modules/network/SMSMAP clean
 	$(MAKE) -C ../../modules/hdd/atad clean
 	$(MAKE) -C ../../modules/hdd/ps2hdd clean
-	$(MAKE) -C ../../modules/hdd/hdldsvr clean
+	$(MAKE) -C ../../modules/network/lwnbdsvr clean
 	rm -f *.elf *.o *.a *.s
 
 rebuild: clean all
@@ -42,7 +42,7 @@ smsutils.s:
 smstcpip.s:
 	$(MAKE) -C ../../modules/network/SMSTCPIP -f Makefile rebuild
 	$(BIN2S) ../../modules/network/SMSTCPIP/SMSTCPIP.irx smstcpip.s smstcpip_irx
-		
+
 smsmap.s:
 	$(MAKE) -C ../../modules/network/SMSMAP
 	$(BIN2S) ../../modules/network/SMSMAP/SMSMAP.irx smsmap.s smsmap_irx
@@ -55,9 +55,9 @@ ps2hdd.s:
 	$(MAKE) -C ../../modules/hdd/ps2hdd
 	$(BIN2S) ../../modules/hdd/ps2hdd/ps2hdd.irx ps2hdd.s ps2hdd_irx
 
-hdldsvr.s:
-	$(MAKE) -C ../../modules/hdd/hdldsvr
-	$(BIN2S) ../../modules/hdd/hdldsvr/hdldsvr.irx hdldsvr.s hdldsvr_irx
+lwnbdsvr.s:
+	$(MAKE) -C ../../modules/network/lwnbdsvr
+	$(BIN2S) ../../modules/network/lwnbdsvr/lwnbdsvr.irx lwnbdsvr.s lwnbdsvr_irx
 
 iomanx.s:
 	$(BIN2S) $(PS2SDK)/iop/irx/iomanX.irx iomanx.s iomanx_irx

labs/hdldsvrlab/hdldsvrlab.c → labs/lwnbdsvr/lwnbdsvrlab.c

@@ -35,8 +35,8 @@ extern void ps2atad_irx;
 extern int size_ps2atad_irx;
 extern void ps2hdd_irx;
 extern int size_ps2hdd_irx;
-extern void hdldsvr_irx;
-extern int size_hdldsvr_irx;
+extern void lwnbdsvr_irx;
+extern int size_lwnbdsvr_irx;
 extern void iomanx_irx;
 extern int size_iomanx_irx;
 extern void filexio_irx;
@@ -76,7 +76,7 @@ int main(int argc, char *argv[2])
 
     init_scr();
     scr_clear();
-    scr_printf("\t hdldsvrlab\n\n");
+    scr_printf("\t lwnbdsvrlab\n\n");
 
     SifInitRpc(0);
 
@@ -122,7 +122,7 @@ int main(int argc, char *argv[2])
     id = SifExecModuleBuffer(&smsmap_irx, size_smsmap_irx, g_ipconfig_len, g_ipconfig, &ret);
     id = SifExecModuleBuffer(&ps2atad_irx, size_ps2atad_irx, 0, NULL, &ret);
     id = SifExecModuleBuffer(&ps2hdd_irx, size_ps2hdd_irx, sizeof(hddarg), hddarg, &ret);
-    id = SifExecModuleBuffer(&hdldsvr_irx, size_hdldsvr_irx, 0, NULL, &ret);
+    id = SifExecModuleBuffer(&lwnbdsvr_irx, size_lwnbdsvr_irx, 0, NULL, &ret);
 
     scr_printf("OK\n");