Sojus07/hackrf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #197 from mossmann/spiflash_no_verbose_2

Browse Source 
Add hackrf_spiflash verbose option, make default not-verbose.
This commit is contained in:
Michael Ossmann
2015-07-10 14:39:26 -06:00
parent af13e756d9 8cfa81f40c
commit 25dd75081c
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
host/hackrf-tools/src/hackrf_spiflash.c
View File

@ -51,6 +51,7 @@ static struct option long_options[] = {
{ "length", required_argument, 0, 'l' }, { "length", required_argument, 0, 'l' },
{ "read", required_argument, 0, 'r' }, { "read", required_argument, 0, 'r' },
{ "write", required_argument, 0, 'w' }, { "write", required_argument, 0, 'w' },
{ "verbose", no_argument, 0, 'v' },
{ 0, 0, 0, 0 }, { 0, 0, 0, 0 },
}; };
@ -90,6 +91,7 @@ static void usage()
printf("\t-r <filename>: Read data into file.\n"); printf("\t-r <filename>: Read data into file.\n");
printf("\t-w <filename>: Write data from file.\n"); printf("\t-w <filename>: Write data from file.\n");
printf("\t-d <serialnumber>: Serial number of device, if multiple devices\n"); printf("\t-d <serialnumber>: Serial number of device, if multiple devices\n");
printf("\t-v: Verbose output.\n");
} }
int main(int argc, char** argv) int main(int argc, char** argv)
@ -109,8 +111,9 @@ int main(int argc, char** argv)
FILE* fd = NULL; FILE* fd = NULL;
bool read = false; bool read = false;
bool write = false; bool write = false;
bool verbose = false;
while ((opt = getopt_long(argc, argv, "a:l:r:w:d:", long_options, while ((opt = getopt_long(argc, argv, "a:l:r:w:d:v", long_options,
&option_index)) != EOF) { &option_index)) != EOF) {
switch (opt) { switch (opt) {
case 'a': case 'a':
@ -135,6 +138,10 @@ int main(int argc, char** argv)
serial_number = optarg; serial_number = optarg;
break; break;
case 'v':
verbose = true;
break;
default: default:
fprintf(stderr, "opt error: %d\n", opt); fprintf(stderr, "opt error: %d\n", opt);
usage(); usage();
@ -233,7 +240,7 @@ int main(int argc, char** argv)
while (tmp_length) while (tmp_length)
{ {
xfer_len = (tmp_length > 256) ? 256 : tmp_length; xfer_len = (tmp_length > 256) ? 256 : tmp_length;
printf("Reading %d bytes from 0x%06x.\n", xfer_len, address); if( verbose ) printf("Reading %d bytes from 0x%06x.\n", xfer_len, address);
result = hackrf_spiflash_read(device, address, xfer_len, pdata); result = hackrf_spiflash_read(device, address, xfer_len, pdata);
if (result != HACKRF_SUCCESS) { if (result != HACKRF_SUCCESS) {
fprintf(stderr, "hackrf_spiflash_read() failed: %s (%d)\n", fprintf(stderr, "hackrf_spiflash_read() failed: %s (%d)\n",
@ -272,9 +279,10 @@ int main(int argc, char** argv)
fd = NULL; fd = NULL;
return EXIT_FAILURE; return EXIT_FAILURE;
} }
if( !verbose ) printf("Writing %d bytes at 0x%06x.\n", length, address);
while (length) { while (length) {
xfer_len = (length > 256) ? 256 : length; xfer_len = (length > 256) ? 256 : length;
printf("Writing %d bytes at 0x%06x.\n", xfer_len, address); if( verbose ) printf("Writing %d bytes at 0x%06x.\n", xfer_len, address);
result = hackrf_spiflash_write(device, address, xfer_len, pdata); result = hackrf_spiflash_write(device, address, xfer_len, pdata);
if (result != HACKRF_SUCCESS) { if (result != HACKRF_SUCCESS) {
fprintf(stderr, "hackrf_spiflash_write() failed: %s (%d)\n", fprintf(stderr, "hackrf_spiflash_write() failed: %s (%d)\n",