X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/65e344df3e787e8bf2fbc13d3859ca1a6e2292c3..refs/pull/461/head:/client/lualibs/read14a.lua?ds=inline

diff --git a/client/lualibs/read14a.lua b/client/lualibs/read14a.lua
index cc3ba2eb..ec227b17 100644
--- a/client/lualibs/read14a.lua
+++ b/client/lualibs/read14a.lua
@@ -20,11 +20,15 @@ local ISO14A_COMMAND = {
 	ISO14A_RAW = 8,
 	ISO14A_REQUEST_TRIGGER = 0x10,
 	ISO14A_APPEND_CRC = 0x20,
-	ISO14A_SET_TIMEOUT = 0x40
+	ISO14A_SET_TIMEOUT = 0x40,
+	ISO14A_NO_SELECT = 0x80,
+	ISO14A_TOPAZMODE = 0x100,
+	ISO14A_NO_RATS = 0x200
 }
 
 local ISO14443a_TYPES = {}		
 ISO14443a_TYPES[0x00] = "NXP MIFARE Ultralight | Ultralight C"
+ISO14443a_TYPES[0x01] = "NXP MIFARE TNP3xxx Activision Game Appliance"
 ISO14443a_TYPES[0x04] = "NXP MIFARE (various !DESFire !DESFire EV1)"
 ISO14443a_TYPES[0x08] = "NXP MIFARE CLASSIC 1k | Plus 2k"
 ISO14443a_TYPES[0x09] = "NXP MIFARE Mini 0.3k"
@@ -89,9 +93,10 @@ end
 
 -- This function does a connect and retrieves som einfo
 -- @param dont_disconnect - if true, does not disable the field
+-- @param no_rats - if true, skips ISO14443-4 select (RATS)
 -- @return if successfull: an table containing card info
 -- @return if unsuccessfull : nil, error
-local function read14443a(dont_disconnect)
+local function read14443a(dont_disconnect, no_rats)
 	local command, result, info, err, data
 
 	command = Command:new{cmd = cmds.CMD_READER_ISO_14443a, 
@@ -99,6 +104,9 @@ local function read14443a(dont_disconnect)
 	if dont_disconnect then
 		command.arg1 = command.arg1 + ISO14A_COMMAND.ISO14A_NO_DISCONNECT
 	end
+	if no_rats then
+		command.arg1 = command.arg1 + ISO14A_COMMAND.ISO14A_NO_RATS
+	end
 	local result,err = sendToDevice(command)
 	if result then
 		local count,cmd,arg0,arg1,arg2 = bin.unpack('LLLL',result)
@@ -134,6 +142,7 @@ end
 local library = {
 	
 	read1443a = read14443a,
+	read 	= read14443a,
 	waitFor14443a = waitFor14443a,
 	parse1443a = parse1443a,
 	sendToDevice = sendToDevice,