Changeset 3449

Timestamp:

11/20/07 07:05:28 (6 years ago)

Author:

tick

Message:

[gsmd] New feature for power on/off GSM modem (Sean Chiang)

Location:

trunk/src/target/gsm

Files:

• include/gsmd/machineplugin.h (modified) (1 diff)
• include/gsmd/usock.h (modified) (2 diffs)
• include/libgsmd/misc.h (modified) (1 diff)
• src/gsmd/machine_generic.c (modified) (1 diff)
• src/gsmd/machine_gta01.c (modified) (2 diffs)
• src/gsmd/machine_tihtc.c (modified) (1 diff)
• src/gsmd/usock.c (modified) (2 diffs)
• src/libgsmd/Makefile.am (modified) (1 diff)
• src/util/shell.c (modified) (2 diffs)

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

@@ -12 +12 @@
         struct llist_head list;
         unsigned char *name;
+        int (*power)(struct gsmd *g, int power);
         int (*ex_submit)(struct gsmd *g);
         int (*detect)(struct gsmd *g);

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

@@ -25 +25 @@
         GSMD_MSG_SMS            = 9,
         GSMD_MSG_CB             = 10,
+        GSMD_MSG_MODEM          = 11,
         __NUM_GSMD_MSGS
 };
@@ -56 +57 @@
         GSMD_PHONE_POWERUP      = 1,
         GSMD_PHONE_POWERDOWN    = 2,
+};
+
+enum gsmd_msg_modem {
+        GSMD_MODEM_POWERUP      = 1,
+        GSMD_MODEM_POWERDOWN    = 2,
 };
 

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

@@ -10 +10 @@
 
 extern int lgsm_phone_power(struct lgsm_handle *lh, int power);
+extern int lgsm_modem_power(struct lgsm_handle *lh, int power);
 
 enum lgsm_info_type {

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

@@ -57 +57 @@
 struct gsmd_machine_plugin gsmd_machine_plugin = {
         .name = "generic",
+        .power = NULL,
         .ex_submit = NULL,
         .detect = &generic_detect,

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

@@ -16 +16 @@
 
 #define GSMD_MODEM_WAKEUP_TIMEOUT     3
+#define GSMD_MODEM_POWEROFF_TIMEOUT     3        
+
+static void poweroff_timeout(struct gsmd_timer *tmr, void *data) 
+{
+        exit(0);
+}
+
+static struct gsmd_timer * poweroff_timer(struct gsmd *g)
+{
+        struct timeval tv;
+        tv.tv_sec = GSMD_MODEM_POWEROFF_TIMEOUT;
+        tv.tv_usec = 0;
+        DEBUGP("Create power off timer\n");
+
+        return gsmd_timer_create(&tv,&poweroff_timeout,g);
+}
+
+static int gta01_power(struct gsmd *g, int power)
+{
+        struct gsmd_atcmd * cmd = NULL;
+
+        switch (power) 
+        {
+                case GSMD_MODEM_POWERUP: 
+                        break;
+
+                case GSMD_MODEM_POWERDOWN:      
+
+                        //After send AT@POFF to GSM modem, modem will not work anymore and gsmd get no response
+                        cmd = atcmd_fill("AT@POFF", 7+1, NULL, g, 0, poweroff_timer);
+
+                        if (!cmd)
+                                return -ENOMEM;
+
+                        llist_add_tail(&cmd->list, &g->pending_atcmds);
+                        if (llist_empty(&g->busy_atcmds) && !llist_empty(&g->pending_atcmds)) {
+                                atcmd_wake_pending_queue(g);
+                        }
+                        break;
+
+                default:
+                        return -EINVAL;
+        }
+
+        return 0;
+}
 
 static int null_wakeup_cb(struct gsmd_atcmd *cmd, void *ctx, char *resp) 
@@ -104 +150 @@
 struct gsmd_machine_plugin gsmd_machine_plugin = {
         .name = "TI Calypso / FIC firmware",
+        .power = &gta01_power,
         .ex_submit = &atcmd_wakeup_modem,
         .detect = &gta01_detect,

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

@@ -67 +67 @@
 struct gsmd_machine_plugin gsmd_machine_plugin = {
         .name = "TI Calypso / HTC firmware",
+        .power = NULL,
         .ex_submit = NULL,
         .detect = &tihtc_detect,

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

@@ -287 +287 @@
 
         return atcmd_submit(gu->gsmd, cmd);
+}
+
+static int usock_rcv_modem(struct gsmd_user *gu, struct gsmd_msg_hdr *gph, 
+                           int len)
+{
+        struct gsmd *g = gu->gsmd;
+
+        if (g->machinepl->power) {
+                g->machinepl->power(g, gph->msg_subtype);
+        }
+
+        return 0; 
 }
 
@@ -1169 +1181 @@
         [GSMD_MSG_CB]           = &usock_rcv_cb,
         [GSMD_MSG_PHONEBOOK]    = &usock_rcv_phonebook,
+        [GSMD_MSG_MODEM]        = &usock_rcv_modem,
 };
 

trunk/src/target/gsm/src/libgsmd/Makefile.am

@@ -6 +6 @@
 
 libgsmd_la_LDFLAGS = -Wc,-nostartfiles -version-info $(LIBVERSION)
-libgsmd_la_SOURCES = libgsmd.c libgsmd_input.c libgsmd_voicecall.c libgsmd_passthrough.c libgsmd_event.c libgsmd_phone.c libgsmd_network.c libgsmd_pin.c libgsmd_sms.c libgsmd_phonebook.c
+libgsmd_la_SOURCES = libgsmd.c libgsmd_input.c libgsmd_voicecall.c libgsmd_passthrough.c libgsmd_event.c libgsmd_phone.c libgsmd_network.c libgsmd_pin.c libgsmd_sms.c libgsmd_phonebook.c libgsmd_modem.c
 
 noinst_HEADERS = lgsm_internals.h

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

@@ -357 +357 @@
                 "\tO\tPower On\n"
                 "\to\tPower Off\n"
+                "\tM\tModem Power On\n"
+                "\tm\tModem Power Off\n"
                 "\tr\tRegister to network\n"
                 "\tR\tRegister to given operator (R=number)\n"
@@ -676 +678 @@
                                 lgsm_get_imsi(lgsmh);
                                 pending_responses ++;
+                        } else if (!strncmp(buf, "M", 1)) {
+                                printf("Modem Power On\n");
+                                lgsm_modem_power(lgsmh, 1);
+                        } else if (!strncmp(buf, "m", 1)) {
+                                printf("Modem Power Off\n");
+                                lgsm_modem_power(lgsmh, 0);
                         } else {
                                 printf("Unknown command `%s'\n", buf);