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

rework some defines

Browse source
This commit is contained in:
iceman1001 2021-05-16 23:03:13 +02:00
commit 16783000f0
4 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
include/common.h
View file

@ -131,6 +131,15 @@ extern bool tearoff_enabled;
#endif
#endif
// convert 2 bytes to U16
#ifndef BYTES2UINT16
# define BYTES2UINT16(x) ((x[1] << 8) | (x[0]))
#endif
// convert 4 bytes to U32
#ifndef BYTES2UINT32
# define BYTES2UINT32(x) ((x[3] << 24) | (x[2] << 16) | (x[1] << 8) | (x[0]))
#endif
#define EVEN 0
#define ODD 1

4
include/em4x50.h
View file

@ -11,6 +11,8 @@
#ifndef EM4X50_H__
#define EM4X50_H__
#include "common.h"
#define EM4X50_NO_WORDS 34
// special words
@ -45,8 +47,6 @@
#define TIMEOUT_CMD 3000
#define DUMP_FILESIZE 136
#define BYTES2UINT32(x) ((x[0] << 24) | (x[1] << 16) | (x[2] << 8) | (x[3]))
typedef struct {
bool addr_given;
bool pwd_given;