I wrote on 2009-02-11: > I wrote on 2009-01-18: >> I pushed a few updates for firedtv (FireWire DVB driver) out to >> >> git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git ... > What I still want to do before I post everything at LKML is less > ambitious: Some whitespace and comment style changes, remove a kernel > version compatibility macro, use dev_printk, remove some pointer type > casts, collapse all header files into a single one. Here we go. Below is the log of this weekend's updates which are already pushed out to linux1394-2.6.git and to my quilt series and patchkits at http://user.in-berlin.de/~s5r6/linux1394/. In addition to what I mentioned above, these updates contain - preparation to add a drivers/firewire backend in addition to the present drivers/ieee1394 backend, - modularization of the remote control code (can build firedtv without it if the target does not have an input subsystem), - a locking fix in the demux feed start/stop code, - some other minimal housekeeping. If somebody else worked on firedtv in the meantime too and wants me to rebase his changes on top of mine, please send me your patches. Also, if there is something objectionable in my latest changes, yell. At this point I consider firedtv ready to go into mainline, either before v2.6.30-rc1 or maybe already even into a v2.6.29-rc. I will post an according announcement to LKML + linux1394-devel + linux-media on Monday, and I will post the combined firedtv patch to LKML then too. The shortlog and diffstat: Stefan Richter (13): firedtv: misc style touch-ups firedtv: combine header files firedtv: remove kernel version compatibility macro firedtv: amend Kconfig menu prompt firedtv: concentrate ieee1394 dependencies firedtv: replace EXTRA_CFLAGS by ccflags firedtv: allow build without input subsystem firedtv: dvb demux: fix missing braces firedtv: dvb demux: fix mutex protection firedtv: dvb demux: remove a bogus loop firedtv: dvb demux: some simplifications firedtv: dvb demux: more compact channels backing store firedtv: rename a file once more drivers/media/dvb/Kconfig | 2 + drivers/media/dvb/firewire/Kconfig | 26 +- drivers/media/dvb/firewire/Makefile | 15 +- drivers/media/dvb/firewire/avc.h | 52 --- drivers/media/dvb/firewire/firedtv-1394.c | 291 ++++++------------ .../media/dvb/firewire/{avc.c => firedtv-avc.c} | 116 ++++---- drivers/media/dvb/firewire/firedtv-ci.c | 28 +- drivers/media/dvb/firewire/firedtv-ci.h | 9 - drivers/media/dvb/firewire/firedtv-dvb.c | 328 +++++++++++++------- drivers/media/dvb/firewire/firedtv-fe.c | 30 +- drivers/media/dvb/firewire/firedtv-rc.c | 1 - drivers/media/dvb/firewire/firedtv-rc.h | 11 - drivers/media/dvb/firewire/firedtv.h | 112 +++++-- 13 files changed, 491 insertions(+), 530 deletions(-) delete mode 100644 drivers/media/dvb/firewire/avc.h rename drivers/media/dvb/firewire/{avc.c => firedtv-avc.c} (92%) delete mode 100644 drivers/media/dvb/firewire/firedtv-ci.h delete mode 100644 drivers/media/dvb/firewire/firedtv-rc.h The verbose changelog: commit 5fc95971bf3a717247a793732a6e56bbfe486ee7 Author: Stefan Richter <stefanr at s5r6.in-berlin.de> Date: Sun Feb 15 15:33:17 2009 +0100 firedtv: rename a file once more At the moment, about a third of avc.c is specific to FireDTVs rather than generic AV/C code. Rename it to firedtv-avc.c. Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de> drivers/media/dvb/firewire/Makefile | 2 +- .../media/dvb/firewire/{avc.c => firedtv-avc.c} | 0 drivers/media/dvb/firewire/firedtv.h | 64 ++++++++++---------- 3 files changed, 33 insertions(+), 33 deletions(-) rename drivers/media/dvb/firewire/{avc.c => firedtv-avc.c} (100%) commit 5bf7c3f7290352d250f45120d3600346474ba861 Author: Stefan Richter <stefanr at s5r6.in-berlin.de> Date: Sun Feb 15 15:33:17 2009 +0100 firedtv: dvb demux: more compact channels backing store Replace struct firedtv_channel { bool active; int pid; } channel[16]; by unsigned long channel_active; u16 channel_pid[16];. Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de> drivers/media/dvb/firewire/firedtv-dvb.c | 52 +++++++++++++---------------- drivers/media/dvb/firewire/firedtv.h | 10 ++--- 2 files changed, 27 insertions(+), 35 deletions(-) commit 8d32c221fb6901815751e20f853a19d5143bd609 Author: Stefan Richter <stefanr at s5r6.in-berlin.de> Date: Sun Feb 15 15:33:17 2009 +0100 firedtv: dvb demux: some simplifications c->active was unnecessarily cleared twice. Also, by marking the channel inactive before the for loop, the loop becomes identical with fdtv_channel_collect(). Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de> drivers/media/dvb/firewire/firedtv-dvb.c | 21 +++++++-------------- 1 files changed, 7 insertions(+), 14 deletions(-) commit d78c3e582bd00c6e277fc4ce610b3270c4d446a2 Author: Stefan Richter <stefanr at s5r6.in-berlin.de> Date: Sun Feb 15 15:33:17 2009 +0100 firedtv: dvb demux: remove a bogus loop This loop is unnecessary because - only active channel[].pid's will be sent to the device, - when a channel is activated, its pid is set to dvbdmxfeed->pid. Perhaps the original code was there because it was initially not fully covered by the fdtv->demux_mutex. Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de> drivers/media/dvb/firewire/firedtv-dvb.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) commit 5cf2725300eda4c428d2c5c39ce7130c1410a7cb Author: Stefan Richter <stefanr at s5r6.in-berlin.de> Date: Sun Feb 15 15:33:17 2009 +0100 firedtv: dvb demux: fix mutex protection fdtv_start_feed() accessed the channel list unsafely. Fully serialize it with itself and fdtv_stop_feed(). Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de> drivers/media/dvb/firewire/firedtv-dvb.c | 80 ++++++++++++------------------ 1 files changed, 32 insertions(+), 48 deletions(-) commit 4b718f730bc4db35e6cb21f75aab3cbd5249b27b Author: Stefan Richter <stefanr at s5r6.in-berlin.de> Date: Sun Feb 15 15:33:17 2009 +0100 firedtv: dvb demux: fix missing braces Original code was: ... case DMX_TS_PES_OTHER: //Dirty fix to keep firesat->channel pid-list up to date for(k=0;k<16;k++){ if(firesat->channel[k].active == 0) firesat->channel[k].pid = dvbdmxfeed->pid; break; } channel = firesat_channel_allocate(firesat); break; default: ... Looks bogus in several respects. For now let's just add braces to the if because that seems to be what the author meant. Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de> drivers/media/dvb/firewire/firedtv-dvb.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) commit b3595f3875adad10d5058c7f1f4a1eb192db4b17 Author: Stefan Richter <stefanr at s5r6.in-berlin.de> Date: Sun Feb 15 15:33:17 2009 +0100 firedtv: allow build without input subsystem !CONFIG_INPUT is very unlikely on systems on which firedtv is of interest. But we can easily support it. Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de> drivers/media/dvb/firewire/Kconfig | 5 ++++- drivers/media/dvb/firewire/Makefile | 3 ++- drivers/media/dvb/firewire/firedtv.h | 7 +++++++ 3 files changed, 13 insertions(+), 2 deletions(-) commit f62ca0511c7920d62920a03ccf27ceab5b8801f7 Author: Stefan Richter <stefanr at s5r6.in-berlin.de> Date: Sun Feb 15 15:33:17 2009 +0100 firedtv: replace EXTRA_CFLAGS by ccflags The former are deprecated. The latter can depend on Kconfig variables. Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de> drivers/media/dvb/firewire/Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit b71e0fe2ac16dba20c0191a12fea022f35d25561 Author: Stefan Richter <stefanr at s5r6.in-berlin.de> Date: Sun Feb 15 15:33:17 2009 +0100 firedtv: concentrate ieee1394 dependencies Move the entire interface with drivers/ieee1394 to firedtv-1394.c. Move 1394-independent module initialization code to firedtv-dvb.c. This prepares interfacing with drivers/firewire. Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de> drivers/media/dvb/firewire/Kconfig | 7 + drivers/media/dvb/firewire/Makefile | 10 +- drivers/media/dvb/firewire/avc.c | 82 ++++----- drivers/media/dvb/firewire/firedtv-1394.c | 265 ++++++++++------------------ drivers/media/dvb/firewire/firedtv-ci.c | 11 +- drivers/media/dvb/firewire/firedtv-dvb.c | 162 ++++++++++++++++-- drivers/media/dvb/firewire/firedtv-fe.c | 10 +- drivers/media/dvb/firewire/firedtv.h | 60 ++++--- 8 files changed, 333 insertions(+), 274 deletions(-) commit 54b5fc4df6698518bc462642c0bba45a0963f7c0 Author: Stefan Richter <stefanr at s5r6.in-berlin.de> Date: Sun Feb 15 15:33:17 2009 +0100 firedtv: amend Kconfig menu prompt Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de> drivers/media/dvb/Kconfig | 2 ++ drivers/media/dvb/firewire/Kconfig | 14 +++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) commit fddec15d16a9f7097bc6a2963fccaf0e1f21e190 Author: Stefan Richter <stefanr at s5r6.in-berlin.de> Date: Sun Feb 15 15:33:17 2009 +0100 firedtv: remove kernel version compatibility macro Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de> drivers/media/dvb/firewire/firedtv-dvb.c | 7 ++++--- drivers/media/dvb/firewire/firedtv.h | 8 -------- 2 files changed, 4 insertions(+), 11 deletions(-) commit 05bfc469937ad5575f3eb92ee801581b61b0ba80 Author: Stefan Richter <stefanr at s5r6.in-berlin.de> Date: Sun Feb 15 15:33:17 2009 +0100 firedtv: combine header files avc.h and firedtv-*.h are small and currently not shared with other drivers, hence concatenate them all into firedtv.h. Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de> drivers/media/dvb/firewire/avc.c | 2 - drivers/media/dvb/firewire/avc.h | 52 ----------------------------- drivers/media/dvb/firewire/firedtv-1394.c | 3 -- drivers/media/dvb/firewire/firedtv-ci.c | 2 - drivers/media/dvb/firewire/firedtv-ci.h | 9 ----- drivers/media/dvb/firewire/firedtv-dvb.c | 2 - drivers/media/dvb/firewire/firedtv-fe.c | 1 - drivers/media/dvb/firewire/firedtv-rc.c | 1 - drivers/media/dvb/firewire/firedtv-rc.h | 11 ------ drivers/media/dvb/firewire/firedtv.h | 33 ++++++++++++++++++ 10 files changed, 33 insertions(+), 83 deletions(-) delete mode 100644 drivers/media/dvb/firewire/avc.h delete mode 100644 drivers/media/dvb/firewire/firedtv-ci.h delete mode 100644 drivers/media/dvb/firewire/firedtv-rc.h commit 37682f529d7141a43c202369b664c31a2923f691 Author: Stefan Richter <stefanr at s5r6.in-berlin.de> Date: Sun Feb 15 15:33:17 2009 +0100 firedtv: misc style touch-ups Standardize on lower-case hexadecimal constants. Adjust whitespace. Omit unnecessary pointer type casts and an unnecessary list head initialization. Use dev_printk. Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de> drivers/media/dvb/firewire/avc.c | 32 +++++++------- drivers/media/dvb/firewire/firedtv-1394.c | 35 ++++----------- drivers/media/dvb/firewire/firedtv-ci.c | 29 ++++++------- drivers/media/dvb/firewire/firedtv-dvb.c | 65 +++++++++++++--------------- drivers/media/dvb/firewire/firedtv-fe.c | 27 +++++++----- 5 files changed, 85 insertions(+), 103 deletions(-) -- Stefan Richter -=====-==--= --=- -==== http://arcgraph.de/sr/
