anod/Luma3DS-autorun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplified button stuff

Browse Source
This commit is contained in:
Aurora 2016-03-24 16:02:00 +01:00
parent 85a59264c9
commit c413b6d07f
4 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
loader/source/buttons.h
View File

@ -2,13 +2,13 @@
#include "types.h" #include "types.h"
#define HID_PAD ((~*(vu16 *)0x10146000) & 0xFFF) #define HID_PAD (*(vu16 *)0x10146000 ^ 0xFFF)
#define BUTTON_B (1 << 1) #define BUTTON_B (1 << 1)
#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)
#define BUTTON_START (1 << 3) #define BUTTON_START (1 << 3)
#define BUTTON_RIGHT (1 << 4) #define BUTTON_RIGHT (1 << 4)
#define BUTTON_LEFT (1 << 5) #define BUTTON_LEFT (1 << 5)
#define BUTTON_UP (1 << 6) #define BUTTON_UP (1 << 6)
#define BUTTON_DOWN (1 << 7) #define BUTTON_DOWN (1 << 7)

2
loader/source/main.c
View File

@ -9,7 +9,7 @@ static u32 loadPayload(const char *path){
unsigned int br; unsigned int br;
if(f_open(&payload, path, FA_READ) == FR_OK) if(f_open(&payload, path, FA_READ) == FR_OK)
{ {
f_read(&payload, (void*)PAYLOAD_ADDRESS, f_size(&payload), &br); f_read(&payload, (void *)PAYLOAD_ADDRESS, f_size(&payload), &br);
f_close(&payload); f_close(&payload);
return 1; return 1;

10
source/buttons.h
View File

@ -8,20 +8,14 @@
#include "types.h" #include "types.h"
#define HID_PAD ((~*(vu16 *)0x10146000) & 0xFFF) #define HID_PAD (*(vu16 *)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
#define BUTTON_B (1 << 1) #define BUTTON_B (1 << 1)
#define BUTTON_X (1 << 10)
#define BUTTON_Y (1 << 11)
#define BUTTON_UP (1 << 6) #define BUTTON_UP (1 << 6)
#define BUTTON_DOWN (1 << 7) #define BUTTON_DOWN (1 << 7)
#define BUTTON_RIGHT (1 << 4)
#define BUTTON_LEFT (1 << 5)
#define BUTTON_START (1 << 3) #define BUTTON_START (1 << 3)
#define BUTTON_SELECT (1 << 2) #define BUTTON_SELECT (1 << 2)
#define SAFE_MODE (BUTTON_R1 | BUTTON_L1 | BUTTON_A | BUTTON_UP) #define SAFE_MODE (BUTTON_R1 | BUTTON_L1 | BUTTON_A | BUTTON_UP)
#define PAYLOAD_BUTTONS (BUTTON_R1 | BUTTON_UP | BUTTON_DOWN | BUTTON_RIGHT |\ #define PAYLOAD_BUTTONS ((BUTTON_L1 | BUTTON_A) ^ 0xFFF)
BUTTON_LEFT | BUTTON_START | BUTTON_SELECT | BUTTON_B |\
BUTTON_X | BUTTON_Y)

2
source/draw.c
View File

@ -43,7 +43,7 @@ void loadSplash(void){
} }
void drawCharacter(char character, int pos_x, int pos_y, u32 color){ void drawCharacter(char character, int pos_x, int pos_y, u32 color){
u8 *select = fb->top_left; u8 *const select = fb->top_left;
for(int y = 0; y < 8; y++){ for(int y = 0; y < 8; y++){
unsigned char char_pos = font[character * 8 + y]; unsigned char char_pos = font[character * 8 + y];