i2c: update for new-ipc

This commit is contained in:
Michael Scire 2019-10-18 23:09:57 -07:00 committed by fincs
parent 861e9d7c3d
commit 61fabbe1bc
No known key found for this signature in database
GPG Key ID: 62C7609ADA219C60
2 changed files with 34 additions and 153 deletions

View File

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

View File

@ -1,178 +1,59 @@
#include "types.h"
#include "result.h"
#include "arm/atomics.h"
#include "kernel/ipc.h"
#define NX_SERVICE_ASSUME_NON_DOMAIN
#include "service_guard.h"
#include "services/i2c.h"
#include "services/sm.h"
#include "runtime/hosversion.h"
static Service g_i2cSrv;
static u64 g_refCnt;
Result i2cInitialize(void) {
Result rc = 0;
NX_GENERATE_SERVICE_GUARD(i2c);
atomicIncrement64(&g_refCnt);
if (serviceIsActive(&g_i2cSrv))
return 0;
rc = smGetService(&g_i2cSrv, "i2c");
if (R_FAILED(rc)) i2cExit();
return rc;
Result _i2cInitialize(void) {
return smGetService(&g_i2cSrv, "i2c");
}
void i2cExit(void) {
if (atomicDecrement64(&g_refCnt) == 0) {
void _i2cCleanup(void) {
serviceClose(&g_i2cSrv);
}
}
Service* i2cGetServiceSession(void) {
return &g_i2cSrv;
}
Result i2cOpenSession(I2cSession *out, I2cDevice dev) {
IpcCommand c;
ipcInitialize(&c);
struct {
u64 magic;
u64 cmd_id;
u32 device;
} *raw;
raw = serviceIpcPrepareHeader(&g_i2cSrv, &c, sizeof(*raw));
raw->magic = SFCI_MAGIC;
raw->cmd_id = 1;
raw->device = dev;
Result rc = serviceIpcDispatch(&g_i2cSrv);
if (R_SUCCEEDED(rc)) {
IpcParsedCommand r;
struct {
u64 magic;
u64 result;
} *resp;
serviceIpcParse(&g_i2cSrv, &r, sizeof(*resp));
resp = r.Raw;
rc = resp->result;
if (R_SUCCEEDED(rc)) {
serviceCreateSubservice(&out->s, &g_i2cSrv, &r, 0);
}
}
return rc;
const u32 in = dev;
return serviceDispatchIn(&g_i2cSrv, 1, in,
.out_num_objects = 1,
.out_objects = &out->s,
);
}
Result i2csessionSendAuto(I2cSession *s, const void *buf, size_t size, I2cTransactionOption option) {
IpcCommand c;
ipcInitialize(&c);
ipcAddSendSmart(&c, s->s.pointer_buffer_size, buf, size, 0);
struct {
u64 magic;
u64 cmd_id;
u32 option;
} *raw;
raw = serviceIpcPrepareHeader(&s->s, &c, sizeof(*raw));
raw->magic = SFCI_MAGIC;
raw->cmd_id = 10;
raw->option = option;
Result rc = serviceIpcDispatch(&s->s);
if (R_SUCCEEDED(rc)) {
IpcParsedCommand r;
struct {
u64 magic;
u64 result;
} *resp;
serviceIpcParse(&s->s, &r, sizeof(*resp));
resp = r.Raw;
rc = resp->result;
}
return rc;
const u32 in = option;
return serviceDispatchIn(&s->s, 10, in,
.buffer_attrs = { SfBufferAttr_In | SfBufferAttr_HipcAutoSelect },
.buffers = { { buf, size } },
);
}
Result i2csessionReceiveAuto(I2cSession *s, void *buf, size_t size, I2cTransactionOption option) {
IpcCommand c;
ipcInitialize(&c);
ipcAddRecvSmart(&c, s->s.pointer_buffer_size, buf, size, 0);
struct {
u64 magic;
u64 cmd_id;
u32 option;
} *raw;
raw = serviceIpcPrepareHeader(&s->s, &c, sizeof(*raw));
raw->magic = SFCI_MAGIC;
raw->cmd_id = 11;
raw->option = option;
Result rc = serviceIpcDispatch(&s->s);
if (R_SUCCEEDED(rc)) {
IpcParsedCommand r;
struct {
u64 magic;
u64 result;
} *resp;
serviceIpcParse(&s->s, &r, sizeof(*resp));
resp = r.Raw;
rc = resp->result;
}
return rc;
const u32 in = option;
return serviceDispatchIn(&s->s, 11, in,
.buffer_attrs = { SfBufferAttr_Out | SfBufferAttr_HipcAutoSelect },
.buffers = { { buf, size } },
);
}
Result i2csessionExecuteCommandList(I2cSession *s, void *dst, size_t dst_size, const void *cmd_list, size_t cmd_list_size) {
IpcCommand c;
ipcInitialize(&c);
ipcAddSendStatic(&c, cmd_list, cmd_list_size, 0);
ipcAddRecvSmart(&c, s->s.pointer_buffer_size, dst, dst_size, 0);
struct {
u64 magic;
u64 cmd_id;
} *raw;
raw = serviceIpcPrepareHeader(&s->s, &c, sizeof(*raw));
raw->magic = SFCI_MAGIC;
raw->cmd_id = 12;
Result rc = serviceIpcDispatch(&s->s);
if (R_SUCCEEDED(rc)) {
IpcParsedCommand r;
struct {
u64 magic;
u64 result;
} *resp;
serviceIpcParse(&s->s, &r, sizeof(*resp));
resp = r.Raw;
rc = resp->result;
}
return rc;
return serviceDispatch(&s->s, 12,
.buffer_attrs = {
SfBufferAttr_Out | SfBufferAttr_HipcAutoSelect,
SfBufferAttr_In | SfBufferAttr_HipcPointer,
},
.buffers = {
{ dst, dst_size },
{ cmd_list, cmd_list_size },
},
);
}
void i2csessionClose(I2cSession *s) {