LIRC 0.8.7 Fixes for Maverick

Leann Ogasawara leann.ogasawara at canonical.com
Mon Aug 23 17:00:29 BST 2010


On Mon, 2010-08-23 at 09:22 -0600, Tim Gardner wrote:
> On 08/23/2010 08:31 AM, Mario Limonciello wrote:
> > Adding Jarod Wilson.
> >
> > On 08/23/2010 10:23 AM, Tim Gardner wrote:
> >> On 08/19/2010 09:53 AM, Mario Limonciello wrote:
> >>> Hi Everyone:
> >>>
> >>> I've assembled and tested a set of LIRC fixes for Maverick that should
> >>> be compatible with 2.6.35. These sauce patches should be droppable for
> >>> 2.6.36 (lirc is in staging, and mceusb/streamzap should be merged from
> >>> v4l-dvb's other branch into mainline). The 4 sauce patches are the same
> >>> ones that Fedora 14 is going to be shipping with.
> >>>
> >>> I've also opened a tracking bug for this at
> >>> https://bugs.edge.launchpad.net/ubuntu/+source/linux/+bug/620498. Pull
> >>> request below.
> >>>
> >>>
> >>> The following changes since commit
> >>> c3395bde8d122155fec15f2d2953a3426b09fbc2:
> >>> Mathieu J. Poirier (1):
> >>> UBUNTU: SAUCE: (no-up) ARM: Resetting power_mode to its original value.
> >>>
> >>> are available in the git repository at:
> >>>
> >>> git://kernel.ubuntu.com/mariol/ubuntu-maverick.git lirc-maverick
> >>>
> >>> Jarod Wilson (4):
> >>> UBUNTU: SAUCE: Bring in staging/lirc from 2.6.36
> >>> UBUNTU: SAUCE: Update ir-core to linuxtv/other which should be merged
> >>> for 2.6.36.
> >>> UBUNTU: SAUCE: Fix memleaks in imon and mceusb drivers
> >>> UBUNTU: SAUCE: Bring in streamzap support from linuxtv/other
> >>>
> >>> Mario Limonciello (2):
> >>> UBUNTU: Remove ubuntu/lirc in favor of staging/lirc from 2.6.36
> >>> UBUNTU: [Config] Regenerate config for LIRC in staging
> >>>
> >>> Documentation/DocBook/media-entities.tmpl | 1 +
> >>> Documentation/DocBook/media.tmpl | 8 +-
> >>> .../DocBook/v4l/lirc_device_interface.xml | 235 ++
> >>> Documentation/DocBook/v4l/remote_controllers.xml | 2 +
> >>> Documentation/dvb/get_dvb_firmware | 19 +-
> >>> Documentation/video4linux/CARDLIST.cx23885 | 6 +-
> >>> debian.master/config/amd64/config.common.amd64 | 1 -
> >>> debian.master/config/armel/config.flavour.omap | 1 -
> >>> .../config/armel/config.flavour.versatile | 1 -
> >>> debian.master/config/config.common.ubuntu | 14 +-
> >>> debian.master/config/i386/config.common.i386 | 1 -
> >>> debian.master/control | 750 +++++++
> >>> debian.master/control.stub | 750 +++++++
> >>> debian.master/d-i/kernel-versions | 19 +
> >>> drivers/input/evdev.c | 39 +
> >>> drivers/input/input.c | 268 ++-
> >>> drivers/media/IR/Kconfig | 56 +
> >>> drivers/media/IR/Makefile | 5 +
> >>> drivers/media/IR/imon.c | 25 +-
> >>> drivers/media/IR/ir-core-priv.h | 60 +
> >>> drivers/media/IR/ir-jvc-decoder.c | 152 +--
> >>> drivers/media/IR/ir-lirc-codec.c | 283 +++
> >>> drivers/media/IR/ir-nec-decoder.c | 151 +--
> >>> drivers/media/IR/ir-raw-event.c | 167 +-
> >>> drivers/media/IR/ir-rc5-decoder.c | 167 +--
> >>> drivers/media/IR/ir-rc5-sz-decoder.c | 153 ++
> >>> drivers/media/IR/ir-rc6-decoder.c | 153 +--
> >>> drivers/media/IR/ir-sony-decoder.c | 155 +--
> >>> drivers/media/IR/ir-sysfs.c | 269 ++-
> >>> drivers/media/IR/keymaps/Makefile | 3 +
> >>> drivers/media/IR/keymaps/rc-lirc.c | 41 +
> >>> drivers/media/IR/keymaps/rc-rc6-mce.c | 105 +
> >>> drivers/media/IR/keymaps/rc-streamzap.c | 82 +
> >>> drivers/media/IR/lirc_dev.c | 764 +++++++
> >>> drivers/media/IR/mceusb.c | 1130 ++++++++++
> >>> drivers/media/IR/streamzap.c | 569 +++++
> >>> drivers/media/common/tuners/tda18271-fe.c | 8 +-
> >>> drivers/media/dvb/mantis/Kconfig | 14 +-
> >>> drivers/media/dvb/mantis/mantis_input.c | 5 +-
> >>> drivers/media/video/cx23885/cx23885-cards.c | 40 +
> >>> drivers/media/video/cx23885/cx23885-core.c | 11 +-
> >>> drivers/media/video/cx23885/cx23885-dvb.c | 2 +-
> >>> drivers/media/video/cx23885/cx23885-input.c | 317 +--
> >>> drivers/media/video/cx23885/cx23885-ir.c | 2 +-
> >>> drivers/media/video/cx23885/cx23885.h | 12 +-
> >>> drivers/media/video/cx88/cx88-cards.c | 9 +-
> >>> drivers/media/video/cx88/cx88-i2c.c | 6 +-
> >>> drivers/media/video/cx88/cx88-input.c | 46 +-
> >>> drivers/media/video/cx88/cx88.h | 1 +
> >>> drivers/media/video/em28xx/em28xx-input.c | 80 +-
> >>> drivers/media/video/em28xx/em28xx-video.c | 4 +-
> >>> drivers/media/video/em28xx/em28xx.h | 1 +
> >>> drivers/media/video/hdpvr/hdpvr-core.c | 5 +
> >>> drivers/media/video/ir-kbd-i2c.c | 14 +-
> >>> drivers/media/video/pvrusb2/pvrusb2-ioread.c | 5 +-
> >>> drivers/staging/Kconfig | 2 +
> >>> drivers/staging/Makefile | 1 +
> >>> drivers/staging/lirc/Kconfig | 105 +
> >>> drivers/staging/lirc/Makefile | 18 +
> >>> drivers/staging/lirc/TODO | 8 +
> >>> drivers/staging/lirc/TODO.lirc_i2c | 3 +
> >>> .../staging/lirc}/lirc_bt829.c | 25 +-
> >>> .../staging/lirc}/lirc_ene0100.c | 17 +-
> >>> .../staging/lirc}/lirc_ene0100.h | 25 +-
> >>> .../lirc_i2c => drivers/staging/lirc}/lirc_i2c.c | 264 +---
> >>> .../staging/lirc}/lirc_igorplugusb.c | 237 +--
> >>> drivers/staging/lirc/lirc_imon.c | 1058 +++++++++
> >>> .../lirc_it87 => drivers/staging/lirc}/lirc_it87.c | 141 +-
> >>> .../lirc_it87 => drivers/staging/lirc}/lirc_it87.h | 0
> >>> .../staging/lirc}/lirc_ite8709.c | 54 +-
> >>> .../staging/lirc}/lirc_parallel.c | 107 +-
> >>> .../staging/lirc}/lirc_parallel.h | 2 +-
> >>> .../staging/lirc}/lirc_sasem.c | 273 +--
> >>> .../staging/lirc}/lirc_serial.c | 399 ++---
> >>> .../lirc_sir => drivers/staging/lirc}/lirc_sir.c | 117 +-
> >>> .../staging/lirc}/lirc_ttusbir.c | 24 +-
> >>> drivers/staging/lirc/lirc_zilog.c | 1387 ++++++++++++
> >>> include/linux/input.h | 39 +-
> >>> include/media/ir-core.h | 8 +-
> >>> include/media/ir-kbd-i2c.h | 2 +-
> >>> include/media/lirc.h | 165 ++
> >>> include/media/lirc_dev.h | 225 ++
> >>> include/media/rc-map.h | 9 +
> >>> ubuntu/Kconfig | 1 -
> >>> ubuntu/Makefile | 1 -
> >>> ubuntu/lirc/Kconfig | 88 -
> >>> ubuntu/lirc/Makefile | 23 -
> >>> ubuntu/lirc/kcompat.h | 402 ----
> >>> ubuntu/lirc/lirc.h | 105 -
> >>> ubuntu/lirc/lirc_atiusb/Makefile | 3 -
> >>> ubuntu/lirc/lirc_atiusb/lirc_atiusb.c | 1450 ------------
> >>> ubuntu/lirc/lirc_bt829/Makefile | 3 -
> >>> ubuntu/lirc/lirc_dev/Makefile | 3 -
> >>> ubuntu/lirc/lirc_dev/lirc_dev.c | 1024 ---------
> >>> ubuntu/lirc/lirc_dev/lirc_dev.h | 343 ---
> >>> ubuntu/lirc/lirc_ene0100/Makefile | 3 -
> >>> ubuntu/lirc/lirc_gpio/Makefile | 3 -
> >>> ubuntu/lirc/lirc_gpio/lirc_gpio.c | 613 -----
> >>> ubuntu/lirc/lirc_i2c/Makefile | 3 -
> >>> ubuntu/lirc/lirc_igorplugusb/Makefile | 3 -
> >>> ubuntu/lirc/lirc_imon/Makefile | 3 -
> >>> ubuntu/lirc/lirc_imon/lirc_imon.c | 2368 --------------------
> >>> ubuntu/lirc/lirc_it87/Makefile | 3 -
> >>> ubuntu/lirc/lirc_it87/README | 46 -
> >>> ubuntu/lirc/lirc_it87/TODO | 5 -
> >>> ubuntu/lirc/lirc_ite8709/Makefile | 3 -
> >>> ubuntu/lirc/lirc_mceusb/Makefile | 3 -
> >>> ubuntu/lirc/lirc_mceusb/lirc_mceusb.c | 1288 -----------
> >>> ubuntu/lirc/lirc_parallel/Makefile | 3 -
> >>> ubuntu/lirc/lirc_sasem/Makefile | 2 -
> >>> ubuntu/lirc/lirc_serial/Makefile | 3 -
> >>> ubuntu/lirc/lirc_sir/Makefile | 3 -
> >>> ubuntu/lirc/lirc_streamzap/Makefile | 2 -
> >>> ubuntu/lirc/lirc_streamzap/lirc_streamzap.c | 888 --------
> >>> ubuntu/lirc/lirc_ttusbir/Makefile | 3 -
> >>> ubuntu/lirc/lirc_wpc8769l/Makefile | 3 -
> >>> ubuntu/lirc/lirc_wpc8769l/lirc_wpc8769l.c | 1177 ----------
> >>> ubuntu/lirc/lirc_wpc8769l/lirc_wpc8769l.h | 186 --
> >>> 118 files changed, 9377 insertions(+), 12585 deletions(-)
> >>> create mode 100644 Documentation/DocBook/v4l/lirc_device_interface.xml
> >>> mode change 100644 => 100755 Documentation/video4linux/extract_xc3028.pl
> >>> create mode 100644 debian.master/control
> >>> create mode 100644 debian.master/control.stub
> >>> create mode 100644 debian.master/d-i/kernel-versions
> >>> create mode 100644 drivers/media/IR/ir-lirc-codec.c
> >>> create mode 100644 drivers/media/IR/ir-rc5-sz-decoder.c
> >>> create mode 100644 drivers/media/IR/keymaps/rc-lirc.c
> >>> create mode 100644 drivers/media/IR/keymaps/rc-rc6-mce.c
> >>> create mode 100644 drivers/media/IR/keymaps/rc-streamzap.c
> >>> create mode 100644 drivers/media/IR/lirc_dev.c
> >>> create mode 100644 drivers/media/IR/mceusb.c
> >>> create mode 100644 drivers/media/IR/streamzap.c
> >>> create mode 100644 drivers/staging/lirc/Kconfig
> >>> create mode 100644 drivers/staging/lirc/Makefile
> >>> create mode 100644 drivers/staging/lirc/TODO
> >>> create mode 100644 drivers/staging/lirc/TODO.lirc_i2c
> >>> rename {ubuntu/lirc/lirc_bt829 => drivers/staging/lirc}/lirc_bt829.c
> >>> (92%)
> >>> rename {ubuntu/lirc/lirc_ene0100 => drivers/staging/lirc}/lirc_ene0100.c
> >>> (97%)
> >>> rename {ubuntu/lirc/lirc_ene0100 => drivers/staging/lirc}/lirc_ene0100.h
> >>> (90%)
> >>> rename {ubuntu/lirc/lirc_i2c => drivers/staging/lirc}/lirc_i2c.c (66%)
> >>> rename {ubuntu/lirc/lirc_igorplugusb =>
> >>> drivers/staging/lirc}/lirc_igorplugusb.c (69%)
> >>> create mode 100644 drivers/staging/lirc/lirc_imon.c
> >>> rename {ubuntu/lirc/lirc_it87 => drivers/staging/lirc}/lirc_it87.c (91%)
> >>> rename {ubuntu/lirc/lirc_it87 => drivers/staging/lirc}/lirc_it87.h
> >>> (100%)
> >>> rename {ubuntu/lirc/lirc_ite8709 => drivers/staging/lirc}/lirc_ite8709.c
> >>> (94%)
> >>> rename {ubuntu/lirc/lirc_parallel =>
> >>> drivers/staging/lirc}/lirc_parallel.c (86%)
> >>> rename {ubuntu/lirc/lirc_parallel =>
> >>> drivers/staging/lirc}/lirc_parallel.h (91%)
> >>> rename {ubuntu/lirc/lirc_sasem => drivers/staging/lirc}/lirc_sasem.c
> >>> (77%)
> >>> rename {ubuntu/lirc/lirc_serial => drivers/staging/lirc}/lirc_serial.c
> >>> (82%)
> >>> rename {ubuntu/lirc/lirc_sir => drivers/staging/lirc}/lirc_sir.c (92%)
> >>> rename {ubuntu/lirc/lirc_ttusbir => drivers/staging/lirc}/lirc_ttusbir.c
> >>> (95%)
> >>> create mode 100644 drivers/staging/lirc/lirc_zilog.c
> >>> create mode 100644 include/media/lirc.h
> >>> create mode 100644 include/media/lirc_dev.h
> >>> delete mode 100644 ubuntu/lirc/Kconfig
> >>> delete mode 100644 ubuntu/lirc/Makefile
> >>> delete mode 100644 ubuntu/lirc/kcompat.h
> >>> delete mode 100644 ubuntu/lirc/lirc.h
> >>> delete mode 100644 ubuntu/lirc/lirc_atiusb/Makefile
> >>> delete mode 100644 ubuntu/lirc/lirc_atiusb/lirc_atiusb.c
> >>> delete mode 100644 ubuntu/lirc/lirc_bt829/Makefile
> >>> delete mode 100644 ubuntu/lirc/lirc_dev/Makefile
> >>> delete mode 100644 ubuntu/lirc/lirc_dev/lirc_dev.c
> >>> delete mode 100644 ubuntu/lirc/lirc_dev/lirc_dev.h
> >>> delete mode 100644 ubuntu/lirc/lirc_ene0100/Makefile
> >>> delete mode 100644 ubuntu/lirc/lirc_gpio/Makefile
> >>> delete mode 100644 ubuntu/lirc/lirc_gpio/lirc_gpio.c
> >>> delete mode 100644 ubuntu/lirc/lirc_i2c/Makefile
> >>> delete mode 100644 ubuntu/lirc/lirc_igorplugusb/Makefile
> >>> delete mode 100644 ubuntu/lirc/lirc_imon/Makefile
> >>> delete mode 100644 ubuntu/lirc/lirc_imon/lirc_imon.c
> >>> delete mode 100644 ubuntu/lirc/lirc_it87/Makefile
> >>> delete mode 100644 ubuntu/lirc/lirc_it87/README
> >>> delete mode 100644 ubuntu/lirc/lirc_it87/TODO
> >>> delete mode 100644 ubuntu/lirc/lirc_ite8709/Makefile
> >>> delete mode 100644 ubuntu/lirc/lirc_mceusb/Makefile
> >>> delete mode 100644 ubuntu/lirc/lirc_mceusb/lirc_mceusb.c
> >>> delete mode 100644 ubuntu/lirc/lirc_parallel/Makefile
> >>> delete mode 100644 ubuntu/lirc/lirc_sasem/Makefile
> >>> delete mode 100644 ubuntu/lirc/lirc_serial/Makefile
> >>> delete mode 100644 ubuntu/lirc/lirc_sir/Makefile
> >>> delete mode 100644 ubuntu/lirc/lirc_streamzap/Makefile
> >>> delete mode 100755 ubuntu/lirc/lirc_streamzap/lirc_streamzap.c
> >>> delete mode 100644 ubuntu/lirc/lirc_ttusbir/Makefile
> >>> delete mode 100644 ubuntu/lirc/lirc_wpc8769l/Makefile
> >>> delete mode 100644 ubuntu/lirc/lirc_wpc8769l/lirc_wpc8769l.c
> >>> delete mode 100644 ubuntu/lirc/lirc_wpc8769l/lirc_wpc8769l.h
> >>>
> >>
> >> In principle I'm OK with this since it pulls in from upstream
> >> (mostly). I assume its ARM safe since its a USB protocol?
> >>
> >> Whats the story with IR_RC5_SZ_DECODER which _didn't_ land in 2.6.36 ?
> >>
> >> I think you should rip out ubuntu/lirc as the first commit as that
> >> ought to make things a bit more bisectable. As soon as
> >> drivers/staging/lirc/Kconfig and drivers/media/IR/Kconfig are updated,
> >> bisection gets a bit more complex. Bisection is gonna be a PITA any
> >> way you do it, so its up to Leann.
> >>
> >> Acked-by: Tim Gardner <tim.gardner at canonical.com>

As Tim mentioned, I'm also mostly ok with this since it's dropping an
ubuntu/ driver we've been having to maintain separately in favor of
pulling what's upstream.  I just wanted to do a quick review (which I
plan to do today) of some of the changes that might have a more wide
spread affect, eg:

 drivers/input/evdev.c                              |   39 +
 drivers/input/input.c                              |  268 ++-
 drivers/media/*

> > Jarod:
> >
> > Could you comment on those first two questions? I don't have a method to
> > test on ARM, so if there are any worries, i'll just redo the config
> > commit to disable ARM.
> >
> > Tim:
> >
> > I'm a little iffy on process tid-bits here. When this is pulled can
> > Leann reshuffle the commit orders, or should I fix that in my tree
> > before the pull?
> >
> 
> I'm sure Leann can manage. She's gonna have to mess with updateconfigs 
> anyways since they almost never merge correctly.

I can handle the re-ordering of commits when I apply them.

Thanks,
Leann




More information about the kernel-team mailing list