more constants fro the cmds

diff --git a/gemtag/gemtag.h b/gemtag/gemtag.h
index d1bef964c00ec87b15bed51ecf4cfcec14b8d920..fa716f83b462477d5be776e77839953248c808e5 100644 (file)
--- a/gemtag/gemtag.h
+++ b/gemtag/gemtag.h
@@ -58,8 +58,8 @@ struct gemtag_cmd_hdr {
 #define GEMTAG_CMD_HOST_CODE_KEY       0x16
 #define GEMTAG_CMD_PCD_LOAD_KEY_E2     0x17
 #define GEMTAG_CMD_PICC_AUTH_KEY       0x18
-#define GEMTAG_PICC_AUTHENT1A
-#define GEMTAG_PICC_AUTHENT1B
+#define GEMTAG_PICC_AUTHENT1A          0x60
+#define GEMTAG_PICC_AUTHENT1B          0x61
 
 #define GEMTAG_CMD_PICC_READ           0x19
 #define GEMTAG_CMD_PICC_WRITE          0x1a
@@ -73,28 +73,35 @@ struct gemtag_cmd_hdr {
 #define GEMTAG_CMD_PCD_READ_E2         0x23
 #define GEMTAG_CMD_PCD_WRITE_E2                0x24
 #define GEMTAG_CMD_PICC_COMMON_READ    0x28
-#define GEMTAG_PICC_DECREMENT          
-#define GEMTAG_PICC_INCREMENT          
-#define GEMTAG_PICC_READ16
-#define GEMTAG_PICC_RESTORE
-#define GEMTAG_PICC_WRITE16
-#define GEMTAG_PICC_WRITE4
+#define GEMTAG_PICC_DECREMENT          0xc0
+#define GEMTAG_PICC_INCREMENT          0xc1
+#define GEMTAG_PICC_RESTORE            0xc2
+#define GEMTAG_PICC_READ16             0x30
+#define GEMTAG_PICC_WRITE16            0xa0
+#define GEMTAG_PICC_WRITE4             0xa2
 
-#define GEMTAG_CMD_PICC_REQUEST                0x40
-#define GEMTAG_PICC_REQIDL             0x26
 #define GEMTAG_CMD_PCD_SET_TMO         0x27
 
+#define GEMTAG_CMD_PICC_REQUEST                0x40
 #define GEMTAG_CMD_PICC_CASC_ANTICOLL  0x41
 #define GEMTAG_CMD_PICC_CASC_SELECT    0x42
 #define GEMTAG_PICC_STD_SELECT_CODE    0x93
 #define GEMTAG_PICC_CASC_LEVEL1                0x95
 #define GEMTAG_PICC_CASC_LEVEL2                0x97
+/* from another source (mac gemtag tool) ... */
+#define GEMTAG_PICC_CASC_L1            0x93
+#define GEMTAG_PICC_CASC_L2            0x92
+#define GEMTAG_PICC_CASC_L3            0x94
+#define GEMTAG_PICC_CASC_L4            0x98
+#define GEMTAG_PICC_CASC_L5            0x95
+#define GEMTAG_PICC_CASC_L6            0x97
 
 #define GEMTAG_CMD_PICC_ACTIVATE_IDLE  0x43
 #define GEMTAG_CMD_PICC_ACTIVATE_WAKEUP        0x44
 #define GEMTAG_CMD_SET_DFLT_ATTRIBUTES 0x45
 #define GEMTAG_CMD_SET_ATTRIBUTES      0x46
 #define GEMTAG_CMD_PICC_EXCHANGE_BLOCK 0x48
+#define GEMTAG_PICC_REQIDL             0x26
 #define GEMTAG_PICC_REQALL             0x52
 
 #define GEMTAG_CMD_SWITCH_LED          0x60