OSDN -- 오픈 소스 소프트웨어 개발 및 다운로드
Translation Status of 한국말 translation status for ko

Android-x86
Fork
Donation

  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

external-bluetooth-bluez: Commit

external/bluetooth/bluez


Commit MetaInfo

Revisiona9c504ad234184ee350e9d34ad326385e0ca3c8b (tree)
Time2017-06-01 12:28:29
AuthorJaap Jan Meijer <jjmeijer88@gmai...>
CommiterChih-Wei Huang

Log Message

android: cm: update interfaces for CM 13.0 (6.0.1 r52)

Change Summary

Incremental Difference

--- a/android/client/if-rc.c
+++ b/android/client/if-rc.c
@@ -78,23 +78,40 @@ static void remote_features_cb(bt_bdaddr_t *bd_addr,
7878 bt_bdaddr_t2str(bd_addr, last_addr), features);
7979 }
8080
81+#if CM_ANDROID_VERSION >= PLATFORM_VER(13, 0, 0)
82+static void get_play_status_cb(bt_bdaddr_t *bd_addr)
83+#else
8184 static void get_play_status_cb(void)
85+#endif
8286 {
8387 haltest_info("%s\n", __func__);
8488 }
8589
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
8693 static void list_player_app_attr_cb(void)
94+#endif
8795 {
8896 haltest_info("%s\n", __func__);
8997 }
9098
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
91102 static void list_player_app_values_cb(btrc_player_attr_t attr_id)
103+#endif
92104 {
93105 haltest_info("%s, attr_id=%d\n", __func__, attr_id);
94106 }
95107
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
96112 static void get_player_app_value_cb(uint8_t num_attr,
97113 btrc_player_attr_t *p_attrs)
114+#endif
98115 {
99116 int i;
100117
@@ -104,8 +121,13 @@ static void get_player_app_value_cb(uint8_t num_attr,
104121 haltest_info("attribute=%u\n", p_attrs[i]);
105122 }
106123
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
107128 static void get_player_app_attrs_text_cb(uint8_t num_attr,
108129 btrc_player_attr_t *p_attrs)
130+#endif
109131 {
110132 int i;
111133
@@ -116,14 +138,24 @@ static void get_player_app_attrs_text_cb(uint8_t num_attr,
116138
117139 }
118140
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
119146 static void get_player_app_values_text_cb(uint8_t attr_id, uint8_t num_val,
120147 uint8_t *p_vals)
148+#endif
121149 {
122150 haltest_info("%s, attr_id=%d num_val=%d values=%p\n", __func__,
123151 attr_id, num_val, p_vals);
124152 }
125153
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
126157 static void set_player_app_value_cb(btrc_player_settings_t *p_vals)
158+#endif
127159 {
128160 int i;
129161
@@ -134,7 +166,12 @@ static void set_player_app_value_cb(btrc_player_settings_t *p_vals)
134166 p_vals->attr_values[i]);
135167 }
136168
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
137173 static void get_element_attr_cb(uint8_t num_attr, btrc_media_attr_t *attrs)
174+#endif
138175 {
139176 uint8_t i;
140177
@@ -144,17 +181,30 @@ static void get_element_attr_cb(uint8_t num_attr, btrc_media_attr_t *attrs)
144181 haltest_info("attr id=%s\n", btrc_media_attr_t2str(attrs[i]));
145182 }
146183
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
147188 static void register_notification_cb(btrc_event_id_t event_id, uint32_t param)
189+#endif
148190 {
149191 haltest_info("%s, event=%u param=%u\n", __func__, event_id, param);
150192 }
151193
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
152197 static void volume_change_cb(uint8_t volume, uint8_t ctype)
198+#endif
153199 {
154200 haltest_info("%s, volume=%d ctype=%d\n", __func__, volume, ctype);
155201 }
156202
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
157206 static void passthrough_cmd_cb(int id, int key_state)
207+#endif
158208 {
159209 haltest_info("%s, id=%d key_state=%d\n", __func__, id, key_state);
160210 }
@@ -198,7 +248,11 @@ static void get_play_status_rsp_c(int argc, const char **argv,
198248 }
199249 }
200250
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
201254 static void get_play_status_rsp_p(int argc, const char **argv)
255+#endif
202256 {
203257 btrc_play_status_t play_status;
204258 uint32_t song_len, song_pos;
@@ -373,6 +427,11 @@ static void register_notification_rsp_p(int argc, const char **argv)
373427 memcpy(&reg.song_pos, &song_pos, sizeof(uint32_t));
374428 break;
375429
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
376435 case BTRC_EVT_APP_SETTINGS_CHANGED:
377436 haltest_error("not supported");
378437 return;
@@ -396,6 +455,9 @@ static void cleanup_p(int argc, const char **argv)
396455
397456 static struct method methods[] = {
398457 STD_METHOD(init),
458+#if CM_ANDROID_VERSION >= PLATFORM_VER(13, 0, 0)
459+ //TODO
460+#else
399461 STD_METHODCH(get_play_status_rsp,
400462 "<play_status> <song_len> <song_pos>"),
401463 STD_METHODCH(get_element_attr_rsp, "<num_attr> <attrs_id> <value>"),
@@ -408,6 +470,7 @@ static struct method methods[] = {
408470 "BTRC_EVT_TRACK_REACHED_END <type>\n"
409471 "BTRC_EVT_TRACK_REACHED_START <type>\n"
410472 "BTRC_EVT_PLAY_POS_CHANGED <type> <song_pos>\n"),
473+#endif
411474 STD_METHOD(cleanup),
412475 END_METHOD
413476 };
--- a/android/hal-a2dp-sink.c
+++ b/android/hal-a2dp-sink.c
@@ -100,7 +100,12 @@ static bt_status_t disconnect(bt_bdaddr_t *bd_addr)
100100 sizeof(cmd), &cmd, NULL, NULL, NULL);
101101 }
102102
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
103107 static bt_status_t init(btav_callbacks_t *callbacks)
108+#endif
104109 {
105110 struct hal_cmd_register_module cmd;
106111 int ret;
--- a/android/hal-a2dp.c
+++ b/android/hal-a2dp.c
@@ -102,7 +102,12 @@ static bt_status_t disconnect(bt_bdaddr_t *bd_addr)
102102 sizeof(cmd), &cmd, NULL, NULL, NULL);
103103 }
104104
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
105109 static bt_status_t init(btav_callbacks_t *callbacks)
110+#endif
106111 {
107112 struct hal_cmd_register_module cmd;
108113 int ret;
--- a/android/hal-avrcp.c
+++ b/android/hal-avrcp.c
@@ -306,7 +306,7 @@ static bt_status_t get_play_status_rsp(btrc_play_status_t status,
306306 }
307307
308308 #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,
310310 btrc_player_attr_t *p_attrs,
311311 bt_bdaddr_t *bd_addr)
312312 #else
@@ -323,8 +323,13 @@ static bt_status_t list_player_app_attr_rsp(int num_attr,
323323 if (!interface_ready())
324324 return BT_STATUS_NOT_READY;
325325
326+#if CM_ANDROID_VERSION >= PLATFORM_VER(13, 0, 0)
327+ if (num_attr < 1)
328+ return BT_STATUS_PARM_INVALID;
329+#else
326330 if (num_attr < 0)
327331 return BT_STATUS_PARM_INVALID;
332+#endif
328333
329334 len = sizeof(*cmd) + num_attr;
330335 if (len > IPC_MTU)
@@ -339,7 +344,7 @@ static bt_status_t list_player_app_attr_rsp(int num_attr,
339344 }
340345
341346 #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,
343348 bt_bdaddr_t *bd_addr)
344349 #else
345350 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)
354359 if (!interface_ready())
355360 return BT_STATUS_NOT_READY;
356361
362+#if CM_ANDROID_VERSION >= PLATFORM_VER(13, 0, 0)
363+ if (num_val < 1)
364+ return BT_STATUS_PARM_INVALID;
365+#else
357366 if (num_val < 0)
358367 return BT_STATUS_PARM_INVALID;
368+#endif
359369
360370 len = sizeof(*cmd) + num_val;
361371
Show on old repository browser