DevKit7/libctru
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

os: Changed Get*Version format.

Browse Source
This commit is contained in:
plutoo 2014-08-21 22:35:20 +02:00
parent ef1323a3a1
commit a0f8a6d153
2 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libctru/include/3ds/os.h
View File

@ -1,13 +1,13 @@
#ifndef OS_H #ifndef OS_H
#define OS_H #define OS_H
typedef struct {
u8 major, minor, revision; #define SYSTEM_VERSION(major, minor, revision) \
} sysVersion; (((major)<<24)|((minor)<<16)|((revision)<<8))
u32 osConvertVirtToPhys(u32 vaddr); u32 osConvertVirtToPhys(u32 vaddr);
const char* osStrError(u32 error); const char* osStrError(u32 error);
sysVersion osGetFirmVersion(); u32 osGetFirmVersion();
sysVersion osGetKernelVersion(); u32 osGetKernelVersion();
#endif #endif

16
libctru/source/os.c
View File

@ -15,20 +15,12 @@ u32 osConvertVirtToPhys(u32 vaddr)
return 0; return 0;
} }
sysVersion osGetFirmVersion() { u32 osGetFirmVersion() {
return (sysVersion) { return (*(u32*)0x1FF80000) & ~0xFF;
.major=*(u8*)0x1FF80003,
.minor=*(u8*)0x1FF80002,
.revision=*(u8*)0x1FF80001
};
} }
sysVersion osGetKernelVersion() { u32 osGetKernelVersion() {
return (sysVersion) { return (*(u32*)0x1FF80060) & ~0xFF;
.major=*(u8*)0x1FF80063,
.minor=*(u8*)0x1FF80062,
.revision=*(u8*)0x1FF80061
};
} }
const char* osStrError(u32 error) { const char* osStrError(u32 error) {