[PATCH 0/6] Deprecate the Deregister() method

[PATCH 0/6] Deprecate the Deregister() method

[Aki Niemi]

[-- Attachment #1: Type: text/plain, Size: 208 bytes --]

Hi All,

This set of patches removes the Deregister() method from the netreg
atom. This method serves no purpose, since the Online property is used
to control oFono's radio on/off state.

Cheers,
Aki

[PATCH 1/6] netreg: Deprecate the deregister method

[Aki Niemi]

[-- Attachment #1: Type: text/plain, Size: 2775 bytes --]

---
 src/network.c |   37 ++-----------------------------------
 1 files changed, 2 insertions(+), 35 deletions(-)

diff --git a/src/network.c b/src/network.c
index ae0f334..1f66f34 100644
--- a/src/network.c
+++ b/src/network.c
@@ -43,8 +43,6 @@
 enum network_registration_mode {
 	NETWORK_REGISTRATION_MODE_AUTO =	0,
 	NETWORK_REGISTRATION_MODE_MANUAL =	1,
-	NETWORK_REGISTRATION_MODE_OFF =		2,
-	NETWORK_REGISTRATION_MODE_MANUAL_AUTO =	4,
 };
 
 #define SETTINGS_STORE "netreg"
@@ -102,8 +100,6 @@ static const char *registration_mode_to_string(int mode)
 		return "auto";
 	case NETWORK_REGISTRATION_MODE_MANUAL:
 		return "manual";
-	case NETWORK_REGISTRATION_MODE_OFF:
-		return "off";
 	}
 
 	return "unknown";
@@ -845,26 +841,6 @@ static DBusMessage *network_register(DBusConnection *conn,
 	return NULL;
 }
 
-static DBusMessage *network_deregister(DBusConnection *conn,
-					DBusMessage *msg, void *data)
-{
-	struct ofono_netreg *netreg = data;
-
-	if (netreg->pending)
-		return __ofono_error_busy(msg);
-
-	if (netreg->driver->deregister == NULL)
-		return __ofono_error_not_implemented(msg);
-
-	netreg->pending = dbus_message_ref(msg);
-
-	netreg->driver->deregister(netreg, register_callback, netreg);
-
-	set_registration_mode(netreg, NETWORK_REGISTRATION_MODE_OFF);
-
-	return NULL;
-}
-
 static void append_operator_struct(struct ofono_netreg *netreg,
 					struct network_operator_data *opd,
 					DBusMessageIter *iter)
@@ -1016,8 +992,6 @@ static GDBusMethodTable network_registration_methods[] = {
 	{ "GetProperties",  "",  "a{sv}",	network_get_properties },
 	{ "Register",       "",  "",		network_register,
 						G_DBUS_METHOD_FLAG_ASYNC },
-	{ "Deregister",     "",  "",		network_deregister,
-						G_DBUS_METHOD_FLAG_ASYNC },
 	{ "GetOperators",   "",  "a(oa{sv})",	network_get_operators },
 	{ "Scan",           "",  "a(oa{sv})",	network_scan,
 						G_DBUS_METHOD_FLAG_ASYNC },
@@ -1782,7 +1756,6 @@ struct ofono_netreg *ofono_netreg_create(struct ofono_modem *modem,
 static void netreg_load_settings(struct ofono_netreg *netreg)
 {
 	const char *imsi;
-	int mode;
 
 	imsi = ofono_sim_get_imsi(netreg->sim);
 	if (imsi == NULL)
@@ -1795,14 +1768,8 @@ static void netreg_load_settings(struct ofono_netreg *netreg)
 
 	netreg->imsi = g_strdup(imsi);
 
-	mode = g_key_file_get_integer(netreg->settings, SETTINGS_GROUP,
-					"Mode", NULL);
-
-	if (mode >= 0 && mode <= 2)
-		netreg->mode = mode;
-
-	g_key_file_set_integer(netreg->settings, SETTINGS_GROUP,
-				"Mode", netreg->mode);
+	netreg->mode = g_key_file_get_integer(netreg->settings, SETTINGS_GROUP,
+						"Mode", NULL);
 }
 
 void ofono_netreg_register(struct ofono_netreg *netreg)
-- 
1.7.1

[PATCH 2/6] isimodem: Remove deregister implementation

[Aki Niemi]

[-- Attachment #1: Type: text/plain, Size: 960 bytes --]

---
 drivers/isimodem/network-registration.c |    9 ---------
 1 files changed, 0 insertions(+), 9 deletions(-)

diff --git a/drivers/isimodem/network-registration.c b/drivers/isimodem/network-registration.c
index 47aaeb1..6518968 100644
--- a/drivers/isimodem/network-registration.c
+++ b/drivers/isimodem/network-registration.c
@@ -663,14 +663,6 @@ error:
 	g_free(cbd);
 }
 
-static void isi_deregister(struct ofono_netreg *netreg,
-				ofono_netreg_register_cb_t cb,
-				void *data)
-{
-	DBG("Not implemented.");
-	CALLBACK_WITH_FAILURE(cb, data);
-}
-
 static void rssi_ind_cb(const GIsiMessage *msg, void *data)
 {
 	struct ofono_netreg *netreg = data;
@@ -859,7 +851,6 @@ static struct ofono_netreg_driver driver = {
 	.list_operators		= isi_list_operators,
 	.register_auto		= isi_register_auto,
 	.register_manual	= isi_register_manual,
-	.deregister		= isi_deregister,
 	.strength		= isi_strength,
 };
 
-- 
1.7.1

[PATCH 3/6] atmodem: Remove deregister implementation

[Aki Niemi]

[-- Attachment #1: Type: text/plain, Size: 1255 bytes --]

---
 drivers/atmodem/network-registration.c |   20 --------------------
 1 files changed, 0 insertions(+), 20 deletions(-)

diff --git a/drivers/atmodem/network-registration.c b/drivers/atmodem/network-registration.c
index e11c974..4b8cc34 100644
--- a/drivers/atmodem/network-registration.c
+++ b/drivers/atmodem/network-registration.c
@@ -557,25 +557,6 @@ error:
 	CALLBACK_WITH_FAILURE(cb, data);
 }
 
-static void at_deregister(struct ofono_netreg *netreg,
-				ofono_netreg_register_cb_t cb, void *data)
-{
-	struct netreg_data *nd = ofono_netreg_get_data(netreg);
-	struct cb_data *cbd = cb_data_new(cb, data);
-
-	if (cbd == NULL)
-		goto error;
-
-	if (g_at_chat_send(nd->chat, "AT+COPS=2", none_prefix,
-				register_cb, cbd, g_free) > 0)
-		return;
-
-error:
-	g_free(cbd);
-
-	CALLBACK_WITH_FAILURE(cb, data);
-}
-
 static void csq_notify(GAtResult *result, gpointer user_data)
 {
 	struct ofono_netreg *netreg = user_data;
@@ -1342,7 +1323,6 @@ static struct ofono_netreg_driver driver = {
 	.list_operators			= at_list_operators,
 	.register_auto			= at_register_auto,
 	.register_manual		= at_register_manual,
-	.deregister			= at_deregister,
 	.strength			= at_signal_strength,
 };
 
-- 
1.7.1

[PATCH 4/6] api: Remove deregister from modem driver API

[Aki Niemi]

[-- Attachment #1: Type: text/plain, Size: 624 bytes --]

---
 include/netreg.h |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/include/netreg.h b/include/netreg.h
index a88301d..26a3442 100644
--- a/include/netreg.h
+++ b/include/netreg.h
@@ -84,8 +84,6 @@ struct ofono_netreg_driver {
 	void (*register_manual)(struct ofono_netreg *netreg,
 				const char *mcc, const char *mnc,
 				ofono_netreg_register_cb_t cb, void *data);
-	void (*deregister)(struct ofono_netreg *netreg,
-			ofono_netreg_register_cb_t cb, void *data);
 	void (*strength)(struct ofono_netreg *netreg,
 			ofono_netreg_strength_cb_t, void *data);
 };
-- 
1.7.1

[PATCH 5/6] doc: Remove deregister method documentation

[Aki Niemi]

[-- Attachment #1: Type: text/plain, Size: 956 bytes --]

---
 doc/network-api.txt |    9 ---------
 1 files changed, 0 insertions(+), 9 deletions(-)

diff --git a/doc/network-api.txt b/doc/network-api.txt
index 3e705e6..75187cd 100644
--- a/doc/network-api.txt
+++ b/doc/network-api.txt
@@ -30,12 +30,6 @@ Methods		dict GetProperties()
 
 			Possible Errors: [service].Error.InvalidArguments
 
-		void Deregister()
-
-			Completely unregisters from the network
-
-			Possible Errors: [service].Error.InvalidArguments
-
 		array{object,dict} GetOperators()
 
 			Retrieve array of operator object and properties.
@@ -81,9 +75,6 @@ Properties	string Mode [readonly]
 				           manually. If the operator is
 				           currently not selected, registration
 				           is not attempted
-				"off"      Unregisters from currently selected
-				           network, if any, and does not
-				           attempt to register again.
 
 		string Status [readonly]
 
-- 
1.7.1

[PATCH 6/6] test: Remove deregister support from test script

[Aki Niemi]

[-- Attachment #1: Type: text/plain, Size: 1038 bytes --]

---
 test/test-network-registration |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/test/test-network-registration b/test/test-network-registration
index a8bd141..0c25885 100755
--- a/test/test-network-registration
+++ b/test/test-network-registration
@@ -18,8 +18,6 @@ if __name__ == "__main__":
 			(sys.argv[0])
 		print "Usage: %s default - Register to default PLMN" %\
 			(sys.argv[0])
-		print "Usage: %s unregister - Unregister from all PLMNs" %\
-			(sys.argv[0])
 		sys.exit(1)
 
 	canexit = False
@@ -53,14 +51,12 @@ if __name__ == "__main__":
 	try:
 		if sys.argv[1] == 'default':
 			netreg.Register()
-		elif sys.argv[1] == 'unregister':
-			netreg.Deregister()
 		else:
 			obj = bus.get_object('org.ofono', sys.argv[1]);
 			op = dbus.Interface(obj, 'org.ofono.NetworkOperator')
 			op.Register()
 	except dbus.DBusException, e:
-		print "Unable to register/deregister: ", e
+		print "Unable to register: ", e
 		sys.exit(1)
 
 	canexit = True
-- 
1.7.1

Re: [PATCH 1/6] netreg: Deprecate the deregister method

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 749 bytes --]

Hi Aki,

> @@ -1795,14 +1768,8 @@ static void netreg_load_settings(struct ofono_netreg *netreg)
>  
>  	netreg->imsi = g_strdup(imsi);
>  
> -	mode = g_key_file_get_integer(netreg->settings, SETTINGS_GROUP,
> -					"Mode", NULL);
> -
> -	if (mode >= 0 && mode <= 2)
> -		netreg->mode = mode;
> -
> -	g_key_file_set_integer(netreg->settings, SETTINGS_GROUP,
> -				"Mode", netreg->mode);
> +	netreg->mode = g_key_file_get_integer(netreg->settings, SETTINGS_GROUP,
> +						"Mode", NULL);
>  }
>  

I dropped this chunk and amended your patch to stipulate mode 0 and 1
only.  This was a sanity check that no-one is messing with our settings
file.

>  void ofono_netreg_register(struct ofono_netreg *netreg)

Regards,
-Denis

Re: [PATCH 0/6] Deprecate the Deregister() method

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 317 bytes --]

Hi Aki,

On 01/19/2011 03:53 PM, Aki Niemi wrote:
> Hi All,
> 
> This set of patches removes the Deregister() method from the netreg
> atom. This method serves no purpose, since the Online property is used
> to control oFono's radio on/off state.

All patches have been applied, thanks.

Regards,
-Denis