Dear all,
The firmware-tool utility in the ~mchehab/tm6000 repository currently
cannot parse firmware IDs that are longer than 32-bits. This patch
allows 64-bit IDs to be parsed.
Regards,
Timothy Lee
diff -r 499c88f177c1 v4l2-apps/util/xc3028-firmware/firmware-tool.c
--- a/v4l2-apps/util/xc3028-firmware/firmware-tool.c Fri Nov 23 14:18:56 2007 -0200
+++ b/v4l2-apps/util/xc3028-firmware/firmware-tool.c Wed Dec 12 09:39:43 2007 +0800
@@ -354,7 +354,7 @@ void dump_firm_std(v4l2_std_id id)
curr_id = V4L2_STD_PAL;
} else if ( (id & V4L2_STD_MN) == V4L2_STD_MN) {
printf ("NTSC PAL/M PAL/N ");
- curr_id = V4L2_STD_PAL;
+ curr_id = V4L2_STD_MN;
} else if ( (id & V4L2_STD_PAL_BG) == V4L2_STD_PAL_BG) {
printf ("PAL/BG ");
curr_id = V4L2_STD_PAL_BG;
@@ -452,7 +452,7 @@ void dump_firm_std(v4l2_std_id id)
printf ("A2/A ");
curr_id = V4L2_STD_A2_A;
} else if ( (id & V4L2_STD_A2_B) == V4L2_STD_A2_B) {
- printf ("A2/A ");
+ printf ("A2/B ");
curr_id = V4L2_STD_A2_B;
} else if ( (id & V4L2_STD_NICAM) == V4L2_STD_NICAM) {
printf ("NICAM ");
@@ -531,7 +531,7 @@ void set_standard_type(struct firmware*
write_firmware_file(firmware_file, f);
}
-void set_standard_id(struct firmware* f, char* firmware_file, __u16 i, __u32 id) {
+void set_standard_id(struct firmware* f, char* firmware_file, __u16 i, __u64 id) {
if(i > f->nr_desc) {
return;
}
@@ -666,7 +666,7 @@ int main(int argc, char* argv[])
break;
case SET_ID_ACTION:
- set_standard_id(f, firmware_file, strtoul(index_str, NULL, 10), strtoul(nr_str, NULL, 10));
+ set_standard_id(f, firmware_file, strtoul(index_str, NULL, 10), strtoull(nr_str, NULL, 10));
break;
}
return 0;
_______________________________________________
linux-dvb mailing list
linux-dvb@xxxxxxxxxxx
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linux-dvb
