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

changing {} style to match majority of previous style

Browse source
This commit is contained in:
Philippe Teuwen 2019-03-10 11:20:22 +01:00
commit 961d929f4d
320 changed files with 5502 additions and 10485 deletions
Download patch file Download diff file Expand all files Collapse all files

57
armsrc/util.c
View file

@ -9,8 +9,7 @@
//-----------------------------------------------------------------------------
#include "util.h"
size_t nbytes(size_t nbits)
{
size_t nbytes(size_t nbits) {
return (nbits >> 3) + ((nbits % 8) > 0);
}
@ -19,8 +18,7 @@ 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) {
if (t & 1)
@ -32,12 +30,10 @@ uint32_t reflect(uint32_t v, int b)
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;
@ -59,16 +55,14 @@ 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);
@ -78,8 +72,7 @@ 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];
@ -87,22 +80,19 @@ void rol(uint8_t *data, const size_t len)
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[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)
{
uint8_t hex2int(char hexchar) {
switch (hexchar) {
case '0':
return 0;
@ -163,8 +153,7 @@ uint8_t hex2int(char hexchar)
}
}
void LEDsoff()
{
void LEDsoff() {
LED_A_OFF();
LED_B_OFF();
LED_C_OFF();
@ -172,8 +161,7 @@ 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)
@ -198,8 +186,7 @@ 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();
@ -208,8 +195,7 @@ 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) {
switch (led) {
@ -230,8 +216,7 @@ void SpinErr(uint8_t led, uint32_t speed, uint8_t times)
}
}
void SpinDown(uint32_t speed)
{
void SpinDown(uint32_t speed) {
SpinOff(speed);
LED_D_ON();
SpinDelay(speed);
@ -247,8 +232,7 @@ 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);
@ -269,8 +253,7 @@ 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;
@ -328,8 +311,7 @@ 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;
@ -369,8 +351,7 @@ 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)
{
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);