projects / librfid / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
implement SELECT command for ISO15693 (Bjoern Riemer)
[librfid] / src / rfid_layer2_iso15693.c
diff --git a/src/rfid_layer2_iso15693.c b/src/rfid_layer2_iso15693.c
index 6d64c65..d06f776 100644 (file)
--- a/src/rfid_layer2_iso15693.c
+++ b/src/rfid_layer2_iso15693.c
@@ -19,8 +19,6 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define DEBUG_LIBRFID
-
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
@@ -62,6 +60,33 @@ const unsigned int iso15693_timing[2][5] = {
        },
 };
 
+unsigned char
+iso15693_get_response_error_name(u_int8_t error){
+       switch (error){
+               case RFID_15693_ERR_NOTSUPP:
+                       return "ERR_NOTSUPP";
+               case RFID_15693_ERR_INVALID: /* command not recognized */
+                       return "ERR_INVALID";
+               case RFID_15693_ERR_UNKNOWN: /* unknown error */
+                       return "ERR_UNKNOWN";
+               case RFID_15693_ERR_BLOCK_NA: /* block not available */
+                       return "ERR_BLOCK_N";
+               case RFID_15693_ERR_BLOCK_LOCKED:
+                       return "ERR_BLOCK_LOCKE";
+               case RFID_15693_ERR_BLOCK_LOCKED_CH:
+                       return "ERR_BLOCK_LOCKED_CH";
+               case RFID_15693_ERR_BLOCK_NOTPROG:
+                       return "ERR_BLOCK_NOTPROG";
+               case RFID_15693_ERR_BLOCK_NOTLOCK:
+                       return "ERR_BLOCK_NOTLOCK";
+               case 0xA0: /* until 0xDF*/
+                       return "Custom Command error Code";
+               case 0xE0:
+               default:
+                       return "Undef.";
+       }
+}
+
 static int iso15693_transceive(struct rfid_layer2_handle *handle,
                               enum rfid_frametype frametype,
                               const unsigned char *tx_buf, unsigned int tx_len,
@@ -169,7 +194,7 @@ iso15693_anticol(struct rfid_layer2_handle *handle)
 
        struct iso15693_anticol_resp resp;
                
-       char boc;
+       u_int8_t boc;
 #define MAX_SLOTS 16   
        int num_slots = MAX_SLOTS;
 
@@ -223,8 +248,8 @@ iso15693_anticol(struct rfid_layer2_handle *handle)
                                uuid_list_valid[i] = -boc;
                                memcpy(uuid_list[i], resp.uuid, ISO15693_UID_LEN);
                        } else {
-                               DEBUGP("Slot %d ret: %d UUID: %s\n", i, ret,
-                                       rfid_hexdump(resp.uuid, ISO15693_UID_LEN));
+                               DEBUGP("Slot %d ret: %d DSFID: %02x UUID: %s\n", i, ret,
+                                       resp.dsfid, rfid_hexdump(resp.uuid, ISO15693_UID_LEN));
                                uuid_list_valid[i] = MY_UUID;
                                memcpy(&uuid_list[i][0], resp.uuid, ISO15693_UID_LEN);
                        }
@@ -237,6 +262,9 @@ iso15693_anticol(struct rfid_layer2_handle *handle)
                } else if (uuid_list_valid[i] == MY_UUID) {
                        DEBUGP("slot[%d]: VALID uuid: %s\n", i,
                                rfid_hexdump(uuid_list[i], ISO15693_UID_LEN));
+                       memcpy(handle->uid, uuid_list[i], ISO15693_UID_LEN);
+                       /* FIXME: move to init */
+                       handle->uid_len = ISO15693_UID_LEN;
                        num_valid++;
                } else if (uuid_list_valid[i] < 0) {
                        DEBUGP("slot[%d]: collision(%d %d,%d) uuid: %s\n",
@@ -254,7 +282,7 @@ iso15693_anticol(struct rfid_layer2_handle *handle)
 }
 
 static int
-iso15693_select(struct rfid_layer2_handle *handle)
+iso15693_select(struct rfid_layer2_handle *l2h)
 {
        struct iso15693_request_adressed tx_req;
        int ret;
@@ -268,18 +296,68 @@ iso15693_select(struct rfid_layer2_handle *handle)
        rx_len = sizeof(rx_buf);
 
        tx_req.head.command = ISO15693_CMD_SELECT;
-       tx_req.head.flags = RFID_15693_F4_ADDRESS | RFID_15693_F_SUBC_TWO ;
-       tx_req.uid = 0xE0070000020C1F18;
-       //req.uid = 0x181F0C02000007E0;
-       //req.uid = 0xe004010001950837;
-       //req.uid = 0x37089501000104e0;
+       tx_req.head.flags = RFID_15693_F4_ADDRESS;
+       if (l2h->priv.iso15693.vicc_fast)
+               tx_req.head.flags |= RFID_15693_F_RATE_HIGH;
+       if (l2h->priv.iso15693.vicc_two_subc)
+               tx_req.head.flags |= RFID_15693_F_SUBC_TWO;
+       memcpy(&tx_req.uid, l2h->uid, ISO15693_UID_LEN);
        tx_len = sizeof(tx_req);
+
        DEBUGP("tx_len=%u", tx_len); DEBUGPC(" rx_len=%u\n",rx_len);
-       ret = iso15693_transceive(handle, RFID_15693_FRAME, (u_int8_t*)&tx_req,
-                                 tx_len, (u_int8_t*)&rx_buf, &rx_len, 50,0);
-       DEBUGP("ret: %d, error_flag: %d error: %d\n", ret,
-               rx_buf.head.flags&RFID_15693_RF_ERROR, 0);
-       return -1;
+
+       DEBUGP("ret: %d%s, error_flag: %d", ret,(ret==-ETIMEDOUT)?"(TIMEOUT)":"",
+                       rx_buf.head.flags&RFID_15693_RF_ERROR);
+       if (rx_buf.head.flags&RFID_15693_RF_ERROR){
+               DEBUGPC(" -> error: %02x '%s'\n", rx_buf.error,
+                       iso15693_get_response_error_name(rx_buf.error));
+               l2h->priv.iso15693.state = RFID_15693_STATE_SELECTED;
+               return 0;
+       }else{
+               DEBUGPC("\n");
+               return -1;
+       }
+}
+
+static int
+iso15693_stay_quiet(struct rfid_layer2_handle *l2h)
+{
+       struct iso15693_request_adressed tx_req;
+       int ret;
+       unsigned int rx_len, tx_len;
+
+       struct {
+               struct iso15693_response head;
+               u_int8_t error;
+               unsigned char crc[2];
+       } rx_buf;
+       rx_len = sizeof(rx_buf);
+
+       tx_req.head.command = ISO15693_CMD_STAY_QUIET;
+
+       tx_req.head.flags = RFID_15693_F4_ADDRESS;
+       if (l2h->priv.iso15693.vicc_fast)
+               tx_req.head.flags |= RFID_15693_F_RATE_HIGH;
+       if (l2h->priv.iso15693.vicc_two_subc)
+               tx_req.head.flags |= RFID_15693_F_SUBC_TWO;
+       memcpy(&tx_req.uid, l2h->uid, ISO15693_UID_LEN);
+       tx_len = sizeof(tx_req);
+
+       DEBUGP("tx_len=%u", tx_len); DEBUGPC(" rx_len=%u\n",rx_len);
+
+       ret = iso15693_transceive(l2h, RFID_15693_FRAME, (u_int8_t*)&tx_req,
+                                 tx_len, (u_int8_t*)&rx_buf, &rx_len, 10,0);
+
+       l2h->priv.iso15693.state = RFID_15693_STATE_QUIET;
+
+       DEBUGP("ret: %d%s, error_flag: %d", ret,(ret==-ETIMEDOUT)?"(TIMEOUT)":"",
+                       rx_buf.head.flags&RFID_15693_RF_ERROR);
+       if (rx_buf.head.flags&RFID_15693_RF_ERROR)
+               DEBUGPC(" -> error: %02x\n", rx_buf.error);
+       else
+               DEBUGPC("\n");
+
+       return 0;
 }
 
 static int
@@ -423,7 +501,7 @@ iso15693_setopt(struct rfid_layer2_handle *handle, int optname,
                if (val)
                        handle->priv.iso15693.use_afi = 1;
                else
-                       handle->priv.iso15693.use_afi = 1;
+                       handle->priv.iso15693.use_afi = 0;
                break;
        case RFID_OPT_15693_AFI:
                if (val > 0xff)
@@ -485,7 +563,7 @@ const struct rfid_layer2 rfid_layer2_iso15693 = {
                .open           = &iso15693_anticol,
                //.open         = &iso15693_select,
                //.transceive   = &iso15693_transceive,
-               //.close                = &iso14443a_hlta,
+               .close          = &iso15693_stay_quiet,
                .fini           = &iso15693_fini,
                .setopt         = &iso15693_setopt,
                .getopt         = &iso15693_getopt,
Unnamed repository; edit this file 'description' to name the repository.