bnep: use UUIDs from bluetooth_sdp.h

This commit is contained in:
Matthias Ringwald 2017-03-25 22:51:28 +01:00
parent dd80720956
commit a224d682a3
3 changed files with 5 additions and 20 deletions

View File

@ -403,7 +403,7 @@ static void handle_sdp_client_query_result(uint8_t packet_type, uint16_t channel
printf("l2cap_psm 0x%04x, bnep_version 0x%04x\n", bnep_l2cap_psm, bnep_version);
/* Create BNEP connection */
bnep_connect(packet_handler, remote, bnep_l2cap_psm, PANU_UUID, bnep_remote_uuid);
bnep_connect(packet_handler, remote, bnep_l2cap_psm, BLUETOOTH_SERVICE_CLASS_PANU, bnep_remote_uuid);
}
break;
default:

View File

@ -53,16 +53,7 @@
#include <stdlib.h>
#include <string.h>
#include "btstack_event.h"
#include "btstack_memory.h"
#include "btstack_run_loop.h"
#include "classic/sdp_client.h"
#include "classic/sdp_util.h"
#include "hci.h"
#include "hci_cmd.h"
#include "hci_dump.h"
#include "l2cap.h"
#include "pan.h"
#include "btstack.h"
int record_id = -1;
int attribute_id = -1;
@ -202,9 +193,9 @@ static void handle_sdp_client_query_result(uint8_t packet_type, uint16_t channel
if (de_get_element_type(element) != DE_UUID) continue;
uint32_t uuid = de_get_uuid32(element);
switch (uuid){
case PANU_UUID:
case NAP_UUID:
case GN_UUID:
case BLUETOOTH_SERVICE_CLASS_PANU:
case BLUETOOTH_SERVICE_CLASS_NAP:
case BLUETOOTH_SERVICE_CLASS_GN:
printf(" ** Attribute 0x%04x: BNEP PAN protocol UUID: %04x\n", sdp_event_query_attribute_byte_get_attribute_id(packet), uuid);
break;
default:

View File

@ -913,12 +913,6 @@ typedef enum rpn_flow_control {
* PAN Profile
*/
typedef enum {
PANU_UUID = 0x1115,
NAP_UUID = 0x1116,
GN_UUID = 0x1117
} bnep_service_uuid_t;
typedef enum {
BNEP_SECURITY_NONE = 0x0000,
BNEP_SECURITY_SERVICE_LEVEL_ENFORCED,