external/bluetooth/bluez
Revision | a9c504ad234184ee350e9d34ad326385e0ca3c8b (tree) |
---|---|
Time | 2017-06-01 12:28:29 |
Author | Jaap Jan Meijer <jjmeijer88@gmai...> |
Commiter | Chih-Wei Huang |
android: cm: update interfaces for CM 13.0 (6.0.1 r52)
@@ -78,23 +78,40 @@ static void remote_features_cb(bt_bdaddr_t *bd_addr, | ||
78 | 78 | bt_bdaddr_t2str(bd_addr, last_addr), features); |
79 | 79 | } |
80 | 80 | |
81 | +#if CM_ANDROID_VERSION >= PLATFORM_VER(13, 0, 0) | |
82 | +static void get_play_status_cb(bt_bdaddr_t *bd_addr) | |
83 | +#else | |
81 | 84 | static void get_play_status_cb(void) |
85 | +#endif | |
82 | 86 | { |
83 | 87 | haltest_info("%s\n", __func__); |
84 | 88 | } |
85 | 89 | |
90 | +#if CM_ANDROID_VERSION >= PLATFORM_VER(13, 0, 0) | |
91 | +static void list_player_app_attr_cb(bt_bdaddr_t *bd_addr) | |
92 | +#else | |
86 | 93 | static void list_player_app_attr_cb(void) |
94 | +#endif | |
87 | 95 | { |
88 | 96 | haltest_info("%s\n", __func__); |
89 | 97 | } |
90 | 98 | |
99 | +#if CM_ANDROID_VERSION >= PLATFORM_VER(13, 0, 0) | |
100 | +static void list_player_app_values_cb(btrc_player_attr_t attr_id, bt_bdaddr_t *bd_addr) | |
101 | +#else | |
91 | 102 | static void list_player_app_values_cb(btrc_player_attr_t attr_id) |
103 | +#endif | |
92 | 104 | { |
93 | 105 | haltest_info("%s, attr_id=%d\n", __func__, attr_id); |
94 | 106 | } |
95 | 107 | |
108 | +#if CM_ANDROID_VERSION >= PLATFORM_VER(13, 0, 0) | |
109 | +static void get_player_app_value_cb(uint8_t num_attr, btrc_player_attr_t *p_attrs, | |
110 | + bt_bdaddr_t *bd_addr) | |
111 | +#else | |
96 | 112 | static void get_player_app_value_cb(uint8_t num_attr, |
97 | 113 | btrc_player_attr_t *p_attrs) |
114 | +#endif | |
98 | 115 | { |
99 | 116 | int i; |
100 | 117 |
@@ -104,8 +121,13 @@ static void get_player_app_value_cb(uint8_t num_attr, | ||
104 | 121 | haltest_info("attribute=%u\n", p_attrs[i]); |
105 | 122 | } |
106 | 123 | |
124 | +#if CM_ANDROID_VERSION >= PLATFORM_VER(13, 0, 0) | |
125 | +static void get_player_app_attrs_text_cb(uint8_t num_attr, | |
126 | + btrc_player_attr_t *p_attrs, bt_bdaddr_t *bd_addr) | |
127 | +#else | |
107 | 128 | static void get_player_app_attrs_text_cb(uint8_t num_attr, |
108 | 129 | btrc_player_attr_t *p_attrs) |
130 | +#endif | |
109 | 131 | { |
110 | 132 | int i; |
111 | 133 |
@@ -116,14 +138,24 @@ static void get_player_app_attrs_text_cb(uint8_t num_attr, | ||
116 | 138 | |
117 | 139 | } |
118 | 140 | |
141 | +#if CM_ANDROID_VERSION >= PLATFORM_VER(13, 0, 0) | |
142 | +static void get_player_app_values_text_cb(uint8_t attr_id, | |
143 | + uint8_t num_val, uint8_t *p_vals, | |
144 | + bt_bdaddr_t *bd_addr) | |
145 | +#else | |
119 | 146 | static void get_player_app_values_text_cb(uint8_t attr_id, uint8_t num_val, |
120 | 147 | uint8_t *p_vals) |
148 | +#endif | |
121 | 149 | { |
122 | 150 | haltest_info("%s, attr_id=%d num_val=%d values=%p\n", __func__, |
123 | 151 | attr_id, num_val, p_vals); |
124 | 152 | } |
125 | 153 | |
154 | +#if CM_ANDROID_VERSION >= PLATFORM_VER(13, 0, 0) | |
155 | +static void set_player_app_value_cb(btrc_player_settings_t *p_vals, bt_bdaddr_t *bd_addr) | |
156 | +#else | |
126 | 157 | static void set_player_app_value_cb(btrc_player_settings_t *p_vals) |
158 | +#endif | |
127 | 159 | { |
128 | 160 | int i; |
129 | 161 |
@@ -134,7 +166,12 @@ static void set_player_app_value_cb(btrc_player_settings_t *p_vals) | ||
134 | 166 | p_vals->attr_values[i]); |
135 | 167 | } |
136 | 168 | |
169 | +#if CM_ANDROID_VERSION >= PLATFORM_VER(13, 0, 0) | |
170 | +static void get_element_attr_cb(uint8_t num_attr, btrc_media_attr_t *attrs, | |
171 | + bt_bdaddr_t *bd_addr) | |
172 | +#else | |
137 | 173 | static void get_element_attr_cb(uint8_t num_attr, btrc_media_attr_t *attrs) |
174 | +#endif | |
138 | 175 | { |
139 | 176 | uint8_t i; |
140 | 177 |
@@ -144,17 +181,30 @@ static void get_element_attr_cb(uint8_t num_attr, btrc_media_attr_t *attrs) | ||
144 | 181 | haltest_info("attr id=%s\n", btrc_media_attr_t2str(attrs[i])); |
145 | 182 | } |
146 | 183 | |
184 | +#if CM_ANDROID_VERSION >= PLATFORM_VER(13, 0, 0) | |
185 | +static void register_notification_cb(btrc_event_id_t event_id, uint32_t param, | |
186 | + bt_bdaddr_t *bd_addr) | |
187 | +#else | |
147 | 188 | static void register_notification_cb(btrc_event_id_t event_id, uint32_t param) |
189 | +#endif | |
148 | 190 | { |
149 | 191 | haltest_info("%s, event=%u param=%u\n", __func__, event_id, param); |
150 | 192 | } |
151 | 193 | |
194 | +#if CM_ANDROID_VERSION >= PLATFORM_VER(13, 0, 0) | |
195 | +static void volume_change_cb(uint8_t volume, uint8_t ctype, bt_bdaddr_t *bd_addr) | |
196 | +#else | |
152 | 197 | static void volume_change_cb(uint8_t volume, uint8_t ctype) |
198 | +#endif | |
153 | 199 | { |
154 | 200 | haltest_info("%s, volume=%d ctype=%d\n", __func__, volume, ctype); |
155 | 201 | } |
156 | 202 | |
203 | +#if CM_ANDROID_VERSION >= PLATFORM_VER(13, 0, 0) | |
204 | +static void passthrough_cmd_cb(int id, int key_state, bt_bdaddr_t *bd_addr) | |
205 | +#else | |
157 | 206 | static void passthrough_cmd_cb(int id, int key_state) |
207 | +#endif | |
158 | 208 | { |
159 | 209 | haltest_info("%s, id=%d key_state=%d\n", __func__, id, key_state); |
160 | 210 | } |
@@ -198,7 +248,11 @@ static void get_play_status_rsp_c(int argc, const char **argv, | ||
198 | 248 | } |
199 | 249 | } |
200 | 250 | |
251 | +#if CM_ANDROID_VERSION >= PLATFORM_VER(13, 0, 0) | |
252 | +static void get_play_status_rsp_p(uint8_t argc, const char **argv) | |
253 | +#else | |
201 | 254 | static void get_play_status_rsp_p(int argc, const char **argv) |
255 | +#endif | |
202 | 256 | { |
203 | 257 | btrc_play_status_t play_status; |
204 | 258 | uint32_t song_len, song_pos; |
@@ -373,6 +427,11 @@ static void register_notification_rsp_p(int argc, const char **argv) | ||
373 | 427 | memcpy(®.song_pos, &song_pos, sizeof(uint32_t)); |
374 | 428 | break; |
375 | 429 | |
430 | +#if CM_ANDROID_VERSION >= PLATFORM_VER(13, 0, 0) | |
431 | + case BTRC_EVT_ADDRESSED_PLAYER_CHANGED: | |
432 | + case BTRC_EVT_AVAILABLE_PLAYERS_CHANGED: | |
433 | + case BTRC_EVT_NOW_PLAYING_CONTENT_CHANGED: | |
434 | +#endif | |
376 | 435 | case BTRC_EVT_APP_SETTINGS_CHANGED: |
377 | 436 | haltest_error("not supported"); |
378 | 437 | return; |
@@ -396,6 +455,9 @@ static void cleanup_p(int argc, const char **argv) | ||
396 | 455 | |
397 | 456 | static struct method methods[] = { |
398 | 457 | STD_METHOD(init), |
458 | +#if CM_ANDROID_VERSION >= PLATFORM_VER(13, 0, 0) | |
459 | + //TODO | |
460 | +#else | |
399 | 461 | STD_METHODCH(get_play_status_rsp, |
400 | 462 | "<play_status> <song_len> <song_pos>"), |
401 | 463 | STD_METHODCH(get_element_attr_rsp, "<num_attr> <attrs_id> <value>"), |
@@ -408,6 +470,7 @@ static struct method methods[] = { | ||
408 | 470 | "BTRC_EVT_TRACK_REACHED_END <type>\n" |
409 | 471 | "BTRC_EVT_TRACK_REACHED_START <type>\n" |
410 | 472 | "BTRC_EVT_PLAY_POS_CHANGED <type> <song_pos>\n"), |
473 | +#endif | |
411 | 474 | STD_METHOD(cleanup), |
412 | 475 | END_METHOD |
413 | 476 | }; |
@@ -100,7 +100,12 @@ static bt_status_t disconnect(bt_bdaddr_t *bd_addr) | ||
100 | 100 | sizeof(cmd), &cmd, NULL, NULL, NULL); |
101 | 101 | } |
102 | 102 | |
103 | +#if CM_ANDROID_VERSION >= PLATFORM_VER(13, 0, 0) | |
104 | +static bt_status_t init(btav_callbacks_t *callbacks, | |
105 | + int max_a2dp_connections, int a2dp_multicast_state) | |
106 | +#else | |
103 | 107 | static bt_status_t init(btav_callbacks_t *callbacks) |
108 | +#endif | |
104 | 109 | { |
105 | 110 | struct hal_cmd_register_module cmd; |
106 | 111 | int ret; |
@@ -102,7 +102,12 @@ static bt_status_t disconnect(bt_bdaddr_t *bd_addr) | ||
102 | 102 | sizeof(cmd), &cmd, NULL, NULL, NULL); |
103 | 103 | } |
104 | 104 | |
105 | +#if CM_ANDROID_VERSION >= PLATFORM_VER(13, 0, 0) | |
106 | +static bt_status_t init(btav_callbacks_t *callbacks, | |
107 | + int max_a2dp_connections, int a2dp_multicast_state) | |
108 | +#else | |
105 | 109 | static bt_status_t init(btav_callbacks_t *callbacks) |
110 | +#endif | |
106 | 111 | { |
107 | 112 | struct hal_cmd_register_module cmd; |
108 | 113 | int ret; |
@@ -306,7 +306,7 @@ static bt_status_t get_play_status_rsp(btrc_play_status_t status, | ||
306 | 306 | } |
307 | 307 | |
308 | 308 | #if CM_ANDROID_VERSION >= PLATFORM_VER(13, 0, 0) |
309 | -static bt_status_t list_player_app_attr_rsp(int num_attr, | |
309 | +static bt_status_t list_player_app_attr_rsp(uint8_t num_attr, | |
310 | 310 | btrc_player_attr_t *p_attrs, |
311 | 311 | bt_bdaddr_t *bd_addr) |
312 | 312 | #else |
@@ -323,8 +323,13 @@ static bt_status_t list_player_app_attr_rsp(int num_attr, | ||
323 | 323 | if (!interface_ready()) |
324 | 324 | return BT_STATUS_NOT_READY; |
325 | 325 | |
326 | +#if CM_ANDROID_VERSION >= PLATFORM_VER(13, 0, 0) | |
327 | + if (num_attr < 1) | |
328 | + return BT_STATUS_PARM_INVALID; | |
329 | +#else | |
326 | 330 | if (num_attr < 0) |
327 | 331 | return BT_STATUS_PARM_INVALID; |
332 | +#endif | |
328 | 333 | |
329 | 334 | len = sizeof(*cmd) + num_attr; |
330 | 335 | if (len > IPC_MTU) |
@@ -339,7 +344,7 @@ static bt_status_t list_player_app_attr_rsp(int num_attr, | ||
339 | 344 | } |
340 | 345 | |
341 | 346 | #if CM_ANDROID_VERSION >= PLATFORM_VER(13, 0, 0) |
342 | -static bt_status_t list_player_app_value_rsp(int num_val, uint8_t *p_vals, | |
347 | +static bt_status_t list_player_app_value_rsp(uint8_t num_val, uint8_t *p_vals, | |
343 | 348 | bt_bdaddr_t *bd_addr) |
344 | 349 | #else |
345 | 350 | static bt_status_t list_player_app_value_rsp(int num_val, uint8_t *p_vals) |
@@ -354,8 +359,13 @@ static bt_status_t list_player_app_value_rsp(int num_val, uint8_t *p_vals) | ||
354 | 359 | if (!interface_ready()) |
355 | 360 | return BT_STATUS_NOT_READY; |
356 | 361 | |
362 | +#if CM_ANDROID_VERSION >= PLATFORM_VER(13, 0, 0) | |
363 | + if (num_val < 1) | |
364 | + return BT_STATUS_PARM_INVALID; | |
365 | +#else | |
357 | 366 | if (num_val < 0) |
358 | 367 | return BT_STATUS_PARM_INVALID; |
368 | +#endif | |
359 | 369 | |
360 | 370 | len = sizeof(*cmd) + num_val; |
361 | 371 |