From 2f6fcf7fb28d16f06e1bd2bcb0ac49e51d545eb5 Mon Sep 17 00:00:00 2001 From: yellows8 Date: Tue, 29 Dec 2020 20:31:06 -0500 Subject: [PATCH] btdrv: Updated param names/docs. --- nx/include/switch/services/btdrv.h | 24 ++++++++++++------------ nx/source/services/btdrv.c | 28 ++++++++++++++-------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/nx/include/switch/services/btdrv.h b/nx/include/switch/services/btdrv.h index 303c1b7c..a25f9d84 100644 --- a/nx/include/switch/services/btdrv.h +++ b/nx/include/switch/services/btdrv.h @@ -353,10 +353,10 @@ Result btdrvEnableBurstMode(BtdrvAddress addr, bool flag); * @brief SetZeroRetransmission * @note This is used by btm-sysmodule. * @param[in] addr \ref BtdrvAddress - * @param[in] buf Input buffer containing an array of u8s. + * @param[in] report_ids Input buffer containing an array of u8s. * @param[in] count Total u8s in the input buffer. This can be 0, the max is 5. */ -Result btdrvSetZeroRetransmission(BtdrvAddress addr, u8 *buf, u8 count); +Result btdrvSetZeroRetransmission(BtdrvAddress addr, u8 *report_ids, u8 count); /** * @brief EnableMcMode @@ -767,10 +767,10 @@ Result btdrvGetBleManagedEventInfo(void* buffer, size_t size, u32 *type); * @param[in] id \ref BtdrvGattId * @param[in] flag Flag * @param[in] uuid \ref BtdrvGattAttributeUuid - * @param[out] unk_out Unknown - * @param[out] id_out \ref BtdrvGattId + * @param[out] out_property Output Property. + * @param[out] out_char_id Output CharacteristicId \ref BtdrvGattId */ -Result btdrvGetGattFirstCharacteristic(u32 unk, const BtdrvGattId *id, bool flag, const BtdrvGattAttributeUuid *uuid, u8 *unk_out, BtdrvGattId *id_out); +Result btdrvGetGattFirstCharacteristic(u32 unk, const BtdrvGattId *id, bool flag, const BtdrvGattAttributeUuid *uuid, u8 *out_property, BtdrvGattId *out_char_id); /** * @brief GetGattNextCharacteristic @@ -780,10 +780,10 @@ Result btdrvGetGattFirstCharacteristic(u32 unk, const BtdrvGattId *id, bool flag * @param[in] flag Flag * @param[in] id1 \ref BtdrvGattId * @param[in] uuid \ref BtdrvGattAttributeUuid - * @param[out] unk_out Unknown - * @param[out] id_out \ref BtdrvGattId + * @param[out] out_property Output Property. + * @param[out] out_char_id Output CharacteristicId \ref BtdrvGattId */ -Result btdrvGetGattNextCharacteristic(u32 unk, const BtdrvGattId *id0, bool flag, const BtdrvGattId *id1, const BtdrvGattAttributeUuid *uuid, u8 *unk_out, BtdrvGattId *id_out); +Result btdrvGetGattNextCharacteristic(u32 unk, const BtdrvGattId *id0, bool flag, const BtdrvGattId *id1, const BtdrvGattAttributeUuid *uuid, u8 *out_property, BtdrvGattId *out_char_id); /** * @brief GetGattFirstDescriptor @@ -793,9 +793,9 @@ Result btdrvGetGattNextCharacteristic(u32 unk, const BtdrvGattId *id0, bool flag * @param[in] flag Flag * @param[in] id1 \ref BtdrvGattId * @param[in] uuid \ref BtdrvGattAttributeUuid - * @param[out] id_out \ref BtdrvGattId + * @param[out] out_desc_id Output DescriptorId \ref BtdrvGattId */ -Result btdrvGetGattFirstDescriptor(u32 unk, const BtdrvGattId *id0, bool flag, const BtdrvGattId *id1, const BtdrvGattAttributeUuid *uuid, BtdrvGattId *id_out); +Result btdrvGetGattFirstDescriptor(u32 unk, const BtdrvGattId *id0, bool flag, const BtdrvGattId *id1, const BtdrvGattAttributeUuid *uuid, BtdrvGattId *out_desc_id); /** * @brief GetGattNextDescriptor @@ -806,9 +806,9 @@ Result btdrvGetGattFirstDescriptor(u32 unk, const BtdrvGattId *id0, bool flag, c * @param[in] id1 \ref BtdrvGattId * @param[in] id2 \ref BtdrvGattId * @param[in] uuid \ref BtdrvGattAttributeUuid - * @param[out] id_out \ref BtdrvGattId + * @param[out] out_desc_id Output DescriptorId \ref BtdrvGattId */ -Result btdrvGetGattNextDescriptor(u32 unk, const BtdrvGattId *id0, bool flag, const BtdrvGattId *id1, const BtdrvGattId *id2, const BtdrvGattAttributeUuid *uuid, BtdrvGattId *id_out); +Result btdrvGetGattNextDescriptor(u32 unk, const BtdrvGattId *id0, bool flag, const BtdrvGattId *id1, const BtdrvGattId *id2, const BtdrvGattAttributeUuid *uuid, BtdrvGattId *out_desc_id); /** * @brief RegisterGattManagedDataPath diff --git a/nx/source/services/btdrv.c b/nx/source/services/btdrv.c index 3d75df62..cc90599e 100644 --- a/nx/source/services/btdrv.c +++ b/nx/source/services/btdrv.c @@ -344,10 +344,10 @@ Result btdrvEnableBurstMode(BtdrvAddress addr, bool flag) { return _btmCmdInAddrU8NoOut(addr, flag!=0, 29); } -Result btdrvSetZeroRetransmission(BtdrvAddress addr, u8 *buf, u8 count) { +Result btdrvSetZeroRetransmission(BtdrvAddress addr, u8 *report_ids, u8 count) { return serviceDispatchIn(&g_btdrvSrv, 30, addr, .buffer_attrs = { SfBufferAttr_HipcPointer | SfBufferAttr_In }, - .buffers = { { buf, count } }, + .buffers = { { report_ids, count } }, ); } @@ -865,7 +865,7 @@ Result btdrvGetBleManagedEventInfo(void* buffer, size_t size, u32 *type) { return _btdrvCmdOutU32OutBuf(buffer, size, type, cmd_id); } -Result btdrvGetGattFirstCharacteristic(u32 unk, const BtdrvGattId *id, bool flag, const BtdrvGattAttributeUuid *uuid, u8 *unk_out, BtdrvGattId *id_out) { +Result btdrvGetGattFirstCharacteristic(u32 unk, const BtdrvGattId *id, bool flag, const BtdrvGattAttributeUuid *uuid, u8 *out_property, BtdrvGattId *out_char_id) { if (hosversionBefore(5,0,0)) return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer); u32 cmd_id = hosversionBefore(5,1,0) ? 79 : 80; @@ -879,20 +879,20 @@ Result btdrvGetGattFirstCharacteristic(u32 unk, const BtdrvGattId *id, bool flag } in = { flag!=0, {0}, unk, *id, *uuid }; struct { - u8 unk; + u8 property; u8 pad[3]; BtdrvGattId id; } out; Result rc = serviceDispatchInOut(&g_btdrvSrv, cmd_id, in, out); if (R_SUCCEEDED(rc)) { - if (unk_out) *unk_out = out.unk; - if (id_out) *id_out = out.id; + if (out_property) *out_property = out.property; + if (out_char_id) *out_char_id = out.id; } return rc; } -Result btdrvGetGattNextCharacteristic(u32 unk, const BtdrvGattId *id0, bool flag, const BtdrvGattId *id1, const BtdrvGattAttributeUuid *uuid, u8 *unk_out, BtdrvGattId *id_out) { +Result btdrvGetGattNextCharacteristic(u32 unk, const BtdrvGattId *id0, bool flag, const BtdrvGattId *id1, const BtdrvGattAttributeUuid *uuid, u8 *out_property, BtdrvGattId *out_char_id) { if (hosversionBefore(5,0,0)) return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer); u32 cmd_id = hosversionBefore(5,1,0) ? 80 : 81; @@ -907,20 +907,20 @@ Result btdrvGetGattNextCharacteristic(u32 unk, const BtdrvGattId *id0, bool flag } in = { flag!=0, {0}, unk, *id0, *id1, *uuid }; struct { - u8 unk; + u8 property; u8 pad[3]; BtdrvGattId id; } out; Result rc = serviceDispatchInOut(&g_btdrvSrv, cmd_id, in, out); if (R_SUCCEEDED(rc)) { - if (unk_out) *unk_out = out.unk; - if (id_out) *id_out = out.id; + if (out_property) *out_property = out.property; + if (out_char_id) *out_char_id = out.id; } return rc; } -Result btdrvGetGattFirstDescriptor(u32 unk, const BtdrvGattId *id0, bool flag, const BtdrvGattId *id1, const BtdrvGattAttributeUuid *uuid, BtdrvGattId *id_out) { +Result btdrvGetGattFirstDescriptor(u32 unk, const BtdrvGattId *id0, bool flag, const BtdrvGattId *id1, const BtdrvGattAttributeUuid *uuid, BtdrvGattId *out_desc_id) { if (hosversionBefore(5,0,0)) return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer); u32 cmd_id = hosversionBefore(5,1,0) ? 81 : 82; @@ -934,10 +934,10 @@ Result btdrvGetGattFirstDescriptor(u32 unk, const BtdrvGattId *id0, bool flag, c BtdrvGattAttributeUuid uuid; } in = { flag!=0, {0}, unk, *id0, *id1, *uuid }; - return serviceDispatchInOut(&g_btdrvSrv, cmd_id, in, *id_out); + return serviceDispatchInOut(&g_btdrvSrv, cmd_id, in, *out_desc_id); } -Result btdrvGetGattNextDescriptor(u32 unk, const BtdrvGattId *id0, bool flag, const BtdrvGattId *id1, const BtdrvGattId *id2, const BtdrvGattAttributeUuid *uuid, BtdrvGattId *id_out) { +Result btdrvGetGattNextDescriptor(u32 unk, const BtdrvGattId *id0, bool flag, const BtdrvGattId *id1, const BtdrvGattId *id2, const BtdrvGattAttributeUuid *uuid, BtdrvGattId *out_desc_id) { if (hosversionBefore(5,0,0)) return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer); u32 cmd_id = hosversionBefore(5,1,0) ? 82 : 83; @@ -952,7 +952,7 @@ Result btdrvGetGattNextDescriptor(u32 unk, const BtdrvGattId *id0, bool flag, co BtdrvGattAttributeUuid uuid; } in = { flag!=0, {0}, unk, *id0, *id1, *id2, *uuid }; - return serviceDispatchInOut(&g_btdrvSrv, cmd_id, in, *id_out); + return serviceDispatchInOut(&g_btdrvSrv, cmd_id, in, *out_desc_id); } Result btdrvRegisterGattManagedDataPath(const BtdrvGattAttributeUuid *uuid) {