Changeset 3519

Timestamp:

11/27/07 09:24:57 (5 years ago)

Author:

tick

Message:

gsmd: Refactorying get_imsi from PHONEBOOK to PHONE (tick)

Location:

trunk/src/target/gsm

Files:

• include/gsmd/usock.h (modified) (2 diffs)
• include/libgsmd/misc.h (modified) (1 diff)
• include/libgsmd/phonebook.h (modified) (1 diff)
• src/gsmd/usock.c (modified) (4 diffs)
• src/libgsmd/libgsmd_phone.c (modified) (1 diff)
• src/libgsmd/libgsmd_phonebook.c (modified) (1 diff)
• src/util/shell.c (modified) (3 diffs)

trunk/src/target/gsm/include/gsmd/usock.h

@@ -57 +57 @@
         GSMD_PHONE_POWERUP      = 1,
         GSMD_PHONE_POWERDOWN    = 2,
+        GSMD_PHONE_GET_IMSI     = 3,
 };
 
@@ -256 +257 @@
         GSMD_PHONEBOOK_RETRIEVE_READRG  = 9,
         GSMD_PHONEBOOK_RETRIEVE_FIND    = 10,
-        GSMD_PHONEBOOK_GET_IMSI         = 11,
 };
 

trunk/src/target/gsm/include/libgsmd/misc.h

@@ -78 +78 @@
 /* TBD */
 
+/* Retrieve IMSI information */
+extern int lgsm_get_imsi(struct lgsm_handle *lh);
 
 #endif

trunk/src/target/gsm/include/libgsmd/phonebook.h

@@ -100 +100 @@
 extern int lgsm_pb_retrieve_find(struct lgsm_handle *lh, int num);
 
-/* Retrieve IMSI information */
-extern int lgsm_get_imsi(struct lgsm_handle *lh); // TODO this needs to go into a SIM specific file
-
 #endif

trunk/src/target/gsm/src/gsmd/usock.c

@@ -264 +264 @@
 }
 
+static int get_imsi_cb(struct gsmd_atcmd *cmd, void *ctx, char *resp)
+{
+        struct gsmd_user *gu = ctx;
+        struct gsmd_ucmd *ucmd;
+
+        DEBUGP("resp: %s\n", resp);
+
+        ucmd = gsmd_ucmd_fill(strlen(resp)+1, GSMD_MSG_PHONE,
+                                  GSMD_PHONE_GET_IMSI, 0);
+        if (!ucmd)
+                return -ENOMEM;
+
+        strcpy(ucmd->buf, resp);
+
+        usock_cmd_enqueue(ucmd, gu);
+
+        return 0;
+}
+
 static int usock_rcv_phone(struct gsmd_user *gu, struct gsmd_msg_hdr *gph, 
                            int len)
@@ -280 +299 @@
                 gu->gsmd->dev_state.on = 0;
                 break;
+        case GSMD_PHONE_GET_IMSI:
+                cmd = atcmd_fill("AT+CIMI", 7 + 1, &get_imsi_cb, gu, 0, NULL);
+                break;
+
         default:
                 return -EINVAL;
         }
+
         if (!cmd)
                 return -ENOMEM;
@@ -962 +986 @@
 }
 
-static int get_imsi_cb(struct gsmd_atcmd *cmd, void *ctx, char *resp)
-{
-        struct gsmd_user *gu = ctx;
-        struct gsmd_ucmd *ucmd;
-
-        DEBUGP("resp: %s\n", resp);
-
-        ucmd = gsmd_ucmd_fill(strlen(resp)+1, GSMD_MSG_PHONEBOOK,
-                                  GSMD_PHONEBOOK_GET_IMSI, 0);
-        if (!ucmd)
-                return -ENOMEM;
-
-        strcpy(ucmd->buf, resp);
-
-        usock_cmd_enqueue(ucmd, gu);
-
-        return 0;
-}
-
 
 static int usock_rcv_phonebook(struct gsmd_user *gu,
@@ -1157 +1162 @@
                 break;
         
-        case GSMD_PHONEBOOK_GET_IMSI:
-                cmd = atcmd_fill("AT+CIMI", 7 + 1, &get_imsi_cb, gu, 0, NULL);
-                break;
 
         default:

trunk/src/target/gsm/src/libgsmd/libgsmd_phone.c

@@ -45 +45 @@
         return lgsm_send_simple(lh, GSMD_MSG_PHONE, type);
 }
+
+int lgsm_get_imsi(struct lgsm_handle *lh)
+{
+        return lgsm_send_simple(lh, GSMD_MSG_PHONE, GSMD_PHONE_GET_IMSI);
+}
+

trunk/src/target/gsm/src/libgsmd/libgsmd_phonebook.c

@@ -247 +247 @@
 }
 
-int lgsm_get_imsi(struct lgsm_handle *lh)
-{
-        return lgsm_send_simple(lh, GSMD_MSG_PHONEBOOK, GSMD_PHONEBOOK_GET_IMSI);
-}
-
+

trunk/src/target/gsm/src/util/shell.c

@@ -131 +131 @@
 
                 nFIND = 0;
-                break;
-        case GSMD_PHONEBOOK_GET_IMSI:
-                payload = (char *)gmh + sizeof(*gmh);
-                printf("imsi <%s>\n", payload);
-                pending_responses --;
                 break;
         default:
@@ -348 +343 @@
                 return -EINVAL;
         }
+}
+
+static int phone_msghandler(struct lgsm_handle *lh, struct gsmd_msg_hdr *gmh) {
+        char *payload;
+        switch (gmh->msg_subtype) {
+        case GSMD_PHONE_GET_IMSI:
+                payload = (char *)gmh + sizeof(*gmh);
+                printf("imsi <%s>\n", payload);
+                pending_responses --;
+                break;
+        default:
+                return -EINVAL;
+        }
+        return 0;
 }
 
@@ -406 +415 @@
         lgsm_register_handler(lgsmh, GSMD_MSG_SMS, &sms_msghandler);
         lgsm_register_handler(lgsmh, GSMD_MSG_NETWORK, &net_msghandler);
+        lgsm_register_handler(lgsmh, GSMD_MSG_PHONE, &phone_msghandler);
 
         fcntl(0, F_SETFD, O_NONBLOCK);