From c02835722fda93e3f796d183b2994c89dc817baf Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Thu, 4 Mar 2010 20:37:36 -0800
Subject: [PATCH] novatel: remove PIN checking code

This is handled by the generic class before the modem is even exported
over D-Bus.
---
 plugins/mm-modem-novatel-gsm.c | 76 ----------------------------------
 1 file changed, 76 deletions(-)

diff --git a/plugins/mm-modem-novatel-gsm.c b/plugins/mm-modem-novatel-gsm.c
index 8189627d..4a846269 100644
--- a/plugins/mm-modem-novatel-gsm.c
+++ b/plugins/mm-modem-novatel-gsm.c
@@ -48,78 +48,6 @@ mm_modem_novatel_gsm_new (const char *device,
 /*    Modem class override functions                                         */
 /*****************************************************************************/
 
-static void
-init_modem_done (MMSerialPort *port,
-                 GString *response,
-                 GError *error,
-                 gpointer user_data)
-{
-    MMCallbackInfo *info = (MMCallbackInfo *) user_data;
-
-    mm_generic_gsm_enable_complete (MM_GENERIC_GSM (info->modem), error, info);
-}
-
-static void
-pin_check_done (MMModem *modem, GError *error, gpointer user_data)
-{
-    MMCallbackInfo *info = (MMCallbackInfo *) user_data;
-    MMGenericGsm *self = MM_GENERIC_GSM (modem);
-    MMSerialPort *primary;
-
-    if (error) {
-        mm_generic_gsm_enable_complete (self, error, info);
-        return;
-    }
-
-    /* Finish the initialization */
-    primary = mm_generic_gsm_get_port (self, MM_PORT_TYPE_PRIMARY);
-    g_assert (primary);
-    mm_serial_port_queue_command (primary, "Z E0 V1 X4 &C1 +CMEE=1;+CFUN=1", 10, init_modem_done, info);
-}
-
-static void
-pre_init_done (MMSerialPort *port,
-               GString *response,
-               GError *error,
-               gpointer user_data)
-{
-    MMCallbackInfo *info = (MMCallbackInfo *) user_data;
-
-    if (error) {
-        mm_generic_gsm_enable_complete (MM_GENERIC_GSM (info->modem), error, info);
-        return;
-    }
-
-    /* Now check the PIN explicitly, novatel doesn't seem to report
-     * that it needs it otherwise.
-     */
-    mm_generic_gsm_check_pin (MM_GENERIC_GSM (info->modem), pin_check_done, info);
-}
-
-static void
-enable_flash_done (MMSerialPort *port, GError *error, gpointer user_data)
-{
-    MMCallbackInfo *info = user_data;
-
-    if (error)
-        mm_generic_gsm_enable_complete (MM_GENERIC_GSM (info->modem), error, info);
-    else
-        mm_serial_port_queue_command (port, "E0 V1", 3, pre_init_done, user_data);
-}
-
-static void
-do_enable (MMGenericGsm *modem, MMModemFn callback, gpointer user_data)
-{
-    MMCallbackInfo *info;
-    MMSerialPort *primary;
-
-    primary = mm_generic_gsm_get_port (modem, MM_PORT_TYPE_PRIMARY);
-    g_assert (primary);
-
-    info = mm_callback_info_new (MM_MODEM (modem), callback, user_data);
-    mm_serial_port_flash (primary, 100, enable_flash_done, info);
-}
-
 static void
 dmat_callback (MMSerialPort *port,
                GString *response,
@@ -175,10 +103,6 @@ mm_modem_novatel_gsm_init (MMModemNovatelGsm *self)
 static void
 mm_modem_novatel_gsm_class_init (MMModemNovatelGsmClass *klass)
 {
-    MMGenericGsmClass *gsm_class = MM_GENERIC_GSM_CLASS (klass);
-
     mm_modem_novatel_gsm_parent_class = g_type_class_peek_parent (klass);
-
-    gsm_class->do_enable = do_enable;
 }