Changeset 566 for branches

Timestamp:

08/06/04 07:21:33 (4 years ago)

Author:

nils

Message:

apply recent changes from the cvs head

Location:

branches/openct-0.6/src/ifd

Files:

• ifd-kaan.c (modified) (5 diffs)
• usb-descriptors.c (modified) (1 diff)

branches/openct-0.6/src/ifd/ifd-kaan.c

@@ -304 +304 @@
 {
         kaan_status_t   *st = (kaan_status_t *) reader->driver_data;
-        unsigned char   buffer[16] = { 0x20, 0x13, slot+1, 0x80, 0x00 };
+        unsigned char   buffer[16] = { 0x20, 0x13, 0x00, 0x80, 0x00 };
         unsigned char   *byte;
         int             rc, n;
 
+        buffer[2] = slot+1;
         ifd_debug(1, "slot=%d", slot);
         if (!st->frozen
@@ -443 +444 @@
 kaan_card_reset(ifd_reader_t *reader, int nslot, void *result, size_t size)
 {
-        unsigned char   cmd[5] = { 0x20, 0x10, nslot+1, 0x01, 0x00 };
-
+        unsigned char   cmd[5] = { 0x20, 0x10, 0x00, 0x01, 0x00 };
+
+        cmd[2] = nslot + 1;
         ifd_debug(1, "called.");
         return kaan_do_reset(reader, nslot, cmd, 5, (unsigned char *) result, size, 0);
@@ -458 +460 @@
 {
         ct_buf_t        buf;
-        unsigned char   buffer[256] = { 0x20, 0x17, slot+1, 0x01, 0x00 };
+        unsigned char   buffer[256] = { 0x20, 0x17, 0x00, 0x01, 0x00 };
         int             n;
 
+        buffer[2] = slot + 1;
         /* Build the APDU, which is basically a modified CTBCS OUTPUT command */
         ct_buf_init(&buf, buffer, sizeof(buffer)-1);
@@ -483 +486 @@
 {
         kaan_status_t   *st = (kaan_status_t *) reader->driver_data;
-        unsigned char   cmd[] = { 0x80, 0x60, nslot+1, 0x00, 0x03, 0x22, 0x01, 0x00 };
+        unsigned char   cmd[] = { 0x80, 0x60, 0x00, 0x00, 0x03, 0x22, 0x01, 0x00 };
         unsigned char   buffer[2];
         unsigned short  sw;
@@ -489 +492 @@
         int             rc;
 
+        cmd[2] = nslot + 1;
         ifd_debug(1, "proto=%d", proto);
 

branches/openct-0.6/src/ifd/usb-descriptors.c

@@ -229 +229 @@
 
   memcpy(config, buffer, IFD_USB_DT_CONFIG_SIZE);
+  IFD_USB_LE16_TO_CPU(config->wTotalLength);
   size = config->wTotalLength;