Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-04-08 07:05:40 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

More clang-format

Browse source
This commit is contained in:
wheremyfoodat 2023-06-28 01:53:26 +03:00
parent eff25180d5
commit e86aec0c33
1 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
include/services/hid.hpp
View file

@ -1,6 +1,7 @@
#pragma once #pragma once
#include <array> #include <array>
#include <optional> #include <optional>
#include "helpers.hpp" #include "helpers.hpp"
#include "kernel_types.hpp" #include "kernel_types.hpp"
#include "logger.hpp" #include "logger.hpp"
@ -22,12 +23,12 @@ namespace HID::Keys {
X = 1 << 10, X = 1 << 10,
Y = 1 << 11, Y = 1 << 11,
GPIO0Inv = 1 << 12, // Inverted value of GPIO bit 0 GPIO0Inv = 1 << 12, // Inverted value of GPIO bit 0
GPIO14Inv = 1 << 13, // Inverted value of GPIO bit 14 GPIO14Inv = 1 << 13, // Inverted value of GPIO bit 14
CirclePadRight = 1 << 28, // X >= 41 CirclePadRight = 1 << 28, // X >= 41
CirclePadLeft = 1 << 29, // X <= -41 CirclePadLeft = 1 << 29, // X <= -41
CirclePadUp = 1 << 30, // Y >= 41 CirclePadUp = 1 << 30, // Y >= 41
CirclePadDown = 1u << 31 // Y <= -41 CirclePadDown = 1u << 31 // Y <= -41
}; };
} }
@ -39,18 +40,18 @@ class HIDService {
Handle handle = KernelHandles::HID; Handle handle = KernelHandles::HID;
Memory& mem; Memory& mem;
Kernel& kernel; Kernel& kernel;
u8* sharedMem = nullptr; // Pointer to HID shared memory u8* sharedMem = nullptr; // Pointer to HID shared memory
uint nextPadIndex; uint nextPadIndex;
uint nextTouchscreenIndex; uint nextTouchscreenIndex;
uint nextAccelerometerIndex; uint nextAccelerometerIndex;
uint nextGyroIndex; uint nextGyroIndex;
u32 newButtons; // The button state currently being edited u32 newButtons; // The button state currently being edited
u32 oldButtons; // The previous pad state u32 oldButtons; // The previous pad state
s16 circlePadX, circlePadY; // Circlepad state s16 circlePadX, circlePadY; // Circlepad state
s16 touchScreenX, touchScreenY; // Touchscreen state s16 touchScreenX, touchScreenY; // Touchscreen state
bool accelerometerEnabled; bool accelerometerEnabled;
bool eventsInitialized; bool eventsInitialized;
@ -79,7 +80,7 @@ class HIDService {
*(T*)&sharedMem[offset] = value; *(T*)&sharedMem[offset] = value;
} }
public: public:
HIDService(Memory& mem, Kernel& kernel) : mem(mem), kernel(kernel) {} HIDService(Memory& mem, Kernel& kernel) : mem(mem), kernel(kernel) {}
void reset(); void reset();
void handleSyncRequest(u32 messagePointer); void handleSyncRequest(u32 messagePointer);
@ -87,7 +88,7 @@ public:
void pressKey(u32 mask) { newButtons |= mask; } void pressKey(u32 mask) { newButtons |= mask; }
void releaseKey(u32 mask) { newButtons &= ~mask; } void releaseKey(u32 mask) { newButtons &= ~mask; }
s16 getCirclepadX() { return circlePadX; } s16 getCirclepadX() { return circlePadX; }
s16 getCirclepadY() { return circlePadY; } s16 getCirclepadY() { return circlePadY; }
void setCirclepadX(s16 x) { void setCirclepadX(s16 x) {
@ -96,9 +97,9 @@ public:
// Turn bits 28 and 29 off in the new button state, which indicate whether the circlepad is steering left or right // Turn bits 28 and 29 off in the new button state, which indicate whether the circlepad is steering left or right
// Then, set them according to the new value of x // Then, set them according to the new value of x
newButtons &= ~0x3000'0000; newButtons &= ~0x3000'0000;
if (x >= 41) // Pressing right if (x >= 41) // Pressing right
newButtons |= 1 << 28; newButtons |= 1 << 28;
else if (x <= -41) // Pressing left else if (x <= -41) // Pressing left
newButtons |= 1 << 29; newButtons |= 1 << 29;
} }
@ -108,9 +109,9 @@ public:
// Turn bits 30 and 31 off in the new button state, which indicate whether the circlepad is steering up or down // Turn bits 30 and 31 off in the new button state, which indicate whether the circlepad is steering up or down
// Then, set them according to the new value of y // Then, set them according to the new value of y
newButtons &= ~0xC000'0000; newButtons &= ~0xC000'0000;
if (y >= 41) // Pressing up if (y >= 41) // Pressing up
newButtons |= 1 << 30; newButtons |= 1 << 30;
else if (y <= -41) // Pressing down else if (y <= -41) // Pressing down
newButtons |= 1 << 31; newButtons |= 1 << 31;
} }
@ -118,7 +119,7 @@ public:
void setSharedMem(u8* ptr) { void setSharedMem(u8* ptr) {
sharedMem = ptr; sharedMem = ptr;
if (ptr != nullptr) { // Zero-fill shared memory in case the process tries to read stale service data or vice versa if (ptr != nullptr) { // Zero-fill shared memory in case the process tries to read stale service data or vice versa
std::memset(ptr, 0, 0x2b0); std::memset(ptr, 0, 0x2b0);
} }
} }