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

Use more defines when using main clock or master clock

Browse source
This commit is contained in:
Philippe Teuwen 2019-08-06 13:40:08 +02:00
commit 8b3159c83d
6 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
armsrc/flashmem.h
View file

@ -102,7 +102,6 @@
#define MAX_BLOCKS 4 #define MAX_BLOCKS 4
#define MAX_SECTORS 16 #define MAX_SECTORS 16
#define MCK 48000000
//#define FLASH_BAUD 24000000 //#define FLASH_BAUD 24000000
#define FLASH_MINFAST 24000000 //33000000 #define FLASH_MINFAST 24000000 //33000000
#define FLASH_BAUD MCK/2 #define FLASH_BAUD MCK/2

4
armsrc/ticks.c
View file

@ -13,7 +13,7 @@
// timer counts in 21.3uS increments (1024/48Mhz), rounding applies // timer counts in 21.3uS increments (1024/48Mhz), rounding applies
// WARNING: timer can't measure more than 1.39s (21.3uS * 0xffff) // WARNING: timer can't measure more than 1.39s (21.3uS * 0xffff)
void SpinDelayUs(int us) { void SpinDelayUs(int us) {
int ticks = (48 * us + 512) >> 10; int ticks = ((MCK / 1000000) * us + 512) >> 10;
// Borrow a PWM unit for my real-time clock // Borrow a PWM unit for my real-time clock
// This resets PWMC_CPRDR as well // This resets PWMC_CPRDR as well
@ -59,7 +59,7 @@ void StartTickCount(void) {
while ((AT91C_BASE_PMC->PMC_MCFR & AT91C_CKGR_MAINRDY) == 0); // Wait for MAINF value to become available... while ((AT91C_BASE_PMC->PMC_MCFR & AT91C_CKGR_MAINRDY) == 0); // Wait for MAINF value to become available...
uint16_t mainf = AT91C_BASE_PMC->PMC_MCFR & AT91C_CKGR_MAINF; // Get # main clocks within 16 slow clocks uint16_t mainf = AT91C_BASE_PMC->PMC_MCFR & AT91C_CKGR_MAINF; // Get # main clocks within 16 slow clocks
// set RealTimeCounter divider to count at 1kHz, should be 32 if RC is exactly at 32kHz: // set RealTimeCounter divider to count at 1kHz, should be 32 if RC is exactly at 32kHz:
AT91C_BASE_RTTC->RTTC_RTMR = AT91C_RTTC_RTTRST | ((((16000000 / 1000 * 16) + (mainf / 2)) / mainf) & AT91C_RTTC_RTPRES); AT91C_BASE_RTTC->RTTC_RTMR = AT91C_RTTC_RTTRST | ((((MAINCK / 1000 * 16) + (mainf / 2)) / mainf) & AT91C_RTTC_RTPRES);
// note: worst case precision is approx 2.5% // note: worst case precision is approx 2.5%
} }

4
armsrc/util.c
View file

@ -182,7 +182,7 @@ int BUTTON_CLICKED(int ms) {
Dbprintf(_RED_("Error, BUTTON_CLICKED called with %i > 1390"), ms); Dbprintf(_RED_("Error, BUTTON_CLICKED called with %i > 1390"), ms);
ms = 1390; ms = 1390;
} }
int ticks = (48000 * (ms ? ms : 1000)) >> 10; int ticks = ((MCK / 1000) * (ms ? ms : 1000)) >> 10;
// If we're not even pressed, forget about it! // If we're not even pressed, forget about it!
if (!BUTTON_PRESS()) if (!BUTTON_PRESS())
@ -210,7 +210,7 @@ int BUTTON_CLICKED(int ms) {
// reset our timer for 500ms // reset our timer for 500ms
start = AT91C_BASE_PWMC_CH0->PWMC_CCNTR; start = AT91C_BASE_PWMC_CH0->PWMC_CCNTR;
ticks = (48000 * (500)) >> 10; ticks = ((MCK / 1000) * (500)) >> 10;
} }
// Still haven't let it off // Still haven't let it off

4
common/usart.c
View file

@ -229,9 +229,9 @@ void usart_init(uint32_t baudrate, uint8_t parity) {
// OVER = 1, -yes we are oversampling // OVER = 1, -yes we are oversampling
// baudrate == selected clock/8/CD --> this is ours // baudrate == selected clock/8/CD --> this is ours
// //
uint32_t brgr = 48000000 / (usart_baudrate << 3); uint32_t brgr = MCK / (usart_baudrate << 3);
// doing fp = round((mck / (usart_baudrate << 3) - brgr) * 8) with integers: // doing fp = round((mck / (usart_baudrate << 3) - brgr) * 8) with integers:
uint32_t fp = ((16 * 48000000 / (usart_baudrate << 3) - 16 * brgr) + 1) / 2; uint32_t fp = ((16 * MCK / (usart_baudrate << 3) - 16 * brgr) + 1) / 2;
pUS1->US_BRGR = (fp << 16) | brgr; pUS1->US_BRGR = (fp << 16) | brgr;

2
common/usb_cdc.c
View file

@ -450,7 +450,7 @@ AT91S_CDC_LINE_CODING line = { // purely informative, actual values don't matter
// WARNING: timer can't measure more than 1.39s (21.3uS * 0xffff) // WARNING: timer can't measure more than 1.39s (21.3uS * 0xffff)
static void SpinDelay(int ms) { static void SpinDelay(int ms) {
int us = ms * 1000; int us = ms * 1000;
int ticks = (48 * us + 512) >> 10; int ticks = ((MCK / 1000000) * us + 512) >> 10;
// Borrow a PWM unit for my real-time clock // Borrow a PWM unit for my real-time clock
AT91C_BASE_PWMC->PWMC_ENA = PWM_CHANNEL(0); AT91C_BASE_PWMC->PWMC_ENA = PWM_CHANNEL(0);

4
include/proxmark3.h
View file

@ -17,6 +17,10 @@
#include "pm3_cmd.h" #include "pm3_cmd.h"
#include "common.h" #include "common.h"
// Check bootrom.c for actual clock settings
#define MAINCK 16000000
#define MCK (4 * MAINCK)
#define WDT_HIT() AT91C_BASE_WDTC->WDTC_WDCR = 0xa5000001 #define WDT_HIT() AT91C_BASE_WDTC->WDTC_WDCR = 0xa5000001
#define PWM_CH_MODE_PRESCALER(x) ((x) << 0) #define PWM_CH_MODE_PRESCALER(x) ((x) << 0)