mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-07-04 10:32:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Removed IGeneralService

Browse Source
This commit is contained in:
shadowninja108 2018-06-04 19:58:29 -07:00
parent d305b68b79
commit 2a1c7660dd
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
nx/source/services/nifm.c
View File

@ -8,16 +8,12 @@
#include "services/nifm.h" #include "services/nifm.h"
#include "arm/atomics.h" #include "arm/atomics.h"
typedef struct {
Service s;
} IGeneralService;
static Service g_nifmSrv; static Service g_nifmSrv;
static IGeneralService g_nifmIGS; static Service g_nifmIGS;
static u64 g_refCnt; static u64 g_refCnt;
static Result _nifmCreateGeneralService(IGeneralService* out, u64 in); static Result _nifmCreateGeneralService(Service* out, u64 in);
static Result _nifmCreateGeneralServiceOld(IGeneralService* out); static Result _nifmCreateGeneralServiceOld(Service* out);
Result nifmInitialize(void) { Result nifmInitialize(void) {
atomicIncrement64(&g_refCnt); atomicIncrement64(&g_refCnt);
@ -44,7 +40,7 @@ Result nifmInitialize(void) {
void nifmExit(void) { void nifmExit(void) {
if (atomicDecrement64(&g_refCnt) == 0) { if (atomicDecrement64(&g_refCnt) == 0) {
serviceClose(&g_nifmIGS.s); serviceClose(&g_nifmIGS);
serviceClose(&g_nifmSrv); serviceClose(&g_nifmSrv);
} }
} }
@ -63,7 +59,7 @@ Result nifmGetCurrentIpAddress(u32* out) {
raw->magic = SFCI_MAGIC; raw->magic = SFCI_MAGIC;
raw->cmd_id = 12; raw->cmd_id = 12;
Result rc = serviceIpcDispatch(&g_nifmIGS.s); Result rc = serviceIpcDispatch(&g_nifmIGS);
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc)) {
IpcParsedCommand r; IpcParsedCommand r;
@ -82,7 +78,7 @@ Result nifmGetCurrentIpAddress(u32* out) {
return rc; return rc;
} }
static Result _nifmCreateGeneralService(IGeneralService* out, u64 in) { static Result _nifmCreateGeneralService(Service* out, u64 in) {
IpcCommand c; IpcCommand c;
ipcInitialize(&c); ipcInitialize(&c);
ipcSendPid(&c); ipcSendPid(&c);
@ -113,13 +109,13 @@ static Result _nifmCreateGeneralService(IGeneralService* out, u64 in) {
rc = resp->result; rc = resp->result;
if (R_SUCCEEDED(rc)) if (R_SUCCEEDED(rc))
serviceCreate(&out->s, r.Handles[0]); serviceCreate(out, r.Handles[0]);
} }
return rc; return rc;
} }
static Result _nifmCreateGeneralServiceOld(IGeneralService* out) { static Result _nifmCreateGeneralServiceOld(Service* out) {
IpcCommand c; IpcCommand c;
ipcInitialize(&c); ipcInitialize(&c);
@ -147,7 +143,7 @@ static Result _nifmCreateGeneralServiceOld(IGeneralService* out) {
rc = resp->result; rc = resp->result;
if (R_SUCCEEDED(rc)) if (R_SUCCEEDED(rc))
serviceCreate(&out->s, r.Handles[0]); serviceCreate(out, r.Handles[0]);
} }
return rc; return rc;