diff --git a/include/bluetooth/sdp.h b/include/bluetooth/sdp.h index 65eef9df0a3..005a9c646ab 100644 --- a/include/bluetooth/sdp.h +++ b/include/bluetooth/sdp.h @@ -39,83 +39,83 @@ extern "C" { /* * Service class identifiers of standard services and service groups */ -#define BT_SDP_SDP_SERVER_SVCLASS_ID 0x1000 -#define BT_SDP_BROWSE_GRP_DESC_SVCLASS_ID 0x1001 -#define BT_SDP_PUBLIC_BROWSE_GROUP 0x1002 -#define BT_SDP_SERIAL_PORT_SVCLASS_ID 0x1101 -#define BT_SDP_LAN_ACCESS_SVCLASS_ID 0x1102 -#define BT_SDP_DIALUP_NET_SVCLASS_ID 0x1103 -#define BT_SDP_IRMC_SYNC_SVCLASS_ID 0x1104 -#define BT_SDP_OBEX_OBJPUSH_SVCLASS_ID 0x1105 -#define BT_SDP_OBEX_FILETRANS_SVCLASS_ID 0x1106 -#define BT_SDP_IRMC_SYNC_CMD_SVCLASS_ID 0x1107 -#define BT_SDP_HEADSET_SVCLASS_ID 0x1108 -#define BT_SDP_CORDLESS_TELEPHONY_SVCLASS_ID 0x1109 -#define BT_SDP_AUDIO_SOURCE_SVCLASS_ID 0x110a -#define BT_SDP_AUDIO_SINK_SVCLASS_ID 0x110b -#define BT_SDP_AV_REMOTE_TARGET_SVCLASS_ID 0x110c -#define BT_SDP_ADVANCED_AUDIO_SVCLASS_ID 0x110d -#define BT_SDP_AV_REMOTE_SVCLASS_ID 0x110e -#define BT_SDP_AV_REMOTE_CONTROLLER_SVCLASS_ID 0x110f -#define BT_SDP_INTERCOM_SVCLASS_ID 0x1110 -#define BT_SDP_FAX_SVCLASS_ID 0x1111 -#define BT_SDP_HEADSET_AGW_SVCLASS_ID 0x1112 -#define BT_SDP_WAP_SVCLASS_ID 0x1113 -#define BT_SDP_WAP_CLIENT_SVCLASS_ID 0x1114 -#define BT_SDP_PANU_SVCLASS_ID 0x1115 -#define BT_SDP_NAP_SVCLASS_ID 0x1116 -#define BT_SDP_GN_SVCLASS_ID 0x1117 -#define BT_SDP_DIRECT_PRINTING_SVCLASS_ID 0x1118 -#define BT_SDP_REFERENCE_PRINTING_SVCLASS_ID 0x1119 -#define BT_SDP_IMAGING_SVCLASS_ID 0x111a -#define BT_SDP_IMAGING_RESPONDER_SVCLASS_ID 0x111b -#define BT_SDP_IMAGING_ARCHIVE_SVCLASS_ID 0x111c -#define BT_SDP_IMAGING_REFOBJS_SVCLASS_ID 0x111d -#define BT_SDP_HANDSFREE_SVCLASS_ID 0x111e -#define BT_SDP_HANDSFREE_AGW_SVCLASS_ID 0x111f -#define BT_SDP_DIRECT_PRT_REFOBJS_SVCLASS_ID 0x1120 -#define BT_SDP_REFLECTED_UI_SVCLASS_ID 0x1121 -#define BT_SDP_BASIC_PRINTING_SVCLASS_ID 0x1122 -#define BT_SDP_PRINTING_STATUS_SVCLASS_ID 0x1123 -#define BT_SDP_HID_SVCLASS_ID 0x1124 -#define BT_SDP_HCR_SVCLASS_ID 0x1125 -#define BT_SDP_HCR_PRINT_SVCLASS_ID 0x1126 -#define BT_SDP_HCR_SCAN_SVCLASS_ID 0x1127 -#define BT_SDP_CIP_SVCLASS_ID 0x1128 -#define BT_SDP_VIDEO_CONF_GW_SVCLASS_ID 0x1129 -#define BT_SDP_UDI_MT_SVCLASS_ID 0x112a -#define BT_SDP_UDI_TA_SVCLASS_ID 0x112b -#define BT_SDP_AV_SVCLASS_ID 0x112c -#define BT_SDP_SAP_SVCLASS_ID 0x112d -#define BT_SDP_PBAP_PCE_SVCLASS_ID 0x112e -#define BT_SDP_PBAP_PSE_SVCLASS_ID 0x112f -#define BT_SDP_PBAP_SVCLASS_ID 0x1130 -#define BT_SDP_MAP_MSE_SVCLASS_ID 0x1132 -#define BT_SDP_MAP_MCE_SVCLASS_ID 0x1133 -#define BT_SDP_MAP_SVCLASS_ID 0x1134 -#define BT_SDP_GNSS_SVCLASS_ID 0x1135 -#define BT_SDP_GNSS_SERVER_SVCLASS_ID 0x1136 -#define BT_SDP_MPS_SC_SVCLASS_ID 0x113a -#define BT_SDP_MPS_SVCLASS_ID 0x113b -#define BT_SDP_PNP_INFO_SVCLASS_ID 0x1200 -#define BT_SDP_GENERIC_NETWORKING_SVCLASS_ID 0x1201 -#define BT_SDP_GENERIC_FILETRANS_SVCLASS_ID 0x1202 -#define BT_SDP_GENERIC_AUDIO_SVCLASS_ID 0x1203 -#define BT_SDP_GENERIC_TELEPHONY_SVCLASS_ID 0x1204 -#define BT_SDP_UPNP_SVCLASS_ID 0x1205 -#define BT_SDP_UPNP_IP_SVCLASS_ID 0x1206 -#define BT_SDP_UPNP_PAN_SVCLASS_ID 0x1300 -#define BT_SDP_UPNP_LAP_SVCLASS_ID 0x1301 -#define BT_SDP_UPNP_L2CAP_SVCLASS_ID 0x1302 -#define BT_SDP_VIDEO_SOURCE_SVCLASS_ID 0x1303 -#define BT_SDP_VIDEO_SINK_SVCLASS_ID 0x1304 -#define BT_SDP_VIDEO_DISTRIBUTION_SVCLASS_ID 0x1305 -#define BT_SDP_HDP_SVCLASS_ID 0x1400 -#define BT_SDP_HDP_SOURCE_SVCLASS_ID 0x1401 -#define BT_SDP_HDP_SINK_SVCLASS_ID 0x1402 -#define BT_SDP_GENERIC_ACCESS_SVCLASS_ID 0x1800 -#define BT_SDP_GENERIC_ATTRIB_SVCLASS_ID 0x1801 -#define BT_SDP_APPLE_AGENT_SVCLASS_ID 0x2112 +#define BT_SDP_SDP_SERVER_SVCLASS 0x1000 +#define BT_SDP_BROWSE_GRP_DESC_SVCLASS 0x1001 +#define BT_SDP_PUBLIC_BROWSE_GROUP 0x1002 +#define BT_SDP_SERIAL_PORT_SVCLASS 0x1101 +#define BT_SDP_LAN_ACCESS_SVCLASS 0x1102 +#define BT_SDP_DIALUP_NET_SVCLASS 0x1103 +#define BT_SDP_IRMC_SYNC_SVCLASS 0x1104 +#define BT_SDP_OBEX_OBJPUSH_SVCLASS 0x1105 +#define BT_SDP_OBEX_FILETRANS_SVCLASS 0x1106 +#define BT_SDP_IRMC_SYNC_CMD_SVCLASS 0x1107 +#define BT_SDP_HEADSET_SVCLASS 0x1108 +#define BT_SDP_CORDLESS_TELEPHONY_SVCLASS 0x1109 +#define BT_SDP_AUDIO_SOURCE_SVCLASS 0x110a +#define BT_SDP_AUDIO_SINK_SVCLASS 0x110b +#define BT_SDP_AV_REMOTE_TARGET_SVCLASS 0x110c +#define BT_SDP_ADVANCED_AUDIO_SVCLASS 0x110d +#define BT_SDP_AV_REMOTE_SVCLASS 0x110e +#define BT_SDP_AV_REMOTE_CONTROLLER_SVCLASS 0x110f +#define BT_SDP_INTERCOM_SVCLASS 0x1110 +#define BT_SDP_FAX_SVCLASS 0x1111 +#define BT_SDP_HEADSET_AGW_SVCLASS 0x1112 +#define BT_SDP_WAP_SVCLASS 0x1113 +#define BT_SDP_WAP_CLIENT_SVCLASS 0x1114 +#define BT_SDP_PANU_SVCLASS 0x1115 +#define BT_SDP_NAP_SVCLASS 0x1116 +#define BT_SDP_GN_SVCLASS 0x1117 +#define BT_SDP_DIRECT_PRINTING_SVCLASS 0x1118 +#define BT_SDP_REFERENCE_PRINTING_SVCLASS 0x1119 +#define BT_SDP_IMAGING_SVCLASS 0x111a +#define BT_SDP_IMAGING_RESPONDER_SVCLASS 0x111b +#define BT_SDP_IMAGING_ARCHIVE_SVCLASS 0x111c +#define BT_SDP_IMAGING_REFOBJS_SVCLASS 0x111d +#define BT_SDP_HANDSFREE_SVCLASS 0x111e +#define BT_SDP_HANDSFREE_AGW_SVCLASS 0x111f +#define BT_SDP_DIRECT_PRT_REFOBJS_SVCLASS 0x1120 +#define BT_SDP_REFLECTED_UI_SVCLASS 0x1121 +#define BT_SDP_BASIC_PRINTING_SVCLASS 0x1122 +#define BT_SDP_PRINTING_STATUS_SVCLASS 0x1123 +#define BT_SDP_HID_SVCLASS 0x1124 +#define BT_SDP_HCR_SVCLASS 0x1125 +#define BT_SDP_HCR_PRINT_SVCLASS 0x1126 +#define BT_SDP_HCR_SCAN_SVCLASS 0x1127 +#define BT_SDP_CIP_SVCLASS 0x1128 +#define BT_SDP_VIDEO_CONF_GW_SVCLASS 0x1129 +#define BT_SDP_UDI_MT_SVCLASS 0x112a +#define BT_SDP_UDI_TA_SVCLASS 0x112b +#define BT_SDP_AV_SVCLASS 0x112c +#define BT_SDP_SAP_SVCLASS 0x112d +#define BT_SDP_PBAP_PCE_SVCLASS 0x112e +#define BT_SDP_PBAP_PSE_SVCLASS 0x112f +#define BT_SDP_PBAP_SVCLASS 0x1130 +#define BT_SDP_MAP_MSE_SVCLASS 0x1132 +#define BT_SDP_MAP_MCE_SVCLASS 0x1133 +#define BT_SDP_MAP_SVCLASS 0x1134 +#define BT_SDP_GNSS_SVCLASS 0x1135 +#define BT_SDP_GNSS_SERVER_SVCLASS 0x1136 +#define BT_SDP_MPS_SC_SVCLASS 0x113a +#define BT_SDP_MPS_SVCLASS 0x113b +#define BT_SDP_PNP_INFO_SVCLASS 0x1200 +#define BT_SDP_GENERIC_NETWORKING_SVCLASS 0x1201 +#define BT_SDP_GENERIC_FILETRANS_SVCLASS 0x1202 +#define BT_SDP_GENERIC_AUDIO_SVCLASS 0x1203 +#define BT_SDP_GENERIC_TELEPHONY_SVCLASS 0x1204 +#define BT_SDP_UPNP_SVCLASS 0x1205 +#define BT_SDP_UPNP_IP_SVCLASS 0x1206 +#define BT_SDP_UPNP_PAN_SVCLASS 0x1300 +#define BT_SDP_UPNP_LAP_SVCLASS 0x1301 +#define BT_SDP_UPNP_L2CAP_SVCLASS 0x1302 +#define BT_SDP_VIDEO_SOURCE_SVCLASS 0x1303 +#define BT_SDP_VIDEO_SINK_SVCLASS 0x1304 +#define BT_SDP_VIDEO_DISTRIBUTION_SVCLASS 0x1305 +#define BT_SDP_HDP_SVCLASS 0x1400 +#define BT_SDP_HDP_SOURCE_SVCLASS 0x1401 +#define BT_SDP_HDP_SINK_SVCLASS 0x1402 +#define BT_SDP_GENERIC_ACCESS_SVCLASS 0x1800 +#define BT_SDP_GENERIC_ATTRIB_SVCLASS 0x1801 +#define BT_SDP_APPLE_AGENT_SVCLASS 0x2112 /* * Attribute identifier codes @@ -135,7 +135,7 @@ extern "C" { #define BT_SDP_ATTR_LANG_BASE_ATTR_ID_LIST 0x0006 #define BT_SDP_ATTR_SVCINFO_TTL 0x0007 #define BT_SDP_ATTR_SERVICE_AVAILABILITY 0x0008 -#define BT_SDP_ATTR_PFILE_DESC_LIST 0x0009 +#define BT_SDP_ATTR_PROFILE_DESC_LIST 0x0009 #define BT_SDP_ATTR_DOC_URL 0x000a #define BT_SDP_ATTR_CLNT_EXEC_URL 0x000b #define BT_SDP_ATTR_ICON_URL 0x000c diff --git a/tests/bluetooth/shell/src/main.c b/tests/bluetooth/shell/src/main.c index a0e60b42517..664c0a54386 100644 --- a/tests/bluetooth/shell/src/main.c +++ b/tests/bluetooth/shell/src/main.c @@ -77,7 +77,7 @@ static struct bt_sdp_attribute spp_attrs[] = { BT_SDP_DATA_ELEM_LIST( { BT_SDP_TYPE_SIZE(BT_SDP_UUID16), - BT_SDP_ARRAY_16(BT_SDP_SERIAL_PORT_SVCLASS_ID) + BT_SDP_ARRAY_16(BT_SDP_SERIAL_PORT_SVCLASS) }, ) ), @@ -110,7 +110,7 @@ static struct bt_sdp_attribute spp_attrs[] = { ) ), BT_SDP_LIST( - BT_SDP_ATTR_PFILE_DESC_LIST, + BT_SDP_ATTR_PROFILE_DESC_LIST, BT_SDP_TYPE_SIZE(BT_SDP_SEQ8, 8), BT_SDP_DATA_ELEM_LIST( { @@ -118,7 +118,7 @@ static struct bt_sdp_attribute spp_attrs[] = { BT_SDP_DATA_ELEM_LIST( { BT_SDP_TYPE_SIZE(BT_SDP_UUID16), - BT_SDP_ARRAY_16(BT_SDP_SERIAL_PORT_SVCLASS_ID) + BT_SDP_ARRAY_16(BT_SDP_SERIAL_PORT_SVCLASS) }, { BT_SDP_TYPE_SIZE(BT_SDP_UINT16),