- change/fix key override handling

- fix/improve input code
- better memory management
- improved drawing

Author: Cpasjuste

source/arm9/source/hid.c

@@ -1,48 +1,18 @@
 #include "hid.h"
 
 void hidScanInput() {}
-
+u32 key_old = 0x00000000;
 
 u32 hidKeysDown() {
 
-    u32 key = 0;
-    vu32 t = 0;
-
-    while (HID_STATE != 0x00000FFF);
-    while (true) {
-
-        key = HID_STATE;
-        if(key != 0x00000FFF)
-            break;
-    }
-
-    for (t = 0; t < 0x150000; t++) {}
-
-    return ~key;
-}
-
-u32 hidKeysDownTimeout(int seconds) {
-
-    u32 key = 0;
-    vu32 t = 0;
-    u64 timeout = 0; // fake timer
-
-    while (HID_STATE != 0x00000FFF);
-    while (true) {
-
-        key = HID_STATE;
-        if(key != 0x00000FFF)
-            break;
+    u32 key = HID_STATE;
 
-        if(seconds > 0) {
-            timeout++;
-            if ((int)(timeout/200000) > seconds)
-                break;
-        }
+    if(key_old != key) {
+        key_old = key;
+        return ~key;
     }
-    for (t = 0; t < 0x150000; t++) {}
 
-    return ~key;
+    return 0x00000000;
 }
 
 u32 hidKeysHeld() {

source/arm9/source/hid.h

@@ -4,6 +4,8 @@
 
 #define HID_STATE (*(volatile u32*)0x10146000)
 
+#define BIT(n) (1U<<(n))
+
 #define KEY_A      (1 << 0)
 #define KEY_B      (1 << 1)
 #define KEY_SELECT (1 << 2)
@@ -22,11 +24,7 @@
 #define KEY_L     KEY_L1
 #define KEY_X      (1 << 10)
 #define KEY_Y      (1 << 11)
-#define KEY_ANY    0x00000FFF
-
-#define BIT(n) (1U<<(n))
 
 u32 hidKeysDown();
 u32 hidKeysHeld();
-u32 hidKeysDownTimeout(int seconds);
 void hidScanInput();

source/arm9/stage2/data/stage2.bin

@@ -4,7 +4,7 @@ ENTRY(_start)
 
 MEMORY
   {
-  ram : ORIGIN = 0x23000000, LENGTH = 16K
+  ram : ORIGIN = 0x08006000, LENGTH = 0x10000K
   }
 
 SECTIONS

source/arm9/stage2/payload/payload_stage2.ld

@@ -1,29 +1,13 @@
-#include "common.h"
+#include <string.h>
 
 #define PTR_PAYLOAD_MAIN        0x23F00000
-#define PTR_PAYLOAD_MAIN_DATA   0x20000000
-#define PTR_PAYLOAD_SIZE_MAX    0x00100000
-#define PTR_PAYLOAD_STAGE2      0x23000000
+#define PTR_PAYLOAD_MAIN_DATA   0x26000000
+#define PTR_PAYLOAD_SIZE_MAX    0x000FFD00
+#define PTR_PAYLOAD_STAGE2      0x08006000
 
 int main() 
 {
 	memcpy((void*)PTR_PAYLOAD_MAIN, (void*)PTR_PAYLOAD_MAIN_DATA, PTR_PAYLOAD_SIZE_MAX);
-
-	//gateway
-	*(volatile uint32_t*)0x80FFFC0 = 0x18300000;    // framebuffer 1 top left
-	*(volatile uint32_t*)0x80FFFC4 = 0x18300000;    // framebuffer 2 top left
-	*(volatile uint32_t*)0x80FFFC8 = 0x18300000;    // framebuffer 1 top right
-	*(volatile uint32_t*)0x80FFFCC = 0x18300000;    // framebuffer 2 top right
-	*(volatile uint32_t*)0x80FFFD0 = 0x18346500;    // framebuffer 1 bottom
-	*(volatile uint32_t*)0x80FFFD4 = 0x18346500;    // framebuffer 2 bottom
-	*(volatile uint32_t*)0x80FFFD8 = 1;    // framebuffer select top
-	*(volatile uint32_t*)0x80FFFDC = 1;    // framebuffer select bottom
-
-	//cakehax
-	*(u32*)0x23FFFE00 = 0x18300000;
-	*(u32*)0x23FFFE04 = 0x18300000;
-	*(u32*)0x23FFFE08 = 0x18346500;
-
 	((void (*)())PTR_PAYLOAD_MAIN)();
 
 	return 0;

source/arm9/stage2/payload/source/common.h

@@ -15,7 +15,7 @@
 #include "config.h"
 #include "gfx.h"
 
-boot_config_s sconf;
+//boot_config_s sconf;
 #else
 #include <3ds.h>
 #endif
@@ -138,7 +138,7 @@ int configInit() {
 
     // init config
 #ifdef ARM9
-    config = &sconf;
+    config = (boot_config_s *)PTR_CFG;
 #else
     config = malloc(sizeof(boot_config_s));
 #endif
@@ -222,7 +222,7 @@ void loadBg(gfxScreen_t screen) {
     }
 
 #ifdef ARM9
-    u8 *bg = screen == GFX_TOP ? PTR_TOP_BG_BUF : PTR_BOT_BG_BUF;
+    u8 *bg = screen == GFX_TOP ? PTR_TOP_BG : PTR_BOT_BG;
 #else
     u8 *bg = malloc(size);
 #endif

source/arm9/stage2/payload/source/main.c

@@ -179,6 +179,15 @@ void gfxClearBot(u8 bot[8]) {
     gfxFillColor(GFX_BOTTOM, GFX_LEFT, bot);
 }
 
+void gfxClear() {
+    memset(PTR_TOP_SCREEN, 0, TOP_SCREEN_SIZE);
+    memset(PTR_BOT_SCREEN, 0, BOT_SCREEN_SIZE);
+    memset(PTR_TOP_SCREEN_BUF, 0, TOP_SCREEN_SIZE);
+    memset(PTR_BOT_SCREEN_BUF, 0, BOT_SCREEN_SIZE);
+    memset(PTR_TOP_BG, 0, TOP_SCREEN_SIZE);
+    memset(PTR_BOT_BG, 0, BOT_SCREEN_SIZE);
+}
+
 void gfxSwap() {
 #ifdef ARM9
     memcpy(PTR_TOP_SCREEN, PTR_TOP_SCREEN_BUF, TOP_SCREEN_SIZE);

source/config_new.c

@@ -35,4 +35,6 @@ void gfxClearTop(u8 top1[3], u8 top2[3]);
 
 void gfxClearBot(u8 bot[8]);
 
+void gfxClear();
+
 void gfxSwap();

source/gfx.c

@@ -5,7 +5,7 @@
 #else
 
 #include "gfx.h"
-#include "arm9/source/common.h"
+#include "arm9/source/fatfs/ff.h"
 #include "stage2_bin.h"
 
 #endif
@@ -22,10 +22,12 @@ int load_bin(char *path, long offset) {
         return -1;
     }
 
-    if (fileReadOffset(path, (void *) PTR_PAYLOAD_MAIN_DATA, size, offset) != 0) {
+    if (fileReadOffset(path, (void *) PTR_PAYLOAD_MAIN_DATA, PTR_PAYLOAD_SIZE_MAX, offset) != 0) {
         return -1;
     }
 
+    gfxClear();
+
     memcpy((void *) PTR_PAYLOAD_STAGE2, stage2_bin, stage2_bin_size);
     ((void (*)()) PTR_PAYLOAD_STAGE2)();