uGFX
/
ugfx
2
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Update file2c tool to enable creation of directory entries for the ROM file system.

ugfx_release_2.6
inmarket 2014-02-05 08:45:28 +10:00
parent 79d913f16d
commit 888a5d0656
5 changed files with 77 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/gfile/gfile.h
View File

@ -177,11 +177,6 @@ extern "C" {
//setbuf //setbuf
//setvbuf //setvbuf
//fflush //fflush
//fscanf
//scanf
//sscanf
//vscanf
//vsscanf
//fgetc //fgetc
//fgets //fgets
//fputc //fputc

6
include/gfile/options.h
View File

@ -65,9 +65,9 @@
* @note If GFILE_ALLOW_DEVICESPECIFIC is on then you can ensure that you are * @note If GFILE_ALLOW_DEVICESPECIFIC is on then you can ensure that you are
* opening a file on the ROM file system by prefixing * opening a file on the ROM file system by prefixing
* its name with "S|" (the letter 'S', followed by a vertical bar). * its name with "S|" (the letter 'S', followed by a vertical bar).
* @note This requires a file called romfs_files.h to be included in the * @note This requires a file called romfs_files.h to be in the
* users project. This file includes all the files converted to .h files * users project include path. This file should include all the files
* using the file2c utility using the "-r" flag. * converted to .h files using the file2c utility (using flags "-dbcs").
*/ */
#ifndef GFILE_NEED_ROMFS #ifndef GFILE_NEED_ROMFS
#define GFILE_NEED_ROMFS FALSE #define GFILE_NEED_ROMFS FALSE

BIN
tools/file2c/binaries/windows/file2c.exe
View File

Binary file not shown.

10
tools/file2c/src/Makefile.mingw32 100644
View File

@ -0,0 +1,10 @@
CC = i686-pc-mingw32-gcc
CFLAGS = -Wall -O2
all:
$(CC) $(CFLAGS) -o file2c.exe file2c.c
clean:
@rm file2c.exe

95
tools/file2c/src/file2c.c
View File

@ -8,11 +8,14 @@
#include <stdio.h> #include <stdio.h>
#include <fcntl.h> #include <fcntl.h>
#include <string.h> #include <string.h>
#include <stdlib.h>
#include <time.h>
#ifdef WIN32 #ifdef WIN32
#include <io.h> #include <io.h>
#endif #endif
static unsigned char buf[1024]; static unsigned char buf[1024];
static char tname[FILENAME_MAX];
static char *filenameof(char *fname) { static char *filenameof(char *fname) {
char *p; char *p;
@ -25,6 +28,13 @@ static char *filenameof(char *fname) {
#endif #endif
p = strrchr(fname, '/'); p = strrchr(fname, '/');
if (p) fname = p+1; if (p) fname = p+1;
return fname;
}
static char *basenameof(char *fname) {
char *p;
fname = filenameof(fname);
p = strchr(fname, '.'); p = strchr(fname, '.');
if (p) *p = 0; if (p) *p = 0;
return fname; return fname;
@ -43,34 +53,35 @@ char * opt_progname;
char * opt_inputfile; char * opt_inputfile;
char * opt_outputfile; char * opt_outputfile;
char * opt_arrayname; char * opt_arrayname;
char * opt_dirname;
int opt_breakblocks; int opt_breakblocks;
int opt_romdir;
char * opt_static; char * opt_static;
char * opt_const; char * opt_const;
FILE * f_input; FILE * f_input;
FILE * f_output; FILE * f_output;
unsigned blocknum; unsigned blocknum;
size_t len; size_t len, totallen;
size_t i; size_t i;
/* Default values for our parameters */ /* Default values for our parameters */
opt_progname = filenameof(argv[0]); opt_progname = basenameof(argv[0]);
opt_inputfile = 0; opt_inputfile = opt_outputfile = opt_arrayname = opt_dirname = 0;
opt_outputfile = 0; opt_breakblocks = opt_romdir = 0;
opt_arrayname = 0; opt_static = opt_const = "";
opt_breakblocks = 0;
opt_static = "";
opt_const = "";
/* Read the arguments */ /* Read the arguments */
while(*++argv) { while(*++argv) {
if (argv[0][0] == '-') { if (argv[0][0] == '-') {
while (*++(argv[0])) { while (*++(argv[0])) {
switch(argv[0][0]) { switch(argv[0][0]) {
case '?': case 'h': goto usage; case '?': case 'h': goto usage;
case 'b': opt_breakblocks = 1; break; case 'd': opt_romdir = 1; break;
case 'c': opt_const = "const "; break; case 'b': opt_breakblocks = 1; break;
case 's': opt_static = "static "; break; case 'c': opt_const = "const "; break;
case 'n': opt_arrayname = *++argv; goto nextarg; case 's': opt_static = "static "; break;
case 'n': opt_arrayname = *++argv; goto nextarg;
case 'f': opt_romdir = 1; opt_dirname = *++argv; goto nextarg;
default: default:
fprintf(stderr, "Unknown flag -%c\n", argv[0][0]); fprintf(stderr, "Unknown flag -%c\n", argv[0][0]);
goto usage; goto usage;
@ -82,20 +93,28 @@ size_t i;
opt_outputfile = argv[0]; opt_outputfile = argv[0];
else { else {
usage: usage:
fprintf(stderr, "Usage:\n\t%s -?\n" fprintf(stderr, "Usage:\n\n%s -?\n"
"\t%s [-bs] [-n name] [inputfile] [outputfile]\n" "%s [-dbcs] [-n name] [-f file] [inputfile] [outputfile]\n"
"\t\t-?\tThis help\n" "\t-?\tThis help\n"
"\t\t-h\tThis help\n" "\t-h\tThis help\n"
"\t\t-b\tBreak the arrays for compilers that won't handle large arrays\n" "\t-d\tAdd a directory entry for the ROM file system\n"
"\t\t-c\tDeclare the arrays as const (useful to ensure they end up in Flash)\n" "\t-b\tBreak the arrays for compilers that won't handle large arrays\n"
"\t\t-s\tDeclare the arrays as static\n" "\t-c\tDeclare as const (useful to ensure they end up in Flash)\n"
"\t\t-n name\tUse \"name\" as the name of the array\n" "\t-s\tDeclare as static\n"
"\t-n name\tUse \"name\" as the name of the array\n"
"\t-f file\tUse \"file\" as the filename in the ROM directory entry\n"
, opt_progname, opt_progname); , opt_progname, opt_progname);
return 1; return 1;
} }
nextarg: ; nextarg: ;
} }
/* Make sure we can generate a default directory name if required */
if (opt_romdir && !opt_dirname && !opt_inputfile) {
fprintf(stderr, "If using -d you must either specify an input filename or use -f to specify a directory entry filename\n");
goto usage;
}
/* Open the input file */ /* Open the input file */
if (opt_inputfile) { if (opt_inputfile) {
f_input = fopen(opt_inputfile, f_input = fopen(opt_inputfile,
@ -129,43 +148,57 @@ size_t i;
fprintf(f_output, "/**\n * This file was generated "); fprintf(f_output, "/**\n * This file was generated ");
if (opt_inputfile) fprintf(f_output, "from \"%s\" ", opt_inputfile); if (opt_inputfile) fprintf(f_output, "from \"%s\" ", opt_inputfile);
fprintf(f_output, "using...\n *\n *\t%s", opt_progname); fprintf(f_output, "using...\n *\n *\t%s", opt_progname);
if (opt_arrayname || opt_static[0] || opt_const[0] || opt_breakblocks) { if (opt_arrayname || opt_static[0] || opt_const[0] || opt_breakblocks || opt_romdir) {
fprintf(f_output, " -"); fprintf(f_output, " -");
if (opt_romdir) fprintf(f_output, "b");
if (opt_breakblocks) fprintf(f_output, "b"); if (opt_breakblocks) fprintf(f_output, "b");
if (opt_const[0]) fprintf(f_output, "c"); if (opt_const[0]) fprintf(f_output, "c");
if (opt_static[0]) fprintf(f_output, "s"); if (opt_static[0]) fprintf(f_output, "s");
if (opt_arrayname) fprintf(f_output, "n %s", opt_arrayname); if (opt_arrayname) fprintf(f_output, "n %s", opt_arrayname);
if (opt_dirname) fprintf(f_output, (opt_arrayname ? " -f %s" : "f %s"), opt_dirname);
} }
if (opt_inputfile) fprintf(f_output, " %s", opt_inputfile); if (opt_inputfile) fprintf(f_output, " %s", opt_inputfile);
if (opt_outputfile) fprintf(f_output, " %s", opt_outputfile); if (opt_outputfile) fprintf(f_output, " %s", opt_outputfile);
fprintf(f_output, "\n *\n */\n"); fprintf(f_output, "\n *\n */\n");
/* /*
* Set the array name. * Set the array name and dir name
* We do this after printing opt_inputfile for the last time as we
* modify opt_inputfile in place to generate opt_arrayname.
*/ */
if (!opt_arrayname) { if (!opt_arrayname) {
if (opt_inputfile) if (opt_inputfile)
opt_arrayname = filenameof(opt_inputfile); opt_arrayname = basenameof(strcpy(tname, opt_inputfile));
if (!opt_arrayname || !opt_arrayname[0]) if (!opt_arrayname || !opt_arrayname[0]) {
opt_arrayname = "filearray"; srand(time(NULL));
sprintf(tname, "filearray%u", rand());
opt_arrayname = tname;
}
} }
opt_arrayname = clean4c(opt_arrayname); opt_arrayname = clean4c(opt_arrayname);
if (opt_romdir && !opt_dirname)
opt_dirname = filenameof(opt_inputfile);
/* Read the file processing 1K at a time */ /* Read the file processing 1K at a time */
blocknum = 0; blocknum = 0;
totallen = 0;
while((len = fread(buf, 1, sizeof(buf), f_input))) { while((len = fread(buf, 1, sizeof(buf), f_input))) {
if (!blocknum++) if (!blocknum++)
fprintf(f_output, "%s%sunsigned char %s[] = {", opt_static, opt_const, opt_arrayname); fprintf(f_output, "%s%schar %s[] = {", opt_static, opt_const, opt_arrayname);
else if (opt_breakblocks) else if (opt_breakblocks)
fprintf(f_output, "\n};\n%s%sunsigned char %s_p%u[] = {", opt_static, opt_const, opt_arrayname, blocknum); fprintf(f_output, "\n};\n%s%schar %s_p%u[] = {", opt_static, opt_const, opt_arrayname, blocknum);
for(i = 0; i < len; i++) { for(i = 0; i < len; i++) {
fprintf(f_output, (i & 0x0F) ? " 0x%02X," : "\n\t0x%02X,", buf[i]); fprintf(f_output, (i & 0x0F) ? " 0x%02X," : "\n\t0x%02X,", buf[i]);
} }
totallen += len;
} }
fprintf(f_output, "\n};\n"); fprintf(f_output, "\n};\n");
/* Add the directory entry if required */
if (opt_romdir) {
fprintf(f_output, "\n#ifdef ROMFS_DIRENTRY_HEAD\n");
fprintf(f_output, "\t%s%sROMFS_DIRENTRY %s_dir = { ROMFS_DIRENTRY_HEAD, \"%s\", %u, %s };\n", opt_static, opt_const, opt_arrayname, opt_dirname, totallen, opt_arrayname);
fprintf(f_output, "\t#undef ROMFS_DIRENTRY_HEAD\n\t#define ROMFS_DIRENTRY_HEAD &%s_dir\n#endif\n", opt_arrayname);
}
/* Clean up */ /* Clean up */
if (ferror(f_input)) if (ferror(f_input))
fprintf(stderr, "Input file read error\n"); fprintf(stderr, "Input file read error\n");