summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/gsmd/atcmd.c22
-rw-r--r--src/gsmd/vendor_bcm.c3
2 files changed, 19 insertions, 6 deletions
diff --git a/src/gsmd/atcmd.c b/src/gsmd/atcmd.c
index 514625b..37c8538 100644
--- a/src/gsmd/atcmd.c
+++ b/src/gsmd/atcmd.c
@@ -76,6 +76,14 @@ static inline int llparse_append(struct llparser *llp, char byte)
}
}
+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)
{
int ret = 0;
@@ -121,16 +129,18 @@ static int llparse_byte(struct llparser *llp, char byte)
case LLPARSE_STATE_RESULT:
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:
if (byte == ' ')
diff --git a/src/gsmd/vendor_bcm.c b/src/gsmd/vendor_bcm.c
index e8e1584..9bcfa1a 100644
--- a/src/gsmd/vendor_bcm.c
+++ b/src/gsmd/vendor_bcm.c
@@ -98,6 +98,9 @@ static int bcm_initsettings(struct gsmd *g)
int rc;
struct gsmd_atcmd *cmd;
+ /* bcm sometimes sends LFCR instead of CRLF (eg *MTSMENU message) */
+ g->llp.flags |= LGSM_ATCMD_F_LFCR;
+
/* TODO */
return rc;
}
personal git repositories of Harald Welte. Your mileage may vary