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

gsm: strip command response bits from mfg/model/revision responses

Browse Source
This commit is contained in:
Dan Williams
2009-10-06 12:38:21 -07:00
parent 5079b32a09
commit 01100c1008
1 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,6 +18,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <ctype.h>
#include "mm-generic-gsm.h" #include "mm-generic-gsm.h"
#include "mm-modem-gsm-card.h" #include "mm-modem-gsm-card.h"
#include "mm-modem-gsm-network.h" #include "mm-modem-gsm-network.h"
@@ -511,6 +512,21 @@ card_info_invoke (MMCallbackInfo *info)
info->error, info->user_data); info->error, info->user_data);
} }
#define GMI_RESP_TAG "+CGMI:"
#define GMM_RESP_TAG "+CGMM:"
#define GMR_RESP_TAG "+CGMR:"
static const char *
strip_tag (const char *str, const char *tag)
{
/* Strip the response header, if any */
if (strncmp (str, tag, strlen (tag)) == 0)
str += strlen (tag);
while (*str && isspace (*str))
str++;
return str;
}
static void static void
get_version_done (MMSerialPort *port, get_version_done (MMSerialPort *port,
GString *response, GString *response,
@@ -518,9 +534,10 @@ get_version_done (MMSerialPort *port,
gpointer user_data) gpointer user_data)
{ {
MMCallbackInfo *info = (MMCallbackInfo *) user_data; MMCallbackInfo *info = (MMCallbackInfo *) user_data;
const char *resp = strip_tag (response->str, GMR_RESP_TAG);
if (!error) if (!error)
mm_callback_info_set_data (info, "card-info-version", g_strdup (response->str), g_free); mm_callback_info_set_data (info, "card-info-version", g_strdup (resp), g_free);
else if (!info->error) else if (!info->error)
info->error = g_error_copy (error); info->error = g_error_copy (error);
@@ -534,9 +551,10 @@ get_model_done (MMSerialPort *port,
gpointer user_data) gpointer user_data)
{ {
MMCallbackInfo *info = (MMCallbackInfo *) user_data; MMCallbackInfo *info = (MMCallbackInfo *) user_data;
const char *resp = strip_tag (response->str, GMM_RESP_TAG);
if (!error) if (!error)
mm_callback_info_set_data (info, "card-info-model", g_strdup (response->str), g_free); mm_callback_info_set_data (info, "card-info-model", g_strdup (resp), g_free);
else if (!info->error) else if (!info->error)
info->error = g_error_copy (error); info->error = g_error_copy (error);
} }
@@ -548,9 +566,10 @@ get_manufacturer_done (MMSerialPort *port,
gpointer user_data) gpointer user_data)
{ {
MMCallbackInfo *info = (MMCallbackInfo *) user_data; MMCallbackInfo *info = (MMCallbackInfo *) user_data;
const char *resp = strip_tag (response->str, GMI_RESP_TAG);
if (!error) if (!error)
mm_callback_info_set_data (info, "card-info-manufacturer", g_strdup (response->str), g_free); mm_callback_info_set_data (info, "card-info-manufacturer", g_strdup (resp), g_free);
else else
info->error = g_error_copy (error); info->error = g_error_copy (error);
} }