mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2025-08-14 02:27:26 -07:00
make style
This commit is contained in:
Philippe Teuwen
parent
0d9223a547
commit
0373696662
483 changed files with 56514 additions and 52451 deletions
198
armsrc/util.c
198
armsrc/util.c
|
|
@ -9,8 +9,9 @@
|
|||
//-----------------------------------------------------------------------------
|
||||
#include "util.h"
|
||||
|
||||
size_t nbytes(size_t nbits) {
|
||||
return (nbits >> 3)+((nbits % 8) > 0);
|
||||
size_t nbytes(size_t nbits)
|
||||
{
|
||||
return (nbits >> 3) + ((nbits % 8) > 0);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -18,22 +19,25 @@ size_t nbytes(size_t nbits) {
|
|||
Returns the value v with the bottom b [0,32] bits reflected.
|
||||
Example: reflect(0x3e23L,3) == 0x3e26
|
||||
*/
|
||||
uint32_t reflect(uint32_t v, int b) {
|
||||
uint32_t reflect(uint32_t v, int b)
|
||||
{
|
||||
uint32_t t = v;
|
||||
for ( int i = 0; i < b; ++i) {
|
||||
for (int i = 0; i < b; ++i) {
|
||||
if (t & 1)
|
||||
v |= BITMASK((b-1)-i);
|
||||
v |= BITMASK((b - 1) - i);
|
||||
else
|
||||
v &= ~BITMASK((b-1)-i);
|
||||
t>>=1;
|
||||
v &= ~BITMASK((b - 1) - i);
|
||||
t >>= 1;
|
||||
}
|
||||
return v;
|
||||
}
|
||||
|
||||
uint8_t reflect8(uint8_t b) {
|
||||
uint8_t reflect8(uint8_t b)
|
||||
{
|
||||
return ((b * 0x80200802ULL) & 0x0884422110ULL) * 0x0101010101ULL >> 32;
|
||||
}
|
||||
uint16_t reflect16(uint16_t b) {
|
||||
uint16_t reflect16(uint16_t b)
|
||||
{
|
||||
uint16_t v = 0;
|
||||
v |= (b & 0x8000) >> 15;
|
||||
v |= (b & 0x4000) >> 13;
|
||||
|
|
@ -55,14 +59,16 @@ uint16_t reflect16(uint16_t b) {
|
|||
return v;
|
||||
}
|
||||
|
||||
void num_to_bytes(uint64_t n, size_t len, uint8_t* dest) {
|
||||
void num_to_bytes(uint64_t n, size_t len, uint8_t *dest)
|
||||
{
|
||||
while (len--) {
|
||||
dest[len] = (uint8_t) n;
|
||||
n >>= 8;
|
||||
}
|
||||
}
|
||||
|
||||
uint64_t bytes_to_num(uint8_t* src, size_t len) {
|
||||
uint64_t bytes_to_num(uint8_t *src, size_t len)
|
||||
{
|
||||
uint64_t num = 0;
|
||||
while (len--) {
|
||||
num = (num << 8) | (*src);
|
||||
|
|
@ -72,56 +78,93 @@ uint64_t bytes_to_num(uint8_t* src, size_t len) {
|
|||
}
|
||||
|
||||
// RotateLeft - Ultralight, Desfire
|
||||
void rol(uint8_t *data, const size_t len) {
|
||||
void rol(uint8_t *data, const size_t len)
|
||||
{
|
||||
uint8_t first = data[0];
|
||||
for (size_t i = 0; i < len-1; i++) {
|
||||
data[i] = data[i+1];
|
||||
for (size_t i = 0; i < len - 1; i++) {
|
||||
data[i] = data[i + 1];
|
||||
}
|
||||
data[len-1] = first;
|
||||
data[len - 1] = first;
|
||||
}
|
||||
|
||||
void lsl (uint8_t *data, size_t len) {
|
||||
void lsl(uint8_t *data, size_t len)
|
||||
{
|
||||
for (size_t n = 0; n < len - 1; n++) {
|
||||
data[n] = (data[n] << 1) | (data[n+1] >> 7);
|
||||
data[n] = (data[n] << 1) | (data[n + 1] >> 7);
|
||||
}
|
||||
data[len - 1] <<= 1;
|
||||
}
|
||||
|
||||
int32_t le24toh (uint8_t data[3]) {
|
||||
int32_t le24toh(uint8_t data[3])
|
||||
{
|
||||
return (data[2] << 16) | (data[1] << 8) | data[0];
|
||||
}
|
||||
|
||||
//convert hex digit to integer
|
||||
uint8_t hex2int(char hexchar){
|
||||
switch(hexchar){
|
||||
case '0': return 0; break;
|
||||
case '1': return 1; break;
|
||||
case '2': return 2; break;
|
||||
case '3': return 3; break;
|
||||
case '4': return 4; break;
|
||||
case '5': return 5; break;
|
||||
case '6': return 6; break;
|
||||
case '7': return 7; break;
|
||||
case '8': return 8; break;
|
||||
case '9': return 9; break;
|
||||
uint8_t hex2int(char hexchar)
|
||||
{
|
||||
switch (hexchar) {
|
||||
case '0':
|
||||
return 0;
|
||||
break;
|
||||
case '1':
|
||||
return 1;
|
||||
break;
|
||||
case '2':
|
||||
return 2;
|
||||
break;
|
||||
case '3':
|
||||
return 3;
|
||||
break;
|
||||
case '4':
|
||||
return 4;
|
||||
break;
|
||||
case '5':
|
||||
return 5;
|
||||
break;
|
||||
case '6':
|
||||
return 6;
|
||||
break;
|
||||
case '7':
|
||||
return 7;
|
||||
break;
|
||||
case '8':
|
||||
return 8;
|
||||
break;
|
||||
case '9':
|
||||
return 9;
|
||||
break;
|
||||
case 'a':
|
||||
case 'A': return 10; break;
|
||||
case 'A':
|
||||
return 10;
|
||||
break;
|
||||
case 'b':
|
||||
case 'B': return 11; break;
|
||||
case 'B':
|
||||
return 11;
|
||||
break;
|
||||
case 'c':
|
||||
case 'C': return 12; break;
|
||||
case 'C':
|
||||
return 12;
|
||||
break;
|
||||
case 'd':
|
||||
case 'D': return 13; break;
|
||||
case 'D':
|
||||
return 13;
|
||||
break;
|
||||
case 'e':
|
||||
case 'E': return 14; break;
|
||||
case 'E':
|
||||
return 14;
|
||||
break;
|
||||
case 'f':
|
||||
case 'F': return 15; break;
|
||||
case 'F':
|
||||
return 15;
|
||||
break;
|
||||
default:
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
void LEDsoff() {
|
||||
void LEDsoff()
|
||||
{
|
||||
LED_A_OFF();
|
||||
LED_B_OFF();
|
||||
LED_C_OFF();
|
||||
|
|
@ -129,7 +172,8 @@ void LEDsoff() {
|
|||
}
|
||||
|
||||
// LEDs: R(C) O(A) G(B) -- R(D) [1, 2, 4 and 8]
|
||||
void LED(int led, int ms) {
|
||||
void LED(int led, int ms)
|
||||
{
|
||||
if (led & LED_RED)
|
||||
LED_C_ON();
|
||||
if (led & LED_ORANGE)
|
||||
|
|
@ -154,7 +198,8 @@ void LED(int led, int ms) {
|
|||
LED_D_OFF();
|
||||
}
|
||||
|
||||
void SpinOff(uint32_t pause) {
|
||||
void SpinOff(uint32_t pause)
|
||||
{
|
||||
LED_A_OFF();
|
||||
LED_B_OFF();
|
||||
LED_C_OFF();
|
||||
|
|
@ -163,29 +208,30 @@ void SpinOff(uint32_t pause) {
|
|||
}
|
||||
|
||||
// 0=A, 1=B, 2=C, 3=D
|
||||
void SpinErr(uint8_t led, uint32_t speed, uint8_t times) {
|
||||
void SpinErr(uint8_t led, uint32_t speed, uint8_t times)
|
||||
{
|
||||
SpinOff(speed);
|
||||
NTIME(times)
|
||||
{
|
||||
NTIME(times) {
|
||||
switch (led) {
|
||||
case 0:
|
||||
LED_A_INV();
|
||||
break;
|
||||
case 1:
|
||||
LED_B_INV();
|
||||
break;
|
||||
case 2:
|
||||
LED_C_INV();
|
||||
break;
|
||||
case 3:
|
||||
LED_D_INV();
|
||||
break;
|
||||
case 0:
|
||||
LED_A_INV();
|
||||
break;
|
||||
case 1:
|
||||
LED_B_INV();
|
||||
break;
|
||||
case 2:
|
||||
LED_C_INV();
|
||||
break;
|
||||
case 3:
|
||||
LED_D_INV();
|
||||
break;
|
||||
}
|
||||
SpinDelay(speed);
|
||||
}
|
||||
}
|
||||
|
||||
void SpinDown(uint32_t speed) {
|
||||
void SpinDown(uint32_t speed)
|
||||
{
|
||||
SpinOff(speed);
|
||||
LED_D_ON();
|
||||
SpinDelay(speed);
|
||||
|
|
@ -201,7 +247,8 @@ void SpinDown(uint32_t speed) {
|
|||
LED_A_OFF();
|
||||
}
|
||||
|
||||
void SpinUp(uint32_t speed) {
|
||||
void SpinUp(uint32_t speed)
|
||||
{
|
||||
SpinOff(speed);
|
||||
LED_A_ON();
|
||||
SpinDelay(speed);
|
||||
|
|
@ -222,7 +269,8 @@ void SpinUp(uint32_t speed) {
|
|||
// not clicked, or held down (for ms || 1sec)
|
||||
// In general, don't use this function unless you expect a
|
||||
// double click, otherwise it will waste 500ms -- use BUTTON_HELD instead
|
||||
int BUTTON_CLICKED(int ms) {
|
||||
int BUTTON_CLICKED(int ms)
|
||||
{
|
||||
// Up to 500ms in between clicks to mean a double click
|
||||
int ticks = (48000 * (ms ? ms : 1000)) >> 10;
|
||||
|
||||
|
|
@ -240,16 +288,13 @@ int BUTTON_CLICKED(int ms) {
|
|||
uint16_t start = AT91C_BASE_PWMC_CH0->PWMC_CCNTR;
|
||||
|
||||
int letoff = 0;
|
||||
for(;;)
|
||||
{
|
||||
for (;;) {
|
||||
uint16_t now = AT91C_BASE_PWMC_CH0->PWMC_CCNTR;
|
||||
|
||||
// We haven't let off the button yet
|
||||
if (!letoff)
|
||||
{
|
||||
if (!letoff) {
|
||||
// We just let it off!
|
||||
if (!BUTTON_PRESS())
|
||||
{
|
||||
if (!BUTTON_PRESS()) {
|
||||
letoff = 1;
|
||||
|
||||
// reset our timer for 500ms
|
||||
|
|
@ -270,11 +315,10 @@ int BUTTON_CLICKED(int ms) {
|
|||
if (BUTTON_PRESS())
|
||||
return BUTTON_DOUBLE_CLICK;
|
||||
|
||||
// Have we ran out of time to double click?
|
||||
else
|
||||
if (now == (uint16_t)(start + ticks))
|
||||
// At least we did a single click
|
||||
return BUTTON_SINGLE_CLICK;
|
||||
// Have we ran out of time to double click?
|
||||
else if (now == (uint16_t)(start + ticks))
|
||||
// At least we did a single click
|
||||
return BUTTON_SINGLE_CLICK;
|
||||
|
||||
WDT_HIT();
|
||||
}
|
||||
|
|
@ -284,7 +328,8 @@ int BUTTON_CLICKED(int ms) {
|
|||
}
|
||||
|
||||
// Determine if a button is held down
|
||||
int BUTTON_HELD(int ms) {
|
||||
int BUTTON_HELD(int ms)
|
||||
{
|
||||
// If button is held for one second
|
||||
int ticks = (48000 * (ms ? ms : 1000)) >> 10;
|
||||
|
||||
|
|
@ -301,8 +346,7 @@ int BUTTON_HELD(int ms) {
|
|||
|
||||
uint16_t start = AT91C_BASE_PWMC_CH0->PWMC_CCNTR;
|
||||
|
||||
for(;;)
|
||||
{
|
||||
for (;;) {
|
||||
uint16_t now = AT91C_BASE_PWMC_CH0->PWMC_CCNTR;
|
||||
|
||||
// As soon as our button let go, we didn't hold long enough
|
||||
|
|
@ -310,9 +354,8 @@ int BUTTON_HELD(int ms) {
|
|||
return BUTTON_SINGLE_CLICK;
|
||||
|
||||
// Have we waited the full second?
|
||||
else
|
||||
if (now == (uint16_t)(start + ticks))
|
||||
return BUTTON_HOLD;
|
||||
else if (now == (uint16_t)(start + ticks))
|
||||
return BUTTON_HOLD;
|
||||
|
||||
WDT_HIT();
|
||||
}
|
||||
|
|
@ -326,10 +369,11 @@ int BUTTON_HELD(int ms) {
|
|||
* verifies the magic properties, then stores a formatted string, prefixed by
|
||||
* prefix in dst.
|
||||
*/
|
||||
void FormatVersionInformation(char *dst, int len, const char *prefix, void *version_information) {
|
||||
struct version_information *v = (struct version_information*)version_information;
|
||||
void FormatVersionInformation(char *dst, int len, const char *prefix, void *version_information)
|
||||
{
|
||||
struct version_information *v = (struct version_information *)version_information;
|
||||
dst[0] = 0;
|
||||
strncat(dst, prefix, len-1);
|
||||
strncat(dst, prefix, len - 1);
|
||||
if (v->magic != VERSION_INFORMATION_MAGIC) {
|
||||
strncat(dst, "Missing/Invalid version information\n", len - strlen(dst) - 1);
|
||||
return;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue