Merge pull request #859 from uyjulian/rpc_inited_cleanup

Make SIF binding handling more consistent

Author: fjtrujy

ee/kernel/include/iopcontrol.h

@@ -41,6 +41,20 @@ extern int SifIopIsAlive(void);
  */
 extern int SifIopSync(void);
 
+/**
+ * @return 1 if IOP reboot count has changed since last call or 0 if not
+ */
+static inline int HasIopRebootedSinceLastCall(void)
+{
+    static int _rb_count;
+    extern int _iop_reboot_count;
+    if (_rb_count != _iop_reboot_count) {
+        _rb_count = _iop_reboot_count;
+        return 1;
+    }
+    return 0;
+}
+
 #ifdef __cplusplus
 }
 #endif

ee/kernel/src/fileio.c

@@ -21,13 +21,12 @@
 #define NEWLIB_PORT_AWARE
 #include <fileio.h>
 #include <string.h>
+#include <iopcontrol.h>
 #include <fileio-common.h>
 
 #define D(fmt, args...) printf("(%s:%s:%i):" #fmt, __FILE__, __FUNCTION__, __LINE__, ##args)
 
-extern int _iop_reboot_count;
 extern SifRpcClientData_t _fio_cd;
-extern int _fio_init;
 extern int _fio_block_mode;
 extern int _fio_io_sema;
 extern int _fio_completion_sema;
@@ -41,7 +40,6 @@ void _fio_intr();
 SifRpcClientData_t _fio_cd;
 int _fio_recv_data[512] __attribute__((aligned(64)));
 int _fio_intr_data[32] __attribute__((aligned(64)));
-int _fio_init = 0;
 int _fio_block_mode;
 int _fio_io_sema         = -1;
 int _fio_completion_sema = -1;
@@ -52,15 +50,10 @@ int fioInit(void)
 {
     int res;
     ee_sema_t sema;
-    static int _rb_count = 0;
-
-    if (_rb_count != _iop_reboot_count) {
-        _rb_count = _iop_reboot_count;
-
+    if (HasIopRebootedSinceLastCall())
         fioExit();
-    }
 
-    if (_fio_init)
+    if (_fio_cd.server)
         return 0;
 
     sceSifInitRpc(0);
@@ -87,7 +80,6 @@ int fioInit(void)
     if (_fio_io_sema < 0)
         return -E_LIB_SEMA_CREATE;
 
-    _fio_init       = 1;
     _fio_block_mode = FIO_WAIT;
 
     return 0;
@@ -151,8 +143,7 @@ void fioSetBlockMode(int blocking)
 #ifdef F_fio_exit
 void fioExit(void)
 {
-    if (_fio_init) {
-        _fio_init = 0;
+    if (_fio_cd.server) {
         memset(&_fio_cd, 0, sizeof _fio_cd);
         if (_fio_completion_sema >= 0) {
             DeleteSema(_fio_completion_sema);

ee/kernel/src/iopheap.c

@@ -15,33 +15,23 @@
 #include "sifrpc.h"
 #include "sifcmd.h"
 #include "string.h"
+#include <iopcontrol.h>
 #include "iopheap-common.h"
 
 #include "iopheap.h"
 
-#define IH_C_BOUND 0x0001
-
-extern int _iop_reboot_count;
 extern SifRpcClientData_t _ih_cd;
-extern int _ih_caps;
 
 #ifdef F_SifInitIopHeap
 SifRpcClientData_t _ih_cd;
-int _ih_caps = 0;
 
 int SifInitIopHeap()
 {
     int res;
+    if (HasIopRebootedSinceLastCall())
+        SifExitIopHeap();
 
-    static int _rb_count = 0;
-    if (_rb_count != _iop_reboot_count) {
-        _rb_count = _iop_reboot_count;
-        memset(&_ih_cd, 0, sizeof _ih_cd);
-        _ih_caps = 0;
-        memset(&_ih_caps, 0, sizeof _ih_caps);
-    }
-
-    if (_ih_caps)
+    if (_ih_cd.server)
         return 0;
 
     sceSifInitRpc(0);
@@ -52,16 +42,14 @@ int SifInitIopHeap()
     if (res < 0)
         return -E_SIF_RPC_BIND;
 
-    _ih_caps |= IH_C_BOUND;
-
     return 0;
 }
 #endif
 
 #ifdef F_SifExitIopHeap
 void SifExitIopHeap()
 {
-    _ih_caps = 0;
+    memset(&_ih_cd, 0, sizeof _ih_cd);
 }
 #endif
 

ee/kernel/src/loadfile.c

@@ -20,34 +20,29 @@
 #include <kernel.h>
 #include <sifrpc.h>
 #include <string.h>
+#include <iopcontrol.h>
 
 #include <loadfile.h>
 #include <iopheap.h>
 #include <fcntl.h>
 #include <unistd.h>
 
-extern int _iop_reboot_count;
 extern SifRpcClientData_t _lf_cd;
-extern int _lf_init;
 
 int _SifLoadElfPart(const char *path, const char *secname, t_ExecData *data, int fno);
 int _SifLoadModuleBuffer(void *ptr, int arg_len, const char *args, int *modres);
 
 #if defined(F_SifLoadFileInit)
 SifRpcClientData_t _lf_cd;
-int _lf_init = 0;
 
 int SifLoadFileInit()
 {
     int res;
-    static int _rb_count = 0;
-    if (_rb_count != _iop_reboot_count) {
-        _rb_count = _iop_reboot_count;
-        memset(&_lf_cd, 0, sizeof _lf_cd);
-        _lf_init = 0;
-    }
 
-    if (_lf_init)
+    if (HasIopRebootedSinceLastCall())
+        SifLoadFileExit();
+
+    if (_lf_cd.server)
         return 0;
 
     sceSifInitRpc(0);
@@ -58,15 +53,13 @@ int SifLoadFileInit()
     if (res < 0)
         return -E_SIF_RPC_BIND;
 
-    _lf_init = 1;
     return 0;
 }
 #endif
 
 #if defined(F_SifLoadFileExit)
 void SifLoadFileExit()
 {
-    _lf_init = 0;
     memset(&_lf_cd, 0, sizeof _lf_cd);
 }
 #endif

ee/kernel/src/sifcmd.c

@@ -19,6 +19,7 @@
 #include <tamtypes.h>
 #include <kernel.h>
 #include <sifcmd.h>
+#include <iopcontrol.h>
 
 #define CMD_PACKET_MAX      128
 #define CMD_PACKET_DATA_MAX 112
@@ -50,7 +51,6 @@ struct cmd_data
     int *sregs;
 } __attribute__((aligned(64)));
 
-extern int _iop_reboot_count;
 extern struct cmd_data _sif_cmd_data;
 extern unsigned int _SifSendCmd(int cid, int mode, void *pkt, int pktsize, void *src,
                                 void *dest, int size);
@@ -182,7 +182,6 @@ static SifCmdSysHandlerData_t sys_cmd_handlers[SYS_CMD_HANDLER_MAX];
 static int sregs[32];
 
 struct cmd_data _sif_cmd_data;
-static int init    = 0;
 static int sif0_id = -1;
 
 struct ca_pkt
@@ -218,17 +217,10 @@ void sceSifInitCmd(void)
 {
     static struct ca_pkt packet __attribute((aligned(64)));
     int i;
-    static int _rb_count = 0;
-    if (_rb_count != _iop_reboot_count) {
-        _rb_count = _iop_reboot_count;
-        if (sif0_id >= 0) {
-            DisableDmac(DMAC_SIF0);
-            RemoveDmacHandler(DMAC_SIF0, sif0_id);
-        }
-        init = 0;
-    }
+    if (HasIopRebootedSinceLastCall())
+        sceSifExitCmd();
 
-    if (init)
+    if (sif0_id >= 0)
         return;
 
     DI();
@@ -267,7 +259,6 @@ void sceSifInitCmd(void)
     sif0_id = AddDmacHandler(DMAC_SIF0, &_SifCmdIntHandler, 0);
     EnableDmac(DMAC_SIF0);
 
-    init = 1;
 
     _sif_cmd_data.iopbuf = (void *)sceSifGetReg(SIF_SYSREG_SUBADDR);
     if (_sif_cmd_data.iopbuf) {
@@ -293,9 +284,11 @@ void sceSifInitCmd(void)
 
 void sceSifExitCmd(void)
 {
-    DisableDmac(DMAC_SIF0);
-    RemoveDmacHandler(DMAC_SIF0, sif0_id);
-    init = 0;
+    if (sif0_id >= 0) {
+        DisableDmac(DMAC_SIF0);
+        RemoveDmacHandler(DMAC_SIF0, sif0_id);
+        sif0_id = -1;
+    }
 }
 #endif
 

ee/kernel/src/sifrpc.c

@@ -21,6 +21,7 @@
 #include <kernel.h>
 #include <sifcmd.h>
 #include <sifrpc.h>
+#include <iopcontrol.h>
 
 #define RPC_PACKET_SIZE 64
 
@@ -50,7 +51,6 @@ struct rpc_data
     void *active_queue;
 } __attribute__((aligned(64)));
 
-extern int _iop_reboot_count;
 extern struct rpc_data _sif_rpc_data;
 
 void *_rpc_get_packet(struct rpc_data *rpc_data);
@@ -415,13 +415,10 @@ void sceSifInitRpc(int mode)
 
     (void)mode;
 
-    static int _rb_count = 0;
-    if (_rb_count != _iop_reboot_count) {
-        _rb_count = _iop_reboot_count;
+    if (HasIopRebootedSinceLastCall()) {
         sceSifExitCmd();
         init = 0;
     }
-
     if (init)
         return;
     init = 1;