I now pushed the following two branches out to linux1394-2.6.git:
git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git firedtv
git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git firedtv-2.6.27
The firedtv branch is based on Linux v2.6.25. It can be cleanly pulled
into a 2.6.25(.y) based tree or a 2.6.26(.y) based tree.
The firedtv-2.6.27 branch is based on Linux v2.6.27-rc3 and can thus be
pulled cleanly into a clone of Linus' current tree.
To track one of these branches, you can for example run
git remote add -t firedtv linux1394 git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git
or
git remote add -t firedtv-2.6.27 linux1394 git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git
in a clone of linux-2.6.git. Then stay up to date for example with
git fetch linux1394
git checkout my-work-branch
git pull . refs/remotes/linux1394/firedtv
or
git pull . refs/remotes/linux1394/firedtv-2.6.27
I will also keep my firedtv quilt kits up to date during the merge
preparation phase: http://user.in-berlin.de/~s5r6/linux1394/firedtv/
This is the current content of the firedtv branch:
Ben Backx (2):
firesat: fix DVB-S2 device recognition
firesat: add DVB-S support for DVB-S2 devices
Greg Kroah-Hartman (1):
DVB: add firesat driver
Henrik Kurelid (1):
firesat: update isochronous interface, add CI support
drivers/media/dvb/Kconfig | 2 +
drivers/media/dvb/Makefile | 2 +
drivers/media/dvb/firesat/Kconfig | 11 +
drivers/media/dvb/firesat/Makefile | 13 +
drivers/media/dvb/firesat/avc_api.c | 1307 ++++++++++++++++++++++
drivers/media/dvb/firesat/avc_api.h | 449 ++++++++
drivers/media/dvb/firesat/cmp.c | 242 ++++
drivers/media/dvb/firesat/cmp.h | 9 +
drivers/media/dvb/firesat/firesat-ci.c | 353 ++++++
drivers/media/dvb/firesat/firesat-ci.h | 9 +
drivers/media/dvb/firesat/firesat-rc.c | 84 ++
drivers/media/dvb/firesat/firesat-rc.h | 9 +
drivers/media/dvb/firesat/firesat.h | 230 ++++
drivers/media/dvb/firesat/firesat_1394.c | 389 +++++++
drivers/media/dvb/firesat/firesat_dvb.c | 365 ++++++
drivers/media/dvb/firesat/firesat_fe.c | 291 +++++
drivers/media/dvb/firesat/firesat_iso.c | 106 ++
17 files changed, 3871 insertions(+), 0 deletions(-)
create mode 100644 drivers/media/dvb/firesat/Kconfig
create mode 100644 drivers/media/dvb/firesat/Makefile
create mode 100644 drivers/media/dvb/firesat/avc_api.c
create mode 100644 drivers/media/dvb/firesat/avc_api.h
create mode 100644 drivers/media/dvb/firesat/cmp.c
create mode 100644 drivers/media/dvb/firesat/cmp.h
create mode 100644 drivers/media/dvb/firesat/firesat-ci.c
create mode 100644 drivers/media/dvb/firesat/firesat-ci.h
create mode 100644 drivers/media/dvb/firesat/firesat-rc.c
create mode 100644 drivers/media/dvb/firesat/firesat-rc.h
create mode 100644 drivers/media/dvb/firesat/firesat.h
create mode 100644 drivers/media/dvb/firesat/firesat_1394.c
create mode 100644 drivers/media/dvb/firesat/firesat_dvb.c
create mode 100644 drivers/media/dvb/firesat/firesat_fe.c
create mode 100644 drivers/media/dvb/firesat/firesat_iso.c
The firedtv-2.6.27 branch is the same plus a merge commit to warp it
forward to 2.6.27-rc3.
I.e. there is still some smaller and bigger work to be done like
- adding missing copyright notices,
- rename the driver from firesat to firedtv,
- misc coding style adaptions and API usage changes (whitespace,
camelcase names, semaphore to mutex conversion, bitfields...),
- addressing some sparse warnings.
I will gradually work on these items as spare time permits and will post
patches to the list for review before I do any updates of the git repo.
Henrik told me that he wants to look into reported runtime issues of the
driver; I will harvest such patches as well and will try to merge them
with ongoing style cleanups.
When some of the more obvious cleanups are done, I will post a snapshot
of firedtv on LKML and ask for inclusion into linux-next. In my
opinion, we should aim for mainline merge of firedtv right after 2.6.27
was released, i.e. before 2.6.28-rc1.
Comments (and patches) are welcome,
--
Stefan Richter
-=====-==--- =--- =--==
http://arcgraph.de/sr/
