From c413b6d07f7e1cb1ab98764f799a870a39fa47e4 Mon Sep 17 00:00:00 2001
From: Aurora <davidone92@katamail.com>
Date: Thu, 24 Mar 2016 16:02:00 +0100
Subject: [PATCH] Simplified button stuff

---
 loader/source/buttons.h | 20 ++++++++++----------
 loader/source/main.c    |  2 +-
 source/buttons.h        | 10 ++--------
 source/draw.c           |  2 +-
 4 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/loader/source/buttons.h b/loader/source/buttons.h
index 1d42c9a..5ca0857 100644
--- a/loader/source/buttons.h
+++ b/loader/source/buttons.h
@@ -2,13 +2,13 @@
 
 #include "types.h"
 
-#define HID_PAD            ((~*(vu16 *)0x10146000) & 0xFFF)
-#define BUTTON_B           (1 << 1)
-#define BUTTON_X           (1 << 10)
-#define BUTTON_Y           (1 << 11)
-#define BUTTON_SELECT      (1 << 2)
-#define BUTTON_START       (1 << 3)
-#define BUTTON_RIGHT       (1 << 4)
-#define BUTTON_LEFT        (1 << 5)
-#define BUTTON_UP          (1 << 6)
-#define BUTTON_DOWN        (1 << 7)
\ No newline at end of file
+#define HID_PAD       (*(vu16 *)0x10146000 ^ 0xFFF)
+#define BUTTON_B      (1 << 1)
+#define BUTTON_X      (1 << 10)
+#define BUTTON_Y      (1 << 11)
+#define BUTTON_SELECT (1 << 2)
+#define BUTTON_START  (1 << 3)
+#define BUTTON_RIGHT  (1 << 4)
+#define BUTTON_LEFT   (1 << 5)
+#define BUTTON_UP     (1 << 6)
+#define BUTTON_DOWN   (1 << 7)
\ No newline at end of file
diff --git a/loader/source/main.c b/loader/source/main.c
index b7361bb..5c107b8 100644
--- a/loader/source/main.c
+++ b/loader/source/main.c
@@ -9,7 +9,7 @@ static u32 loadPayload(const char *path){
     unsigned int br;
     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);
 
         return 1;
diff --git a/source/buttons.h b/source/buttons.h
index 20e9366..ce5ceb0 100644
--- a/source/buttons.h
+++ b/source/buttons.h
@@ -8,20 +8,14 @@
 
 #include "types.h"
 
-#define HID_PAD         ((~*(vu16 *)0x10146000) & 0xFFF)
+#define HID_PAD         (*(vu16 *)0x10146000 ^ 0xFFF)
 #define BUTTON_R1       (1 << 8)
 #define BUTTON_L1       (1 << 9)
 #define BUTTON_A        1
 #define BUTTON_B        (1 << 1)
-#define BUTTON_X        (1 << 10)
-#define BUTTON_Y        (1 << 11)
 #define BUTTON_UP       (1 << 6)
 #define BUTTON_DOWN     (1 << 7)
-#define BUTTON_RIGHT    (1 << 4)
-#define BUTTON_LEFT     (1 << 5)
 #define BUTTON_START    (1 << 3)
 #define BUTTON_SELECT   (1 << 2)
 #define SAFE_MODE       (BUTTON_R1 | BUTTON_L1 | BUTTON_A | BUTTON_UP)
-#define PAYLOAD_BUTTONS (BUTTON_R1 | BUTTON_UP | BUTTON_DOWN | BUTTON_RIGHT |\
-                         BUTTON_LEFT | BUTTON_START | BUTTON_SELECT | BUTTON_B |\
-                         BUTTON_X | BUTTON_Y)
+#define PAYLOAD_BUTTONS ((BUTTON_L1 | BUTTON_A) ^ 0xFFF)
\ No newline at end of file
diff --git a/source/draw.c b/source/draw.c
index ec8b8ce..741957d 100644
--- a/source/draw.c
+++ b/source/draw.c
@@ -43,7 +43,7 @@ void loadSplash(void){
 }
 
 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++){
         unsigned char char_pos = font[character * 8 + y];