[Pcsclite-cvs-commit] r4420 - /website/short_apdu_readers.py

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Sun Oct  4 08:12:55 2009
New Revision: 4420

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=4420
Log:
use symbolic constants

Modified:
    website/short_apdu_readers.py

Modified: website/short_apdu_readers.py
URL: http://svn.debian.org/wsvn/pcsclite/website/short_apdu_readers.py?rev=4420&op=diff
==============================================================================
--- website/short_apdu_readers.py (original)
+++ website/short_apdu_readers.py Sun Oct  4 08:12:55 2009
@@ -20,14 +20,27 @@
 from matrix import *
 import sys
 
+CCID_CLASS_AUTO_CONF_ATR	= 0x00000002
+CCID_CLASS_AUTO_VOLTAGE		= 0x00000008
+CCID_CLASS_AUTO_BAUD		= 0x00000020
+CCID_CLASS_AUTO_PPS_PROP	= 0x00000040
+CCID_CLASS_AUTO_PPS_CUR		= 0x00000080
+CCID_CLASS_AUTO_IFSD		= 0x00000400
+CCID_CLASS_CHARACTER		= 0x00000000
+CCID_CLASS_TPDU				= 0x00010000
+CCID_CLASS_SHORT_APDU		= 0x00020000
+CCID_CLASS_EXTENDED_APDU	= 0x00040000
+CCID_CLASS_EXCHANGE_MASK	= 0x00070000
+
 def get_extended_apdu_readers(readers):
     l = []
     for r in readers.keys():
+        dwFeatures = int(readers[r]['dwFeatures'],16)
         # TPDU level exchanges with CCID
-        if (int(readers[r]['dwFeatures'],16) & 0x70000) == 0x10000:
+        if (dwFeatures & CCID_CLASS_EXCHANGE_MASK) == ICCID_CLASS_TPDU:
             l.append(r)
         # Short and Extended APDU level exchange with CCID
-        if (int(readers[r]['dwFeatures'],16) & 0x70000) == 0x40000:
+        if (dwFeatures & CCID_CLASS_EXCHANGE_MASK) == CCID_CLASS_EXTENDED_APDU:
             l.append(r)
 
     return l
@@ -35,8 +48,9 @@
 def get_short_apdu_readers(readers):
     l = []
     for r in readers.keys():
+        dwFeatures = int(readers[r]['dwFeatures'],16)
         # Short APDU level exchange with CCID
-        if (int(readers[r]['dwFeatures'],16) & 0x70000) == 0x20000:
+        if (dwFeatures & CCID_CLASS_EXCHANGE_MASK) == CCID_CLASS_SHORT_APDU:
             l.append(r)
 
     return l