mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-06-21 12:32:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for 1.0.0

Browse Source
This commit is contained in:
plutoo 2017-11-25 09:10:59 +01:00
parent 96010d3c75
commit de52de8e88
3 changed files with 37 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nx/source/kernel/virtmem.c
View File

@ -35,15 +35,15 @@ static Result _GetRegionFromInfo(VirtualRegion* r, u64 id0_addr, u32 id0_sz) {
}
static inline bool _InRegion(VirtualRegion* r, u64 addr) {
return (addr >= r->start) && (addr < (r->end-1));
return (addr >= r->start) && (addr < r->end);
}
void virtmemSetup() {
if (R_FAILED(_GetRegionFromInfo(&g_AddressSpace, 12, 13))) {
// Default values in case we're running on 1.0.0
// Assumes 36-bit address space
g_AddressSpace.start = 0x8000000ull;
g_AddressSpace.end = 0x1000000000ull;
// Assumes 32-bit address space
g_AddressSpace.start = 0ull;
g_AddressSpace.end = 0x100000000ull;
}
if (R_FAILED(_GetRegionFromInfo(&g_Region[REGION_MAP], 2, 3))) {

53
nx/source/services/vi.c
View File

@ -1,19 +1,20 @@
#include <string.h>
#include <switch.h>
static Handle g_viServiceSession = 0;
static Handle g_viServiceSession = INVALID_HANDLE;
static u32 g_viServiceType = -1;
static Handle g_viIApplicationDisplayService = 0;
static Handle g_viIHOSBinderDriverRelay = 0;
static Handle g_viISystemDisplayService = 0;
static Handle g_viIManagerDisplayService = 0;
static Handle g_viIHOSBinderDriverIndirect = 0;
static Handle g_viIApplicationDisplayService = INVALID_HANDLE;
static Handle g_viIHOSBinderDriverRelay = INVALID_HANDLE;
static Handle g_viISystemDisplayService = INVALID_HANDLE;
static Handle g_viIManagerDisplayService = INVALID_HANDLE;
static Handle g_viIHOSBinderDriverIndirect = INVALID_HANDLE;
static Result _viGetSession(Handle sessionhandle, Handle* handle_out, void* inraw, size_t rawsize);
static Result _viGetSessionNoParams(Handle sessionhandle, Handle* handle_out, u64 cmd_id);
Result viInitialize(viServiceType servicetype) {
if(g_viServiceType!=-1)return MAKERESULT(MODULE_LIBNX, LIBNX_ALREADYINITIALIZED);
if(g_viServiceType!=-1)
return MAKERESULT(MODULE_LIBNX, LIBNX_ALREADYINITIALIZED);
Result rc = 0;
@ -47,48 +48,54 @@ Result viInitialize(viServiceType servicetype) {
rc = _viGetSession(g_viServiceSession, &g_viIApplicationDisplayService, &raw, sizeof(raw));
}
if (R_SUCCEEDED(rc))rc = _viGetSessionNoParams(g_viIApplicationDisplayService, &g_viIHOSBinderDriverRelay, 100);
if (g_viServiceType>=VISERVTYPE_System && R_SUCCEEDED(rc))rc = _viGetSessionNoParams(g_viIApplicationDisplayService, &g_viISystemDisplayService, 101);
if (g_viServiceType>=VISERVTYPE_Manager && R_SUCCEEDED(rc))rc = _viGetSessionNoParams(g_viIApplicationDisplayService, &g_viIManagerDisplayService, 102);
if (g_viServiceType>=VISERVTYPE_System && R_SUCCEEDED(rc))rc = _viGetSessionNoParams(g_viIApplicationDisplayService, &g_viIHOSBinderDriverIndirect, 103);
if (R_SUCCEEDED(rc))
rc = _viGetSessionNoParams(g_viIApplicationDisplayService, &g_viIHOSBinderDriverRelay, 100);
if (R_FAILED(rc))g_viServiceType = -1;
if (g_viServiceType>=VISERVTYPE_System && R_SUCCEEDED(rc))
rc = _viGetSessionNoParams(g_viIApplicationDisplayService, &g_viISystemDisplayService, 101);
if (g_viServiceType>=VISERVTYPE_Manager && R_SUCCEEDED(rc))
rc = _viGetSessionNoParams(g_viIApplicationDisplayService, &g_viIManagerDisplayService, 102);
if (g_viServiceType>=VISERVTYPE_System && R_SUCCEEDED(rc) && kernelAbove200())
rc = _viGetSessionNoParams(g_viIApplicationDisplayService, &g_viIHOSBinderDriverIndirect, 103);
if (R_FAILED(rc)) {
viExit();
g_viServiceType = -1;
}
return rc;
}
void viExit(void)
{
if(g_viServiceType==-1)return;
if(g_viServiceType == -1)
return;
g_viServiceType = -1;
if(g_viServiceSession)
{
if(g_viServiceSession != INVALID_HANDLE) {
svcCloseHandle(g_viServiceSession);
g_viServiceSession = 0;
}
if(g_viIApplicationDisplayService)
{
if(g_viIApplicationDisplayService != INVALID_HANDLE) {
svcCloseHandle(g_viIApplicationDisplayService);
g_viIApplicationDisplayService = 0;
}
if(g_viISystemDisplayService)
{
if(g_viISystemDisplayService != INVALID_HANDLE) {
svcCloseHandle(g_viISystemDisplayService);
g_viISystemDisplayService = 0;
}
if(g_viIManagerDisplayService)
{
if(g_viIManagerDisplayService != INVALID_HANDLE) {
svcCloseHandle(g_viIManagerDisplayService);
g_viIManagerDisplayService = 0;
}
if(g_viIHOSBinderDriverIndirect)
{
if(g_viIHOSBinderDriverIndirect != INVALID_HANDLE) {
svcCloseHandle(g_viIHOSBinderDriverIndirect);
g_viIHOSBinderDriverIndirect = 0;
}

6
nx/source/system/init.c
View File

@ -5,10 +5,10 @@ void __nx_exit(int rc);
void virtmemSetup();
void newlibSetup(Handle main_thread);
#define INNER_HEAP_SIZE 0x20000
#define INNER_HEAP_SIZE 0x200000
__attribute__((weak)) size_t __nx_inner_heap_size = INNER_HEAP_SIZE;
__attribute__((weak)) char __nx_inner_heap[INNER_HEAP_SIZE];
__attribute__((weak)) size_t __nx_outer_heap_size = 0x2000000*4;//Must be a multiple of 0x2000000.
__attribute__((weak)) char __nx_inner_heap[INNER_HEAP_SIZE];
__attribute__((weak)) size_t __nx_outer_heap_size = 0x2000000*16;//Must be a multiple of 0x2000000.
static void _SetupHeap() {
u64 addr;