RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-04-04 19:39:57 +08:00
Code Issues Projects Releases Packages Wiki Activity

perform startup delay also during TIA

Browse source
This commit is contained in:
Philippe Teuwen 2019-10-15 18:07:24 +02:00
parent 0877802ded
commit bf3ae7f007
4 changed files with 8 additions and 12 deletions
armsrc
appmain.c
bootrom
bootrom.c
common_arm
clocks.cclocks.h

2
armsrc/appmain.c
View file

@ -307,7 +307,7 @@ void SendVersion(void) {
void TimingIntervalAcquisition(void) { void TimingIntervalAcquisition(void) {
// trigger new acquisition by turning main oscillator off and on // trigger new acquisition by turning main oscillator off and on
mck_from_pll_to_slck(); mck_from_pll_to_slck();
mck_from_slck_to_pll(false); mck_from_slck_to_pll();
// wait for MCFR and recompute RTMR scaler // wait for MCFR and recompute RTMR scaler
StartTickCount(); StartTickCount();
} }

2
bootrom/bootrom.c
View file

@ -69,7 +69,7 @@ static void ConfigClocks(void) {
(1 << AT91C_ID_PWMC) | (1 << AT91C_ID_PWMC) |
(1 << AT91C_ID_UDP); (1 << AT91C_ID_UDP);
mck_from_slck_to_pll(true); mck_from_slck_to_pll();
} }
static void Fatal(void) { static void Fatal(void) {

14
common_arm/clocks.c
View file

@ -15,7 +15,7 @@ void mck_from_pll_to_slck(void) {
AT91C_BASE_PMC->PMC_MOR = 0; AT91C_BASE_PMC->PMC_MOR = 0;
} }
void mck_from_slck_to_pll(bool cold) { void mck_from_slck_to_pll(void) {
// worst case scenario, with MAINCK = 16MHz xtal, startup delay is 1.4ms // worst case scenario, with MAINCK = 16MHz xtal, startup delay is 1.4ms
// if SLCK slow clock runs at its worst case (max) frequency of 42kHz // if SLCK slow clock runs at its worst case (max) frequency of 42kHz
// max startup delay = (1.4ms*42k)/8 = 7.356 so round up to 8 // max startup delay = (1.4ms*42k)/8 = 7.356 so round up to 8
@ -23,14 +23,10 @@ void mck_from_slck_to_pll(bool cold) {
// we observed on 10% of the devices very wrong initial slow clock RC TIA measures. // we observed on 10% of the devices very wrong initial slow clock RC TIA measures.
// Bumping delay to 16 helps fixing the issue even on the most screwed RC. // Bumping delay to 16 helps fixing the issue even on the most screwed RC.
// enable main oscillator and set startup delay if cold boot // enable main oscillator and set startup delay
if (cold) { AT91C_BASE_PMC->PMC_MOR =
AT91C_BASE_PMC->PMC_MOR = AT91C_CKGR_MOSCEN |
AT91C_CKGR_MOSCEN | PMC_MAIN_OSC_STARTUP_DELAY(16);
PMC_MAIN_OSC_STARTUP_DELAY(16);
} else {
AT91C_BASE_PMC->PMC_MOR = AT91C_CKGR_MOSCEN;
}
// wait for main oscillator to stabilize // wait for main oscillator to stabilize
while (!(AT91C_BASE_PMC->PMC_SR & AT91C_PMC_MOSCS)) {}; while (!(AT91C_BASE_PMC->PMC_SR & AT91C_PMC_MOSCS)) {};

2
common_arm/clocks.h
View file

@ -5,6 +5,6 @@
#include "at91sam7s512.h" #include "at91sam7s512.h"
void mck_from_pll_to_slck(void); void mck_from_pll_to_slck(void);
void mck_from_slck_to_pll(bool cold); void mck_from_slck_to_pll(void);
#endif // _CLOCKS_H_ #endif // _CLOCKS_H_