github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-22 14:13:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0c9b68b9e8 into a37725facf

Browse source
This commit is contained in:
Iceman 2018-02-11 16:33:03 +00:00 • committed by GitHub
commit c3de7d5d33
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
armsrc/appmain.c
View file

@ -1408,6 +1408,9 @@ void __attribute__((noreturn)) AppMain(void)
// Reset SSC // Reset SSC
AT91C_BASE_SSC->SSC_CR = AT91C_SSC_SWRST; AT91C_BASE_SSC->SSC_CR = AT91C_SSC_SWRST;
// Configure MUX
SetAdcMuxFor(0);
// Load the FPGA image, which we have stored in our flash. // Load the FPGA image, which we have stored in our flash.
// (the HF version by default) // (the HF version by default)
FpgaDownloadAndGo(FPGA_BITSTREAM_HF); FpgaDownloadAndGo(FPGA_BITSTREAM_HF);

3
armsrc/fpgaloader.c
View file

@ -558,7 +558,8 @@ void SetAdcMuxFor(uint32_t whichGpio)
LOW(GPIO_MUXSEL_LORAW); LOW(GPIO_MUXSEL_LORAW);
LOW(GPIO_MUXSEL_LOPKD); LOW(GPIO_MUXSEL_LOPKD);
HIGH(whichGpio); if (whichGpio > 0)
HIGH(whichGpio);
} }
void Fpga_print_status(void) { void Fpga_print_status(void) {