lfdemod reduce duplicate code

[proxmark3-svn] / client / cmdlft55xx.c

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index da3ee1a9f04b3f4612d69e30946a341665e9f84c..4d1eaa00d19b635d2827b58357116ac9ff18b315 100644 (file)
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -752,12 +752,10 @@ int CmdT55xxReadTrace(const char *Cmd)
        uint32_t icr     = PackBits(si, 3, DemodBuffer); si += 3;\r
        uint32_t year    = PackBits(si, 4, DemodBuffer); si += 4;\r
        uint32_t quarter = PackBits(si, 2, DemodBuffer); si += 2;\r
        uint32_t icr     = PackBits(si, 3, DemodBuffer); si += 3;\r
        uint32_t year    = PackBits(si, 4, DemodBuffer); si += 4;\r
        uint32_t quarter = PackBits(si, 2, DemodBuffer); si += 2;\r

-       uint32_t lotid    = PackBits(si, 12, DemodBuffer); si += 12;\r
+       uint32_t lotid    = PackBits(si, 14, DemodBuffer); si += 14;\r

        uint32_t wafer   = PackBits(si, 5, DemodBuffer); si += 5;\r
        uint32_t dw      = PackBits(si, 15, DemodBuffer); \r
        \r
        uint32_t wafer   = PackBits(si, 5, DemodBuffer); si += 5;\r
        uint32_t dw      = PackBits(si, 15, DemodBuffer); \r
        \r

-       year += 2000;\r
-       \r

        PrintAndLog("");\r
        PrintAndLog("-- T55xx Trace Information ----------------------------------");\r
        PrintAndLog("-------------------------------------------------------------");\r
        PrintAndLog("");\r
        PrintAndLog("-- T55xx Trace Information ----------------------------------");\r
        PrintAndLog("-------------------------------------------------------------");\r


@@ -766,7 +764,7 @@ int CmdT55xxReadTrace(const char *Cmd)
        PrintAndLog(" CID                                     : 0x%02X (%d) - %s", cid, cid, GetModelStrFromCID(cid));\r
        PrintAndLog(" ICR IC Revision                         : %d",icr );\r
        PrintAndLog(" Manufactured");\r
        PrintAndLog(" CID                                     : 0x%02X (%d) - %s", cid, cid, GetModelStrFromCID(cid));\r
        PrintAndLog(" ICR IC Revision                         : %d",icr );\r
        PrintAndLog(" Manufactured");\r

-       PrintAndLog("     Year/Quarter : %d/%d",year, quarter );\r
+       PrintAndLog("     Year/Quarter : 20?%d/%d",year, quarter);\r

        PrintAndLog("     Lot ID       : %d", lotid );\r
        PrintAndLog("     Wafer number : %d", wafer);\r
        PrintAndLog("     Die Number   : %d", dw);\r
        PrintAndLog("     Lot ID       : %d", lotid );\r
        PrintAndLog("     Wafer number : %d", wafer);\r
        PrintAndLog("     Die Number   : %d", dw);\r