]> git.zerfleddert.de Git - proxmark3-svn/blobdiff - client/fpga_compress.c
fix: fpga_compressor file size check
[proxmark3-svn] / client / fpga_compress.c
index 68e9103c9dfab8c0cf590dc3ba0bac74a0934388..2779e8350ec90870ed8a6d779b43cda09ce2aa79 100644 (file)
@@ -3,7 +3,10 @@
 // at your option, any later version. See the LICENSE.txt file for the text of
 // the license.
 //-----------------------------------------------------------------------------
-// Flasher frontend tool
+// Compression tool for FPGA config files. Compress several *.bit files at
+// compile time. Decompression is done at run time (see fpgaloader.c).
+// This uses the zlib library tuned to this specific case. The small file sizes
+// allow to use "insane" parameters for optimum compression ratio.
 //-----------------------------------------------------------------------------
 
 #include <stdio.h>
@@ -17,8 +20,8 @@
 
 // zlib configuration
 #define COMPRESS_LEVEL                 9               // use best possible compression
-#define COMPRESS_WINDOW_BITS   15              // default = 15 for a window of 2^15 = 32KBytes
-#define COMPRESS_MEM_LEVEL             9               // determines the amount of memory allocated during compression. Default = 8. Must be < 9
+#define COMPRESS_WINDOW_BITS   15              // default = max = 15 for a window of 2^15 = 32KBytes
+#define COMPRESS_MEM_LEVEL             9               // determines the amount of memory allocated during compression. Default = 8.
 /* COMPRESS_STRATEGY can be 
        Z_DEFAULT_STRATEGY (the default), 
        Z_FILTERED (more huffmann, less string matching),
 #define FPGA_INTERLEAVE_SIZE   288     // (the FPGA's internal config frame size is 288 bits. Interleaving with 288 bytes should give best compression)
 #define FPGA_CONFIG_SIZE               42336   // our current fpga_[lh]f.bit files are 42175 bytes. Rounded up to next multiple of FPGA_INTERLEAVE_SIZE
 
-static void usage(char *argv0)
+static void usage(void)
 {
-       fprintf(stderr, "Usage:   %s <infile1> <infile2> ... <infile_n> <outfile>\n\n", argv0);
-       fprintf(stderr, "Combines n FPGA bitstream files and compresses them into one.\n\n");
+       fprintf(stderr, "Usage: fpga_compress <infile1> <infile2> ... <infile_n> <outfile>\n");
+       fprintf(stderr, "          Combine n FPGA bitstream files and compress them into one.\n\n");
+       fprintf(stderr, "       fpga_compress -d <infile> <outfile>");
+       fprintf(stderr, "          Decompress <infile>. Write result to <outfile>");
 }
 
 
@@ -77,9 +82,18 @@ int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile)
 
        fpga_config = malloc(num_infiles * FPGA_CONFIG_SIZE);
        
-       // read the input files interleaving into fpga_config[]
+       // read the input files. Interleave them into fpga_config[]
        i = 0;
        do {
+
+               if (i >= num_infiles * FPGA_CONFIG_SIZE) {
+                       fprintf(stderr, "Input files too big (total > %lu bytes). These are probably not PM3 FPGA config files.\n", num_infiles*FPGA_CONFIG_SIZE);
+                       for(uint16_t j = 0; j < num_infiles; j++) {
+                               fclose(infile[j]);
+                       }
+                       return(EXIT_FAILURE);
+               }
+
                for(uint16_t j = 0; j < num_infiles; j++) {
                        for(uint16_t k = 0; k < FPGA_INTERLEAVE_SIZE; k++) {
                                c = fgetc(infile[j]);
@@ -91,17 +105,8 @@ int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile)
                        }
                }
 
-               if (i > num_infiles * FPGA_CONFIG_SIZE) {
-                       fprintf(stderr, "Input files too big (total of %ld > %d bytes). These are probably not PM3 FPGA config files.", i, num_infiles*FPGA_CONFIG_SIZE);
-                       for(uint16_t j = 0; j < num_infiles; j++) {
-                               fclose(infile[j]);
-                       }
-                       return -1;
-               }
        } while (!all_feof(infile, num_infiles));
 
-       fprintf(stderr, "Read a total of %ld bytes from %d files\n", i, num_infiles);
-       
        // initialize zlib structures
        compressed_fpga_stream.next_in = fpga_config;
        compressed_fpga_stream.avail_in = i;
@@ -120,7 +125,6 @@ int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile)
        uint8_t *outbuf = malloc(outsize_max);
        compressed_fpga_stream.next_out = outbuf;
        compressed_fpga_stream.avail_out = outsize_max;
-       
                                        
        if (ret == Z_OK) {
                ret = deflateTune(&compressed_fpga_stream,
@@ -134,7 +138,7 @@ int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile)
                ret = deflate(&compressed_fpga_stream, Z_FINISH);
        }
        
-       fprintf(stderr, "\ncompressed %d input bytes to %d output bytes\n", i, compressed_fpga_stream.total_out);
+       fprintf(stderr, "compressed %lu input bytes to %lu output bytes\n", i, compressed_fpga_stream.total_out);
 
        if (ret != Z_STREAM_END) {
                fprintf(stderr, "Error in deflate(): %d %s\n", ret, compressed_fpga_stream.msg);
@@ -146,7 +150,7 @@ int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile)
                fclose(outfile);
                free(infile);
                free(fpga_config);
-               return -1;
+               return(EXIT_FAILURE);
                }
                
        for (i = 0; i < compressed_fpga_stream.total_out; i++) {
@@ -162,7 +166,7 @@ int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile)
        free(infile);
        free(fpga_config);
        
-       return 0;
+       return(EXIT_SUCCESS);
        
 }
 
@@ -175,6 +179,7 @@ int zlib_decompress(FILE *infile, FILE *outfile)
        int ret;
        
        z_stream compressed_fpga_stream;
+
        // initialize zlib structures
        compressed_fpga_stream.next_in = inbuf;
        compressed_fpga_stream.avail_in = 0;
@@ -223,12 +228,12 @@ int zlib_decompress(FILE *infile, FILE *outfile)
                }
                fclose(outfile);
                fclose(infile);
-               return 0;
+               return(EXIT_SUCCESS);
        } else {
                fprintf(stderr, "Error. Inflate() returned error %d, %s", ret, compressed_fpga_stream.msg);
                fclose(outfile);
                fclose(infile);
-               return -1;
+               return(EXIT_FAILURE);
        }
        
 }
@@ -240,45 +245,43 @@ int main(int argc, char **argv)
        FILE *outfile;
        
        if (argc == 1 || argc == 2) {
-               usage(argv[0]);
-               return -1;
+               usage();
+               return(EXIT_FAILURE);
        }
        
-       if (!strcmp(argv[1], "-d")) {
+       if (!strcmp(argv[1], "-d")) {                   // Decompress
                infiles = calloc(1, sizeof(FILE*));
                if (argc != 4) {
-                       usage(argv[0]);
-                       return -1;
+                       usage();
+                       return(EXIT_FAILURE);
                } 
                infiles[0] = fopen(argv[2], "rb");
                if (infiles[0] == NULL) {
                        fprintf(stderr, "Error. Cannot open input file %s", argv[2]);
-                       return -1;
+                       return(EXIT_FAILURE);
                }
                outfile = fopen(argv[3], "wb");
                if (outfile == NULL) {
                        fprintf(stderr, "Error. Cannot open output file %s", argv[3]);
-                       return -1;
+                       return(EXIT_FAILURE);
                }
                return zlib_decompress(infiles[0], outfile);
-       }
-       
 
-       infiles = calloc(argc-2, sizeof(FILE*));
-       
-       for (uint16_t i = 0; i < argc-2; i++) { 
-               infiles[i] = fopen(argv[i+1], "rb");
-               if (infiles[i] == NULL) {
-                       fprintf(stderr, "Error. Cannot open input file %s", argv[i+1]);
-                       return -1;
-               }
-       }
+       } else {                                                                // Compress
 
-       outfile = fopen(argv[argc-1], "wb");
-       if (outfile == NULL) {
-               fprintf(stderr, "Error. Cannot open output file %s", argv[argc-1]);
-               return -1;
+               infiles = calloc(argc-2, sizeof(FILE*));
+               for (uint16_t i = 0; i < argc-2; i++) { 
+                       infiles[i] = fopen(argv[i+1], "rb");
+                       if (infiles[i] == NULL) {
+                               fprintf(stderr, "Error. Cannot open input file %s", argv[i+1]);
+                               return(EXIT_FAILURE);
+                       }
+               }
+               outfile = fopen(argv[argc-1], "wb");
+               if (outfile == NULL) {
+                       fprintf(stderr, "Error. Cannot open output file %s", argv[argc-1]);
+                       return(EXIT_FAILURE);
+               }
+               return zlib_compress(infiles, argc-2, outfile);
        }
-               
-       return zlib_compress(infiles, argc-2, outfile);
 }
Impressum, Datenschutz