Fixed up last gcc 4.1 and 4.4 warnings, added OpenOCD wiggler config

[proxmark3-svn] / armsrc / fpgaloader.c

diff --git a/armsrc/fpgaloader.c b/armsrc/fpgaloader.c
index c30468f46cab1368b6a25de0b8e05bce33c5245d..8cea61b0b7005fd51e116a0c43a7d82c964b9eb0 100644 (file)
--- a/armsrc/fpgaloader.c
+++ b/armsrc/fpgaloader.c
@@ -152,7 +152,7 @@ static void DownloadFPGA_byte(unsigned char w)
 // If bytereversal is set: reverse the byte order in each 4-byte word\r
 static void DownloadFPGA(const char *FpgaImage, int FpgaImageLen, int bytereversal)\r
 {\r
-       int i, j;\r
+       int i;\r
 \r
        PIO_OUTPUT_ENABLE = (1 << GPIO_FPGA_ON);\r
        PIO_ENABLE = (1 << GPIO_FPGA_ON);\r
@@ -218,7 +218,7 @@ static int bitparse_init(void * start_address, void *end_address)
        }\r
 }\r
 \r
-int bitparse_find_section(char section_name, void **section_start, unsigned int *section_length)\r
+int bitparse_find_section(char section_name, char **section_start, unsigned int *section_length)\r
 {\r
        char *pos = bitparse_headers_start;\r
        int result = 0;\r
@@ -275,7 +275,7 @@ void FpgaDownloadAndGo(void)
                /* Successfully initialized the .bit parser. Find the 'e' section and\r
                 * send its contents to the FPGA.
                 */\r
-               void *bitstream_start;\r
+               char *bitstream_start;\r
                unsigned int bitstream_length;\r
                if(bitparse_find_section('e', &bitstream_start, &bitstream_length)) {\r
                        DownloadFPGA(bitstream_start, bitstream_length, 0);\r
@@ -300,26 +300,26 @@ void FpgaGatherVersion(char *dst, int len)
        char *fpga_info; \r
        unsigned int fpga_info_len;\r
        dst[0] = 0;\r
-       if(!bitparse_find_section('e', (void**)&fpga_info, &fpga_info_len)) {\r
+       if(!bitparse_find_section('e', &fpga_info, &fpga_info_len)) {\r
                strncat(dst, "FPGA image: legacy image without version information", len-1);\r
        } else {\r
                strncat(dst, "FPGA image built", len-1);\r
                /* USB packets only have 48 bytes data payload, so be terse */\r
 #if 0\r
-               if(bitparse_find_section('a', (void**)&fpga_info, &fpga_info_len) && fpga_info[fpga_info_len-1] == 0 ) {\r
+               if(bitparse_find_section('a', &fpga_info, &fpga_info_len) && fpga_info[fpga_info_len-1] == 0 ) {\r
                        strncat(dst, " from ", len-1);\r
                        strncat(dst, fpga_info, len-1);\r
                }\r
-               if(bitparse_find_section('b', (void**)&fpga_info, &fpga_info_len) && fpga_info[fpga_info_len-1] == 0 ) {\r
+               if(bitparse_find_section('b', &fpga_info, &fpga_info_len) && fpga_info[fpga_info_len-1] == 0 ) {\r
                        strncat(dst, " for ", len-1);\r
                        strncat(dst, fpga_info, len-1);\r
                }\r
 #endif\r
-               if(bitparse_find_section('c', (void**)&fpga_info, &fpga_info_len) && fpga_info[fpga_info_len-1] == 0 ) {\r
+               if(bitparse_find_section('c', &fpga_info, &fpga_info_len) && fpga_info[fpga_info_len-1] == 0 ) {\r
                        strncat(dst, " on ", len-1);\r
                        strncat(dst, fpga_info, len-1);\r
                }\r
-               if(bitparse_find_section('d', (void**)&fpga_info, &fpga_info_len) && fpga_info[fpga_info_len-1] == 0 ) {\r
+               if(bitparse_find_section('d', &fpga_info, &fpga_info_len) && fpga_info[fpga_info_len-1] == 0 ) {\r
                        strncat(dst, " at ", len-1);\r
                        strncat(dst, fpga_info, len-1);\r
                }\r