Update CHANGELOG.md

[proxmark3-svn] / armsrc / fpgaloader.c

diff --git a/armsrc/fpgaloader.c b/armsrc/fpgaloader.c
index da85c66c1a424233e875ce63e224008d005b1b56..a96cb5d9e9b2cffff6eaacd9b8511b52d4e55fe3 100644 (file)
--- a/armsrc/fpgaloader.c
+++ b/armsrc/fpgaloader.c
@@ -9,16 +9,7 @@
 // Routines to load the FPGA image, and then to configure the FPGA's major
 // mode once it is configured.
 //-----------------------------------------------------------------------------
-
-#include <stdint.h>
-#include <stddef.h>
-#include <stdbool.h>
 #include "fpgaloader.h"
-#include "proxmark3.h"
-#include "util.h"
-#include "string.h"
-#include "BigBuf.h"
-#include "zlib.h"
 
 extern void Dbprintf(const char *fmt, ...);
 
@@ -117,8 +108,7 @@ void SetupSpi(int mode)
 // Set up the synchronous serial port, with the one set of options that we
 // always use when we are talking to the FPGA. Both RX and TX are enabled.
 //-----------------------------------------------------------------------------
-void FpgaSetupSsc(void)
-{
+void FpgaSetupSscExt(uint8_t clearPCER) {
        // First configure the GPIOs, and get ourselves a clock.
        AT91C_BASE_PIOA->PIO_ASR =
                GPIO_SSC_FRAME  |
@@ -127,7 +117,10 @@ void FpgaSetupSsc(void)
                GPIO_SSC_CLK;
        AT91C_BASE_PIOA->PIO_PDR = GPIO_SSC_DOUT;
 
-       AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_SSC);
+       if ( clearPCER )
+               AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_SSC);
+       else
+               AT91C_BASE_PMC->PMC_PCER |= (1 << AT91C_ID_SSC);
 
        // Now set up the SSC proper, starting from a known state.
        AT91C_BASE_SSC->SSC_CR = AT91C_SSC_SWRST;
@@ -149,25 +142,24 @@ void FpgaSetupSsc(void)
 
        AT91C_BASE_SSC->SSC_CR = AT91C_SSC_RXEN | AT91C_SSC_TXEN;
 }
-
+void FpgaSetupSsc(void) {
+       FpgaSetupSscExt(TRUE);
+}
 //-----------------------------------------------------------------------------
 // Set up DMA to receive samples from the FPGA. We will use the PDC, with
 // a single buffer as a circular buffer (so that we just chain back to
 // ourselves, not to another buffer). The stuff to manipulate those buffers
 // is in apps.h, because it should be inlined, for speed.
 //-----------------------------------------------------------------------------
-bool FpgaSetupSscDma(uint8_t *buf, int len)
-{
-       if (buf == NULL)
-        return false;
-
+bool FpgaSetupSscDma(uint8_t *buf, int len) {
+       if (buf == NULL) return false;
+       
        AT91C_BASE_PDC_SSC->PDC_PTCR = AT91C_PDC_RXTDIS;        // Disable DMA Transfer
        AT91C_BASE_PDC_SSC->PDC_RPR = (uint32_t) buf;           // transfer to this memory address
        AT91C_BASE_PDC_SSC->PDC_RCR = len;                                      // transfer this many bytes
        AT91C_BASE_PDC_SSC->PDC_RNPR = (uint32_t) buf;          // next transfer to same memory address
        AT91C_BASE_PDC_SSC->PDC_RNCR = len;                                     // ... with same number of bytes
-       AT91C_BASE_PDC_SSC->PDC_PTCR = AT91C_PDC_RXTEN;         // go!
-    
+       AT91C_BASE_PDC_SSC->PDC_PTCR = AT91C_PDC_RXTEN;         // go!    
     return true;
 }
 
@@ -220,7 +212,8 @@ static voidpf fpga_inflate_malloc(voidpf opaque, uInt items, uInt size)
 
 static void fpga_inflate_free(voidpf opaque, voidpf address)
 {
-       BigBuf_free();
+       // free eventually allocated BigBuf memory
+       BigBuf_free(); BigBuf_Clear_ext(false);
 }
 
 
@@ -416,7 +409,7 @@ void FpgaDownloadAndGo(int bitstream_version)
                return;
 
        // make sure that we have enough memory to decompress
-       BigBuf_free();
+       BigBuf_free(); BigBuf_Clear_ext(false);
        
        if (!reset_fpga_stream(bitstream_version, &compressed_fpga_stream, output_buffer)) {
                return;
@@ -430,7 +423,8 @@ void FpgaDownloadAndGo(int bitstream_version)
 
        inflateEnd(&compressed_fpga_stream);
        
-       BigBuf_free();
+       // free eventually allocated BigBuf memory
+       BigBuf_free(); BigBuf_Clear_ext(false);
 }      
 
 
@@ -450,7 +444,7 @@ void FpgaGatherVersion(int bitstream_version, char *dst, int len)
        dst[0] = '\0';
 
        // ensure that we can allocate enough memory for decompression:
-       BigBuf_free();
+       BigBuf_free(); BigBuf_Clear_ext(false);
 
        if (!reset_fpga_stream(bitstream_version, &compressed_fpga_stream, output_buffer))
                return;