Changeset 201 for trunk

Timestamp:

10/17/07 17:34:53 (2 years ago)

Author:

zany

Message:

at-command rewrite

Location:

trunk

Files:

• bfb/bfb_io.c (modified) (18 diffs)
• multicobex/multi_cobex.c (modified) (1 diff)

trunk/bfb/bfb_io.c

@@ -109 +109 @@
         if(select(fd+1, &fdset, NULL, NULL, &time)) {
                 actual = read(fd, buffer, length);
-                if(actual < 0)
+                if (actual < 0) {
                         DEBUG(2, "%s() Read error: %d\n", __func__, actual);
+                }
                 return actual;
         }
@@ -125 +126 @@
         int actual;
         int tries=3;
-        bfb_frame_t *frame;
+        bfb_frame_t *frame = NULL;
         uint8_t rspbuf[200];
+        int rsplen;
 
         uint8_t init_magic = BFB_CONNECT_HELLO;
@@ -141 +143 @@
 #endif
 
-        while (tries-- > 0) {
+        while (!frame && tries-- > 0) {
                 actual = bfb_write_packets (fd, BFB_FRAME_CONNECT, &init_magic, sizeof(init_magic));
                 DEBUG(2, "%s() Wrote %d packets\n", __func__, actual);
@@ -150 +152 @@
                 }
 
-                actual = bfb_io_read(fd, rspbuf, sizeof(rspbuf), 1);
-                DEBUG(2, "%s() Read %d bytes\n", __func__, actual);
-
-                if (actual < 1) {
-                        DEBUG(1, "BFB read error\n");
-                        return FALSE;
+                rsplen = 0;
+                while (!frame && actual > 0) {
+                        actual = bfb_io_read(fd, &rspbuf[rsplen], sizeof(rspbuf)-rsplen, 2);
+                        DEBUG(2, "%s() Read %d bytes\n", __func__, actual);
+
+                        if (actual < 0) {
+                                DEBUG(1, "BFB read error\n");
+                                return FALSE;
+                        }
+                        if (actual == 0) {
+                                DEBUG(1, "BFB read timeout\n");
+                        }
+
+                        rsplen += actual;
+                        frame = bfb_read_packets(rspbuf, &rsplen);
+                        DEBUG(2, "%s() Unstuffed, %d bytes remaining\n", __func__, rsplen);
                 }
-
-                frame = bfb_read_packets(rspbuf, &actual);
-                DEBUG(2, "%s() Unstuffed, %d bytes remaining\n", __func__, actual);
-
-                if (frame != NULL)
-                        break;
         }
                 
@@ -184 +190 @@
 }
 
-/* Send an AT-command an expect 1 line back as answer */
-/* Ericsson may choose to answer one line, blank one line and then send OK */
+/**
+        Send an AT-command and expect an answer of one or more lines.
+
+        \note Start your command with "AT" and terminate it with "\r" (CR).
+
+        \note The expected lines are the the echo,
+                one optional information response and
+                a final result code of "OK" or "ERROR".
+ */
 int do_at_cmd(fd_t fd, const char *cmd, char *rspbuf, int rspbuflen)
 {
@@ -195 +208 @@
 
         char *answer = NULL;
-        char *answer_end = NULL;
         int answer_size;
 
         char tmpbuf[100] = {0,};
         int total = 0;
-        int done = 0;
         int cmdlen;
 
@@ -211 +222 @@
 
         /* Write command */
-        if(bfb_io_write(fd, cmd, cmdlen) < cmdlen)
+        if (bfb_io_write(fd, cmd, cmdlen) < cmdlen)
                 return -1;
 
-        while(!done)    {
+        actual = 1;
+        while (actual > 0)      {
                 actual = bfb_io_read(fd, &tmpbuf[total], sizeof(tmpbuf) - total, 2);
-                /* error checking */
-                if(actual < 0)
+                if (actual < 0) /* error checking */
                         return actual;
-
-                if(actual == 0)
-                        /* Anser didn't come in time. Cancel */
-                        return -1;
                 
                 total += actual;
+                tmpbuf[total] = '\0'; /* terminate the string, always */
 
                 DEBUG(3, "%s() tmpbuf=%d: %s\n", __func__, total, tmpbuf);
 
                 /* Answer not found within 100 bytes. Cancel */
-                if(total == sizeof(tmpbuf))
+                if (total >= sizeof(tmpbuf))
                         return -1;
 
-                if( (answer = strchr(tmpbuf, '\n')) )   {
-                        while((*answer == '\r') || (*answer == '\n'))
+                /* Remove first line (echo), then search final result code */
+                for (answer = tmpbuf; answer && *answer ; ) {
+                        while ((*answer != '\r') && (*answer != '\n') && (*answer != '\0'))
                                 answer++;
-                        /* Remove first line (echo) */
-                        if( (answer_end = strchr(answer+1, '\n')) )     {
-                                /* Found end of answer */
-                                done = 1;
+                        while ((*answer == '\r') || (*answer == '\n'))
+                                answer++;
+                        if (!strncmp(answer, "OK\r", 3) || !strncmp(answer, "ERROR\r", 6) ||
+                            !strncmp(answer, "OK\n", 3) || !strncmp(answer, "ERROR\n", 6)) {
+                                actual = 0; /* we are done */
                         }
                 }
         }
-        /* try hard to discard remaing lines */
-        actual = bfb_io_read(fd, &tmpbuf[total], sizeof(tmpbuf) - total, 2);
-
-/*      DEBUG(3, "%s() buf:%08lx answer:%08lx end:%08lx\n", __func__, tmpbuf, answer, answer_end); */
-
-        DEBUG(3, "%s() Answer: %s\n", __func__, answer);
-
-        /* Remove heading and trailing \r */
-        while((*answer_end == '\r') || (*answer_end == '\n'))
-                answer_end--;
-        DEBUG(3, "%s() Answer: %s\n", __func__, answer);
-
-        answer_size = (answer_end) - answer +1;
-
-        DEBUG(2, "%s() Answer size=%d\n", __func__, answer_size);
+        /* try hard to discard remaing CR/LF */
+        if (total > 0 && tmpbuf[total-1] != '\n')
+                actual = bfb_io_read(fd, &tmpbuf[total], sizeof(tmpbuf) - total, 2);
+
+        /* Remove echo and trailing CRs */
+        answer = strchr(tmpbuf, '\r');
+        if (!answer) /* no echo found */
+                return -1;
+
+        while (*answer == '\r' || *answer == '\n')
+                answer++;
+        answer_size = 0;
+        while (answer[answer_size] != '\0' &&
+                answer[answer_size] != '\r' && answer[answer_size] != '\n')
+        answer_size++;
+
+        DEBUG(3, "%s() Answer (size=%d): %s\n", __func__, answer_size, answer);
         if( (answer_size) >= rspbuflen )
                 return -1;
@@ -381 +393 @@
         //}
 
-        if(do_at_cmd(ttyfd, "ATZ\r\n", rspbuf, sizeof(rspbuf)) < 0) {
+        if(do_at_cmd(ttyfd, "ATZ\r", rspbuf, sizeof(rspbuf)) < 0) {
                 DEBUG(1, "Comm-error or already in BFB mode\n");
 #ifdef _WIN32
@@ -389 +401 @@
                 (void) tcflush(ttyfd, TCIFLUSH);
                 (void) tcsetattr(ttyfd, TCSANOW, &newtio);
-                if(do_at_cmd(ttyfd, "ATZ\r\n", rspbuf, sizeof(rspbuf)) < 0) {
+                if(do_at_cmd(ttyfd, "ATZ\r", rspbuf, sizeof(rspbuf)) < 0) {
                         DEBUG(1, "Comm-error or already in BFB mode\n");
                         goto bfbmode;
@@ -400 +412 @@
         }
 
-        if(do_at_cmd(ttyfd, "AT+GMI\r\n", rspbuf, sizeof(rspbuf)) < 0)  {
+        if(do_at_cmd(ttyfd, "AT+GMI\r", rspbuf, sizeof(rspbuf)) < 0)    {
                 DEBUG(1, "Comm-error\n");
                 goto err;
@@ -421 +433 @@
         }
 
-        if(do_at_cmd(ttyfd, "AT^SIFS\r\n", rspbuf, sizeof(rspbuf)) < 0) {
+        if(do_at_cmd(ttyfd, "AT^SIFS\r", rspbuf, sizeof(rspbuf)) < 0)   {
                 DEBUG(1, "Comm-error\n");
                 goto err;
@@ -433 +445 @@
 
         /* prefer connection without BFB */
-        if(do_at_cmd(ttyfd, "AT^SBFB=?\r\n", rspbuf, sizeof(rspbuf)) < 0)       {
+        if(do_at_cmd(ttyfd, "AT^SBFB=?\r", rspbuf, sizeof(rspbuf)) < 0) {
                 DEBUG(1, "Comm-error\n");
                 goto err;
@@ -443 +455 @@
         DEBUG(1, "Old BFB Siemens protocol. (%s)\n", rspbuf);
         
-        if(do_at_cmd(ttyfd, "AT^SBFB=1\r\n", rspbuf, sizeof(rspbuf)) < 0)       {
+        if(do_at_cmd(ttyfd, "AT^SBFB=1\r", rspbuf, sizeof(rspbuf)) < 0) {
                 DEBUG(1, "Comm-error\n");
                 goto err;
@@ -473 +485 @@
 
  ericsson:
-        if(do_at_cmd(ttyfd, "AT*EOBEX\r\n", rspbuf, sizeof(rspbuf)) < 0) {
+        if(do_at_cmd(ttyfd, "AT*EOBEX\r", rspbuf, sizeof(rspbuf)) < 0) {
                 DEBUG(1, "Comm-error\n");
                 goto err;
@@ -486 +498 @@
 
  motorola:
-        if(do_at_cmd(ttyfd, "AT+MODE=22\r\n", rspbuf, sizeof(rspbuf)) < 0) {
+        if(do_at_cmd(ttyfd, "AT+MODE=22\r", rspbuf, sizeof(rspbuf)) < 0) {
                 DEBUG(1, "Comm-error\n");
                 goto err;
@@ -504 +516 @@
          * No need to implement BFC(1) mode if we only want to run OBEX.
          */ 
-        if(do_at_cmd(ttyfd, "AT^SQWE?\r\n", rspbuf, sizeof(rspbuf)) < 0) { 
+        if(do_at_cmd(ttyfd, "AT^SQWE?\r", rspbuf, sizeof(rspbuf)) < 0) { 
                 DEBUG(1, "Comm-error\n"); 
                 goto err; 
         } 
         if (strcasecmp("^SQWE:0",rspbuf) != 0) { 
-                if(do_at_cmd(ttyfd, "AT^SQWE=0\r\n", rspbuf, sizeof(rspbuf)) < 0) { 
+                if(do_at_cmd(ttyfd, "AT^SQWE=0\r", rspbuf, sizeof(rspbuf)) < 0) { 
                         DEBUG(1, "Comm-error\n"); 
                         goto err; 
@@ -519 +531 @@
                 sleep(1); 
         } 
-        if(do_at_cmd(ttyfd, "AT^SQWE=3\r\n", rspbuf, sizeof(rspbuf)) < 0) {
+        if(do_at_cmd(ttyfd, "AT^SQWE=3\r", rspbuf, sizeof(rspbuf)) < 0) {
                 DEBUG(1, "Comm-error\n");
                 goto err;
@@ -533 +545 @@
 
  generic:
-        if(do_at_cmd(ttyfd, "AT+CPROT=0\r\n", rspbuf, sizeof(rspbuf)) < 0) {
+        if(do_at_cmd(ttyfd, "AT+CPROT=0\r", rspbuf, sizeof(rspbuf)) < 0) {
                 DEBUG(1, "Comm-error\n");
                 goto err;

trunk/multicobex/multi_cobex.c

@@ -72 +72 @@
                  * with the linux driver (linux-2.6.17.13) 
                  */
-                bfb_write_at(c->fd, "at^sbfb=0\r");
+                bfb_write_at(c->fd, "AT^SBFB=0\r");
                 sleep(1);
                 bfb_io_write(c->fd, "+++", 3);
                 sleep(1);
-                bfb_io_write(c->fd,"\r",1);
+                bfb_io_write(c->fd,"\r", 1);
         }
         bfb_io_close(c->fd, force);