gpio: update for new-ipc

This commit is contained in:
Michael Scire 2019-10-18 22:41:45 -07:00 committed by fincs
parent edcd25bdae
commit 48905d70d2
No known key found for this signature in database
GPG Key ID: 62C7609ADA219C60
2 changed files with 27 additions and 189 deletions

View File

@ -6,7 +6,7 @@
*/ */
#pragma once #pragma once
#include "../types.h" #include "../types.h"
#include "sm.h" #include "../sf/service.h"
typedef enum { typedef enum {
GpioPadName_AudioCodec = 1, GpioPadName_AudioCodec = 1,

View File

@ -1,217 +1,55 @@
#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 "services/gpio.h" #include "services/gpio.h"
#include "services/sm.h"
static Service g_gpioSrv; static Service g_gpioSrv;
static u64 g_refCnt;
Result gpioInitialize(void) { NX_GENERATE_SERVICE_GUARD(gpio);
Result rc = 0;
atomicIncrement64(&g_refCnt); Result _gpioInitialize(void) {
return smGetService(&g_gpioSrv, "gpio");
if (serviceIsActive(&g_gpioSrv))
return 0;
rc = smGetService(&g_gpioSrv, "gpio");
if (R_FAILED(rc)) gpioExit();
return rc;
} }
void gpioExit(void) { void _gpioCleanup(void) {
if (atomicDecrement64(&g_refCnt) == 0) { serviceClose(&g_gpioSrv);
serviceClose(&g_gpioSrv);
}
} }
Service* gpioGetServiceSession(void) { Service* gpioGetServiceSession(void) {
return &g_gpioSrv; return &g_gpioSrv;
} }
static Result _gpioCmdInU32NoOut(Service *srv, u32 value, u32 cmd_id) {
return serviceDispatchIn(srv, cmd_id, value);
}
static Result _gpioCmdNoInOutU32(Service *srv, u32 *out_value, u32 cmd_id) {
return serviceDispatchOut(srv, cmd_id, *out_value);
}
Result gpioOpenSession(GpioPadSession *out, GpioPadName name) { Result gpioOpenSession(GpioPadSession *out, GpioPadName name) {
IpcCommand c; _Static_assert(sizeof(name) == sizeof(u32), "GpioPadName size");
ipcInitialize(&c); return serviceDispatchIn(&g_gpioSrv, 1, name,
.out_num_objects = 1,
struct { .out_objects = &out->s,
u64 magic; );
u64 cmd_id;
u32 name;
} *raw;
raw = serviceIpcPrepareHeader(&g_gpioSrv, &c, sizeof(*raw));
raw->magic = SFCI_MAGIC;
raw->cmd_id = 1;
raw->name = name;
Result rc = serviceIpcDispatch(&g_gpioSrv);
if (R_SUCCEEDED(rc)) {
IpcParsedCommand r;
struct {
u64 magic;
u64 result;
} *resp;
serviceIpcParse(&g_gpioSrv, &r, sizeof(*resp));
resp = r.Raw;
rc = resp->result;
if (R_SUCCEEDED(rc)) {
serviceCreateSubservice(&out->s, &g_gpioSrv, &r, 0);
}
}
return rc;
} }
Result gpioPadSetDirection(GpioPadSession *p, GpioDirection dir) { Result gpioPadSetDirection(GpioPadSession *p, GpioDirection dir) {
IpcCommand c; return _gpioCmdInU32NoOut(&p->s, dir, 0);
ipcInitialize(&c);
struct {
u64 magic;
u64 cmd_id;
u32 dir;
} *raw;
raw = serviceIpcPrepareHeader(&p->s, &c, sizeof(*raw));
raw->magic = SFCI_MAGIC;
raw->cmd_id = 0;
raw->dir = dir;
Result rc = serviceIpcDispatch(&p->s);
if (R_SUCCEEDED(rc)) {
IpcParsedCommand r;
struct {
u64 magic;
u64 result;
} *resp;
serviceIpcParse(&p->s, &r, sizeof(*resp));
resp = r.Raw;
rc = resp->result;
}
return rc;
} }
Result gpioPadGetDirection(GpioPadSession *p, GpioDirection *out) { Result gpioPadGetDirection(GpioPadSession *p, GpioDirection *out) {
IpcCommand c; _Static_assert(sizeof(*out) == sizeof(u32), "GpioDirection size");
ipcInitialize(&c); return _gpioCmdNoInOutU32(&p->s, (u32 *)out, 1);
struct {
u64 magic;
u64 cmd_id;
} *raw;
raw = serviceIpcPrepareHeader(&p->s, &c, sizeof(*raw));
raw->magic = SFCI_MAGIC;
raw->cmd_id = 1;
Result rc = serviceIpcDispatch(&p->s);
if (R_SUCCEEDED(rc)) {
IpcParsedCommand r;
struct {
u64 magic;
u64 result;
u8 dir;
} *resp;
serviceIpcParse(&p->s, &r, sizeof(*resp));
resp = r.Raw;
rc = resp->result;
if (R_SUCCEEDED(rc)) {
*out = (GpioDirection)resp->dir;
}
}
return rc;
} }
Result gpioPadSetValue(GpioPadSession *p, GpioValue val) { Result gpioPadSetValue(GpioPadSession *p, GpioValue val) {
IpcCommand c; return _gpioCmdInU32NoOut(&p->s, val, 8);
ipcInitialize(&c);
struct {
u64 magic;
u64 cmd_id;
u32 val;
} *raw;
raw = serviceIpcPrepareHeader(&p->s, &c, sizeof(*raw));
raw->magic = SFCI_MAGIC;
raw->cmd_id = 8;
raw->val = val;
Result rc = serviceIpcDispatch(&p->s);
if (R_SUCCEEDED(rc)) {
IpcParsedCommand r;
struct {
u64 magic;
u64 result;
u8 val;
} *resp;
serviceIpcParse(&p->s, &r, sizeof(*resp));
resp = r.Raw;
rc = resp->result;
}
return rc;
} }
Result gpioPadGetValue(GpioPadSession *p, GpioValue *out) { Result gpioPadGetValue(GpioPadSession *p, GpioValue *out) {
IpcCommand c; _Static_assert(sizeof(*out) == sizeof(u32), "GpioValue size");
ipcInitialize(&c); return _gpioCmdNoInOutU32(&p->s, (u32 *)out, 9);
struct {
u64 magic;
u64 cmd_id;
} *raw;
raw = serviceIpcPrepareHeader(&p->s, &c, sizeof(*raw));
raw->magic = SFCI_MAGIC;
raw->cmd_id = 9;
Result rc = serviceIpcDispatch(&p->s);
if (R_SUCCEEDED(rc)) {
IpcParsedCommand r;
struct {
u64 magic;
u64 result;
u8 val;
} *resp;
serviceIpcParse(&p->s, &r, sizeof(*resp));
resp = r.Raw;
rc = resp->result;
if (R_SUCCEEDED(rc)) {
*out = (GpioValue)resp->val;
}
}
return rc;
} }
void gpioPadClose(GpioPadSession *p) { void gpioPadClose(GpioPadSession *p) {