mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-06-21 20:42:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Split hidGetNpadControllerColor/PowerInfo into Single/Split variants

Browse Source
This commit is contained in:
fincs 2020-11-18 00:15:10 +01:00
parent 3f4f6dba44
commit 40e5b08f70
No known key found for this signature in database
GPG Key ID: 62C7609ADA219C60
2 changed files with 66 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nx/include/switch/services/hid.h
View File

@ -842,8 +842,11 @@ u32 hidGetNpadStyleSet(u32 id);
/// Gets the \ref HidNpadJoyAssignmentMode for the specified controller. /// Gets the \ref HidNpadJoyAssignmentMode for the specified controller.
HidNpadJoyAssignmentMode hidGetNpadJoyAssignment(u32 id); HidNpadJoyAssignmentMode hidGetNpadJoyAssignment(u32 id);
/// Gets the \ref HidNpadControllerColor for the specified controller. colors is the output array, where count is the number of entries. count must be 1 or 2: former for the main colors, latter for reading left/right colors. /// Gets the main \ref HidNpadControllerColor for the specified controller.
Result hidGetNpadControllerColor(u32 id, HidNpadControllerColor *colors, size_t count); Result hidGetNpadControllerColorSingle(u32 id, HidNpadControllerColor *color);
/// Gets the left/right \ref HidNpadControllerColor for the specified controller (Joy-Con pair in dual mode).
Result hidGetNpadControllerColorSplit(u32 id, HidNpadControllerColor *color_left, HidNpadControllerColor *color_right);
/// Gets the \ref HidDeviceTypeBits for the specified controller. /// Gets the \ref HidDeviceTypeBits for the specified controller.
u32 hidGetNpadDeviceType(u32 id); u32 hidGetNpadDeviceType(u32 id);
@ -854,8 +857,11 @@ void hidGetNpadSystemProperties(u32 id, HidNpadSystemProperties *out);
/// Gets the \ref HidNpadSystemButtonProperties for the specified controller. /// Gets the \ref HidNpadSystemButtonProperties for the specified controller.
void hidGetNpadSystemButtonProperties(u32 id, HidNpadSystemButtonProperties *out); void hidGetNpadSystemButtonProperties(u32 id, HidNpadSystemButtonProperties *out);
/// Gets the \ref HidPowerInfo for the specified controller. info is the output array, where count is the number of entries. count must be 1 or 2: former for the main battery info, latter for reading left/right Joy-Con PowerInfo. /// Gets the main \ref HidPowerInfo for the specified controller.
void hidGetNpadPowerInfo(u32 id, HidPowerInfo *info, size_t count); void hidGetNpadPowerInfoSingle(u32 id, HidPowerInfo *info);
/// Gets the left/right \ref HidPowerInfo for the specified controller (Joy-Con pair in dual mode).
void hidGetNpadPowerInfoSplit(u32 id, HidPowerInfo *info_left, HidPowerInfo *info_right);
/// Gets a bitfield of AppletFooterUiAttributes for the specified Npad. /// Gets a bitfield of AppletFooterUiAttributes for the specified Npad.
/// Only available on [9.0.0+]. /// Only available on [9.0.0+].

82
nx/source/services/hid.c
View File

@ -358,28 +358,43 @@ HidNpadJoyAssignmentMode hidGetNpadJoyAssignment(u32 id) {
return tmp; return tmp;
} }
Result hidGetNpadControllerColor(u32 id, HidNpadControllerColor *colors, size_t count) { Result hidGetNpadControllerColorSingle(u32 id, HidNpadControllerColor *color) {
Result rc = _hidVerifyNpadIdType(id); Result rc = _hidVerifyNpadIdType(id);
u32 tmp=0;
if (count==0) return rc;
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc)) {
HidNpad *npad = _hidNpadSharedmemGetInternalState(id); HidNpad *npad = _hidNpadSharedmemGetInternalState(id);
if (npad == NULL) if (npad == NULL)
rc = MAKERESULT(Module_Libnx, LibnxError_NotInitialized); rc = MAKERESULT(Module_Libnx, LibnxError_NotInitialized);
else { else {
tmp = count==1 ? npad->header.single_colors_descriptor : npad->header.split_colors_descriptor; u32 tmp = npad->header.single_colors_descriptor;
if (tmp==2) rc = MAKERESULT(202, 604);
else if (tmp==1) rc = MAKERESULT(202, 603);
else if (tmp!=0) diagAbortWithResult(MAKERESULT(Module_Libnx, LibnxError_ShouldNotHappen));
if (R_SUCCEEDED(rc))
*color = npad->header.single_colors;
}
}
return rc;
}
Result hidGetNpadControllerColorSplit(u32 id, HidNpadControllerColor *color_left, HidNpadControllerColor *color_right) {
Result rc = _hidVerifyNpadIdType(id);
if (R_SUCCEEDED(rc)) {
HidNpad *npad = _hidNpadSharedmemGetInternalState(id);
if (npad == NULL)
rc = MAKERESULT(Module_Libnx, LibnxError_NotInitialized);
else {
u32 tmp = npad->header.split_colors_descriptor;
if (tmp==2) rc = MAKERESULT(202, 604); if (tmp==2) rc = MAKERESULT(202, 604);
else if (tmp==1) rc = MAKERESULT(202, 603); else if (tmp==1) rc = MAKERESULT(202, 603);
else if (tmp!=0) diagAbortWithResult(MAKERESULT(Module_Libnx, LibnxError_ShouldNotHappen)); else if (tmp!=0) diagAbortWithResult(MAKERESULT(Module_Libnx, LibnxError_ShouldNotHappen));
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc)) {
if (count==1) colors[0] = npad->header.single_colors; *color_left = npad->header.left_colors;
else { *color_right = npad->header.right_colors;
colors[0] = npad->header.left_colors;
colors[1] = npad->header.right_colors;
}
} }
} }
} }
@ -431,30 +446,45 @@ void hidGetNpadSystemButtonProperties(u32 id, HidNpadSystemButtonProperties *out
if (R_FAILED(rc)) diagAbortWithResult(rc); if (R_FAILED(rc)) diagAbortWithResult(rc);
} }
void hidGetNpadPowerInfo(u32 id, HidPowerInfo *info, size_t count) { static void _hidGetNpadPowerInfo(HidNpad *npad, HidPowerInfo *info, u32 powerInfo, u32 i) {
info->batteryCharge = atomic_load_explicit(&npad->batteryCharge[i], memory_order_acquire);
if (info->batteryCharge > 4) info->batteryCharge = 4; // sdknso would Abort when this occurs.
info->isCharging = (powerInfo & BIT(i)) != 0;
info->powerConnected = (powerInfo & BIT(i+3)) != 0;
}
void hidGetNpadPowerInfoSingle(u32 id, HidPowerInfo *info) {
Result rc = _hidVerifyNpadIdType(id); Result rc = _hidVerifyNpadIdType(id);
size_t i;
size_t indexbase;
HidNpadSystemProperties properties;
if (count == 0) return;
if (count > 2) count = 2;
indexbase = count-1;
hidGetNpadSystemProperties(id, &properties);
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc)) {
HidNpad *npad = _hidNpadSharedmemGetInternalState(id); HidNpad *npad = _hidNpadSharedmemGetInternalState(id);
if (npad == NULL) if (npad == NULL)
rc = MAKERESULT(Module_Libnx, LibnxError_NotInitialized); rc = MAKERESULT(Module_Libnx, LibnxError_NotInitialized);
else { else {
for (i=0; i<count; i++) { HidNpadSystemProperties properties;
info[i].batteryCharge = atomic_load_explicit(&npad->batteryCharge[indexbase+i], memory_order_acquire); properties = atomic_load_explicit(&npad->system_properties, memory_order_acquire);
if (info[i].batteryCharge > 4) info->batteryCharge = 4; // sdknso would Abort when this occurs.
info[i].isCharging = (properties.powerInfo & BIT(indexbase+i)) != 0; _hidGetNpadPowerInfo(npad, info, properties.powerInfo, 0);
info[i].powerConnected = (properties.powerInfo & BIT(indexbase+i+3)) != 0; }
} }
if (R_FAILED(rc)) diagAbortWithResult(rc);
}
void hidGetNpadPowerInfoSplit(u32 id, HidPowerInfo *info_left, HidPowerInfo *info_right) {
Result rc = _hidVerifyNpadIdType(id);
if (R_SUCCEEDED(rc)) {
HidNpad *npad = _hidNpadSharedmemGetInternalState(id);
if (npad == NULL)
rc = MAKERESULT(Module_Libnx, LibnxError_NotInitialized);
else {
HidNpadSystemProperties properties;
properties = atomic_load_explicit(&npad->system_properties, memory_order_acquire);
_hidGetNpadPowerInfo(npad, info_left, properties.powerInfo, 1);
_hidGetNpadPowerInfo(npad, info_right, properties.powerInfo, 2);
} }
} }