Changeset 202 for trunk

Timestamp:

10/17/07 17:39:00 (13 months ago)

Author:

zany

Message:

adding transparent OBEX mode check

Files:

• trunk/bfb/bfb_io.c (modified) (3 diffs)

trunk/bfb/bfb_io.c

@@ -119 +119 @@
         }
 #endif
+}
+
+/**
+        Read (repeatedly) from fd until a timeout or an error is encountered.
+ */
+static int bfb_io_read_all(int fd, uint8_t *buffer, int length, int timeout)
+{
+        int actual;
+        int pos = 0;
+        for (;;) {
+                actual = bfb_io_read(fd, &buffer[pos], length - pos, timeout);
+                if (actual < 0) return actual;
+                if (actual == 0) return pos;
+                pos += actual;
+        }
 }
 
@@ -317 +332 @@
 {
         char rspbuf[200];
+        int actual;
 #ifdef _WIN32
         HANDLE ttyfd;
@@ -392 +408 @@
         //      goto bfbmode;
         //}
+
+        /* check if we are in transparent OBEX or AT mode:      */
+        /* send an ABORT (0xFF) with cleverly embedded AT command.      */
+        /* look for valid OBEX frame (OK=0xA0, BADREQ=0xC0, or alike)   */
+        DEBUG(1, "Checking for transparent OBEX mode\n");
+        actual = bfb_io_write(ttyfd, "\xFF\x00\x08\xCBATZ\r", 8);
+        if (actual == 8) {
+                DEBUG(3, "Write ok, reading back\n");
+                actual = bfb_io_read_all(ttyfd, rspbuf, sizeof(rspbuf), 2);
+                if (actual >= 3 && rspbuf[actual-1] == actual) {
+                        DEBUG(3, "Received %02X OBEX frame\n", (uint8_t)rspbuf[0]);
+                        DEBUG(1, "Transparent OBEX\n");
+                        *typeinfo = TT_GENERIC;
+                        return ttyfd;
+                }
+                else if (actual >= 3 && !strncmp(rspbuf, "ATZ", 3)) {
+                        DEBUG(1, "AT mode\n");
+                }
+        }
 
         if(do_at_cmd(ttyfd, "ATZ\r", rspbuf, sizeof(rspbuf)) < 0) {