projects
/
proxmark3-svn
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CHG: syntax suger
[proxmark3-svn]
/
armsrc
/
util.c
diff --git
a/armsrc/util.c
b/armsrc/util.c
index c3d4d2c621d3d3252dd06415de5f6084204af37e..640809e068bd4719826fe2fc134a602d70f184be 100644
(file)
--- a/
armsrc/util.c
+++ b/
armsrc/util.c
@@
-8,7
+8,7
@@
// Utility functions used in many places, not specific to any piece of code.
//-----------------------------------------------------------------------------
// Utility functions used in many places, not specific to any piece of code.
//-----------------------------------------------------------------------------
-#include "
../include/
proxmark3.h"
+#include "proxmark3.h"
#include "util.h"
#include "string.h"
#include "apps.h"
#include "util.h"
#include "string.h"
#include "apps.h"
@@
-17,21
+17,25
@@
void print_result(char *name, uint8_t *buf, size_t len) {
void print_result(char *name, uint8_t *buf, size_t len) {
- uint8_t *p = buf;
+
uint8_t *p = buf;
- if ( len % 16 == 0 ) {
- for(; p-buf < len; p += 16)
- Dbprintf("[%s:%d/%d] %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x",
+
if ( len % 16 == 0 ) {
+
for(; p-buf < len; p += 16)
+
Dbprintf("[%s:%d/%d] %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x",
name,
p-buf,
len,
p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7],p[8], p[9], p[10], p[11], p[12], p[13], p[14], p[15]
name,
p-buf,
len,
p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7],p[8], p[9], p[10], p[11], p[12], p[13], p[14], p[15]
- );
- }
- else {
- for(; p-buf < len; p += 8)
- Dbprintf("[%s:%d/%d] %02x %02x %02x %02x %02x %02x %02x %02x", name, p-buf, len, p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7]);
- }
+ );
+ }
+ else {
+ for(; p-buf < len; p += 8)
+ Dbprintf("[%s:%d/%d] %02x %02x %02x %02x %02x %02x %02x %02x",
+ name,
+ p-buf,
+ len,
+ p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7]);
+ }
}
size_t nbytes(size_t nbits) {
}
size_t nbytes(size_t nbits) {
@@
-39,27
+43,23
@@
size_t nbytes(size_t nbits) {
}
uint32_t SwapBits(uint32_t value, int nrbits) {
}
uint32_t SwapBits(uint32_t value, int nrbits) {
- int i;
uint32_t newvalue = 0;
uint32_t newvalue = 0;
- for(i = 0; i < nrbits; i++) {
+ for(i
nt i
= 0; i < nrbits; i++) {
newvalue ^= ((value >> i) & 1) << (nrbits - 1 - i);
}
return newvalue;
}
newvalue ^= ((value >> i) & 1) << (nrbits - 1 - i);
}
return newvalue;
}
-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;
}
}
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;
uint64_t num = 0;
- while (len--)
- {
+ while (len--) {
num = (num << 8) | (*src);
src++;
}
num = (num << 8) | (*src);
src++;
}
@@
-67,13
+67,14
@@
uint64_t bytes_to_num(uint8_t* src, size_t len)
}
// RotateLeft - Ultralight, Desfire
}
// 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];
}
data[len-1] = first;
}
uint8_t first = data[0];
for (size_t i = 0; i < len-1; i++) {
data[i] = data[i+1];
}
data[len-1] = first;
}
+
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);
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);
@@
-268,15
+269,15
@@
void FormatVersionInformation(char *dst, int len, const char *prefix, void *vers
dst[0] = 0;
strncat(dst, prefix, len-1);
if(v->magic != VERSION_INFORMATION_MAGIC) {
dst[0] = 0;
strncat(dst, prefix, len-1);
if(v->magic != VERSION_INFORMATION_MAGIC) {
- strncat(dst, "Missing/Invalid version information", len - strlen(dst) - 1);
+ strncat(dst, "Missing/Invalid version information
\n
", len - strlen(dst) - 1);
return;
}
if(v->versionversion != 1) {
return;
}
if(v->versionversion != 1) {
- strncat(dst, "Version information not understood", len - strlen(dst) - 1);
+ strncat(dst, "Version information not understood
\n
", len - strlen(dst) - 1);
return;
}
if(!v->present) {
return;
}
if(!v->present) {
- strncat(dst, "Version information not available", len - strlen(dst) - 1);
+ strncat(dst, "Version information not available
\n
", len - strlen(dst) - 1);
return;
}
return;
}
@@
-289,6
+290,7
@@
void FormatVersionInformation(char *dst, int len, const char *prefix, void *vers
strncat(dst, " ", len - strlen(dst) - 1);
strncat(dst, v->buildtime, len - strlen(dst) - 1);
strncat(dst, " ", len - strlen(dst) - 1);
strncat(dst, v->buildtime, len - strlen(dst) - 1);
+ strncat(dst, "\n", len - strlen(dst) - 1);
}
// -------------------------------------------------------------------------
}
// -------------------------------------------------------------------------
@@
-303,11
+305,12
@@
void FormatVersionInformation(char *dst, int len, const char *prefix, void *vers
void StartTickCount()
{
void StartTickCount()
{
-// must be 0x40, but on my cpu - included divider is optimal
-// 0x20 - 1 ms / bit
-// 0x40 - 2 ms / bit
-
- AT91C_BASE_RTTC->RTTC_RTMR = AT91C_RTTC_RTTRST + 0x001D; // was 0x003B
+ // This timer is based on the slow clock. The slow clock frequency is between 22kHz and 40kHz.
+ // We can determine the actual slow clock frequency by looking at the Main Clock Frequency Register.
+ uint16_t mainf = AT91C_BASE_PMC->PMC_MCFR & 0xffff; // = 16 * main clock frequency (16MHz) / slow clock frequency
+ // set RealTimeCounter divider to count at 1kHz:
+ AT91C_BASE_RTTC->RTTC_RTMR = AT91C_RTTC_RTTRST | ((256000 + (mainf/2)) / mainf);
+ // note: worst case precision is approx 2.5%
}
/*
}
/*
@@
-329,8
+332,8
@@
void StartCountUS()
// fast clock
AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS; // timer disable
AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV3_CLOCK | // MCK(48MHz)/32 -- tick=1.5mks
// fast clock
AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS; // timer disable
AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV3_CLOCK | // MCK(48MHz)/32 -- tick=1.5mks
-
AT91C_TC_WAVE | AT91C_TC_WAVESEL_UP_AUTO | AT91C_TC_ACPA_CLEAR |
-
AT91C_TC_ACPC_SET | AT91C_TC_ASWTRG_SET;
+ AT91C_TC_WAVE | AT91C_TC_WAVESEL_UP_AUTO | AT91C_TC_ACPA_CLEAR |
+ AT91C_TC_ACPC_SET | AT91C_TC_ASWTRG_SET;
AT91C_BASE_TC0->TC_RA = 1;
AT91C_BASE_TC0->TC_RC = 0xBFFF + 1; // 0xC000
AT91C_BASE_TC0->TC_RA = 1;
AT91C_BASE_TC0->TC_RC = 0xBFFF + 1; // 0xC000
@@
-343,17
+346,20
@@
void StartCountUS()
}
uint32_t RAMFUNC GetCountUS(){
}
uint32_t RAMFUNC GetCountUS(){
- return (AT91C_BASE_TC1->TC_CV * 0x8000) + ((AT91C_BASE_TC0->TC_CV / 15) * 10);
+ //return (AT91C_BASE_TC1->TC_CV * 0x8000) + ((AT91C_BASE_TC0->TC_CV / 15) * 10);
+ // By suggestion from PwPiwi, http://www.proxmark.org/forum/viewtopic.php?pid=17548#p17548
+ //return (AT91C_BASE_TC1->TC_CV * 0x8000) + ((AT91C_BASE_TC0->TC_CV * 2) / 3);
+ return (AT91C_BASE_TC1->TC_CV * 0x8000) + ((AT91C_BASE_TC0->TC_CV << 1) / 3);
}
}
-static uint32_t GlobalUsCounter = 0;
+
//
static uint32_t GlobalUsCounter = 0;
-uint32_t RAMFUNC GetDeltaCountUS(){
- uint32_t g_cnt = GetCountUS();
- uint32_t g_res = g_cnt - GlobalUsCounter;
- GlobalUsCounter = g_cnt;
- return g_res;
-}
+
//
uint32_t RAMFUNC GetDeltaCountUS(){
+
//
uint32_t g_cnt = GetCountUS();
+
//
uint32_t g_res = g_cnt - GlobalUsCounter;
+
//
GlobalUsCounter = g_cnt;
+
//
return g_res;
+
//
}
// -------------------------------------------------------------------------
// -------------------------------------------------------------------------
@@
-417,15
+423,10
@@
void StartCountSspClk()
while (AT91C_BASE_TC0->TC_CV < 0xFFF0);
}
while (AT91C_BASE_TC0->TC_CV < 0xFFF0);
}
-
uint32_t RAMFUNC GetCountSspClk(){
uint32_t RAMFUNC GetCountSspClk(){
- uint32_t tmp_count;
- tmp_count = (AT91C_BASE_TC2->TC_CV << 16) | AT91C_BASE_TC0->TC_CV;
- if ((tmp_count & 0x0000ffff) == 0) { //small chance that we may have missed an increment in TC2
+ uint32_t tmp_count = (AT91C_BASE_TC2->TC_CV << 16) | AT91C_BASE_TC0->TC_CV;
+ if ((tmp_count & 0x0000ffff) == 0) //small chance that we may have missed an increment in TC2
return (AT91C_BASE_TC2->TC_CV << 16);
return (AT91C_BASE_TC2->TC_CV << 16);
- }
- else {
- return tmp_count;
- }
+ return tmp_count;
}
}
Impressum
,
Datenschutz