projects
/
platform
/
upstream
/
iotivity.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
replace : iotivity -> iotivity-sec
[platform/upstream/iotivity.git]
/
resource
/
csdk
/
connectivity
/
src
/
bt_le_adapter
/
linux
/
client.c
diff --git
a/resource/csdk/connectivity/src/bt_le_adapter/linux/client.c
b/resource/csdk/connectivity/src/bt_le_adapter/linux/client.c
index
2888c7b
..
299f54e
100644
(file)
--- a/
resource/csdk/connectivity/src/bt_le_adapter/linux/client.c
+++ b/
resource/csdk/connectivity/src/bt_le_adapter/linux/client.c
@@
-70,7
+70,7
@@
typedef struct _CAGattClientContext
GHashTable * address_map;
/// Mutex used to synchronize access to context fields.
GHashTable * address_map;
/// Mutex used to synchronize access to context fields.
-
ca
_mutex lock;
+
oc
_mutex lock;
} CAGattClientContext;
} CAGattClientContext;
@@
-108,7
+108,7
@@
static void CAGattClientOnCharacteristicPropertiesChanged(
char const * const object_path =
g_dbus_proxy_get_object_path(characteristic);
char const * const object_path =
g_dbus_proxy_get_object_path(characteristic);
-
ca
_mutex_lock(g_context.lock);
+
oc
_mutex_lock(g_context.lock);
char * const address =
g_hash_table_lookup(g_context.address_map, object_path);
char * const address =
g_hash_table_lookup(g_context.address_map, object_path);
@@
-145,7
+145,7
@@
static void CAGattClientOnCharacteristicPropertiesChanged(
}
}
}
}
-
ca
_mutex_unlock(g_context.lock);
+
oc
_mutex_unlock(g_context.lock);
}
// ---------------------------------------------------------------------
}
// ---------------------------------------------------------------------
@@
-483,7
+483,7
@@
static void CAGattClientOnDevicePropertiesChanged(
{
CALEContext * const context = user_data;
{
CALEContext * const context = user_data;
-
ca
_mutex_lock(g_context.lock);
+
oc
_mutex_lock(g_context.lock);
CAGattClientSetupService(device,
g_context.characteristic_map,
CAGattClientSetupService(device,
g_context.characteristic_map,
@@
-491,7
+491,7
@@
static void CAGattClientOnDevicePropertiesChanged(
services_prop,
context);
services_prop,
context);
-
ca
_mutex_unlock(g_context.lock);
+
oc
_mutex_unlock(g_context.lock);
g_variant_unref(services_prop);
}
g_variant_unref(services_prop);
}
@@
-499,7
+499,7
@@
static void CAGattClientOnDevicePropertiesChanged(
CAResult_t CAGattClientInitialize(CALEContext * context)
{
CAResult_t CAGattClientInitialize(CALEContext * context)
{
- g_context.lock =
ca
_mutex_new();
+ g_context.lock =
oc
_mutex_new();
/*
Map Bluetooth MAC address to OIC Transport Profile
/*
Map Bluetooth MAC address to OIC Transport Profile
@@
-521,7
+521,7
@@
CAResult_t CAGattClientInitialize(CALEContext * context)
OICFree,
OICFree);
OICFree,
OICFree);
-
ca
_mutex_lock(context->lock);
+
oc
_mutex_lock(context->lock);
for (GList * l = context->devices; l != NULL; l = l->next)
{
for (GList * l = context->devices; l != NULL; l = l->next)
{
@@
-545,14
+545,14
@@
CAResult_t CAGattClientInitialize(CALEContext * context)
context);
}
context);
}
-
ca
_mutex_unlock(context->lock);
+
oc
_mutex_unlock(context->lock);
-
ca
_mutex_lock(g_context.lock);
+
oc
_mutex_lock(g_context.lock);
g_context.characteristic_map = characteristic_map;
g_context.address_map = address_map;
g_context.characteristic_map = characteristic_map;
g_context.address_map = address_map;
-
ca
_mutex_unlock(g_context.lock);
+
oc
_mutex_unlock(g_context.lock);
return CA_STATUS_OK;
}
return CA_STATUS_OK;
}
@@
-564,7
+564,7
@@
void CAGattClientDestroy()
return; // Initialization did not complete.
}
return; // Initialization did not complete.
}
-
ca
_mutex_lock(g_context.lock);
+
oc
_mutex_lock(g_context.lock);
if (g_context.characteristic_map != NULL)
{
if (g_context.characteristic_map != NULL)
{
@@
-578,9
+578,9
@@
void CAGattClientDestroy()
g_context.address_map = NULL;
}
g_context.address_map = NULL;
}
-
ca
_mutex_unlock(g_context.lock);
+
oc
_mutex_unlock(g_context.lock);
-
ca
_mutex_free(g_context.lock);
+
oc
_mutex_free(g_context.lock);
g_context.lock = NULL;
/*
g_context.lock = NULL;
/*
@@
-636,7
+636,7
@@
static CAResult_t CAGattClientSendDataImpl(GDBusProxy * characteristic,
g_error_free(error);
g_error_free(error);
-
ca
_mutex_lock(context->lock);
+
oc
_mutex_lock(context->lock);
if (context->on_client_error != NULL)
{
if (context->on_client_error != NULL)
{
@@
-650,7
+650,7
@@
static CAResult_t CAGattClientSendDataImpl(GDBusProxy * characteristic,
CA_STATUS_FAILED);
}
CA_STATUS_FAILED);
}
-
ca
_mutex_unlock(context->lock);
+
oc
_mutex_unlock(context->lock);
return CA_STATUS_FAILED;
}
return CA_STATUS_FAILED;
}
@@
-669,7
+669,7
@@
CAResult_t CAGattClientSendData(char const * address,
CAResult_t result = CA_STATUS_FAILED;
CAResult_t result = CA_STATUS_FAILED;
-
ca
_mutex_lock(g_context.lock);
+
oc
_mutex_lock(g_context.lock);
GDBusProxy * const characteristic =
G_DBUS_PROXY(
GDBusProxy * const characteristic =
G_DBUS_PROXY(
@@
-691,7
+691,7
@@
CAResult_t CAGattClientSendData(char const * address,
length,
context);
length,
context);
-
ca
_mutex_unlock(g_context.lock);
+
oc
_mutex_unlock(g_context.lock);
return result;
}
return result;
}
@@
-704,12
+704,12
@@
CAResult_t CAGattClientSendDataToAll(uint8_t const * data,
CAResult_t result = CA_STATUS_FAILED;
CAResult_t result = CA_STATUS_FAILED;
-
ca
_mutex_lock(g_context.lock);
+
oc
_mutex_lock(g_context.lock);
if (g_context.characteristic_map == NULL)
{
// Remote OIC GATT service was not found prior to getting here.
if (g_context.characteristic_map == NULL)
{
// Remote OIC GATT service was not found prior to getting here.
-
ca
_mutex_unlock(g_context.lock);
+
oc
_mutex_unlock(g_context.lock);
return result;
}
return result;
}
@@
-737,7
+737,7
@@
CAResult_t CAGattClientSendDataToAll(uint8_t const * data,
}
}
}
}
-
ca
_mutex_unlock(g_context.lock);
+
oc
_mutex_unlock(g_context.lock);
return result;
}
return result;
}