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

btdrv: Fixed btdrvGetHidReport IPC, updated docs, and added an enum.

Browse Source
This commit is contained in:
yellows8 2020-07-27 18:04:35 -04:00
parent 354e7d84fd
commit a771f06a0e
2 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
nx/include/switch/services/btdrv.h
View File

@ -18,6 +18,16 @@ typedef enum {
BtdrvBluetoothPropertyType_Unknown6 = 6, ///< Unknown. 1-byte. The default is value 0x68. BtdrvBluetoothPropertyType_Unknown6 = 6, ///< Unknown. 1-byte. The default is value 0x68.
} BtdrvBluetoothPropertyType; } BtdrvBluetoothPropertyType;
/// BluetoothHhReportType
/// Bit0-1 directly control the HID bluetooth transaction report-type value.
/// Bit2-3: these directly control the Parameter Reserved field for SetReport, for GetReport these control the Parameter Reserved and Size bits.
typedef enum {
BtdrvBluetoothHhReportType_Other = 0, ///< Other
BtdrvBluetoothHhReportType_Input = 1, ///< Input
BtdrvBluetoothHhReportType_Output = 2, ///< Output
BtdrvBluetoothHhReportType_Feature = 3, ///< Feature
} BtdrvBluetoothHhReportType;
/// HidEventType /// HidEventType
typedef enum { typedef enum {
BtdrvHidEventType_Unknown0 = 0, ///< Unknown. Only used with \ref btdrvGetHidEventInfo. BtdrvHidEventType_Unknown0 = 0, ///< Unknown. Only used with \ref btdrvGetHidEventInfo.
@ -283,7 +293,7 @@ Result btdrvSetAdapterProperty(BtdrvBluetoothPropertyType type, const void* buff
Result btdrvGetEventInfo(void* buffer, size_t size, u32 *type); Result btdrvGetEventInfo(void* buffer, size_t size, u32 *type);
/** /**
* @brief WriteHidData * @brief This sends a HID DATA transaction packet with report-type Output.
* @param[in] addr \ref BtdrvAddress * @param[in] addr \ref BtdrvAddress
* @param[in] buffer Input \ref BtdrvHidReport, on pre-9.0.0 this is \ref BtdrvHidData. * @param[in] buffer Input \ref BtdrvHidReport, on pre-9.0.0 this is \ref BtdrvHidData.
*/ */
@ -298,20 +308,20 @@ Result btdrvWriteHidData(BtdrvAddress addr, BtdrvHidReport *buffer);
Result btdrvWriteHidData2(BtdrvAddress addr, const void* buffer, size_t size); Result btdrvWriteHidData2(BtdrvAddress addr, const void* buffer, size_t size);
/** /**
* @brief SetHidReport * @brief This sends a HID SET_REPORT transaction packet.
* @param[in] addr \ref BtdrvAddress * @param[in] addr \ref BtdrvAddress
* @param[in] type BluetoothHhReportType * @param[in] type \ref BtdrvBluetoothHhReportType
* @param[in] buffer Input \ref BtdrvHidReport, on pre-9.0.0 this is \ref BtdrvHidData. * @param[in] buffer Input \ref BtdrvHidReport, on pre-9.0.0 this is \ref BtdrvHidData.
*/ */
Result btdrvSetHidReport(BtdrvAddress addr, u32 type, BtdrvHidReport *buffer); Result btdrvSetHidReport(BtdrvAddress addr, BtdrvBluetoothHhReportType type, BtdrvHidReport *buffer);
/** /**
* @brief GetHidReport * @brief This sends a HID GET_REPORT transaction packet.
* @param[in] addr \ref BtdrvAddress * @param[in] addr \ref BtdrvAddress
* @param[in] unk Unknown * @param[in] report_id This is sent in the packet for the Report Id, when non-zero.
* @param[in] type BluetoothHhReportType * @param[in] type \ref BtdrvBluetoothHhReportType
*/ */
Result btdrvGetHidReport(BtdrvAddress addr, u8 unk, u32 type); Result btdrvGetHidReport(BtdrvAddress addr, u8 report_id, BtdrvBluetoothHhReportType type);
/** /**
* @brief TriggerConnection * @brief TriggerConnection

10
nx/source/services/btdrv.c
View File

@ -149,7 +149,7 @@ Result btdrvWriteHidData2(BtdrvAddress addr, const void* buffer, size_t size) {
); );
} }
Result btdrvSetHidReport(BtdrvAddress addr, u32 type, BtdrvHidReport *buffer) { Result btdrvSetHidReport(BtdrvAddress addr, BtdrvBluetoothHhReportType type, BtdrvHidReport *buffer) {
size_t size = hosversionBefore(9,0,0) ? sizeof(BtdrvHidData) : sizeof(BtdrvHidReport); size_t size = hosversionBefore(9,0,0) ? sizeof(BtdrvHidData) : sizeof(BtdrvHidReport);
const struct { const struct {
@ -163,13 +163,13 @@ Result btdrvSetHidReport(BtdrvAddress addr, u32 type, BtdrvHidReport *buffer) {
); );
} }
Result btdrvGetHidReport(BtdrvAddress addr, u8 unk, u32 type) { Result btdrvGetHidReport(BtdrvAddress addr, u8 report_id, BtdrvBluetoothHhReportType type) {
const struct { const struct {
BtdrvAddress addr; BtdrvAddress addr;
u8 unk; u8 report_id;
u8 pad[3]; u8 pad;
u32 type; u32 type;
} in = { addr, unk, {0}, type }; } in = { addr, report_id, 0, type };
return serviceDispatchIn(&g_btdrvSrv, 22, in); return serviceDispatchIn(&g_btdrvSrv, 22, in);
} }