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

Merge branch 'master' of git://gitorious.org/modemmanager/asacs-mbm

Browse Source
This commit is contained in:
Tambet Ingo
2008-12-05 15:57:55 +02:00
parent 793044b577 1673c6c998
commit a504fb408a
4 changed files with 92 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -326,6 +326,35 @@ get_card_info (MMModemGsmCard *modem,
mm_serial_queue_command (MM_SERIAL (modem), "+CGMR", 3, get_version_done, info);
}
static void
send_puk_done (MMSerial *serial,
GString *response,
GError *error,
gpointer user_data)
{
MMCallbackInfo *info = (MMCallbackInfo *) user_data;
if (error)
info->error = g_error_copy (error);
mm_callback_info_schedule (info);
}
static void
send_puk (MMModemGsmCard *modem,
const char *puk,
const char *pin,
MMModemFn callback,
gpointer user_data)
{
MMCallbackInfo *info;
char *command;
info = mm_callback_info_new (MM_MODEM (modem), callback, user_data);
command = g_strdup_printf ("+CPIN=\"%s\",\"%s\"", puk, pin);
mm_serial_queue_command (MM_SERIAL (modem), command, 3, send_puk_done, info);
g_free (command);
}
static void
send_pin_done (MMSerial *serial,
GString *response,
@@ -1104,6 +1133,7 @@ modem_gsm_card_init (MMModemGsmCard *class)
class->get_imsi = get_imsi;
class->get_info = get_card_info;
class->send_pin = send_pin;
class->send_puk = send_puk;
class->enable_pin = enable_pin;
class->change_pin = change_pin;
}

32
src/mm-modem-gsm-card.c
View File

@@ -19,6 +19,11 @@ static void impl_gsm_modem_send_pin (MMModemGsmCard *modem,
const char *pin,
DBusGMethodInvocation *context);
static void impl_gsm_modem_send_puk (MMModemGsmCard *modem,
const char *puk,
const char *pin,
DBusGMethodInvocation *context);
static void impl_gsm_modem_enable_pin (MMModemGsmCard *modem,
const char *pin,
gboolean enabled,
@@ -182,6 +187,24 @@ mm_modem_gsm_card_get_info (MMModemGsmCard *self,
info_call_not_supported (self, callback, user_data);
}
void
mm_modem_gsm_card_send_puk (MMModemGsmCard *self,
const char *puk,
const char *pin,
MMModemFn callback,
gpointer user_data)
{
g_return_if_fail (MM_IS_MODEM_GSM_CARD (self));
g_return_if_fail (puk != NULL);
g_return_if_fail (pin != NULL);
g_return_if_fail (callback != NULL);
if (MM_MODEM_GSM_CARD_GET_INTERFACE (self)->send_puk)
MM_MODEM_GSM_CARD_GET_INTERFACE (self)->send_puk (self, puk, pin, callback, user_data);
else
async_call_not_supported (self, callback, user_data);
}
void
mm_modem_gsm_card_send_pin (MMModemGsmCard *self,
const char *pin,
@@ -256,6 +279,15 @@ impl_gsm_modem_get_info (MMModemGsmCard *modem,
mm_modem_gsm_card_get_info (modem, info_call_done, context);
}
static void
impl_gsm_modem_send_puk (MMModemGsmCard *modem,
const char *puk,
const char *pin,
DBusGMethodInvocation *context)
{
mm_modem_gsm_card_send_puk (modem, puk, pin, async_call_done, context);
}
static void
impl_gsm_modem_send_pin (MMModemGsmCard *modem,
const char *pin,

12
src/mm-modem-gsm-card.h
View File

@@ -35,6 +35,12 @@ struct _MMModemGsmCard {
MMModemGsmCardInfoFn callback,
gpointer user_data);
void (*send_puk) (MMModemGsmCard *self,
const char *puk,
const char *pin,
MMModemFn callback,
gpointer user_data);
void (*send_pin) (MMModemGsmCard *self,
const char *pin,
MMModemFn callback,
@@ -67,6 +73,12 @@ void mm_modem_gsm_card_get_info (MMModemGsmCard *self,
MMModemGsmCardInfoFn callback,
gpointer user_data);
void mm_modem_gsm_card_send_puk (MMModemGsmCard *self,
const char *puk,
const char *pin,
MMModemFn callback,
gpointer user_data);
void mm_modem_gsm_card_send_pin (MMModemGsmCard *self,
const char *pin,
MMModemFn callback,