Rename device helpers to adapter helpers

3 files changed, 15 insertions, 15 deletions

diff --git a/hcid/device.c b/hcid/device.c
index b3c9b050..e7e3fbda 100644
--- a/hcid/device.c
+++ b/hcid/device.c
@@ -92,7 +92,7 @@ static struct hci_dev devices[MAX_DEVICES];
 
 #define ASSERT_DEV_ID { if (dev_id >= MAX_DEVICES) return -ERANGE; }
 
-void init_devices(void)
+void init_adapters(void)
 {
 	int i;
 
@@ -124,7 +124,7 @@ static int device_read_bdaddr(uint16_t dev_id, bdaddr_t *bdaddr)
 	return 0;
 }
 
-int add_device(uint16_t dev_id)
+int add_adapter(uint16_t dev_id)
 {
 	struct hci_dev *dev;
 	struct hci_dev_info di;
@@ -157,7 +157,7 @@ int add_device(uint16_t dev_id)
 	return 0;
 }
 
-int remove_device(uint16_t dev_id)
+int remove_adapter(uint16_t dev_id)
 {
 	struct hci_dev *dev;
 
@@ -227,7 +227,7 @@ static void update_ext_inquiry_response(int dd, struct hci_dev *dev)
 						strerror(errno), errno);
 }
 
-int start_device(uint16_t dev_id)
+int start_adapter(uint16_t dev_id)
 {
 	struct hci_dev *dev;
 	struct hci_version ver;
@@ -357,7 +357,7 @@ done:
 	return 0;
 }
 
-int stop_device(uint16_t dev_id)
+int stop_adapter(uint16_t dev_id)
 {
 	ASSERT_DEV_ID;
 
diff --git a/hcid/hcid.h b/hcid/hcid.h
index 4e628f73..cffbd8c6 100644
--- a/hcid/hcid.h
+++ b/hcid/hcid.h
@@ -155,11 +155,11 @@ void toggle_pairing(int enable);
 
 void set_pin_length(bdaddr_t *sba, int length);
 
-void init_devices(void);
-int add_device(uint16_t dev_id);
-int remove_device(uint16_t dev_id);
-int start_device(uint16_t dev_id);
-int stop_device(uint16_t dev_id);
+void init_adapters(void);
+int add_adapter(uint16_t dev_id);
+int remove_adapter(uint16_t dev_id);
+int start_adapter(uint16_t dev_id);
+int stop_adapter(uint16_t dev_id);
 
 int get_device_address(uint16_t dev_id, char *address, size_t size);
 int get_device_class(uint16_t dev_id, uint8_t *class);
diff --git a/hcid/main.c b/hcid/main.c
index a739289d..bd470c87 100644
--- a/hcid/main.c
+++ b/hcid/main.c
@@ -570,12 +570,12 @@ static void device_devreg_setup(int dev_id)
 
 static void device_devup_setup(int dev_id)
 {
-	add_device(dev_id);
+	add_adapter(dev_id);
 	if (hcid.auto_init)
 		configure_device(dev_id);
 	if (hcid.security)
 		start_security_manager(dev_id);
-	start_device(dev_id);
+	start_adapter(dev_id);
 	hcid_dbus_start_device(dev_id);
 }
 
@@ -634,7 +634,7 @@ static inline void device_event(GIOChannel *chan, evt_stack_internal *si)
 	case HCI_DEV_UNREG:
 		info("HCI dev %d unregistered", sd->dev_id);
 		hcid_dbus_unregister_device(sd->dev_id);
-		remove_device(sd->dev_id);
+		remove_adapter(sd->dev_id);
 		break;
 
 	case HCI_DEV_UP:
@@ -647,7 +647,7 @@ static inline void device_event(GIOChannel *chan, evt_stack_internal *si)
 		hcid_dbus_stop_device(sd->dev_id);
 		if (hcid.security)
 			stop_security_manager(sd->dev_id);
-		stop_device(sd->dev_id);
+		stop_adapter(sd->dev_id);
 		break;
 	}
 }
@@ -853,7 +853,7 @@ int main(int argc, char *argv[])
 			child_exit, NULL);
 	g_io_channel_unref(child_io);
 
-	init_devices();
+	init_adapters();
 
 	if (hcid_dbus_init() < 0) {
 		error("Unable to get on D-Bus");