Rename modem_add_interface / modem_remove_interface

Move to ofono_modem_add_interface, ofono_modem_remove_interface
and put in ofono/modem.h

15 files changed, 66 insertions, 27 deletions

diff --git a/include/Makefile.am b/include/Makefile.am
index 3ebad83f..4f63c777 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,7 +1,7 @@
 
 includedir = @includedir@/ofono
 
-include_HEADERS = log.h plugin.h history.h dbus.h
+include_HEADERS = log.h plugin.h history.h dbus.h modem.h
 
 nodist_include_HEADERS = version.h
 
diff --git a/include/modem.h b/include/modem.h
new file mode 100644
index 00000000..047c1b46
--- /dev/null
+++ b/include/modem.h
@@ -0,0 +1,39 @@
+/*
+ *
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2008-2009  Intel Corporation. All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef __OFONO_MODEM_H
+#define __OFONO_MODEM_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void ofono_modem_add_interface(struct ofono_modem *modem,
+				const char *interface);
+
+void ofono_modem_remove_interface(struct ofono_modem *modem,
+					const char *interface);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __OFONO_MODEM_H */
diff --git a/src/call-barring.c b/src/call-barring.c
index 5a98fbff..6e78db45 100644
--- a/src/call-barring.c
+++ b/src/call-barring.c
@@ -1102,7 +1102,7 @@ int ofono_call_barring_register(struct ofono_modem *modem,
 		return -1;
 	}
 
-	modem_add_interface(modem, CALL_BARRING_INTERFACE);
+	ofono_modem_add_interface(modem, CALL_BARRING_INTERFACE);
 
 	cb_register_ss_controls(modem);
 
@@ -1121,7 +1121,7 @@ void ofono_call_barring_unregister(struct ofono_modem *modem)
 	if (!modem->call_barring)
 		return;
 
-	modem_remove_interface(modem, CALL_BARRING_INTERFACE);
+	ofono_modem_remove_interface(modem, CALL_BARRING_INTERFACE);
 	g_dbus_unregister_interface(conn, modem->path, CALL_BARRING_INTERFACE);
 
 	cb_unregister_ss_controls(modem);
diff --git a/src/call-forwarding.c b/src/call-forwarding.c
index b329e72c..56768819 100644
--- a/src/call-forwarding.c
+++ b/src/call-forwarding.c
@@ -1166,7 +1166,7 @@ int ofono_call_forwarding_register(struct ofono_modem *modem,
 
 	cf_register_ss_controls(modem);
 
-	modem_add_interface(modem, CALL_FORWARDING_INTERFACE);
+	ofono_modem_add_interface(modem, CALL_FORWARDING_INTERFACE);
 
 	return 0;
 }
@@ -1179,7 +1179,7 @@ void ofono_call_forwarding_unregister(struct ofono_modem *modem)
 	if (!cf)
 		return;
 
-	modem_remove_interface(modem, CALL_FORWARDING_INTERFACE);
+	ofono_modem_remove_interface(modem, CALL_FORWARDING_INTERFACE);
 	g_dbus_unregister_interface(conn, modem->path,
 					CALL_FORWARDING_INTERFACE);
 
diff --git a/src/call-meter.c b/src/call-meter.c
index 1647a2f7..4657fe4c 100644
--- a/src/call-meter.c
+++ b/src/call-meter.c
@@ -741,7 +741,7 @@ int ofono_call_meter_register(struct ofono_modem *modem,
 		return -1;
 	}
 
-	modem_add_interface(modem, CALL_METER_INTERFACE);
+	ofono_modem_add_interface(modem, CALL_METER_INTERFACE);
 
 	return 0;
 }
@@ -753,7 +753,7 @@ void ofono_call_meter_unregister(struct ofono_modem *modem)
 	if (!modem->call_meter)
 		return;
 
-	modem_remove_interface(modem, CALL_METER_INTERFACE);
+	ofono_modem_remove_interface(modem, CALL_METER_INTERFACE);
 	g_dbus_unregister_interface(conn, modem->path, CALL_METER_INTERFACE);
 
 	modem->call_meter = NULL;
diff --git a/src/call-settings.c b/src/call-settings.c
index 5c35f8f4..86019924 100644
--- a/src/call-settings.c
+++ b/src/call-settings.c
@@ -1232,7 +1232,7 @@ int ofono_call_settings_register(struct ofono_modem *modem,
 
 	cs_register_ss_controls(modem);
 
-	modem_add_interface(modem, CALL_SETTINGS_INTERFACE);
+	ofono_modem_add_interface(modem, CALL_SETTINGS_INTERFACE);
 	return 0;
 }
 
@@ -1244,7 +1244,7 @@ void ofono_call_settings_unregister(struct ofono_modem *modem)
 	if (!cs)
 		return;
 
-	modem_remove_interface(modem, CALL_SETTINGS_INTERFACE);
+	ofono_modem_remove_interface(modem, CALL_SETTINGS_INTERFACE);
 	g_dbus_unregister_interface(conn, modem->path,
 					CALL_SETTINGS_INTERFACE);
 
diff --git a/src/modem.c b/src/modem.c
index 28d5cc4c..bcb3a7d3 100644
--- a/src/modem.c
+++ b/src/modem.c
@@ -224,7 +224,8 @@ static gboolean trigger_interface_update(void *data)
 	return FALSE;
 }
 
-void modem_add_interface(struct ofono_modem *modem, const char *interface)
+void ofono_modem_add_interface(struct ofono_modem *modem,
+				const char *interface)
 {
 	struct ofono_modem_data *info = modem->modem_info;
 
@@ -236,7 +237,8 @@ void modem_add_interface(struct ofono_modem *modem, const char *interface)
 			g_timeout_add(0, trigger_interface_update, modem);
 }
 
-void modem_remove_interface(struct ofono_modem *modem, const char *interface)
+void ofono_modem_remove_interface(struct ofono_modem *modem,
+				const char *interface)
 {
 	struct ofono_modem_data *info = modem->modem_info;
 
diff --git a/src/modem.h b/src/modem.h
index abe44cc7..60a142f2 100644
--- a/src/modem.h
+++ b/src/modem.h
@@ -23,7 +23,3 @@ struct ofono_modem_attribute_ops;
 
 struct ofono_modem *modem_create(int id, struct ofono_modem_attribute_ops *ops);
 void modem_remove(struct ofono_modem *modem);
-
-void modem_add_interface(struct ofono_modem *modem, const char *interface);
-void modem_remove_interface(struct ofono_modem *modem, const char *interface);
-
diff --git a/src/network.c b/src/network.c
index 8b411676..312f348a 100644
--- a/src/network.c
+++ b/src/network.c
@@ -919,7 +919,7 @@ static void initialize_network_registration(struct ofono_modem *modem)
 	ofono_debug("NetworkRegistration interface for modem: %s created",
 			modem->path);
 
-	modem_add_interface(modem, NETWORK_REGISTRATION_INTERFACE);
+	ofono_modem_add_interface(modem, NETWORK_REGISTRATION_INTERFACE);
 	ofono_sim_ready_notify_register(modem, network_sim_ready);
 
 	if (modem->network_registration->ops->list_operators) {
@@ -1405,6 +1405,6 @@ void ofono_network_registration_unregister(struct ofono_modem *modem)
 
 	g_dbus_unregister_interface(conn, modem->path,
 					NETWORK_REGISTRATION_INTERFACE);
-	modem_remove_interface(modem, NETWORK_REGISTRATION_INTERFACE);
+	ofono_modem_remove_interface(modem, NETWORK_REGISTRATION_INTERFACE);
 }
 
diff --git a/src/ofono.h b/src/ofono.h
index cb311e50..905e808c 100644
--- a/src/ofono.h
+++ b/src/ofono.h
@@ -83,6 +83,8 @@ struct ofono_modem {
 	GSList *history_contexts;
 };
 
+#include <ofono/modem.h>
+
 unsigned int __ofono_modem_alloc_callid(struct ofono_modem *modem);
 void __ofono_modem_release_callid(struct ofono_modem *modem, int id);
 
diff --git a/src/phonebook.c b/src/phonebook.c
index a4a92ef9..cfdf3d8e 100644
--- a/src/phonebook.c
+++ b/src/phonebook.c
@@ -525,7 +525,7 @@ int ofono_phonebook_register(struct ofono_modem *modem,
 		return -1;
 	}
 
-	modem_add_interface(modem, PHONEBOOK_INTERFACE);
+	ofono_modem_add_interface(modem, PHONEBOOK_INTERFACE);
 	return 0;
 }
 
@@ -536,7 +536,7 @@ void ofono_phonebook_unregister(struct ofono_modem *modem)
 	if (modem->phonebook == NULL)
 		return;
 
-	modem_remove_interface(modem, PHONEBOOK_INTERFACE);
+	ofono_modem_remove_interface(modem, PHONEBOOK_INTERFACE);
 	g_dbus_unregister_interface(conn, modem->path,
 					PHONEBOOK_INTERFACE);
 }
diff --git a/src/sim.c b/src/sim.c
index 0420af96..73ed7e4a 100644
--- a/src/sim.c
+++ b/src/sim.c
@@ -666,7 +666,7 @@ static void initialize_sim_manager(struct ofono_modem *modem)
 	ofono_debug("SIMManager interface for modem: %s created",
 			modem->path);
 
-	modem_add_interface(modem, SIM_MANAGER_INTERFACE);
+	ofono_modem_add_interface(modem, SIM_MANAGER_INTERFACE);
 
 	ofono_sim_ready_notify_register(modem, sim_ready);
 
@@ -775,7 +775,7 @@ void ofono_sim_manager_unregister(struct ofono_modem *modem)
 
 	g_dbus_unregister_interface(conn, modem->path,
 					SIM_MANAGER_INTERFACE);
-	modem_remove_interface(modem, SIM_MANAGER_INTERFACE);
+	ofono_modem_remove_interface(modem, SIM_MANAGER_INTERFACE);
 }
 
 void ofono_sim_manager_init(struct ofono_modem *modem)
diff --git a/src/sms.c b/src/sms.c
index 146f7758..87b6dcd0 100644
--- a/src/sms.c
+++ b/src/sms.c
@@ -812,7 +812,7 @@ int ofono_sms_manager_register(struct ofono_modem *modem,
 	ofono_debug("SmsManager interface for modem: %s created",
 			modem->path);
 
-	modem_add_interface(modem, SMS_MANAGER_INTERFACE);
+	ofono_modem_add_interface(modem, SMS_MANAGER_INTERFACE);
 
 	return 0;
 }
@@ -824,5 +824,5 @@ void ofono_sms_manager_unregister(struct ofono_modem *modem)
 	g_dbus_unregister_interface(conn, modem->path,
 					SMS_MANAGER_INTERFACE);
 
-	modem_remove_interface(modem, SMS_MANAGER_INTERFACE);
+	ofono_modem_remove_interface(modem, SMS_MANAGER_INTERFACE);
 }
diff --git a/src/ussd.c b/src/ussd.c
index 781a6195..b0d92851 100644
--- a/src/ussd.c
+++ b/src/ussd.c
@@ -572,7 +572,7 @@ int ofono_ussd_register(struct ofono_modem *modem, struct ofono_ussd_ops *ops)
 		return -1;
 	}
 
-	modem_add_interface(modem, SUPPLEMENTARY_SERVICES_INTERFACE);
+	ofono_modem_add_interface(modem, SUPPLEMENTARY_SERVICES_INTERFACE);
 
 	return 0;
 }
@@ -584,7 +584,7 @@ void ofono_ussd_unregister(struct ofono_modem *modem)
 	if (modem->ussd == NULL)
 		return;
 
-	modem_remove_interface(modem, SUPPLEMENTARY_SERVICES_INTERFACE);
+	ofono_modem_remove_interface(modem, SUPPLEMENTARY_SERVICES_INTERFACE);
 	g_dbus_unregister_interface(conn, modem->path,
 					SUPPLEMENTARY_SERVICES_INTERFACE);
 }
diff --git a/src/voicecall.c b/src/voicecall.c
index 3d33db39..f71e906c 100644
--- a/src/voicecall.c
+++ b/src/voicecall.c
@@ -1677,7 +1677,7 @@ int ofono_voicecall_register(struct ofono_modem *modem, struct ofono_voicecall_o
 		return -1;
 	}
 
-	modem_add_interface(modem, VOICECALL_MANAGER_INTERFACE);
+	ofono_modem_add_interface(modem, VOICECALL_MANAGER_INTERFACE);
 
 	return 0;
 }
@@ -1689,7 +1689,7 @@ void ofono_voicecall_unregister(struct ofono_modem *modem)
 	if (!modem->voicecalls)
 		return;
 
-	modem_remove_interface(modem, VOICECALL_MANAGER_INTERFACE);
+	ofono_modem_remove_interface(modem, VOICECALL_MANAGER_INTERFACE);
 	g_dbus_unregister_interface(conn, modem->path,
 					VOICECALL_MANAGER_INTERFACE);