github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-07-16 02:03:00 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'Proxmark/master' into iclass

Browse source 
Conflicts:
	CHANGELOG.md
This commit is contained in:
marshmellow42 2015-10-07 09:34:47 -04:00
commit c54dff4f4a
26 changed files with 869 additions and 185 deletions
Download patch file Download diff file Expand all files Collapse all files

1
client/util.h
View file

@ -47,6 +47,7 @@ char * printBits(size_t const size, void const * const ptr);
uint8_t *SwapEndian64(const uint8_t *src, const size_t len, const uint8_t blockSize);
char param_getchar(const char *line, int paramnum);
int param_getptr(const char *line, int *bg, int *en, int paramnum);
uint8_t param_get8(const char *line, int paramnum);
uint8_t param_get8ex(const char *line, int paramnum, int deflt, int base);
uint32_t param_get32ex(const char *line, int paramnum, int deflt, int base);