From 044fe0edd36db997f5fac9ccd36de86afe6b6b0d Mon Sep 17 00:00:00 2001 From: Luiz Augusto von Dentz Date: Wed, 14 Sep 2016 12:26:46 +0300 Subject: [PATCH] core/gatt-database: Remove unused function btd_gatt_database_add_ccc is not used anymore. --- src/gatt-database.c | 26 ++++---------------------- src/gatt-database.h | 11 ----------- 2 files changed, 4 insertions(+), 33 deletions(-) diff --git a/src/gatt-database.c b/src/gatt-database.c index 27559fd6f..126e1b3d4 100644 --- a/src/gatt-database.c +++ b/src/gatt-database.c @@ -149,6 +149,10 @@ struct device_state { struct queue *ccc_states; }; +typedef uint8_t (*btd_gatt_database_ccc_write_t) (uint16_t value, + void *user_data); +typedef void (*btd_gatt_database_destroy_t) (void *data); + struct ccc_state { uint16_t handle; uint8_t value[2]; @@ -827,28 +831,6 @@ service_add_ccc(struct gatt_db_attribute *service, return ccc; } -struct gatt_db_attribute * -btd_gatt_database_add_ccc(struct btd_gatt_database *database, - uint16_t service_handle, - btd_gatt_database_ccc_write_t write_callback, - void *user_data, - btd_gatt_database_destroy_t destroy) -{ - struct gatt_db_attribute *service; - - if (!database || !service_handle) - return NULL; - - service = gatt_db_get_attribute(database->db, service_handle); - if (!service) { - error("No service exists with handle: 0x%04x", service_handle); - return NULL; - } - - return service_add_ccc(service, database, write_callback, user_data, - destroy); -} - static void populate_gatt_service(struct btd_gatt_database *database) { bt_uuid_t uuid; diff --git a/src/gatt-database.h b/src/gatt-database.h index 163b60127..0d9106b11 100644 --- a/src/gatt-database.h +++ b/src/gatt-database.h @@ -23,14 +23,3 @@ struct btd_gatt_database *btd_gatt_database_new(struct btd_adapter *adapter); void btd_gatt_database_destroy(struct btd_gatt_database *database); struct gatt_db *btd_gatt_database_get_db(struct btd_gatt_database *database); - -typedef uint8_t (*btd_gatt_database_ccc_write_t) (uint16_t value, - void *user_data); -typedef void (*btd_gatt_database_destroy_t) (void *data); - -struct gatt_db_attribute * -btd_gatt_database_add_ccc(struct btd_gatt_database *database, - uint16_t service_handle, - btd_gatt_database_ccc_write_t write_callback, - void *user_data, - btd_gatt_database_destroy_t destroy); -- 2.47.3