Changeset 969 for trunk/src/ifd

Timestamp:

06/21/07 09:41:53 (5 years ago)

Author:

aj

Message:

Chaskiel M Grundman:
add ccid char support.

File:

• trunk/src/ifd/ifd-ccid.c (modified) (6 diffs)

trunk/src/ifd/ifd-ccid.c

@@ -450 +450 @@
         unsigned char recvbuf[CCID_MAX_MSG_LEN + 1];
         int r;
+        unsigned char ctlbuf[3], *ctlptr=0;
+
+        ctlptr=NULL;
+        if (st->reader_type == TYPE_CHAR) {
+                ctlbuf[0] = 0;
+                ctlbuf[1] = rlen & 0xff;
+                ctlbuf[2] = (rlen >> 8) & 0xff;
+                ctlptr = ctlbuf;
+        }
 
         r = ccid_prepare_cmd(reader, sendbuf, st->maxmsg,
-                             slot, CCID_CMD_XFRBLOCK, NULL, sbuf, slen);
+                             slot, CCID_CMD_XFRBLOCK, ctlptr, sbuf, slen);
         if (r < 0)
                 return r;
@@ -695 +704 @@
         st->ifsd = ccid.dwMaxIFSD;
 
-        if (st->reader_type == TYPE_CHAR) {
-                ct_error("ccid: Character mode readers not supported");
-                free(st);
-                ifd_device_close(dev);
-                return -1;
-        }
-
         /* must provide AUTO or at least one of 5/3.3/1.8 */
         if (st->voltage_support == 0) {
@@ -1119 +1121 @@
                 }
                 r = ccid_exchange(reader, s, pts, ptslen, ptsret,
-                                  sizeof(ptsret));
+                                  ptslen);
                 if (r < 0)
                         return r;
@@ -1131 +1133 @@
         memset(&parambuf[r], 0, sizeof(parambuf) - r);
         if (proto == IFD_PROTOCOL_T0) {
-                p = ifd_protocol_new(IFD_PROTOCOL_TRANSPARENT,
-                                     reader, slot->dad);
+                if (st->reader_type == TYPE_CHAR) {
+                        p = ifd_protocol_new(proto,
+                                             reader, slot->dad);
+                } else {
+                        p = ifd_protocol_new(IFD_PROTOCOL_TRANSPARENT,
+                                             reader, slot->dad);
+                }
         } else {
                 p = ifd_protocol_new(proto, reader, slot->dad);
@@ -1156 +1163 @@
                 return -1;
         }
+        /* ccid_recv needs to know the exact expected data length */
+        if (st->reader_type == TYPE_CHAR)
+                ifd_protocol_set_parameter(p, IFD_PROTOCOL_BLOCK_ORIENTED, 0);
         if (slot->proto) {
                 ifd_protocol_free(slot->proto);
@@ -1238 +1248 @@
         st->sbuf[dad] = NULL;
         st->slen[dad] = 0;
+        if (r < 0)
+                ifd_debug(3, "failed: %d", r);
         return r;
 }