pcv: update for new-ipc

nx/include/switch/services/pcv.h

@@ -6,7 +6,7 @@
  */
 #pragma once
 #include "../types.h"
-#include "../services/sm.h"
+#include "../sf/service.h"
 
 typedef enum {
     PcvModule_CpuBus            = 0,
@@ -197,7 +197,11 @@ Service* pcvGetServiceSession(void);
 
 Result pcvGetModuleId(PcvModuleId *module_id, PcvModule module);
 
+/// Only available on [1.0.0-7.0.1].
 Result pcvGetClockRate(PcvModule module, u32 *out_hz);
+/// Only available on [1.0.0-7.0.1].
 Result pcvSetClockRate(PcvModule module, u32 hz);
-Result pcvSetVoltageEnabled(bool state, u32 voltage);
+/// Only available on [1.0.0-7.0.1].
-Result pcvGetVoltageEnabled(bool *isEnabled, u32 voltage);
+Result pcvSetVoltageEnabled(u32 power_domain, bool state);
+/// Only available on [1.0.0-7.0.1].
+Result pcvGetVoltageEnabled(bool *isEnabled, u32 power_domain);

nx/source/services/pcv.c

@@ -1,33 +1,18 @@
-#include "types.h"
+#define NX_SERVICE_ASSUME_NON_DOMAIN
-#include "result.h"
+#include "service_guard.h"
-#include "arm/atomics.h"
-#include "kernel/ipc.h"
-#include "runtime/hosversion.h"
 #include "services/pcv.h"
-#include "services/sm.h"
+#include "runtime/hosversion.h"
 
 static Service g_pcvSrv;
-static u64 g_refCnt;
 
-Result pcvInitialize(void) {
+NX_GENERATE_SERVICE_GUARD(pcv);
-    Result rc = 0;
-    
-    atomicIncrement64(&g_refCnt);
 
-    if (serviceIsActive(&g_pcvSrv))
+Result _pcvInitialize(void) {
-        return 0;
+    return smGetService(&g_pcvSrv, "pcv");
-
-    rc = smGetService(&g_pcvSrv, "pcv");
-
-    if (R_FAILED(rc)) pcvExit();
-
-    return rc;
 }
 
-void pcvExit(void) {
+void _pcvCleanup(void) {
-    if (atomicDecrement64(&g_refCnt) == 0) {
+    serviceClose(&g_pcvSrv);
-        serviceClose(&g_pcvSrv);
-    }
 }
 
 Service* pcvGetServiceSession(void) {
@@ -69,166 +54,43 @@ Result pcvGetModuleId(PcvModuleId *module_id, PcvModule module) {
 }
 
 Result pcvSetClockRate(PcvModule module, u32 hz) {
-    if(hosversionAtLeast(8,0,0)) {
+    if(hosversionAtLeast(8,0,0))
         return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer);
-    }
 
-    IpcCommand c;
+    const struct {
-    ipcInitialize(&c);
-
-    struct {
-        u64 magic;
-        u64 cmd_id;
         u32 module;
         u32 hz;
-    } *raw;
+    } in = { module, hz };
-
+    return serviceDispatchIn(&g_pcvSrv, 2, in);
-    raw = serviceIpcPrepareHeader(&g_pcvSrv, &c, sizeof(*raw));
-
-    raw->magic = SFCI_MAGIC;
-    raw->cmd_id = 2;
-    raw->module = module;
-    raw->hz = hz;
-
-    Result rc = serviceIpcDispatch(&g_pcvSrv);
-
-    if (R_SUCCEEDED(rc)) {
-        IpcParsedCommand r;
-        struct {
-            u64 magic;
-            u64 result;
-        } *resp;
-
-        serviceIpcParse(&g_pcvSrv, &r, sizeof(*resp));
-        resp = r.Raw;
-
-        rc = resp->result;
-    }
-
-    return rc;
 }
 
 Result pcvGetClockRate(PcvModule module, u32 *out_hz) {
-    if(hosversionAtLeast(8,0,0)) {
+    if(hosversionAtLeast(8,0,0))
         return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer);
-    }
 
-    IpcCommand c;
+    const u32 in = module;
-    ipcInitialize(&c);
+    return serviceDispatchInOut(&g_pcvSrv, 3, in, *out_hz);
-
-    struct {
-        u64 magic;
-        u64 cmd_id;
-        u32 module;
-    } *raw;
-
-    raw = serviceIpcPrepareHeader(&g_pcvSrv, &c, sizeof(*raw));
-
-    raw->magic = SFCI_MAGIC;
-    raw->cmd_id = 3;
-    raw->module = module;
-
-    Result rc = serviceIpcDispatch(&g_pcvSrv);
-
-    if (R_SUCCEEDED(rc)) {
-        IpcParsedCommand r;
-        struct {
-            u64 magic;
-            u64 result;
-            u32 hz;
-        } *resp;
-
-        serviceIpcParse(&g_pcvSrv, &r, sizeof(*resp));
-        resp = r.Raw;
-
-        rc = resp->result;
-        
-        if (R_SUCCEEDED(rc)) {
-            *out_hz = resp->hz;
-        }
-    }
-
-    return rc;
 }
 
-Result pcvSetVoltageEnabled(bool state, u32 voltage) {
+Result pcvSetVoltageEnabled(u32 power_domain, bool state) {
-    if(hosversionAtLeast(8,0,0)) {
+    if(hosversionAtLeast(8,0,0))
         return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer);
-    }
 
-    IpcCommand c;
+    const struct {
-    ipcInitialize(&c);
-
-    struct {
-        u64 magic;
-        u64 cmd_id;
         u8 state;
-        u32 voltage;
+        u32 power_domain;
-    } *raw;
+    } in = { state != 0, power_domain };
-
+    return serviceDispatchIn(&g_pcvSrv, 8, in);
-    raw = serviceIpcPrepareHeader(&g_pcvSrv, &c, sizeof(*raw));
-
-    raw->magic = SFCI_MAGIC;
-    raw->cmd_id = 8;
-    raw->state = (u8)state;
-    raw->voltage = voltage;
-
-    Result rc = serviceIpcDispatch(&g_pcvSrv);
-
-    if (R_SUCCEEDED(rc)) {
-        IpcParsedCommand r;
-        struct {
-            u64 magic;
-            u64 result;
-        } *resp;
-
-        serviceIpcParse(&g_pcvSrv, &r, sizeof(*resp));
-        resp = r.Raw;
-
-        rc = resp->result;
-    }
-
-    return rc;
 }
 
-Result pcvGetVoltageEnabled(bool *isEnabled, u32 voltage) {
+Result pcvGetVoltageEnabled(bool *isEnabled, u32 power_domain) {
-    if(hosversionAtLeast(8,0,0)) {
+    if(hosversionAtLeast(8,0,0))
         return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer);
-    }
 
-    IpcCommand c;
+    u8 tmp = 0;
-    ipcInitialize(&c);
+    Result rc = serviceDispatchInOut(&g_pcvSrv, 9, power_domain, tmp);
 
-    struct {
+    if (R_SUCCEEDED(rc) && isEnabled) *isEnabled = tmp & 1;
-        u64 magic;
-        u64 cmd_id;
-        u32 voltage;
-    } *raw;
-
-    raw = serviceIpcPrepareHeader(&g_pcvSrv, &c, sizeof(*raw));
-
-    raw->magic = SFCI_MAGIC;
-    raw->cmd_id = 9;
-    raw->voltage = voltage;
-
-    Result rc = serviceIpcDispatch(&g_pcvSrv);
-
-    if (R_SUCCEEDED(rc)) {
-        IpcParsedCommand r;
-        struct {
-            u64 magic;
-            u64 result;
-            u8 isEnabled;
-        } *resp;
-
-        serviceIpcParse(&g_pcvSrv, &r, sizeof(*resp));
-        resp = r.Raw;
-
-        rc = resp->result;
-        if(R_SUCCEEDED(rc) && isEnabled) {
-            *isEnabled = (bool)resp->isEnabled;
-        }
-    }
 
     return rc;
 }