From: DoHyun Pyun Date: Mon, 21 Nov 2016 05:46:12 +0000 (+0900) Subject: Modify build feature names as Tizen 3.0 build option naming rule X-Git-Tag: accepted/tizen/common/20161122.193043^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F80%2F98880%2F1;p=platform%2Fupstream%2Fbluez.git Modify build feature names as Tizen 3.0 build option naming rule Change-Id: Id474f0db7668bbc4a0d8a4cdafa77fbd4b941a3c Signed-off-by: DoHyun Pyun --- diff --git a/attrib/att.c b/attrib/att.c index 4d39de1..fef602c 100644 --- a/attrib/att.c +++ b/attrib/att.c @@ -129,7 +129,7 @@ struct att_data_list *att_data_list_alloc(uint16_t num, uint16_t len) return list; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY void get_uuid(uint8_t type, const void *val, bt_uuid_t *uuid) #else static void get_uuid(uint8_t type, const void *val, bt_uuid_t *uuid) @@ -137,7 +137,7 @@ static void get_uuid(uint8_t type, const void *val, bt_uuid_t *uuid) { if (type == BT_UUID16) bt_uuid16_create(uuid, get_le16(val)); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY else if (type == BT_UUID32) bt_uuid32_create(uuid, get_le32(val)); #endif @@ -160,7 +160,7 @@ uint16_t enc_read_by_grp_req(uint16_t start, uint16_t end, bt_uuid_t *uuid, if (uuid->type == BT_UUID16) uuid_len = 2; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY else if (uuid->type == BT_UUID32) uuid_len = 4; #endif @@ -198,7 +198,7 @@ uint16_t dec_read_by_grp_req(const uint8_t *pdu, size_t len, uint16_t *start, if (len == (min_len + 2)) type = BT_UUID16; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY else if (len == (min_len + 4)) type = BT_UUID32; #endif diff --git a/attrib/att.h b/attrib/att.h index e80aeda..c32f9ff 100644 --- a/attrib/att.h +++ b/attrib/att.h @@ -106,7 +106,7 @@ struct att_range { uint16_t end; }; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY void get_uuid(uint8_t type, const void *val, bt_uuid_t *uuid); static inline bt_uuid_t att_get_uuid(const void *ptr, uint8_t len) diff --git a/attrib/gatt-service.c b/attrib/gatt-service.c index 2cca42f..e434d3b 100644 --- a/attrib/gatt-service.c +++ b/attrib/gatt-service.c @@ -81,7 +81,7 @@ static GSList *parse_opts(gatt_option opt1, va_list args) while (opt != GATT_OPT_INVALID) { switch (opt) { case GATT_OPT_CHR_UUID16: -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY case GATT_OPT_DESC_UUID16: #endif bt_uuid16_create(&info->uuid, va_arg(args, int)); @@ -89,7 +89,7 @@ static GSList *parse_opts(gatt_option opt1, va_list args) info->num_attrs += 2; break; case GATT_OPT_CHR_UUID: -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY case GATT_OPT_DESC_UUID: #endif memcpy(&info->uuid, va_arg(args, bt_uuid_t *), @@ -98,7 +98,7 @@ static GSList *parse_opts(gatt_option opt1, va_list args) info->num_attrs += 2; break; case GATT_OPT_CHR_PROPS: -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY case GATT_OPT_DESC_PROPS: #endif info->props = va_arg(args, int); @@ -112,7 +112,7 @@ static GSList *parse_opts(gatt_option opt1, va_list args) * descriptor, but it is not supported yet. */ break; case GATT_OPT_CHR_VALUE_CB: -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY case GATT_OPT_DESC_VALUE_CB: #endif cb = g_new0(struct attrib_cb, 1); @@ -142,7 +142,7 @@ static GSList *parse_opts(gatt_option opt1, va_list args) } opt = va_arg(args, gatt_option); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (opt == GATT_OPT_CHR_UUID16 || opt == GATT_OPT_CHR_UUID || opt == GATT_OPT_DESC_UUID16 || opt == GATT_OPT_DESC_UUID) { #else @@ -285,7 +285,7 @@ static gboolean add_characteristic(struct btd_adapter *adapter, if (info->value_handle != NULL) *info->value_handle = a->handle; -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY /* Since old attrib service implementation add descriptor by default * if notification and indication properties are set, As per new gatt server implemenation * CCCD are added by the application*/ diff --git a/attrib/gatt-service.h b/attrib/gatt-service.h index d6c61e2..5a8ac38 100644 --- a/attrib/gatt-service.h +++ b/attrib/gatt-service.h @@ -31,7 +31,7 @@ typedef enum { /* a uint16 value */ GATT_OPT_CHR_UUID16, -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY /* bt_uuid_t* value */ GATT_OPT_DESC_UUID, @@ -41,7 +41,7 @@ typedef enum { GATT_OPT_CHR_PROPS, GATT_OPT_CHR_VALUE_CB, -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY GATT_OPT_DESC_PROPS, GATT_OPT_DESC_VALUE_CB, #endif diff --git a/attrib/gatt.c b/attrib/gatt.c index b9596c4..72457ce 100644 --- a/attrib/gatt.c +++ b/attrib/gatt.c @@ -185,7 +185,7 @@ static void put_uuid_le(const bt_uuid_t *uuid, void *dst) { if (uuid->type == BT_UUID16) put_le16(uuid->value.u16, dst); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY else if (uuid->type == BT_UUID32) put_le32(uuid->value.u32, dst); #endif @@ -201,7 +201,7 @@ static void get_uuid128(uint8_t type, const void *val, bt_uuid_t *uuid) bt_uuid16_create(&uuid16, get_le16(val)); bt_uuid_to_uuid128(&uuid16, uuid); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY } else if (type == BT_UUID32) { bt_uuid_t uuid32; @@ -852,7 +852,7 @@ done: long_read->func(status, rpdu, rlen, long_read->user_data); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY guint gatt_read_char_by_offset(GAttrib *attrib, uint16_t handle, uint16_t offset, GAttribResultFunc func, gpointer user_data) { diff --git a/attrib/gatt.h b/attrib/gatt.h index ca9650d..0d998c9 100644 --- a/attrib/gatt.h +++ b/attrib/gatt.h @@ -121,7 +121,7 @@ gboolean gatt_parse_record(const sdp_record_t *rec, uuid_t *prim_uuid, uint16_t *psm, uint16_t *start, uint16_t *end); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY guint gatt_read_char_by_offset(GAttrib *attrib, uint16_t handle, uint16_t offset, GAttribResultFunc func, gpointer user_data); #endif diff --git a/attrib/interactive.c b/attrib/interactive.c index 20cb58f..62a25fa 100644 --- a/attrib/interactive.c +++ b/attrib/interactive.c @@ -559,7 +559,7 @@ static void cmd_char_desc(int argcp, char **argvp) static void cmd_read_hnd(int argcp, char **argvp) { int handle; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY int offset = 0; #endif if (conn_state != STATE_CONNECTED) { @@ -577,7 +577,7 @@ static void cmd_read_hnd(int argcp, char **argvp) error("Invalid handle: %s\n", argvp[1]); return; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (argcp > 2) { offset = strtohandle(argvp[2]); if (offset < 0) { @@ -808,7 +808,7 @@ static struct { "Characteristics Discovery" }, { "char-desc", cmd_char_desc, "[start hnd] [end hnd]", "Characteristics Descriptor Discovery" }, -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY { "char-read-hnd", cmd_read_hnd, " [offset]", "Characteristics Value/Descriptor Read by handle" }, #else diff --git a/client/main.c b/client/main.c index 6cc9740..a39fba7 100644 --- a/client/main.c +++ b/client/main.c @@ -657,7 +657,7 @@ static void cmd_show(const char *arg) print_uuids(proxy); print_property(proxy, "Modalias"); print_property(proxy, "Discovering"); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY print_property(proxy, "Advertising"); #endif } @@ -1169,7 +1169,7 @@ static void cmd_info(const char *arg) print_property(proxy, "LegacyPairing"); print_uuids(proxy); print_property(proxy, "Modalias"); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY print_property(proxy, "ManufacturerDataLen"); #endif print_property(proxy, "ManufacturerData"); diff --git a/doc/adapter-api.txt b/doc/adapter-api.txt index 0eeb0cc..4208e40 100644 --- a/doc/adapter-api.txt +++ b/doc/adapter-api.txt @@ -105,7 +105,7 @@ Methods void StartDiscovery() org.bluez.Error.NotSupported org.bluez.Error.Failed -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY void StartCustomDiscovery(string pattern) This method starts the device discovery session with @@ -368,7 +368,7 @@ Properties string Address [readonly] Local Device ID information in modalias format used by the kernel and udev. -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY boolean LEDiscovering [readonly] Indicates that a device LE discovery procedure is active. diff --git a/doc/device-api.txt b/doc/device-api.txt index 8141244..69c854e 100644 --- a/doc/device-api.txt +++ b/doc/device-api.txt @@ -67,7 +67,7 @@ Methods void Connect() org.bluez.Error.InvalidArguments org.bluez.Error.NotSupported -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY void Pair(uint8 conn_type) #else void Pair() @@ -89,7 +89,7 @@ Methods void Connect() In case there is no application agent and also no default agent present, this method will fail. -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY conn_type represents the type of the connection to be used for pairing. 0xFF -> BR/EDR and LE @@ -114,7 +114,7 @@ Methods void Connect() Possible errors: org.bluez.Error.DoesNotExist org.bluez.Error.Failed -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY void ConnectLe() This is a generic method to connect GATT of @@ -175,7 +175,7 @@ Properties string Address [readonly] Indicates if the remote device is paired. -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY byte Connected [readonly] #else boolean Connected [readonly] @@ -259,7 +259,7 @@ Properties string Address [readonly] updated once all remote GATT services of this device have been discovered and exported over D-Bus. -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY boolean GattConnected [readonly] Indicates if the remote LE device is currently connected. diff --git a/doc/gatt-api.txt b/doc/gatt-api.txt index d366bd1..7c4fff5 100644 --- a/doc/gatt-api.txt +++ b/doc/gatt-api.txt @@ -161,7 +161,7 @@ Properties string UUID [read-only] descriptor objects will become available via ObjectManager as soon as they get discovered. -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY string Unicast [read-only] 12:34:56:78:9A:BC remote device address, if address is set then @@ -360,7 +360,7 @@ Methods void RegisterApplication(object application, dict options) Possible errors: org.bluez.Error.InvalidArguments org.bluez.Error.DoesNotExist -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY GetService(string uuid) This Reads the service, characterstics and descriptors diff --git a/doc/mgmt-api.txt b/doc/mgmt-api.txt index b27990d..0d94f8b 100644 --- a/doc/mgmt-api.txt +++ b/doc/mgmt-api.txt @@ -1893,7 +1893,7 @@ Load Identity Resolving Keys Command Possible errors: Invalid Parameters Invalid Index -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY Generate Identity Resolving Key Command ======================================= diff --git a/doc/network-api.txt b/doc/network-api.txt index 4d31a02..0fb633c 100644 --- a/doc/network-api.txt +++ b/doc/network-api.txt @@ -75,7 +75,7 @@ Methods void Register(string uuid, string bridge) All servers will be automatically unregistered when the calling application terminates. -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY void Disconnect(string address) Disconnect the device from the network device. diff --git a/doc/profile-api.txt b/doc/profile-api.txt index 0e371b5..60eee2b 100644 --- a/doc/profile-api.txt +++ b/doc/profile-api.txt @@ -91,7 +91,7 @@ Object path /org/bluez Possible errors: org.bluez.Error.InvalidArguments org.bluez.Error.AlreadyExists -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY void RegisterProfile2(object profile, string uuid, string destination, string path,dict options) diff --git a/doc/settings-storage.txt b/doc/settings-storage.txt index a5f0eda..5b7bb1f 100644 --- a/doc/settings-storage.txt +++ b/doc/settings-storage.txt @@ -81,7 +81,7 @@ Settings file contains one [General] group with adapter info like: 0 = disable timer, i.e. stay discoverable forever -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY LocalIrk String Identity resolving key for local adapter. This key value is used to generate the RPA to suport privacy feature. @@ -95,7 +95,7 @@ Sample: Discoverable=false Pairable=true DiscoverableTimeout=0 -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY LocalIrk="" #endif @@ -293,7 +293,7 @@ Long term key) related to a remote device. Authenticated Boolean True if the key is authenticated -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY [IdentityResolvingKey] group contains: Key String Identity Resolving key in hexadecimal format diff --git a/gdbus/object.c b/gdbus/object.c index 1ae45d6..ba5e4fd 100644 --- a/gdbus/object.c +++ b/gdbus/object.c @@ -33,7 +33,7 @@ #include "gdbus.h" -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY #if 0 #include static void gdbus_dbg(const char *format, ...) @@ -105,7 +105,7 @@ static int global_flags = 0; static struct generic_data *root; static GSList *pending = NULL; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY #define ADAPTER_INTERFACE "org.bluez.Adapter1" static char *adapter_path = NULL; @@ -678,7 +678,7 @@ static gboolean remove_interface(struct generic_data *data, const char *name) data->interfaces = g_slist_remove(data->interfaces, iface); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (g_strcmp0(iface->name, ADAPTER_INTERFACE) == 0) { g_free(adapter_path); adapter_path = NULL; @@ -1097,7 +1097,7 @@ static DBusHandlerResult generic_message(DBusConnection *connection, if (check_privilege(connection, message, method, iface->user_data) == TRUE) return DBUS_HANDLER_RESULT_HANDLED; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY #if 0 gdbus_dbg("%s: %s.%s()", dbus_message_get_path(message), iface->name, method->name); @@ -1192,7 +1192,7 @@ static DBusMessage *get_objects(DBusConnection *connection, return reply; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static DBusMessage *default_adapter(DBusConnection *conn, DBusMessage *msg, void *data) { @@ -1217,7 +1217,7 @@ static DBusMessage *default_adapter(DBusConnection *conn, static const GDBusMethodTable manager_methods[] = { { GDBUS_METHOD("GetManagedObjects", NULL, GDBUS_ARGS({ "objects", "a{oa{sa{sv}}}" }), get_objects) }, -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY { GDBUS_METHOD("DefaultAdapter", NULL, GDBUS_ARGS({ "adapter", "o" }), default_adapter) }, @@ -1409,7 +1409,7 @@ gboolean g_dbus_register_interface(DBusConnection *connection, return FALSE; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (g_strcmp0(name, ADAPTER_INTERFACE) == 0) adapter_path = g_strdup(path); #endif diff --git a/gobex/gobex-apparam.c b/gobex/gobex-apparam.c index 7ba8ca6..6f7a952 100644 --- a/gobex/gobex-apparam.c +++ b/gobex/gobex-apparam.c @@ -104,10 +104,10 @@ GObexApparam *g_obex_apparam_decode(const void *data, gsize size) GHashTable *tags; gsize count = 0; -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY if (size < 2) return NULL; -#endif /* __TIZEN_PATCH__ */ +#endif /* TIZEN_FEATURE_BLUEZ_MODIFY */ apparam = g_obex_apparam_new(); @@ -168,7 +168,7 @@ gssize g_obex_apparam_encode(GObexApparam *apparam, void *buf, gsize len) return count; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY void g_obex_apparam_remove_all(GObexApparam *apparam) { g_hash_table_remove_all(apparam->tags); diff --git a/gobex/gobex-apparam.h b/gobex/gobex-apparam.h index 7c55988..701fd43 100644 --- a/gobex/gobex-apparam.h +++ b/gobex/gobex-apparam.h @@ -30,7 +30,7 @@ typedef struct _GObexApparam GObexApparam; GObexApparam *g_obex_apparam_decode(const void *data, gsize size); gssize g_obex_apparam_encode(GObexApparam *apparam, void *buf, gsize size); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY void g_obex_apparam_remove_all(GObexApparam *apparam); #endif diff --git a/gobex/gobex-header.c b/gobex/gobex-header.c index e7d2292..c6634c7 100644 --- a/gobex/gobex-header.c +++ b/gobex/gobex-header.c @@ -389,7 +389,7 @@ GObexHeader *g_obex_header_new_unicode(guint8 id, const char *str) GObexHeader *header; gsize len; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY gunichar2 *utf16; glong utf16_len; #endif @@ -406,7 +406,7 @@ GObexHeader *g_obex_header_new_unicode(guint8 id, const char *str) len = g_utf8_strlen(str, -1); header->vlen = len; -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY header->hlen = len == 0 ? 3 : 3 + ((len + 1) * 2); header->v.string = g_strdup(str); #else diff --git a/gobex/gobex.c b/gobex/gobex.c index 06779ec..61ddc66 100644 --- a/gobex/gobex.c +++ b/gobex/gobex.c @@ -571,11 +571,11 @@ static guint8 *digest_response(const guint8 *nonce) return result; g_checksum_update(md5, nonce, NONCE_LEN); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY g_checksum_update(md5, (guint8 *) ":0000", 5); #else g_checksum_update(md5, (guint8 *) ":BlueZ", 6); -#endif /* __TIZEN_PATCH__ */ +#endif /* TIZEN_FEATURE_BLUEZ_MODIFY */ size = NONCE_LEN; diff --git a/lib/bluetooth.h b/lib/bluetooth.h index 3acee0f..6e198e6 100644 --- a/lib/bluetooth.h +++ b/lib/bluetooth.h @@ -119,7 +119,7 @@ struct bt_voice { #define BT_SNDMTU 12 #define BT_RCVMTU 13 -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY #define BT_LE_CONN_PARAM 14 struct le_conn_param { uint16_t min; diff --git a/lib/hci.c b/lib/hci.c index 780b967..25fce18 100644 --- a/lib/hci.c +++ b/lib/hci.c @@ -156,7 +156,7 @@ char *hci_bustostr(int bus) return "PCI"; case HCI_SDIO: return "SDIO"; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY case HCI_SMD: return "QC_SMD"; #endif @@ -592,7 +592,7 @@ static hci_map commands_map[] = { { "LE Receiver Test", 228 }, { "LE Transmitter Test", 229 }, { "LE Test End", 230 }, -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY { "LE Read Maximum Data Length", 231 }, { "Reserved", 232 }, #else @@ -1089,7 +1089,7 @@ int hci_close_dev(int dd) /* HCI functions that require open device * dd - Device descriptor returned by hci_open_dev. */ -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY int hci_send_data(int dd, uint16_t handle, uint8_t len, void *data) { uint8_t type = HCI_ACLDATA_PKT; @@ -1639,7 +1639,7 @@ int hci_write_local_name(int dd, const char *name, int to) struct hci_request rq; memset(&cp, 0, sizeof(cp)); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY strncpy((char *) cp.name, name, sizeof(cp.name) - 1); #else strncpy((char *) cp.name, name, sizeof(cp.name)); @@ -3159,7 +3159,7 @@ int hci_le_read_remote_features(int dd, uint16_t handle, uint8_t *features, int return 0; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY int hci_le_read_maximum_data_length( int dd, uint8_t *status, uint16_t *tx_octets, uint16_t *tx_time, uint16_t *rx_octets, diff --git a/lib/hci.h b/lib/hci.h index edc59c0..549bacb 100644 --- a/lib/hci.h +++ b/lib/hci.h @@ -56,7 +56,7 @@ extern "C" { #define HCI_PCI 5 #define HCI_SDIO 6 -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY #define HCI_SMD 7 #endif @@ -1710,7 +1710,7 @@ typedef struct { } __attribute__ ((packed)) le_test_end_rp; #define LE_TEST_END_RP_SIZE 3 -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY #define OCF_LE_READ_MAXIMUM_DATA_LENGTH 0x002F typedef struct { uint8_t status; @@ -1790,8 +1790,8 @@ typedef struct { /* Vendor specific commands */ #define OGF_VENDOR_CMD 0x3f -#ifdef __TIZEN_PATCH__ -#ifdef __BROADCOM_QOS_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY +#ifdef TIZEN_FEATURE_BLUEZ_BRCM_QOS #define BRCM_QOS_PRIORITY_NORMAL 0x00 #define BRCM_QOS_PRIORITY_HIGH 0xFF #define BROADCOM_QOS_CMD 0xFC57 /* Only for bcm4329/bcm4330/bcm4334 chipsets */ @@ -1800,8 +1800,8 @@ typedef struct { uint8_t priority; } __attribute__ ((__packed__)) broadcom_qos_cp; #define BROADCOM_QOS_CP_SIZE 3 -#endif /* __BROADCOM_QOS_PATCH__ */ -#endif /* __TIZEN_PATCH__ */ +#endif /* TIZEN_FEATURE_BLUEZ_BRCM_QOS */ +#endif /* TIZEN_FEATURE_BLUEZ_MODIFY */ /* ---- HCI Events ---- */ diff --git a/lib/hci_lib.h b/lib/hci_lib.h index 0febe8e..ff79599 100644 --- a/lib/hci_lib.h +++ b/lib/hci_lib.h @@ -50,7 +50,7 @@ struct hci_version { int hci_open_dev(int dev_id); int hci_close_dev(int dd); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY int hci_send_data(int dd, uint16_t handle, uint8_t len, void *data); #endif int hci_send_cmd(int dd, uint16_t ogf, uint16_t ocf, uint8_t plen, void *param); @@ -144,7 +144,7 @@ int hci_le_clear_resolving_list(int dd, int to); int hci_le_read_resolving_list_size(int dd, uint8_t *size, int to); int hci_le_set_address_resolution_enable(int dev_id, uint8_t enable, int to); int hci_le_read_remote_features(int dd, uint16_t handle, uint8_t *features, int to); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY int hci_le_read_maximum_data_length( int dd, uint8_t *status, uint16_t *tx_octets, uint16_t *tx_time, uint16_t *rx_octets, diff --git a/lib/l2cap.h b/lib/l2cap.h index 117ded8..62b8c33 100644 --- a/lib/l2cap.h +++ b/lib/l2cap.h @@ -182,7 +182,7 @@ typedef struct { } __attribute__ ((packed)) l2cap_conf_opt; #define L2CAP_CONF_OPT_SIZE 2 -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY typedef struct { uint8_t mode; uint8_t txwin_size; diff --git a/lib/mgmt.h b/lib/mgmt.h index bc80dff..bc1c696 100644 --- a/lib/mgmt.h +++ b/lib/mgmt.h @@ -875,7 +875,7 @@ static const char *mgmt_status[] = { "Permission Denied", }; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY #define TIZEN_OP_CODE_BASE 0xff00 #define TIZEN_EV_BASE 0xff00 @@ -1056,11 +1056,6 @@ struct mgmt_cp_set_dev_rpa_res_support { uint8_t res_support; } __packed; -#define MGMT_OP_SET_IRK (TIZEN_OP_CODE_BASE + 0x20) -struct mgmt_cp_set_irk { - uint8_t irk[16]; -} __packed; - /* BEGIN TIZEN_Bluetooth :: name update changes */ #define MGMT_EV_DEVICE_NAME_UPDATE (TIZEN_EV_BASE + 0x01) struct mgmt_ev_device_name_update { @@ -1166,7 +1161,7 @@ static const char *mgmt_tizen_op[] = { "LE Set Scan Parameters", "Set Voice Setting", "Get Adv Tx Power", -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY "Enable BT 6LOWPAN", "Connect BT 6LOWPAN", "Disconnect BT 6LOWPAN" @@ -1187,7 +1182,7 @@ static const char *mgmt_tizen_ev[] = { "LE Device Found", "Multi Adv State Change", }; -#endif /* End of __TIZEN_PATCH__ */ +#endif /* End of TIZEN_FEATURE_BLUEZ_MODIFY */ #ifndef NELEM #define NELEM(x) (sizeof(x) / sizeof((x)[0])) @@ -1195,7 +1190,7 @@ static const char *mgmt_tizen_ev[] = { static inline const char *mgmt_opstr(uint16_t op) { -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (op >= NELEM(mgmt_op)) { uint16_t tizen_op = op - TIZEN_OP_CODE_BASE; @@ -1215,7 +1210,7 @@ static inline const char *mgmt_opstr(uint16_t op) static inline const char *mgmt_evstr(uint16_t ev) { -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (ev >= NELEM(mgmt_ev)) { uint16_t tizen_ev = ev - TIZEN_EV_BASE; diff --git a/lib/uuid.h b/lib/uuid.h index 6ba8e12..393fbe8 100644 --- a/lib/uuid.h +++ b/lib/uuid.h @@ -30,7 +30,7 @@ extern "C" { #endif #include -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY #include #endif @@ -112,7 +112,7 @@ extern "C" { #define OBEX_MNS_UUID "00001133-0000-1000-8000-00805f9b34fb" #define OBEX_MAP_UUID "00001134-0000-1000-8000-00805f9b34fb" -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY /* Samsung Accessary Protocol UUIDs */ #define WEARABLE_OLD_SAP_UUID "a49eb41e-cb06-495c-9f4f-aa80a90cdf4a" #define WEARABLE_NEW_SAP_UUID "a49eb41e-cb06-495c-9f4f-bb80a90cdf00" @@ -139,7 +139,7 @@ extern "C" { #define GATT_CHARAC_SOFTWARE_REVISION_STRING 0x2A28 #define GATT_CHARAC_MANUFACTURER_NAME_STRING 0x2A29 #define GATT_CHARAC_PNP_ID 0x2A50 -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY #define GATT_CHARAC_CENTRAL_RPA_RESOLUTION 0x2AA6 #endif @@ -154,7 +154,7 @@ extern "C" { #define GATT_EXTERNAL_REPORT_REFERENCE 0x2907 #define GATT_REPORT_REFERENCE 0x2908 -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY /* GATT Service UUIDs : Defined by SIG */ #define GATT_IPSP_UUID 0x1820 #endif diff --git a/monitor/broadcom.c b/monitor/broadcom.c index 91a2b25..80edbeb 100644 --- a/monitor/broadcom.c +++ b/monitor/broadcom.c @@ -35,7 +35,7 @@ #include "ll.h" #include "vendor.h" #include "broadcom.h" -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY #include "uuid.h" #endif @@ -96,7 +96,7 @@ static void launch_ram_cmd(const void *data, uint8_t size) print_field("Address: 0x%8.8x", addr); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static void set_advt_param_multi_subcmd(const void *data, uint8_t size) { uint8_t adv_instance = get_u8(data + size - 2); @@ -728,7 +728,7 @@ static void read_verbose_version_info_rsp(const void *data, uint8_t size) print_field("Build number: %u (0x%4.4x)", build_num, build_num); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static void get_vendor_capabilities_rsp(const void *data, uint8_t size) { uint8_t status = get_u8(data); @@ -844,7 +844,7 @@ static const struct vendor_ocf vendor_ocf_table[] = { { 0x079, "Read Verbose Config Version Info", null_cmd, 0, true, read_verbose_version_info_rsp, 7, true }, -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY { 0x0153, "LE Get Vendor Capabilities", null_cmd, 0, true, get_vendor_capabilities_rsp, 10, false }, @@ -940,7 +940,7 @@ void broadcom_lm_diag(const void *data, uint8_t size) } } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY struct hci_vse_sec_brcm_link_loss_dbg_info{ unsigned char linklost_status; unsigned char conn_handle; @@ -990,7 +990,7 @@ static void linkloss_evt(const void *data, uint8_t size) #endif static const struct vendor_evt vendor_evt_table[] = { -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY { 0x76, "SEC Link Loss", linkloss_evt, 18, true }, #endif { } diff --git a/monitor/control.c b/monitor/control.c index 0d58ecd..8fa9ea1 100644 --- a/monitor/control.c +++ b/monitor/control.c @@ -1157,13 +1157,13 @@ void control_server(const char *path) server_fd = fd; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY bool control_writer(const char *path, int16_t rotate_count, ssize_t file_size) #else bool control_writer(const char *path) #endif { -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY btsnoop_file = btsnoop_create(path, BTSNOOP_FORMAT_MONITOR, rotate_count, file_size); #else @@ -1198,7 +1198,7 @@ void control_reader(const char *path) break; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY setenv("PAGER", "cat", 0); #endif open_pager(); diff --git a/monitor/control.h b/monitor/control.h index 87876d0..8f01056 100644 --- a/monitor/control.h +++ b/monitor/control.h @@ -24,7 +24,7 @@ #include -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY bool control_writer(const char *path, int16_t rotate_count, ssize_t file_size); #else bool control_writer(const char *path); diff --git a/monitor/display.h b/monitor/display.h index fc75b45..9216387 100644 --- a/monitor/display.h +++ b/monitor/display.h @@ -43,7 +43,7 @@ bool use_color(void); #define COLOR_INFO COLOR_OFF #define COLOR_DEBUG COLOR_WHITE -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY #define FALLBACK_TERMINAL_WIDTH 130 #else #define FALLBACK_TERMINAL_WIDTH 80 diff --git a/monitor/main.c b/monitor/main.c index 0457734..e1d133f 100644 --- a/monitor/main.c +++ b/monitor/main.c @@ -67,7 +67,7 @@ static void usage(void) "\t-T, --date Show time and date information\n" "\t-S, --sco Dump SCO traffic\n" "\t-E, --ellisys [ip] Send Ellisys HCI Injection\n" -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY "\t-C, --count Save traces by rotation\n" "\t-W, --size Save traces at most size\n" #endif @@ -85,7 +85,7 @@ static const struct option main_options[] = { { "date", no_argument, NULL, 'T' }, { "sco", no_argument, NULL, 'S' }, { "ellisys", required_argument, NULL, 'E' }, -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY { "count", required_argument, NULL, 'C' }, { "size", required_argument, NULL, 'W' }, #endif @@ -103,7 +103,7 @@ int main(int argc, char *argv[]) const char *analyze_path = NULL; const char *ellisys_server = NULL; unsigned short ellisys_port = 0; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY int16_t rotate_count = -1; ssize_t file_size = -1; #endif @@ -118,7 +118,7 @@ int main(int argc, char *argv[]) for (;;) { int opt; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY opt = getopt_long(argc, argv, "r:w:a:s:p:i:tTSE:C:W:vh", main_options, NULL); #else @@ -171,7 +171,7 @@ int main(int argc, char *argv[]) ellisys_server = optarg; ellisys_port = 24352; break; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY case 'C': rotate_count = atoi(optarg); break; @@ -229,7 +229,7 @@ int main(int argc, char *argv[]) return EXIT_SUCCESS; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (writer_path && !control_writer(writer_path, rotate_count, file_size)) { printf("Failed to open '%s'\n", writer_path); diff --git a/monitor/packet.c b/monitor/packet.c index 52e5ef7..932fad0 100644 --- a/monitor/packet.c +++ b/monitor/packet.c @@ -7300,7 +7300,7 @@ static const char *current_vendor_str(void) return "Intel"; case 15: return "Broadcom"; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY default: return "Unknown"; #endif @@ -7323,7 +7323,7 @@ static const struct vendor_ocf *current_vendor_ocf(uint16_t ocf) return intel_vendor_ocf(ocf); case 15: return broadcom_vendor_ocf(ocf); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY default: return broadcom_vendor_ocf(ocf); #endif @@ -7346,7 +7346,7 @@ static const struct vendor_evt *current_vendor_evt(uint8_t evt) return intel_vendor_evt(evt); case 15: return broadcom_vendor_evt(evt); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY default: return broadcom_vendor_evt(evt); #endif @@ -9086,7 +9086,7 @@ void packet_todo(void) } } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY void print_le_set_adv_parameters_cmd(const void *data, uint8_t size) { le_set_adv_parameters_cmd(data, size); diff --git a/monitor/packet.h b/monitor/packet.h index 59cbd6e..2bb4a63 100644 --- a/monitor/packet.h +++ b/monitor/packet.h @@ -91,7 +91,7 @@ void packet_hci_scodata(struct timeval *tv, struct ucred *cred, uint16_t index, void packet_todo(void); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY void print_le_set_adv_parameters_cmd(const void *data, uint8_t size); void print_le_set_random_address_cmd(const void *data, uint8_t size); void print_le_set_adv_data_cmd(const void *data, uint8_t size); diff --git a/obexd/client/bluetooth.c b/obexd/client/bluetooth.c index 7fd7133..20a4904 100644 --- a/obexd/client/bluetooth.c +++ b/obexd/client/bluetooth.c @@ -186,7 +186,7 @@ static void search_callback(uint8_t type, uint16_t status, protos = NULL; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY /* Use obex over l2cap only if obex over rfcomm is not there */ if (ch == -1) { data = sdp_data_get(rec, 0x0200); diff --git a/obexd/client/manager.c b/obexd/client/manager.c index 32853fc..cc472e4 100644 --- a/obexd/client/manager.c +++ b/obexd/client/manager.c @@ -46,7 +46,7 @@ #include "sync.h" #include "map.h" #include "manager.h" -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY #include "mns-tizen.h" #endif #define CLIENT_INTERFACE "org.bluez.obex.Client1" @@ -66,7 +66,7 @@ static void shutdown_session(struct obc_session *session) obc_session_unref(session); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY void release_session(struct obc_session *session) { DBG("+"); @@ -166,7 +166,7 @@ static int parse_device_dict(DBusMessageIter *iter, static struct obc_session *find_session(const char *path) { GSList *l; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if(!path) return NULL; #endif @@ -253,12 +253,12 @@ static DBusMessage *remove_session(DBusConnection *connection, ERROR_INTERFACE ".NotAuthorized", "Not Authorized"); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY obc_session_update(session, message, connection); #endif release_session(session); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY return NULL; #else return dbus_message_new_method_return(message); @@ -287,7 +287,7 @@ static struct obc_module { { "pbap", pbap_init, pbap_exit }, { "sync", sync_init, sync_exit }, { "map", map_init, map_exit }, -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY { "mns", mns_init, mns_exit }, #endif { } diff --git a/obexd/client/opp.c b/obexd/client/opp.c index 846a969..99668ef 100644 --- a/obexd/client/opp.c +++ b/obexd/client/opp.c @@ -55,13 +55,13 @@ static DBusMessage *opp_send_file(DBusConnection *connection, char *filename; char *basename; GError *err = NULL; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY char *mimetype = NULL; #endif if (dbus_message_get_args(message, NULL, DBUS_TYPE_STRING, &filename, -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY DBUS_TYPE_STRING, &mimetype, #endif DBUS_TYPE_INVALID) == FALSE) @@ -70,7 +70,7 @@ static DBusMessage *opp_send_file(DBusConnection *connection, basename = g_path_get_basename(filename); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY transfer = obc_transfer_put(mimetype, basename, filename, NULL, 0, &err); #else transfer = obc_transfer_put(NULL, basename, filename, NULL, 0, &err); @@ -132,7 +132,7 @@ static DBusMessage *opp_exchange_business_cards(DBusConnection *connection, static const GDBusMethodTable opp_methods[] = { { GDBUS_METHOD("SendFile", -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY GDBUS_ARGS({ "sourcefile", "s" }, { "mimetype", "s" }), #else GDBUS_ARGS({ "sourcefile", "s" }), diff --git a/obexd/client/pbap.c b/obexd/client/pbap.c index c6313b1..db46a80 100644 --- a/obexd/client/pbap.c +++ b/obexd/client/pbap.c @@ -218,7 +218,7 @@ static char *build_phonebook_path(const char *location, const char *item) internal = TRUE; } else if (!g_ascii_strncasecmp(location, "sim", 3)) { if (strlen(location) == 3) -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY tmp = g_strdup("SIM1"); #else tmp = g_strdup("sim1"); @@ -231,7 +231,7 @@ static char *build_phonebook_path(const char *location, const char *item) } else return NULL; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (!g_ascii_strcasecmp(item, "nil")) return path; #endif @@ -367,7 +367,7 @@ static void read_return_apparam(struct obc_transfer *transfer, g_obex_apparam_get_uint16(apparam, PHONEBOOKSIZE_TAG, phone_book_size); -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY g_obex_apparam_get_uint16(apparam, NEWMISSEDCALLS_TAG, #else g_obex_apparam_get_uint8(apparam, NEWMISSEDCALLS_TAG, @@ -506,7 +506,7 @@ static GObexApparam *parse_offset(GObexApparam *apparam, DBusMessageIter *iter) { guint16 num; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (dbus_message_iter_get_arg_type(iter) != DBUS_TYPE_UINT16 && dbus_message_iter_get_arg_type(iter) != DBUS_TYPE_UINT32) return NULL; @@ -525,7 +525,7 @@ static GObexApparam *parse_max_count(GObexApparam *apparam, { guint16 num; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (dbus_message_iter_get_arg_type(iter) != DBUS_TYPE_UINT16 && dbus_message_iter_get_arg_type(iter) != DBUS_TYPE_UINT32) return NULL; @@ -762,7 +762,7 @@ static DBusMessage *pbap_select(DBusConnection *connection, } request = pending_request_new(pbap, message); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (pbap->path == NULL || strlen(pbap->path) == 0) obc_session_setpath(pbap->session, path + 1, pbap_setpath_cb, request, &err); @@ -902,7 +902,7 @@ static DBusMessage *pbap_list(DBusConnection *connection, struct pbap_data *pbap = user_data; GObexApparam *apparam; DBusMessageIter args; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY const char *pb_folder; #endif @@ -913,7 +913,7 @@ static DBusMessage *pbap_list(DBusConnection *connection, dbus_message_iter_init(message, &args); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (dbus_message_iter_get_arg_type(&args) != DBUS_TYPE_STRING) return g_dbus_create_error(message, ERROR_INTERFACE ".InvalidArguments", NULL); @@ -933,7 +933,7 @@ static DBusMessage *pbap_list(DBusConnection *connection, ERROR_INTERFACE ".InvalidArguments", NULL); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY return pull_vcard_listing(pbap, message, pb_folder, apparam); #else return pull_vcard_listing(pbap, message, "", apparam); @@ -1097,7 +1097,7 @@ static const GDBusMethodTable pbap_methods[] = { { "properties", "a{sv}" }), pbap_pull_vcard) }, { GDBUS_ASYNC_METHOD("List", -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY GDBUS_ARGS({ "folder", "s" }, {"filters", "a{sv}" }), #else GDBUS_ARGS({"filters", "a{sv}" }), diff --git a/obexd/client/session.c b/obexd/client/session.c index 75bc3cb..88c308f 100644 --- a/obexd/client/session.c +++ b/obexd/client/session.c @@ -43,7 +43,7 @@ #include "dbus.h" #include "transfer.h" #include "session.h" -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY #include "manager.h" #endif #include "driver.h" @@ -117,7 +117,7 @@ struct obc_session { guint process_id; char *folder; struct callback_data *callback; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY DBusMessage *message; DBusConnection *connection; #endif @@ -146,7 +146,7 @@ struct obc_session *obc_session_ref(struct obc_session *session) return session; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY void obc_session_update(struct obc_session *session, DBusMessage *message, DBusConnection *connection) { @@ -281,7 +281,7 @@ static void disconnect_complete(GObex *obex, GError *err, GObexPacket *rsp, if (err) error("%s", err->message); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (session->message) { /* Dbus reply need to be done */ DBG("Dbus reply for remove_session"); @@ -380,7 +380,7 @@ static void session_disconnected(GObex *obex, GError *err, gpointer user_data) if (err) error("%s", err->message); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY release_session(session); #else obc_session_shutdown(session); @@ -1212,7 +1212,7 @@ guint obc_session_setpath(struct obc_session *session, const char *path, if (!data->remaining || !data->remaining[0]) { error("obc_session_setpath: invalid path %s", path); g_set_error(err, OBEX_IO_ERROR, -EINVAL, "Invalid argument"); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY setpath_data_free(data); #endif return 0; diff --git a/obexd/client/session.h b/obexd/client/session.h index 14704be..2ce9f3f 100644 --- a/obexd/client/session.h +++ b/obexd/client/session.h @@ -80,7 +80,7 @@ guint obc_session_delete(struct obc_session *session, const char *file, GError **err); void obc_session_cancel(struct obc_session *session, guint id, gboolean remove); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY void release_session(struct obc_session *session); void obc_session_update(struct obc_session *session, DBusMessage *message, DBusConnection *connection); diff --git a/obexd/client/transfer.c b/obexd/client/transfer.c index 521232e..a5ecd13 100644 --- a/obexd/client/transfer.c +++ b/obexd/client/transfer.c @@ -787,7 +787,7 @@ static gboolean report_progress(gpointer data) if (transfer->transferred == transfer->progress) return TRUE; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (transfer->transferred == transfer->size) { transfer->progress_id = 0; if(transfer->progress == 0) { @@ -898,7 +898,7 @@ static gboolean transfer_start_put(struct obc_transfer *transfer, GError **err) if (transfer->path == NULL) return TRUE; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY transfer->progress_id = g_timeout_add(10, report_progress, transfer); #else diff --git a/obexd/plugins/mas.c b/obexd/plugins/mas.c index 7036497..04b54d2 100644 --- a/obexd/plugins/mas.c +++ b/obexd/plugins/mas.c @@ -71,7 +71,7 @@ struct mas_session { GObexApparam *inparams; GObexApparam *outparams; gboolean ap_sent; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY gboolean headers_sent; int notification_status; char *remote_addr; @@ -123,7 +123,7 @@ static void reset_request(struct mas_session *mas) mas->nth_call = FALSE; mas->finished = FALSE; mas->ap_sent = FALSE; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY mas->headers_sent = FALSE; g_free(mas->response_handle); mas->response_handle = NULL; @@ -133,7 +133,7 @@ static void reset_request(struct mas_session *mas) static void mas_clean(struct mas_session *mas) { reset_request(mas); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY g_free(mas->remote_addr); #endif g_free(mas); @@ -142,7 +142,7 @@ static void mas_clean(struct mas_session *mas) static void *mas_connect(struct obex_session *os, int *err) { struct mas_session *mas; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY char *address; #endif @@ -156,7 +156,7 @@ static void *mas_connect(struct obex_session *os, int *err) manager_register_session(os); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (obex_getpeername(os, &address) == 0) { mas->remote_addr = address; DBG("mas->remote_addr = %s\n", mas->remote_addr); @@ -427,7 +427,7 @@ proceed: obex_object_set_io_flags(mas, G_IO_IN, 0); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static void put_message_cb(void *session, int err, guint64 handle, void *user_data) { @@ -496,7 +496,7 @@ static void get_folder_listing_cb(void *session, int err, uint16_t size, mas->finished = TRUE; goto proceed; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY } else { mas->ap_sent = TRUE; #endif @@ -665,7 +665,7 @@ static void *message_open(const char *name, int oflag, mode_t mode, DBG(""); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (oflag != O_RDONLY) { DBG("Message pushing invoked \n"); @@ -735,7 +735,7 @@ static void *message_open(const char *name, int oflag, mode_t mode, return mas; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static ssize_t message_write(void *object, const void *buf, size_t count) { DBG(""); @@ -822,7 +822,7 @@ static void *message_set_status_open(const char *name, int oflag, mode_t mode, return mas; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static int notification_registration_close(void *obj) { struct mas_session *mas = obj; @@ -993,7 +993,7 @@ static struct obex_mime_type_driver mime_message = { .open = message_open, .close = any_close, .read = any_read, -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY .write = message_write, .get_next_header = put_next_header #else @@ -1028,7 +1028,7 @@ static struct obex_mime_type_driver mime_notification_registration = { .target_size = TARGET_SIZE, .mimetype = "x-bt/MAP-NotificationRegistration", .open = notification_registration_open, -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY .close = notification_registration_close, #else .close = any_close, diff --git a/obexd/plugins/messages-tizen.c b/obexd/plugins/messages-tizen.c index 7276c01..8f684fc 100644 --- a/obexd/plugins/messages-tizen.c +++ b/obexd/plugins/messages-tizen.c @@ -773,11 +773,6 @@ int messages_connect(void **s) QUERY_GET_FOLDER_TREE); if (!message) { error("Can't allocate new message"); -#ifdef __TIZEN_PATCH__ - g_free(session->cwd); - g_free(session); - *s = NULL; -#endif return -1; } @@ -793,12 +788,6 @@ int messages_connect(void **s) } dbus_message_unref(message); - -#ifdef __TIZEN_PATCH__ - g_free(session->cwd); - g_free(session); - *s = NULL; -#endif return -1; } @@ -1351,7 +1340,7 @@ int messages_get_message(void *session, return 1; } -#ifndef SUPPORT_SMS_ONLY +#ifndef TIZEN_FEATURE_BLUEZ_SMS_ONLY static void message_update_msg(DBusPendingCall *call, void *user_data) { DBusMessage *reply = dbus_pending_call_steal_reply(call); @@ -1384,7 +1373,7 @@ int messages_update_inbox(void *session, messages_status_cb callback, void *user_data) { -#ifdef SUPPORT_SMS_ONLY +#ifdef TIZEN_FEATURE_BLUEZ_SMS_ONLY /* MAP.TS.1.0.3 : TP/MMB/BV-16-I Currently support is only for SMS, Since SMS service does not allow the polling of its mailbox, it must return Not implemented */ diff --git a/obexd/plugins/messages.h b/obexd/plugins/messages.h index b240294..a3e0b81 100644 --- a/obexd/plugins/messages.h +++ b/obexd/plugins/messages.h @@ -169,7 +169,7 @@ void messages_disconnect(void *session); * value is used to set the error code in OBEX response. ******************************************************************************/ -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY /* Registers Message Client for receiving message event reports. * @@ -252,7 +252,7 @@ int messages_get_messages_listing(void *session, const char *name, messages_get_messages_listing_cb callback, void *user_data); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY /* Retrieves bMessage object (see MAP specification, ch. 3.1.3) of a given * message. * @@ -354,7 +354,7 @@ int messages_set_read(void *session, const char *handle, uint8_t value, int messages_set_delete(void *session, const char *handle, uint8_t value, messages_status_cb callback, void *user_data); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY /* Informs Message Server to modify status of the message. * diff --git a/obexd/plugins/pbap.c b/obexd/plugins/pbap.c index 144f9bd..76031e5 100644 --- a/obexd/plugins/pbap.c +++ b/obexd/plugins/pbap.c @@ -65,9 +65,9 @@ #define PHONEBOOKSIZE_TAG 0X08 #define NEWMISSEDCALLS_TAG 0X09 -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY #define PBAP_MAXLISTCOUNT_MAX_VALUE 65535 -#endif /* __TIZEN_PATCH__ */ +#endif /* TIZEN_FEATURE_BLUEZ_MODIFY */ struct cache { gboolean valid; @@ -89,7 +89,7 @@ struct pbap_session { uint32_t find_handle; struct cache cache; struct pbap_object *obj; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY void *backend_data; #endif }; @@ -201,14 +201,14 @@ static void phonebook_size_result(const char *buffer, size_t bufsize, phonebooksize); pbap->obj->firstpacket = TRUE; -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY if (missed > 0) { #else if (pbap->params->required_missedcall_call_header == TRUE) { -#endif /* __TIZEN_PATCH__ */ +#endif /* TIZEN_FEATURE_BLUEZ_MODIFY */ DBG("missed %d", missed); -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY pbap->obj->apparam = g_obex_apparam_set_uint16( #else pbap->obj->apparam = g_obex_apparam_set_uint8( @@ -245,7 +245,7 @@ static void query_result(const char *buffer, size_t bufsize, int vcards, else pbap->obj->buffer = g_string_append_len(pbap->obj->buffer, buffer, bufsize); -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY if (missed > 0) { #else if (pbap->params->required_missedcall_call_header == TRUE) { @@ -254,7 +254,7 @@ static void query_result(const char *buffer, size_t bufsize, int vcards, pbap->obj->firstpacket = TRUE; -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY pbap->obj->apparam = g_obex_apparam_set_uint16( #else pbap->obj->apparam = g_obex_apparam_set_uint8( @@ -394,7 +394,7 @@ static int generate_response(void *user_data) pbap->obj->apparam, PHONEBOOKSIZE_TAG, size); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (pbap->params->required_missedcall_call_header == TRUE) { //DBG("missed %d", missed); pbap->obj->apparam = g_obex_apparam_set_uint8( @@ -402,11 +402,11 @@ static int generate_response(void *user_data) NEWMISSEDCALLS_TAG, pbap->params->new_missed_calls); } -#endif /* __TIZEN_PATCH__ */ +#endif /* TIZEN_FEATURE_BLUEZ_MODIFY */ return 0; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (pbap->params->required_missedcall_call_header == TRUE) { pbap->obj->firstpacket = TRUE; pbap->obj->apparam = g_obex_apparam_set_uint8( @@ -414,7 +414,7 @@ static int generate_response(void *user_data) NEWMISSEDCALLS_TAG, pbap->params->new_missed_calls); } -#endif /* __TIZEN_PATCH__ */ +#endif /* TIZEN_FEATURE_BLUEZ_MODIFY */ /* * Don't free the sorted list content: this list contains @@ -445,18 +445,18 @@ static int generate_response(void *user_data) return 0; } -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY static void cache_ready_notify(void *user_data) #else static void cache_ready_notify(void *user_data, unsigned int new_missed_call) -#endif /* __TIZEN_PATCH__ */ +#endif /* TIZEN_FEATURE_BLUEZ_MODIFY */ { struct pbap_session *pbap = user_data; DBG(""); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY pbap->params->new_missed_calls = new_missed_call; -#endif /* __TIZEN_PATCH__ */ +#endif /* TIZEN_FEATURE_BLUEZ_MODIFY */ phonebook_req_finalize(pbap->obj->request); pbap->obj->request = NULL; @@ -490,7 +490,7 @@ static void cache_entry_done(void *user_data) obex_object_set_io_flags(pbap->obj, G_IO_ERR, ret); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static void cache_clear_notify(void *user_data) { struct pbap_session *pbap = user_data; @@ -508,9 +508,9 @@ static struct apparam_field *parse_aparam(const uint8_t *buffer, uint32_t hlen) { GObexApparam *apparam; struct apparam_field *param; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY gboolean bmaxlistCount = FALSE; -#endif /* __TIZEN_PATCH__ */ +#endif /* TIZEN_FEATURE_BLUEZ_MODIFY */ apparam = g_obex_apparam_decode(buffer, hlen); if (apparam == NULL) @@ -528,26 +528,26 @@ static struct apparam_field *parse_aparam(const uint8_t *buffer, uint32_t hlen) g_obex_apparam_get_uint8(apparam, SEARCHATTRIB_TAG, ¶m->searchattrib); g_obex_apparam_get_uint8(apparam, FORMAT_TAG, ¶m->format); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY bmaxlistCount = g_obex_apparam_get_uint16(apparam, MAXLISTCOUNT_TAG, ¶m->maxlistcount); #else g_obex_apparam_get_uint16(apparam, MAXLISTCOUNT_TAG, ¶m->maxlistcount); -#endif /* __TIZEN_PATCH__ */ +#endif /* TIZEN_FEATURE_BLUEZ_MODIFY */ g_obex_apparam_get_uint16(apparam, LISTSTARTOFFSET_TAG, ¶m->liststartoffset); g_obex_apparam_get_uint64(apparam, FILTER_TAG, ¶m->filter); param->searchval = g_obex_apparam_get_string(apparam, SEARCHVALUE_TAG); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if(bmaxlistCount == FALSE) { param->maxlistcount = PBAP_MAXLISTCOUNT_MAX_VALUE; } else { /* Keep the MaxlistCount value as send in request from client */ } -#endif /* __TIZEN_PATCH__ */ +#endif /* TIZEN_FEATURE_BLUEZ_MODIFY */ DBG("o %x sa %x sv %s fil %" G_GINT64_MODIFIER "x for %x max %x off %x", param->order, param->searchattrib, param->searchval, @@ -569,7 +569,7 @@ static void *pbap_connect(struct obex_session *os, int *err) pbap->folder = g_strdup("/"); pbap->find_handle = PHONEBOOK_INVALID_HANDLE; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY int error; error = phonebook_connect(&pbap->backend_data); @@ -585,10 +585,8 @@ static void *pbap_connect(struct obex_session *os, int *err) return pbap; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY failed: - g_free(pbap->backend_data); - g_free(pbap->folder); g_free(pbap); return NULL; @@ -703,7 +701,7 @@ static void pbap_disconnect(struct obex_session *os, void *user_data) manager_unregister_session(os); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (!pbap) return; @@ -774,13 +772,13 @@ static void *vobject_pull_open(const char *name, int oflag, mode_t mode, ret = -EBADR; goto fail; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (strcmp(name, "/telecom/mch.vcf") == 0) pbap->params->required_missedcall_call_header = TRUE; DBG("[%s] - required_missedcall_call_header [%d] ", name,pbap->params->required_missedcall_call_header); -#endif /* __TIZEN_PATCH__ */ +#endif /* TIZEN_FEATURE_BLUEZ_MODIFY */ if (pbap->params->maxlistcount == 0) cb = phonebook_size_result; @@ -851,13 +849,13 @@ static void *vobject_list_open(const char *name, int oflag, mode_t mode, ret = -EPERM; goto fail; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (strcmp(name, "/telecom/mch") == 0) pbap->params->required_missedcall_call_header = TRUE; DBG("[%s] - required_missedcall_call_header [%d] ", name,pbap->params->required_missedcall_call_header); -#endif /* __TIZEN_PATCH__ */ +#endif /* TIZEN_FEATURE_BLUEZ_MODIFY */ /* PullvCardListing always get the contacts from the cache */ @@ -869,7 +867,7 @@ static void *vobject_list_open(const char *name, int oflag, mode_t mode, cache_ready_notify, pbap, &ret); if (ret == 0) obj = vobject_create(pbap, request); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY phonebook_set_cache_notification(pbap->backend_data, cache_clear_notify, pbap); #endif @@ -898,7 +896,7 @@ static void *vobject_vcard_open(const char *name, int oflag, mode_t mode, struct pbap_session *pbap = context; const char *id; uint32_t handle; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY int ret = 0; #else int ret; @@ -919,7 +917,7 @@ static void *vobject_vcard_open(const char *name, int oflag, mode_t mode, if (pbap->cache.valid == FALSE) { pbap->find_handle = handle; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY request = phonebook_create_cache(pbap->folder, (phonebook_entry_cb)cache_entry_notify, (phonebook_cache_ready_cb)cache_entry_done, pbap, &ret); @@ -927,7 +925,7 @@ static void *vobject_vcard_open(const char *name, int oflag, mode_t mode, request = phonebook_create_cache(pbap->folder, cache_entry_notify, cache_entry_done, pbap, &ret); #endif -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY phonebook_set_cache_notification(pbap->backend_data, cache_clear_notify, pbap); #endif @@ -971,7 +969,7 @@ static ssize_t vobject_pull_get_next_header(void *object, void *buf, size_t mtu, if (obj->firstpacket) { obj->firstpacket = FALSE; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY gsize count = 0; count = g_obex_apparam_encode(obj->apparam, buf, mtu); DBG("APPARAM Processed remove tags"); @@ -1028,7 +1026,7 @@ static ssize_t vobject_list_get_next_header(void *object, void *buf, size_t mtu, return -EAGAIN; *hi = G_OBEX_HDR_APPARAM; -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY if (pbap->params->maxlistcount == 0) return g_obex_apparam_encode(obj->apparam, buf, mtu); @@ -1043,7 +1041,7 @@ static ssize_t vobject_list_get_next_header(void *object, void *buf, size_t mtu, } else return 0; -#endif /* __TIZEN_PATCH__ */ +#endif /* TIZEN_FEATURE_BLUEZ_MODIFY */ } static ssize_t vobject_list_read(void *object, void *buf, size_t count) diff --git a/obexd/plugins/phonebook-dummy.c b/obexd/plugins/phonebook-dummy.c index 199190e..d30fa32 100644 --- a/obexd/plugins/phonebook-dummy.c +++ b/obexd/plugins/phonebook-dummy.c @@ -526,7 +526,7 @@ void *phonebook_get_entry(const char *folder, const char *id, fd = open(filename, O_RDONLY); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY g_free(filename); #endif diff --git a/obexd/plugins/phonebook-tizen.c b/obexd/plugins/phonebook-tizen.c index a09bcf1..dcb6179 100755 --- a/obexd/plugins/phonebook-tizen.c +++ b/obexd/plugins/phonebook-tizen.c @@ -325,11 +325,11 @@ static void get_phonebook_list_reply(DBusPendingCall *call, void *user_data) DBG("new_missed_call %d\n", new_missed_call); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY data->ready_cb(data->user_data, new_missed_call); #else data->ready_cb(data->user_data); -#endif /* __TIZEN_PATCH__ */ +#endif /* TIZEN_FEATURE_BLUEZ_MODIFY */ dbus_message_unref(reply); } diff --git a/obexd/plugins/phonebook.h b/obexd/plugins/phonebook.h index ba7da5f..364ee9b 100644 --- a/obexd/plugins/phonebook.h +++ b/obexd/plugins/phonebook.h @@ -66,10 +66,10 @@ struct apparam_field { uint8_t order; uint8_t searchattrib; char *searchval; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY gboolean required_missedcall_call_header; uint16_t new_missed_calls; -#endif /* __TIZEN_PATCH__ */ +#endif /* TIZEN_FEATURE_BLUEZ_MODIFY */ }; /* @@ -89,7 +89,7 @@ typedef void (*phonebook_entry_cb) (const char *id, uint32_t handle, const char *name, const char *sound, const char *tel, void *user_data); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY typedef void (*phonebook_cache_clear_cb) (void *user_data); #endif @@ -97,17 +97,17 @@ typedef void (*phonebook_cache_clear_cb) (void *user_data); * After notify all entries to PBAP core, the backend * needs to notify that the operation has finished. */ -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY typedef void (*phonebook_cache_ready_cb) (void *user_data); #else typedef void (*phonebook_cache_ready_cb) (void *user_data, unsigned int new_missed_calls); -#endif /* __TIZEN_PATCH__ */ +#endif /* TIZEN_FEATURE_BLUEZ_MODIFY */ int phonebook_init(void); void phonebook_exit(void); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY int phonebook_connect(void **user_data); void phonebook_disconnect(void *user_data); #endif @@ -182,7 +182,7 @@ void *phonebook_create_cache(const char *name, phonebook_entry_cb entry_cb, */ void phonebook_req_finalize(void *request); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY void phonebook_set_cache_notification(void *session, phonebook_cache_clear_cb cache_cb, void *user_data); diff --git a/obexd/src/main.c b/obexd/src/main.c index 00644c9..e2df4ef 100755 --- a/obexd/src/main.c +++ b/obexd/src/main.c @@ -179,7 +179,7 @@ static GOptionEntry options[] = { { NULL }, }; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY void obex_option_set_root_folder(const char *root) { g_free(option_root); diff --git a/obexd/src/manager.c b/obexd/src/manager.c index 9fbac6f..90c5114 100755 --- a/obexd/src/manager.c +++ b/obexd/src/manager.c @@ -190,7 +190,7 @@ static DBusMessage *unregister_agent(DBusConnection *conn, return dbus_message_new_method_return(msg); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static DBusMessage *set_root(DBusConnection *conn, DBusMessage *msg, const char *root, void *data) { @@ -486,7 +486,7 @@ static gboolean transfer_get_filename(const GDBusPropertyTable *property, return TRUE; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static gboolean transfer_operation_exists(const GDBusPropertyTable *property, void *data) { @@ -576,7 +576,7 @@ static const GDBusMethodTable manager_methods[] = { GDBUS_ARGS({ "agent", "o" }), NULL, register_agent) }, { GDBUS_METHOD("UnregisterAgent", GDBUS_ARGS({ "agent", "o" }), NULL, unregister_agent) }, -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY { GDBUS_METHOD("SetProperty", GDBUS_ARGS({ "property", "sv" }), NULL, set_property) }, #endif @@ -597,7 +597,7 @@ static const GDBusPropertyTable transfer_properties[] = { { "Time", "t", transfer_get_time, NULL, transfer_time_exists }, { "Filename", "s", transfer_get_filename, NULL, transfer_filename_exists }, -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY { "Operation", "s", transfer_get_operation, NULL, transfer_operation_exists }, { "Address", "s", transfer_get_address, NULL, diff --git a/obexd/src/obex.c b/obexd/src/obex.c index 580b12e..fee2461 100644 --- a/obexd/src/obex.c +++ b/obexd/src/obex.c @@ -642,7 +642,7 @@ static void parse_name(struct obex_session *os, GObexPacket *req) if (!g_obex_header_get_unicode(hdr, &name)) return; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY DBG("Obex Session For: %s", os->service->name); if (name && g_strcmp0(os->service->name, "Object Push server") == 0) { char *new_name; @@ -783,7 +783,7 @@ int obex_put_stream_start(struct obex_session *os, const char *filename) int err; os->object = os->driver->open(filename, O_WRONLY | O_CREAT | O_TRUNC, -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY 0644, os->service_data, #else 0600, os->service_data, diff --git a/obexd/src/obexd.h b/obexd/src/obexd.h index 41f28d6..ddf5ba0 100755 --- a/obexd/src/obexd.h +++ b/obexd/src/obexd.h @@ -41,6 +41,6 @@ gboolean obex_option_auto_accept(void); const char *obex_option_root_folder(void); gboolean obex_option_symlinks(void); const char *obex_option_capability(void); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY void obex_option_set_root_folder(const char *root); #endif diff --git a/packaging/bluez.spec b/packaging/bluez.spec index aaeb379..0b4924c 100644 --- a/packaging/bluez.spec +++ b/packaging/bluez.spec @@ -1,3 +1,4 @@ +#%define with_libcapng --enable-capng %define _libpath /usr/lib %define upgrade_script_path /usr/share/upgrade/scripts Name: bluez @@ -94,17 +95,19 @@ cp %{SOURCE1001} . autoreconf -fiv %if "%{?tizen_target_name}" == "TM1" || "%{?profile}" == "ivi" -export CFLAGS="${CFLAGS} -D__TIZEN_PATCH__ -DBLUEZ5_27_GATT_CLIENT" +%if "%{?tizen_target_name}" == "TM1" +export CFLAGS="${CFLAGS} -DTIZEN_FEATURE_BLUEZ_SPRD_QOS -DTIZEN_FEATURE_BLUEZ_SPRD_PAGE_SCAN" +%endif %else -export CFLAGS="${CFLAGS} -D__TIZEN_PATCH__ -D__BROADCOM_PATCH__ -DBLUEZ5_27_GATT_CLIENT" +export CFLAGS="${CFLAGS} -DTIZEN_FEATURE_BLUEZ_BRCM_CHIP" %endif %if "%{?profile}" == "wearable" -export CFLAGS="${CFLAGS} -D__BT_SCMST_FEATURE__ -DSUPPORT_SMS_ONLY -D__BROADCOM_QOS_PATCH__ -DTIZEN_WEARABLE" +export CFLAGS="${CFLAGS} -DTIZEN_FEATURE_BLUEZ_SMS_ONLY -DTIZEN_FEATURE_BLUEZ_BRCM_QOS -DTIZEN_FEATURE_BLUEZ_ROLE_CHANGE -DTIZEN_FEATURE_BLUEZ_CONFIRM_ONLY" %endif export LDFLAGS=" -lncurses -Wl,--as-needed " -export CFLAGS+=" -DPBAP_SIM_ENABLE -DSUPPORT_AVRCP_TARGET" +export CFLAGS+=" -DTIZEN_FEATURE_BLUEZ_MODIFY -DTIZEN_FEATURE_BLUEZ_PBAP_SIM -DTIZEN_FEATURE_BLUEZ_AVRCP_TARGET" %reconfigure --disable-static \ --sysconfdir=%{_sysconfdir} \ --localstatedir=%{_localstatedir} \ @@ -135,7 +138,9 @@ export CFLAGS+=" -DPBAP_SIM_ENABLE -DSUPPORT_AVRCP_TARGET" --enable-experimental \ --enable-autopair=no \ %if "%{?profile}" == "wearable" - --enable-wearable \ + --enable-wearable \ +%else + --enable-network \ %endif --enable-hid=yes \ --enable-tizenunusedplugin=no @@ -151,6 +156,7 @@ make check # bluez-test rm -rvf $RPM_BUILD_ROOT/%{_libdir}/gstreamer-* +#install --mode=0755 -D %{S:4} $RPM_BUILD_ROOT/usr/lib/udev/bluetooth.sh install --mode=0644 -D %{S:7} $RPM_BUILD_ROOT/%{_sysconfdir}/modprobe.d/50-bluetooth.conf # no idea why this is suddenly necessary... @@ -159,16 +165,24 @@ install --mode 0755 -d $RPM_BUILD_ROOT/var/lib/bluetooth %if "%{?profile}" == "wearable" install -D -m 0644 src/main_w.conf %{buildroot}%{_sysconfdir}/bluetooth/main.conf %else -%if "%{?profile}" == "ivi" -install -D -m 0644 src/main_ivi.conf %{buildroot}%{_sysconfdir}/bluetooth/main.conf -%else install -D -m 0644 src/main_m.conf %{buildroot}%{_sysconfdir}/bluetooth/main.conf %endif -%endif +#install -D -m 0644 src/bluetooth.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/bluetooth.conf +#install -D -m 0644 profiles/audio/audio.conf %{buildroot}%{_sysconfdir}/bluetooth/audio.conf +#install -D -m 0644 profiles/network/network.conf %{buildroot}%{_sysconfdir}/bluetooth/network.conf + +#install -D -m 0644 COPYING %{buildroot}%{_datadir}/license/bluez +#install -D -m 0644 COPYING %{buildroot}%{_datadir}/license/libbluetooth3 +#install -D -m 0644 COPYING %{buildroot}%{_datadir}/license/libbluetooth-devel + +#install -D -m 0755 %SOURCE101 %{buildroot}%{_bindir}/obex-root-setup +#install -D -m 0755 %SOURCE102 %{buildroot}%{_sysconfdir}/obex/root-setup.d/000_create-symlinks +#install -D -m 0755 %SOURCE103 %{buildroot}%{_bindir}/obex.sh install -D -m 0755 tools/btiotest $RPM_BUILD_ROOT/%{_bindir}/ install -D -m 0755 tools/bluetooth-player $RPM_BUILD_ROOT/%{_bindir}/ +#install -D -m 0755 tools/mpris-player $RPM_BUILD_ROOT/%{_bindir}/ install -D -m 0755 tools/btmgmt $RPM_BUILD_ROOT/%{_bindir}/ install -D -m 0755 tools/scotest $RPM_BUILD_ROOT/%{_bindir}/ install -D -m 0755 tools/bluemoon $RPM_BUILD_ROOT/%{_bindir}/ @@ -195,12 +209,12 @@ cp -f packaging/bluetoothd_upgrade.sh %{buildroot}%{upgrade_script_path} %manifest %{name}.manifest %defattr(-, root, root) %license COPYING -#{_sysconfdir}/bluetooth/audio.conf +#%{_sysconfdir}/bluetooth/audio.conf %{_sysconfdir}/bluetooth/main.conf -#{_sysconfdir}/bluetooth/network.conf -#{_sysconfdir}/bluetooth/rfcomm.conf -#{_sysconfdir}/dbus-1/system.d/bluetooth.conf -#{_datadir}/man/*/* +#%{_sysconfdir}/bluetooth/network.conf +#%{_sysconfdir}/bluetooth/rfcomm.conf +#%{_sysconfdir}/dbus-1/system.d/bluetooth.conf +#%{_datadir}/man/*/* %{_bindir}/hcitool %{_bindir}/l2ping %{_bindir}/obexctl @@ -209,12 +223,12 @@ cp -f packaging/bluetoothd_upgrade.sh %{buildroot}%{upgrade_script_path} %{_bindir}/mpris-proxy %{_bindir}/sdptool %{_bindir}/ciptool -#{_bindir}/dfutool +#%{_bindir}/dfutool %{_bindir}/hciattach %{_bindir}/hciconfig %{_libexecdir}/bluetooth/bluetoothd %{_bindir}/bccmd -#{_sbindir}/hid2hci +#%{_sbindir}/hid2hci %dir /usr/lib/udev /usr/lib/udev/* %{upgrade_script_path}/bluetoothd_upgrade.sh @@ -256,9 +270,9 @@ cp -f packaging/bluetoothd_upgrade.sh %{buildroot}%{upgrade_script_path} %{_libexecdir}/bluetooth/obexd %{_libpath}/systemd/user/obex.service %{_datadir}/dbus-1/services/org.bluez.obex.service -#{_sysconfdir}/obex/root-setup.d/000_create-symlinks -#{_bindir}/obex-root-setup -#{_bindir}/obex.sh +#%{_sysconfdir}/obex/root-setup.d/000_create-symlinks +#%{_bindir}/obex-root-setup +#%{_bindir}/obex.sh %files test @@ -269,7 +283,7 @@ cp -f packaging/bluetoothd_upgrade.sh %{buildroot}%{upgrade_script_path} %{_bindir}/rctest %{_bindir}/bluetoothctl %{_bindir}/btiotest -#{_bindir}/mpris-player +#%{_bindir}/mpris-player %{_bindir}/bluetooth-player %{_bindir}/btmon %{_bindir}/hcidump diff --git a/plugins/dbusoob.c b/plugins/dbusoob.c index 20a90f6..8948d5d 100644 --- a/plugins/dbusoob.c +++ b/plugins/dbusoob.c @@ -23,7 +23,7 @@ * */ -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY #ifdef HAVE_CONFIG_H #include #endif diff --git a/plugins/neard.c b/plugins/neard.c index 4f068c3..51e276e 100644 --- a/plugins/neard.c +++ b/plugins/neard.c @@ -259,7 +259,7 @@ static DBusMessage *create_request_oob_reply(struct btd_adapter *adapter, return reply; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static void read_local_complete(struct btd_adapter *adapter, const uint8_t *hash, const uint8_t *randomizer, const uint8_t *hash256, const uint8_t *randomizer256, diff --git a/plugins/policy.c b/plugins/policy.c index 0f0da33..5bf8f5c 100644 --- a/plugins/policy.c +++ b/plugins/policy.c @@ -45,7 +45,7 @@ #include "src/profile.h" #include "src/hcid.h" -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY #define CONTROL_CONNECT_TIMEOUT 4 #define TARGET_CONNECT_TIMEOUT 1 #else @@ -55,7 +55,7 @@ #define SINK_RETRY_TIMEOUT SOURCE_RETRY_TIMEOUT #define CT_RETRY_TIMEOUT 1 #define TG_RETRY_TIMEOUT CT_RETRY_TIMEOUT -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY #define SOURCE_RETRIES 0 #else #define SOURCE_RETRIES 1 @@ -277,7 +277,7 @@ static void sink_cb(struct btd_service *service, btd_service_state_t old_state, * immediatelly otherwise set timer */ if (old_state == BTD_SERVICE_STATE_CONNECTING) -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY /* Set timer as most of the devices initiate * avrcp connection immediately; irrespective of local * or remote initiated a2dp connection @@ -316,7 +316,7 @@ static void policy_set_tg_timer(struct policy_data *data, int timeout) g_source_remove(data->tg_timer); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY data->tg_timer = g_timeout_add_seconds(TARGET_CONNECT_TIMEOUT, policy_connect_tg, data); @@ -391,7 +391,7 @@ static void source_cb(struct btd_service *service, if (data->tg_timer > 0) { g_source_remove(data->tg_timer); data->tg_timer = 0; -#if defined __TIZEN_PATCH__ && defined BT_QUALIFICATION +#if defined TIZEN_FEATURE_BLUEZ_MODIFY && defined BT_QUALIFICATION } #else } else if (btd_service_get_state(target) != diff --git a/profiles/audio/a2dp.c b/profiles/audio/a2dp.c index 1844f33..78c4dc2 100644 --- a/profiles/audio/a2dp.c +++ b/profiles/audio/a2dp.c @@ -72,7 +72,7 @@ struct a2dp_sep { struct avdtp *session; struct avdtp_stream *stream; guint suspend_timer; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY gboolean remote_suspended; #endif gboolean delay_reporting; @@ -211,14 +211,14 @@ static void finalize_setup_errno(struct a2dp_setup *s, int err, { GSourceFunc finalize; va_list args; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY struct avdtp_error *avdtp_err; #else struct avdtp_error avdtp_err; #endif if (err < 0) { -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY avdtp_err = g_new(struct avdtp_error, 1); avdtp_error_init(avdtp_err, AVDTP_ERRNO, -err); s->err = avdtp_err; @@ -408,7 +408,7 @@ static void stream_state_changed(struct avdtp_stream *stream, return; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (new_state == AVDTP_STATE_STREAMING && sep->suspend_timer) { g_source_remove(sep->suspend_timer); sep->suspend_timer = 0; @@ -839,7 +839,7 @@ static gboolean start_ind(struct avdtp *session, struct avdtp_local_sep *sep, else DBG("Source %p: Start_Ind", sep); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (!a2dp_sep->locked) { a2dp_sep->session = avdtp_ref(session); if(a2dp_sep->remote_suspended == FALSE) @@ -911,7 +911,7 @@ static gboolean suspend_ind(struct avdtp *session, struct avdtp_local_sep *sep, else DBG("Source %p: Suspend_Ind", sep); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY a2dp_sep->remote_suspended = TRUE; #endif @@ -1228,7 +1228,7 @@ static sdp_record_t *a2dp_record(uint8_t type) sdp_record_t *record; sdp_data_t *psm, *version, *features; uint16_t lp = AVDTP_UUID; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY #ifdef SUPPORT_LOCAL_DEVICE_A2DP_SINK uint16_t a2dp_ver = 0x0102, avdtp_ver = 0x0103, feat = 0x0002; #else @@ -1420,7 +1420,7 @@ struct avdtp *a2dp_avdtp_get(struct btd_device *device) return NULL; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (chan->auth_id) { DBG("auth is already going..."); return NULL; @@ -1551,7 +1551,7 @@ static void confirm_cb(GIOChannel *io, gpointer data) if (!device) goto drop; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY { gboolean restricted = FALSE; @@ -1608,7 +1608,7 @@ static bool a2dp_server_listen(struct a2dp_server *server) btd_adapter_get_address(server->adapter), BT_IO_OPT_PSM, AVDTP_PSM, BT_IO_OPT_SEC_LEVEL, BT_IO_SEC_MEDIUM, -#if defined(__TIZEN_PATCH__) && defined(SUPPORT_LOCAL_DEVICE_A2DP_SINK) +#if defined(TIZEN_FEATURE_BLUEZ_MODIFY) && defined(SUPPORT_LOCAL_DEVICE_A2DP_SINK) BT_IO_OPT_IMTU, 895, #endif BT_IO_OPT_MASTER, true, @@ -1838,13 +1838,13 @@ done: static struct a2dp_sep *a2dp_find_sep(struct avdtp *session, GSList *list, const char *sender) { -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY struct a2dp_sep *selected_sep = NULL; #endif for (; list; list = list->next) { struct a2dp_sep *sep = list->data; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY struct avdtp_remote_sep *rsep; struct avdtp_media_codec_capability *cap; struct avdtp_service_capability *service; @@ -1862,7 +1862,7 @@ static struct a2dp_sep *a2dp_find_sep(struct avdtp *session, GSList *list, continue; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY rsep = avdtp_find_remote_sep(session, sep->lsep); if (rsep == NULL) continue; @@ -1883,7 +1883,7 @@ static struct a2dp_sep *a2dp_find_sep(struct avdtp *session, GSList *list, } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (selected_sep) return selected_sep; else @@ -2563,7 +2563,7 @@ static struct btd_adapter_driver media_driver = { static int a2dp_init(void) { btd_register_adapter_driver(&media_driver); -#if defined(__TIZEN_PATCH__) && defined(SUPPORT_LOCAL_DEVICE_A2DP_SINK) +#if defined(TIZEN_FEATURE_BLUEZ_MODIFY) && defined(SUPPORT_LOCAL_DEVICE_A2DP_SINK) btd_profile_register(&a2dp_source_profile); #endif btd_profile_register(&a2dp_sink_profile); diff --git a/profiles/audio/avctp.c b/profiles/audio/avctp.c index 4c80727..2a5f464 100644 --- a/profiles/audio/avctp.c +++ b/profiles/audio/avctp.c @@ -320,13 +320,13 @@ static void send_key(int fd, uint16_t key, int pressed) static gboolean auto_release(gpointer user_data) { struct avctp *session = user_data; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY uint16_t op = session->key.op; #endif DBG("AV/C: key press timeout"); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (op != KEY_FASTFORWARD && op != KEY_REWIND) { session->key.timer = 0; send_key(session->uinput, op, 0); @@ -341,7 +341,7 @@ static gboolean auto_release(gpointer user_data) return FALSE; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY extern void avrcp_stop_position_timer(void); #endif @@ -353,7 +353,7 @@ static void handle_press(struct avctp *session, uint16_t op) /* Only auto release if keys are different */ if (session->key.op == op) goto done; -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY send_key(session->uinput, session->key.op, 0); #endif } @@ -376,7 +376,7 @@ static void handle_release(struct avctp *session, uint16_t op) send_key(session->uinput, op, 0); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY extern void avrcp_stop_position_timer(void); #endif @@ -435,7 +435,7 @@ static size_t handle_panel_passthrough(struct avctp *session, if (pressed) { handle_press(session, key_map[i].uinput); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (key_map[i].avc == AVC_REWIND) avrcp_stop_position_timer(); #endif @@ -813,7 +813,7 @@ static gboolean process_queue(void *user_data) return FALSE; chan->p = p; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY p->timeout = g_timeout_add_seconds(5, req_timeout, chan); #else p->timeout = g_timeout_add_seconds(2, req_timeout, chan); @@ -1394,7 +1394,7 @@ static void avctp_control_confirm(struct avctp *session, GIOChannel *chan, src = btd_adapter_get_address(device_get_adapter(dev)); dst = device_get_address(dev); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY session->auth_id = btd_request_authorization(src, dst, AVRCP_TARGET_UUID, auth_cb, session); @@ -1466,7 +1466,7 @@ static void avctp_confirm_cb(GIOChannel *chan, gpointer data) if (!device) return; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY char name[10]; device_get_name(device, name, sizeof(name)); DBG("name : %s", name); @@ -1732,7 +1732,7 @@ static gboolean repeat_timeout(gpointer user_data) struct avctp *session = user_data; avctp_passthrough_release(session, session->key.op); -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY avctp_passthrough_press(session, session->key.op); return TRUE; @@ -1743,7 +1743,7 @@ static gboolean repeat_timeout(gpointer user_data) static void release_pressed(struct avctp *session) { -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (session->key.op != AVC_FAST_FORWARD && session->key.op != AVC_REWIND) #endif avctp_passthrough_release(session, session->key.op); @@ -1796,7 +1796,7 @@ int avctp_send_passthrough(struct avctp *session, uint8_t op) return avctp_passthrough_press(session, op); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY int avctp_send_release_passthrough(struct avctp *session, uint8_t op) { DBG("+"); diff --git a/profiles/audio/avctp.h b/profiles/audio/avctp.h index b932952..e86e9cc 100644 --- a/profiles/audio/avctp.h +++ b/profiles/audio/avctp.h @@ -172,7 +172,7 @@ unsigned int avctp_register_browsing_pdu_handler(struct avctp *session, gboolean avctp_unregister_browsing_pdu_handler(unsigned int id); int avctp_send_passthrough(struct avctp *session, uint8_t op); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY int avctp_send_release_passthrough(struct avctp *session, uint8_t op); #endif int avctp_send_vendordep(struct avctp *session, uint8_t transaction, diff --git a/profiles/audio/avdtp.c b/profiles/audio/avdtp.c index 6e7410b..fd194fd 100644 --- a/profiles/audio/avdtp.c +++ b/profiles/audio/avdtp.c @@ -41,12 +41,12 @@ #include "lib/sdp_lib.h" #include "lib/uuid.h" -#ifdef __TIZEN_PATCH__ -#if defined(__BROADCOM_QOS_PATCH__) || defined(__SPRD_QOS_PATCH__) +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY +#if defined(TIZEN_FEATURE_BLUEZ_BRCM_QOS) || defined(TIZEN_FEATURE_BLUEZ_SPRD_QOS) #include #include -#endif /* __BROADCOM_QOS_PATCH__ */ -#endif /* __TIZEN_PATCH__ */ +#endif /* TIZEN_FEATURE_BLUEZ_BRCM_QOS */ +#endif /* TIZEN_FEATURE_BLUEZ_MODIFY */ #include "btio/btio.h" #include "src/log.h" @@ -55,7 +55,7 @@ #include "src/adapter.h" #include "src/device.h" -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY #include "src/service.h" #endif @@ -96,7 +96,7 @@ static unsigned int seids; #define AVDTP_MSG_TYPE_ACCEPT 0x02 #define AVDTP_MSG_TYPE_REJECT 0x03 -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY #define REQ_TIMEOUT 10 #else #define REQ_TIMEOUT 6 @@ -845,7 +845,7 @@ static void handle_transport_connect(struct avdtp *session, GIOChannel *io, goto proceed; DBG("sk %d, omtu %d, send buffer size %d", sk, omtu, buf_size); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY min_buf_size = omtu * 10; #else min_buf_size = omtu * 2; @@ -855,7 +855,7 @@ static void handle_transport_connect(struct avdtp *session, GIOChannel *io, min_buf_size); set_send_buffer_size(sk, min_buf_size); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY else { DBG("send buffer size to be decreassed to %d", min_buf_size); @@ -965,8 +965,8 @@ static void handle_unanswered_req(struct avdtp *session, pending_req_free(req); } -#ifdef __TIZEN_PATCH__ -#ifdef __BROADCOM_QOS_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY +#ifdef TIZEN_FEATURE_BLUEZ_BRCM_QOS static gboolean send_broadcom_a2dp_qos(const bdaddr_t *dst, gboolean qos_high) { int dd; @@ -1012,9 +1012,9 @@ static gboolean send_broadcom_a2dp_qos(const bdaddr_t *dst, gboolean qos_high) return TRUE; } -#endif /* __BROADCOM_QOS_PATCH__ */ +#endif /* TIZEN_FEATURE_BLUEZ_BRCM_QOS */ -#ifdef __SPRD_QOS_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_SPRD_QOS static gboolean send_sprd_a2dp_qos(bdaddr_t *dst, gboolean qos_high) { int dd; @@ -1067,9 +1067,9 @@ static gboolean send_sprd_a2dp_qos(bdaddr_t *dst, gboolean qos_high) return TRUE; } -#endif /* __SPRD_QOS_PATCH__ */ +#endif /* TIZEN_FEATURE_BLUEZ_SPRD_QOS */ -#ifdef TIZEN_WEARABLE +#ifdef TIZEN_FEATURE_BLUEZ_ROLE_CHANGE static gboolean fix_role_to_master(const bdaddr_t *dst, gboolean fix_to_master) { int dd; @@ -1128,17 +1128,17 @@ static gboolean fix_role_to_master(const bdaddr_t *dst, gboolean fix_to_master) return TRUE; } -#endif /* TIZEN_WEARABLE */ -#endif /* __TIZEN_PATCH__ */ +#endif /* TIZEN_FEATURE_BLUEZ_ROLE_CHANGE */ +#endif /* TIZEN_FEATURE_BLUEZ_MODIFY */ static void avdtp_sep_set_state(struct avdtp *session, struct avdtp_local_sep *sep, avdtp_state_t state) { struct avdtp_stream *stream = sep->stream; -#ifdef __TIZEN_PATCH__ -#if (defined(__BROADCOM_QOS_PATCH__) || defined(TIZEN_WEARABLE)) || \ - defined(__SPRD_QOS_PATCH__) +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY +#if (defined(TIZEN_FEATURE_BLUEZ_BRCM_QOS) || defined(TIZEN_FEATURE_BLUEZ_ROLE_CHANGE)) || \ + defined(TIZEN_FEATURE_BLUEZ_SPRD_QOS) const bdaddr_t *dst; dst = device_get_address(session->device); #endif @@ -1173,17 +1173,17 @@ static void avdtp_sep_set_state(struct avdtp *session, break; case AVDTP_STATE_OPEN: stream->starting = FALSE; -#ifdef __TIZEN_PATCH__ -#ifdef __BROADCOM_QOS_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY +#ifdef TIZEN_FEATURE_BLUEZ_BRCM_QOS send_broadcom_a2dp_qos(dst, FALSE); -#elif defined(__SPRD_QOS_PATCH__) +#elif defined(TIZEN_FEATURE_BLUEZ_SPRD_QOS) if (old_state == AVDTP_STATE_STREAMING) send_sprd_a2dp_qos(dst, FALSE); #endif -#ifdef TIZEN_WEARABLE +#ifdef TIZEN_FEATURE_BLUEZ_ROLE_CHANGE fix_role_to_master(dst, FALSE); -#endif /* TIZEN_WEARABLE */ -#endif /* __TIZEN_PATCH__ */ +#endif /* TIZEN_FEATURE_BLUEZ_ROLE_CHANGE */ +#endif /* TIZEN_FEATURE_BLUEZ_MODIFY */ break; case AVDTP_STATE_STREAMING: @@ -1192,17 +1192,17 @@ static void avdtp_sep_set_state(struct avdtp *session, stream->start_timer = 0; } -#ifdef __TIZEN_PATCH__ -#ifdef __BROADCOM_QOS_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY +#ifdef TIZEN_FEATURE_BLUEZ_BRCM_QOS send_broadcom_a2dp_qos(dst, TRUE); -#elif defined(__SPRD_QOS_PATCH__) +#elif defined(TIZEN_FEATURE_BLUEZ_SPRD_QOS) if (old_state == AVDTP_STATE_OPEN) send_sprd_a2dp_qos(dst, TRUE); #endif -#ifdef TIZEN_WEARABLE +#ifdef TIZEN_FEATURE_BLUEZ_ROLE_CHANGE fix_role_to_master(dst, TRUE); -#endif /* TIZEN_WEARABLE */ -#endif /* __TIZEN_PATCH__ */ +#endif /* TIZEN_FEATURE_BLUEZ_ROLE_CHANGE */ +#endif /* TIZEN_FEATURE_BLUEZ_MODIFY */ stream->open_acp = FALSE; break; case AVDTP_STATE_CLOSING: @@ -1242,7 +1242,7 @@ static void avdtp_sep_set_state(struct avdtp *session, } } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY void finalize_discovery(struct avdtp *session, int err) #else static void finalize_discovery(struct avdtp *session, int err) @@ -1330,14 +1330,14 @@ static void avdtp_free(void *data) static void connection_lost(struct avdtp *session, int err) { char address[18]; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY struct btd_service *service; #endif ba2str(device_get_address(session->device), address); DBG("Disconnected from %s", address); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY service = btd_device_get_service(session->device, A2DP_SINK_UUID); if (service) btd_service_connecting_complete(service, -err); @@ -1349,7 +1349,7 @@ static void connection_lost(struct avdtp *session, int err) avdtp_set_state(session, AVDTP_SESSION_STATE_DISCONNECTED); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY DBG("%p: ref=%d", session, session->ref); if (err != EIO && session->ref > 0) /* link loss*/ return; @@ -1361,7 +1361,7 @@ static void connection_lost(struct avdtp *session, int err) avdtp_free(session); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static gboolean disconnect_acl_timeout(gpointer user_data) { struct btd_device *device = user_data; @@ -1379,7 +1379,7 @@ static gboolean disconnect_timeout(gpointer user_data) struct avdtp *session = user_data; struct btd_service *service; gboolean stream_setup; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY struct btd_device *device = NULL; struct btd_adapter *adapter = NULL; const bdaddr_t *bdaddr = NULL; @@ -1388,7 +1388,7 @@ static gboolean disconnect_timeout(gpointer user_data) #endif /* Fix : REVERSE_INULL */ -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (session->device == NULL) { error("session device NOT found"); return FALSE; @@ -1412,7 +1412,7 @@ static gboolean disconnect_timeout(gpointer user_data) return FALSE; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (session->device) { adapter = device_get_adapter(session->device); bdaddr = device_get_address(session->device); @@ -1425,7 +1425,7 @@ static gboolean disconnect_timeout(gpointer user_data) connection_lost(session, ETIMEDOUT); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (device) g_timeout_add(100, disconnect_acl_timeout, @@ -1435,19 +1435,19 @@ static gboolean disconnect_timeout(gpointer user_data) return FALSE; } -#if defined __TIZEN_PATCH__ && defined SUPPORT_LOCAL_DEVICE_A2DP_SINK +#if defined TIZEN_FEATURE_BLUEZ_MODIFY && defined SUPPORT_LOCAL_DEVICE_A2DP_SINK static void set_disconnect_timer(struct avdtp *session, gboolean disconn) #else static void set_disconnect_timer(struct avdtp *session) #endif { -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY char name[6]; #endif if (session->dc_timer) remove_disconnect_timer(session); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY device_get_name(session->device, name, sizeof(name)); DBG("name : [%s]", name); if (g_str_equal(name, "VW BT") || g_str_equal(name, "VW MI") || @@ -1459,7 +1459,7 @@ static void set_disconnect_timer(struct avdtp *session) session); } else { #endif -#if defined __TIZEN_PATCH__ && defined SUPPORT_LOCAL_DEVICE_A2DP_SINK +#if defined TIZEN_FEATURE_BLUEZ_MODIFY && defined SUPPORT_LOCAL_DEVICE_A2DP_SINK if (disconn == TRUE) session->dc_timer = g_timeout_add(100, disconnect_timeout, @@ -1488,7 +1488,7 @@ void avdtp_unref(struct avdtp *session) if (session->ref > 0) return; -#if defined __TIZEN_PATCH__ && defined SUPPORT_LOCAL_DEVICE_A2DP_SINK +#if defined TIZEN_FEATURE_BLUEZ_MODIFY && defined SUPPORT_LOCAL_DEVICE_A2DP_SINK set_disconnect_timer(session, TRUE); #else set_disconnect_timer(session); @@ -2475,7 +2475,7 @@ static gboolean session_cb(GIOChannel *chan, GIOCondition cond, } if (session->in.message_type == AVDTP_MSG_TYPE_COMMAND) { -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY struct btd_service *service; service = btd_device_get_service(session->device, A2DP_SINK_UUID); @@ -2648,7 +2648,7 @@ static void avdtp_connect_cb(GIOChannel *chan, GError *err, gpointer user_data) NULL); if (session->stream_setup) -#if defined __TIZEN_PATCH__ && defined SUPPORT_LOCAL_DEVICE_A2DP_SINK +#if defined TIZEN_FEATURE_BLUEZ_MODIFY && defined SUPPORT_LOCAL_DEVICE_A2DP_SINK set_disconnect_timer(session, FALSE); #else set_disconnect_timer(session); @@ -2726,7 +2726,7 @@ static GIOChannel *l2cap_connect(struct avdtp *session) device_get_address(session->device), BT_IO_OPT_PSM, AVDTP_PSM, BT_IO_OPT_SEC_LEVEL, BT_IO_SEC_MEDIUM, -#if defined __TIZEN_PATCH__ && defined SUPPORT_LOCAL_DEVICE_A2DP_SINK +#if defined TIZEN_FEATURE_BLUEZ_MODIFY && defined SUPPORT_LOCAL_DEVICE_A2DP_SINK BT_IO_OPT_IMTU, 895, #endif BT_IO_OPT_INVALID); @@ -3116,7 +3116,7 @@ static gboolean avdtp_abort_resp(struct avdtp *session, struct seid_rej *resp, int size) { struct avdtp_local_sep *sep = stream->lsep; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (!sep) { error("Error in getting sep"); return FALSE; @@ -3743,7 +3743,7 @@ int avdtp_start(struct avdtp *session, struct avdtp_stream *stream) /* If timer already active wait it */ if (stream->start_timer) return 0; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY else { char address[18]; uint32_t timeout_sec = START_TIMEOUT; diff --git a/profiles/audio/avdtp.h b/profiles/audio/avdtp.h index ec0b9f1..54591aa 100644 --- a/profiles/audio/avdtp.h +++ b/profiles/audio/avdtp.h @@ -230,7 +230,7 @@ int avdtp_discover(struct avdtp *session, avdtp_discover_cb_t cb, gboolean avdtp_has_stream(struct avdtp *session, struct avdtp_stream *stream); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY void finalize_discovery(struct avdtp *session, int err); #endif diff --git a/profiles/audio/avrcp.c b/profiles/audio/avrcp.c index dafa974..4917a54 100644 --- a/profiles/audio/avrcp.c +++ b/profiles/audio/avrcp.c @@ -137,7 +137,7 @@ #define AVRCP_CHARSET_UTF8 106 #define AVRCP_BROWSING_TIMEOUT 1 -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY #define AVRCP_CT_VERSION 0x0103 #define AVRCP_TG_VERSION 0x0103 #else @@ -279,7 +279,7 @@ struct avrcp { uint8_t transaction; uint8_t transaction_events[AVRCP_EVENT_LAST + 1]; struct pending_pdu *pending_pdu; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY uint32_t playback_status_id; #endif }; @@ -299,11 +299,11 @@ struct control_pdu_handler { static GSList *servers = NULL; static unsigned int avctp_id = 0; -#ifdef __TIZEN_PATCH__ -#ifdef SUPPORT_AVRCP_TARGET +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY +#ifdef TIZEN_FEATURE_BLUEZ_AVRCP_TARGET static uint16_t adapter_avrcp_tg_ver = 0; #endif -#ifdef SUPPORT_AVRCP_CONTROL +#ifdef TIZEN_FEATURE_BLUEZ_AVRCP_CONTROL static uint16_t adapter_avrcp_ct_ver = 0; #endif #endif @@ -322,13 +322,13 @@ static uint32_t company_ids[] = { static void avrcp_register_notification(struct avrcp *session, uint8_t event); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static GList *player_list_settings(struct avrcp_player *player); void avrcp_stop_position_timer(void); unsigned int pos_timer_id = 0; #endif -#ifdef SUPPORT_AVRCP_CONTROL +#ifdef TIZEN_FEATURE_BLUEZ_AVRCP_CONTROL static sdp_record_t *avrcp_ct_record(void) { sdp_list_t *svclass_id, *pfseq, *apseq, *apseq1, *root; @@ -338,7 +338,7 @@ static sdp_record_t *avrcp_ct_record(void) sdp_record_t *record; sdp_data_t *psm[2], *version, *features; uint16_t lp = AVCTP_CONTROL_PSM, ap = AVCTP_BROWSING_PSM; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY uint16_t avctp_ver = 0x0104; uint16_t feat = 0; #ifdef ENABLE_AVRCP_CATEGORY1 @@ -405,7 +405,7 @@ static sdp_record_t *avrcp_ct_record(void) /* Bluetooth Profile Descriptor List */ sdp_uuid16_create(&profile[0].uuid, AV_REMOTE_PROFILE_ID); profile[0].version = AVRCP_CT_VERSION; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY adapter_avrcp_ct_ver = AVRCP_CT_VERSION; #endif pfseq = sdp_list_append(NULL, &profile[0]); @@ -435,7 +435,7 @@ static sdp_record_t *avrcp_ct_record(void) } #endif -#ifdef SUPPORT_AVRCP_TARGET +#ifdef TIZEN_FEATURE_BLUEZ_AVRCP_TARGET static sdp_record_t *avrcp_tg_record(void) { sdp_list_t *svclass_id, *pfseq, *apseq, *root, *apseq_browsing; @@ -444,13 +444,13 @@ static sdp_record_t *avrcp_tg_record(void) sdp_list_t *aproto_control, *proto_control[2]; sdp_record_t *record; sdp_data_t *psm_control, *version, *features, *psm_browsing; -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY sdp_list_t *aproto_browsing; #endif sdp_list_t *proto_browsing[2] = {0}; uint16_t lp = AVCTP_CONTROL_PSM; uint16_t lp_browsing = AVCTP_BROWSING_PSM; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY uint16_t avctp_ver = 0x0104; uint16_t feat = 0; #ifdef ENABLE_AVRCP_CATEGORY1 @@ -506,7 +506,7 @@ static sdp_record_t *avrcp_tg_record(void) proto_browsing[1] = sdp_list_append(proto_browsing[1], version); apseq_browsing = sdp_list_append(apseq_browsing, proto_browsing[1]); -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY aproto_browsing = sdp_list_append(NULL, apseq_browsing); sdp_set_add_access_protos(record, aproto_browsing); #endif @@ -514,7 +514,7 @@ static sdp_record_t *avrcp_tg_record(void) /* Bluetooth Profile Descriptor List */ sdp_uuid16_create(&profile[0].uuid, AV_REMOTE_PROFILE_ID); profile[0].version = AVRCP_TG_VERSION; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY adapter_avrcp_tg_ver = AVRCP_TG_VERSION; #endif pfseq = sdp_list_append(NULL, &profile[0]); @@ -529,7 +529,7 @@ static sdp_record_t *avrcp_tg_record(void) sdp_list_free(proto_browsing[0], NULL); sdp_list_free(proto_browsing[1], NULL); sdp_list_free(apseq_browsing, NULL); -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY sdp_list_free(aproto_browsing, NULL); #endif @@ -553,13 +553,13 @@ static unsigned int attr_get_max_val(uint8_t attr) case AVRCP_ATTRIBUTE_EQUALIZER: return AVRCP_EQUALIZER_ON; case AVRCP_ATTRIBUTE_REPEAT_MODE: -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY return AVRCP_REPEAT_MODE_ALL; #else return AVRCP_REPEAT_MODE_GROUP; #endif case AVRCP_ATTRIBUTE_SHUFFLE: -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY return AVRCP_SHUFFLE_ALL; #else return AVRCP_SHUFFLE_GROUP; @@ -742,7 +742,7 @@ void avrcp_player_event(struct avrcp_player *player, uint8_t id, GSList *l; int attr; int val; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY uint32_t *position_val = NULL; GList *settings; #endif @@ -785,7 +785,7 @@ void avrcp_player_event(struct avrcp_player *player, uint8_t id, break; case AVRCP_EVENT_SETTINGS_CHANGED: size = 2; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY settings = player_list_settings(player); pdu->params[1] = g_list_length(settings); for (; settings; settings = settings->next) { @@ -817,7 +817,7 @@ void avrcp_player_event(struct avrcp_player *player, uint8_t id, pdu->params[size++] = val; #endif /* __TIZEN__PATCH__ */ break; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY case AVRCP_EVENT_PLAYBACK_POS_CHANGED: size = 5; position_val = (uint32_t *) data; @@ -843,7 +843,7 @@ void avrcp_player_event(struct avrcp_player *player, uint8_t id, done: pdu->params_len = htons(size); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (id == AVRCP_EVENT_PLAYBACK_POS_CHANGED && pos_timer_id > 0) { /* Remove the timer function which was added for register notification. @@ -1034,7 +1034,7 @@ static const char *attrval_to_str(uint8_t attr, uint8_t value) return "singletrack"; case AVRCP_REPEAT_MODE_ALL: return "alltracks"; -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY case AVRCP_REPEAT_MODE_GROUP: return "group"; #endif @@ -1049,7 +1049,7 @@ static const char *attrval_to_str(uint8_t attr, uint8_t value) return "off"; case AVRCP_SCAN_ALL: return "alltracks"; -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY case AVRCP_SCAN_GROUP: return "group"; #endif @@ -1544,7 +1544,7 @@ static GList *player_list_settings(struct avrcp_player *player) return player->cb->list_settings(player->user_data); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static uint32_t player_get_playback_position(struct avrcp_player *player) { if (player == NULL) @@ -1635,7 +1635,7 @@ static bool handle_passthrough(struct avctp *conn, uint8_t op, bool pressed, return handler->func(session); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY void avrcp_stop_position_timer(void) { if (pos_timer_id > 0) { @@ -1670,7 +1670,7 @@ static uint8_t avrcp_handle_register_notification(struct avrcp *session, struct btd_device *dev = session->dev; uint16_t len = ntohs(pdu->params_len); uint64_t uid; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY uint32_t playback_interval; uint32_t playback_position; uint8_t play_status; @@ -1746,7 +1746,7 @@ static uint8_t avrcp_handle_register_notification(struct avrcp *session, len = 2; break; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY case AVRCP_EVENT_PLAYBACK_POS_CHANGED: len = 5; @@ -3028,7 +3028,7 @@ static int ct_press(struct avrcp_player *player, uint8_t op) return 0; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static int ct_release(struct avrcp_player *player, uint8_t op) { DBG("+"); @@ -3081,7 +3081,7 @@ static int ct_previous(struct media_player *mp, void *user_data) return ct_press(player, AVC_BACKWARD); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static int ct_press_fast_forward(struct media_player *mp, void *user_data) { DBG("+"); @@ -3430,7 +3430,7 @@ static const struct media_player_callback ct_cbs = { .stop = ct_stop, .next = ct_next, .previous = ct_previous, -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY .press_fast_forward = ct_press_fast_forward, .release_fast_forward = ct_release_fast_forward, .press_rewind = ct_press_rewind, @@ -3568,7 +3568,7 @@ static void player_destroy(gpointer data) if (player->destroy) player->destroy(player->user_data); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY avrcp_stop_position_timer(); #endif @@ -3869,7 +3869,7 @@ static void avrcp_register_notification(struct avrcp *session, uint8_t event) avrcp_handle_event, session); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static char *avrcp_event_to_string(uint8_t event) { @@ -3930,7 +3930,7 @@ static gboolean avrcp_get_capabilities_resp(struct avctp *conn, uint8_t event = pdu->params[1 + count]; events |= (1 << event); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY DBG("Supported Event %s", avrcp_event_to_string(event)); #endif switch (event) { @@ -3938,7 +3938,7 @@ static gboolean avrcp_get_capabilities_resp(struct avctp *conn, case AVRCP_EVENT_TRACK_CHANGED: case AVRCP_EVENT_PLAYBACK_POS_CHANGED: case AVRCP_EVENT_SETTINGS_CHANGED: -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY case AVRCP_EVENT_ADDRESSED_PLAYER_CHANGED: case AVRCP_EVENT_UIDS_CHANGED: case AVRCP_EVENT_AVAILABLE_PLAYERS_CHANGED: @@ -3963,7 +3963,7 @@ static gboolean avrcp_get_capabilities_resp(struct avctp *conn, if (!(events & (1 << AVRCP_EVENT_STATUS_CHANGED))) avrcp_get_element_attributes(session); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if ((events & (1 << AVRCP_EVENT_STATUS_CHANGED)) == 0) { session->playback_status_id = g_timeout_add_seconds(1, avrcp_get_playback_status, session); @@ -4080,7 +4080,7 @@ static void avrcp_connect_browsing(struct avrcp *session) session); } -#ifdef SUPPORT_AVRCP_TARGET +#ifdef TIZEN_FEATURE_BLUEZ_AVRCP_TARGET static void target_init(struct avrcp *session) { struct avrcp_server *server = session->server; @@ -4107,11 +4107,11 @@ static void target_init(struct avrcp *session) session->supported_events |= (1 << AVRCP_EVENT_STATUS_CHANGED) | (1 << AVRCP_EVENT_TRACK_CHANGED) | -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY (1 << AVRCP_EVENT_TRACK_REACHED_START) | (1 << AVRCP_EVENT_TRACK_REACHED_END) | #endif -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY (1 << AVRCP_EVENT_PLAYBACK_POS_CHANGED) | #endif (1 << AVRCP_EVENT_SETTINGS_CHANGED); @@ -4119,7 +4119,7 @@ static void target_init(struct avrcp *session) if (target->version < 0x0104) return; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (adapter_avrcp_tg_ver < 0x0104) return; #endif @@ -4140,7 +4140,7 @@ static void target_init(struct avrcp *session) } #endif -#ifdef SUPPORT_AVRCP_CONTROL +#ifdef TIZEN_FEATURE_BLUEZ_AVRCP_CONTROL static void controller_init(struct avrcp *session) { struct avrcp_player *player; @@ -4155,7 +4155,7 @@ static void controller_init(struct avrcp *session) DBG("%p version 0x%04x", controller, controller->version); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if ((controller->version >= 0x0104) && (adapter_avrcp_ct_ver >= 0x0104)) session->supported_events |= (1 << AVRCP_EVENT_VOLUME_CHANGED); #endif @@ -4179,7 +4179,7 @@ static void controller_init(struct avrcp *session) if (controller->version < 0x0104) return; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (adapter_avrcp_ct_ver < 0x0104) return; #endif @@ -4203,11 +4203,11 @@ static void session_init_control(struct avrcp *session) handle_vendordep_pdu, session); session->control_handlers = control_handlers; -#ifdef SUPPORT_AVRCP_CONTROL +#ifdef TIZEN_FEATURE_BLUEZ_AVRCP_CONTROL if (btd_device_get_service(session->dev, AVRCP_TARGET_UUID) != NULL) controller_init(session); #endif -#ifdef SUPPORT_AVRCP_TARGET +#ifdef TIZEN_FEATURE_BLUEZ_AVRCP_TARGET if (btd_device_get_service(session->dev, AVRCP_REMOTE_UUID) != NULL) target_init(session); #endif @@ -4244,7 +4244,7 @@ static void session_destroy(struct avrcp *session, int err) server->sessions = g_slist_remove(server->sessions, session); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (session->playback_status_id > 0) { DBG("Removing the timer for playback status polling"); g_source_remove(session->playback_status_id); @@ -4572,12 +4572,12 @@ static int avrcp_connect(struct btd_service *service) { struct btd_device *dev = btd_service_get_device(service); const char *path = device_get_path(dev); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY char name[10]; #endif DBG("path %s", path); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY device_get_name(dev, name, sizeof(name)); DBG("name : %s", name); if (g_str_equal(name, "PLT_M50")) { @@ -4612,7 +4612,7 @@ static void avrcp_target_remove(struct btd_service *service) control_unregister(service); } -#ifdef SUPPORT_AVRCP_TARGET +#ifdef TIZEN_FEATURE_BLUEZ_AVRCP_TARGET static void avrcp_target_server_remove(struct btd_profile *p, struct btd_adapter *adapter) { @@ -4634,7 +4634,7 @@ static void avrcp_target_server_remove(struct btd_profile *p, } #endif -#ifdef SUPPORT_AVRCP_TARGET +#ifdef TIZEN_FEATURE_BLUEZ_AVRCP_TARGET static int avrcp_target_server_probe(struct btd_profile *p, struct btd_adapter *adapter) { @@ -4680,7 +4680,7 @@ static struct btd_profile avrcp_target_profile = { .connect = avrcp_connect, .disconnect = avrcp_disconnect, -#ifdef SUPPORT_AVRCP_TARGET +#ifdef TIZEN_FEATURE_BLUEZ_AVRCP_TARGET .adapter_probe = avrcp_target_server_probe, .adapter_remove = avrcp_target_server_remove, #endif @@ -4700,7 +4700,7 @@ static void avrcp_controller_remove(struct btd_service *service) control_unregister(service); } -#ifdef SUPPORT_AVRCP_CONTROL +#ifdef TIZEN_FEATURE_BLUEZ_AVRCP_CONTROL static void avrcp_controller_server_remove(struct btd_profile *p, struct btd_adapter *adapter) { @@ -4722,7 +4722,7 @@ static void avrcp_controller_server_remove(struct btd_profile *p, } #endif -#ifdef SUPPORT_AVRCP_CONTROL +#ifdef TIZEN_FEATURE_BLUEZ_AVRCP_CONTROL static int avrcp_controller_server_probe(struct btd_profile *p, struct btd_adapter *adapter) { @@ -4768,7 +4768,7 @@ static struct btd_profile avrcp_controller_profile = { .connect = avrcp_connect, .disconnect = avrcp_disconnect, -#ifdef SUPPORT_AVRCP_CONTROL +#ifdef TIZEN_FEATURE_BLUEZ_AVRCP_CONTROL .adapter_probe = avrcp_controller_server_probe, .adapter_remove = avrcp_controller_server_remove, #endif diff --git a/profiles/audio/media.c b/profiles/audio/media.c index dacdc5f..33ed69b 100644 --- a/profiles/audio/media.c +++ b/profiles/audio/media.c @@ -44,7 +44,7 @@ #include "src/dbus-common.h" #include "src/profile.h" -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY #include "src/service.h" #endif @@ -58,7 +58,7 @@ #include "transport.h" #include "a2dp.h" #include "avrcp.h" -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY #include "sink.h" #endif @@ -69,7 +69,7 @@ #define REQUEST_TIMEOUT (3 * 1000) /* 3 seconds */ -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY #define SINK_SUSPEND_TIMEOUT 4 /* 4 seconds */ unsigned int suspend_timer_id = 0; @@ -118,7 +118,7 @@ struct media_player { guint watch; guint properties_watch; guint seek_watch; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY guint sink_watch; #endif char *status; @@ -136,7 +136,7 @@ struct media_player { static GSList *adapters = NULL; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static gboolean set_avrcp_status = FALSE; static gboolean send_track_changed_event = FALSE; @@ -263,7 +263,7 @@ static void clear_configuration(struct media_endpoint *endpoint, { DBusMessage *msg; const char *path; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY struct media_player *mp; #endif @@ -281,7 +281,7 @@ static void clear_configuration(struct media_endpoint *endpoint, g_dbus_send_message(btd_get_dbus_connection(), msg); done: endpoint->transports = g_slist_remove(endpoint->transports, transport); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if ((mp = media_adapter_get_player(endpoint->adapter))) if (mp->sink_watch) { sink_remove_state_cb(mp->sink_watch); @@ -451,7 +451,7 @@ static struct media_transport *find_device_transport( return match->data; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY struct media_player * media_adapter_get_player(struct media_adapter * adapter) { GSList *l; @@ -506,7 +506,7 @@ static void media_sink_state_changed_cb(struct btd_service *service, if ((old_state == SINK_STATE_PLAYING) && (new_state == SINK_STATE_CONNECTED)) { -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY struct btd_device *device = btd_service_get_device(service); char name[20] = {0,}; #endif @@ -517,7 +517,7 @@ static void media_sink_state_changed_cb(struct btd_service *service, media_stop_suspend_timer(); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY device_get_name(device, name, sizeof(name)); DBG("Name : %s", name); @@ -527,7 +527,7 @@ static void media_sink_state_changed_cb(struct btd_service *service, suspend_timer_id = g_timeout_add_seconds(SINK_SUSPEND_TIMEOUT, media_reset_mp_status, mp); DBG("SINK SUSPEND TIMEOUT started"); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY } #endif } @@ -537,7 +537,7 @@ static void media_sink_state_changed_cb(struct btd_service *service, (new_state == SINK_STATE_PLAYING)) { struct btd_device *device = btd_service_get_device(service); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY char name[20] = {0,}; #else char name[20]; @@ -604,7 +604,7 @@ static gboolean set_configuration(struct media_endpoint *endpoint, const char *path; DBusMessageIter iter; struct media_transport *transport; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY struct media_adapter *adapter; struct media_player *mp; #endif @@ -628,7 +628,7 @@ static gboolean set_configuration(struct media_endpoint *endpoint, return FALSE; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY set_avrcp_status = FALSE; adapter = find_adapter(device); if ((mp = media_adapter_get_player(adapter))) @@ -1057,7 +1057,7 @@ static DBusMessage *register_endpoint(DBusConnection *conn, DBusMessage *msg, if (parse_properties(&props, &uuid, &delay_reporting, &codec, &capabilities, &size) < 0) return btd_error_invalid_args(msg); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if(!a2dp_sink_support && !g_strcmp0(uuid, A2DP_SINK_UUID)) { error("A2DP sink role is not supported."); return btd_error_not_supported(msg); @@ -1162,7 +1162,7 @@ static void media_player_free(gpointer data) if (mp->settings) g_hash_table_unref(mp->settings); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY media_stop_suspend_timer(); if (mp->sink_watch) @@ -1331,7 +1331,7 @@ static uint64_t get_uid(void *user_data) if (mp->track == NULL) return UINT64_MAX; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (!g_hash_table_lookup(mp->track, "Title")) return UINT64_MAX; #endif @@ -1514,7 +1514,7 @@ static void media_player_exit(DBusConnection *connection, void *user_data) static gboolean set_status(struct media_player *mp, DBusMessageIter *iter) { const char *value; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY uint32_t playback_position; #endif @@ -1534,7 +1534,7 @@ static gboolean set_status(struct media_player *mp, DBusMessageIter *iter) mp->status = g_strdup(value); avrcp_player_event(mp->player, AVRCP_EVENT_STATUS_CHANGED, mp->status); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (strcasecmp(mp->status, "reverse-seek") != 0 && strcasecmp(mp->status, "playing") != 0) { playback_position = get_position(mp); @@ -1548,17 +1548,17 @@ static gboolean set_status(struct media_player *mp, DBusMessageIter *iter) static gboolean set_position(struct media_player *mp, DBusMessageIter *iter) { -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY uint32_t value; #else uint64_t value; const char *status; #endif -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY uint32_t playback_position; #endif -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY if (dbus_message_iter_get_arg_type(iter) != DBUS_TYPE_INT64) return FALSE; #else @@ -1567,11 +1567,11 @@ static gboolean set_position(struct media_player *mp, DBusMessageIter *iter) #endif dbus_message_iter_get_basic(iter, &value); -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY value /= 1000; #endif DBG("Value %d", value); -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY if (value > get_position(mp)) status = "forward-seek"; else @@ -1586,7 +1586,7 @@ static gboolean set_position(struct media_player *mp, DBusMessageIter *iter) if (!mp->position) { avrcp_player_event(mp->player, AVRCP_EVENT_TRACK_REACHED_START, NULL); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY playback_position = get_position(mp); avrcp_player_event(mp->player, AVRCP_EVENT_PLAYBACK_POS_CHANGED, &playback_position); @@ -1602,7 +1602,7 @@ static gboolean set_position(struct media_player *mp, DBusMessageIter *iter) if (mp->position == UINT32_MAX || mp->position >= mp->duration) { avrcp_player_event(mp->player, AVRCP_EVENT_TRACK_REACHED_END, NULL); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY playback_position = get_position(mp); avrcp_player_event(mp->player, AVRCP_EVENT_PLAYBACK_POS_CHANGED, &playback_position); @@ -1610,11 +1610,11 @@ static gboolean set_position(struct media_player *mp, DBusMessageIter *iter) return TRUE; } -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY /* Send a status change to force resync the position */ avrcp_player_event(mp->player, AVRCP_EVENT_STATUS_CHANGED, status); #endif -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY playback_position = get_position(mp); avrcp_player_event(mp->player, AVRCP_EVENT_PLAYBACK_POS_CHANGED, &playback_position); @@ -1626,7 +1626,7 @@ static gboolean set_position(struct media_player *mp, DBusMessageIter *iter) static void set_metadata(struct media_player *mp, const char *key, const char *value) { -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY const char *current_value = NULL; current_value = g_hash_table_lookup(mp->track, key); @@ -1694,7 +1694,7 @@ static gboolean parse_int64_metadata(struct media_player *mp, const char *key, dbus_message_iter_get_basic(iter, &value); if (strcasecmp(key, "Duration") == 0) { -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY value /= 1000; #endif mp->duration = value; @@ -1737,7 +1737,7 @@ static gboolean parse_player_metadata(struct media_player *mp, int ctype; gboolean title = FALSE; uint64_t uid; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY uint32_t playback_position; #endif @@ -1747,7 +1747,7 @@ static gboolean parse_player_metadata(struct media_player *mp, dbus_message_iter_recurse(iter, &dict); -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY if (mp->track != NULL) g_hash_table_unref(mp->track); @@ -1791,7 +1791,7 @@ static gboolean parse_player_metadata(struct media_player *mp, } else if (strcasecmp(key, "mpris:length") == 0) { if (!parse_int64_metadata(mp, "Duration", &var)) return FALSE; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY } else if (strcasecmp(key, "xesam:totalTracks") == 0) { if (!parse_int32_metadata(mp, "NumberOfTracks", &var)) return FALSE; @@ -1809,7 +1809,7 @@ static gboolean parse_player_metadata(struct media_player *mp, g_hash_table_insert(mp->track, g_strdup("Title"), g_strdup("")); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (send_track_changed_event) { uid = get_uid(mp); avrcp_player_event(mp->player, @@ -2078,7 +2078,7 @@ static struct media_player *media_player_create(struct media_adapter *adapter, mp->settings = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY mp->track = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free); #endif diff --git a/profiles/audio/player.c b/profiles/audio/player.c index 436d193..e39f04a 100644 --- a/profiles/audio/player.c +++ b/profiles/audio/player.c @@ -534,7 +534,7 @@ static DBusMessage *media_player_previous(DBusConnection *conn, return g_dbus_create_reply(msg, DBUS_TYPE_INVALID); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static DBusMessage *media_player_press_fast_forward(DBusConnection *conn, DBusMessage *msg, void *data) { @@ -801,7 +801,7 @@ static const GDBusMethodTable media_player_methods[] = { { GDBUS_METHOD("Stop", NULL, NULL, media_player_stop) }, { GDBUS_METHOD("Next", NULL, NULL, media_player_next) }, { GDBUS_METHOD("Previous", NULL, NULL, media_player_previous) }, -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY { GDBUS_METHOD("PressFastForward", NULL, NULL, media_player_press_fast_forward) }, { GDBUS_METHOD("ReleaseFastForward", NULL, NULL, media_player_release_fast_forward) }, { GDBUS_METHOD("PressRewind", NULL, NULL, media_player_press_rewind) }, @@ -1413,7 +1413,7 @@ void media_player_set_metadata(struct media_player *mp, struct media_item *item, const char *key, void *data, size_t len) { -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY char *value; char *end, *temp; #else @@ -1422,7 +1422,7 @@ void media_player_set_metadata(struct media_player *mp, value = g_strndup(data, len); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY temp = value; while (g_utf8_validate(temp, -1, (const gchar **)&end) == FALSE) { temp = g_utf8_find_next_char(end, NULL); @@ -1437,7 +1437,7 @@ void media_player_set_metadata(struct media_player *mp, DBG("%s: %s", key, value); -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY curval = g_hash_table_lookup(mp->track, key); if (g_strcmp0(curval, value) == 0) { g_free(value); diff --git a/profiles/audio/player.h b/profiles/audio/player.h index c560ec2..280a8ac 100644 --- a/profiles/audio/player.h +++ b/profiles/audio/player.h @@ -52,7 +52,7 @@ struct media_player_callback { int (*stop) (struct media_player *mp, void *user_data); int (*next) (struct media_player *mp, void *user_data); int (*previous) (struct media_player *mp, void *user_data); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY int (*press_fast_forward) (struct media_player *mp, void *user_data); int (*release_fast_forward) (struct media_player *mp, void *user_data); int (*press_rewind) (struct media_player *mp, void *user_data); diff --git a/profiles/audio/sink.c b/profiles/audio/sink.c index e2751ab..4843bbe 100644 --- a/profiles/audio/sink.c +++ b/profiles/audio/sink.c @@ -106,14 +106,14 @@ static void sink_set_state(struct sink *sink, sink_state_t new_state) if (new_state != SINK_STATE_DISCONNECTED) return; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY btd_service_disconnecting_complete(service, 0); #endif if (sink->session) { avdtp_unref(sink->session); sink->session = NULL; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY sink->connect_id = 0; sink->disconnect_id = 0; #endif @@ -156,7 +156,7 @@ static void stream_state_changed(struct avdtp_stream *stream, switch (new_state) { case AVDTP_STATE_IDLE: -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY btd_service_disconnecting_complete(sink->service, 0); #endif @@ -202,7 +202,7 @@ static void stream_setup_complete(struct avdtp *session, struct a2dp_sep *sep, avdtp_unref(sink->session); sink->session = NULL; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (err && avdtp_error_category(err) == AVDTP_ERRNO && avdtp_error_posix_errno(err) != EHOSTDOWN) #else @@ -301,7 +301,7 @@ int sink_connect(struct btd_service *service) { struct sink *sink = btd_service_get_user_data(service); -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY if (!sink->session) sink->session = a2dp_avdtp_get(btd_service_get_device(service)); @@ -320,7 +320,7 @@ int sink_connect(struct btd_service *service) if (sink->stream_state >= AVDTP_STATE_OPEN) return -EALREADY; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (!sink->session) sink->session = a2dp_avdtp_get(btd_service_get_device(service)); @@ -348,7 +348,7 @@ static void sink_free(struct btd_service *service) avdtp_stream_remove_cb(sink->session, sink->stream, sink->cb_id); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (sink->session) { /* We need to clear the avdtp discovery procedure */ finalize_discovery(sink->session, ECANCELED); diff --git a/profiles/gap/gas.c b/profiles/gap/gas.c index 35e4753..256a9be 100644 --- a/profiles/gap/gas.c +++ b/profiles/gap/gas.c @@ -164,7 +164,7 @@ static void handle_appearance(struct gas *gas, uint16_t value_handle) DBG("Failed to send request to read appearance"); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static void read_rpa_res_characteristic_value_cb(bool success, uint8_t att_ecode, const uint8_t *value, uint16_t length, void *user_data) @@ -224,7 +224,7 @@ static void handle_characteristic(struct gatt_db_attribute *attr, handle_device_name(gas, value_handle); else if (uuid_cmp(GATT_CHARAC_APPEARANCE, &uuid)) handle_appearance(gas, value_handle); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY else if (uuid_cmp(GATT_CHARAC_CENTRAL_RPA_RESOLUTION, &uuid)) handle_rpa_res_characteristic_value(gas, value_handle); #endif diff --git a/profiles/network/bnep.c b/profiles/network/bnep.c index c03c2c8..86d1eb9 100644 --- a/profiles/network/bnep.c +++ b/profiles/network/bnep.c @@ -54,7 +54,7 @@ static int ctl; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY /* Compatibility with old ioctls */ #define OLD_BNEPCONADD 1 #define OLD_BNEPCONDEL 2 @@ -101,7 +101,7 @@ int bnep_init(void) return err; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY /* Temporary ioctl compatibility hack */ { struct bnep_connlist_req req; @@ -215,7 +215,7 @@ static int bnep_if_down(const char *devname) sk = socket(AF_INET, SOCK_DGRAM, 0); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (sk < 0) return -1; #endif @@ -461,7 +461,7 @@ void bnep_disconnect(struct bnep *session) if (!session) return; -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY if (session->watch > 0) { g_source_remove(session->watch); session->watch = 0; @@ -476,7 +476,7 @@ void bnep_disconnect(struct bnep *session) bnep_conndel(&session->dst_addr); } -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY static int bnep_add_to_bridge(const char *devname, const char *bridge) { int ifindex; @@ -491,7 +491,7 @@ static int bnep_add_to_bridge(const char *devname, const char *bridge) sk = socket(AF_INET, SOCK_STREAM, 0); if (sk < 0) return -1; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY err = ioctl(sk, SIOCBRADDBR, bridge); if (err < 0) { @@ -654,7 +654,7 @@ static uint16_t bnep_setup_decode(int sk, struct bnep_setup_conn_req *req, return BNEP_CONN_INVALID_DST; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY int bnep_if_down_wrapper(const char *devname) { bnep_if_down(devname); @@ -688,7 +688,7 @@ static int bnep_server_add_legacy(int sk, uint16_t dst, char *bridge, goto reply; } -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY err = bnep_add_to_bridge(iface, bridge); if (err < 0) { bnep_conndel(addr); @@ -765,7 +765,7 @@ int bnep_server_add(int sk, char *bridge, char *iface, const bdaddr_t *addr, goto failed; } -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY err = bnep_add_to_bridge(iface, bridge); if (err < 0) goto failed_conn; @@ -780,7 +780,7 @@ int bnep_server_add(int sk, char *bridge, char *iface, const bdaddr_t *addr, failed_bridge: bnep_del_from_bridge(iface, bridge); -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY failed_conn: #endif bnep_conndel(addr); diff --git a/profiles/network/bnep.h b/profiles/network/bnep.h index f915cf3..d34ed03 100644 --- a/profiles/network/bnep.h +++ b/profiles/network/bnep.h @@ -40,7 +40,7 @@ void bnep_disconnect(struct bnep *session); int bnep_server_add(int sk, char *bridge, char *iface, const bdaddr_t *addr, uint8_t *setup_data, int len); void bnep_server_delete(char *bridge, char *iface, const bdaddr_t *addr); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY int bnep_if_down_wrapper(const char *devname); int bnep_conndel_wrapper(const bdaddr_t *dst); #endif diff --git a/profiles/network/connection.c b/profiles/network/connection.c index c86f679..53d35fe 100644 --- a/profiles/network/connection.c +++ b/profiles/network/connection.c @@ -123,7 +123,7 @@ static void bnep_disconn_cb(gpointer data) DBusConnection *conn = btd_get_dbus_connection(); const char *path = device_get_path(nc->peer->device); -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY g_dbus_emit_property_changed(conn, path, NETWORK_PEER_INTERFACE, "Connected"); g_dbus_emit_property_changed(conn, path, @@ -139,7 +139,7 @@ static void bnep_disconn_cb(gpointer data) info("%s disconnected", nc->dev); nc->state = DISCONNECTED; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY g_dbus_emit_property_changed(conn, path, NETWORK_PEER_INTERFACE, "Connected"); g_dbus_emit_property_changed(conn, path, @@ -189,7 +189,7 @@ static void cancel_connection(struct network_conn *nc, int err) if (nc->state == CONNECTED) bnep_disconnect(nc->session); -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY bnep_free(nc->session); nc->session = NULL; #endif @@ -237,7 +237,7 @@ static void bnep_conn_cb(char *iface, int err, void *data) conn = btd_get_dbus_connection(); path = device_get_path(nc->peer->device); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY nc->state = CONNECTED; #endif g_dbus_emit_property_changed(conn, path, @@ -247,7 +247,7 @@ static void bnep_conn_cb(char *iface, int err, void *data) g_dbus_emit_property_changed(conn, path, NETWORK_PEER_INTERFACE, "UUID"); -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY nc->state = CONNECTED; #endif nc->dc_id = device_add_disconnect_watch(nc->peer->device, disconnect_cb, diff --git a/profiles/network/server.c b/profiles/network/server.c index 6e1023d..814bb24 100644 --- a/profiles/network/server.c +++ b/profiles/network/server.c @@ -86,7 +86,7 @@ struct network_server { static GSList *adapters = NULL; static gboolean security = TRUE; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static gboolean server_disconnected_cb(GIOChannel *chan, GIOCondition cond, gpointer user_data); #endif @@ -156,7 +156,7 @@ static struct network_server *find_server_by_uuid(GSList *list, return NULL; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static struct network_session *find_session(GSList *list, GIOChannel *io) { GSList *l; @@ -197,7 +197,7 @@ static sdp_record_t *server_record_new(const char *name, uint16_t id) sdp_data_t *v, *p; uint16_t psm = BNEP_PSM, version = 0x0100; uint16_t security_desc = (security ? 0x0001 : 0x0000); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY uint16_t net_access_type = 0x000a; uint32_t max_net_access_rate = 0x001312d0; #else @@ -345,7 +345,7 @@ static void setup_destroy(void *user_data) session_free(setup); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static gboolean server_disconnected_cb(GIOChannel *chan, GIOCondition cond, gpointer user_data) { @@ -473,7 +473,7 @@ static gboolean bnep_setup(GIOChannel *chan, packet, n) < 0) error("BNEP server cannot be added"); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (ns) { /* Emit connected signal to BT application */ const gchar *adapter_path = adapter_get_path(na->adapter); @@ -633,7 +633,7 @@ static void server_remove_sessions(struct network_server *ns) bnep_server_delete(ns->bridge, session->dev, &session->dst); } -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY g_slist_free_full(ns->sessions, session_free); ns->sessions = NULL; @@ -710,7 +710,7 @@ static DBusMessage *unregister_server(DBusConnection *conn, if (!ns) return btd_error_failed(msg, "Invalid UUID"); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (!ns->record_id) return btd_error_not_available(msg); #endif @@ -770,7 +770,7 @@ static void path_unregister(void *data) adapter_free(na); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static DBusMessage *disconnect_device(DBusConnection *conn, DBusMessage *msg, void *data) { @@ -848,7 +848,7 @@ static DBusMessage *get_properties(DBusConnection *conn, } #endif -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static GDBusSignalTable server_signals[] = { { GDBUS_SIGNAL("PeerConnected", GDBUS_ARGS({ "device", "s" }, { "address", "s" })) }, @@ -865,7 +865,7 @@ static const GDBusMethodTable server_methods[] = { { GDBUS_METHOD("Unregister", GDBUS_ARGS({ "uuid", "s" }), NULL, unregister_server) }, -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY { GDBUS_METHOD("Disconnect", GDBUS_ARGS({ "address", "s" }), NULL, disconnect_device) }, @@ -931,7 +931,7 @@ int server_register(struct btd_adapter *adapter, uint16_t id) if (g_slist_length(na->servers) > 0) goto done; -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY if (!g_dbus_register_interface(btd_get_dbus_connection(), path, NETWORK_SERVER_INTERFACE, server_methods, NULL, NULL, na, diff --git a/profiles/proximity/immalert.c b/profiles/proximity/immalert.c index 3448625..adf9140 100644 --- a/profiles/proximity/immalert.c +++ b/profiles/proximity/immalert.c @@ -49,7 +49,7 @@ #include "src/attio.h" #include "src/dbus-common.h" -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY #include "src/shared/queue.h" #include "src/shared/gatt-db.h" #include "src/shared/att.h" @@ -62,7 +62,7 @@ struct imm_alert_adapter { struct btd_adapter *adapter; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY struct gatt_db_attribute *imservice; #endif GSList *connected_devices; @@ -77,7 +77,7 @@ struct connected_device { static GSList *imm_alert_adapters; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static bool get_dest_info(struct bt_att *att, bdaddr_t *dst, uint8_t *dst_type) { GIOChannel *io = NULL; @@ -217,7 +217,7 @@ static void imm_alert_disc_cb(gpointer user_data) imm_alert_remove_condev(condev); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static void imm_alert_alert_lvl_write(struct gatt_db_attribute *attrib, unsigned int id, uint16_t offset, const uint8_t *value, size_t len, @@ -435,7 +435,7 @@ static void remove_condev_list_item(gpointer data, gpointer user_data) void imm_alert_unregister(struct btd_adapter *adapter) { struct imm_alert_adapter *imadapter; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY struct gatt_db *db; #endif @@ -445,7 +445,7 @@ void imm_alert_unregister(struct btd_adapter *adapter) g_slist_foreach(imadapter->connected_devices, remove_condev_list_item, NULL); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY /* Remove registered service */ if (imadapter->imservice) { db = (struct gatt_db *) btd_gatt_database_get_db(btd_adapter_get_database(adapter)); diff --git a/profiles/proximity/linkloss.c b/profiles/proximity/linkloss.c index da22f3d..60b1064 100644 --- a/profiles/proximity/linkloss.c +++ b/profiles/proximity/linkloss.c @@ -50,7 +50,7 @@ #include "src/attio.h" #include "src/dbus-common.h" -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY #include "src/shared/queue.h" #include "src/shared/gatt-db.h" #include "src/shared/att.h" @@ -63,7 +63,7 @@ struct link_loss_adapter { struct btd_adapter *adapter; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY struct gatt_db_attribute *llservice; #else uint16_t alert_lvl_value_handle; @@ -81,7 +81,7 @@ struct connected_device { static GSList *link_loss_adapters; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static bool get_dest_info(struct bt_att *att, bdaddr_t *dst, uint8_t *dst_type) { GIOChannel *io = NULL; @@ -185,7 +185,7 @@ static void link_loss_emit_alert_signal(struct connected_device *condev) g_dbus_emit_property_changed(btd_get_dbus_connection(), path, PROXIMITY_REPORTER_INTERFACE, "LinkLossAlertLevel"); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static void link_loss_alert_lvl_read(struct gatt_db_attribute *attrib, unsigned int id, uint16_t offset, uint8_t opcode, struct bt_att *att, @@ -310,7 +310,7 @@ static void link_loss_local_disc(struct btd_device *device, DBG("alert level zeroed for locally disconnecting dev %p", device); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static void link_loss_alert_lvl_write(struct gatt_db_attribute *attrib, unsigned int id, uint16_t offset, const uint8_t *value, size_t len, @@ -447,7 +447,7 @@ set_error: void link_loss_register(struct btd_adapter *adapter) { -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY struct gatt_db_attribute *service, *charc; struct gatt_db *db; #else @@ -462,7 +462,7 @@ void link_loss_register(struct btd_adapter *adapter) lladapter->adapter = adapter; link_loss_adapters = g_slist_append(link_loss_adapters, lladapter); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY db = (struct gatt_db *) btd_gatt_database_get_db(btd_adapter_get_database(adapter)); /* @@ -524,7 +524,7 @@ static void remove_condev_list_item(gpointer data, gpointer user_data) void link_loss_unregister(struct btd_adapter *adapter) { struct link_loss_adapter *lladapter; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY struct gatt_db *db; #endif @@ -534,7 +534,7 @@ void link_loss_unregister(struct btd_adapter *adapter) g_slist_foreach(lladapter->connected_devices, remove_condev_list_item, NULL); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY /* Remove registered service */ if (lladapter->llservice) { db = (struct gatt_db *) btd_gatt_database_get_db(btd_adapter_get_database(adapter)); diff --git a/profiles/proximity/reporter.c b/profiles/proximity/reporter.c index 3a88354..30fc7c2 100644 --- a/profiles/proximity/reporter.c +++ b/profiles/proximity/reporter.c @@ -52,7 +52,7 @@ #include "attrib/att-database.h" #include "src/attrib-server.h" -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY #include "src/error.h" #endif @@ -103,7 +103,7 @@ const char *get_alert_level_string(uint8_t level) return "unknown"; } -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY static void register_tx_power(struct btd_adapter *adapter) { uint16_t start_handle, h; @@ -228,7 +228,7 @@ int reporter_device_probe(struct btd_service *service) return 0; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static DBusMessage *register_proximity(DBusConnection *conn, DBusMessage *msg, void *user_data) { @@ -294,7 +294,7 @@ int reporter_adapter_probe(struct btd_profile *p, struct btd_adapter *adapter) radapter = g_new0(struct reporter_adapter, 1); radapter->adapter = adapter; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY const char *path = adapter_get_path(adapter); g_dbus_register_interface(btd_get_dbus_connection(), path, diff --git a/src/adapter.c b/src/adapter.c index cc66919..f80948f 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -77,18 +77,18 @@ #include "advertising.h" #include "eir.h" -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY #include "adapter_le_vsc_features.h" #endif #define ADAPTER_INTERFACE "org.bluez.Adapter1" -#ifdef __TIZEN_PATCH__ -#ifdef TIZEN_WEARABLE +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY +#ifdef TIZEN_FEATURE_BLUEZ_BATTERY_WATCH #define DEVICED_DEST "org.tizen.system.deviced" #define DEVICED_BATT_INTERFACE "org.tizen.system.deviced.Battery" #define DEVICED_BATT_OBJECT_PATH "/Org/Tizen/System/DeviceD/Battery" -#endif /* TIZEN_WEARABLE */ +#endif /* TIZEN_FEATURE_BLUEZ_BATTERY_WATCH */ #endif #define MODE_OFF 0x00 @@ -109,7 +109,7 @@ #define DISTANCE_VAL_INVALID 0x7FFF #define PATHLOSS_MAX 137 -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY #define check_address(address) bachk(address) #define ADV_DATA_MAX_LENGTH 31 #define SCAN_RESPONSE_DATA_LENGTH_MAX 31 @@ -125,7 +125,7 @@ #define LE_BEARER_POSTFIX " LE" #define LE_BEARER_POSTFIX_LEN 3 -#endif /* __TIZEN_PATCH__ */ +#endif /* TIZEN_FEATURE_BLUEZ_MODIFY */ static DBusConnection *dbus_conn = NULL; @@ -212,7 +212,7 @@ struct btd_adapter_pin_cb_iter { /* When the iterator reaches the end, it is NULL and attempt is 0 */ }; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY struct adv_info { int slot_id; /* Reservied slot id is 0 (Single adv) */ bool status; /* Advertising status */ @@ -233,7 +233,7 @@ struct btd_adapter { struct mgmt *mgmt; bdaddr_t bdaddr; /* controller Bluetooth address */ -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY bdaddr_t le_static_addr; bdaddr_t rpaddr; /* controller RPA */ #endif @@ -254,18 +254,18 @@ struct btd_adapter { char *current_alias; /* current adapter name alias */ char *stored_alias; /* stored adapter name alias */ -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY bool le_privacy_enabled; /* whether LE Privacy feature enabled */ uint8_t *local_irk; /* adapter local IRK */ uint8_t disc_type; bool ipsp_intialized; /* Ipsp Initialization state */ struct le_data_length_read_handler *read_handler; struct le_data_length_read_default_data_length_handler *def_read_handler; -#ifdef TIZEN_WEARABLE +#ifdef TIZEN_FEATURE_BLUEZ_BATTERY_WATCH guint charging_watch; guint charging_timeout; charging_state_e charging; -#endif /* TIZEN_WEARABLE */ +#endif /* TIZEN_FEATURE_BLUEZ_BATTERY_WATCH */ #endif bool discovering; /* discovering property state */ @@ -301,7 +301,7 @@ struct btd_adapter { struct btd_advertising *adv_manager; gboolean initialized; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY GSList *adv_list; /* List of advertising instance */ bool advertising; /* Advertising active */ gchar *version; /* Bluetooth Version */ @@ -328,7 +328,7 @@ struct btd_adapter { guint pair_device_timeout; unsigned int db_id; /* Service event handler for GATT db */ -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY guint private_addr_timeout; uint8_t central_rpa_res_support; #ifdef TIZEN_FEATURE_PLATFROM_SCAN_FILTER @@ -347,7 +347,7 @@ struct btd_adapter { bool is_default; /* true if adapter is default one */ }; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY enum { DEINIT_6LOWPAN, INIT_6LOWPAN @@ -546,7 +546,7 @@ static void store_adapter_info(struct btd_adapter *adapter) if (adapter->stored_alias) g_key_file_set_string(key_file, "General", "Alias", adapter->stored_alias); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (adapter->local_irk) { int i; char key_str[35]; @@ -580,13 +580,12 @@ static void adapter_stop(struct btd_adapter *adapter); static void trigger_passive_scanning(struct btd_adapter *adapter); static bool set_mode(struct btd_adapter *adapter, uint16_t opcode, uint8_t mode); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static bool set_privacy(struct btd_adapter *adapter, bool privacy); -static bool set_irk(struct btd_adapter *adapter, bool set); #endif -#ifdef __TIZEN_PATCH__ -#ifdef TIZEN_WEARABLE +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY +#ifdef TIZEN_FEATURE_BLUEZ_BATTERY_WATCH static gboolean charging_state_timeout_cb(gpointer user_data) { struct btd_adapter *adapter = user_data; @@ -667,7 +666,7 @@ charging_state_e get_charging_state(struct btd_adapter *adapter) DBG("charging_state: %d", adapter->charging); return adapter->charging; } -#endif /* TIZEN_WEARABLE */ +#endif /* TIZEN_FEATURE_BLUEZ_BATTERY_WATCH */ static int compare_slot(gconstpointer a, gconstpointer b) { @@ -762,7 +761,7 @@ static void advertiser_cleanup(struct btd_adapter *adapter) } #endif -#if defined __TIZEN_PATCH__ && defined __SPRD_PAGE_SCAN_PATCH__ +#if defined TIZEN_FEATURE_BLUEZ_MODIFY && defined TIZEN_FEATURE_BLUEZ_SPRD_PAGE_SCAN #define OCF_PAGE_SCAN_TIMEOUT 0x0018 #define OGF_PAGE_SCAN_TIMEOUT 0x03 @@ -808,7 +807,7 @@ static void settings_changed(struct btd_adapter *adapter, uint32_t settings) if (adapter->current_settings & MGMT_SETTING_POWERED) { adapter_start(adapter); -#if defined __TIZEN_PATCH__ && defined __SPRD_PAGE_SCAN_PATCH__ +#if defined TIZEN_FEATURE_BLUEZ_MODIFY && defined TIZEN_FEATURE_BLUEZ_SPRD_PAGE_SCAN /* Approx 6.4 Seconds of timeout */ /* This Added because Z3 device was not able to connect with * some device as it was getting Page Timeout @@ -816,7 +815,7 @@ static void settings_changed(struct btd_adapter *adapter, uint32_t settings) * from 5.12 Sec (which is default) to ~6.4sec*/ DBG("Setting value"); send_sprd_page_scan_timeout(10240); -#endif /* __SPRD_QOS_PATCH__ */ +#endif /* TIZEN_FEATURE_BLUEZ_SPRD_PAGE_SCAN */ } else { adapter_stop(adapter); @@ -852,7 +851,7 @@ static void settings_changed(struct btd_adapter *adapter, uint32_t settings) trigger_pairable_timeout(adapter); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (changed_mask & MGMT_SETTING_ADVERTISING) { if ((adapter->current_settings & MGMT_SETTING_ADVERTISING) && (adapter->advertising)) { @@ -1122,7 +1121,7 @@ struct btd_device *btd_adapter_find_device(struct btd_adapter *adapter, struct device_addr_type addr; struct btd_device *device; GSList *list; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY bool exact_match = false; #endif char addr_str[18]; @@ -1136,7 +1135,7 @@ struct btd_device *btd_adapter_find_device(struct btd_adapter *adapter, ba2str(dst, addr_str); DBG("find device %s %d", addr_str, bdaddr_type); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY list = g_slist_find_custom(adapter->devices, &addr, device_addr_type_strict_cmp); if (list) { @@ -1160,7 +1159,7 @@ struct btd_device *btd_adapter_find_device(struct btd_adapter *adapter, device = list->data; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (exact_match) return device; #endif @@ -1413,7 +1412,7 @@ static void adapter_service_insert(struct btd_adapter *adapter, sdp_record_t *re DBG("%s", adapter->path); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (rec == NULL) { DBG("record is NULL return"); return; @@ -1481,7 +1480,7 @@ void adapter_service_remove(struct btd_adapter *adapter, uint32_t handle) remove_record_from_server(rec->handle); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static void adapter_print_devices(struct btd_adapter *adapter) { GSList *dev; @@ -1505,7 +1504,7 @@ static struct btd_device *adapter_create_device(struct btd_adapter *adapter, adapter->devices = g_slist_append(adapter->devices, device); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY adapter_print_devices(adapter); #endif @@ -1535,7 +1534,7 @@ static void service_auth_cancel(struct service_auth *auth) g_free(auth); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY void btd_adapter_unpair_device(struct btd_adapter *adapter, struct btd_device *dev) { @@ -1620,7 +1619,7 @@ struct btd_device *btd_adapter_get_device(struct btd_adapter *adapter, if (!adapter) return NULL; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (!bacmp(addr, BDADDR_ANY)) return NULL; #endif @@ -1670,7 +1669,7 @@ static gboolean passive_scanning_timeout(gpointer user_data) adapter->passive_scan_timeout = 0; cp.type = SCAN_TYPE_LE; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY mgmt_send(adapter->mgmt, MGMT_OP_START_LE_DISCOVERY, adapter->dev_id, sizeof(cp), &cp, passive_scanning_complete, adapter, NULL); @@ -1709,7 +1708,7 @@ static void trigger_passive_scanning(struct btd_adapter *adapter) * The discovery procedure is using interleaved scanning and * thus will discover Low Energy devices as well. */ -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (adapter->discovery_list || adapter->le_discovery_list) return; #else @@ -1789,7 +1788,7 @@ static void stop_passive_scanning_complete(uint8_t status, uint16_t length, static void stop_passive_scanning(struct btd_adapter *adapter) { struct mgmt_cp_stop_discovery cp; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY struct mgmt_cp_stop_discovery le_cp; #endif @@ -1797,7 +1796,7 @@ static void stop_passive_scanning(struct btd_adapter *adapter) /* If there are any normal discovery clients passive scanning * wont be running */ -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (adapter->discovery_list || adapter->le_discovery_list) return; #else @@ -1808,7 +1807,7 @@ static void stop_passive_scanning(struct btd_adapter *adapter) if (adapter->discovery_enable == 0x00) return; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if ((adapter->discovery_type & 0x01) > 0) cp.type = 0x01; mgmt_send(adapter->mgmt, MGMT_OP_STOP_DISCOVERY, @@ -1874,7 +1873,7 @@ static void start_discovery_complete(uint8_t status, uint16_t length, const struct mgmt_cp_start_discovery *rp = param; DBG("status 0x%02x", status); -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY DBG("Discovery Type 0x%02x", rp->type); #endif @@ -1885,7 +1884,7 @@ static void start_discovery_complete(uint8_t status, uint16_t length, } if (status == MGMT_STATUS_SUCCESS) { -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY DBG("Return param discovery type 0x%02x", rp->type); adapter->discovery_type |= rp->type; #else @@ -1906,7 +1905,7 @@ static void start_discovery_complete(uint8_t status, uint16_t length, ADAPTER_INTERFACE, "Discovering"); return; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY } else { adapter->discovering = false; g_dbus_emit_property_changed(dbus_conn, adapter->path, @@ -1919,12 +1918,12 @@ static void start_discovery_complete(uint8_t status, uint16_t length, * In case the restart of the discovery failed, then just trigger * it for the next idle timeout again. */ -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY trigger_start_discovery(adapter, IDLE_DISCOV_TIMEOUT * 2); #endif } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static void start_le_discovery_complete(uint8_t status, uint16_t length, const void *param, void *user_data) { @@ -1973,7 +1972,7 @@ static void start_le_discovery_complete(uint8_t status, uint16_t length, static gboolean start_discovery_timeout(gpointer user_data) { struct btd_adapter *adapter = user_data; -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY struct mgmt_cp_start_service_discovery *sd_cp; #endif uint8_t new_type; @@ -1982,7 +1981,7 @@ static gboolean start_discovery_timeout(gpointer user_data) adapter->discovery_idle_timeout = 0; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (adapter->disc_type == BT_DISC_TYPE_BREDR_ONLY) new_type = SCAN_TYPE_BREDR; else if (adapter->disc_type == BT_DISC_TYPE_LE_ONLY) @@ -2139,7 +2138,7 @@ static void trigger_start_discovery(struct btd_adapter *adapter, guint delay) start_discovery_timeout, adapter); } -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY static void suspend_discovery_complete(uint8_t status, uint16_t length, const void *param, void *user_data) { @@ -2226,7 +2225,7 @@ static void discovering_callback(uint16_t index, uint16_t length, DBG("hci%u type %u discovering %u method %d", adapter->dev_id, ev->type, ev->discovering, adapter->filtered_discovery); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY DBG("info discov_type %d", adapter->discovery_type); if (ev->type == DISCOV_TYPE_BREDR) { if (ev->discovering == FALSE) { @@ -2268,7 +2267,7 @@ static void discovering_callback(uint16_t index, uint16_t length, * If there are no clients, then it is good idea to trigger a * passive scanning attempt. */ -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (adapter->discovery_list == NULL && adapter->le_discovery_list == NULL) { if (!adapter->connect_le) trigger_passive_scanning(adapter); @@ -2303,7 +2302,7 @@ static void discovering_callback(uint16_t index, uint16_t length, } } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static void stop_discovery_complete(uint8_t status, uint16_t length, const void *param, void *user_data) { @@ -2656,7 +2655,11 @@ static void discovery_destroy(void *user_data) if (adapter->discovery_list) return; +#ifdef __TIZEN_PATCH__ + hci_clear_bit(BDADDR_BREDR, &adapter->discovery_type); +#else adapter->discovery_type = 0x00; +#endif if (adapter->discovery_idle_timeout > 0) { g_source_remove(adapter->discovery_idle_timeout); @@ -2747,7 +2750,7 @@ static bool get_discovery_client(struct btd_adapter *adapter, } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static void le_discovery_destroy(void *user_data) { struct watch_client *client = user_data; @@ -2770,7 +2773,9 @@ static void le_discovery_destroy(void *user_data) if (adapter->discovery_list || adapter->le_discovery_list) return; - adapter->discovery_type = 0x00; + hci_clear_bit(BDADDR_LE_PUBLIC, &adapter->discovery_type); + hci_clear_bit(BDADDR_LE_RANDOM, &adapter->discovery_type); + DBG("Restart Timer... adapter->discovery_type[%d]", adapter->discovery_type); if (adapter->discovery_idle_timeout > 0) { g_source_remove(adapter->discovery_idle_timeout); @@ -5124,7 +5129,7 @@ static DBusMessage *set_nb_parameters(DBusConnection *conn, return dbus_message_new_method_return(msg); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY void btd_adapter_set_read_le_data_length_handler( struct btd_adapter *adapter, struct le_data_length_read_handler *handler) @@ -5528,7 +5533,7 @@ static DBusMessage *adapter_set_manufacturer_data(DBusConnection *conn, return btd_error_failed(msg, "Set manufacturer data failed"); } -#endif /* __TIZEN_PATCH__ */ +#endif /* TIZEN_FEATURE_BLUEZ_MODIFY */ static DBusMessage *start_discovery(DBusConnection *conn, @@ -5577,7 +5582,7 @@ static DBusMessage *start_discovery(DBusConnection *conn, adapter->discovery_list = g_slist_prepend(adapter->discovery_list, client); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY adapter->disc_type = BT_DISC_TYPE_BREDR_ONLY; #endif @@ -5845,7 +5850,7 @@ static DBusMessage *stop_discovery(DBusConnection *conn, client = list->data; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY adapter->disc_type = BT_DISC_TYPE_BREDR_ONLY; #endif cp.type = adapter->discovery_type; @@ -5874,7 +5879,7 @@ static DBusMessage *stop_discovery(DBusConnection *conn, return dbus_message_new_method_return(msg); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY cp.type = 0x01; #endif mgmt_send(adapter->mgmt, MGMT_OP_STOP_DISCOVERY, @@ -5898,7 +5903,7 @@ static gboolean property_get_address(const GDBusPropertyTable *property, return TRUE; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static gboolean property_get_le_address(const GDBusPropertyTable *property, DBusMessageIter *iter, void *user_data) { @@ -6106,7 +6111,7 @@ static void property_set_mode(struct btd_adapter *adapter, uint32_t setting, len = sizeof(mode); break; case MGMT_SETTING_DISCOVERABLE: -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY if (kernel_conn_control) { if (mode) { set_mode(adapter, MGMT_OP_SET_CONNECTABLE, @@ -6134,7 +6139,7 @@ static void property_set_mode(struct btd_adapter *adapter, uint32_t setting, param = &mode; len = sizeof(mode); break; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY case MGMT_SETTING_CONNECTABLE: opcode = MGMT_OP_SET_CONNECTABLE; param = &mode; @@ -6155,7 +6160,7 @@ static void property_set_mode(struct btd_adapter *adapter, uint32_t setting, data->adapter = adapter; data->id = id; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY /* * Use mgmt_send_nowait to avoid dbus timeout in a state of bonding. */ @@ -6346,7 +6351,7 @@ static void iter_append_uuid(gpointer key, gpointer value, gpointer user_data) dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &uuid); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static gboolean property_get_le_discovering(const GDBusPropertyTable *property, DBusMessageIter *iter, void *user_data) { @@ -6530,7 +6535,7 @@ static int device_path_cmp(gconstpointer a, gconstpointer b) return strcasecmp(dev_path, path); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static DBusMessage *adapter_unpair_device(DBusConnection *conn, DBusMessage *msg, void *user_data) { @@ -6812,7 +6817,7 @@ static const GDBusMethodTable adapter_methods[] = { GDBUS_ARGS({ "properties", "a{sv}" }), NULL, set_discovery_filter) }, { GDBUS_METHOD("StopDiscovery", NULL, NULL, stop_discovery) }, -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY { GDBUS_METHOD("StartCustomDiscovery", GDBUS_ARGS({ "type", "s" }), NULL, adapter_start_custom_discovery) }, @@ -6925,7 +6930,7 @@ static const GDBusMethodTable adapter_methods[] = { #endif { GDBUS_ASYNC_METHOD("RemoveDevice", GDBUS_ARGS({ "device", "o" }), NULL, remove_device) }, -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY { GDBUS_ASYNC_METHOD("LEReadMaximumDataLength", NULL, GDBUS_ARGS({"maxTxOctets", "q" }, { "maxTxTime", "q" }, {"maxRxOctets", "q" }, { "maxRxTime", "q" }), @@ -6940,7 +6945,7 @@ static const GDBusMethodTable adapter_methods[] = { { } }; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static const GDBusSignalTable adapter_signals[] = { { GDBUS_SIGNAL("AdvertisingEnabled", GDBUS_ARGS({ "slot_id", "i" }, @@ -6978,13 +6983,13 @@ static const GDBusPropertyTable adapter_properties[] = { { "PairableTimeout", "u", property_get_pairable_timeout, property_set_pairable_timeout }, { "Discovering", "b", property_get_discovering }, -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY { "LEDiscovering", "b", property_get_le_discovering }, #endif { "UUIDs", "as", property_get_uuids }, { "Modalias", "s", property_get_modalias, NULL, property_exists_modalias }, -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY { "Connectable", "b", property_get_connectable, property_set_connectable }, { "Version", "s", property_get_version }, @@ -7143,7 +7148,7 @@ static struct irk_info *get_irk_info(GKeyFile *key_file, const char *peer, char *str; str = g_key_file_get_string(key_file, "IdentityResolvingKey", "Key", NULL); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (!str) return NULL; if (strlen(str) < 32) { @@ -7548,7 +7553,7 @@ static uint8_t get_le_addr_type(GKeyFile *keyfile) return addr_type; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static uint8_t get_addr_type(GKeyFile *keyfile) { char **techno, **t; @@ -7624,7 +7629,7 @@ static void load_devices(struct btd_adapter *adapter) struct btd_device *device; char filename[PATH_MAX]; GKeyFile *key_file; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY struct link_key_info *key_info = NULL; GSList *list, *ltk_info = NULL; struct device_addr_type addr; @@ -7642,7 +7647,7 @@ static void load_devices(struct btd_adapter *adapter) if (entry->d_type != DT_DIR || bachk(entry->d_name) < 0) continue; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY { bdaddr_t bdaddr; @@ -7677,7 +7682,7 @@ static void load_devices(struct btd_adapter *adapter) if (param) params = g_slist_append(params, param); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY str2ba(entry->d_name, &addr.bdaddr); addr.bdaddr_type = get_addr_type(key_file); @@ -7688,7 +7693,7 @@ static void load_devices(struct btd_adapter *adapter) device_address_cmp); #endif if (list) { -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY DBG("Skip already loaded device [%s] [%d]", entry->d_name, addr.bdaddr_type); #endif @@ -7701,7 +7706,7 @@ static void load_devices(struct btd_adapter *adapter) if (!device) goto free; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY { char idaddr[18]; @@ -8320,7 +8325,7 @@ void adapter_auto_connect_remove(struct btd_adapter *adapter, static void adapter_start(struct btd_adapter *adapter) { -#if defined(__TIZEN_PATCH__) && !defined(__SPRD_PATCH__) +#if defined(TIZEN_FEATURE_BLUEZ_MODIFY) && !defined(__SPRD_PATCH__) if (adapter_le_read_ble_feature_info()) g_dbus_emit_property_changed(dbus_conn, adapter->path, ADAPTER_INTERFACE, "SupportedLEFeatures"); @@ -8337,7 +8342,7 @@ static void adapter_start(struct btd_adapter *adapter) adapter_le_enable_offloading(TRUE); #endif -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY g_dbus_emit_property_changed(dbus_conn, adapter->path, ADAPTER_INTERFACE, "Powered"); #else @@ -9300,7 +9305,7 @@ static void load_config(struct btd_adapter *adapter) char address[18]; struct stat st; GError *gerr = NULL; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY char *str; #endif @@ -9353,21 +9358,26 @@ static void load_config(struct btd_adapter *adapter) gerr = NULL; } -#ifdef __TIZEN_PATCH__ - /* Get Local IRK */ - str = g_key_file_get_string(key_file, "General", "LocalIrk", &gerr); - if (gerr || !str || strlen(str) != 34) { - g_error_free(gerr); - gerr = NULL; +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY + /* Get Le Privacy feature support */ + adapter->le_privacy_enabled = main_opts.le_privacy; + if (adapter->le_privacy_enabled) { + /* Get Local IRK */ + str = g_key_file_get_string(key_file, + "General", "LocalIrk", &gerr); + if (gerr || !str || strlen(str) != 34) { + g_error_free(gerr); + gerr = NULL; - g_free(adapter->local_irk); - adapter->local_irk = NULL; - } else { - if (adapter->local_irk) g_free(adapter->local_irk); + adapter->local_irk = NULL; + } else { + if (adapter->local_irk) + g_free(adapter->local_irk); - adapter->local_irk = g_malloc0(MGMT_IRK_SIZE); - str2buf(&str[2], adapter->local_irk, MGMT_IRK_SIZE); + adapter->local_irk = g_malloc0(MGMT_IRK_SIZE); + str2buf(&str[2], adapter->local_irk, MGMT_IRK_SIZE); + } } #endif @@ -9377,13 +9387,13 @@ static void load_config(struct btd_adapter *adapter) static struct btd_adapter *btd_adapter_new(uint16_t index) { struct btd_adapter *adapter; -#ifdef __TIZEN_PATCH__ -#ifdef TIZEN_WEARABLE +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY +#ifdef TIZEN_FEATURE_BLUEZ_BATTERY_WATCH DBusConnection *conn = btd_get_dbus_connection(); DBusMessage *msg = NULL; DBusMessage *reply = NULL; int charging_state = 0; -#endif /* TIZEN_WEARABLE */ +#endif /* TIZEN_FEATURE_BLUEZ_BATTERY_WATCH */ #endif adapter = g_try_new0(struct btd_adapter, 1); @@ -9411,7 +9421,7 @@ static struct btd_adapter *btd_adapter_new(uint16_t index) main_opts.did_version); adapter->discoverable_timeout = main_opts.discovto; adapter->pairable_timeout = main_opts.pairto; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY adapter->advertising = FALSE; #endif @@ -9421,7 +9431,7 @@ static struct btd_adapter *btd_adapter_new(uint16_t index) DBG("Modalias: %s", adapter->modalias); DBG("Discoverable timeout: %u seconds", adapter->discoverable_timeout); DBG("Pairable timeout: %u seconds", adapter->pairable_timeout); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (main_opts.le_privacy) DBG("LE Privacy is enabled."); else @@ -9429,8 +9439,8 @@ static struct btd_adapter *btd_adapter_new(uint16_t index) #endif adapter->auths = g_queue_new(); -#ifdef __TIZEN_PATCH__ -#ifdef TIZEN_WEARABLE +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY +#ifdef TIZEN_FEATURE_BLUEZ_BATTERY_WATCH adapter->charging_watch = g_dbus_add_signal_watch(conn, DEVICED_DEST, DEVICED_BATT_OBJECT_PATH, DEVICED_BATT_INTERFACE, "ChargerType", @@ -9458,7 +9468,7 @@ static struct btd_adapter *btd_adapter_new(uint16_t index) } else { error("Unable to create dbus message for charging state"); } -#endif /* TIZEN_WEARABLE */ +#endif /* TIZEN_FEATURE_BLUEZ_BATTERY_WATCH */ #endif return btd_adapter_ref(adapter); @@ -9467,14 +9477,14 @@ static struct btd_adapter *btd_adapter_new(uint16_t index) static void adapter_remove(struct btd_adapter *adapter) { GSList *l; -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY struct gatt_db *db; #endif DBG("Removing adapter %s", adapter->path); -#ifdef __TIZEN_PATCH__ -#ifdef TIZEN_WEARABLE +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY +#ifdef TIZEN_FEATURE_BLUEZ_BATTERY_WATCH if (adapter->charging_watch > 0) { g_dbus_remove_watch(btd_get_dbus_connection(), adapter->charging_watch); @@ -9485,7 +9495,7 @@ static void adapter_remove(struct btd_adapter *adapter) g_source_remove(adapter->charging_timeout); adapter->charging_timeout = 0; } -#endif /* TIZEN_WEARABLE */ +#endif /* TIZEN_FEATURE_BLUEZ_BATTERY_WATCH */ #endif if (adapter->discovery_idle_timeout > 0) { @@ -9511,7 +9521,7 @@ static void adapter_remove(struct btd_adapter *adapter) unload_drivers(adapter); -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY db = btd_gatt_database_get_db(adapter->database); gatt_db_unregister(db, adapter->db_id); adapter->db_id = 0; @@ -9545,7 +9555,7 @@ const bdaddr_t *btd_adapter_get_address(struct btd_adapter *adapter) return &adapter->bdaddr; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY const bdaddr_t *btd_adapter_get_le_address(struct btd_adapter *adapter) { if (adapter->le_static_addr.b[5] != 0) @@ -9728,7 +9738,7 @@ static bool is_filter_match(GSList *discovery_filter, struct eir_data *eir_data, return got_match; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static void update_found_devices(struct btd_adapter *adapter, const bdaddr_t *bdaddr, uint8_t bdaddr_type, int8_t rssi, @@ -9778,7 +9788,7 @@ static void update_found_devices(struct btd_adapter *adapter, * not marked as discoverable, then do not create new * device objects. */ -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY /*DBG("List BREDR:%p LE:%p Discoverable:%d", adapter->discovery_list, adapter->le_discovery_list, discoverable);*/ if ((adapter->discovery_list == NULL && @@ -9804,7 +9814,7 @@ static void update_found_devices(struct btd_adapter *adapter, return; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if(device_get_rpa_exist(dev) == true) bdaddr_type = BDADDR_LE_RANDOM; #endif @@ -9828,7 +9838,7 @@ static void update_found_devices(struct btd_adapter *adapter, * If no client has requested discovery, then only update * already paired devices (skip temporary ones). */ -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (device_is_temporary(dev) && adapter->discovery_list == NULL && adapter->le_discovery_list == NULL) { DBG("discovery list is NULL"); @@ -9845,7 +9855,7 @@ static void update_found_devices(struct btd_adapter *adapter, } #endif -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (bdaddr_type == BDADDR_BREDR) { #endif if (adapter->filtered_discovery && @@ -9863,7 +9873,7 @@ static void update_found_devices(struct btd_adapter *adapter, if (eir_data.tx_power != 127) device_set_tx_power(dev, eir_data.tx_power); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY } #endif @@ -9872,7 +9882,7 @@ static void update_found_devices(struct btd_adapter *adapter, /* Report an unknown name to the kernel even if there is a short name * known, but still update the name with the known short name. */ -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (eir_data.name_complete) name_known = device_name_known(dev); else @@ -9896,7 +9906,7 @@ static void update_found_devices(struct btd_adapter *adapter, device_add_eir_uuids(dev, eir_data.services); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (eir_data.flags != 0) device_set_remote_feature_flag(dev, eir_data.flags); @@ -9925,7 +9935,7 @@ static void update_found_devices(struct btd_adapter *adapter, * Otherwise, this is an event from passive discovery and we * should check if the device needs connecting to. */ -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (!adapter->discovery_list && !adapter->le_discovery_list) #else if (!adapter->discovery_list) @@ -9944,7 +9954,7 @@ static void update_found_devices(struct btd_adapter *adapter, return; connect_le: -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY /* Ignore non-connectable events */ if (not_connectable) return; @@ -10017,7 +10027,7 @@ static void device_found_callback(uint16_t index, uint16_t length, confirm_name = (flags & MGMT_DEV_FOUND_CONFIRM_NAME); legacy = (flags & MGMT_DEV_FOUND_LEGACY_PAIRING); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY update_found_devices(adapter, &ev->addr.bdaddr, ev->addr.type, ev->rssi, confirm_name, legacy, 0, eir, eir_len); @@ -10029,7 +10039,7 @@ static void device_found_callback(uint16_t index, uint16_t length, #endif } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static void le_device_found_callback(uint16_t index, uint16_t length, const void *param, void *user_data) { @@ -10095,7 +10105,7 @@ static void adapter_remove_connection(struct btd_adapter *adapter, device_remove_connection(device, bdaddr_type); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (device_is_authenticating(device, bdaddr_type)) #else if (device_is_authenticating(device)) @@ -10107,7 +10117,7 @@ static void adapter_remove_connection(struct btd_adapter *adapter, return; adapter->connections = g_slist_remove(adapter->connections, device); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY DBG("isPaired %d, isBonded %d", device_is_paired(device, bdaddr_type), device_is_bonded(device, bdaddr_type)); if ((device_is_temporary(device) && !device_is_retrying(device)) || @@ -10118,7 +10128,7 @@ static void adapter_remove_connection(struct btd_adapter *adapter, const char *path = device_get_path(device); DBG("Removing temporary device %s", path); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY /* device_is_paired is added incase of tempoary bonded * oop file transfer in that device is not bonded it's paired. */ @@ -10184,7 +10194,7 @@ static void adapter_stop(struct btd_adapter *adapter) g_dbus_emit_property_changed(dbus_conn, adapter->path, ADAPTER_INTERFACE, "Discovering"); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY g_dbus_emit_property_changed(dbus_conn, adapter->path, ADAPTER_INTERFACE, "LEDiscovering"); #endif @@ -10197,7 +10207,7 @@ static void adapter_stop(struct btd_adapter *adapter) ADAPTER_INTERFACE, "Class"); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY advertiser_cleanup(adapter); #endif g_dbus_emit_property_changed(dbus_conn, adapter->path, @@ -10283,13 +10293,13 @@ static gboolean process_auth_queue(gpointer user_data) /* Wait services to be resolved before asking authorization */ if (auth->svc_id > 0) { -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY DBG("Wait services to be resolved before asking authorization"); #endif return FALSE; } -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY if (device_is_trusted(device) == TRUE) { #else if (device_is_trusted(device) == TRUE || @@ -10299,7 +10309,7 @@ static gboolean process_auth_queue(gpointer user_data) goto next; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY /* If Profile is Blocked, Simply reject Authorization*/ if (device_is_profile_blocked(device, auth->uuid) == TRUE) { auth->cb(&err, auth->user_data); @@ -10652,7 +10662,7 @@ static void user_confirm_request_callback(uint16_t index, uint16_t length, return; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY device_set_auth_addr_type(device, ev->addr.type); #endif @@ -10730,7 +10740,7 @@ static void user_passkey_request_callback(uint16_t index, uint16_t length, return; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY device_set_auth_addr_type(device, ev->addr.type); #endif @@ -10779,7 +10789,7 @@ static void user_passkey_notify_callback(uint16_t index, uint16_t length, "device_notify_passkey: %s", strerror(-err)); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static void rssi_alert_callback(uint16_t index, uint16_t length, const void *param, void *user_data) { @@ -11198,7 +11208,7 @@ static void pin_code_request_callback(uint16_t index, uint16_t length, /* Flag the request of a pincode to allow a bonding retry. */ adapter->pincode_requested = true; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY btd_device_set_legacy_pairing(device, true); #endif @@ -11288,7 +11298,7 @@ static void bonding_complete(struct btd_adapter *adapter, if (device != NULL) device_bonding_complete(device, addr_type, status); -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY resume_discovery(adapter); #endif check_oob_bonding_complete(adapter, bdaddr, status); @@ -11407,7 +11417,7 @@ int adapter_create_bonding(struct btd_adapter *adapter, const bdaddr_t *bdaddr, return -EBUSY; } -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY suspend_discovery(adapter); #endif return adapter_bonding_attempt(adapter, bdaddr, addr_type, io_cap); @@ -11479,7 +11489,7 @@ static void dev_disconnected(struct btd_adapter *adapter, { struct btd_device *device; char dst[18]; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY struct device_addr_type t_addr; #endif @@ -11489,7 +11499,7 @@ static void dev_disconnected(struct btd_adapter *adapter, device = btd_adapter_find_device(adapter, &addr->bdaddr, addr->type); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (device) { device_get_tizen_addr(device, addr->type, &t_addr); @@ -11548,7 +11558,7 @@ static void disconnect_complete(uint8_t status, uint16_t length, return; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY /* Use HCI error code instead of MGMT disconnection reason */ dev_disconnected(adapter, &rp->addr, 0x16); #else @@ -11669,7 +11679,7 @@ static void new_link_key_callback(uint16_t index, uint16_t length, key->pin_len); device_set_bonded(device, BDADDR_BREDR); -#if defined(__TIZEN_PATCH__) && defined(SUPPORT_LOCAL_DEVICE_A2DP_SINK) +#if defined(TIZEN_FEATURE_BLUEZ_MODIFY) && defined(SUPPORT_LOCAL_DEVICE_A2DP_SINK) } else { DBG("store_hint %d", ev->store_hint); btd_device_set_temporary(device, false); @@ -11743,7 +11753,7 @@ static void new_long_term_key_callback(uint16_t index, uint16_t length, struct btd_device *device; bool persistent; char dst[18]; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY struct device_addr_type t_addr; #endif @@ -11790,7 +11800,7 @@ static void new_long_term_key_callback(uint16_t index, uint16_t length, ediv = le16_to_cpu(key->ediv); rand = le64_to_cpu(key->rand); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY device_get_tizen_addr(device, addr->type, &t_addr); store_longtermkey(bdaddr, &t_addr.bdaddr, t_addr.bdaddr_type, key->val, key->master, key->type, @@ -11879,7 +11889,7 @@ static void new_csrk_callback(uint16_t index, uint16_t length, const bdaddr_t *bdaddr = btd_adapter_get_address(adapter); struct btd_device *device; char dst[18]; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY struct device_addr_type t_addr; #endif @@ -11903,7 +11913,7 @@ static void new_csrk_callback(uint16_t index, uint16_t length, if (!ev->store_hint) return; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY device_get_tizen_addr(device, addr->type, &t_addr); store_csrk(bdaddr, &t_addr.bdaddr, t_addr.bdaddr_type, key->val, 0, key->type); @@ -11959,7 +11969,7 @@ static void new_irk_callback(uint16_t index, uint16_t length, struct btd_device *device, *duplicate; bool persistent; char dst[18], rpa[18]; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY struct device_addr_type t_addr; #endif @@ -11976,7 +11986,7 @@ static void new_irk_callback(uint16_t index, uint16_t length, if (bacmp(&ev->rpa, BDADDR_ANY)) { device = btd_adapter_get_device(adapter, &ev->rpa, BDADDR_LE_RANDOM); -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY duplicate = btd_adapter_find_device(adapter, &addr->bdaddr, addr->type); if (duplicate == device) @@ -12002,7 +12012,7 @@ static void new_irk_callback(uint16_t index, uint16_t length, if (duplicate) device_merge_duplicate(device, duplicate); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY device_set_irk_value(device, irk->val); #endif @@ -12010,7 +12020,7 @@ static void new_irk_callback(uint16_t index, uint16_t length, if (!persistent) return; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY device_get_tizen_addr(device, addr->type, &t_addr); store_irk(adapter, &t_addr.bdaddr, t_addr.bdaddr_type, irk->val); #else @@ -12068,7 +12078,7 @@ static void new_conn_param(uint16_t index, uint16_t length, uint16_t min, max, latency, timeout; struct btd_device *dev; char dst[18]; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY struct device_addr_type t_addr; #endif @@ -12098,7 +12108,7 @@ static void new_conn_param(uint16_t index, uint16_t length, if (!ev->store_hint) return; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY device_get_tizen_addr(dev, ev->addr.type, &t_addr); store_conn_param(adapter, &t_addr.bdaddr, t_addr.bdaddr_type, ev->min_interval, ev->max_interval, @@ -12170,7 +12180,7 @@ int btd_adapter_remove_remote_oob_data(struct btd_adapter *adapter, return -EIO; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY int btd_adapter_add_remote_oob_ext_data(struct btd_adapter *adapter, const bdaddr_t *bdaddr, uint8_t bdaddr_type, uint8_t *hash192, uint8_t *randomizer192, @@ -12251,7 +12261,7 @@ static void read_local_oob_data_complete(uint8_t status, uint16_t length, const struct mgmt_rp_read_local_oob_data *rp = param; struct btd_adapter *adapter = user_data; const uint8_t *hash, *randomizer; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY const uint8_t *hash256 = NULL; const uint8_t *randomizer256 = NULL; #endif @@ -12262,7 +12272,7 @@ static void read_local_oob_data_complete(uint8_t status, uint16_t length, mgmt_errstr(status), status); hash = NULL; randomizer = NULL; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY } else if (length < 32) { #else } else if (length < sizeof(*rp)) { @@ -12273,7 +12283,7 @@ static void read_local_oob_data_complete(uint8_t status, uint16_t length, } else { hash = rp->hash192; randomizer = rp->rand192; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (length > 32) { hash256 = rp->hash256; randomizer256 = rp->rand256; @@ -12284,7 +12294,7 @@ static void read_local_oob_data_complete(uint8_t status, uint16_t length, if (!adapter->oob_handler || !adapter->oob_handler->read_local_cb) return; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY adapter->oob_handler->read_local_cb(adapter, hash, randomizer, hash256, randomizer256, adapter->oob_handler->user_data); @@ -12403,7 +12413,7 @@ static int adapter_register(struct btd_adapter *adapter) if (!g_dbus_register_interface(dbus_conn, adapter->path, ADAPTER_INTERFACE, -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY adapter_methods, adapter_signals, #else adapter_methods, NULL, @@ -12461,22 +12471,14 @@ static int adapter_register(struct btd_adapter *adapter) clear_blocked(adapter); load_devices(adapter); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY adapter_print_devices(adapter); if (adapter->le_privacy_enabled && (adapter->supported_settings & MGMT_SETTING_PRIVACY)) set_privacy(adapter, true); - else { - /* - * Some Android devices don't consider the device as LE one, - * if the device doesn't distribute IRK when pairing. - * Because of this compatibility issue, set IRK - * even though privacy feature is disabled. - */ + else DBG("LE privacy feature not configured or supported"); - set_irk(adapter, true); - } #endif /* retrieve the active connections: address the scenario where @@ -12706,7 +12708,7 @@ static void connect_failed_callback(uint16_t index, uint16_t length, device_bonding_failed(device, ev->status); } -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY /* In the case the bonding was canceled or did exists, remove the device * when it is temporary. */ if (device && !device_is_bonding(device, NULL) @@ -12728,7 +12730,7 @@ static void remove_keys(struct btd_adapter *adapter, ba2str(btd_adapter_get_address(adapter), adapter_addr); ba2str(device_get_address(device), device_addr); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (device_get_rpa_exist(device) == true) ba2str(device_get_rpa(device), device_addr); #endif @@ -12783,30 +12785,7 @@ static void unpaired_callback(uint16_t index, uint16_t length, device_set_unpaired(device, ev->addr.type); } -#ifdef __TIZEN_PATCH__ -static uint8_t *generate_irk(void) -{ - int fd; - uint8_t *irk; - - DBG("Generate IRK"); - - fd = open("/dev/urandom", O_RDONLY); - if (fd < 0) - return NULL; - - irk = g_malloc0(MGMT_IRK_SIZE); - if (read(fd, irk, MGMT_IRK_SIZE) != MGMT_IRK_SIZE) { - error("Cannot read random bytes"); - g_free(irk); - close(fd); - return NULL; - } - close(fd); - - return irk; -} - +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static void set_privacy_complete(uint8_t status, uint16_t length, const void *param, void *user_data) { @@ -12826,15 +12805,28 @@ static bool set_privacy(struct btd_adapter *adapter, bool privacy) memset(&cp, 0, sizeof(cp)); - if (privacy) { - if (adapter->local_irk == NULL) { - adapter->local_irk = generate_irk(); - if (adapter->local_irk == NULL) - goto fail; + if (privacy && !adapter->local_irk) { + int fd; + + DBG("Generate local irk"); + + fd = open("/dev/urandom", O_RDONLY); + if (fd < 0) + goto fail; + + adapter->local_irk = g_malloc0(MGMT_IRK_SIZE); + if (read(fd, adapter->local_irk, MGMT_IRK_SIZE) != + MGMT_IRK_SIZE) { + error("Cannot read local irk"); + close(fd); + goto fail; } + close(fd); store_adapter_info(adapter); + } + if (privacy) { cp.privacy = 0x01; memcpy(cp.irk, adapter->local_irk, MGMT_IRK_SIZE); } @@ -12850,44 +12842,6 @@ fail: return false; } -static void set_irk_complete(uint8_t status, uint16_t length, - const void *param, void *user_data) -{ - struct btd_adapter *adapter = user_data; - - if (status != MGMT_STATUS_SUCCESS) - error("Setting IRK is failed for hci%u: %s (0x%02x)", - adapter->dev_id, mgmt_errstr(status), status); - else - DBG("Setting IRK is succeed for hci%u", adapter->dev_id); -} - -static bool set_irk(struct btd_adapter *adapter, bool set) -{ - struct mgmt_cp_set_irk cp; - - memset(&cp, 0, sizeof(cp)); - - if (set) { - if (adapter->local_irk == NULL) { - adapter->local_irk = generate_irk(); - if (adapter->local_irk == NULL) - goto fail; - } - - store_adapter_info(adapter); - memcpy(cp.irk, adapter->local_irk, MGMT_IRK_SIZE); - } - - if (mgmt_send(adapter->mgmt, MGMT_OP_SET_IRK, - adapter->dev_id, sizeof(cp), &cp, - set_irk_complete, adapter, NULL) > 0) - return true; - -fail: - error("Failed to set irk %u", adapter->dev_id); - return false; -} int btd_adapter_connect_ipsp(struct btd_adapter *adapter, const bdaddr_t *bdaddr, @@ -13045,7 +12999,7 @@ static void read_info_complete(uint8_t status, uint16_t length, adapter->supported_settings = btohl(rp->supported_settings); adapter->current_settings = btohl(rp->current_settings); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY adapter_check_version(adapter, rp->version); #endif @@ -13099,7 +13053,7 @@ static void read_info_complete(uint8_t status, uint16_t length, (missing_settings & MGMT_SETTING_FAST_CONNECTABLE)) set_mode(adapter, MGMT_OP_SET_FAST_CONNECTABLE, 0x01); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY /* Set the RPA resolution value to '1' if privacy is supported */ if (adapter->le_privacy_enabled && adapter->supported_settings & MGMT_SETTING_PRIVACY) @@ -13141,7 +13095,7 @@ static void read_info_complete(uint8_t status, uint16_t length, device_found_callback, adapter, NULL); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY mgmt_register(adapter->mgmt, MGMT_EV_LE_DEVICE_FOUND, adapter->dev_id, le_device_found_callback, @@ -13227,7 +13181,7 @@ static void read_info_complete(uint8_t status, uint16_t length, user_passkey_notify_callback, adapter, NULL); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY mgmt_register(adapter->mgmt, MGMT_EV_RSSI_ALERT, adapter->dev_id, rssi_alert_callback, @@ -13301,7 +13255,7 @@ static void read_info_complete(uint8_t status, uint16_t length, if (adapter->current_settings & MGMT_SETTING_POWERED) adapter_start(adapter); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY else set_mode(adapter, MGMT_OP_SET_POWERED, 0x01); #endif diff --git a/src/adapter.h b/src/adapter.h index 6efead7..46d80ae 100644 --- a/src/adapter.h +++ b/src/adapter.h @@ -25,7 +25,7 @@ #include #include #include -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY #include #include #include @@ -37,7 +37,7 @@ /* Invalid SSP passkey value used to indicate negative replies */ #define INVALID_PASSKEY 0xffffffff -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY #define BT_DISC_TYPE_DEFAULT 0 #define BT_DISC_TYPE_BREDR_ONLY 1 #define BT_DISC_TYPE_LE_ONLY 2 @@ -75,7 +75,7 @@ uint16_t btd_adapter_get_index(struct btd_adapter *adapter); typedef void (*adapter_cb) (struct btd_adapter *adapter, gpointer user_data); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY typedef void (*oob_ext_read_local_cb_t) (struct btd_adapter *adapter, const uint8_t *hash192, const uint8_t *randomizer192, @@ -92,7 +92,7 @@ typedef void (*oob_bonding_cb_t) (struct btd_adapter *adapter, void *user_data); struct oob_handler { -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY oob_ext_read_local_cb_t read_local_cb; #else oob_read_local_cb_t read_local_cb; @@ -102,14 +102,14 @@ struct oob_handler { void *user_data; }; -#ifdef __TIZEN_PATCH__ -#ifdef TIZEN_WEARABLE +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY +#ifdef TIZEN_FEATURE_BLUEZ_BATTERY_WATCH typedef enum { NONE_CHARGING, WIRE_CHARGING, WIRELESS_CHARGING, } charging_state_e; -#endif /* TIZEN_WEARABLE */ +#endif /* TIZEN_FEATURE_BLUEZ_BATTERY_WATCH */ #endif int adapter_init(void); @@ -149,7 +149,7 @@ struct btd_device *btd_adapter_find_device(struct btd_adapter *adapter, const char *adapter_get_path(struct btd_adapter *adapter); const bdaddr_t *btd_adapter_get_address(struct btd_adapter *adapter); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY const bdaddr_t *btd_adapter_get_le_address(struct btd_adapter *adapter); uint8_t btd_adapter_get_le_address_type(struct btd_adapter * adapter); #endif @@ -259,7 +259,7 @@ int btd_adapter_add_remote_oob_data(struct btd_adapter *adapter, int btd_adapter_remove_remote_oob_data(struct btd_adapter *adapter, const bdaddr_t *bdaddr); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY int btd_adapter_add_remote_oob_ext_data(struct btd_adapter *adapter, const bdaddr_t *bdaddr, uint8_t bdaddr_type, uint8_t *hash192, uint8_t *randomizer192, @@ -297,7 +297,7 @@ void btd_adapter_for_each_device(struct btd_adapter *adapter, bool btd_le_connect_before_pairing(void); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY int btd_adapter_connect_ipsp(struct btd_adapter *adapter, const bdaddr_t *bdaddr, uint8_t bdaddr_type); @@ -336,9 +336,9 @@ struct le_data_length_read_default_data_length_handler { int btd_adapter_le_set_data_length(struct btd_adapter *adapter, bdaddr_t *bdaddr, uint16_t max_tx_octets, uint16_t max_tx_time); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY void adapter_check_version(struct btd_adapter *adapter, uint8_t hci_ver); -#ifdef TIZEN_WEARABLE +#ifdef TIZEN_FEATURE_BLUEZ_BATTERY_WATCH charging_state_e get_charging_state(struct btd_adapter *adapter); -#endif /* TIZEN_WEARABLE */ +#endif /* TIZEN_FEATURE_BLUEZ_BATTERY_WATCH */ #endif diff --git a/src/adapter_le_vsc_features.c b/src/adapter_le_vsc_features.c index 2ab3d14..6c586eb 100644 --- a/src/adapter_le_vsc_features.c +++ b/src/adapter_le_vsc_features.c @@ -1,4 +1,4 @@ -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY #include @@ -766,4 +766,4 @@ gboolean adapter_le_remove_irk_to_list(const bdaddr_t *bdaddr, uint8_t bdaddr_ty } -#endif /* __TIZEN_PATCH__ */ +#endif /* TIZEN_FEATURE_BLUEZ_MODIFY */ diff --git a/src/adapter_le_vsc_features.h b/src/adapter_le_vsc_features.h index 0bbc866..44a4bcc 100644 --- a/src/adapter_le_vsc_features.h +++ b/src/adapter_le_vsc_features.h @@ -1,4 +1,4 @@ -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY typedef enum { BLE_ADV_TX_POWER_MIN = 0x00, @@ -500,4 +500,4 @@ gboolean adapter_le_add_irk_to_list(const uint8_t *le_irk, const bdaddr_t *bdadd gboolean adapter_le_remove_irk_to_list(const bdaddr_t *bdaddr, uint8_t bdaddr_type); -#endif /* __TIZEN_PATCH__ */ +#endif /* TIZEN_FEATURE_BLUEZ_MODIFY */ diff --git a/src/attrib-server.c b/src/attrib-server.c index 31989af..03b585a 100644 --- a/src/attrib-server.c +++ b/src/attrib-server.c @@ -255,7 +255,7 @@ static int attribute_cmp(gconstpointer a1, gconstpointer a2) return attrib1->handle - attrib2->handle; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static int attribute_uuid_cmp(gconstpointer a, gconstpointer b) { const struct attribute *attrib1 = a; @@ -337,7 +337,7 @@ static uint32_t attrib_create_sdp_new(struct gatt_server *server, if (a->len == 2) sdp_uuid16_create(&svc, get_le16(a->data)); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY else if (a->len == 4) sdp_uuid32_create(&svc, get_le32(a->data)); #endif @@ -355,14 +355,14 @@ static uint32_t attrib_create_sdp_new(struct gatt_server *server, return 0; if (name != NULL) -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY sdp_set_info_attr(record, name, "Samsung", NULL); #else sdp_set_info_attr(record, name, "BlueZ", NULL); #endif sdp_uuid16_create(&gap_uuid, GENERIC_ACCESS_PROFILE_ID); -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY if (sdp_uuid_cmp(&svc, &gap_uuid) == 0) { sdp_set_url_attr(record, "http://www.bluez.org/", "http://www.bluez.org/", @@ -539,7 +539,7 @@ static uint16_t read_by_group(struct gatt_channel *channel, uint16_t start, if (dl == NULL) cur->end = a->handle; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY else if (a->handle == end && end == 0xffff) cur->end = a->handle; #endif @@ -981,7 +981,7 @@ static uint16_t write_value(struct gatt_channel *channel, uint16_t handle, g_file_set_contents(filename, data, length, NULL); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY g_free(filename); filename = btd_device_get_storage_path(channel->device, "ccc_sc"); if (!filename) { @@ -1140,7 +1140,7 @@ static void channel_handler(const uint8_t *ipdu, uint16_t len, } length = find_info(channel, start, end, opdu, channel->mtu); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (length == 0 && start == end) { status = ATT_ECODE_ATTR_NOT_FOUND; goto done; @@ -1368,7 +1368,7 @@ static gboolean register_core_services(struct gatt_server *server) uint8_t atval[256]; bt_uuid_t uuid; uint16_t appearance = 0x0000; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY uint16_t service_changed_handle; #endif @@ -1419,7 +1419,7 @@ static gboolean register_core_services(struct gatt_server *server) attrib_db_add_new(server, 0x0010, &uuid, ATT_NONE, ATT_NOT_PERMITTED, atval, 2); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY /* GATT service: service changed characteristic */ service_changed_handle = 0x0012; bt_uuid16_create(&uuid, GATT_CHARAC_UUID); @@ -1728,7 +1728,7 @@ int attrib_db_del(struct btd_adapter *adapter, uint16_t handle) return 0; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY uint16_t send_sc_indication(uint16_t start_handle, uint16_t end_handle, size_t vlen, uint8_t *pdu, size_t len) { diff --git a/src/attrib-server.h b/src/attrib-server.h index 44031e4..2a951e4 100644 --- a/src/attrib-server.h +++ b/src/attrib-server.h @@ -40,7 +40,7 @@ void attrib_free_sdp(struct btd_adapter *adapter, uint32_t sdp_handle); GAttrib *attrib_from_device(struct btd_device *device); guint attrib_channel_attach(GAttrib *attrib); gboolean attrib_channel_detach(GAttrib *attrib, guint id); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY struct attribute *attribute_find(struct btd_adapter *adapter, const bt_uuid_t *uuid); void attrib_send_noty_ind(struct btd_device *device, GAttrib *attrib, uint16_t handle, uint16_t desc_handle, diff --git a/src/device.c b/src/device.c index 4b9b3d2..c0edf68 100644 --- a/src/device.c +++ b/src/device.c @@ -76,11 +76,11 @@ #include "attrib-server.h" #include "eir.h" -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY #include "sdp-xml.h" -#ifdef TIZEN_WEARABLE +#ifdef TIZEN_FEATURE_BLUEZ_BATTERY_WATCH #include -#endif /* TIZEN_WEARABLE */ +#endif /* TIZEN_FEATURE_BLUEZ_BATTERY_WATCH */ #endif #define IO_CAPABILITY_NOINPUTNOOUTPUT 0x03 @@ -99,7 +99,7 @@ #define GATT_INCLUDE_UUID_STR "2802" #define GATT_CHARAC_UUID_STR "2803" -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY #define DEV_SIMUL_CONTROLLER 0x08 /* Simultaneous LE and BR/EDR to Same Device Capable (Controller) */ #define DEV_SIMUL_HOST 0x10 /* Simultaneous LE and BR/EDR to Same @@ -183,7 +183,7 @@ struct svc_callback { void *user_data; }; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY struct le_adv_report_info { uint8_t flags; char manufacturer_data[DEV_MAX_MANUFACTURER_DATA_LEN]; @@ -213,7 +213,7 @@ struct csrk_info { uint32_t counter; }; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY typedef enum { DEV_PAIRED_NONE = 0, DEV_PAIRED_BREDR = 1, @@ -309,7 +309,7 @@ struct btd_device { time_t le_seen; gboolean trusted; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY struct trusted_profile_t trusted_profiles; struct restricted_profile_t restricted_profiles; #endif @@ -324,7 +324,7 @@ struct btd_device { GIOChannel *att_io; guint store_id; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY bool legacy_pairing; char *manufacturer_data; int manufacturer_data_len; @@ -357,7 +357,7 @@ static const uint16_t uuid_list[] = { 0 }; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY typedef enum { SHOW_AUTHORIZATION = 0x0, /* 0b00 */ SUPPORTED_BLOCKED = 0x1, /* 0b01 */ @@ -474,7 +474,7 @@ static void store_csrk(struct csrk_info *csrk, GKeyFile *key_file, g_key_file_set_integer(key_file, group, "Counter", csrk->counter); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static char *manufacturer_data2str(char *data, int size) { char str[DEV_MAX_MANUFACTURER_DATA_LEN * 3 + 1]; @@ -521,7 +521,7 @@ static gboolean store_device_info_cb(gpointer user_data) char class[9]; char **uuids = NULL; gsize length = 0; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY gboolean svc_change_regd = false; #endif @@ -530,7 +530,7 @@ static gboolean store_device_info_cb(gpointer user_data) ba2str(btd_adapter_get_address(device->adapter), adapter_addr); ba2str(&device->bdaddr, device_addr); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (device->rpa) ba2str(device->rpa, device_addr); #endif @@ -562,7 +562,7 @@ static gboolean store_device_info_cb(gpointer user_data) g_key_file_remove_key(key_file, "General", "Appearance", NULL); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (device->rpa_res_support) { g_key_file_set_integer(key_file, "General", "RPAResSupport", device->rpa_res_support); @@ -575,7 +575,7 @@ static gboolean store_device_info_cb(gpointer user_data) g_key_file_set_boolean(key_file, "General", "Trusted", device->trusted); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY struct trusted_profile_t trust_profile = device->trusted_profiles; int trusted_profiles = (trust_profile.pbap << PBAP_SHIFT_OFFSET) | (trust_profile.map << MAP_SHIFT_OFFSET) | @@ -608,7 +608,7 @@ static gboolean store_device_info_cb(gpointer user_data) g_key_file_remove_key(key_file, "General", "Services", NULL); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (device->le_adv_data.flags) { g_key_file_set_integer(key_file, "General", "Flags", device->le_adv_data.flags); @@ -658,7 +658,7 @@ static gboolean store_device_info_cb(gpointer user_data) g_key_file_remove_group(key_file, "DeviceID", NULL); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY svc_change_regd = bt_att_get_svc_changed_indication_registered(device->att); g_key_file_set_boolean(key_file, "Att", "SvcChangeRegd", svc_change_regd); @@ -727,7 +727,7 @@ void device_store_cached_name(struct btd_device *dev, const char *name) ba2str(btd_adapter_get_address(dev->adapter), s_addr); ba2str(&dev->bdaddr, d_addr); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (dev->rpa) ba2str(dev->rpa, d_addr); #endif @@ -748,7 +748,7 @@ void device_store_cached_name(struct btd_device *dev, const char *name) static void browse_request_free(struct browse_req *req) { -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY DBG(""); #endif if (req->listener_id) @@ -889,7 +889,7 @@ static void device_free(gpointer user_data) if (device->eir_uuids) g_slist_free_full(device->eir_uuids, g_free); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY g_free(device->rpa); #endif g_free(device->local_csrk); @@ -900,7 +900,7 @@ static void device_free(gpointer user_data) g_free(device); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY void device_set_remote_feature_flag(struct btd_device *device, int flags) { device->remote_feature_flags = flags; @@ -932,7 +932,7 @@ gboolean device_is_trusted(struct btd_device *device) return device->trusted; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY gboolean device_is_profile_trusted(struct btd_device *device, const char *uuid) { @@ -989,7 +989,7 @@ static gboolean dev_property_get_address(const GDBusPropertyTable *property, char dstaddr[18]; const char *ptr = dstaddr; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (device->rpa) ba2str(device->rpa, dstaddr); else @@ -1033,7 +1033,7 @@ static gboolean dev_property_get_alias(const GDBusPropertyTable *property, ptr = device->name; } else { ba2str(&device->bdaddr, dstaddr); -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY g_strdelimit(dstaddr, ":", '-'); #endif ptr = dstaddr; @@ -1044,7 +1044,7 @@ static gboolean dev_property_get_alias(const GDBusPropertyTable *property, return TRUE; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static gboolean dev_property_get_alias_set(const GDBusPropertyTable *property, DBusMessageIter *iter, void *data) { @@ -1340,7 +1340,7 @@ static void dev_property_set_trusted(const GDBusPropertyTable *property, set_trust(id, b, data); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static gboolean dev_property_get_trusted_profiles(const GDBusPropertyTable *property, DBusMessageIter *iter, void *data) { @@ -1429,7 +1429,7 @@ static void dev_property_set_blocked(const GDBusPropertyTable *property, set_blocked(id, b, data); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static uint8_t device_get_connected_state(struct btd_device *device) { if (device->bredr_state.connected && device->le_state.connected) @@ -1530,7 +1530,7 @@ static gboolean dev_property_get_connected(const GDBusPropertyTable *property, { struct btd_device *dev = data; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY uint8_t connected = device_get_connected_state(dev); dbus_message_iter_append_basic(iter, DBUS_TYPE_BYTE, &connected); @@ -1609,7 +1609,7 @@ static gboolean dev_property_get_adapter(const GDBusPropertyTable *property, } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static gboolean property_get_manufacturer_data_len(const GDBusPropertyTable *property, DBusMessageIter *iter, void *user_data) { @@ -1996,7 +1996,7 @@ static void device_profile_connected(struct btd_device *dev, if (!err) btd_device_set_temporary(dev, false); -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY if (dev->pending == NULL) goto done; #endif @@ -2010,7 +2010,7 @@ static void device_profile_connected(struct btd_device *dev, } } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (dev->pending == NULL) return; #endif @@ -2049,7 +2049,7 @@ done: g_dbus_send_message(dbus_conn, btd_error_failed(dev->connect, strerror(-err))); else { -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY /* SDP is not required for Samsung TV Power on */ if (g_strcmp0(profile->name, "hid-device") == 0) { DBG("Skip SDP discovery."); @@ -2058,11 +2058,11 @@ done: /* Start passive SDP discovery to update known services */ if (dev->bredr && !dev->svc_refreshed) device_browse_sdp(dev, NULL); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY } #endif -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (err) g_dbus_send_message(dbus_conn, btd_error_failed(dev->connect, strerror(-err))); @@ -2141,7 +2141,7 @@ static struct btd_service *find_connectable_service(struct btd_device *dev, const char *uuid) { GSList *l; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY struct btd_service *s = NULL; #endif for (l = dev->services; l != NULL; l = g_slist_next(l)) { @@ -2151,7 +2151,7 @@ static struct btd_service *find_connectable_service(struct btd_device *dev, if (!p->connect || !p->remote_uuid) continue; -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY if (strcasecmp(uuid, p->remote_uuid) == 0) return service; #else @@ -2165,7 +2165,7 @@ static struct btd_service *find_connectable_service(struct btd_device *dev, } #endif } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (s) return s; #endif @@ -2186,7 +2186,7 @@ static GSList *create_pending_list(struct btd_device *dev, const char *uuid) struct btd_service *service; struct btd_profile *p; GSList *l; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY bool hs_hf_verify = FALSE; #endif @@ -2194,7 +2194,7 @@ static GSList *create_pending_list(struct btd_device *dev, const char *uuid) service = find_connectable_service(dev, uuid); if (service) return g_slist_prepend(dev->pending, service); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY else if ((service == NULL) && (g_strcmp0(uuid, HFP_HS_UUID) == 0)) { DBG("HFP service not found check for HSP service"); @@ -2216,7 +2216,7 @@ static GSList *create_pending_list(struct btd_device *dev, const char *uuid) service = l->data; p = btd_service_get_profile(service); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY DBG("profile uuid %s", p->remote_uuid); if (g_strcmp0(p->remote_uuid, HSP_HS_UUID) == 0) { DBG("HSP service is found check for HFP service"); @@ -2286,7 +2286,7 @@ static DBusMessage *connect_profiles(struct btd_device *dev, uint8_t bdaddr_type DBG("%s %s, client %s", dev->path, uuid ? uuid : "(all)", dbus_message_get_sender(msg)); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (dev->pending || dev->connect) return btd_error_in_progress(msg); #else @@ -2305,7 +2305,7 @@ static DBusMessage *connect_profiles(struct btd_device *dev, uint8_t bdaddr_type dev->pending = create_pending_list(dev, uuid); if (!dev->pending) { if (dev->svc_refreshed) { -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (!uuid && find_service_with_state(dev->services, BTD_SERVICE_STATE_CONNECTED)) #else @@ -2472,7 +2472,7 @@ static DBusMessage *disconnect_profile(DBusConnection *conn, DBusMessage *msg, return btd_error_invalid_args(msg); service = find_connectable_service(dev, uuid); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if ((service == NULL) && (g_strcmp0(uuid, HFP_HS_UUID) == 0)) { DBG("HFP service is not found check for HSP service"); service = find_connectable_service(dev, HSP_HS_UUID); @@ -2527,7 +2527,7 @@ static void store_services(struct btd_device *device) ba2str(btd_adapter_get_address(adapter), src_addr); ba2str(&device->bdaddr, dst_addr); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (device->rpa) ba2str(device->rpa, dst_addr); #endif @@ -2781,13 +2781,13 @@ static void device_svc_resolved(struct btd_device *dev, uint8_t bdaddr_type, struct bearer_state *state = get_state(dev, bdaddr_type); struct browse_req *req = dev->browse; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY DBG("%s bdaddr_type %d err %d", dev->path, bdaddr_type, err); #else DBG("%s err %d", dev->path, err); #endif -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY state->svc_resolved = true; #else if (err == 0) @@ -2832,7 +2832,7 @@ static void device_svc_resolved(struct btd_device *dev, uint8_t bdaddr_type, if (!req) return; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY /* If bdaddr_type is LE but req is for SDP, don't complete browse req. */ if (bdaddr_type != BDADDR_BREDR && req->search_uuid) { DBG("Discover comp. is for LE but browse req. is for SDP."); @@ -2934,7 +2934,7 @@ static DBusMessage *pair_device(DBusConnection *conn, DBusMessage *msg, { struct btd_device *device = data; struct btd_adapter *adapter = device->adapter; -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY struct bearer_state *state; #endif uint8_t bdaddr_type; @@ -2942,7 +2942,7 @@ static DBusMessage *pair_device(DBusConnection *conn, DBusMessage *msg, struct agent *agent; struct bonding_req *bonding; uint8_t io_cap; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY uint8_t conn_type; bool connect_le = FALSE; #endif @@ -2950,7 +2950,7 @@ static DBusMessage *pair_device(DBusConnection *conn, DBusMessage *msg, btd_device_set_temporary(device, false); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (dbus_message_get_args(msg, NULL, DBUS_TYPE_BYTE, &conn_type, DBUS_TYPE_INVALID) == FALSE) #else @@ -2961,7 +2961,7 @@ static DBusMessage *pair_device(DBusConnection *conn, DBusMessage *msg, if (device->bonding) return btd_error_in_progress(msg); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (conn_type == DEV_CONN_DEFAULT) { if (device_is_bonded(device, DEV_CONN_BREDR)) return btd_error_already_exists(msg); @@ -2993,7 +2993,7 @@ static DBusMessage *pair_device(DBusConnection *conn, DBusMessage *msg, return btd_error_already_exists(msg); #endif -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (conn_type == DEV_CONN_LE && (device_is_bredrle(device) || bdaddr_type != BDADDR_BREDR)) { DBG("LE Connect request"); @@ -3009,7 +3009,7 @@ static DBusMessage *pair_device(DBusConnection *conn, DBusMessage *msg, else io_cap = IO_CAPABILITY_NOINPUTNOOUTPUT; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if ((conn_type == DEV_CONN_LE && bdaddr_type != BDADDR_BREDR) || connect_le) bonding = bonding_request_new(msg, device, bdaddr_type, agent); @@ -3034,7 +3034,7 @@ static DBusMessage *pair_device(DBusConnection *conn, DBusMessage *msg, * channel first and only then start pairing (there's code for * this in the ATT connect callback) */ -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (((conn_type == DEV_CONN_LE && bdaddr_type != BDADDR_BREDR) || (connect_le)) && !device->le_state.connected) err = device_connect_le(device); @@ -3085,7 +3085,7 @@ static DBusMessage *new_authentication_return(DBusMessage *msg, uint8_t status) "Authentication Rejected"); case MGMT_STATUS_CANCELLED: case MGMT_STATUS_NO_RESOURCES: -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY case MGMT_STATUS_DISCONNECTED: #endif return dbus_message_new_error(msg, @@ -3169,7 +3169,7 @@ static DBusMessage *cancel_pairing(DBusConnection *conn, DBusMessage *msg, return dbus_message_new_method_return(msg); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static DBusMessage *discover_services(DBusConnection *conn, DBusMessage *msg, void *user_data) { @@ -3810,14 +3810,14 @@ static const GDBusMethodTable device_methods[] = { NULL, connect_profile) }, { GDBUS_ASYNC_METHOD("DisconnectProfile", GDBUS_ARGS({ "UUID", "s" }), NULL, disconnect_profile) }, -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY { GDBUS_ASYNC_METHOD("Pair", GDBUS_ARGS({ "conn_type", "y" }), NULL, pair_device) }, #else { GDBUS_ASYNC_METHOD("Pair", NULL, NULL, pair_device) }, #endif { GDBUS_METHOD("CancelPairing", NULL, NULL, cancel_pairing) }, -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY { GDBUS_ASYNC_METHOD("ConnectLE", GDBUS_ARGS({ "auto_connect", "b"}), NULL, connect_le) }, { GDBUS_ASYNC_METHOD("DisconnectLE", NULL, NULL, disconnect_le) }, @@ -3867,7 +3867,7 @@ static const GDBusPropertyTable device_properties[] = { { "Blocked", "b", dev_property_get_blocked, dev_property_set_blocked }, { "LegacyPairing", "b", dev_property_get_legacy }, { "RSSI", "n", dev_property_get_rssi, NULL, dev_property_exists_rssi }, -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY {"IsAliasSet", "b", dev_property_get_alias_set }, { "Connected", "y", dev_property_get_connected }, #else @@ -3877,7 +3877,7 @@ static const GDBusPropertyTable device_properties[] = { { "Modalias", "s", dev_property_get_modalias, NULL, dev_property_exists_modalias }, { "Adapter", "o", dev_property_get_adapter }, -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY /* To handle Failed Legacy Pairing when initiated from Remote device*/ { "LegacyPaired", "b", dev_property_get_paired }, { "ManufacturerDataLen", "q", property_get_manufacturer_data_len }, @@ -3907,7 +3907,7 @@ static const GDBusPropertyTable device_properties[] = { { } }; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static const GDBusSignalTable device_signals[] = { { GDBUS_SIGNAL("Disconnected", GDBUS_ARGS({ "bdaddr_type", "y" }, { "reason", "y" }, @@ -3960,14 +3960,14 @@ void device_add_connection(struct btd_device *dev, uint8_t bdaddr_type) state->connected = true; -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY if (dev->le_state.connected && dev->bredr_state.connected) return; g_dbus_emit_property_changed(dbus_conn, dev->path, DEVICE_INTERFACE, "Connected"); #else -#ifdef TIZEN_WEARABLE +#ifdef TIZEN_FEATURE_BLUEZ_BATTERY_WATCH if (bdaddr_type == BDADDR_BREDR && get_charging_state(dev->adapter) == WIRELESS_CHARGING) { int br_pkt_type = ACL_PTYPE_MASK | @@ -3977,7 +3977,7 @@ void device_add_connection(struct btd_device *dev, uint8_t bdaddr_type) DBG("During wireless charging... Change packet type"); device_change_pkt_type(dev, (gpointer)br_pkt_type); } -#endif /* TIZEN_WEARABLE */ +#endif /* TIZEN_FEATURE_BLUEZ_BATTERY_WATCH */ g_dbus_emit_signal(dbus_conn, dev->path, DEVICE_INTERFACE, "DeviceConnected", @@ -3989,7 +3989,7 @@ void device_add_connection(struct btd_device *dev, uint8_t bdaddr_type) void device_remove_connection(struct btd_device *device, uint8_t bdaddr_type) { struct bearer_state *state = get_state(device, bdaddr_type); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY char *dev_name = device->name; #endif @@ -4005,7 +4005,7 @@ void device_remove_connection(struct btd_device *device, uint8_t bdaddr_type) device->disconn_timer = 0; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (device->browse) { struct browse_req *req = device->browse; @@ -4029,7 +4029,7 @@ void device_remove_connection(struct btd_device *device, uint8_t bdaddr_type) btd_adapter_remove_bonding(device->adapter, &device->bdaddr, bdaddr_type); -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY if (device->bredr_state.connected || device->le_state.connected) return; @@ -4152,7 +4152,7 @@ static void load_info(struct btd_device *device, const char *local, char **uuids; int source, vendor, product, version; char **techno, **t; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY gboolean svc_change_regd; char buf[DEV_MAX_MANUFACTURER_DATA_LEN] = { 0, }; #endif @@ -4192,7 +4192,7 @@ static void load_info(struct btd_device *device, const char *local, g_free(str); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY /* Load RPA Resolution Support value */ device->rpa_res_support = g_key_file_get_integer(key_file, "General", "RPAResSupport", NULL); @@ -4264,7 +4264,7 @@ next: device->trusted = g_key_file_get_boolean(key_file, "General", "Trusted", NULL); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY /* Load Trusted Profiles*/ int trusted_profiles = g_key_file_get_integer(key_file, "General", "TrustedProfiles", NULL); @@ -4329,7 +4329,7 @@ next: btd_device_set_pnpid(device, source, vendor, product, version); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY /* Load Service changed Registered flag */ svc_change_regd = g_key_file_get_boolean(key_file, "Att", "SvcChangeRegd", NULL); @@ -4805,7 +4805,7 @@ static void device_add_gatt_services(struct btd_device *device) gatt_db_foreach_service(device->db, NULL, add_gatt_service, device); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static void accept_gatt_service(struct gatt_db_attribute *attr, void *user_data) { struct btd_device *device = user_data; @@ -4826,7 +4826,7 @@ static void accept_gatt_service(struct gatt_db_attribute *attr, void *user_data) static void device_accept_gatt_profiles(struct btd_device *device) { -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY GSList *l; for (l = device->services; l != NULL; l = g_slist_next(l)) @@ -5033,7 +5033,7 @@ static struct btd_device *device_new(struct btd_adapter *adapter, if (g_dbus_register_interface(dbus_conn, device->path, DEVICE_INTERFACE, -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY device_methods, device_signals, #else device_methods, NULL, @@ -5054,7 +5054,7 @@ static struct btd_device *device_new(struct btd_adapter *adapter, return btd_device_ref(device); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY void device_print_addr(struct btd_device *dev) { char ida[18]; @@ -5141,7 +5141,7 @@ char *btd_device_get_storage_path(struct btd_device *device, ba2str(btd_adapter_get_address(device->adapter), srcaddr); ba2str(&device->bdaddr, dstaddr); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (device->rpa) ba2str(device->rpa, dstaddr); #endif @@ -5227,7 +5227,7 @@ void device_update_addr(struct btd_device *device, const bdaddr_t *bdaddr, void device_set_bredr_support(struct btd_device *device) { -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY char addr_str[18]; if (device->rpa) { @@ -5251,7 +5251,7 @@ void device_set_bredr_support(struct btd_device *device) store_device_info(device); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY void device_set_rpa(struct btd_device *device, const bdaddr_t *rpa) { if (device->rpa == NULL) { @@ -5407,7 +5407,7 @@ static void device_remove_stored(struct btd_device *device) ba2str(src, adapter_addr); ba2str(&device->bdaddr, device_addr); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (device->rpa) ba2str(device->rpa, device_addr); #endif @@ -5433,7 +5433,7 @@ static void device_remove_stored(struct btd_device *device) g_key_file_free(key_file); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY void device_unpair(struct btd_device *device, gboolean remove_stored) { DBG("+"); @@ -5574,7 +5574,7 @@ void device_remove(struct btd_device *device, gboolean remove_stored) btd_device_unref(device); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY int device_rpa_cmp(gconstpointer a, gconstpointer b) { const struct btd_device *device = a; @@ -5624,7 +5624,7 @@ static bool addr_is_public(uint8_t addr_type) return false; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY int device_addr_type_strict_cmp(gconstpointer a, gconstpointer b) { const struct btd_device *dev = a; @@ -5669,7 +5669,7 @@ int device_addr_type_cmp(gconstpointer a, gconstpointer b) */ if (!cmp && addr_is_public(addr->bdaddr_type) && addr_is_public(dev->bdaddr_type)) -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY { if (dev->rpa && addr->bdaddr_type == BDADDR_BREDR) { char addr_str[18]; @@ -5700,7 +5700,8 @@ int device_addr_type_cmp(gconstpointer a, gconstpointer b) return cmp; } -#ifdef TIZEN_WEARABLE +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY +#ifdef TIZEN_FEATURE_BLUEZ_BATTERY_WATCH void device_change_pkt_type(gpointer data, gpointer user_data) { int pkt_type = (int)user_data; @@ -5758,7 +5759,8 @@ void device_change_pkt_type(gpointer data, gpointer user_data) hci_close_dev(hdev); return; } -#endif /* TIZEN_WEARABLE */ +#endif /* TIZEN_FEATURE_BLUEZ_BATTERY_WATCH */ +#endif static gboolean record_has_uuid(const sdp_record_t *rec, const char *profile_uuid) @@ -5817,7 +5819,7 @@ static struct btd_service *probe_service(struct btd_device *device, * Profile based auto connection is not used in Tizen. * Instead, the applications request auto connection with address. */ -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY if (profile->auto_connect) device_set_auto_connect(device, TRUE); #endif @@ -6243,7 +6245,7 @@ static void search_cb(sdp_list_t *recs, int err, gpointer user_data) DEVICE_INTERFACE, "UUIDs"); send_reply: -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (!req->msg) goto done; @@ -6350,7 +6352,7 @@ static void att_disconnected_cb(int err, void *user_data) adapter_connect_list_add(device->adapter, device); done: -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY device_set_gatt_connected(device, FALSE); #endif attio_cleanup(device); @@ -6372,7 +6374,7 @@ static void register_gatt_services(struct btd_device *device) btd_device_set_temporary(device, false); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (req) { if (req->search_uuid) DBG("browse req. is for SDP. Ignore it."); @@ -6425,7 +6427,7 @@ static void gatt_client_ready_cb(bool success, uint8_t att_ecode, if (!device->gatt_cache_used) g_idle_add(gatt_services_changed, device); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (device->name[0] == '\0') { char *name = NULL; name = bt_gatt_client_get_gap_device_name(device->client); @@ -6534,7 +6536,7 @@ static bool remote_counter(uint32_t *sign_cnt, void *user_data) return true; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static bool load_svc_change_indication_status(struct btd_device *device, const char *local, const char *peer) { @@ -6571,14 +6573,14 @@ bool device_attach_att(struct btd_device *dev, GIOChannel *io) struct btd_gatt_database *database; const bdaddr_t *src, *dst; char srcaddr[18], dstaddr[18]; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY uint8_t dst_type = BDADDR_BREDR; #endif bt_io_get(io, &gerr, BT_IO_OPT_SEC_LEVEL, &sec_level, BT_IO_OPT_IMTU, &mtu, BT_IO_OPT_CID, &cid, -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY BT_IO_OPT_DEST_TYPE, &dst_type, #endif BT_IO_OPT_INVALID); @@ -6589,7 +6591,7 @@ bool device_attach_att(struct btd_device *dev, GIOChannel *io) return false; } -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY if (sec_level == BT_IO_SEC_LOW && dev->le_state.paired) { DBG("Elevating security level since LTK is available"); @@ -6628,7 +6630,7 @@ bool device_attach_att(struct btd_device *dev, GIOChannel *io) bt_att_set_remote_key(dev->att, dev->remote_csrk->key, remote_counter, dev); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (dst_type != BDADDR_BREDR && device_get_rpa_exist(dev) == true) { bt_att_set_remote_addr(dev->att, device_get_rpa(dev), BDADDR_LE_RANDOM); @@ -6659,7 +6661,7 @@ bool device_attach_att(struct btd_device *dev, GIOChannel *io) */ adapter_connect_list_remove(dev->adapter, dev); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY /* load the service changed indication status on connection */ load_svc_change_indication_status(dev, srcaddr, dstaddr); #endif @@ -6857,7 +6859,7 @@ static int device_browse_gatt(struct btd_device *device, DBusMessage *msg) struct att_callbacks *attcb; struct browse_req *req; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY DBG(""); #endif req = browse_request_new(device, msg); @@ -6938,7 +6940,7 @@ static int device_browse_sdp(struct btd_device *device, DBusMessage *msg) uuid_t uuid; int err; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY DBG(""); #endif req = browse_request_new(device, msg); @@ -6953,7 +6955,7 @@ static int device_browse_sdp(struct btd_device *device, DBusMessage *msg) &device->bdaddr, &uuid, browse_cb, req, NULL, req->sdp_flags); if (err < 0) { -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY device->browse = NULL; #endif browse_request_free(req); @@ -6963,7 +6965,7 @@ static int device_browse_sdp(struct btd_device *device, DBusMessage *msg) return err; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY void device_set_last_addr_type(struct btd_device *device, uint8_t type) { if (!device) @@ -7166,7 +7168,7 @@ void btd_device_set_trusted(struct btd_device *device, gboolean trusted) DEVICE_INTERFACE, "Trusted"); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY void btd_device_set_trusted_profiles(struct btd_device *device, uint32_t pbap, uint32_t map, uint32_t sap) { @@ -7247,7 +7249,7 @@ void device_set_rssi_with_delta(struct btd_device *device, int8_t rssi, if (!device) return; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (rssi == 0 || device->rssi == 0) { if (device->rssi == rssi) return; @@ -7414,20 +7416,19 @@ void device_bonding_complete(struct btd_device *device, uint8_t bdaddr_type, if (status) { device_cancel_authentication(device, TRUE); device_bonding_failed(device, status); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY device->legacy_pairing = false; #endif return; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY device->legacy_pairing = false; #endif device_auth_req_free(device); /* If we're already paired nothing more is needed */ if (state->paired) { -#ifdef __TIZEN_PATCH__ -#ifdef TIZEN_WEARABLE +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (bdaddr_type == BDADDR_BREDR && state->svc_resolved) { DBG("Link key has been changed. Report it"); if (!device->rpa) @@ -7442,8 +7443,7 @@ void device_bonding_complete(struct btd_device *device, uint8_t bdaddr_type, g_dbus_emit_property_changed(dbus_conn, device->path, DEVICE_INTERFACE, "Paired"); } -#endif /* TIZEN_WEARABLE */ -#endif /* __TIZEN_PATCH__ */ +#endif /* TIZEN_FEATURE_BLUEZ_MODIFY */ return; } @@ -7533,7 +7533,7 @@ unsigned int device_wait_for_svc_complete(struct btd_device *dev, g_source_remove(dev->discov_timer); dev->discov_timer = g_idle_add(start_discovery, dev); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY else if (!dev->browse) { DBG("Service is not going on. Start discovery"); dev->discov_timer = g_idle_add(start_discovery, dev); @@ -7646,7 +7646,7 @@ void device_bonding_failed(struct btd_device *device, uint8_t status) DBG("status %u", status); if (!bonding) { -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (device->legacy_pairing) { DBG("Emit LegacyPaired"); g_dbus_emit_property_changed(dbus_conn, device->path, @@ -7655,7 +7655,7 @@ void device_bonding_failed(struct btd_device *device, uint8_t status) #endif return; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY btd_device_set_temporary(device, TRUE); #endif @@ -7702,7 +7702,7 @@ static void confirm_cb(struct agent *agent, DBusError *err, void *data) if (auth->agent == NULL) return; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY btd_adapter_confirm_reply(device->adapter, &device->bdaddr, device->auth_bdaddr_type, err ? FALSE : TRUE); @@ -7730,7 +7730,7 @@ static void passkey_cb(struct agent *agent, DBusError *err, if (err) passkey = INVALID_PASSKEY; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY btd_adapter_passkey_reply(device->adapter, &device->bdaddr, device->auth_bdaddr_type, passkey); device_set_auth_addr_type(device, BDADDR_BREDR); @@ -7840,7 +7840,7 @@ int device_confirm_passkey(struct btd_device *device, uint32_t passkey, auth->passkey = passkey; -#ifndef TIZEN_WEARABLE +#ifndef TIZEN_FEATURE_BLUEZ_CONFIRM_ONLY if (confirm_hint) err = agent_request_authorization(auth->agent, device, confirm_cb, auth, NULL); @@ -7958,12 +7958,12 @@ void device_cancel_authentication(struct btd_device *device, gboolean aborted) device_auth_req_free(device); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY device_set_auth_addr_type(device, BDADDR_BREDR); #endif } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY gboolean device_is_authenticating(struct btd_device *dev, uint8_t bdaddr_type) { return (dev->auth_bdaddr_type == bdaddr_type && dev->authr != NULL); @@ -8060,7 +8060,7 @@ static sdp_list_t *read_device_records(struct btd_device *device) ba2str(btd_adapter_get_address(device->adapter), local); ba2str(&device->bdaddr, peer); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (device->rpa) ba2str(device->rpa, peer); #endif @@ -8152,7 +8152,7 @@ void device_set_appearance(struct btd_device *device, uint16_t value) store_device_info(device); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY int device_get_rpa_res_char_value(struct btd_device *device) { return device->rpa_res_support; @@ -8304,7 +8304,9 @@ guint btd_device_add_attio_callback(struct btd_device *device, attio->dcfunc = dcfunc; attio->user_data = user_data; +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY device_set_auto_connect(device, TRUE); +#endif /* Check if there is no GAttrib associated to the device created by a * incoming connection */ @@ -8387,7 +8389,7 @@ static void service_state_changed(struct btd_service *service, struct btd_device *device = btd_service_get_device(service); int err = btd_service_get_error(service); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (!err) { if (old_state == BTD_SERVICE_STATE_UNAVAILABLE || new_state == BTD_SERVICE_STATE_UNAVAILABLE) @@ -8450,7 +8452,7 @@ void btd_device_cleanup(void) btd_service_remove_state_cb(service_state_cb_id); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY void btd_device_set_legacy_pairing(struct btd_device *dev, bool legacy_pairing) { dev->legacy_pairing = legacy_pairing; diff --git a/src/device.h b/src/device.h index 11e655c..d00a93c 100644 --- a/src/device.h +++ b/src/device.h @@ -26,7 +26,7 @@ struct btd_device; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY /* Device Physical channel connection Type */ #define DEV_CONN_DEFAULT 0xFF /* Represents support for BREDR and LE */ #define DEV_CONN_BREDR 0x00 /* Only BREDR */ @@ -66,7 +66,7 @@ struct device_addr_type { uint8_t bdaddr_type; }; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY int device_addr_type_strict_cmp(gconstpointer a, gconstpointer b); #endif int device_addr_type_cmp(gconstpointer a, gconstpointer b); @@ -92,7 +92,7 @@ void device_remove_profile(gpointer a, gpointer b); struct btd_adapter *device_get_adapter(struct btd_device *device); const bdaddr_t *device_get_address(struct btd_device *device); const char *device_get_path(const struct btd_device *device); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY void device_set_remote_feature_flag(struct btd_device *device, int flags); gboolean device_is_bredrle(struct btd_device *device); void device_set_disconnect_reason(struct btd_device *device, uint8_t reason); @@ -147,7 +147,7 @@ int device_notify_passkey(struct btd_device *device, uint32_t passkey, int device_notify_pincode(struct btd_device *device, gboolean secure, const char *pincode); void device_cancel_authentication(struct btd_device *device, gboolean aborted); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY gboolean device_is_authenticating(struct btd_device *dev, uint8_t bdaddr_type); #else gboolean device_is_authenticating(struct btd_device *device); @@ -167,7 +167,7 @@ void device_remove_disconnect_watch(struct btd_device *device, guint id); int device_get_appearance(struct btd_device *device, uint16_t *value); void device_set_appearance(struct btd_device *device, uint16_t value); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY struct eir_data; void device_set_manufacturer_info(struct btd_device *dev, struct eir_data *eir); void device_set_adv_report_info(struct btd_device *device, void *data, @@ -211,7 +211,7 @@ bool device_remove_svc_complete_callback(struct btd_device *dev, struct btd_service *btd_device_get_service(struct btd_device *dev, const char *remote_uuid); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY void device_print_addr(struct btd_device *dev); gboolean device_is_profile_trusted(struct btd_device *device, const char *uuid); @@ -223,9 +223,9 @@ void btd_device_disconnect(struct btd_device *dev); void btd_device_set_legacy_pairing(struct btd_device *dev, bool legacy_pairing); void btd_device_set_svc_changed_indication(struct btd_device *dev, bool value); bool btd_device_get_svc_changed_indication(struct btd_device *dev); -#ifdef TIZEN_WEARABLE +#ifdef TIZEN_FEATURE_BLUEZ_BATTERY_WATCH void device_change_pkt_type(gpointer data, gpointer user_data); -#endif /* TIZEN_WEARABLE */ +#endif /* TIZEN_FEATURE_BLUEZ_BATTERY_WATCH */ #endif int device_discover_services(struct btd_device *device); diff --git a/src/eir.c b/src/eir.c index 3ef739b..ee5975a 100644 --- a/src/eir.c +++ b/src/eir.c @@ -65,7 +65,7 @@ void eir_data_free(struct eir_data *eir) eir->msd_list = NULL; g_slist_free_full(eir->sd_list, sd_free); eir->sd_list = NULL; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY g_free(eir->manufacturer_data); eir->manufacturer_data = NULL; #endif @@ -132,7 +132,7 @@ static void eir_parse_uuid128(struct eir_data *eir, const uint8_t *data, static char *name2utf8(const uint8_t *name, uint8_t len) { -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY char *utf8_name; char *in_name; char *ptr; @@ -368,7 +368,7 @@ void eir_parse(struct eir_data *eir, const uint8_t *eir_data, uint8_t eir_len) break; case EIR_MANUFACTURER_DATA: -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (data_len < 1) break; diff --git a/src/eir.h b/src/eir.h index 423cb36..5e8bbd5 100644 --- a/src/eir.h +++ b/src/eir.h @@ -92,7 +92,7 @@ struct eir_data { uint16_t did_source; GSList *msd_list; GSList *sd_list; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY char *manufacturer_data; uint8_t manufacturer_data_len; #endif diff --git a/src/gatt-client.c b/src/gatt-client.c index 398e00f..bb3b8b7 100644 --- a/src/gatt-client.c +++ b/src/gatt-client.c @@ -61,7 +61,7 @@ struct btd_gatt_client { struct queue *services; struct queue *all_notify_clients; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY guint wait_charcs_id; #endif }; @@ -77,7 +77,7 @@ struct service { bool chrcs_ready; struct queue *pending_ext_props; guint idle_id; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY guint idle_id2; #endif }; @@ -229,7 +229,7 @@ static bool parse_value_arg(DBusMessage *msg, uint8_t **value, return true; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static bool parse_type_value_arg(DBusMessage *msg, uint8_t *type, uint8_t **value, size_t *value_len) { @@ -481,7 +481,7 @@ static void write_result_cb(bool success, bool reliable_error, reply = btd_error_failed(op->msg, "Reliable write failed"); else { -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY reply = dbus_message_new_method_return(op->msg); if (!reply) { error("Failed to allocate D-Bus message reply"); @@ -503,7 +503,7 @@ static void write_result_cb(bool success, bool reliable_error, error("Failed to allocate D-Bus message reply"); return; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY dbus_message_append_args(reply, DBUS_TYPE_BYTE, &att_ecode, DBUS_TYPE_INVALID); @@ -567,7 +567,7 @@ static unsigned int start_write_request(DBusMessage *msg, uint16_t handle, return id; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static unsigned int start_write_cmd(DBusMessage *msg, uint16_t handle, struct bt_gatt_client *gatt, bool signed_write, const uint8_t *value, size_t value_len, @@ -654,7 +654,7 @@ static DBusMessage *descriptor_write_value(DBusConnection *conn, } static const GDBusPropertyTable descriptor_properties[] = { -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY { "UUID", "s", descriptor_get_uuid }, { "Characteristic", "o", descriptor_get_characteristic }, { "Value", "ay", descriptor_get_value, NULL, @@ -672,7 +672,7 @@ static const GDBusPropertyTable descriptor_properties[] = { }; static const GDBusMethodTable descriptor_methods[] = { -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY { GDBUS_ASYNC_METHOD("ReadValue", NULL, GDBUS_ARGS({ "value", "ay" }), descriptor_read_value) }, { GDBUS_ASYNC_METHOD("WriteValue", @@ -877,7 +877,7 @@ static void write_characteristic_cb(struct gatt_db_attribute *attr, int err, } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static void notify_characteristic_cb(struct gatt_db_attribute *attr, int err, void *user_data) { @@ -1013,7 +1013,7 @@ static DBusMessage *characteristic_write_value(DBusConnection *conn, * - If value is larger than MTU - 3: long-write * * "write-without-response" property set -> write command. */ -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY if ((chrc->ext_props & BT_GATT_CHRC_EXT_PROP_RELIABLE_WRITE)) { supported = true; chrc->write_id = start_long_write(msg, chrc->value_handle, gatt, @@ -1065,7 +1065,7 @@ fail: return btd_error_not_supported(msg); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static DBusMessage *characteristic_write_value_by_type(DBusConnection *conn, DBusMessage *msg, void *user_data) { @@ -1240,7 +1240,7 @@ static bool match_notify_sender(const void *a, const void *b) return strcmp(client->owner, sender) == 0; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY void gatt_characteristic_value_changed(struct notify_client *client, const uint8_t *data, uint16_t data_len, void *user_data) { struct characteristic *chrc = user_data; @@ -1283,7 +1283,7 @@ static void notify_cb(uint16_t value_handle, const uint8_t *value, * applications. */ gatt_db_attribute_reset(chrc->attr); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY gatt_db_attribute_write(chrc->attr, 0, value, length, 0, NULL, notify_characteristic_cb, chrc); @@ -1465,7 +1465,7 @@ static gboolean characteristic_get_descriptors( } static const GDBusPropertyTable characteristic_properties[] = { -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY { "UUID", "s", characteristic_get_uuid }, { "Service", "o", characteristic_get_service }, { "Value", "ay", characteristic_get_value, NULL, @@ -1496,7 +1496,7 @@ static const GDBusPropertyTable characteristic_properties[] = { }; static const GDBusMethodTable characteristic_methods[] = { -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY { GDBUS_ASYNC_METHOD("ReadValue", NULL, GDBUS_ARGS({ "value", "ay" }), characteristic_read_value) }, { GDBUS_ASYNC_METHOD("WriteValue", GDBUS_ARGS({ "value", "ay" }), @@ -1525,7 +1525,7 @@ static const GDBusMethodTable characteristic_methods[] = { #endif }; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static const GDBusSignalTable service_signals[] = { { GDBUS_SIGNAL("GattServiceAdded", GDBUS_ARGS({ "Service Path","s"})) }, @@ -1562,7 +1562,7 @@ static struct characteristic *characteristic_create( chrc->notify_clients = queue_new(); chrc->service = service; -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY gatt_db_attribute_get_char_data(attr, &chrc->handle, &chrc->value_handle, &chrc->props, &uuid); @@ -1592,7 +1592,7 @@ static struct characteristic *characteristic_create( if (!g_dbus_register_interface(btd_get_dbus_connection(), chrc->path, GATT_CHARACTERISTIC_IFACE, -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY characteristic_methods, characteristic_signals, #else characteristic_methods, NULL, @@ -1704,7 +1704,7 @@ static gboolean service_get_characteristics(const GDBusPropertyTable *property, } static const GDBusPropertyTable service_properties[] = { -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY { "UUID", "s", service_get_uuid }, { "Device", "o", service_get_device }, { "Primary", "b", service_get_primary }, @@ -1756,7 +1756,7 @@ static struct service *service_create(struct gatt_db_attribute *attr, if (!g_dbus_register_interface(btd_get_dbus_connection(), service->path, GATT_SERVICE_IFACE, -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY NULL, service_signals, #else NULL, NULL, @@ -1792,7 +1792,7 @@ static void unregister_service(void *data) if (service->idle_id) g_source_remove(service->idle_id); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (service->idle_id2) g_source_remove(service->idle_id2); #endif @@ -1847,7 +1847,7 @@ static void read_ext_props_cb(bool success, uint8_t att_ecode, struct characteristic *chrc = user_data; struct service *service = chrc->service; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY chrc->read_id = 0; #endif @@ -1878,7 +1878,7 @@ static void read_ext_props(void *data, void *user_data) { struct characteristic *chrc = data; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY chrc->read_id = bt_gatt_client_read_value(chrc->service->client->gatt, chrc->ext_props_handle, read_ext_props_cb, @@ -1962,7 +1962,7 @@ static gboolean set_chrcs_ready(gpointer user_data) return FALSE; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static gboolean notify_service_added_complete(gpointer user_data) { struct service *service = user_data; @@ -2012,7 +2012,7 @@ static void export_service(struct gatt_db_attribute *attr, void *user_data) if (!service->chrcs_ready && queue_isempty(service->pending_ext_props)) service->idle_id = g_idle_add(set_chrcs_ready, service); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (service->primary == true) service->idle_id2 = g_idle_add(notify_service_added_complete, service); #endif @@ -2053,7 +2053,7 @@ void btd_gatt_client_destroy(struct btd_gatt_client *client) if (!client) return; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (client->wait_charcs_id) g_source_remove(client->wait_charcs_id); #endif @@ -2092,7 +2092,7 @@ static void register_notify(void *data, void *user_data) notify_client_free(notify_client); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static void check_chrcs_ready(void *data, void *user_data) { gboolean *chrcs_ready = user_data; @@ -2159,7 +2159,7 @@ void btd_gatt_client_ready(struct btd_gatt_client *client) DBG("GATT client ready"); create_services(client); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY /* * In case of more number of services and services having * characteristics extended properties; GattConnected signal @@ -2287,7 +2287,7 @@ void btd_gatt_client_disconnected(struct btd_gatt_client *client) DBG("Device disconnected. Cleaning up."); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (client->wait_charcs_id) { g_source_remove(client->wait_charcs_id); client->wait_charcs_id = 0; diff --git a/src/gatt-database.c b/src/gatt-database.c index a75fc47..4daa2e8 100644 --- a/src/gatt-database.c +++ b/src/gatt-database.c @@ -139,7 +139,7 @@ struct pending_op { struct gatt_db_attribute *attrib; struct queue *owner_queue; struct iovec data; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY bdaddr_t bdaddr; uint8_t bdaddr_type; #endif @@ -168,7 +168,7 @@ struct device_info { uint8_t bdaddr_type; }; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static void conf_cb(void *user_data); #endif @@ -225,7 +225,7 @@ find_device_state(struct btd_gatt_database *database, bdaddr_t *bdaddr, return queue_find(database->device_states, dev_state_match, &dev_info); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static void send_service_changed_indication_on_reconnect( struct btd_device *device, struct bt_gatt_server *server) @@ -294,7 +294,7 @@ static struct device_state *device_state_create(bdaddr_t *bdaddr, uint8_t bdaddr_type) { struct device_state *dev_state; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY char addr[18] = { 0 }; ba2str(bdaddr, addr); @@ -337,7 +337,7 @@ static struct ccc_state *get_ccc_state(struct btd_gatt_database *database, { struct device_state *dev_state; struct ccc_state *ccc; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY char addr[18] = { 0 }; #endif @@ -347,7 +347,7 @@ static struct ccc_state *get_ccc_state(struct btd_gatt_database *database, if (ccc) return ccc; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY ba2str(bdaddr, addr); DBG("create ccc_state of handle: 0x%04x for %s [%d]", handle, addr, bdaddr_type); @@ -576,7 +576,7 @@ static void connect_cb(GIOChannel *io, GError *gerr, gpointer user_data) device_attach_att(device, io); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (btd_device_get_svc_changed_indication(device)) { send_service_changed_indication_on_reconnect(device, btd_device_get_gatt_server(device)); @@ -584,7 +584,7 @@ static void connect_cb(GIOChannel *io, GError *gerr, gpointer user_data) #endif } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY #define LE_BEARER_POSTFIX " LE" #define LE_BEARER_POSTFIX_LEN 3 @@ -601,7 +601,7 @@ static void gap_device_name_read_cb(struct gatt_db_attribute *attrib, size_t len = 0; const uint8_t *value = NULL; const char *device_name; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY bdaddr_t dst = { { 0 } }; uint8_t dst_type = 0; char le_name[MAX_NAME_LENGTH + 1]; @@ -610,7 +610,7 @@ static void gap_device_name_read_cb(struct gatt_db_attribute *attrib, DBG("GAP Device Name read request\n"); device_name = btd_adapter_get_name(database->adapter); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (get_dst_info(att, &dst, &dst_type) && dst_type != BDADDR_BREDR && bacmp(btd_adapter_get_address(database->adapter), btd_adapter_get_le_address(database->adapter))) { @@ -672,7 +672,7 @@ done: gatt_db_attribute_read_result(attrib, id, error, value, len); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static void gap_rpa_res_support_read_cb(struct gatt_db_attribute *attrib, unsigned int id, uint16_t offset, uint8_t opcode, struct bt_att *att, @@ -771,14 +771,14 @@ static uint32_t database_add_record(struct btd_gatt_database *database, return 0; if (name != NULL) -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY sdp_set_info_attr(record, name, "Samsung", NULL); #else sdp_set_info_attr(record, name, "BlueZ", NULL); #endif sdp_uuid16_create(&gap_uuid, UUID_GAP); -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY if (sdp_uuid_cmp(&svc, &gap_uuid) == 0) { sdp_set_url_attr(record, "http://www.bluez.org/", "http://www.bluez.org/", @@ -822,7 +822,7 @@ static void populate_gap_service(struct btd_gatt_database *database) gap_appearance_read_cb, NULL, database); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY /* Central address resolution characteristic */ bt_uuid16_create(&uuid, GATT_CHARAC_CENTRAL_RPA_RESOLUTION); gatt_db_service_add_characteristic(service, &uuid, BT_ATT_PERM_READ, @@ -836,7 +836,7 @@ static void populate_gap_service(struct btd_gatt_database *database) static bool get_dst_info(struct bt_att *att, bdaddr_t *dst, uint8_t *dst_type) { -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY return bt_att_get_remote_addr(att, dst, dst_type); #else GIOChannel *io = NULL; @@ -955,7 +955,7 @@ static void gatt_ccc_write_cb(struct gatt_db_attribute *attrib, done: gatt_db_attribute_write_result(attrib, id, ecode); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (!ecode) { uint16_t svc_chngd_handle = gatt_db_attribute_get_handle(database->svc_chngd_ccc); if (handle == svc_chngd_handle) { @@ -1066,7 +1066,7 @@ struct notify { bool indicate; }; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY struct notify_indicate { struct btd_gatt_database *database; GDBusProxy *proxy; @@ -1128,7 +1128,7 @@ static void indicate_confirm_reply_cb(DBusMessage *message, void *user_data) static void conf_cb(void *user_data) { DBG("GATT server received confirmation"); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY struct notify_indicate_cb *confirm = user_data; if (confirm) { @@ -1142,7 +1142,7 @@ static void conf_cb(void *user_data) #endif } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static void send_notification_indication_to_device(void *data, void *user_data) { struct device_state *device_state = data; @@ -1939,7 +1939,7 @@ static void pending_op_free(void *data) free(op); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static struct pending_op *pending_read_new(struct queue *owner_queue, struct gatt_db_attribute *attrib, struct bt_att *att, @@ -1951,21 +1951,21 @@ static struct pending_op *pending_read_new(struct queue *owner_queue, #endif { struct pending_op *op; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY bdaddr_t bdaddr; uint8_t bdaddr_type; #endif op = new0(struct pending_op, 1); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (!get_dst_info(att, &bdaddr, &bdaddr_type)) { return NULL; } #endif op->owner_queue = owner_queue; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY memcpy(&op->bdaddr, &bdaddr, sizeof(bdaddr_t)); op->bdaddr_type = bdaddr_type; #endif @@ -1977,7 +1977,7 @@ static struct pending_op *pending_read_new(struct queue *owner_queue, return op; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static void read_setup_cb(DBusMessageIter *iter, void *user_data) { struct pending_op *op = user_data; @@ -1999,7 +1999,7 @@ static void read_setup_cb(DBusMessageIter *iter, void *user_data) } #endif -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static void send_read(struct gatt_db_attribute *attrib, struct bt_att *att, GDBusProxy *proxy, struct queue *owner_queue, unsigned int id) @@ -2012,13 +2012,13 @@ static void send_read(struct gatt_db_attribute *attrib, GDBusProxy *proxy, struct pending_op *op; uint8_t ecode = BT_ATT_ERROR_UNLIKELY; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY op = pending_read_new(owner_queue, attrib, att, id); #else op = pending_read_new(owner_queue, attrib, id); #endif -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (g_dbus_proxy_method_call(proxy, "ReadValue", read_setup_cb, read_reply_cb, op, pending_op_free) == TRUE) #else @@ -2036,13 +2036,13 @@ static void write_setup_cb(DBusMessageIter *iter, void *user_data) { struct pending_op *op = user_data; DBusMessageIter array; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY char dstaddr[18] = { 0 }; char *addr_value = NULL; uint16_t offset = 0; #endif -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY ba2str(&op->bdaddr, dstaddr); addr_value = g_strdup(dstaddr); @@ -2098,7 +2098,7 @@ done: gatt_db_attribute_write_result(op->attrib, op->id, ecode); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static struct pending_op *pending_write_new(struct queue *owner_queue, struct gatt_db_attribute *attrib, struct bt_att *att, unsigned int id, @@ -2113,13 +2113,13 @@ static struct pending_op *pending_write_new(struct queue *owner_queue, #endif { struct pending_op *op; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY bdaddr_t bdaddr; uint8_t bdaddr_type; #endif op = new0(struct pending_op, 1); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (!get_dst_info(att, &bdaddr, &bdaddr_type)) { return NULL; } @@ -2127,7 +2127,7 @@ static struct pending_op *pending_write_new(struct queue *owner_queue, op->data.iov_base = (uint8_t *) value; op->data.iov_len = len; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY memcpy(&op->bdaddr, &bdaddr, sizeof(bdaddr_t)); op->bdaddr_type = bdaddr_type; #endif @@ -2140,7 +2140,7 @@ static struct pending_op *pending_write_new(struct queue *owner_queue, return op; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static void send_write(struct gatt_db_attribute *attrib, struct bt_att *att, GDBusProxy *proxy, struct queue *owner_queue, unsigned int id, const uint8_t *value, size_t len) @@ -2154,7 +2154,7 @@ static void send_write(struct gatt_db_attribute *attrib, GDBusProxy *proxy, struct pending_op *op; uint8_t ecode = BT_ATT_ERROR_UNLIKELY; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY op = pending_write_new(owner_queue, attrib, att, id, value, len); #else op = pending_write_new(owner_queue, attrib, id, value, len); @@ -2256,12 +2256,12 @@ static void property_changed_cb(GDBusProxy *proxy, const char *name, DBusMessageIter array; uint8_t *value = NULL; int len = 0; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY bool enable = FALSE; const bdaddr_t *unicast_addr = NULL; #endif -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (strcmp(name, "Value") == 0) { if (dbus_message_iter_get_arg_type(iter) != DBUS_TYPE_ARRAY) { DBG("Malformed \"Value\" property received"); @@ -2443,7 +2443,7 @@ static void desc_read_cb(struct gatt_db_attribute *attrib, error("Read callback called with incorrect attribute"); return; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY send_read(attrib, att, desc->proxy, desc->pending_reads, id); #else send_read(attrib, desc->proxy, desc->pending_reads, id); @@ -2463,7 +2463,7 @@ static void desc_write_cb(struct gatt_db_attribute *attrib, return; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY send_write(attrib, att, desc->proxy, desc->pending_writes, id, value, len); #else send_write(attrib, desc->proxy, desc->pending_writes, id, value, len); @@ -2506,14 +2506,14 @@ static void chrc_read_cb(struct gatt_db_attribute *attrib, return; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY send_read(attrib, att, chrc->proxy, chrc->pending_reads, id); #else send_read(attrib, chrc->proxy, chrc->pending_reads, id); #endif } -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY static void write_without_response_setup_cb(DBusMessageIter *iter, void *user_data) { @@ -2558,7 +2558,7 @@ static void chrc_write_cb(struct gatt_db_attribute *attrib, return; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if ((!(chrc->props & BT_GATT_CHRC_PROP_WRITE_WITHOUT_RESP) && opcode == BT_ATT_OP_WRITE_CMD) || (!(chrc->props & BT_GATT_CHRC_PROP_WRITE) && @@ -2581,7 +2581,7 @@ static void chrc_write_cb(struct gatt_db_attribute *attrib, #endif } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static bool database_check_ccc_desc(struct external_desc *desc) { bt_uuid_t uuid, uuid_ccc; @@ -2631,7 +2631,7 @@ static bool database_add_chrc(struct external_service *service, return false; } -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY /* Existing implementation adds CCC descriptor by default * if notification and indication properties are set. But as per the requirment * CCCD shall be added by the application */ @@ -2650,7 +2650,7 @@ static bool database_add_chrc(struct external_service *service, if (desc->handled || g_strcmp0(desc->chrc_path, chrc->path)) continue; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY /* Check if Application wants to add CCC and use existing * implemenation to add CCC descriptors */ if (database_check_ccc_desc(desc)) { @@ -3177,7 +3177,7 @@ static DBusMessage *manager_unregister_profile(DBusConnection *conn, } static const GDBusMethodTable manager_methods[] = { -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY { GDBUS_ASYNC_METHOD("RegisterApplication", GDBUS_ARGS({ "application", "o" }, { "options", "a{sv}" }), NULL, diff --git a/src/gatt-dbus.c b/src/gatt-dbus.c index c67194d..a81c57c 100644 --- a/src/gatt-dbus.c +++ b/src/gatt-dbus.c @@ -1,4 +1,4 @@ -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY /* * * BlueZ - Bluetooth protocol stack for Linux @@ -234,7 +234,7 @@ static void proxy_removed(GDBusProxy *proxy, void *user_data) esvc->proxies = g_slist_remove(esvc->proxies, proxy); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static void proxy_prop_changed(GDBusProxy *proxy, const char *name, DBusMessageIter *iter, void *user_data) { @@ -308,7 +308,7 @@ static DBusMessage *__bt_gatt_dbus_method_send(const char *path, const char *svc return reply; } #endif -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static uint8_t proxy_read_cb(struct btd_attribute *attr, bdaddr_t *bdaddr, btd_attr_read_result_t result, void *user_data) #else @@ -319,7 +319,7 @@ static void proxy_read_cb(struct btd_attribute *attr, GDBusProxy *proxy; uint8_t *value = NULL; int len = 0; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY char dstaddr[18] = { 0 }; char *addr_value = NULL; DBusMessage *reply; @@ -337,17 +337,17 @@ static void proxy_read_cb(struct btd_attribute *attr, */ proxy = g_hash_table_lookup(proxy_hash, attr); if (!proxy) { -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY return result(-ENOENT, NULL, 0, user_data); #else result(-ENOENT, NULL, 0, user_data); return; #endif } -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY if (!g_dbus_proxy_get_property(proxy, "Value", &iter)) { /* Unusual situation, read property will checked earlier */ -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY return result(-EPERM, NULL, 0, user_data); #else result(-EPERM, NULL, 0, user_data); @@ -357,7 +357,7 @@ static void proxy_read_cb(struct btd_attribute *attr, if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_ARRAY) { DBG("External service inconsistent!"); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY return result(-EPERM, NULL, 0, user_data); #else result(-EPERM, NULL, 0, user_data); @@ -418,7 +418,7 @@ static void proxy_read_cb(struct btd_attribute *attr, #endif DBG("attribute: %p read %d bytes", attr, len); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY return result(0, value, len, user_data); #else result(0, value, len, user_data); @@ -455,7 +455,7 @@ done: wdata->result_cb(err, wdata->user_data); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static uint8_t proxy_write_cb(struct btd_attribute *attr, const uint8_t *value, size_t len, btd_attr_write_result_t result, @@ -471,7 +471,7 @@ static void proxy_write_cb(struct btd_attribute *attr, proxy = g_hash_table_lookup(proxy_hash, attr); if (!proxy) { -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY return result(-ENOENT, user_data); #else result(-ENOENT, user_data); @@ -495,7 +495,7 @@ static void proxy_write_cb(struct btd_attribute *attr, wdata->result_cb = result; wdata->user_data = user_data; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY btd_gatt_set_notify_indicate_flag(attr, FALSE); #endif @@ -504,7 +504,7 @@ static void proxy_write_cb(struct btd_attribute *attr, proxy_write_reply, wdata, g_free)) { g_free(wdata); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY return result(-ENOENT, user_data); #else result(-ENOENT, user_data); @@ -517,7 +517,7 @@ static void proxy_write_cb(struct btd_attribute *attr, * This flow implements the ATT Write Command scenario, where * the remote doesn't receive ATT response. */ -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY btd_gatt_set_notify_indicate_flag(attr, FALSE); #endif g_dbus_proxy_set_property_array(proxy, "Value", DBUS_TYPE_BYTE, @@ -527,7 +527,7 @@ static void proxy_write_cb(struct btd_attribute *attr, DBG("Server: Write attribute callback %s", g_dbus_proxy_get_path(proxy)); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY return 0; #endif @@ -557,7 +557,7 @@ static int register_external_service(struct external_service *esvc, if (bt_string_to_uuid(&uuid, str) < 0) return -EINVAL; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY esvc->service = btd_gatt_add_service(&uuid, path); #else esvc->service = btd_gatt_add_service(&uuid); @@ -575,7 +575,7 @@ static int add_char(GDBusProxy *proxy, const bt_uuid_t *uuid) btd_attr_write_t write_cb; btd_attr_read_t read_cb; uint8_t propmask = 0; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY const char *path; #endif @@ -603,7 +603,7 @@ static int add_char(GDBusProxy *proxy, const bt_uuid_t *uuid) else write_cb = NULL; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY path = g_dbus_proxy_get_path(proxy); attr = btd_gatt_add_char(uuid, propmask, path, read_cb, write_cb); #else @@ -620,11 +620,11 @@ static int add_char(GDBusProxy *proxy, const bt_uuid_t *uuid) static int add_char_desc(GDBusProxy *proxy, const bt_uuid_t *uuid) { struct btd_attribute *attr; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY const char *path; #endif -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY path = g_dbus_proxy_get_path(proxy); attr = btd_gatt_add_char_desc(uuid, path, proxy_read_cb, proxy_write_cb); #else @@ -703,7 +703,7 @@ static void client_ready(GDBusClient *client, void *user_data) dbus_message_unref(esvc->reg); esvc->reg = NULL; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY btd_gatt_update_attr_db(); #endif @@ -744,7 +744,7 @@ static struct external_service *external_service_new(DBusConnection *conn, g_dbus_client_set_disconnect_watch(client, remove_service, esvc); g_dbus_client_set_proxy_handlers(client, proxy_added, proxy_removed, -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY proxy_prop_changed, esvc); #else NULL, esvc); @@ -755,7 +755,7 @@ static struct external_service *external_service_new(DBusConnection *conn, return esvc; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static DBusMessage *get_service(DBusConnection *conn, DBusMessage *msg, void *user_data) { @@ -834,7 +834,7 @@ static DBusMessage *unregister_service(DBusConnection *conn, esvc = list->data; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (strcmp(dbus_message_get_sender(msg), esvc->owner)) #else if (!strcmp(dbus_message_get_sender(msg), esvc->owner)) @@ -853,7 +853,7 @@ static DBusMessage *unregister_service(DBusConnection *conn, } static const GDBusMethodTable methods[] = { -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY { GDBUS_ASYNC_METHOD("RegisterService", #else { GDBUS_EXPERIMENTAL_ASYNC_METHOD("RegisterService", @@ -861,14 +861,14 @@ static const GDBusMethodTable methods[] = { GDBUS_ARGS({ "service", "o"}, { "options", "a{sv}"}), NULL, register_service) }, -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY { GDBUS_METHOD("UnregisterService", #else { GDBUS_EXPERIMENTAL_METHOD("UnregisterService", #endif GDBUS_ARGS({"service", "o"}), NULL, unregister_service) }, -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY { GDBUS_METHOD("GetService", #else { GDBUS_EXPERIMENTAL_METHOD("GetService", diff --git a/src/gatt-dbus.h b/src/gatt-dbus.h index 6d35ecd..bde543a 100644 --- a/src/gatt-dbus.h +++ b/src/gatt-dbus.h @@ -1,4 +1,4 @@ -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY /* * * BlueZ - Bluetooth protocol stack for Linux diff --git a/src/gatt.c b/src/gatt.c index f438216..a756a02 100644 --- a/src/gatt.c +++ b/src/gatt.c @@ -1,4 +1,4 @@ -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY /* * * BlueZ - Bluetooth protocol stack for Linux @@ -28,7 +28,7 @@ #include #include -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY #include #include #include @@ -41,7 +41,7 @@ #include "gatt-dbus.h" #include "gatt.h" -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY #include "adapter.h" #include "attrib/gatt-service.h" #include "attrib/att-database.h" @@ -58,7 +58,7 @@ static const bt_uuid_t primary_uuid = { .type = BT_UUID16, static const bt_uuid_t chr_uuid = { .type = BT_UUID16, .value.u16 = GATT_CHARAC_UUID }; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY #define ATT_CHAR_READ_VALUE 0x01 #define ATT_CHAR_RD_WRT_CB 0x02 @@ -71,7 +71,7 @@ static const bt_uuid_t chr_uuid = { .type = BT_UUID16, struct btd_attribute { uint16_t handle; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY uint16_t attr_start_handle; uint16_t attr_end_handle; bool notify_indicate; @@ -84,7 +84,7 @@ struct btd_attribute { uint8_t value[0]; }; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY struct pending_hndl { uint16_t handle; uint16_t type; @@ -144,7 +144,7 @@ static struct btd_attribute *new_attribute(const bt_uuid_t *type, attr->type = *type; attr->read_cb = read_cb; attr->write_cb = write_cb; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY attr->notify_indicate = TRUE; #endif @@ -172,7 +172,7 @@ static int local_database_add(uint16_t handle, struct btd_attribute *attr) return 0; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static int attr_uuid_cmp(gconstpointer a, gconstpointer b) { const struct btd_attribute *attrib1 = a; @@ -781,7 +781,7 @@ gboolean gatt_unregister_internet_protocol_service(struct btd_adapter *adapter) #endif #endif -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY struct btd_attribute *btd_gatt_add_service(const bt_uuid_t *uuid, const char *path) #else @@ -811,7 +811,7 @@ struct btd_attribute *btd_gatt_add_service(const bt_uuid_t *uuid) if (!attr) return NULL; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY attr->path = g_strdup(path); /* Store the primary handle in linkedlist, * later this list shall be used to add the attributes to DB */ @@ -839,14 +839,14 @@ void btd_gatt_remove_service(struct btd_attribute *service) { GList *list = g_list_find(local_attribute_db, service); bool first_node; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY struct btd_attribute *attrib_rmv = NULL; #endif if (!list) return; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY attrib_rmv = list->data; /* Remove the service from Attrib database */ @@ -861,7 +861,7 @@ void btd_gatt_remove_service(struct btd_attribute *service) /* Remove all characteristics until next service declaration */ while (list && !is_service(list->data)) { -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY free(list->data); #endif list = g_list_delete_link(list, list); @@ -876,7 +876,7 @@ void btd_gatt_remove_service(struct btd_attribute *service) local_attribute_db = list; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY bool btd_gatt_update_char(const bt_uuid_t *uuid, uint8_t *value, size_t len) { GList *l; @@ -937,7 +937,7 @@ bool btd_gatt_update_char(const bt_uuid_t *uuid, uint8_t *value, size_t len) } #endif -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY struct btd_attribute *btd_gatt_add_char(const bt_uuid_t *uuid, uint8_t properties, const char *path, @@ -982,7 +982,7 @@ struct btd_attribute *btd_gatt_add_char(const bt_uuid_t *uuid, if (!char_decl) goto fail; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY char_decl->path = g_strdup(path); #endif @@ -990,14 +990,14 @@ struct btd_attribute *btd_gatt_add_char(const bt_uuid_t *uuid, if (!char_value) goto fail; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY char_value->path = g_strdup(path); #endif if (local_database_add(next_handle, char_decl) < 0) goto fail; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY /* Store the char decl handle in linkedlist, * later this list shall be used to add the attributes to DB */ if (hndl_list && hndl_list->next == NULL) { @@ -1028,7 +1028,7 @@ struct btd_attribute *btd_gatt_add_char(const bt_uuid_t *uuid, /* TODO: remove declaration */ goto fail; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY /* Store the char value handle in linkedlist, * later this list shall be used to add the attributes to DB */ if (hndl_list && hndl_list->next == NULL) { @@ -1053,7 +1053,7 @@ struct btd_attribute *btd_gatt_add_char(const bt_uuid_t *uuid, return char_value; fail: -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY /* Fix : RESOURCE_LEAK */ if (char_decl != NULL && char_decl->path != NULL) g_free(char_decl->path); @@ -1069,7 +1069,7 @@ fail: return NULL; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY struct btd_attribute *btd_gatt_add_char_desc(const bt_uuid_t *uuid, const char *path, btd_attr_read_t read_cb, @@ -1102,7 +1102,7 @@ struct btd_attribute *btd_gatt_add_char_desc(const bt_uuid_t *uuid, return NULL; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY attr->path = g_strdup(path); /* Store the store handle in linkedlist, diff --git a/src/gatt.h b/src/gatt.h index 0c7dc1a..50a19ad 100644 --- a/src/gatt.h +++ b/src/gatt.h @@ -1,4 +1,4 @@ -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY /* * * BlueZ - Bluetooth protocol stack for Linux @@ -36,7 +36,7 @@ void gatt_cleanup(void); * @len: length of value. * @user_data: user_data passed in btd_attr_read_t callback. */ -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY typedef uint8_t (*btd_attr_read_result_t) (int err, uint8_t *value, size_t len, void *user_data); #else @@ -53,7 +53,7 @@ typedef void (*btd_attr_read_result_t) (int err, uint8_t *value, size_t len, * value of attribute read. * @user_data: user_data passed in btd_attr_read_result_t callback. */ -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY typedef uint8_t (*btd_attr_read_t) (struct btd_attribute *attr, bdaddr_t *bdaddr, btd_attr_read_result_t result, void *user_data); @@ -70,7 +70,7 @@ typedef void (*btd_attr_read_t) (struct btd_attribute *attr, * @err: error in -errno format. * @user_data: user_data passed in btd_attr_write_t callback. */ -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY typedef uint8_t (*btd_attr_write_result_t) (int err, void *user_data); #else typedef void (*btd_attr_write_result_t) (int err, void *user_data); @@ -85,7 +85,7 @@ typedef void (*btd_attr_write_result_t) (int err, void *user_data); * result of the write operation. * @user_data: user_data passed in btd_attr_write_result_t callback. */ -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY typedef uint8_t (*btd_attr_write_t) (struct btd_attribute *attr, const uint8_t *value, size_t len, btd_attr_write_result_t result, @@ -104,13 +104,13 @@ typedef void (*btd_attr_write_t) (struct btd_attribute *attr, * Returns a reference to service declaration attribute. In case of error, * NULL is returned. */ -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY struct btd_attribute *btd_gatt_add_service(const bt_uuid_t *uuid, const char *path); #else struct btd_attribute *btd_gatt_add_service(const bt_uuid_t *uuid); #endif -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY /* * btd_gatt_update_attr_db - updates the attribute data base. */ @@ -166,7 +166,7 @@ void btd_gatt_remove_service(struct btd_attribute *service); * Returns a reference to characteristic value attribute. In case of error, * NULL is returned. */ -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY struct btd_attribute *btd_gatt_add_char(const bt_uuid_t *uuid, uint8_t properties, const char *path, @@ -192,7 +192,7 @@ struct btd_attribute *btd_gatt_add_char(const bt_uuid_t *uuid, * Returns a reference to characteristic descriptor attribute. In case of * error, NULL is returned. */ -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY struct btd_attribute *btd_gatt_add_char_desc(const bt_uuid_t *uuid, const char *path, btd_attr_read_t read_cb, @@ -203,7 +203,7 @@ struct btd_attribute *btd_gatt_add_char_desc(const bt_uuid_t *uuid, btd_attr_write_t write_cb); #endif -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY /* * btd_gatt_update_char - update characteristic value to the local * attribute database. diff --git a/src/hcid.h b/src/hcid.h index 251a200..3a52b65 100644 --- a/src/hcid.h +++ b/src/hcid.h @@ -39,7 +39,7 @@ struct main_opts { gboolean name_resolv; gboolean debug_keys; gboolean fast_conn; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY gboolean le_privacy; #endif diff --git a/src/log.c b/src/log.c index 6cae418..8a5057e 100644 --- a/src/log.c +++ b/src/log.c @@ -302,7 +302,7 @@ void __btd_toggle_debug(void) desc->flags |= BTD_DEBUG_FLAG_PRINT; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY void __hci_attach_log_init(void) { int option = LOG_NDELAY | LOG_PID; diff --git a/src/log.h b/src/log.h index f07821c..1299cdd 100644 --- a/src/log.h +++ b/src/log.h @@ -39,7 +39,7 @@ void btd_info(uint16_t index, const char *format, ...) void btd_debug(uint16_t index, const char *format, ...) __attribute__((format(printf, 2, 3))); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY void __hci_attach_log_init(void ); #endif void __btd_log_init(const char *debug, int detach); diff --git a/src/main.c b/src/main.c index bc6c613..32facab 100644 --- a/src/main.c +++ b/src/main.c @@ -89,7 +89,7 @@ static const char * const supported_options[] = { "DebugKeys", "ControllerMode", "MultiProfile", -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY "EnableLEPrivacy", #endif }; @@ -339,7 +339,7 @@ static void parse_config(GKeyFile *config) g_clear_error(&err); else main_opts.fast_conn = boolean; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY boolean = g_key_file_get_boolean(config, "General", "EnableLEPrivacy", &err); if (err) @@ -362,13 +362,13 @@ static void init_defaults(void) main_opts.reverse_sdp = TRUE; main_opts.name_resolv = TRUE; main_opts.debug_keys = FALSE; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY main_opts.le_privacy = FALSE; #endif if (sscanf(VERSION, "%hhu.%hhu", &major, &minor) != 2) return; -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY main_opts.did_source = 0x0002; /* USB */ main_opts.did_vendor = 0x1d6b; /* Linux Foundation */ main_opts.did_product = 0x0246; /* BlueZ */ diff --git a/src/oob.c b/src/oob.c index 0e9c0d8..708467b 100644 --- a/src/oob.c +++ b/src/oob.c @@ -33,7 +33,7 @@ void oob_register_cb(oob_read_cb_t cb) local_oob_read_cb = cb; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY void oob_read_local_data_complete(struct btd_adapter *adapter, uint8_t *hash, uint8_t *randomizer, void *user_data) #else diff --git a/src/oob.h b/src/oob.h index 7fb3d02..d720315 100644 --- a/src/oob.h +++ b/src/oob.h @@ -27,7 +27,7 @@ typedef void (*oob_read_cb_t) (struct btd_adapter *adapter, uint8_t *hash, uint8_t *randomizer); void oob_register_cb(oob_read_cb_t cb); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY void oob_read_local_data_complete(struct btd_adapter *adapter, uint8_t *hash, uint8_t *randomizer, void *user_data); #else diff --git a/src/profile.c b/src/profile.c index b4f2d34..93917d8 100644 --- a/src/profile.c +++ b/src/profile.c @@ -197,7 +197,7 @@ \ " -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY #define SPP_RECORD \ " \ \ @@ -322,7 +322,7 @@ \ " -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY #define OPP_RECORD \ " \ \ @@ -498,14 +498,14 @@ \ " -#ifdef PBAP_SIM_ENABLE +#ifdef TIZEN_FEATURE_BLUEZ_PBAP_SIM #define PBAP_ACCESS "0x03" /* Phone and SIM access support*/ #else #define PBAP_ACCESS "0x01" /* Phone access support only*/ #endif -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY #define PSE_RECORD \ " \ \ @@ -599,7 +599,7 @@ " #endif -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY #define SUPPORTED_MESSAGE_TYPES "0x03" /* EMAIL and SMS_GSM */ #else #define SUPPORTED_MESSAGE_TYPES "0x0F" /* EMAIL, SMS_GSM, SMS_CDMA and MMS */ @@ -920,7 +920,7 @@ struct ext_profile { GSList *conns; GSList *connects; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY char *destination; char *app_path; #endif @@ -1450,7 +1450,7 @@ static void ext_confirm(GIOChannel *io, gpointer user_data) DBG("incoming connect from %s", addr); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY { struct btd_device *device; gboolean restricted = FALSE; @@ -1661,7 +1661,7 @@ static struct ext_profile *find_ext(struct btd_profile *p) return l->data; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY gboolean ext_profile_is_registered_as_client_role(struct btd_profile *p) { struct ext_profile *ext = find_ext(p); @@ -1877,7 +1877,7 @@ static void record_cb(sdp_list_t *recs, int err, gpointer user_data) sdp_record_t *rec = r->data; sdp_list_t *protos; int port; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY char *profile_uuid; sdp_list_t *svcclass = NULL; @@ -2111,7 +2111,7 @@ static char *get_spp_record(struct ext_profile *ext, struct ext_io *l2cap, struct ext_io *rfcomm) { char *svc, *rec; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY char *lan_seq; uint16_t code_ISO639 = (0x65 << 8) | 0x6e; uint16_t encoding = 106; @@ -2123,7 +2123,7 @@ static char *get_spp_record(struct ext_profile *ext, struct ext_io *l2cap, else svc = g_strdup(""); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY lan_seq = g_strdup_printf(LANG_SEQ, code_ISO639, encoding, base_offset); rec = g_strdup_printf(SPP_RECORD, svc, rfcomm->chan, lan_seq, ext->version, @@ -2153,7 +2153,7 @@ static char *get_pce_record(struct ext_profile *ext, struct ext_io *l2cap, static char *get_pse_record(struct ext_profile *ext, struct ext_io *l2cap, struct ext_io *rfcomm) { -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY uint8_t chan = 0; if (rfcomm) @@ -2219,19 +2219,19 @@ static char *get_hid_device_record(struct ext_profile *ext, struct ext_io *l2cap static char *get_opp_record(struct ext_profile *ext, struct ext_io *l2cap, struct ext_io *rfcomm) { -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY uint16_t psm = 0; #endif uint8_t chan = 0; -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY if (l2cap) psm = l2cap->psm; #endif if (rfcomm) chan = rfcomm->chan; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY return g_strdup_printf(OPP_RECORD, chan, ext->version, ext->name); #else return g_strdup_printf(OPP_RECORD, chan, ext->version, psm, ext->name); @@ -2380,7 +2380,7 @@ static struct default_settings { .sec_level = BT_IO_SEC_LOW, .authorize = false, .get_record = get_opp_record, -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY .version = 0x0100, #else .version = 0x0102, @@ -2545,7 +2545,7 @@ static int parse_ext_opt(struct ext_profile *ext, const char *key, return -EINVAL; dbus_message_iter_get_basic(value, &b); -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY if (b) ext->sec_level = BT_IO_SEC_MEDIUM; else @@ -2651,7 +2651,7 @@ static void set_service(struct ext_profile *ext) } } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static struct ext_profile *create_ext2(const char *owner, const char *path, const char *uuid, const char *destination, const char *app_path, DBusMessageIter *opts) @@ -2913,7 +2913,7 @@ static DBusMessage *unregister_profile(DBusConnection *conn, return dbus_message_new_method_return(msg); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static DBusMessage *register_profile2(DBusConnection *conn, DBusMessage *msg, void *user_data) { @@ -2966,7 +2966,7 @@ static const GDBusMethodTable methods[] = { GDBUS_ARGS({ "profile", "o"}, { "UUID", "s" }, { "options", "a{sv}" }), NULL, register_profile) }, -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY /* For Dbus Smack devides dbus API, the functionality is same */ { GDBUS_METHOD("RegisterProfile1", GDBUS_ARGS({ "profile", "o"}, { "UUID", "s" }, @@ -3072,7 +3072,7 @@ void btd_profile_cleanup(void) g_slist_free_full(ext->conns, ext_io_destroy); ext->conns = NULL; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (ext->destination == NULL) { msg = dbus_message_new_method_call(ext->owner, ext->path, diff --git a/src/profile.h b/src/profile.h index 938d67c..d6e20f3 100644 --- a/src/profile.h +++ b/src/profile.h @@ -73,7 +73,7 @@ bool btd_profile_add_custom_prop(const char *uuid, const char *type, void *user_data); bool btd_profile_remove_custom_prop(const char *uuid, const char *name); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY gboolean ext_profile_is_registered_as_client_role(struct btd_profile *p); #endif diff --git a/src/sdp-xml.c b/src/sdp-xml.c index 8a84caf..ec863b6 100644 --- a/src/sdp-xml.c +++ b/src/sdp-xml.c @@ -531,7 +531,7 @@ static void element_end(GMarkupParseContext *context, struct context_data *ctx_data = user_data; struct sdp_xml_data *elem; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (element_name == NULL) return; #endif diff --git a/src/service.c b/src/service.c index 6d81cd1..29e831a 100644 --- a/src/service.c +++ b/src/service.c @@ -171,7 +171,7 @@ int service_probe(struct btd_service *service) void service_remove(struct btd_service *service) { -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (service->profile == NULL) return; #endif @@ -222,7 +222,7 @@ int btd_service_connect(struct btd_service *service) struct btd_profile *profile = service->profile; char addr[18]; int err; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (profile != NULL && !profile->connect) #else if (!profile->connect) @@ -360,7 +360,7 @@ bool btd_service_remove_state_cb(unsigned int id) void btd_service_connecting_complete(struct btd_service *service, int err) { -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (service->state != BTD_SERVICE_STATE_DISCONNECTED && service->state != BTD_SERVICE_STATE_CONNECTING) return; diff --git a/src/shared/att.c b/src/shared/att.c index ec61ec0..b7c557a 100644 --- a/src/shared/att.c +++ b/src/shared/att.c @@ -67,7 +67,7 @@ struct bt_att { bool in_req; /* There's a pending incoming request */ -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY bdaddr_t bdaddr; uint8_t bdaddr_type; bool service_change_indication; /* Service changed indication status */ @@ -214,7 +214,7 @@ static void destroy_att_send_op(void *data) static void cancel_att_send_op(struct att_send_op *op) { -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (op->callback) op->callback(BT_ATT_OP_ERROR_RSP, NULL, 0, op->user_data); #endif @@ -343,7 +343,7 @@ static struct att_send_op *create_att_send_op(struct bt_att *att, * response from the remote end, then no callback should have been * provided, since it will never be called. */ -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (callback && type != ATT_OP_TYPE_REQ && type != ATT_OP_TYPE_IND && type != ATT_OP_TYPE_CMD) return NULL; @@ -494,7 +494,7 @@ static bool can_write_data(struct io *io, void *user_data) case ATT_OP_TYPE_IND: att->pending_ind = op; break; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY case ATT_OP_TYPE_CMD: if (op->callback) op->callback(0, NULL, 0, op->user_data); @@ -506,7 +506,7 @@ static bool can_write_data(struct io *io, void *user_data) att->in_req = false; /* Fall through to the next case */ -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY case ATT_OP_TYPE_CMD: #endif case ATT_OP_TYPE_NOT: @@ -606,7 +606,7 @@ static bool change_security(struct bt_att *att, uint8_t ecode) if (ecode == BT_ATT_ERROR_INSUFFICIENT_ENCRYPTION && security < BT_ATT_SECURITY_MEDIUM) security = BT_ATT_SECURITY_MEDIUM; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY else if (ecode == BT_ATT_ERROR_AUTHENTICATION && security < BT_ATT_SECURITY_MEDIUM) security = BT_ATT_SECURITY_MEDIUM; @@ -644,7 +644,7 @@ static bool handle_error_rsp(struct bt_att *att, uint8_t *pdu, att->pending_req = NULL; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (op->timeout_id) { timeout_remove(op->timeout_id); op->timeout_id = 0; @@ -1480,7 +1480,7 @@ bool bt_att_has_crypto(struct bt_att *att) return att->crypto ? true : false; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY bool bt_att_set_remote_addr(struct bt_att *att, const bdaddr_t *bdaddr, uint8_t bdaddr_type) { diff --git a/src/shared/att.h b/src/shared/att.h index de45fc4..6c1159e 100644 --- a/src/shared/att.h +++ b/src/shared/att.h @@ -25,7 +25,7 @@ #include #include "src/shared/att-types.h" -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY #include "lib/bluetooth.h" #endif @@ -94,7 +94,7 @@ bool bt_att_set_local_key(struct bt_att *att, uint8_t sign_key[16], bool bt_att_set_remote_key(struct bt_att *att, uint8_t sign_key[16], bt_att_counter_func_t func, void *user_data); bool bt_att_has_crypto(struct bt_att *att); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY bool bt_att_set_remote_addr(struct bt_att *att, const bdaddr_t *bdaddr, uint8_t bdaddr_type); bool bt_att_get_remote_addr(struct bt_att *att, diff --git a/src/shared/btsnoop.c b/src/shared/btsnoop.c index 9dc1251..41a8d9d 100644 --- a/src/shared/btsnoop.c +++ b/src/shared/btsnoop.c @@ -25,7 +25,7 @@ #include #endif -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY #include #endif #include @@ -76,7 +76,7 @@ struct btsnoop { bool aborted; bool pklg_format; bool pklg_v2; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY char *path; int16_t rotate_count; ssize_t file_size; @@ -139,7 +139,7 @@ failed: return NULL; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY struct btsnoop *btsnoop_create(const char *path, uint32_t format, int16_t rotate_count, ssize_t file_size) #else @@ -175,7 +175,7 @@ struct btsnoop *btsnoop_create(const char *path, uint32_t format) return NULL; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (rotate_count > 0 && file_size > 0) { btsnoop->path = strdup(path); btsnoop->rotate_count = rotate_count; @@ -186,7 +186,7 @@ struct btsnoop *btsnoop_create(const char *path, uint32_t format) return btsnoop_ref(btsnoop); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static int btsnoop_create_2(struct btsnoop *btsnoop) { struct btsnoop_hdr hdr; @@ -286,7 +286,7 @@ void btsnoop_unref(struct btsnoop *btsnoop) if (__sync_sub_and_fetch(&btsnoop->ref_count, 1)) return; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (btsnoop->path) free(btsnoop->path); #endif @@ -323,7 +323,7 @@ bool btsnoop_write(struct btsnoop *btsnoop, struct timeval *tv, pkt.drops = htobe32(0); pkt.ts = htobe64(ts + 0x00E03AB44A676000ll); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if ((btsnoop->rotate_count > 0 && btsnoop->file_size > 0) && lseek(btsnoop->fd, 0x00, SEEK_CUR) + BTSNOOP_PKT_SIZE + size > btsnoop->file_size) { diff --git a/src/shared/btsnoop.h b/src/shared/btsnoop.h index 57e4f50..f52a297 100644 --- a/src/shared/btsnoop.h +++ b/src/shared/btsnoop.h @@ -92,7 +92,7 @@ struct btsnoop_opcode_user_logging { struct btsnoop; struct btsnoop *btsnoop_open(const char *path, unsigned long flags); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY struct btsnoop *btsnoop_create(const char *path, uint32_t format, int16_t rotate_count, ssize_t file_size); #else diff --git a/src/shared/crypto.c b/src/shared/crypto.c index 0e103ec..d4d58fe 100644 --- a/src/shared/crypto.c +++ b/src/shared/crypto.c @@ -213,7 +213,7 @@ static int alg_new(int fd, const void *keyval, socklen_t keylen) return -1; /* FIXME: This should use accept4() with SOCK_CLOEXEC */ -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY return accept(fd, NULL, NULL); #else return accept(fd, NULL, 0); diff --git a/src/shared/gatt-client.c b/src/shared/gatt-client.c index 208f26c..3c6d7a8 100644 --- a/src/shared/gatt-client.c +++ b/src/shared/gatt-client.c @@ -33,7 +33,7 @@ #include "src/shared/queue.h" #include "src/shared/gatt-db.h" #include "src/shared/gatt-client.h" -#if defined __TIZEN_PATCH__ && defined BLUEZ5_27_GATT_CLIENT +#if defined TIZEN_FEATURE_BLUEZ_MODIFY #include "../log.h" #endif @@ -113,7 +113,7 @@ struct bt_gatt_client { struct bt_gatt_request *discovery_req; unsigned int mtu_req_id; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY char *device_name; struct queue *pending_noti; bool svc_changed_failed; @@ -132,7 +132,7 @@ struct request { void (*destroy)(void *); }; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY struct noti { uint8_t opcode; void *pdu; @@ -365,7 +365,7 @@ static void discovery_op_complete(struct discovery_op *op, bool success, { /* Reset remaining range */ if (success) { -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY util_debug(op->client->debug_callback, op->client->debug_data, "op->start : %u, op->end : %u, op->last : %u", op->start, op->end, op->last); @@ -384,7 +384,7 @@ static void discovery_op_complete(struct discovery_op *op, bool success, UINT16_MAX); #endif } else { -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY util_debug(op->client->debug_callback, op->client->debug_data, "Fail to discover service. Clear DB [%d]", err); #endif @@ -411,7 +411,7 @@ static struct discovery_op *discovery_op_create(struct bt_gatt_client *client, op->failure_func = failure_func; op->start = start; op->end = end; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY op->last = start; #endif @@ -750,7 +750,7 @@ done: discovery_op_complete(op, success, att_ecode); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static void read_name_cb(bool success, uint8_t att_ecode, const uint8_t *value, uint16_t length, void *user_data) { @@ -857,7 +857,7 @@ static void discover_chrcs_cb(bool success, uint8_t att_ecode, chrc_data->properties = properties; chrc_data->uuid = uuid; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (!strcmp(uuid_str, "00002a00-0000-1000-8000-00805f9b34fb")) { if (!bt_gatt_client_read_value(client, chrc_data->value_handle, read_name_cb, client, NULL)) { @@ -963,7 +963,7 @@ static void discover_secondary_cb(bool success, uint8_t att_ecode, start, end, uuid_str); /* Store the service */ -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (client->in_svc_chngd) { util_debug(client->debug_callback, client->debug_data, "In service changed, delete service first."); @@ -1052,7 +1052,7 @@ static void discover_primary_cb(bool success, uint8_t att_ecode, "Primary service discovery failed." " ATT ECODE: 0x%02x", att_ecode); /* Reset error in case of not found */ -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (att_ecode == BT_ATT_ERROR_ATTRIBUTE_NOT_FOUND) { #else if (BT_ATT_ERROR_ATTRIBUTE_NOT_FOUND) { @@ -1081,7 +1081,7 @@ static void discover_primary_cb(bool success, uint8_t att_ecode, "start: 0x%04x, end: 0x%04x, uuid: %s", start, end, uuid_str); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (client->in_svc_chngd) { util_debug(client->debug_callback, client->debug_data, "In service changed, delete service first."); @@ -1185,7 +1185,7 @@ static void exchange_mtu_cb(bool success, uint8_t att_ecode, void *user_data) bt_att_get_mtu(client->att)); discover: -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY op->success = false; #endif client->discovery_req = bt_gatt_discover_all_primary_services( @@ -1211,7 +1211,7 @@ struct service_changed_op { uint16_t end_handle; }; -#if defined __TIZEN_PATCH__ && defined BLUEZ5_27_GATT_CLIENT +#if defined TIZEN_FEATURE_BLUEZ_MODIFY bool bt_gatt_discover_services(struct bt_gatt_client *client) { struct discovery_op *op; @@ -1455,7 +1455,7 @@ static void service_changed_register_cb(uint16_t att_ecode, void *user_data) done: notify_client_ready(client, success, att_ecode); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (success) { struct noti *noti; @@ -1517,7 +1517,7 @@ static void service_changed_complete(struct discovery_op *op, bool success, "Failed to discover services within changed range - " "error: 0x%02x", att_ecode); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY client->svc_changed_failed = true; #endif gatt_db_clear_range(client->db, start_handle, end_handle); @@ -1548,7 +1548,7 @@ static void service_changed_failure(struct discovery_op *op) { struct bt_gatt_client *client = op->client; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY util_debug(client->debug_callback, client->debug_data, "Failed to discover services"); #endif @@ -1594,7 +1594,7 @@ static void service_changed_cb(uint16_t value_handle, const uint8_t *value, uint16_t start, end; if (length != 4) { -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY util_debug(client->debug_callback, client->debug_data, "Service changed is received with invalid length : %d", length); @@ -1654,7 +1654,7 @@ fail: done: notify_client_ready(client, success, att_ecode); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (success) { struct noti *noti; @@ -1676,7 +1676,7 @@ static void init_fail(struct discovery_op *op) { struct bt_gatt_client *client = op->client; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY util_debug(client->debug_callback, client->debug_data, "GATT client init is failed"); #endif @@ -1749,7 +1749,7 @@ static void complete_unregister_notify(void *data) if (notify_data->att_id) { bt_att_cancel(notify_data->client->att, notify_data->att_id); notify_data->att_id = 0; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY notify_data->chrc->ccc_write_id = 0; __sync_sub_and_fetch(¬ify_data->chrc->notify_count, 1); #endif @@ -1796,7 +1796,7 @@ static void notify_cb(uint8_t opcode, const void *pdu, uint16_t length, struct bt_gatt_client *client = user_data; struct pdu_data pdu_data; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (client->ready == false) { struct noti *noti; @@ -1859,7 +1859,7 @@ static void bt_gatt_client_free(struct bt_gatt_client *client) bt_att_unref(client->att); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (client->in_svc_chngd || client->svc_changed_failed) { util_debug(client->debug_callback, client->debug_data, "Service changed is going. Clear DB"); @@ -1876,7 +1876,7 @@ static void bt_gatt_client_free(struct bt_gatt_client *client) queue_destroy(client->notify_chrcs, notify_chrc_free); queue_destroy(client->pending_requests, request_unref); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (client->device_name) { free(client->device_name); client->device_name = NULL; @@ -1923,7 +1923,7 @@ struct bt_gatt_client *bt_gatt_client_new(struct gatt_db *db, client->notify_list = queue_new(); client->notify_chrcs = queue_new(); client->pending_requests = queue_new(); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY client->pending_noti = queue_new(); #endif @@ -2493,7 +2493,7 @@ unsigned int bt_gatt_client_read_long_value(struct bt_gatt_client *client, return req->id; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY struct write_cmd_op { struct bt_gatt_client *client; bt_gatt_client_callback_t callback; @@ -3271,7 +3271,7 @@ unsigned int bt_gatt_client_register_notify(struct bt_gatt_client *client, if (!client || !client->db || !chrc_value_handle || !callback) return 0; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (client->in_svc_chngd) util_debug(client->debug_callback, client->debug_data, "register_notify in service changed handling"); @@ -3320,7 +3320,7 @@ int bt_gatt_client_get_security(struct bt_gatt_client *client) return bt_att_get_security(client->att); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY char *bt_gatt_client_get_gap_device_name(struct bt_gatt_client *client) { if (!client) diff --git a/src/shared/gatt-client.h b/src/shared/gatt-client.h index 8e310ca..8aeb145 100644 --- a/src/shared/gatt-client.h +++ b/src/shared/gatt-client.h @@ -91,7 +91,7 @@ unsigned int bt_gatt_client_read_multiple(struct bt_gatt_client *client, void *user_data, bt_gatt_client_destroy_func_t destroy); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY unsigned int bt_gatt_client_write_without_response_async( struct bt_gatt_client *client, uint16_t value_handle, @@ -145,11 +145,11 @@ bool bt_gatt_client_unregister_notify(struct bt_gatt_client *client, bool bt_gatt_client_set_security(struct bt_gatt_client *client, int level); int bt_gatt_client_get_security(struct bt_gatt_client *client); -#if defined __TIZEN_PATCH__ && defined BLUEZ5_27_GATT_CLIENT +#if defined TIZEN_FEATURE_BLUEZ_MODIFY bool bt_gatt_discover_services(struct bt_gatt_client *client); #endif -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY char *bt_gatt_client_get_gap_device_name(struct bt_gatt_client *client); bool bt_gatt_request_att_mtu(struct bt_gatt_client *client, uint16_t mtu, void *callback, void *user_data); diff --git a/src/shared/gatt-db.c b/src/shared/gatt-db.c index a3f1a48..0126281 100644 --- a/src/shared/gatt-db.c +++ b/src/shared/gatt-db.c @@ -93,7 +93,7 @@ struct gatt_db_attribute { uint32_t permissions; uint16_t value_len; uint8_t *value; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY bool notify_indicate; bdaddr_t unicast_addr; #endif @@ -721,7 +721,7 @@ service_insert_characteristic(struct gatt_db_service *service, service->attributes[i] = new_attribute(service, handle, uuid, NULL, 0); if (!service->attributes[i]) { free(service->attributes[i - 1]); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY service->attributes[i - 1] = NULL; #endif return NULL; @@ -1729,7 +1729,7 @@ bool gatt_db_attribute_reset(struct gatt_db_attribute *attrib) return true; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY void set_ccc_notify_indicate(struct gatt_db_attribute *ccc, bool enable) { diff --git a/src/shared/gatt-db.h b/src/shared/gatt-db.h index 8e9e554..f9044f1 100644 --- a/src/shared/gatt-db.h +++ b/src/shared/gatt-db.h @@ -235,7 +235,7 @@ bool gatt_db_attribute_write_result(struct gatt_db_attribute *attrib, bool gatt_db_attribute_reset(struct gatt_db_attribute *attrib); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY void set_ccc_notify_indicate(struct gatt_db_attribute *ccc, bool enable); diff --git a/src/shared/gatt-server.c b/src/shared/gatt-server.c index 64c400b..e978645 100644 --- a/src/shared/gatt-server.c +++ b/src/shared/gatt-server.c @@ -180,7 +180,7 @@ static bool encode_read_by_grp_type_rsp(struct gatt_db *db, struct queue *q, int iter = 0; uint16_t start_handle, end_handle; struct iovec value; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY uint8_t data_val_len = 0; #else uint8_t data_val_len; @@ -523,7 +523,7 @@ static bool encode_find_info_rsp(struct gatt_db *db, struct queue *q, uint16_t handle; struct gatt_db_attribute *attr; const bt_uuid_t *type; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY int uuid_len = 0, cur_uuid_len; #else int uuid_len, cur_uuid_len; @@ -792,12 +792,12 @@ static void write_cb(uint8_t opcode, const void *pdu, goto error; if (server->pending_write_op) { -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (opcode != BT_ATT_OP_WRITE_CMD) { #endif ecode = BT_ATT_ERROR_UNLIKELY; goto error; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY } #endif } @@ -806,7 +806,7 @@ static void write_cb(uint8_t opcode, const void *pdu, op->server = server; op->opcode = opcode; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY if (opcode != BT_ATT_OP_WRITE_CMD) server->pending_write_op = op; #else @@ -824,7 +824,7 @@ static void write_cb(uint8_t opcode, const void *pdu, ecode = BT_ATT_ERROR_UNLIKELY; error: -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY util_debug(server->debug_callback, server->debug_data, "Handling \"Write %s\" is failed : %d", (opcode == BT_ATT_OP_WRITE_REQ) ? "Req" : "Cmd", @@ -934,7 +934,7 @@ static void handle_read_req(struct bt_gatt_server *server, uint8_t opcode, ecode = BT_ATT_ERROR_UNLIKELY; error: -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY util_debug(server->debug_callback, server->debug_data, "Handling \"Read %sReq\" is failed : %d", (opcode == BT_ATT_OP_READ_BLOB_REQ) ? "Blob" : "", diff --git a/src/storage.c b/src/storage.c index aba4523..c478e03 100644 --- a/src/storage.c +++ b/src/storage.c @@ -144,7 +144,7 @@ int read_local_name(const bdaddr_t *bdaddr, char *name) return 0; } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY int write_device_characteristics(const bdaddr_t *sba, const bdaddr_t *dba, uint8_t bdaddr_type, uint16_t handle, const char *chars) diff --git a/src/storage.h b/src/storage.h index 2fffe55..979075b 100644 --- a/src/storage.h +++ b/src/storage.h @@ -25,7 +25,7 @@ int read_discoverable_timeout(const char *src, int *timeout); int read_pairable_timeout(const char *src, int *timeout); int read_on_mode(const char *src, char *mode, int length); int read_local_name(const bdaddr_t *bdaddr, char *name); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY int write_device_characteristics(const bdaddr_t *sba, const bdaddr_t *dba, uint8_t bdaddr_type, uint16_t handle, const char *chars); diff --git a/tools/bneptest.c b/tools/bneptest.c index 15d28fa..c761e16 100644 --- a/tools/bneptest.c +++ b/tools/bneptest.c @@ -327,7 +327,7 @@ static gboolean setup_bnep_cb(GIOChannel *chan, GIOCondition cond, sk = g_io_channel_unix_get_fd(chan); /* Reading BNEP_SETUP_CONNECTION_REQUEST_MSG */ -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY n = recv(sk, packet, sizeof(packet), MSG_PEEK); #else n = read(sk, packet, sizeof(packet)); diff --git a/tools/btgatt-client.c b/tools/btgatt-client.c index 6698eba..a0fab21 100644 --- a/tools/btgatt-client.c +++ b/tools/btgatt-client.c @@ -363,7 +363,7 @@ static void ready_cb(bool success, uint8_t att_ecode, void *user_data) struct client *cli = user_data; if (!success) { -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY PRLOG("GATT discovery procedures failed - error code: 0x%02x\n", att_ecode); #else @@ -483,7 +483,7 @@ static void read_multiple_cb(bool success, uint8_t att_ecode, int i; if (!success) { -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY PRLOG("\nRead multiple request failed: 0x%02x\n", att_ecode); #else PRLOG("\nRead multiple request failed: %s (0x%02x)\n", @@ -1132,7 +1132,7 @@ static void notify_cb(uint16_t value_handle, const uint8_t *value, static void register_notify_cb(uint16_t att_ecode, void *user_data) { if (att_ecode) { -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY PRLOG("Failed to register notify handler " "- error code: 0x%02x\n", att_ecode); #else diff --git a/tools/btsnoop.c b/tools/btsnoop.c index 814e5e1..06bc9d5 100644 --- a/tools/btsnoop.c +++ b/tools/btsnoop.c @@ -34,7 +34,7 @@ #include #include #include -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY #include #include #endif @@ -275,7 +275,7 @@ close_input: for (i = 0; i < num_input; i++) close(input_fd[i]); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY #define BT_SNOOP_TYPE_HCI_PREFIX "btsnoop_type_hci" static void command_split(const char *input) @@ -625,7 +625,7 @@ static void usage(void) printf("commands:\n" "\t-m, --merge Merge multiple btsnoop files\n" "\t-e, --extract Extract data from btsnoop file\n" -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY "\t-s, --split Split btmon file into legacy btsnoop file(s)\n" #endif "\t-h, --help Show help options\n"); @@ -635,7 +635,7 @@ static const struct option main_options[] = { { "merge", required_argument, NULL, 'm' }, { "extract", required_argument, NULL, 'e' }, { "type", required_argument, NULL, 't' }, -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY { "split", required_argument, NULL, 's' }, #endif { "version", no_argument, NULL, 'v' }, @@ -643,7 +643,7 @@ static const struct option main_options[] = { { } }; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY enum { INVALID, MERGE, EXTRACT, SPLIT }; #else enum { INVALID, MERGE, EXTRACT }; @@ -658,7 +658,7 @@ int main(int argc, char *argv[]) for (;;) { int opt; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY opt = getopt_long(argc, argv, "m:e:s:t:vh", main_options, NULL); #else opt = getopt_long(argc, argv, "m:e:t:vh", main_options, NULL); @@ -675,7 +675,7 @@ int main(int argc, char *argv[]) command = EXTRACT; input_path = optarg; break; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY case 's': command = SPLIT; input_path = optarg; @@ -725,7 +725,7 @@ int main(int argc, char *argv[]) fprintf(stderr, "extract type not supported\n"); break; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY case SPLIT: if (argc - optind > 0) { fprintf(stderr, "extra arguments not allowed\n"); diff --git a/tools/hciattach.c b/tools/hciattach.c index 4b1fbf4..2ef6fb5 100644 --- a/tools/hciattach.c +++ b/tools/hciattach.c @@ -27,7 +27,7 @@ #include #endif -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY #define _GNU_SOURCE #endif #include @@ -64,18 +64,18 @@ struct uart_t { int (*init) (int fd, struct uart_t *u, struct termios *ti); int (*post) (int fd, struct uart_t *u, struct termios *ti); -/* __TIZEN_PATCH__ */ -#if defined __TIZEN_PATCH__ && defined __TI_PATCH__ +/* TIZEN_FEATURE_BLUEZ_MODIFY */ +#if defined TIZEN_FEATURE_BLUEZ_MODIFY && defined __TI_PATCH__ uint16_t device_param; #endif }; -#if defined __TIZEN_PATCH__ && defined __TI_PATCH__ +#if defined TIZEN_FEATURE_BLUEZ_MODIFY && defined __TI_PATCH__ int firmware_path = 0; #endif -#ifdef __TIZEN_PATCH__ -#if defined(__TI_PATCH__) || defined(__BROADCOM_PATCH__) +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY +#if defined(__TI_PATCH__) || defined(TIZEN_FEATURE_BLUEZ_BRCM_CHIP) #define TIOSETBRFPOWER 0x6000 #define BRF_DEEP_SLEEP_OPCODE_BYTE_1 0x0c #define BRF_DEEP_SLEEP_OPCODE_BYTE_2 0xfd @@ -1022,8 +1022,8 @@ static int bcm2035(int fd, struct uart_t *u, struct termios *ti) memset(cmd, 0, sizeof(cmd)); memset(resp, 0, sizeof(resp)); -/* __TIZEN_PATCH__ */ -#if defined(__TIZEN_PATCH__) && !defined(__BROADCOM_PATCH__) +/* TIZEN_FEATURE_BLUEZ_MODIFY */ +#if defined(TIZEN_FEATURE_BLUEZ_MODIFY) && !defined(TIZEN_FEATURE_BLUEZ_BRCM_CHIP) cmd[0] = HCI_COMMAND_PKT; cmd[1] = 0x18; cmd[2] = 0xfc; @@ -1101,7 +1101,7 @@ static int bcm2035(int fd, struct uart_t *u, struct termios *ti) return 0; } -#ifdef __TIZEN_PATCH__ /*SPRD add Start*/ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY /*SPRD add Start*/ static int init_sprd_config(int fd, struct uart_t *u, struct termios *ti) { @@ -1112,7 +1112,7 @@ static int init_sprd_config(int fd, struct uart_t *u, struct termios *ti) struct uart_t uart[] = { { "any", 0x0000, 0x0000, HCI_UART_H4, 115200, 115200, FLOW_CTL, DISABLE_PM, NULL, NULL }, -#ifdef __TIZEN_PATCH__ /*SPRD*/ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY /*SPRD*/ { "sprd", 0x0000, 0x0000, HCI_UART_H4, 3000000, 3000000, FLOW_CTL, DISABLE_PM, NULL, init_sprd_config }, #endif @@ -1141,8 +1141,8 @@ struct uart_t uart[] = { { "swave", 0x0000, 0x0000, HCI_UART_H4, 115200, 115200, FLOW_CTL, DISABLE_PM, NULL, swave }, -/* __TIZEN_PATCH__ */ -#if defined __TIZEN_PATCH__ && defined __TI_PATCH__ +/* TIZEN_FEATURE_BLUEZ_MODIFY */ +#if defined TIZEN_FEATURE_BLUEZ_MODIFY && defined __TI_PATCH__ /* Texas Instruments BRF63xx modules */ { "texas", 0x0000, 0x0000, HCI_UART_LL, 115200,3000000, FLOW_CTL, NULL, texas, NULL/*texas_continue_script*/, BRF_DEEP_SLEEP_OPCODE}, #else @@ -1260,7 +1260,7 @@ static struct uart_t * get_by_type(char *type) return NULL; } -#if defined __TIZEN_PATCH__ && defined __BROADCOM_PATCH__ +#if defined TIZEN_FEATURE_BLUEZ_MODIFY && defined TIZEN_FEATURE_BLUEZ_BRCM_CHIP static int enable_hci(char *dev, struct uart_t *u) { int fd, i; @@ -1299,7 +1299,7 @@ static int enable_hci(char *dev, struct uart_t *u) return fd; } -#else /* __BROADCOM_PATCH__ */ +#else /* TIZEN_FEATURE_BLUEZ_BRCM_CHIP */ /* Initialize UART driver */ static int init_uart(char *dev, struct uart_t *u, int send_break, int raw) @@ -1308,9 +1308,9 @@ static int init_uart(char *dev, struct uart_t *u, int send_break, int raw) int fd, i; unsigned long flags = 0; -/* __TIZEN_PATCH__ */ -#ifdef __TIZEN_PATCH__ -#if defined(__TI_PATCH__) || defined(__BROADCOM_PATCH__) +/* TIZEN_FEATURE_BLUEZ_MODIFY */ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY +#if defined(__TI_PATCH__) || defined(TIZEN_FEATURE_BLUEZ_BRCM_CHIP) int power; #endif #endif @@ -1336,8 +1336,8 @@ static int init_uart(char *dev, struct uart_t *u, int send_break, int raw) cfmakeraw(&ti); -/* __TIZEN_PATCH__ */ -#if defined(__TIZEN_PATCH__) && !defined(__BROADCOM_PATCH__) +/* TIZEN_FEATURE_BLUEZ_MODIFY */ +#if defined(TIZEN_FEATURE_BLUEZ_MODIFY) && !defined(TIZEN_FEATURE_BLUEZ_BRCM_CHIP) ti.c_cflag |= CLOCAL; if (u->flags & FLOW_CTL) ti.c_cflag |= CRTSCTS; @@ -1363,9 +1363,9 @@ static int init_uart(char *dev, struct uart_t *u, int send_break, int raw) usleep(500000); } -/* __TIZEN_PATCH__ */ -#ifdef __TIZEN_PATCH__ -#if defined(__TI_PATCH__) || defined(__BROADCOM_PATCH__) +/* TIZEN_FEATURE_BLUEZ_MODIFY */ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY +#if defined(__TI_PATCH__) || defined(TIZEN_FEATURE_BLUEZ_BRCM_CHIP) /* Power up the BRF chip */ power = 1; ioctl(fd, TIOSETBRFPOWER, &power); @@ -1403,7 +1403,7 @@ static int init_uart(char *dev, struct uart_t *u, int send_break, int raw) goto fail; } -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY if (u->post && u->post(fd, u, &ti) < 0) goto fail; #endif @@ -1415,15 +1415,15 @@ fail: return -1; } -#endif /* __BROADCOM_PATCH__ */ +#endif /* TIZEN_FEATURE_BLUEZ_BRCM_CHIP */ static void usage(void) { printf("hciattach - HCI UART driver initialization utility\n"); printf("Usage:\n"); -/* __TIZEN_PATCH__ */ -#if defined(__TIZEN_PATCH__) && !defined(__TI_PATCH__) +/* TIZEN_FEATURE_BLUEZ_MODIFY */ +#if defined(TIZEN_FEATURE_BLUEZ_MODIFY) && !defined(__TI_PATCH__) /* This commented code was present before bluez 5.25 upgrade * printf("\thciattach [-n] [-p] [-b] [-g device_param] [-r] [-f] [-t timeout] [-s initial_speed] [speed] [flow|noflow] [bdaddr]\n");*/ printf("\thciattach [-n] [-p] [-b] [-g device_param] [-r] [-f]" @@ -1441,14 +1441,14 @@ static void usage(void) int main(int argc, char *argv[]) { struct uart_t *u = NULL; -#if defined(__TIZEN_PATCH__) && !defined(__BROADCOM_PATCH__) +#if defined(TIZEN_FEATURE_BLUEZ_MODIFY) && !defined(TIZEN_FEATURE_BLUEZ_BRCM_CHIP) int detach, printpid, raw, opt, i, n, ld, err; #else int detach, printpid, opt, i, n, ld, err; #endif int to = 10; int init_speed = 0; -#if defined(__TIZEN_PATCH__) && !defined(__BROADCOM_PATCH__) +#if defined(TIZEN_FEATURE_BLUEZ_MODIFY) && !defined(TIZEN_FEATURE_BLUEZ_BRCM_CHIP) int send_break = 0; #endif pid_t pid; @@ -1457,9 +1457,9 @@ int main(int argc, char *argv[]) sigset_t sigs; char dev[PATH_MAX]; -#ifdef __TIZEN_PATCH__ -/* __TIZEN_PATCH__ */ -#if defined(__TI_PATCH__) || defined(__BROADCOM_PATCH__) +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY +/* TIZEN_FEATURE_BLUEZ_MODIFY */ +#if defined(__TI_PATCH__) || defined(TIZEN_FEATURE_BLUEZ_BRCM_CHIP) int power; #endif #endif @@ -1470,17 +1470,17 @@ int main(int argc, char *argv[]) #endif detach = 1; printpid = 0; -#if defined(__TIZEN_PATCH__) && !defined(__BROADCOM_PATCH__) +#if defined(TIZEN_FEATURE_BLUEZ_MODIFY) && !defined(TIZEN_FEATURE_BLUEZ_BRCM_CHIP) raw = 0; #endif -#if defined(__TIZEN_PATCH__) && !defined(__TI_PATCH__) +#if defined(TIZEN_FEATURE_BLUEZ_MODIFY) && !defined(__TI_PATCH__) while ((opt=getopt(argc, argv, "bnprft:g:s:l")) != EOF) { #else while ((opt=getopt(argc, argv, "bnpt:s:lr")) != EOF) { #endif switch(opt) { case 'b': -#if defined(__TIZEN_PATCH__) && !defined(__BROADCOM_PATCH__) +#if defined(TIZEN_FEATURE_BLUEZ_MODIFY) && !defined(TIZEN_FEATURE_BLUEZ_BRCM_CHIP) send_break = 1; #endif break; @@ -1497,8 +1497,8 @@ int main(int argc, char *argv[]) to = atoi(optarg); break; -/* __TIZEN_PATCH__ */ -#if defined(__TIZEN_PATCH__) && defined(__TI_PATCH__) +/* TIZEN_FEATURE_BLUEZ_MODIFY */ +#if defined(TIZEN_FEATURE_BLUEZ_MODIFY) && defined(__TI_PATCH__) case 'g': device_param = (uint16_t)strtol(optarg, NULL, 16); break; @@ -1523,7 +1523,7 @@ int main(int argc, char *argv[]) exit(0); case 'r': -#if defined(__TIZEN_PATCH__) && !defined(__BROADCOM_PATCH__) +#if defined(TIZEN_FEATURE_BLUEZ_MODIFY) && !defined(TIZEN_FEATURE_BLUEZ_BRCM_CHIP) raw = 1; #endif break; @@ -1535,8 +1535,8 @@ int main(int argc, char *argv[]) } n = argc - optind; -/* __TIZEN_PATCH__ */ -#if defined(__TIZEN_PATCH__) && defined(__TI_PATCH__) +/* TIZEN_FEATURE_BLUEZ_MODIFY */ +#if defined(TIZEN_FEATURE_BLUEZ_MODIFY) && defined(__TI_PATCH__) if (!reset_device || (reset_device && n < 1)) #endif if (n < 2) { @@ -1602,8 +1602,8 @@ int main(int argc, char *argv[]) break; } } -/* __TIZEN_PATCH__ */ -#if defined(__TIZEN_PATCH__) && defined(__TI_PATCH__) +/* TIZEN_FEATURE_BLUEZ_MODIFY */ +#if defined(TIZEN_FEATURE_BLUEZ_MODIFY) && defined(__TI_PATCH__) if (reset_device) { // Reset row device @@ -1624,7 +1624,7 @@ int main(int argc, char *argv[]) exit(1); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY // __hci_attach_log_init(); #endif @@ -1632,7 +1632,7 @@ int main(int argc, char *argv[]) the hardware's default */ if (init_speed) u->init_speed = init_speed; -#if defined(__TIZEN_PATCH__) && defined(__TI_PATCH__) +#if defined(TIZEN_FEATURE_BLUEZ_MODIFY) && defined(__TI_PATCH__) /* If user specified a device parameter, use that instead of the hardware's default */ if (device_param) @@ -1647,7 +1647,7 @@ int main(int argc, char *argv[]) /* 10 seconds should be enough for initialization */ alarm(to); bcsp_max_retries = to; -#if defined __TIZEN_PATCH__ && defined __BROADCOM_PATCH__ +#if defined TIZEN_FEATURE_BLUEZ_MODIFY && defined TIZEN_FEATURE_BLUEZ_BRCM_CHIP n = enable_hci(dev, u); #else n = init_uart(dev, u, send_break, raw); @@ -1712,9 +1712,9 @@ int main(int argc, char *argv[]) exit(1); } -/* __TIZEN_PATCH__ */ -#ifdef __TIZEN_PATCH__ -#if defined(__TI_PATCH__) || defined(__BROADCOM_PATCH__) +/* TIZEN_FEATURE_BLUEZ_MODIFY */ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY +#if defined(__TI_PATCH__) || defined(TIZEN_FEATURE_BLUEZ_BRCM_CHIP) /* Power down the BRF or BCMchip */ power = 0; ioctl(n, TIOSETBRFPOWER, &power); diff --git a/tools/hciattach.h b/tools/hciattach.h index ca46594..7164e0d 100644 --- a/tools/hciattach.h +++ b/tools/hciattach.h @@ -61,7 +61,7 @@ int stlc2500_init(int fd, bdaddr_t *bdaddr); int bgb2xx_init(int dd, bdaddr_t *bdaddr); int ath3k_init(int fd, int speed, int init_speed, char *bdaddr, struct termios *ti); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY int sprd_config_init(int fd, char *bdaddr, struct termios *ti); #endif int ath3k_post(int fd, int pm); diff --git a/tools/hciattach_bcm43xx.c b/tools/hciattach_bcm43xx.c index b876d87..af03538 100644 --- a/tools/hciattach_bcm43xx.c +++ b/tools/hciattach_bcm43xx.c @@ -43,7 +43,7 @@ #include "hciattach.h" #ifndef FIRMWARE_DIR -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY #define FIRMWARE_DIR "/usr/etc/bluetooth" #else #define FIRMWARE_DIR "/etc/firmware" diff --git a/tools/hciattach_ti.c b/tools/hciattach_ti.c index 14053d0..b962677 100644 --- a/tools/hciattach_ti.c +++ b/tools/hciattach_ti.c @@ -55,7 +55,7 @@ #define TI_MANUFACTURER_ID 13 -/* __TIZEN_PATCH__ */ +/* TIZEN_FEATURE_BLUEZ_MODIFY */ #ifdef __TI_PATCH__ #define FIRMWARE_DIRECTORY1 "/mnt/mmc/" #define FIRMWARE_DIRECTORY2 "/usr/etc/bluetooth/" @@ -203,7 +203,7 @@ static const char *get_firmware_name(const uint8_t *respond) if (version & 0x8000) maj_ver |= 0x0008; -/* __TIZEN_PATCH__ */ +/* TIZEN_FEATURE_BLUEZ_MODIFY */ #ifdef __TI_PATCH__ FILE *fp; sprintf(firmware_file_name, FIRMWARE_DIRECTORY1 "TIInit_%d.%d.%d.bts", chip, maj_ver, min_ver); diff --git a/tools/hciconfig.c b/tools/hciconfig.c index 3f8a715..babe69e 100644 --- a/tools/hciconfig.c +++ b/tools/hciconfig.c @@ -93,7 +93,7 @@ static void print_pkt_type(struct hci_dev_info *di) static void print_link_policy(struct hci_dev_info *di) { -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY char *str; str = hci_lptostr(di->link_policy); printf("\tLink policy: %s\n", str); diff --git a/tools/hcitool.c b/tools/hcitool.c index 4a141af..0b6f499 100644 --- a/tools/hcitool.c +++ b/tools/hcitool.c @@ -1098,7 +1098,7 @@ static void cmd_epinq(int dev_id, int argc, char **argv) hci_close_dev(dd); } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY /* Send arbitrary ACL data */ static struct option data_options[] = { { "help", 0, 0, 'h' }, @@ -3448,7 +3448,7 @@ static struct { { "spinq", cmd_spinq, "Start periodic inquiry" }, { "epinq", cmd_epinq, "Exit periodic inquiry" }, { "cmd", cmd_cmd, "Submit arbitrary HCI commands" }, -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY { "acl", cmd_data, "Submit arbitrary ACL data" }, #endif { "con", cmd_con, "Display active connections" }, diff --git a/tools/l2test.c b/tools/l2test.c index 50c4dc1..2048820 100644 --- a/tools/l2test.c +++ b/tools/l2test.c @@ -69,13 +69,13 @@ enum { LSENDRECV, CSENDRECV, INFOREQ, -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY CONFIGREQ, #endif PAIRING, }; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY #define L2CAP_DEFAULT_RETRANS_TO 2000 /* 2 seconds */ #define L2CAP_DEFAULT_MONITOR_TO 12000 /* 12 seconds */ #endif @@ -103,7 +103,7 @@ static long buffer_size = 2048; static bdaddr_t bdaddr; static unsigned short psm = 0; static unsigned short cid = 0; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static uint16_t dcid = 0x0000; #endif @@ -1114,7 +1114,7 @@ static void multi_connect_mode(int argc, char *argv[]) } } -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY static void l2cap_add_conf_opt(void **ptr, uint8_t type, uint8_t len, unsigned long val) { l2cap_conf_opt *opt = *ptr; @@ -1201,12 +1201,12 @@ static void config_request(char *svr) unsigned char buf[48]; l2cap_cmd_hdr *cmd = (l2cap_cmd_hdr *) buf; uint8_t *req_buf = (uint8_t *) (buf + L2CAP_CMD_HDR_SIZE); -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY uint16_t mtu; uint32_t channels, mask = 0x0000; #endif struct sockaddr_l2 addr; -#ifndef __TIZEN_PATCH__ +#ifndef TIZEN_FEATURE_BLUEZ_MODIFY int sk, err; #else int sk; @@ -1465,7 +1465,7 @@ static void usage(void) "\t-c connect, disconnect, connect, ...\n" "\t-m multiple connects\n" "\t-p trigger dedicated bonding\n" -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY "\t-o configuration request\n" #endif "\t-z information request\n"); @@ -1497,7 +1497,7 @@ static void usage(void) "\t[-M] become master\n" "\t[-T] enable timestamps\n" "\t[-V type] address type (help for list, default = bredr)\n" -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY "\t[-f DCID] destination CID\n" #endif "\t[-e seq] initial sequence value (default = 0)\n"); @@ -1510,7 +1510,7 @@ int main(int argc, char *argv[]) bacpy(&bdaddr, BDADDR_ANY); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY while ((opt = getopt(argc, argv, "a:b:cde:f:g:i:mnopqrstuwxyz" "AB:C:D:EF:GH:I:J:K:L:MN:O:P:Q:RSTUV:W:X:Y:Z:")) != EOF) { #else @@ -1545,7 +1545,7 @@ int main(int argc, char *argv[]) need_addr = 1; break; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY case 'o': mode = CONFIGREQ; need_addr = 1; @@ -1729,7 +1729,7 @@ int main(int argc, char *argv[]) break; -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY case 'f': dcid = atoi(optarg); printf("dcid %d", dcid); @@ -1845,7 +1845,7 @@ int main(int argc, char *argv[]) info_request(argv[optind]); exit(0); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY case CONFIGREQ: config_request(argv[optind]); exit(0); diff --git a/tools/parser/l2cap.h b/tools/parser/l2cap.h index 8caa0a6..6bd5b2f 100644 --- a/tools/parser/l2cap.h +++ b/tools/parser/l2cap.h @@ -179,7 +179,7 @@ typedef struct { } __attribute__ ((packed)) l2cap_conf_opt; #define L2CAP_CONF_OPT_SIZE 2 -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY typedef struct { uint8_t mode; uint8_t txwin_size; diff --git a/tools/sdptool.c b/tools/sdptool.c index cc67ea7..0881c6f 100644 --- a/tools/sdptool.c +++ b/tools/sdptool.c @@ -1219,7 +1219,7 @@ static int add_sp(sdp_session_t *session, svc_info_t *si) sdp_set_service_classes(&record, svclass_id); sdp_uuid16_create(&profile.uuid, SERIAL_PORT_PROFILE_ID); -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY profile.version = 0x0102; #else profile.version = 0x0100; diff --git a/tools/test-runner.c b/tools/test-runner.c index 4b087f0..b4587ff 100644 --- a/tools/test-runner.c +++ b/tools/test-runner.c @@ -544,7 +544,7 @@ static const char *test_table[] = { static void run_command(char *cmdname, char *home) { -#ifdef __TIZEN_PATCH__ +#ifdef TIZEN_FEATURE_BLUEZ_MODIFY char *argv[10], *envp[3]; #else char *argv[9], *envp[3];