gcc10 compiler fixes:

[proxmark3-svn] / common / protocols.c

diff --git a/common/protocols.c b/common/protocols.c
index 56a6924f78cafa9aa1c9d31ba9a70f96754afdb9..4b2a19f1a85e7487de384b3f0fb980f31d74dab1 100644 (file)
--- a/common/protocols.c
+++ b/common/protocols.c
@@ -1,121 +1,26 @@
-#include <strings.h>
-#include <string.h>
-#include <stdint.h>
-#include <stdarg.h>

 #include "protocols.h"
 #include "protocols.h"

-#ifndef ON_DEVICE
-#include "ui.h"
-#define prnt PrintAndLog
-#endif
-
-
-
-typedef struct {
-       uint8_t app_limit;
-       uint8_t otp[2];
-       uint8_t block_writelock;
-       uint8_t chip_config;
-       uint8_t mem_config;
-       uint8_t eas;
-       uint8_t fuses;
-}picopass_conf_block;
-
-
-typedef struct {
-       uint8_t csn[8];
-       picopass_conf_block conf;
-       uint8_t epurse[8];
-       uint8_t key_d[8];
-       uint8_t key_c[8];
-       uint8_t app_issuer_area[8];
-
-}picopass_hdr;
-
-
-//#define prnt printf
-/*void prnt(char *fmt,...)
-{
-       va_list argptr;
-       va_start(argptr, fmt);
-       vprintf(fmt, argptr);
-       printf("          "); // cleaning prompt
-       va_end(argptr);
-       printf("\n");
-}
-*/
-uint8_t isset(uint8_t val, uint8_t mask)
-{
-       return (val & mask);
-}
-
-uint8_t notset(uint8_t val, uint8_t mask){
-       return !(val & mask);
-}
-
-void fuse_config(const picopass_hdr *hdr)
-{
-       uint8_t fuses = hdr->conf.fuses;
-
-       if (isset(fuses,FUSE_FPERS))prnt("      Mode: Personalization [Programmable]");
-       else prnt("     Mode: Application [Locked]");
-
-       if (isset(fuses, FUSE_CODING1))
-               prnt("  Coding: RFU");
-       else
-       {
-               if( isset( fuses , FUSE_CODING0)) prnt("        Coding: ISO 14443-2 B/ISO 15693");
-               else prnt("     Coding: ISO 14443B only");
-       }
-       if( isset (fuses,FUSE_CRYPT1 | FUSE_CRYPT0 )) prnt("    Crypt: Secured page, keys not locked");
-       if( isset (fuses,FUSE_CRYPT1) && notset( fuses, FUSE_CRYPT0 )) prnt("   Crypt: Secured page, keys not locked");
-       if( notset (fuses,FUSE_CRYPT1) && isset( fuses, FUSE_CRYPT0 )) prnt("   Crypt: Non secured page");
-       if( notset (fuses,FUSE_CRYPT1) && notset( fuses, FUSE_CRYPT0 )) prnt("  Crypt: No auth possible. Read only if RA is enabled");
+#include <stdint.h>

 
 

-       if( isset( fuses, FUSE_RA)) prnt("      RA: Read access enabled");
-       else prnt("     RA: Read access not enabled");
-}
-void mem_app_config(const picopass_hdr *hdr)
-{
-       uint8_t mem = hdr->conf.mem_config;
-       uint8_t applimit = hdr->conf.app_limit;
-       if (applimit < 6) applimit = 26;
-       uint8_t kb=2;
-       uint8_t maxBlk = 32;
-       if( isset(mem, 0x10) && notset(mem, 0x80)){
-               // 2kb default
-       } else if( isset(mem, 0x80) && notset(mem, 0x10)){
-               kb = 16;
-               maxBlk = 255; //16kb
-       } else {
-               kb = 32;
-               maxBlk = 255;
+// ATA55xx shared presets & routines
+uint32_t GetT55xxClockBit(uint32_t clock) {
+       switch (clock) {
+               case 128:
+                       return T55x7_BITRATE_RF_128;
+               case 100:
+                       return T55x7_BITRATE_RF_100;
+               case 64:
+                       return T55x7_BITRATE_RF_64;
+               case 50:
+                       return T55x7_BITRATE_RF_50;
+               case 40:
+                       return T55x7_BITRATE_RF_40;
+               case 32:
+                       return T55x7_BITRATE_RF_32;
+               case 16:
+                       return T55x7_BITRATE_RF_16;
+               case 8:
+                       return T55x7_BITRATE_RF_8;
+               default:
+                       return 0;

        }
        }

-       prnt("  Mem: %u KBits ( %u * 8 bytes) [%02X]", kb, maxBlk, mem);
-       prnt("  AA1: blocks 06-%02X", applimit);
-       prnt("  AA2: blocks %02X-%02X", (applimit+1), (hdr->conf.mem_config));
-}
-void print_picopass_info(const picopass_hdr *hdr)
-{
-       fuse_config(hdr);
-       mem_app_config(hdr);
-}
-void printIclassDumpInfo(uint8_t* iclass_dump)
-{
-//     picopass_hdr hdr;
-//     memcpy(&hdr, iclass_dump, sizeof(picopass_hdr));
-       print_picopass_info((picopass_hdr *) iclass_dump);
-}
-
-/*
-void test()
-{
-       picopass_hdr hdr = {0x27,0xaf,0x48,0x01,0xf9,0xff,0x12,0xe0,0x12,0xff,0xff,0xff,0x7f,0x1f,0xff,0x3c};
-       prnt("Picopass configuration:");
-       print_picopass_info(&hdr);
-}
-int main(int argc, char *argv[])
-{
-       test();
-       return 0;

 }
 }

-*/