github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-14 18:48:13 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

CHG: moved some #define into include\common.h (which is call by apps.h), so we have one place for them. Also changed them to CAPITAL.

Browse source 
ABS(),  MIN(), MAX()
This commit is contained in:
iceman1001 2016-03-13 07:16:42 +01:00
commit f2c2b174cd
5 changed files with 41 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

11
armsrc/pcf7931.c
View file

@ -7,9 +7,6 @@
#define T0_PCF 8 //period for the pcf7931 in us
#define ALLOC 16
#define abs(x) ( ((x)<0) ? -(x) : (x) )
#define max(x,y) ( x<y ? y:x)
int DemodPCF7931(uint8_t **outBlocks) {
uint8_t bits[256] = {0x00};
@ -71,7 +68,7 @@ int DemodPCF7931(uint8_t **outBlocks) {
// Switch depending on lc length:
// Tolerance is 1/8 of clock rate (arbitrary)
if (abs(lc-clock/4) < tolerance) {
if (ABS(lc-clock/4) < tolerance) {
// 16T0
if((i - pmc) == lc) { /* 16T0 was previous one */
/* It's a PMC ! */
@ -83,7 +80,7 @@ int DemodPCF7931(uint8_t **outBlocks) {
else {
pmc = i;
}
} else if (abs(lc-clock/2) < tolerance) {
} else if (ABS(lc-clock/2) < tolerance) {
// 32TO
if((i - pmc) == lc) { /* 16T0 was previous one */
/* It's a PMC ! */
@ -98,7 +95,7 @@ int DemodPCF7931(uint8_t **outBlocks) {
}
else
half_switch++;
} else if (abs(lc-clock) < tolerance) {
} else if (ABS(lc-clock) < tolerance) {
// 64TO
bits[bitidx++] = 1;
} else {
@ -205,7 +202,7 @@ void ReadPCF7931() {
Blocks[0][ALLOC] = 1;
memcpy(Blocks[1], tmpBlocks[i+1], 16);
Blocks[1][ALLOC] = 1;
max_blocks = max((Blocks[1][14] & 0x7f), Blocks[1][15]) + 1;
max_blocks = MAX((Blocks[1][14] & 0x7f), Blocks[1][15]) + 1;
// Debug print
Dbprintf("(dbg) Max blocks: %d", max_blocks);
num_blocks = 2;