X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/1d0ccbe04b6d04cc4e05aeb9bbcb7b7fa0cfdbd1..9945a928c76e7ebd068ee7f63410517f41645633:/common/protocols.c

diff --git a/common/protocols.c b/common/protocols.c
index ee8abadd..357f66c3 100644
--- a/common/protocols.c
+++ b/common/protocols.c
@@ -1,4 +1,3 @@
-#include <strings.h>
 #include <string.h>
 #include <stdint.h>
 #include <stdarg.h>
@@ -7,24 +6,15 @@
 // 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;
+		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;
 	}
 }
 
@@ -41,7 +31,7 @@ typedef struct {
 	uint8_t mem_config;     //[13]
 	uint8_t eas;            //[14]
 	uint8_t fuses;          //[15]
-}picopass_conf_block;
+} picopass_conf_block;
 
 
 typedef struct {
@@ -51,8 +41,7 @@ typedef struct {
 	uint8_t key_d[8];
 	uint8_t key_c[8];
 	uint8_t app_issuer_area[8];
-
-}picopass_hdr;
+} picopass_hdr;
 
 uint8_t isset(uint8_t val, uint8_t mask) {
 	return (val & mask);
@@ -65,23 +54,28 @@ uint8_t notset(uint8_t val, uint8_t 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_FPERS)) 
+		prnt("	Mode: Personalization [Programmable]");
+	else 
+		prnt("	Mode: Application [Locked]");
 
-	if (isset(fuses, FUSE_CODING1))
+	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");
+	} 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");
 
-	if( isset( fuses, FUSE_RA)) prnt("	RA: Read access enabled");
-	else prnt("	RA: Read access not enabled");
+	if( isset( fuses, FUSE_RA))
+		prnt("	RA: Read access enabled");
+	else 
+		prnt("	RA: Read access not enabled");
 }
 
 void getMemConfig(uint8_t mem_cfg, uint8_t chip_cfg, uint8_t *max_blk, uint8_t *app_areas, uint8_t *kb) {