Send commitlog mailing list submissions to
        [email protected]

To subscribe or unsubscribe via the World Wide Web, visit
        http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
        [EMAIL PROTECTED]

You can reach the person managing the list at
        [EMAIL PROTECTED]

When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:

   1. r3522 - in
      trunk/src/target/OM-2007.2/applications/openmoko-dialer2: .
      src/phone-kit ([EMAIL PROTECTED])
   2. r3523 - developers/werner/neocon ([EMAIL PROTECTED])
   3. r3524 - in
      trunk/src/target/OM-2007.2/applications/openmoko-dialer2: .
      src/phone-kit ([EMAIL PROTECTED])
--- Begin Message ---
Author: thomas
Date: 2007-11-27 19:05:22 +0100 (Tue, 27 Nov 2007)
New Revision: 3522

Modified:
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
   
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-dialer.c
Log:
* src/phone-kit/moko-dialer.c: (pb_msghandler):

Fix for change in gsmd api: GSMD_PHONEBOOK_GET_IMSI -> GSMD_PHONE_GET_IMSI


Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog  
2007-11-27 16:38:28 UTC (rev 3521)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog  
2007-11-27 18:05:22 UTC (rev 3522)
@@ -1,3 +1,9 @@
+2007-11-27  Thomas Wood  <[EMAIL PROTECTED]>
+
+       * src/phone-kit/moko-dialer.c: (pb_msghandler):
+
+       Fix for change in gsmd api: GSMD_PHONEBOOK_GET_IMSI -> 
GSMD_PHONE_GET_IMSI
+
 2007-11-26  Chris Lord  <[EMAIL PROTECTED]>
 
        * src/phone-kit/moko-dialer-mcc-dc.h:

Modified: 
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-dialer.c
===================================================================
--- 
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-dialer.c
        2007-11-27 16:38:28 UTC (rev 3521)
+++ 
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-dialer.c
        2007-11-27 18:05:22 UTC (rev 3522)
@@ -94,6 +94,7 @@
   /* Registration variables */
   enum lgsm_netreg_state registered;
   MokoGSMLocation    gsm_location;
+  gboolean           pin_requested;
 };
 
 enum
@@ -1029,7 +1030,7 @@
   MokoDialerPrivate *priv = dialer->priv;
 
   switch (gmh->msg_subtype) {
-    case GSMD_PHONEBOOK_GET_IMSI :
+    case GSMD_PHONE_GET_IMSI :
       priv->imsi = g_strdup ((char *)gmh + sizeof (*gmh));
       
       /* Get phone number */




--- End Message ---
--- Begin Message ---
Author: werner
Date: 2007-11-28 03:01:01 +0100 (Wed, 28 Nov 2007)
New Revision: 3523

Modified:
   developers/werner/neocon/README
   developers/werner/neocon/neocon.c
Log:
neocon.c (main): added "b:" (for the bps option) to "getopt"
neocon.c (copy, usage, main), README: added option "-t delay_ms" to throttle
  the input rate to one character every "delay_ms" milliseconds



Modified: developers/werner/neocon/README
===================================================================
--- developers/werner/neocon/README     2007-11-27 18:05:22 UTC (rev 3522)
+++ developers/werner/neocon/README     2007-11-28 02:01:01 UTC (rev 3523)
@@ -7,3 +7,7 @@
 This is mainly intended for serial over USB interfaces that
 disappear when the Neo or debug board is restarted. E.g.,
 neocon /dev/ttyUSB0 /dev/ttyUSB1
+
+The option  -t delay_ms  throttles keyboard input to a rate of
+one character every "delay_ms" milliseconds. This can be used to
+prevent buffer overruns on the remote end.

Modified: developers/werner/neocon/neocon.c
===================================================================
--- developers/werner/neocon/neocon.c   2007-11-27 18:05:22 UTC (rev 3522)
+++ developers/werner/neocon/neocon.c   2007-11-28 02:01:01 UTC (rev 3523)
@@ -114,12 +114,12 @@
 }
 
 
-static int copy(int in, int out, int scan_escape)
+static int copy(int in, int out, int scan_escape, int single)
 {
     char buffer[2048];
     ssize_t got, wrote, pos;
  
-    got = read(in, buffer, sizeof(buffer));
+    got = read(in, buffer, single ? 1 : sizeof(buffer));
     if (got < 0)
        return 0;
     if (scan_escape)
@@ -160,7 +160,7 @@
 
 static void usage(const char *name)
 {
-    fprintf(stderr, "usage: %s [-b bps] tty ...\n", name);
+    fprintf(stderr, "usage: %s [-b bps] [-t delay_ms] tty ...\n", name);
     exit(1);
 }
 
@@ -170,14 +170,21 @@
     char *end;
     int c;
     int fd = -1;
+    int throttle_us = 0;
+    int throttle = 0;
 
-    while ((c = getopt(argc, argv, "")) != EOF)
+    while ((c = getopt(argc, argv, "b:t:")) != EOF)
        switch (c) {
            case 'b':
                bps = strtoul(optarg, &end, 0);
-               if (!*end)
+               if (*end)
                    usage(*argv);
                break;
+           case 't':
+               throttle_us = strtoul(optarg, &end, 0)*1000;
+               if (*end)
+                   usage(*argv);
+               break;
            default:
                usage(*argv);
        }
@@ -197,21 +204,27 @@
                write_string("\r\n[Open]\r\n");
        }
        FD_ZERO(&set);
-       FD_SET(0, &set);
+       if (!throttle)
+           FD_SET(0, &set);
        if (fd >= 0)
            FD_SET(fd, &set);
        tv.tv_sec = 0;
-       tv.tv_usec = 100000;
+       tv.tv_usec = throttle ? throttle_us : 100000;
        res = select(fd < 0 ? 1 : fd+1, &set, NULL, NULL, &tv);
        if (res < 0) {
            perror("select");
            return 1;
        }
-       if (FD_ISSET(0, &set))
-           if (!copy(0, fd, 1))
+       if (!res)
+           throttle = 0;
+       if (FD_ISSET(0, &set)) {
+           if (throttle_us)
+               throttle = 1;
+           if (!copy(0, fd, 1, throttle_us != 0))
                goto failed;
+       }
        if (fd >= 0 && FD_ISSET(fd, &set))
-           if (!copy(fd, 1, 0))
+           if (!copy(fd, 1, 0, 0))
                goto failed;
        continue;
 




--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-11-28 10:19:55 +0100 (Wed, 28 Nov 2007)
New Revision: 3524

Modified:
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
   
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-dialer.c
Log:
* src/phone-kit/moko-dialer.c: (dialer_init_gsmd): Connect gsmd handlers
before setting phone power


Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog  
2007-11-28 02:01:01 UTC (rev 3523)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog  
2007-11-28 09:19:55 UTC (rev 3524)
@@ -1,3 +1,8 @@
+2007-11-28  Thomas Wood  <[EMAIL PROTECTED]>
+
+       * src/phone-kit/moko-dialer.c: (dialer_init_gsmd): Connect gsmd handlers
+       before setting phone power
+
 2007-11-27  Thomas Wood  <[EMAIL PROTECTED]>
 
        * src/phone-kit/moko-dialer.c: (pb_msghandler):

Modified: 
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-dialer.c
===================================================================
--- 
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-dialer.c
        2007-11-28 02:01:01 UTC (rev 3523)
+++ 
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-dialer.c
        2007-11-28 09:19:55 UTC (rev 3524)
@@ -1109,15 +1109,7 @@
     g_warning ("Error connecting to gsmd");
     return;
   }
-  
-  /* Power the gsm modem up */
-  if (lgsm_phone_power (priv->handle, 1) == -1) {
-    g_warning ("Error powering up gsm modem");
-    lgsm_exit (priv->handle);
-    priv->handle = NULL;
-    return;
-  }
-  
+
   /* Add event handlers */
   lgsm_evt_handler_register (priv->handle, GSMD_EVT_IN_CALL, 
gsmd_eventhandler);
   lgsm_evt_handler_register (priv->handle, GSMD_EVT_IN_CLIP, 
gsmd_eventhandler);
@@ -1128,6 +1120,14 @@
   lgsm_register_handler (priv->handle, GSMD_MSG_NETWORK, &net_msghandler);
   lgsm_register_handler (priv->handle, GSMD_MSG_PHONEBOOK, &pb_msghandler);
 
+  /* Power the gsm modem up */
+  if (lgsm_phone_power (priv->handle, 1) == -1) {
+    g_warning ("Error powering up gsm modem");
+    lgsm_exit (priv->handle);
+    priv->handle = NULL;
+    return;
+  }
+
   /* Register with network */
   priv->registered = GSMD_NETREG_UNREG;
   lgsm_netreg_register (priv->handle, "");




--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog

Reply via email to