X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=rfid_reader_cm5121.c;h=0a72836577a68a48f0651019040cffd16134ade4;hb=b9e8c17d8c4f28938c7cb0a665a1f21232ebdf66;hp=e1fc859caf9bb465707cb044784b47840c8fef59;hpb=5fc01ff6f98d72219420bc29fb59d2d6eb93e887;p=librfid

diff --git a/rfid_reader_cm5121.c b/rfid_reader_cm5121.c
index e1fc859..0a72836 100644
--- a/rfid_reader_cm5121.c
+++ b/rfid_reader_cm5121.c
@@ -180,14 +180,14 @@ static int TestFIFO(struct rc632_handle *handle)
 #endif
 
 static int cm5121_transcieve(struct rfid_reader_handle *rh,
+			     enum rfid_frametype frametype,
 			     const unsigned char *tx_data, unsigned int tx_len,
 			     unsigned char *rx_data, unsigned int *rx_len,
 			     u_int64_t timeout, unsigned int flags)
 {
-	return rh->ah->asic->priv.rc632.fn.transcieve(rh->ah, tx_data,
-							   tx_len, rx_data,
-							   rx_len, timeout,
-							   flags);
+	return rh->ah->asic->priv.rc632.fn.transcieve(rh->ah, frametype,
+						tx_data, tx_len, rx_data,
+						rx_len, timeout, flags);
 }
 
 static int cm5121_transcieve_sf(struct rfid_reader_handle *rh,
@@ -225,6 +225,12 @@ cm5121_15693_init(struct rfid_reader_handle *rh)
 	return rh->ah->asic->priv.rc632.fn.iso15693.init(rh->ah);
 }
 
+static int
+cm5121_mifare_setkey(struct rfid_reader_handle *rh, const u_int8_t *key)
+{
+	return rh->ah->asic->priv.rc632.fn.mifare_classic.setkey(rh->ah, key);
+}
+
 static int
 cm5121_mifare_auth(struct rfid_reader_handle *rh, u_int8_t cmd, 
 		   u_int32_t serno, u_int8_t block)
@@ -321,6 +327,7 @@ struct rfid_reader rfid_reader_cm5121 = {
 		.init = &cm5121_14443b_init,
 	},
 	.mifare_classic = {
+		.setkey = &cm5121_mifare_setkey,
 		.auth = &cm5121_mifare_auth,
 	},
 };