Mirror/GodMode9
1
0
Fork 1
mirror of https://github.com/d0k3/GodMode9.git synced 2025-06-27 06:02:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Autodetect cart inserts / ejects

Browse Source
This commit is contained in:
d0k3 2017-01-16 01:56:04 +01:00
parent b00fb89164
commit eae783d6c3
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/common/hid.c
View File

@ -5,11 +5,15 @@
u32 InputWait() { u32 InputWait() {
static u64 delay = 0; static u64 delay = 0;
u32 pad_state_old = HID_STATE; u32 pad_state_old = HID_STATE;
u32 cart_state_old = CART_STATE;
delay = (delay) ? 72 : 128; delay = (delay) ? 72 : 128;
timer_start(); timer_start();
while (true) { while (true) {
u32 pad_state = HID_STATE; u32 pad_state = HID_STATE;
if (!(pad_state & BUTTON_ANY)) { // no buttons pressed if (!(pad_state & BUTTON_ANY)) { // no buttons pressed
u32 cart_state = CART_STATE;
if (cart_state != cart_state_old)
return cart_state ? CART_INSERT : CART_EJECT;
u32 special_key = i2cReadRegister(I2C_DEV_MCU, 0x10); u32 special_key = i2cReadRegister(I2C_DEV_MCU, 0x10);
if (special_key == 0x01) if (special_key == 0x01)
return pad_state | BUTTON_POWER; return pad_state | BUTTON_POWER;

5
source/common/hid.h
View File

@ -3,6 +3,7 @@
#include "common.h" #include "common.h"
#define HID_STATE (~(*(volatile u32*)0x10146000) & BUTTON_ANY) #define HID_STATE (~(*(volatile u32*)0x10146000) & BUTTON_ANY)
#define CART_STATE (~(*(volatile u8*)0x10000010) & 0x1)
#define BUTTON_A (1 << 0) #define BUTTON_A (1 << 0)
@ -20,9 +21,11 @@
#define BUTTON_ANY 0x00000FFF #define BUTTON_ANY 0x00000FFF
#define BUTTON_ARROW (BUTTON_RIGHT|BUTTON_LEFT|BUTTON_UP|BUTTON_DOWN) #define BUTTON_ARROW (BUTTON_RIGHT|BUTTON_LEFT|BUTTON_UP|BUTTON_DOWN)
// special buttons // special buttons / cart handling
#define BUTTON_POWER (1 << 12) #define BUTTON_POWER (1 << 12)
#define BUTTON_HOME (1 << 13) #define BUTTON_HOME (1 << 13)
#define CART_INSERT (1 << 14)
#define CART_EJECT (1 << 15)
u32 InputWait(); u32 InputWait();
bool CheckButton(u32 button); bool CheckButton(u32 button);

4
source/godmode.c
View File

@ -1146,9 +1146,9 @@ u32 GodMode() {
InitEmuNandBase(); InitEmuNandBase();
InitExtFS(); InitExtFS();
GetDirContents(current_dir, current_path); GetDirContents(current_dir, current_path);
if (cursor >= current_dir->n_entries)
cursor = current_dir->n_entries - 1;
} }
} else if ((pad_state & (CART_INSERT|CART_EJECT)) && (curr_drvtype & DRV_CART)) {
GetDirContents(current_dir, current_path); // refresh cart dir contents
} }
} }