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

Merge pull request #131 from Lectem/fix_heaps_warning

Browse Source 
fix warning types not matching
This commit is contained in:
fincs 2015-06-28 13:36:09 +02:00
commit ee210d1963
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libctru/source/gpu/gpu.c
View File

@ -54,12 +54,12 @@ void GPUCMD_Run(u32* gxbuf)
} }
extern u32 __linear_heap_size; extern u32 __linear_heap_size;
extern u32* __linear_heap; extern u32 __linear_heap;
void GPUCMD_FlushAndRun(u32* gxbuf) void GPUCMD_FlushAndRun(u32* gxbuf)
{ {
//take advantage of GX_SetCommandList_First to flush gsp heap //take advantage of GX_SetCommandList_First to flush gsp heap
GX_SetCommandList_First(gxbuf, gpuCmdBuf, gpuCmdBufOffset*4, __linear_heap, __linear_heap_size, NULL, 0); GX_SetCommandList_First(gxbuf, gpuCmdBuf, gpuCmdBufOffset*4, (u32 *) __linear_heap, __linear_heap_size, NULL, 0);
GX_SetCommandList_Last(gxbuf, gpuCmdBuf, gpuCmdBufOffset*4, 0x0); GX_SetCommandList_Last(gxbuf, gpuCmdBuf, gpuCmdBufOffset*4, 0x0);
} }

4
libctru/source/system/allocateHeaps.c
View File

@ -13,10 +13,10 @@ void __attribute__((weak)) __system_allocateHeaps() {
// Allocate the application heap // Allocate the application heap
__heapBase = 0x08000000; __heapBase = 0x08000000;
svcControlMemory(&tmp, __heapBase, 0x0, __heap_size, MEMOP_ALLOC, 0x3); svcControlMemory(&tmp, __heapBase, 0x0, __heap_size, MEMOP_ALLOC, MEMPERM_READ | MEMPERM_WRITE);
// Allocate the linear heap // Allocate the linear heap
svcControlMemory(&__linear_heap, 0x0, 0x0, __linear_heap_size, MEMOP_ALLOC_LINEAR, 0x3); svcControlMemory(&__linear_heap, 0x0, 0x0, __linear_heap_size, MEMOP_ALLOC_LINEAR, MEMPERM_READ | MEMPERM_WRITE);
// Set up newlib heap // Set up newlib heap
fake_heap_start = (char*)__heapBase; fake_heap_start = (char*)__heapBase;
fake_heap_end = fake_heap_start + __heap_size; fake_heap_end = fake_heap_start + __heap_size;