diff options
author | Nebuleon Fumika | 2013-02-04 23:45:44 -0500 |
---|---|---|
committer | Nebuleon Fumika | 2013-02-04 23:45:44 -0500 |
commit | d1a7bf5eb558e7db4a1a27e15ebedb02e6b7f804 (patch) | |
tree | d951252d393b9d7defb508483aba29e0daad764c /sdk-modifications/include/ds2_malloc.h | |
parent | b1c298ab5066c2e37a69c7c30bd499dd11ed6eb3 (diff) | |
download | snes9x2005-d1a7bf5eb558e7db4a1a27e15ebedb02e6b7f804.tar.gz snes9x2005-d1a7bf5eb558e7db4a1a27e15ebedb02e6b7f804.tar.bz2 snes9x2005-d1a7bf5eb558e7db4a1a27e15ebedb02e6b7f804.zip |
Fully integrate BassAceGold's libraries, finally. The README still states that 1.2 is required to overwrite 0.13's stuff; really, 0.13 is needed only for `gcc`. So the sequence goes 0.13's `gcc` -> 1.2 -> BassAceGold's libraries -> make `libds2a.a`.
DMA function names changed to match BassAceGold's.
Diffstat (limited to 'sdk-modifications/include/ds2_malloc.h')
-rw-r--r-- | sdk-modifications/include/ds2_malloc.h | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/sdk-modifications/include/ds2_malloc.h b/sdk-modifications/include/ds2_malloc.h deleted file mode 100644 index 5f158f7..0000000 --- a/sdk-modifications/include/ds2_malloc.h +++ /dev/null @@ -1,32 +0,0 @@ -#ifndef __DS2_MALLOC_H__ -#define __DS2_MALLOC_H__ - -#ifdef __cplusplus -extern "C" { -#endif - -extern void heapInit(unsigned int start, unsigned int end); - -extern void* Drv_alloc(unsigned int nbytes); -extern void Drv_deAlloc(void* address); -extern void* Drv_realloc(void* address, unsigned int nbytes); -extern void* Drv_calloc(unsigned int nmem, unsigned int size); - -#ifdef __cplusplus -} -#endif - -#define malloc Drv_alloc -#define calloc Drv_calloc -#define realloc Drv_realloc -#define free Drv_deAlloc - -#ifdef __cplusplus -#include <stdio.h> -inline void* operator new ( size_t s ) { return malloc( s ); } -inline void* operator new[] ( size_t s ) { return malloc( s ); } -inline void operator delete ( void* p ) { free( p ); } -inline void operator delete[] ( void* p ) { free( p ); } -#endif - -#endif //__DS2_MALLOC_H__ |