Merge pull request #26 from fjtrujy/master

fjtrujy · web-flow · commit c4de45fd4d6e · 2021-06-28T12:48:49.000+02:00
Solve Warnings
diff --git a/ee/cmdHandler.c b/ee/cmdHandler.c
@@ -97,9 +97,6 @@ makeArgs(int cmdargc, char *cmdargv, struct argData *arg_data)
 {
     int i;
     int t;
-    int argc;
-
-    argc = 0;
 
     if (cmdargc > MAX_ARGS)
         cmdargc = MAX_ARGS;
@@ -138,6 +135,11 @@ pkoLoadElf(char *path)
 
     ret = SifLoadElf(path, &elfdata);
 
+	if (ret < 0) {
+        dbgprintf("EE: Could not load ELF file\n");
+        return -1;
+    }
+
     FlushCache(0);
     FlushCache(2);
 
@@ -219,12 +221,18 @@ static int
 pkoGSExec(pko_pkt_gsexec_req *cmd) {
 	int fd;
     int len;
-	fd = open(cmd->file, O_RDONLY);
+	fd = open((const char *)cmd->file, O_RDONLY);
 	if ( fd < 0 ) {
 		return fd;
 	}
 	len = read(fd, dataBuffer, 128);
 	close(fd);
+
+	if (len < 0 ) {
+		printf("EE: pkoGSExec failed\n");
+		return -1;
+	}
+
     // stop/reset dma02
 
     // dmasend via GIF channel
@@ -856,7 +864,7 @@ cmdThread()
     }
 
     ExitDeleteThread();
-    return 0;
+    return ret;
 }
 
 ////////////////////////////////////////////////////////////////////////
diff --git a/ee/excepHandler.c b/ee/excepHandler.c
@@ -17,11 +17,11 @@ extern int userThreadID;
 extern int excepscrdump;
 
 ////////////////////////////////////////////////////////////////////////
-typedef union 
+typedef union __attribute__((packed))
 {
     unsigned int  uint128 __attribute__(( mode(TI) ));
     unsigned long uint64[2];
-} eeReg __attribute((packed));
+} eeReg;
 
 ////////////////////////////////////////////////////////////////////////
 // Prototypes
diff --git a/ee/ps2link.c b/ee/ps2link.c
@@ -45,10 +45,12 @@ int irx_buffer_addr = 0;
 ////////////////////////////////////////////////////////////////////////
 // Globals
 extern int userThreadID;
+extern void __start(void);
+extern int _end;
 
 // Argv name+path & just path
 char elfName[256] __attribute__((aligned(16)));
-char elfPath[256];
+char elfPath[241]; // It isn't 256 because elfPath will add subpaths
 
 #ifndef BUILTIN_IRXS
 char poweroff_path[PKO_MAX_PATH];
@@ -88,17 +90,20 @@ static void getIpConfig(void);
 ////////////////////////////////////////////////////////////////////////
 #define IPCONF_MAX_LEN 1024
 
+#define DEFAULT_IP "192.168.0.10"
+#define DEFAULT_NETMASK "255.255.255.0"
+#define DEFAULT_GW "192.168.0.1"
+#define SEPARATOR " "
+// DEFAULT_IP_CONFIG should be something as "192.168.0.10 255.0.0.0 192.168.0.1"
+#define DEFAULT_IP_CONFIG DEFAULT_IP SEPARATOR DEFAULT_NETMASK SEPARATOR DEFAULT_GW
+
 // Make sure the "cached config" is in the data section
 // To prevent it from being "zeroed" on a restart of ps2link
 char if_conf[IPCONF_MAX_LEN] __attribute__ ((section (".data"))) = "";
 char fExtraConfig[256] __attribute__ ((section (".data")));
 int load_extra_conf __attribute__ ((section (".data"))) = 0;
 int if_conf_len __attribute__ ((section (".data"))) = 0;
 
-char ip[16] __attribute__((aligned(16))) = "192.168.0.10";
-char netmask[16] __attribute__((aligned(16))) = "255.255.255.0";
-char gw[16] __attribute__((aligned(16))) = "192.168.0.1";
-
 ////////////////////////////////////////////////////////////////////////
 // Parse network configuration from IPCONFIG.DAT
 // Note: parsing really should be made more robust...
@@ -196,20 +201,11 @@ getIpConfig(void)
     if (fd < 0)
     {
         scr_printf("Could not find IPCONFIG.DAT, using defaults\n"
-                   "Net config: %s  %s  %s\n", ip, netmask, gw);
+                   "Net config: %s\n", DEFAULT_IP_CONFIG);
         // Set defaults
         memset(if_conf, 0x00, IPCONF_MAX_LEN);
-        i = 0;
-        strncpy(&if_conf[i], ip, 15);
-        i += strlen(ip) + 1;
-
-        strncpy(&if_conf[i], netmask, 15);
-        i += strlen(netmask) + 1;
-
-        strncpy(&if_conf[i], gw, 15);
-        i += strlen(gw) + 1;
-
-        if_conf_len = i;
+        strcpy(if_conf, DEFAULT_IP_CONFIG);
+        i = strlen(DEFAULT_IP_CONFIG);
         dbgscr_printf("conf len %d\n", if_conf_len);
         return;
     }
@@ -279,6 +275,13 @@ getExtraConfig()
     lseek(fd, 0, SEEK_SET);
     buf = malloc(size + 1);
     ret = read(fd, buf, size);
+    
+    if ( ret < 0 )
+	{
+        scr_printf("failed to read extra conf file\n");
+        return;
+    }
+
     buf[size] = 0;
     close(fd);
     ptr = buf;
@@ -521,10 +524,8 @@ setPathInfo(char *path)
 {
     char *ptr;
 
-    strncpy(elfName, path, 255);
-    strncpy(elfPath, path, 255);
-    elfName[255] = '\0';
-    elfPath[255] = '\0';
+    strcpy(elfName, path);
+    strcpy(elfPath, path);
 
 
     ptr = strrchr(elfPath, '/');
@@ -599,6 +600,13 @@ wipeUserMemLoadHigh(void)
     }
 }
 
+void printWelcomeInfo()
+{
+    scr_printf(WELCOME_STRING, APP_VERSION);
+    scr_printf("ps2link loaded at 0x%08X-0x%08X\n", ((u32) __start) - 8, (u32) &_end);
+    scr_printf("Initializing...\n");
+}
+
 
 void
 restartIOP()
@@ -615,7 +623,7 @@ restartIOP()
     dbgscr_printf("rpc init\n");
     SifInitRpc(0);
 
-    scr_printf("Initializing...\n");
+    printWelcomeInfo();
 //    sio_printf("Initializing...\n");
     sbv_patch_enable_lmb();
     sbv_patch_disable_prefix_check();
@@ -729,10 +737,11 @@ void ResetActiveThreads(void)
 }
 #endif
 
-extern void __start(void);
-extern int _end;
-
 ////////////////////////////////////////////////////////////////////////
+
+// We are not using time zone, so we can safe some KB
+void _ps2sdk_timezone_update() {}
+
 int
 main(int argc, char *argv[])
 {
@@ -743,9 +752,7 @@ main(int argc, char *argv[])
 //    fioInit();
 
     init_scr();
-    scr_printf(WELCOME_STRING, APP_VERSION);
-
-    scr_printf("ps2link loaded at 0x%08X-0x%08X\n", ((u32) __start) - 8, (u32) &_end);
+    printWelcomeInfo();
 
     installExceptionHandlers();
 
diff --git a/iop/cmdHandler.c b/iop/cmdHandler.c
@@ -74,6 +74,8 @@ pkoExecIop(char *buf, int len)
     args = &cmd->argv[strlen(cmd->argv) + 1];
     argc = ntohl(cmd->argc);
 
+    printf("IOP binary path: %s\n", path);
+
     arglen = 0;
     for (i = 0; i < (argc - 1); i++) {
         printf("arg %d: %s (%d)\n", i, &args[arglen], arglen);
@@ -84,31 +86,31 @@ pkoExecIop(char *buf, int len)
     
     if (id < 0) {
         printf("Error loading module: ");
-	switch (-id) {
-	case E_IOP_INTR_CONTEXT:
-	    printf("IOP is in exception context.\n");
-	    break;
-	case E_IOP_DEPENDANCY:
-	    printf("Inter IRX dependancy error.\n");
-	    break;
-	case E_LF_NOT_IRX:
-	    printf("Invalid IRX module.\n");
-	    break;
-	case E_LF_FILE_NOT_FOUND:
-	    printf("Unable to open executable file.\n");
-	    break;
-	case E_LF_FILE_IO_ERROR:
-	    printf("Error while accessing file.\n");
-	    break;
-	case E_IOP_NO_MEMORY:
-	    printf("IOP is out of memory.\n");
-	    break;
-	default:
-	    printf("Unknow error code: %d\n", -retval);
-	    break;
-	}					
+        switch (-id) {
+        case E_IOP_INTR_CONTEXT:
+            printf("IOP is in exception context.\n");
+            break;
+        case E_IOP_DEPENDANCY:
+            printf("Inter IRX dependancy error.\n");
+            break;
+        case E_LF_NOT_IRX:
+            printf("Invalid IRX module.\n");
+            break;
+        case E_LF_FILE_NOT_FOUND:
+            printf("Unable to open executable file.\n");
+            break;
+        case E_LF_FILE_IO_ERROR:
+            printf("Error while accessing file.\n");
+            break;
+        case E_IOP_NO_MEMORY:
+            printf("IOP is out of memory.\n");
+            break;
+        default:
+            printf("Unknow error code: %d\n", -retval);
+            break;
+        }					
     } else {
-	printf("loadmodule: id %d, ret %d\n", id, retval);
+	    printf("loadmodule: id %d, ret %d\n", id, retval);
     }
 }
 
@@ -159,33 +161,25 @@ pkoSendSifCmd(unsigned int cmd, void *src, unsigned int len)
 static void 
 pkoExecEE(char *buf, int len)
 {
-    int ret;
-
-    ret = pkoSendSifCmd(PKO_RPC_EXECEE, buf, len);
+    pkoSendSifCmd(PKO_RPC_EXECEE, buf, len);
 };
 //////////////////////////////////////////////////////////////////////////
 static void 
 pkoGSExec(char *buf, int len)
 {
-    int ret;
-
-    ret = pkoSendSifCmd(PKO_RPC_GSEXEC, buf, len);
+    pkoSendSifCmd(PKO_RPC_GSEXEC, buf, len);
 };
 //////////////////////////////////////////////////////////////////////////
 static void 
 pkoNetDump(char *buf, int len)
 {
-    int ret;
-
-    ret = pkoSendSifCmd(PKO_RPC_NETDUMP, buf, len);
+    pkoSendSifCmd(PKO_RPC_NETDUMP, buf, len);
 };
 //////////////////////////////////////////////////////////////////////////
 static void 
 pkoScrDump(char *buf, int len)
 {
-    int ret;
-
-    ret = pkoSendSifCmd(PKO_RPC_SCRDUMP, buf, len);
+    pkoSendSifCmd(PKO_RPC_SCRDUMP, buf, len);
 };
 
 //////////////////////////////////////////////////////////////////////////
@@ -199,8 +193,6 @@ pkoPowerOff()
 static void 
 pkoReset(char *buf, int len)
 {
-    int ret;
-
     dbgprintf("IOP cmd: RESET\n");
 
     if (len != sizeof(pko_pkt_reset_req)) {
@@ -213,38 +205,32 @@ pkoReset(char *buf, int len)
     printf("unmounted\n");
     DelDrv("tty");
 
-    ret = pkoSendSifCmd(PKO_RPC_RESET, buf, len);
+    pkoSendSifCmd(PKO_RPC_RESET, buf, len);
 };
 
 static void
 pkoStopVU(char *buf, int len) {
-    int ret;
-
-    ret = pkoSendSifCmd(PKO_RPC_STOPVU, buf, len);
+    pkoSendSifCmd(PKO_RPC_STOPVU, buf, len);
 };
 
 static void
 pkoStartVU(char *buf, int len)  {
-    int ret;
-    ret = pkoSendSifCmd(PKO_RPC_STARTVU, buf, len);
+    pkoSendSifCmd(PKO_RPC_STARTVU, buf, len);
 };
 
 static void
 pkoDumpMem(char *buf, int len) {
-    int ret;
-    ret = pkoSendSifCmd(PKO_RPC_DUMPMEM, buf, len);
+    pkoSendSifCmd(PKO_RPC_DUMPMEM, buf, len);
 };
 
 static void
 pkoDumpReg(char *buf, int len) {
-    int ret;
-    ret = pkoSendSifCmd(PKO_RPC_DUMPREG, buf, len);
+    pkoSendSifCmd(PKO_RPC_DUMPREG, buf, len);
 };
 
 static void
 pkoWriteMem(char *buf, int len) {
-    int ret;
-    ret = pkoSendSifCmd(PKO_RPC_WRITEMEM, buf, len);
+    pkoSendSifCmd(PKO_RPC_WRITEMEM, buf, len);
 };
 
 //////////////////////////////////////////////////////////////////////////
diff --git a/iop/excepHandler.c b/iop/excepHandler.c
@@ -62,7 +62,7 @@ char* ExceptionGetModuleName(u32 epc, u32* r_epc)
 			if(r_epc)
 				*r_epc = epc -  mod_info->text_start;
 			
-			return mod_info->name;
+			return (char *)mod_info->name;
 		}	
 	}
 	
diff --git a/iop/net_fio.c b/iop/net_fio.c
@@ -650,7 +650,7 @@ int pko_close_dir(int fd)
 
 //----------------------------------------------------------------------
 //
-int pko_get_stat(char *name, iox_stat_t *stat)
+int pko_get_stat(const char *name, iox_stat_t *stat)
 {
     pko_pkt_getstat_req *getstatreq;
     pko_pkt_getstat_rly *getstatrly;
diff --git a/iop/net_fio.h b/iop/net_fio.h
@@ -27,7 +27,7 @@ int pko_rmdir(char *name);
 int pko_open_dir(char *path);
 int pko_read_dir(int fd, void *buf);
 int pko_close_dir(int fd);
-int pko_get_stat(char *name, iox_stat_t *stat);
+int pko_get_stat(const char *name, iox_stat_t *stat);
 
 /*
  * Don't want printfs to broadcast in case more than 1 ps2 on the same network, so at

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ char* ExceptionGetModuleName(u32 epc, u32* r_epc)`
`62`	`62`	`if(r_epc)`
`63`	`63`	`*r_epc = epc - mod_info->text_start;`
`64`	`64`
`65`		`- return mod_info->name;`
	`65`	`+ return (char *)mod_info->name;`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`
Original file line number	Diff line number	Diff line change
`@@ -650,7 +650,7 @@ int pko_close_dir(int fd)`
`650`	`650`
`651`	`651`	`//----------------------------------------------------------------------`
`652`	`652`	`//`
`653`		`-int pko_get_stat(char name, iox_stat_t stat)`
	`653`	`+int pko_get_stat(const char name, iox_stat_t stat)`
`654`	`654`	`{`
`655`	`655`	`pko_pkt_getstat_req *getstatreq;`
`656`	`656`	`pko_pkt_getstat_rly *getstatrly;`