mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-04-04 13:20:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

migration: update sdp_query_callback and add warning

Browse Source
This commit is contained in:
Matthias Ringwald 2016-03-11 19:43:58 +01:00
parent 785a493911
commit 8c3931c75e
2 changed files with 46 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
tool/conversion_to_v1.0/convert.cocci
View File

@ -38,7 +38,7 @@ identifier fn, connection, packet_type, channel, packet, size;
expression handle; expression handle;
@@ @@
- hci_can_send_sco_packet_now(handle) - hci_can_send_sco_packet_now(handle)
+ hci_can_send_sco_packet_now() + hci_can_send_sco_packet_now()
@@ @@
expression uuid; expression uuid;
@ -67,3 +67,42 @@ identifier fn, ts;
- fn(struct timer * ts) - fn(struct timer * ts)
+ fn(btstack_timer_source_t * ts) + fn(btstack_timer_source_t * ts)
{ ... } { ... }
// propagate sdp client callback into individual sdp client calls
// add warning that type doesn't match
@@
@@
- sdp_parser_init();
@sdp_parser_register_callback @
identifier sdp_client_callback;
@@
- sdp_parser_register_callback(sdp_client_callback);
@@
identifier sdp_parser_register_callback.sdp_client_callback;
expression E1, E2;
@@
- sdp_general_query_for_uuid(E1, E2)
+ sdp_client_query_uuid16(sdp_client_callback, E1, E2)
@@
identifier fn, event;
identifier ve;
identifier ce;
typedef sdp_query_event_t;
typedef sdp_query_attribute_value_event_t;
typedef sdp_query_complete_event_t;
type T;
@@
- T fn(sdp_query_event_t * event)
+
+ // MIGRATION: SDP Client callback changed to btstack_packet_handler_t
+ // Please use sdp_client_X functions to access event fields
+ T fn(uint8_t packet_type, uint16_t channel, uint8_t * packet, uint16_t size)
{ ... }

12
tool/conversion_to_v1.0/convert.sed
View File

@ -24,11 +24,11 @@ s/GATT_NOTIFICATION/GATT_EVENT_NOTIFICATION/g
s/DAEMON_EVENT_HCI_PACKET_SENT/HCI_EVENT_TRANSPORT_PACKET_SENT/g s/DAEMON_EVENT_HCI_PACKET_SENT/HCI_EVENT_TRANSPORT_PACKET_SENT/g
s/GATT_QUERY_COMPLETE/GATT_EVENT_QUERY_COMPLETE/g s/GATT_QUERY_COMPLETE/GATT_EVENT_QUERY_COMPLETE/g
s/GATT_SERVICE_QUERY_RESULT/GATT_EVENT_SERVICE_QUERY_RESULT/g s/GATT_SERVICE_QUERY_RESULT/GATT_EVENT_SERVICE_QUERY_RESULT/g
s/SDP_EVENT_QUERY_ATTRIBUTE_BYTE/SDP_EVENT_QUERY_ATTRIBUTE_BYTE/g s/SDP_QUERY_ATTRIBUTE_BYTE/SDP_EVENT_QUERY_ATTRIBUTE_BYTE/g
s/SDP_EVENT_QUERY_ATTRIBUTE_VALUE/SDP_EVENT_QUERY_ATTRIBUTE_VALUE/g s/SDP_QUERY_ATTRIBUTE_VALUE/SDP_EVENT_QUERY_ATTRIBUTE_VALUE/g
s/SDP_EVENT_QUERY_COMPLETE/SDP_EVENT_QUERY_COMPLETE/g s/SDP_QUERY_COMPLETE/SDP_EVENT_QUERY_COMPLETE/g
s/SDP_EVENT_QUERY_RFCOMM_SERVICE/SDP_EVENT_QUERY_RFCOMM_SERVICE/g s/SDP_QUERY_RFCOMM_SERVICE/SDP_EVENT_QUERY_RFCOMM_SERVICE/g
s/SDP_EVENT_QUERY_SERVICE_RECORD_HANDLE/SDP_EVENT_QUERY_SERVICE_RECORD_HANDLE/g s/SDP_QUERY_SERVICE_RECORD_HANDLE/SDP_EVENT_QUERY_SERVICE_RECORD_HANDLE/g
s/SM_EVENT_AUTHORIZATION_REQUEST/SM_EVENT_AUTHORIZATION_REQUEST/g s/SM_EVENT_AUTHORIZATION_REQUEST/SM_EVENT_AUTHORIZATION_REQUEST/g
s/SM_EVENT_AUTHORIZATION_RESULT/SM_EVENT_AUTHORIZATION_RESULT/g s/SM_EVENT_AUTHORIZATION_RESULT/SM_EVENT_AUTHORIZATION_RESULT/g
s/SM_EVENT_IDENTITY_RESOLVING_FAILED/SM_EVENT_IDENTITY_RESOLVING_FAILED/g s/SM_EVENT_IDENTITY_RESOLVING_FAILED/SM_EVENT_IDENTITY_RESOLVING_FAILED/g
@ -96,7 +96,7 @@ s|"hsp_hs.h"|"classic/hsp_hs.h"|g
s|"pan.h"|"classic/pan.h"|g s|"pan.h"|"classic/pan.h"|g
s|"rfcomm.h"|"classic/rfcomm.h"|g s|"rfcomm.h"|"classic/rfcomm.h"|g
s|"sdp.h"|"classic/sdp_server.h"|g s|"sdp.h"|"classic/sdp_server.h"|g
s|"sdp_client.h"|"classic/sdp_client.h"|g s|#include "sdp_client.h"|#include "classic/sdp_client.h"\n#include "btstack_event.h"|g
s|"sdp_parser.h"|"classic/sdp_client.h"|g s|"sdp_parser.h"|"classic/sdp_client.h"|g
s|"sdp_query_rfcomm.h"|"classic/sdp_query_rfcomm.h"|g s|"sdp_query_rfcomm.h"|"classic/sdp_query_rfcomm.h"|g
s|#include "sdp_query_util.h"|// sdp_query_util doens not exist anymore|g s|#include "sdp_query_util.h"|// sdp_query_util doens not exist anymore|g