colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up generic registration code.

Browse Source
This commit is contained in:
Tambet Ingo
2008-12-15 14:03:27 +02:00
parent e4efbc5c84
commit 614aa0316a
1 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/mm-generic-gsm.c
View File

@@ -25,7 +25,6 @@ typedef struct {
} MMGenericGsmPrivate; } MMGenericGsmPrivate;
static void get_registration_status (MMSerial *serial, MMCallbackInfo *info); static void get_registration_status (MMSerial *serial, MMCallbackInfo *info);
static void real_register (MMSerial *serial, const char *network_id, MMCallbackInfo *info);
static void get_signal_quality (MMModemGsmNetwork *modem, static void get_signal_quality (MMModemGsmNetwork *modem,
MMModemUIntFn callback, MMModemUIntFn callback,
gpointer user_data); gpointer user_data);
@@ -647,22 +646,6 @@ register_done (MMSerial *serial,
get_registration_status (serial, info); get_registration_status (serial, info);
} }
static void
real_register (MMSerial *serial,
const char *network_id,
MMCallbackInfo *info)
{
char *command;
if (network_id)
command = g_strdup_printf ("+COPS=1,2,\"%s\"", network_id);
else
command = g_strdup ("+COPS=0,,");
mm_serial_queue_command (serial, command, 60, register_done, info);
g_free (command);
}
static void static void
do_register (MMModemGsmNetwork *modem, do_register (MMModemGsmNetwork *modem,
const char *network_id, const char *network_id,
@@ -670,11 +653,17 @@ do_register (MMModemGsmNetwork *modem,
gpointer user_data) gpointer user_data)
{ {
MMCallbackInfo *info; MMCallbackInfo *info;
char *command;
info = mm_callback_info_new (MM_MODEM (modem), callback, user_data); info = mm_callback_info_new (MM_MODEM (modem), callback, user_data);
mm_callback_info_set_data (info, "reg-network-id", g_strdup (network_id), g_free);
real_register (MM_SERIAL (modem), network_id, info); if (network_id)
command = g_strdup_printf ("+COPS=1,2,\"%s\"", network_id);
else
command = g_strdup ("+COPS=0,,");
mm_serial_queue_command (MM_SERIAL (modem), command, 60, register_done, info);
g_free (command);
} }
static void static void