Ver1.1

Author: ThatFinnDev

.gitignore

@@ -1,14 +1,14 @@
-*.DS_Store
-*.o
-repos.json
-settings.json
-build/*
-sdroot
-build_*
-*.dol
-*.3dsx
-*.rpx
-*.nro
-*.elf
-*.nacp
+*.DS_Store
+*.o
+repos.json
+settings.json
+build/*
+sdroot
+build_*
+*.dol
+*.3dsx
+*.rpx
+*.nro
+*.elf
+*.nacp
 .vscode

Makefile

@@ -40,7 +40,7 @@ include $(DEVKITPRO)/libnx/switch_rules
 
 APP_TITLE   := 	AA-Reboot
 APP_AUTHOR  := 	ThatFinn
-APP_VERSION := 	1.0
+APP_VERSION := 	1.1
 ICON 		:=	source/Icon.jpg
 TARGET		:=	$(notdir $(CURDIR))
 BUILD		:=	build

README.md

@@ -1,4 +1,9 @@
-# AA-Reboot
-A switch homebrew to reboot into hekate
-
-Make sure you have a hekate.bin file at the root of your sd card!
+# AA-Reboot
+A switch homebrew to reboot into hekate
+
+It will boot the /bootloader/update.bin payload to boot into hekate.
+Make sure hekate is installed on your switch, otherwise it will crash or show a black screen!
+
+If you want a different payload, place a payload named "hekate.bin" on the root of your sd card (OPTIONAL)
+
+PLEASE REPOT ANY ISSUES!

application.lst

@@ -1,2 +1,2 @@
--CSn 
-/home/Home/Music/application/application.elf 
+-CSn 
+/home/Home/Music/application/application.elf 

banner.jpg

@@ -1,88 +1,96 @@
-#include <string.h>
-#include <stdio.h>
-#include <stdbool.h>
-
-#include <switch.h>
-
-#define IRAM_PAYLOAD_MAX_SIZE 0x2F000
-#define IRAM_PAYLOAD_BASE 0x40010000
-
-static alignas(0x1000) u8 g_reboot_payload[IRAM_PAYLOAD_MAX_SIZE];
-static alignas(0x1000) u8 g_ff_page[0x1000];
-static alignas(0x1000) u8 g_work_page[0x1000];
-
-void do_iram_dram_copy(void *buf, uintptr_t iram_addr, size_t size, int option) {
-    memcpy(g_work_page, buf, size);
-    
-    SecmonArgs args = {0};
-    args.X[0] = 0xF0000201;             /* smcAmsIramCopy */
-    args.X[1] = (uintptr_t)g_work_page;  /* DRAM Address */
-    args.X[2] = iram_addr;              /* IRAM Address */
-    args.X[3] = size;                   /* Copy size */
-    args.X[4] = option;                 /* 0 = Read, 1 = Write */
-    svcCallSecureMonitor(&args);
-    
-    memcpy(buf, g_work_page, size);
-}
-
-void copy_to_iram(uintptr_t iram_addr, void *buf, size_t size) {
-    do_iram_dram_copy(buf, iram_addr, size, 1);
-}
-
-void copy_from_iram(void *buf, uintptr_t iram_addr, size_t size) {
-    do_iram_dram_copy(buf, iram_addr, size, 0);
-}
-
-static void clear_iram(void) {
-    memset(g_ff_page, 0xFF, sizeof(g_ff_page));
-    for (size_t i = 0; i < IRAM_PAYLOAD_MAX_SIZE; i += sizeof(g_ff_page)) {
-        copy_to_iram(IRAM_PAYLOAD_BASE + i, g_ff_page, sizeof(g_ff_page));
-    }
-}
-
-static void reboot_to_payload(void) {
-    clear_iram();
-    
-    for (size_t i = 0; i < IRAM_PAYLOAD_MAX_SIZE; i += 0x1000) {
-        copy_to_iram(IRAM_PAYLOAD_BASE + i, &g_reboot_payload[i], 0x1000);
-    }
-    
-    splSetConfig((SplConfigItem)65001, 2);
-}
-
-int main(int argc, char **argv)
-{
-    
-    bool can_reboot = true;
-    Result rc = splInitialize();
-    if (R_FAILED(rc)) {
-        consoleInit(NULL);
-        printf("Failed to initialize spl: 0x%x\n", rc);
-        can_reboot = false;
-    } else {
-        FILE *f = fopen("sdmc:/hekate.bin", "rb");
-        if (f == NULL) {
-        
-            consoleInit(NULL);
-            printf("Failed to open hekate.bin!\n");
-            can_reboot = false;
-        } else {
-            fread(g_reboot_payload, 1, sizeof(g_reboot_payload), f);
-            fclose(f);
-        }
-    }
-    // Main loop
-    while(appletMainLoop())
-    {if (can_reboot) {
-            reboot_to_payload();
-        }
-    }
-
-    if (can_reboot) {
-        splExit();
-    }
-    
-    consoleExit(NULL);
-    return 0;
-}
-
+#include <string.h>
+#include <stdio.h>
+#include <stdbool.h>
+
+#include <switch.h>
+
+#define IRAM_PAYLOAD_MAX_SIZE 0x2F000
+#define IRAM_PAYLOAD_BASE 0x40010000
+
+static alignas(0x1000) u8 g_reboot_payload[IRAM_PAYLOAD_MAX_SIZE];
+static alignas(0x1000) u8 g_ff_page[0x1000];
+static alignas(0x1000) u8 g_work_page[0x1000];
+
+void do_iram_dram_copy(void *buf, uintptr_t iram_addr, size_t size, int option) {
+    memcpy(g_work_page, buf, size);
+    
+    SecmonArgs args = {0};
+    args.X[0] = 0xF0000201;             /* smcAmsIramCopy */
+    args.X[1] = (uintptr_t)g_work_page;  /* DRAM Address */
+    args.X[2] = iram_addr;              /* IRAM Address */
+    args.X[3] = size;                   /* Copy size */
+    args.X[4] = option;                 /* 0 = Read, 1 = Write */
+    svcCallSecureMonitor(&args);
+    
+    memcpy(buf, g_work_page, size);
+}
+
+void copy_to_iram(uintptr_t iram_addr, void *buf, size_t size) {
+    do_iram_dram_copy(buf, iram_addr, size, 1);
+}
+
+void copy_from_iram(void *buf, uintptr_t iram_addr, size_t size) {
+    do_iram_dram_copy(buf, iram_addr, size, 0);
+}
+
+static void clear_iram(void) {
+    memset(g_ff_page, 0xFF, sizeof(g_ff_page));
+    for (size_t i = 0; i < IRAM_PAYLOAD_MAX_SIZE; i += sizeof(g_ff_page)) {
+        copy_to_iram(IRAM_PAYLOAD_BASE + i, g_ff_page, sizeof(g_ff_page));
+    }
+}
+
+static void reboot_to_payload(void) {
+    clear_iram();
+    
+    for (size_t i = 0; i < IRAM_PAYLOAD_MAX_SIZE; i += 0x1000) {
+        copy_to_iram(IRAM_PAYLOAD_BASE + i, &g_reboot_payload[i], 0x1000);
+    }
+    
+    splSetConfig((SplConfigItem)65001, 2);
+}
+
+int main(int argc, char **argv)
+{
+    
+    bool can_reboot = true;
+    Result rc = splInitialize();
+    if (R_FAILED(rc)) {
+        consoleInit(NULL);
+        printf("Failed to initialize spl: 0x%x\n", rc);
+        can_reboot = false;
+    } else {
+        FILE *f = fopen("sdmc:/hekate.bin", "rb");
+        if (f == NULL) {
+            consoleInit(NULL);
+            FILE *c = fopen("sdmc:/bootloader/update.bin", "rb");
+            if (c == NULL) {
+            
+                consoleInit(NULL);
+                printf("Failed to open update.bin!\n");
+                can_reboot = false;
+            } else {
+                fread(g_reboot_payload, 1, sizeof(g_reboot_payload), c);
+                fclose(c);
+            }
+            
+        } else {
+            fread(g_reboot_payload, 1, sizeof(g_reboot_payload), f);
+            fclose(f);
+        }
+    }
+    // Main loop
+    while(appletMainLoop())
+    {if (can_reboot) {
+            reboot_to_payload();
+        }
+    }
+
+    if (can_reboot) {
+        splExit();
+    }
+    
+    consoleExit(NULL);
+    return 0;
+}
+