diff options
| author | XaviDCR92 <xavi.dcr@gmail.com> | 2017-07-27 07:41:25 +0200 |
|---|---|---|
| committer | XaviDCR92 <xavi.dcr@gmail.com> | 2017-07-27 07:41:25 +0200 |
| commit | 153f078ec20cc442dd4dbe802dbd5fcb1748fcca (patch) | |
| tree | db82fe5fe9f6165b2239f3523d5f02ec8d9fa02b /Source/LoadMenu.c | |
| parent | cb1c0345c766fada621b521ca39aac02ae25056b (diff) | |
| download | airport-153f078ec20cc442dd4dbe802dbd5fcb1748fcca.tar.gz | |
* Added comments on System.
* Files needed for Game are now only loaded once, except from LEVEL1.PLT.
* Added DevMenu to get debug info.
* ISR_LoadMenuVBlank() does not stop when accessing SIO.
* On fopen() and SERIAL_INTERFACE defined, "#" is prepended and "@" is appended to filename string.
Diffstat (limited to 'Source/LoadMenu.c')
| -rw-r--r-- | Source/LoadMenu.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/Source/LoadMenu.c b/Source/LoadMenu.c index 878a416..4cd5ae7 100644 --- a/Source/LoadMenu.c +++ b/Source/LoadMenu.c @@ -73,7 +73,7 @@ static void LoadMenuInit(void); static void ISR_LoadMenuVBlank(void); static bool LoadMenuISRHasEnded(void); static bool LoadMenuISRHasStarted(void); -static void LoadMenuLoadFileList( char* fileList[], void * dest[], +static void LoadMenuLoadFileList( char* fileList[], void* dest[], uint8_t szFileList, uint8_t szDestList); /* ************************************* @@ -90,7 +90,7 @@ static char* LoadMenuFiles[] = { "cdrom:\\DATA\\SPRITES\\PLANE.TIM;1", "cdrom:\\DATA\\SPRITES\\LOADING.TIM;1", "cdrom:\\DATA\\FONTS\\FONT_2.FNT;1" }; -static void * LoadMenuDest[] = {(GsSprite*)&LoadMenuPlaneSpr, +static void* LoadMenuDest[] = {(GsSprite*)&LoadMenuPlaneSpr, (GsSprite*)&LoadMenuTitleSpr, (TYPE_FONT*)&SmallFont }; @@ -233,6 +233,8 @@ void LoadMenuInit(void) SmallFont.spr.b = 0; GfxSetGlobalLuminance(0); + + Serial_printf("I_MASK = 0x%08X\n", (*(unsigned int*)0x1F801074)); SetVBlankHandler(&ISR_LoadMenuVBlank); } @@ -253,10 +255,9 @@ void ISR_LoadMenuVBlank(void) { uint8_t i; - Serial_printf("SystemIsBusy() = %d\n", SystemIsBusy() ); - Serial_printf("GfxIsGPUBusy() = %d\n", GfxIsGPUBusy() ); + SystemIncreaseGlobalTimer(); - if( (SystemIsBusy() == true) || (GfxIsGPUBusy() == true) ) + if( (SystemIsBusy() == true) || (GfxIsGPUBusy() == true) || (SerialIsBusy() == true) ) { return; } @@ -418,7 +419,7 @@ bool LoadMenuISRHasStarted(void) } void LoadMenu( char* fileList[], - void * dest[], + void* dest[], uint8_t szFileList , uint8_t szDestList) { @@ -433,7 +434,7 @@ void LoadMenu( char* fileList[], } -void LoadMenuLoadFileList( char* fileList[], void * dest[], +void LoadMenuLoadFileList( char* fileList[], void* dest[], uint8_t szFileList, uint8_t szDestList) { char aux_file_name[100]; |