From: izsh.f0f Date: Fri, 5 Feb 2010 17:16:14 +0000 (+0000) Subject: Alphabetical order ;) And cosmetic changes (remove duplicated includes) X-Git-Tag: v1.0.0~381 X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/41dab153055c6bdbbea436b01e7fcf87354c435a Alphabetical order ;) And cosmetic changes (remove duplicated includes) --- diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c index cc4e0ff2..5ff60a3a 100644 --- a/client/cmdhflegic.c +++ b/client/cmdhflegic.c @@ -1,32 +1,19 @@ #include #include #include "proxusb.h" +#include "data.h" +#include "ui.h" #include "cmdparser.h" #include "cmdhflegic.h" #include "cmdmain.h" -#include "data.h" -#include "ui.h" -#include -#include static int CmdHelp(const char *Cmd); -int CmdLegicRFRead(const char *Cmd) -{ - int byte_count=0,offset=0; - sscanf(Cmd, "%i %i", &offset, &byte_count); - if(byte_count == 0) byte_count = 256; - if(byte_count + offset > 256) byte_count = 256 - offset; - UsbCommand c={CMD_READER_LEGIC_RF, {offset, byte_count, 0}}; - SendCommand(&c); - return 0; -} - static command_t CommandTable[] = { {"help", CmdHelp, 1, "This help"}, - {"reader", CmdLegicRFRead, 0, "[offset [length]] -- read bytes from a LEGIC card"}, {"decode", CmdLegicDecode, 0, "Display deobfuscated and decoded LEGIC RF tag data (use after hf legic reader)"}, + {"reader", CmdLegicRFRead, 0, "[offset [length]] -- read bytes from a LEGIC card"}, {NULL, NULL, 0, NULL} }; @@ -147,7 +134,7 @@ int CmdLegicDecode(const char *Cmd) PrintAndLog("\nADF: User Area"); - i = 22; + i = 22; for (n=0; n<64; n++) { segment_len = ((data_buf[i+1]^crc)&0x0f) * 256 + (data_buf[i]^crc); segment_flag = ((data_buf[i+1]^crc)&0xf0)>>4; @@ -218,3 +205,14 @@ int CmdLegicDecode(const char *Cmd) }; return 0; } + +int CmdLegicRFRead(const char *Cmd) +{ + int byte_count=0,offset=0; + sscanf(Cmd, "%i %i", &offset, &byte_count); + if(byte_count == 0) byte_count = 256; + if(byte_count + offset > 256) byte_count = 256 - offset; + UsbCommand c={CMD_READER_LEGIC_RF, {offset, byte_count, 0}}; + SendCommand(&c); + return 0; +}