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

Address comments

Browse Source
This commit is contained in:
Thomas Guillemard 2019-07-03 19:28:13 +02:00
parent 10a6a949cb
commit d8f5ef8b3d
2 changed files with 24 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
nx/include/switch/services/time.h
View File

@ -36,13 +36,12 @@ typedef struct {
} TimeCalendarAdditionalInfo; } TimeCalendarAdditionalInfo;
typedef struct { typedef struct {
char reserved[0x4000]; u8 data[0x4000];
} TimeZoneRule; } TimeZoneRule;
typedef struct typedef struct {
{
char name[0x24]; char name[0x24];
} LocationName; } TimeLocationName;
Result timeInitialize(void); Result timeInitialize(void);
void timeExit(void); void timeExit(void);
@ -59,15 +58,15 @@ Result timeGetCurrentTime(TimeType type, u64 *timestamp);
*/ */
Result timeSetCurrentTime(TimeType type, u64 timestamp); Result timeSetCurrentTime(TimeType type, u64 timestamp);
Result timeGetDeviceLocationName(LocationName *name); Result timeGetDeviceLocationName(TimeLocationName *name);
Result timeSetDeviceLocationName(const LocationName *name); Result timeSetDeviceLocationName(const TimeLocationName *name);
Result timeGetTotalLocationNameCount(u32 *total_location_name_count); Result timeGetTotalLocationNameCount(u32 *total_location_name_count);
Result timeLoadLocationNameList(u32 index, LocationName *location_name_array, size_t location_name_size, u32 *location_name_count); Result timeLoadLocationNameList(u32 index, TimeLocationName *location_name_array, size_t location_name_size, u32 *location_name_count);
Result timeLoadTimeZoneRule(const LocationName *name, TimeZoneRule *rule); Result timeLoadTimeZoneRule(const TimeLocationName *name, TimeZoneRule *rule);
Result timeToPosixTime(const TimeZoneRule *rule, TimeCalendarTime caltime, u64 *timestamp_list, size_t timestamp_list_size, u32 *timestamp_count); Result timeToPosixTime(const TimeZoneRule *rule, const TimeCalendarTime *caltime, u64 *timestamp_list, size_t timestamp_list_size, u32 *timestamp_count);
Result timeToPosixTimeWithMyRule(TimeCalendarTime caltime, u64 *timestamp_list, size_t timestamp_list_size, u32 *timestamp_count); Result timeToPosixTimeWithMyRule(const TimeCalendarTime *caltime, u64 *timestamp_list, size_t timestamp_list_size, u32 *timestamp_count);
Result timeToCalendarTime(const TimeZoneRule *rule, u64 timestamp, TimeCalendarTime *caltime, TimeCalendarAdditionalInfo *info); Result timeToCalendarTime(const TimeZoneRule *rule, u64 timestamp, TimeCalendarTime *caltime, TimeCalendarAdditionalInfo *info);
Result timeToCalendarTimeWithMyRule(u64 timestamp, TimeCalendarTime *caltime, TimeCalendarAdditionalInfo *info); Result timeToCalendarTimeWithMyRule(u64 timestamp, TimeCalendarTime *caltime, TimeCalendarAdditionalInfo *info);

37
nx/source/services/time.c
View File

@ -191,8 +191,7 @@ Result timeSetCurrentTime(TimeType type, u64 timestamp) {
return rc; return rc;
} }
Result timeGetDeviceLocationName(LocationName *name) Result timeGetDeviceLocationName(TimeLocationName *name) {
{
IpcCommand c; IpcCommand c;
ipcInitialize(&c); ipcInitialize(&c);
@ -215,33 +214,32 @@ Result timeGetDeviceLocationName(LocationName *name)
struct { struct {
u64 magic; u64 magic;
u64 result; u64 result;
LocationName name; TimeLocationName name;
} *resp = r.Raw; } *resp = r.Raw;
rc = resp->result; rc = resp->result;
if (R_SUCCEEDED(rc) && name) memcpy(name, &resp->name, sizeof(LocationName)); if (R_SUCCEEDED(rc) && name) memcpy(name, &resp->name, sizeof(TimeLocationName));
} }
return rc; return rc;
} }
Result timeSetDeviceLocationName(const LocationName *name) Result timeSetDeviceLocationName(const TimeLocationName *name) {
{
IpcCommand c; IpcCommand c;
ipcInitialize(&c); ipcInitialize(&c);
struct { struct {
u64 magic; u64 magic;
u64 cmd_id; u64 cmd_id;
LocationName name; TimeLocationName name;
} *raw; } *raw;
raw = ipcPrepareHeader(&c, sizeof(*raw)); raw = ipcPrepareHeader(&c, sizeof(*raw));
raw->magic = SFCI_MAGIC; raw->magic = SFCI_MAGIC;
raw->cmd_id = 1; raw->cmd_id = 1;
memcpy(&raw->name, name, sizeof(LocationName)); memcpy(&raw->name, name, sizeof(TimeLocationName));
Result rc = serviceIpcDispatch(&g_timeTimeZoneService); Result rc = serviceIpcDispatch(&g_timeTimeZoneService);
@ -260,8 +258,7 @@ Result timeSetDeviceLocationName(const LocationName *name)
return rc; return rc;
} }
Result timeGetTotalLocationNameCount(u32 *total_location_name_count) Result timeGetTotalLocationNameCount(u32 *total_location_name_count) {
{
IpcCommand c; IpcCommand c;
ipcInitialize(&c); ipcInitialize(&c);
@ -295,8 +292,7 @@ Result timeGetTotalLocationNameCount(u32 *total_location_name_count)
return rc; return rc;
} }
Result timeLoadLocationNameList(u32 index, LocationName *location_name_array, size_t location_name_size, u32 *location_name_count) Result timeLoadLocationNameList(u32 index, TimeLocationName *location_name_array, size_t location_name_size, u32 *location_name_count) {
{
IpcCommand c; IpcCommand c;
ipcInitialize(&c); ipcInitialize(&c);
ipcAddRecvBuffer(&c, location_name_array, location_name_size, BufferType_Normal); ipcAddRecvBuffer(&c, location_name_array, location_name_size, BufferType_Normal);
@ -333,8 +329,7 @@ Result timeLoadLocationNameList(u32 index, LocationName *location_name_array, si
return rc; return rc;
} }
Result timeLoadTimeZoneRule(const LocationName *name, TimeZoneRule *rule) Result timeLoadTimeZoneRule(const TimeLocationName *name, TimeZoneRule *rule) {
{
IpcCommand c; IpcCommand c;
ipcInitialize(&c); ipcInitialize(&c);
ipcAddRecvBuffer(&c, rule, sizeof(TimeZoneRule), BufferType_Normal); ipcAddRecvBuffer(&c, rule, sizeof(TimeZoneRule), BufferType_Normal);
@ -342,14 +337,14 @@ Result timeLoadTimeZoneRule(const LocationName *name, TimeZoneRule *rule)
struct { struct {
u64 magic; u64 magic;
u64 cmd_id; u64 cmd_id;
LocationName name; TimeLocationName name;
} *raw; } *raw;
raw = ipcPrepareHeader(&c, sizeof(*raw)); raw = ipcPrepareHeader(&c, sizeof(*raw));
raw->magic = SFCI_MAGIC; raw->magic = SFCI_MAGIC;
raw->cmd_id = 4; raw->cmd_id = 4;
memcpy(&raw->name, name, sizeof(LocationName)); memcpy(&raw->name, name, sizeof(TimeLocationName));
Result rc = serviceIpcDispatch(&g_timeTimeZoneService); Result rc = serviceIpcDispatch(&g_timeTimeZoneService);
@ -445,8 +440,7 @@ Result timeToCalendarTimeWithMyRule(u64 timestamp, TimeCalendarTime *caltime, Ti
return rc; return rc;
} }
Result timeToPosixTime(const TimeZoneRule *rule, TimeCalendarTime caltime, u64 *timestamp_list, size_t timestamp_list_size, u32 *timestamp_count) Result timeToPosixTime(const TimeZoneRule *rule, const TimeCalendarTime *caltime, u64 *timestamp_list, size_t timestamp_list_size, u32 *timestamp_count) {
{
IpcCommand c; IpcCommand c;
ipcInitialize(&c); ipcInitialize(&c);
ipcAddSendBuffer(&c, rule, sizeof(TimeZoneRule), BufferType_Normal); ipcAddSendBuffer(&c, rule, sizeof(TimeZoneRule), BufferType_Normal);
@ -462,7 +456,7 @@ Result timeToPosixTime(const TimeZoneRule *rule, TimeCalendarTime caltime, u64 *
raw->magic = SFCI_MAGIC; raw->magic = SFCI_MAGIC;
raw->cmd_id = 201; raw->cmd_id = 201;
raw->caltime = caltime; raw->caltime = *caltime;
Result rc = serviceIpcDispatch(&g_timeTimeZoneService); Result rc = serviceIpcDispatch(&g_timeTimeZoneService);
@ -484,8 +478,7 @@ Result timeToPosixTime(const TimeZoneRule *rule, TimeCalendarTime caltime, u64 *
return rc; return rc;
} }
Result timeToPosixTimeWithMyRule(TimeCalendarTime caltime, u64 *timestamp_list, size_t timestamp_list_size, u32 *timestamp_count) Result timeToPosixTimeWithMyRule(const TimeCalendarTime *caltime, u64 *timestamp_list, size_t timestamp_list_size, u32 *timestamp_count) {
{
IpcCommand c; IpcCommand c;
ipcInitialize(&c); ipcInitialize(&c);
ipcAddRecvStatic(&c, timestamp_list, timestamp_list_size, 0); ipcAddRecvStatic(&c, timestamp_list, timestamp_list_size, 0);
@ -500,7 +493,7 @@ Result timeToPosixTimeWithMyRule(TimeCalendarTime caltime, u64 *timestamp_list,
raw->magic = SFCI_MAGIC; raw->magic = SFCI_MAGIC;
raw->cmd_id = 202; raw->cmd_id = 202;
raw->caltime = caltime; raw->caltime = *caltime;
Result rc = serviceIpcDispatch(&g_timeTimeZoneService); Result rc = serviceIpcDispatch(&g_timeTimeZoneService);