LowLevel/Luma3DS-3GX
Archived
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

u32-ify

Browse Source
This commit is contained in:
Aurora 2016-04-02 22:02:08 +02:00
parent 956829864c
commit 993e564fbb
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
loader/source/buttons.h
View File

@ -2,7 +2,7 @@
#include "types.h" #include "types.h"
#define HID_PAD (*(vu16 *)0x10146000 ^ 0xFFF) #define HID_PAD (*(vu32 *)0x10146000 ^ 0xFFF)
#define BUTTON_X (1 << 10) #define BUTTON_X (1 << 10)
#define BUTTON_Y (1 << 11) #define BUTTON_Y (1 << 11)
#define BUTTON_SELECT (1 << 2) #define BUTTON_SELECT (1 << 2)

2
loader/source/main.c
View File

@ -26,7 +26,7 @@ void main(void)
f_mount(&fs, "0:", 1); f_mount(&fs, "0:", 1);
//Get pressed buttons //Get pressed buttons
u16 pressed = HID_PAD; u32 pressed = HID_PAD;
if(((pressed & BUTTON_X) && loadPayload("/aurei/payloads/x.bin")) || if(((pressed & BUTTON_X) && loadPayload("/aurei/payloads/x.bin")) ||
((pressed & BUTTON_Y) && loadPayload("/aurei/payloads/y.bin")) || ((pressed & BUTTON_Y) && loadPayload("/aurei/payloads/y.bin")) ||

2
source/buttons.h
View File

@ -8,7 +8,7 @@
#include "types.h" #include "types.h"
#define HID_PAD (*(vu16 *)0x10146000 ^ 0xFFF) #define HID_PAD (*(vu32 *)0x10146000 ^ 0xFFF)
#define BUTTON_R1 (1 << 8) #define BUTTON_R1 (1 << 8)
#define BUTTON_L1 (1 << 9) #define BUTTON_L1 (1 << 9)
#define BUTTON_A 1 #define BUTTON_A 1

4
source/firm.c
View File

@ -44,13 +44,13 @@ void setupCFW(void)
u32 a9lhBoot = !PDN_SPI_CNT ? 1 : 0; u32 a9lhBoot = !PDN_SPI_CNT ? 1 : 0;
//Retrieve the last booted FIRM //Retrieve the last booted FIRM
u8 previousFirm = CFG_BOOTENV; u32 previousFirm = CFG_BOOTENV;
//Detect the console being used //Detect the console being used
console = (PDN_MPCORE_CFG == 1) ? 0 : 1; console = (PDN_MPCORE_CFG == 1) ? 0 : 1;
//Get pressed buttons //Get pressed buttons
u16 pressed = HID_PAD; u32 pressed = HID_PAD;
//Attempt to read the configuration file //Attempt to read the configuration file
const char configPath[] = "aurei/config.bin"; const char configPath[] = "aurei/config.bin";

4
source/firm.h
View File

@ -8,8 +8,8 @@
#include "types.h" #include "types.h"
#define PDN_MPCORE_CFG (*(vu8 *)0x10140FFC) #define PDN_MPCORE_CFG (*(vu32 *)0x10140FFC)
#define PDN_SPI_CNT (*(vu8 *)0x101401C0) #define PDN_SPI_CNT (*(vu32 *)0x101401C0)
//FIRM Header layout //FIRM Header layout
typedef struct firmSectionHeader { typedef struct firmSectionHeader {

4
source/utils.c
View File

@ -21,10 +21,10 @@ struct option {
u32 enabled; u32 enabled;
}; };
static u16 waitInput(void) static u32 waitInput(void)
{ {
u32 pressedKey = 0; u32 pressedKey = 0;
u16 key; u32 key;
//Wait for no keys to be pressed //Wait for no keys to be pressed
while(HID_PAD); while(HID_PAD);

2
source/utils.h
View File

@ -8,7 +8,7 @@
#include "types.h" #include "types.h"
#define CFG_BOOTENV (*(vu8 *)0x10010000) #define CFG_BOOTENV (*(vu32 *)0x10010000)
void configureCFW(const char *configPath, const char *firm90Path); void configureCFW(const char *configPath, const char *firm90Path);
void deleteFirms(const char *firmPaths[], u32 firms); void deleteFirms(const char *firmPaths[], u32 firms);