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

Merge branch 'master' of https://github.com/Proxmark/proxmark3

Browse source 
Conflicts:
	armsrc/appmain.c
	armsrc/iclass.c
This commit is contained in:
iceman1001 2015-02-10 21:53:16 +01:00
commit 4ecde0e1ff
17 changed files with 1286 additions and 1285 deletions
Download patch file Download diff file Expand all files Collapse all files

4
armsrc/util.c
View file

@ -12,6 +12,7 @@
#include "util.h"
#include "string.h"
#include "apps.h"
#include "BigBuf.h"
@ -34,7 +35,7 @@ void print_result(char *name, uint8_t *buf, size_t len) {
}
size_t nbytes(size_t nbits) {
return (nbits/8)+((nbits%8)>0);
return (nbits >> 3)+((nbits % 8) > 0);
}
uint32_t SwapBits(uint32_t value, int nrbits) {
@ -428,4 +429,3 @@ uint32_t RAMFUNC GetCountSspClk(){
}
}