encounter/aurora
1
0
Fork 0
mirror of https://github.com/encounter/aurora.git synced 2025-07-05 04:35:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use PAD_CHANMAX for controller port range instead of hard coded value

Browse Source
This commit is contained in:
Phillip Stephens 2025-04-24 21:05:20 -07:00
parent dfa555263c
commit e28dbaa569
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/dolphin/pad/pad.cpp
View File

@ -147,7 +147,7 @@ uint32_t PADRead(PADStatus* status) {
} }
uint32_t rumbleSupport = 0; uint32_t rumbleSupport = 0;
for (uint32_t i = 0; i < 4; ++i) { for (uint32_t i = 0; i < PAD_CHANMAX; ++i) {
memset(&status[i], 0, sizeof(PADStatus)); memset(&status[i], 0, sizeof(PADStatus));
auto controller = aurora::input::get_controller_for_player(i); auto controller = aurora::input::get_controller_for_player(i);
if (controller == nullptr) { if (controller == nullptr) {
@ -259,7 +259,7 @@ void PADControlMotor(int32_t chan, uint32_t command) {
} }
void PADControlAllMotors(const uint32_t* commands) { void PADControlAllMotors(const uint32_t* commands) {
for (uint32_t i = 0; i < 4; ++i) { for (uint32_t i = 0; i < PAD_CHANMAX; ++i) {
PADControlMotor(i, commands[i]); PADControlMotor(i, commands[i]);
} }
} }
@ -394,7 +394,7 @@ void ClampStick(int8_t* px, int8_t* py, int8_t max, int8_t xy, int8_t min) {
} }
void PADClamp(PADStatus* status) { void PADClamp(PADStatus* status) {
for (uint32_t i = 0; i < 4; ++i) { for (uint32_t i = 0; i < PAD_CHANMAX; ++i) {
if (status[i].err != PAD_ERR_NONE) { if (status[i].err != PAD_ERR_NONE) {
continue; continue;
} }
@ -408,7 +408,7 @@ void PADClamp(PADStatus* status) {
} }
void PADClampCircle(PADStatus* status) { void PADClampCircle(PADStatus* status) {
for (uint32_t i = 0; i < 4; ++i) { for (uint32_t i = 0; i < PAD_CHANMAX; ++i) {
if (status[i].err != PAD_ERR_NONE) { if (status[i].err != PAD_ERR_NONE) {
continue; continue;
} }
@ -507,6 +507,7 @@ void PADSerializeMappings() {
file); file);
} else { } else {
if (!wroteGameCubeAlready) { if (!wroteGameCubeAlready) {
/* This needs to remain at 4 since the adapter only has 4 ports */
for (uint32_t i = 0; i < 4; ++i) { for (uint32_t i = 0; i < 4; ++i) {
/* Just use the current controller's configs for this */ /* Just use the current controller's configs for this */
__PADWriteDeadZones(file, controller.second); __PADWriteDeadZones(file, controller.second);