summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-12-14 15:09:19 -0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-12-14 15:09:19 -0200
commitcac9746a75d2e2e073e29fb681af29f3c0eb272c (patch)
treeb53648a560402f31b5ff5715f63501a37d28a70f
parent1efaa2577875627e2c4021ee3445c0ec438e9813 (diff)
downloadmediapointer-dvb-s2-cac9746a75d2e2e073e29fb681af29f3c0eb272c.tar.gz
mediapointer-dvb-s2-cac9746a75d2e2e073e29fb681af29f3c0eb272c.tar.bz2
Better classify firmware types
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--v4l2-apps/util/xc3028-firmware/firmware-tool.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/v4l2-apps/util/xc3028-firmware/firmware-tool.c b/v4l2-apps/util/xc3028-firmware/firmware-tool.c
index 2d3df055e..a8e6d0c01 100644
--- a/v4l2-apps/util/xc3028-firmware/firmware-tool.c
+++ b/v4l2-apps/util/xc3028-firmware/firmware-tool.c
@@ -289,12 +289,13 @@ void write_firmware_file(const char* filename, struct firmware *f) {
void dump_firm_type(unsigned int type)
{
- if (!type) {
- printf("STD FIRM ");
- return;
- }
- if (type & BASE)
- printf("BASE ");
+ if (type & SCODE)
+ printf("SCODE FW ");
+ else if (type & BASE)
+ printf("BASE FW ");
+ else
+ printf("STD FW ");
+
if (type & F8MHZ)
printf("F8MHZ ");
if (type & MTS)
@@ -349,8 +350,6 @@ void dump_firm_type(unsigned int type)
printf("F6MHZ ");
if (type & INPUT2)
printf("INPUT2 ");
- if (type & SCODE)
- printf("SCODE ");
if (type & HAS_IF)
printf("HAS IF ");
}
@@ -501,7 +500,7 @@ void list_firmware(struct firmware *f) {
f->version);
printf("standards:\t%u\n", f->nr_desc);
for(i = 0; i < f->nr_desc; ++i) {
- printf("Firmware %u, ", i);
+ printf("Firmware %2u, ", i);
printf("type: ");
dump_firm_type(f->desc[i].type);
printf("(0x%08x), ", f->desc[i].type);