Changeset 2736

Timestamp:

08/17/07 12:02:26 (6 years ago)

Author:

laforge

Message:

Add a flag to allow LFCR as a valid linebreak. (Alex Osborne)

Location:

trunk/src/target/gsm

Files:

• include/gsmd/gsmd.h (modified) (2 diffs)
• src/gsmd/atcmd.c (modified) (2 diffs)
• src/gsmd/vendor_bcm.c (modified) (1 diff)

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

@@ -18 +18 @@
 #define LGSM_ATCMD_F_EXTENDED   0x01    /* as opposed to basic */
 #define LGSM_ATCMD_F_PARAM      0x02    /* as opposed to action */
+#define LGSM_ATCMD_F_LFCR       0x04    /* accept LFCR as a line terminator */
 
 struct gsmd_atcmd {
@@ -38 +39 @@
         LLPARSE_STATE_RESULT,           /* within result payload */
         LLPARSE_STATE_RESULT_CR,        /* CR after result */
+        LLPARSE_STATE_RESULT_LF,        /* LF after result */
         LLPARSE_STATE_PROMPT,           /* within a "> " prompt */
         LLPARSE_STATE_PROMPT_SPC,       /* a complete "> " prompt */

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

@@ -77 +77 @@
 }
 
+static inline void llparse_endline(struct llparser *llp)
+{
+        /* re-set cursor to start of buffer */
+        llp->cur = llp->buf;
+        llp->state = LLPARSE_STATE_IDLE;
+        memset(llp->buf, 0, LLPARSE_BUF_SIZE);
+}
+
 static int llparse_byte(struct llparser *llp, char byte)
 {
@@ -122 +130 @@
                 if (byte == '\r')
                         llp->state = LLPARSE_STATE_RESULT_CR;
+                else if ((llp->flags & LGSM_ATCMD_F_LFCR) && byte == '\n')
+                        llp->state = LLPARSE_STATE_RESULT_LF;
                 else
                         ret = llparse_append(llp, byte);
                 break;
         case LLPARSE_STATE_RESULT_CR:
-                if (byte == '\n') {
-                        /* re-set cursor to start of buffer */
-                        llp->cur = llp->buf;
-                        llp->state = LLPARSE_STATE_IDLE;
-                        memset(llp->buf, 0, LLPARSE_BUF_SIZE);
-                }
+                if (byte == '\n')
+                        llparse_endline(llp);
+                break;
+        case LLPARSE_STATE_RESULT_LF:
+                if (byte == '\r')
+                        llparse_endline(llp);
                 break;
         case LLPARSE_STATE_PROMPT:

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

@@ -99 +99 @@
         struct gsmd_atcmd *cmd;
 
+        /* bcm sometimes sends LFCR instead of CRLF (eg *MTSMENU message) */
+        g->llp.flags |= LGSM_ATCMD_F_LFCR;
+
         /* TODO */
         return rc;