Added code for getting the session handles for am, fs, and srv. Updated ACU_WaitInter...

diff --git a/libctru/include/3ds/services/am.h b/libctru/include/3ds/services/am.h
index bf8bc953d283430ef063e48b287e1add712c1ce4..859c9e9f1a838c2b2ec846d919e84a30716f9457 100644 (file)
--- a/libctru/include/3ds/services/am.h
+++ b/libctru/include/3ds/services/am.h
@@ -16,6 +16,7 @@ typedef struct
 
 Result amInit();
 Result amExit();
+Handle *amGetSessionHandle();
 
 /* AM_GetTitleCount()
 About: Gets the number of titles for a given mediatype

diff --git a/libctru/include/3ds/services/fs.h b/libctru/include/3ds/services/fs.h
index be53a4d1aac0d17fa8364778c0f55ea05d14f28d..2f7b4dddf2c074184a924c045020a2c4beff97e0 100644 (file)
--- a/libctru/include/3ds/services/fs.h
+++ b/libctru/include/3ds/services/fs.h
@@ -129,6 +129,7 @@ typedef struct
 
 Result fsInit(void);
 Result fsExit(void);
+Handle *fsGetSessionHandle();
 
 FS_path FS_makePath(FS_pathType type, const char  *path);
 

diff --git a/libctru/include/3ds/srv.h b/libctru/include/3ds/srv.h
index 9fbe481bd4c8b9c1892fa1d8be4e5abf141d57a8..509e37f5def0df7a2b610a105865c8494d54f65c 100644 (file)
--- a/libctru/include/3ds/srv.h
+++ b/libctru/include/3ds/srv.h
@@ -2,6 +2,7 @@
 
 Result srvInit();
 Result srvExit();
+Handle *srvGetSessionHandle();
 Result srvRegisterClient();
 Result srvGetServiceHandle(Handle* out, const char* name);
 Result srvRegisterService(Handle* out, const char* name, int maxSessions);

diff --git a/libctru/source/services/ac.c b/libctru/source/services/ac.c
index 3579a21d041bddb3d70ce40a672a5f33c5d60a00..04449f0dad640e30c59d09e588ff30db17391874 100644 (file)
--- a/libctru/source/services/ac.c
+++ b/libctru/source/services/ac.c
@@ -91,7 +91,7 @@ Result ACU_WaitInternetConnection()
        while(1)
        {
                ret = ACU_GetWifiStatus(&servhandle, &outval);
-               if(ret==0 && outval==1)break;
+               if(ret==0 && outval!=0)break;
        }
 
        svcCloseHandle(servhandle);

diff --git a/libctru/source/services/am.c b/libctru/source/services/am.c
index 8c0d530e2151325440ee01811173453b21df8c60..7830651c11dbcde8a4ba15e9d8426f1dc8287b54 100644 (file)
--- a/libctru/source/services/am.c
+++ b/libctru/source/services/am.c
@@ -21,6 +21,11 @@ Result amExit()
        return svcCloseHandle(amHandle);
 }
 
+Handle *amGetSessionHandle()
+{
+       return &amHandle;
+}
+
 Result AM_GetTitleCount(u8 mediatype, u32 *count)
 {
        Result ret = 0;

diff --git a/libctru/source/services/fs.c b/libctru/source/services/fs.c
index cd48f6f7a18b90a627e9e047c7b100a37ee1dff7..157583e53e327bec50ca2f3193e7517d7ecb0c87 100644 (file)
--- a/libctru/source/services/fs.c
+++ b/libctru/source/services/fs.c
@@ -69,6 +69,15 @@ fsExit(void)
        return svcCloseHandle(fsuHandle);
 }
 
+/*! Gets the fsuser service session handle.
+*
+*  @returns Handle
+*/
+Handle *fsGetSessionHandle()
+{
+       return &fsuHandle;
+}
+
 /*! Initialize FS service handle
  *
  *  If @a handle is NULL, this initializes @ref fsuHandle.

diff --git a/libctru/source/srv.c b/libctru/source/srv.c
index 53c0767d8a6b60deaff06f9c779ceca7d7b7e07f..224371716341120690ab257854e3963480a23f9a 100644 (file)
--- a/libctru/source/srv.c
+++ b/libctru/source/srv.c
@@ -97,6 +97,11 @@ Result srvExit()
        return 0;
 }
 
+Handle *srvGetSessionHandle()
+{
+       return &g_srv_handle;
+}
+
 Result srvRegisterClient()
 {
        Result rc = 0;