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

btdrv: change argument from service id to server interface for gatt server functions

Browse Source
This commit is contained in:
ndeadly 2024-06-01 19:44:10 +02:00 committed by fincs
parent 29a6691b66
commit b2d7022e1b
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1099,31 +1099,31 @@ Result btdrvAddGattService(u8 server_if, const BtdrvGattAttributeUuid *uuid, u8
/** /**
* @brief EnableGattService * @brief EnableGattService
* @note Only available on [5.0.0+]. * @note Only available on [5.0.0+].
* @param[in] service_id Service ID * @param[in] server_if Server interface ID
* @param[in] uuid \ref BtdrvGattAttributeUuid * @param[in] uuid \ref BtdrvGattAttributeUuid
*/ */
Result btdrvEnableGattService(u8 service_id, const BtdrvGattAttributeUuid *uuid); Result btdrvEnableGattService(u8 server_if, const BtdrvGattAttributeUuid *uuid);
/** /**
* @brief AddGattCharacteristic * @brief AddGattCharacteristic
* @note Only available on [5.0.0+]. * @note Only available on [5.0.0+].
* @param[in] service_id Service ID * @param[in] server_if Server interface ID
* @param[in] serv_uuid Service UUID \ref BtdrvGattAttributeUuid * @param[in] serv_uuid Service UUID \ref BtdrvGattAttributeUuid
* @param[in] char_uuid Characteristic UUID \ref BtdrvGattAttributeUuid * @param[in] char_uuid Characteristic UUID \ref BtdrvGattAttributeUuid
* @param[in] permissions \ref BtdrvGattAttributePermission * @param[in] permissions \ref BtdrvGattAttributePermission
* @param[in] property \ref BtdrvGattCharacteristicProperty * @param[in] property \ref BtdrvGattCharacteristicProperty
*/ */
Result btdrvAddGattCharacteristic(u8 service_id, const BtdrvGattAttributeUuid *serv_uuid, const BtdrvGattAttributeUuid *char_uuid, u8 permissions, u16 property); Result btdrvAddGattCharacteristic(u8 server_if, const BtdrvGattAttributeUuid *serv_uuid, const BtdrvGattAttributeUuid *char_uuid, u8 permissions, u16 property);
/** /**
* @brief AddGattDescriptor * @brief AddGattDescriptor
* @note Only available on [5.0.0+]. * @note Only available on [5.0.0+].
* @param[in] service_id Service ID * @param[in] server_if Server interface ID
* @param[in] serv_uuid Service UUID \ref BtdrvGattAttributeUuid * @param[in] serv_uuid Service UUID \ref BtdrvGattAttributeUuid
* @param[in] desc_uuid Descriptor UUID \ref BtdrvGattAttributeUuid * @param[in] desc_uuid Descriptor UUID \ref BtdrvGattAttributeUuid
* @param[in] permissions \ref BtdrvGattAttributePermission * @param[in] permissions \ref BtdrvGattAttributePermission
*/ */
Result btdrvAddGattDescriptor(u8 service_id, const BtdrvGattAttributeUuid *serv_uuid, const BtdrvGattAttributeUuid *desc_uuid, u16 permissions); Result btdrvAddGattDescriptor(u8 server_if, const BtdrvGattAttributeUuid *serv_uuid, const BtdrvGattAttributeUuid *desc_uuid, u16 permissions);
/** /**
* @brief GetBleManagedEventInfo * @brief GetBleManagedEventInfo

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

@ -930,47 +930,47 @@ Result btdrvAddGattService(u8 server_if, const BtdrvGattAttributeUuid *uuid, u8
return serviceDispatchIn(&g_btdrvSrv, 75, in); return serviceDispatchIn(&g_btdrvSrv, 75, in);
} }
Result btdrvEnableGattService(u8 service_id, const BtdrvGattAttributeUuid *uuid) { Result btdrvEnableGattService(u8 server_if, const BtdrvGattAttributeUuid *uuid) {
if (hosversionBefore(5,0,0)) if (hosversionBefore(5,0,0))
return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer); return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer);
u32 cmd_id = hosversionBefore(5,1,0) ? 74 : 76; u32 cmd_id = hosversionBefore(5,1,0) ? 74 : 76;
const struct { const struct {
u8 service_id; u8 server_if;
u8 pad[3]; u8 pad[3];
BtdrvGattAttributeUuid uuid; BtdrvGattAttributeUuid uuid;
} in = { service_id, {0}, *uuid }; } in = { server_if, {0}, *uuid };
return serviceDispatchIn(&g_btdrvSrv, cmd_id, in); return serviceDispatchIn(&g_btdrvSrv, cmd_id, in);
} }
Result btdrvAddGattCharacteristic(u8 service_id, const BtdrvGattAttributeUuid *serv_uuid, const BtdrvGattAttributeUuid *char_uuid, u8 permissions, u16 property) { Result btdrvAddGattCharacteristic(u8 server_if, const BtdrvGattAttributeUuid *serv_uuid, const BtdrvGattAttributeUuid *char_uuid, u8 permissions, u16 property) {
if (hosversionBefore(5,0,0)) if (hosversionBefore(5,0,0))
return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer); return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer);
const struct { const struct {
u8 service_id; u8 server_if;
u8 permissions; u8 permissions;
u16 property; u16 property;
BtdrvGattAttributeUuid serv_uuid; BtdrvGattAttributeUuid serv_uuid;
BtdrvGattAttributeUuid char_uuid; BtdrvGattAttributeUuid char_uuid;
} in = { service_id, permissions, property, *serv_uuid, *char_uuid }; } in = { server_if, permissions, property, *serv_uuid, *char_uuid };
return serviceDispatchIn(&g_btdrvSrv, 77, in); return serviceDispatchIn(&g_btdrvSrv, 77, in);
} }
Result btdrvAddGattDescriptor(u8 service_id, const BtdrvGattAttributeUuid *serv_uuid, const BtdrvGattAttributeUuid *desc_uuid, u16 permissions) { Result btdrvAddGattDescriptor(u8 server_if, const BtdrvGattAttributeUuid *serv_uuid, const BtdrvGattAttributeUuid *desc_uuid, u16 permissions) {
if (hosversionBefore(5,0,0)) if (hosversionBefore(5,0,0))
return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer); return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer);
u32 cmd_id = hosversionBefore(5,1,0) ? 76 : 78; u32 cmd_id = hosversionBefore(5,1,0) ? 76 : 78;
const struct { const struct {
u8 service_id; u8 server_if;
u8 pad; u8 pad;
u16 permissions; u16 permissions;
BtdrvGattAttributeUuid serv_uuid; BtdrvGattAttributeUuid serv_uuid;
BtdrvGattAttributeUuid desc_uuid; BtdrvGattAttributeUuid desc_uuid;
} in = { service_id, 0, permissions, *serv_uuid, *desc_uuid }; } in = { server_if, 0, permissions, *serv_uuid, *desc_uuid };
return serviceDispatchIn(&g_btdrvSrv, cmd_id, in); return serviceDispatchIn(&g_btdrvSrv, cmd_id, in);
} }