Merge pull request #513 from JL2210/disable-padding-option

Add option to disable padding in rgblink
This commit is contained in:
Eldred Habert
2020-04-27 11:05:55 +02:00
committed by GitHub
4 changed files with 27 additions and 6 deletions

View File

@@ -34,6 +34,7 @@ uint8_t padValue; /* -p */
bool is32kMode; /* -t */
bool beVerbose; /* -v */
bool isWRA0Mode; /* -w */
bool disablePadding; /* -x */
static uint32_t nbErrors = 0;
@@ -83,7 +84,7 @@ FILE *openFile(char const *fileName, char const *mode)
}
/* Short options */
static char const *optstring = "dl:m:n:O:o:p:s:tVvw";
static char const *optstring = "dl:m:n:O:o:p:s:tVvwx";
/*
* Equivalent long options
@@ -108,6 +109,7 @@ static struct option const longopts[] = {
{ "version", no_argument, NULL, 'V' },
{ "verbose", no_argument, NULL, 'v' },
{ "wramx", no_argument, NULL, 'w' },
{ "nopad", no_argument, NULL, 'x' },
{ NULL, no_argument, NULL, 0 }
};
@@ -117,7 +119,7 @@ static struct option const longopts[] = {
static void printUsage(void)
{
fputs(
"Usage: rgblink [-dtVvw] [-l script] [-m map_file] [-n sym_file]\n"
"Usage: rgblink [-dtVvwx] [-l script] [-m map_file] [-n sym_file]\n"
" [-O overlay_file] [-o out_file] [-p pad_value] [-s symbol]\n"
" <file> ...\n"
"Useful options:\n"
@@ -126,6 +128,7 @@ static void printUsage(void)
" -n, --sym <path> set the output symbol list file\n"
" -o, --output <path> set the output file\n"
" -p, --pad <value> set the value to pad between sections with\n"
" -x, --nopad disable padding of output binary\n"
" -V, --version print RGBLINK version and exits\n"
"\n"
"For help, use `man rgblink' or go to https://rednex.github.io/rgbds/\n",
@@ -199,6 +202,11 @@ int main(int argc, char *argv[])
case 'w':
isWRA0Mode = true;
break;
case 'x':
disablePadding = true;
/* implies tiny mode */
is32kMode = true;
break;
default:
printUsage();
exit(1);