[Pcsclite-cvs-commit] r4437 - /trunk/PCSC/src/pcsc-wirecheck-gen.c

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Tue Oct  6 09:40:31 2009
New Revision: 4437

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=4437
Log:
update to the new client/server ABI

Modified:
    trunk/PCSC/src/pcsc-wirecheck-gen.c

Modified: trunk/PCSC/src/pcsc-wirecheck-gen.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/pcsc-wirecheck-gen.c?rev=4437&op=diff
==============================================================================
--- trunk/PCSC/src/pcsc-wirecheck-gen.c (original)
+++ trunk/PCSC/src/pcsc-wirecheck-gen.c Tue Oct  6 09:40:31 2009
@@ -81,23 +81,9 @@
     CHECK_DEFINE (PROTOCOL_VERSION_MINOR);
 
     BLANK_LINE ();
-    CHECK_DEFINE (PCSCLITE_MAX_MESSAGE_SIZE);
-
-    BLANK_LINE ();
     CHECK_DEFINE (MAX_READERNAME);
     CHECK_DEFINE (MAX_ATR_SIZE);
     CHECK_DEFINE (MAX_BUFFER_SIZE);
-
-    BLANK_LINE ();
-    COMMENT ("enum pcsc_adm_commands");
-    CHECK_VALUE (CMD_FUNCTION);
-    CHECK_VALUE (CMD_FAILED);
-    CHECK_VALUE (CMD_SERVER_DIED);
-    CHECK_VALUE (CMD_CLIENT_DIED);
-    CHECK_VALUE (CMD_READER_EVENT);
-    CHECK_VALUE (CMD_SYN);
-    CHECK_VALUE (CMD_ACK);
-    CHECK_VALUE (CMD_VERSION);
 
     BLANK_LINE ();
     COMMENT ("enum pcsc_msg_commands");
@@ -117,21 +103,16 @@
     CHECK_VALUE (SCARD_CANCEL_TRANSACTION);
     CHECK_VALUE (SCARD_GET_ATTRIB);
     CHECK_VALUE (SCARD_SET_ATTRIB);
+    CHECK_VALUE (CMD_VERSION);
+    CHECK_VALUE (CMD_GET_READERS_STATE);
+    CHECK_VALUE (CMD_WAIT_READER_STATE_CHANGE);
+    CHECK_VALUE (CMD_STOP_WAITING_READER_STATE_CHANGE);
 }
 
 static void
 check_types (void)
 {
     COMMENT ("Types...");
-
-    BLANK_LINE ();
-    CHECK_STRUCT (rxSharedSegment);
-    CHECK_MEMBER (rxSharedSegment, mtype);
-    CHECK_MEMBER (rxSharedSegment, user_id);
-    CHECK_MEMBER (rxSharedSegment, group_id);
-    CHECK_MEMBER (rxSharedSegment, command);
-    CHECK_MEMBER (rxSharedSegment, date);
-    CHECK_MEMBER (rxSharedSegment, data);
 
     BLANK_LINE ();
     CHECK_STRUCT (version_struct);
@@ -192,7 +173,7 @@
 
     BLANK_LINE ();
     CHECK_STRUCT (cancel_struct);
-    CHECK_MEMBER (cancel_struct, hCard);
+    CHECK_MEMBER (cancel_struct, hContext);
     CHECK_MEMBER (cancel_struct, rv);
 
     BLANK_LINE ();
@@ -211,11 +192,9 @@
     CHECK_MEMBER (transmit_struct, hCard);
     CHECK_MEMBER (transmit_struct, ioSendPciProtocol);
     CHECK_MEMBER (transmit_struct, ioSendPciLength);
-    CHECK_MEMBER (transmit_struct, pbSendBuffer);
     CHECK_MEMBER (transmit_struct, cbSendLength);
     CHECK_MEMBER (transmit_struct, ioRecvPciProtocol);
     CHECK_MEMBER (transmit_struct, ioRecvPciLength);
-    CHECK_MEMBER (transmit_struct, pbRecvBuffer);
     CHECK_MEMBER (transmit_struct, pcbRecvLength);
     CHECK_MEMBER (transmit_struct, rv);
 
@@ -223,9 +202,7 @@
     CHECK_STRUCT (control_struct);
     CHECK_MEMBER (control_struct, hCard);
     CHECK_MEMBER (control_struct, dwControlCode);
-    CHECK_MEMBER (control_struct, pbSendBuffer);
     CHECK_MEMBER (control_struct, cbSendLength);
-    CHECK_MEMBER (control_struct, pbRecvBuffer);
     CHECK_MEMBER (control_struct, cbRecvLength);
     CHECK_MEMBER (control_struct, dwBytesReturned);
     CHECK_MEMBER (control_struct, rv);