LIRC 0.8.7 Fixes for Maverick

classic Classic list List threaded Threaded
20 messages Options
Reply | Threaded
Open this post in threaded view
|

LIRC 0.8.7 Fixes for Maverick

Mario Limonciello-2
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

--
Mario Limonciello
[hidden email]

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

Re: LIRC 0.8.7 Fixes for Maverick

Mario Limonciello-2
On 08/19/2010 11: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
>
> --
> Mario Limonciello
> [hidden email]
Any comments?

--
Mario Limonciello
[hidden email]

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

Re: LIRC 0.8.7 Fixes for Maverick

Tim Gardner-2
In reply to this post by Mario Limonciello-2
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 <[hidden email]>

--
Tim Gardner [hidden email]

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

Re: LIRC 0.8.7 Fixes for Maverick

Mario Limonciello-2
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 [hidden email]

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?

Thanks,

--
Mario Limonciello
[hidden email]

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

Re: LIRC 0.8.7 Fixes for Maverick

Tim Gardner-2
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 <[hidden email]>
>>
> 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.

rtg
--
Tim Gardner [hidden email]

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

Re: LIRC 0.8.7 Fixes for Maverick

Jarod Wilson-4
In reply to this post by Mario Limonciello-2
On Mon, Aug 23, 2010 at 10:31:57AM -0400, 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
...

> >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 <[hidden email]>
> >
> 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.

Don't know of any reason any of this wouldn't work on ARM just as well (or
as badly?) as the old lirc bits would, but I've never touched ARM myself.

The streamzap bits are posted to linux-media, but have not yet been merged
by Mauro. He's been a bit busy lately, and hasn't had a chance to review
them in-depth yet, but told me that at a glance, they looked fine, and he
agrees with the approach taken using the additional decoder, so those bits
*should* be committed pretty much as-is relatively soon. Whether or not
they'll make 2.6.36 remains to be seen.

--
Jarod Wilson
[hidden email]


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

Re: LIRC 0.8.7 Fixes for Maverick

Leann Ogasawara
In reply to this post by Tim Gardner-2
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 <[hidden email]>

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


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

Re: LIRC 0.8.7 Fixes for Maverick

Jarod Wilson-4
On Mon, Aug 23, 2010 at 09:00:29AM -0700, Leann Ogasawara wrote:

> 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.
...
> 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/*

Note that the evdev and input changes were done in a way that *should* be
100% backwards-compatible with all existing drivers. There were a few
bugs shaken out of the {g,s}etkeycodebig bits via linux-next, but no
problems reported since, that I'm aware of. The rest of the changes under
drivers/media/* just convert a bit of already-in-tree code over to using
ir-core, should also be fairly innocuous -- these ports were done and
tested by Mauro.

--
Jarod Wilson
[hidden email]


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[APPLIED] Re: LIRC 0.8.7 Fixes for Maverick

Leann Ogasawara
In reply to this post by Mario Limonciello-2
Applied to Maverick linux master.

Thanks,
Leann

On Thu, 2010-08-19 at 10:53 -0500, 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
>
> --
> Mario Limonciello
> [hidden email]



--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

Re: LIRC 0.8.7 Fixes for Maverick

Jarod Wilson-4
In reply to this post by Leann Ogasawara
On Mon, Aug 23, 2010 at 09:00:29AM -0700, Leann Ogasawara wrote:
> 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.
...
> > >>> 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

So... There's a fair amount of additional ir-core stuff I'd suggest
bringing in at some point. I've already pointed Mario at this, and been
discussing them with him and other mythbuntu devs on irc.

http://people.redhat.com/~jwilson/misc/ir-core-2.6.35/

I believe the above four already committed commits map to:

lirc-staging-2.6.36.patch
linux-2.6-v4l-dvb-ir-core-update.patch
linux-2.6-v4l-dvb-ir-core-memleak-fixes.patch
linux-2.6-v4l-dvb-ir-core-streamzap.patch

I've since tacked on a few more patches in the Fedora 14 kernels:

linux-2.6-v4l-dvb-ir-core-update-2.patch
linux-2.6-v4l-dvb-ir-core-update-3.patch
linux-2.6-lirc-ioctl-compat-fixups.patch

Most of these are in the linuxtv media_tree/staging/v2.6.37 branch, but a
few are still pending merge by Mauro. I've included commit IDs and log
messages for the relevant commits in the patches themselves.

Highlights of these updates include:
- proper auto-config of another imon 0xffdc device
- imon key release fixups (was possible for keys to get stuck down)
- lirc_ene0100 replaced with ene_ir (ported to ir-core)
- new nuvoton (ASRock ION 330HT) ir driver
- lirc compat ioctl fixups so 64-bit kernel, 32-bit userspace works

Please consider merging these patches as well.

Thanks much,

--
Jarod Wilson
[hidden email]


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

Re: LIRC 0.8.7 Fixes for Maverick

Mario Limonciello-2
Leann:

On Mon, Oct 11, 2010 at 16:05, Jarod Wilson <[hidden email]> wrote:
On Mon, Aug 23, 2010 at 09:00:29AM -0700, Leann Ogasawara wrote:
> 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.
...
> > >>> 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

So... There's a fair amount of additional ir-core stuff I'd suggest
bringing in at some point. I've already pointed Mario at this, and been
discussing them with him and other mythbuntu devs on irc.

http://people.redhat.com/~jwilson/misc/ir-core-2.6.35/

I believe the above four already committed commits map to:

lirc-staging-2.6.36.patch
linux-2.6-v4l-dvb-ir-core-update.patch
linux-2.6-v4l-dvb-ir-core-memleak-fixes.patch
linux-2.6-v4l-dvb-ir-core-streamzap.patch

I've since tacked on a few more patches in the Fedora 14 kernels:

linux-2.6-v4l-dvb-ir-core-update-2.patch
linux-2.6-v4l-dvb-ir-core-update-3.patch
linux-2.6-lirc-ioctl-compat-fixups.patch

Most of these are in the linuxtv media_tree/staging/v2.6.37 branch, but a
few are still pending merge by Mauro. I've included commit IDs and log
messages for the relevant commits in the patches themselves.

Highlights of these updates include:
- proper auto-config of another imon 0xffdc device
- imon key release fixups (was possible for keys to get stuck down)
- lirc_ene0100 replaced with ene_ir (ported to ir-core)
- new nuvoton (ASRock ION 330HT) ir driver
- lirc compat ioctl fixups so 64-bit kernel, 32-bit userspace works

Please consider merging these patches as well.

Thanks much,

--
Jarod Wilson
[hidden email]

There are some bugs starting to crop up from all the upgraders that didn't test during development mainly with i2c and imon remotes.  it would be good to try to help some of them.  If you think they're not good candidates for SRU's, would you be open to an LBM for ir-core?

Thanks,

--
Mario Limonciello
[hidden email]

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

Re: LIRC 0.8.7 Fixes for Maverick

Stefan Bader-2
On 10/12/2010 12:09 AM, Mario Limonciello wrote:

> Leann:
>
> On Mon, Oct 11, 2010 at 16:05, Jarod Wilson <[hidden email]> wrote:
>
>> On Mon, Aug 23, 2010 at 09:00:29AM -0700, Leann Ogasawara wrote:
>>> 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.
>> ...
>>>>>>> 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
>>
>> So... There's a fair amount of additional ir-core stuff I'd suggest
>> bringing in at some point. I've already pointed Mario at this, and been
>> discussing them with him and other mythbuntu devs on irc.
>>
>> http://people.redhat.com/~jwilson/misc/ir-core-2.6.35/
>>
>> I believe the above four already committed commits map to:
>>
>> lirc-staging-2.6.36.patch
>> linux-2.6-v4l-dvb-ir-core-update.patch
>> linux-2.6-v4l-dvb-ir-core-memleak-fixes.patch
>> linux-2.6-v4l-dvb-ir-core-streamzap.patch
>>
>> I've since tacked on a few more patches in the Fedora 14 kernels:
>>
>> linux-2.6-v4l-dvb-ir-core-update-2.patch
>> linux-2.6-v4l-dvb-ir-core-update-3.patch
>> linux-2.6-lirc-ioctl-compat-fixups.patch
>>
>> Most of these are in the linuxtv media_tree/staging/v2.6.37 branch, but a
>> few are still pending merge by Mauro. I've included commit IDs and log
>> messages for the relevant commits in the patches themselves.
>>
>> Highlights of these updates include:
>> - proper auto-config of another imon 0xffdc device
>> - imon key release fixups (was possible for keys to get stuck down)
>> - lirc_ene0100 replaced with ene_ir (ported to ir-core)
>> - new nuvoton (ASRock ION 330HT) ir driver
>> - lirc compat ioctl fixups so 64-bit kernel, 32-bit userspace works
>>
>> Please consider merging these patches as well.
>>
>> Thanks much,
>>
>> --
>> Jarod Wilson
>> [hidden email]
>>
>> There are some bugs starting to crop up from all the upgraders that didn't
> test during development mainly with i2c and imon remotes.  it would be good
> to try to help some of them.  If you think they're not good candidates for
> SRU's, would you be open to an LBM for ir-core?
>
> Thanks,
>
>

Just as a note, I am currently working on a lbm-input which starts adding a
newer wacom driver (drivers/input/tablet). Would ir be thematically close to
input? I could think that it has value to be separated but wanted to bring it up
so we do not find out too late and we would have wanted to join the things.

-Stefan

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

Re: LIRC 0.8.7 Fixes for Maverick

Jarod Wilson-4
In reply to this post by Mario Limonciello-2
On Mon, Oct 11, 2010 at 05:09:32PM -0500, Mario Limonciello wrote:

> Leann:
>
> On Mon, Oct 11, 2010 at 16:05, Jarod Wilson <[hidden email]> wrote:
>
> > On Mon, Aug 23, 2010 at 09:00:29AM -0700, Leann Ogasawara wrote:
> > > 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.
> > ...
> > > > >>> 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
> >
> > So... There's a fair amount of additional ir-core stuff I'd suggest
> > bringing in at some point. I've already pointed Mario at this, and been
> > discussing them with him and other mythbuntu devs on irc.
> >
> > http://people.redhat.com/~jwilson/misc/ir-core-2.6.35/
> >
> > I believe the above four already committed commits map to:
> >
> > lirc-staging-2.6.36.patch
> > linux-2.6-v4l-dvb-ir-core-update.patch
> > linux-2.6-v4l-dvb-ir-core-memleak-fixes.patch
> > linux-2.6-v4l-dvb-ir-core-streamzap.patch
> >
> > I've since tacked on a few more patches in the Fedora 14 kernels:
> >
> > linux-2.6-v4l-dvb-ir-core-update-2.patch
> > linux-2.6-v4l-dvb-ir-core-update-3.patch
> > linux-2.6-lirc-ioctl-compat-fixups.patch
> >
> > Most of these are in the linuxtv media_tree/staging/v2.6.37 branch, but a
> > few are still pending merge by Mauro. I've included commit IDs and log
> > messages for the relevant commits in the patches themselves.
> >
> > Highlights of these updates include:
> > - proper auto-config of another imon 0xffdc device
> > - imon key release fixups (was possible for keys to get stuck down)
> > - lirc_ene0100 replaced with ene_ir (ported to ir-core)
> > - new nuvoton (ASRock ION 330HT) ir driver
> > - lirc compat ioctl fixups so 64-bit kernel, 32-bit userspace works
> >
> > Please consider merging these patches as well.
> >
> >
> There are some bugs starting to crop up from all the upgraders that didn't
> test during development mainly with i2c and imon remotes.

Though truth be told, half the issue w/the i2c and imon users is simply
documentation. lirc_i2c changed in the 2.6.33 era due to i2c subsystem
changes, and its not been possible to bind it to pvr-150 cards with a
zilog z8 IR chip since then, but lirc_zilog binds just fine. I've had at
least one person on irc confirm that simply editing
/etc/lirc/hardware.conf, swapping lirc_i2c for lirc_zilog, got them back
to fully functional. The imon case, tools are apparently still telling
imon users they need to use lirc_imon and configuring things to talk to a
/dev/lircX device node that doesn't get created, as their imon devices are
now handled by the imon driver. Its a pure scancode-based device, so the
ir-core lirc bridge driver is never invoked, as there's no raw IR to pass
-- lirc_imon was hackily passing scancodes via its lirc device interface
rather than raw IR.

But some of the imon devices w/the current Ubuntu kernel don't get set up
correctly (one specific 0xffdc model, anyway), and there's definitely an
issue present with key releases not happening as they should in certain
cases -- see https://bugzilla.kernel.org/show_bug.cgi?id=16351 .

> it would be good
> to try to help some of them.  If you think they're not good candidates for
> SRU's, would you be open to an LBM for ir-core?

And while you're at it, fancy adding a patch to improves the Linux HID
layer to the point where the TiVo Slide remotes Just Work(tm) right out of
the box too? :)

https://patchwork.kernel.org/patch/161481/

I've been contacted by more than a few Ubuntu users anxious to use these
remotes with both MythTV and XBMC.

--
Jarod Wilson
[hidden email]


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

Re: LIRC 0.8.7 Fixes for Maverick

Jarod Wilson-4
In reply to this post by Stefan Bader-2
On Tue, Oct 12, 2010 at 09:23:06AM +0200, Stefan Bader wrote:

> On 10/12/2010 12:09 AM, Mario Limonciello wrote:
> > Leann:
> >
> > On Mon, Oct 11, 2010 at 16:05, Jarod Wilson <[hidden email]> wrote:
> >
> >> On Mon, Aug 23, 2010 at 09:00:29AM -0700, Leann Ogasawara wrote:
> >>> 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.
> >> ...
> >>>>>>> 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
> >>
> >> So... There's a fair amount of additional ir-core stuff I'd suggest
> >> bringing in at some point. I've already pointed Mario at this, and been
> >> discussing them with him and other mythbuntu devs on irc.
> >>
> >> http://people.redhat.com/~jwilson/misc/ir-core-2.6.35/
> >>
> >> I believe the above four already committed commits map to:
> >>
> >> lirc-staging-2.6.36.patch
> >> linux-2.6-v4l-dvb-ir-core-update.patch
> >> linux-2.6-v4l-dvb-ir-core-memleak-fixes.patch
> >> linux-2.6-v4l-dvb-ir-core-streamzap.patch
> >>
> >> I've since tacked on a few more patches in the Fedora 14 kernels:
> >>
> >> linux-2.6-v4l-dvb-ir-core-update-2.patch
> >> linux-2.6-v4l-dvb-ir-core-update-3.patch
> >> linux-2.6-lirc-ioctl-compat-fixups.patch
> >>
> >> Most of these are in the linuxtv media_tree/staging/v2.6.37 branch, but a
> >> few are still pending merge by Mauro. I've included commit IDs and log
> >> messages for the relevant commits in the patches themselves.
> >>
> >> Highlights of these updates include:
> >> - proper auto-config of another imon 0xffdc device
> >> - imon key release fixups (was possible for keys to get stuck down)
> >> - lirc_ene0100 replaced with ene_ir (ported to ir-core)
> >> - new nuvoton (ASRock ION 330HT) ir driver
> >> - lirc compat ioctl fixups so 64-bit kernel, 32-bit userspace works
> >>
> >> Please consider merging these patches as well.
> >>
> >> Thanks much,
> >>
> > There are some bugs starting to crop up from all the upgraders that didn't
> > test during development mainly with i2c and imon remotes.  it would be good
> > to try to help some of them.  If you think they're not good candidates for
> > SRU's, would you be open to an LBM for ir-core?
> >
> > Thanks,
> >
> >
>
> Just as a note, I am currently working on a lbm-input which starts adding a
> newer wacom driver (drivers/input/tablet). Would ir be thematically close to
> input? I could think that it has value to be separated but wanted to bring it up
> so we do not find out too late and we would have wanted to join the things.

Technically, it does at least mostly fit (though some transceivers also do
output), but I'd not merge them together. Lots of users are still slightly
baffled by remotes that appear as pure input devices, so I'd wager they
wouldn't look for newer remote drivers in a -input package. I'd probably
go with something along the lines of lbm-remotes (even though technically,
the driver is for the receiver/transmitter/transceiver hardware, not
actually for the remote itself...).

--
Jarod Wilson
[hidden email]


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

Re: LIRC 0.8.7 Fixes for Maverick

Leann Ogasawara
In reply to this post by Mario Limonciello-2
On Mon, 2010-10-11 at 17:09 -0500, Mario Limonciello wrote:

> Leann:
>
> On Mon, Oct 11, 2010 at 16:05, Jarod Wilson <[hidden email]> wrote:
>         On Mon, Aug 23, 2010 at 09:00:29AM -0700, Leann Ogasawara
>         wrote:
>        
>         > 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.
>        
>         ...
>         > > >>> 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
>        
>        
>         So... There's a fair amount of additional ir-core stuff I'd
>         suggest
>         bringing in at some point. I've already pointed Mario at this,
>         and been
>         discussing them with him and other mythbuntu devs on irc.
>        
>         http://people.redhat.com/~jwilson/misc/ir-core-2.6.35/
>        
>         I believe the above four already committed commits map to:
>        
>         lirc-staging-2.6.36.patch
>         linux-2.6-v4l-dvb-ir-core-update.patch
>         linux-2.6-v4l-dvb-ir-core-memleak-fixes.patch
>         linux-2.6-v4l-dvb-ir-core-streamzap.patch
>        
>         I've since tacked on a few more patches in the Fedora 14
>         kernels:
>        
>         linux-2.6-v4l-dvb-ir-core-update-2.patch
>         linux-2.6-v4l-dvb-ir-core-update-3.patch
>         linux-2.6-lirc-ioctl-compat-fixups.patch
>        
>         Most of these are in the linuxtv media_tree/staging/v2.6.37
>         branch, but a
>         few are still pending merge by Mauro. I've included commit IDs
>         and log
>         messages for the relevant commits in the patches themselves.
>        
>         Highlights of these updates include:
>         - proper auto-config of another imon 0xffdc device
>         - imon key release fixups (was possible for keys to get stuck
>         down)
>         - lirc_ene0100 replaced with ene_ir (ported to ir-core)
>         - new nuvoton (ASRock ION 330HT) ir driver
>         - lirc compat ioctl fixups so 64-bit kernel, 32-bit userspace
>         works
>        
>         Please consider merging these patches as well.
>        
>         Thanks much,
>        
>        
>         --
>         Jarod Wilson
>         [hidden email]
>        
>        
> There are some bugs starting to crop up from all the upgraders that
> didn't test during development mainly with i2c and imon remotes.  it
> would be good to try to help some of them.  If you think they're not
> good candidates for SRU's, would you be open to an LBM for ir-core?

After having examined these patches, I'd lean towards these being
applied to linux-backports-modules (LBM) rather than directly to the
Maverick master branch.  Reason being is that the 3 additional patches
Jarod has referenced is actually a bundle of 30 separate commits which
doesn't exactly comply with our SRU (stable release udpate) policy [1].
LBM is a bit more lenient with regards to SRU and is an elective install
from a user perspective.  I'll take a look at getting these bundled for
LBM.

With regards to the 4th patch:

https://patchwork.kernel.org/patch/161481/

Now this patch I could see qualifying for SRU.  And if it were to land
in an upstream 2.6.35.y stable release, we'd get it automatically.  Just
curious if there are any plans to submit this patch to -stable?

Thanks,
Leann

[1] https://wiki.ubuntu.com/KernelTeam/KernelUpdates


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

Re: LIRC 0.8.7 Fixes for Maverick

Jarod Wilson-4
On Thu, Oct 14, 2010 at 03:01:23PM -0700, Leann Ogasawara wrote:
> On Mon, 2010-10-11 at 17:09 -0500, Mario Limonciello wrote:
...

> > There are some bugs starting to crop up from all the upgraders that
> > didn't test during development mainly with i2c and imon remotes.  it
> > would be good to try to help some of them.  If you think they're not
> > good candidates for SRU's, would you be open to an LBM for ir-core?
>
> After having examined these patches, I'd lean towards these being
> applied to linux-backports-modules (LBM) rather than directly to the
> Maverick master branch.  Reason being is that the 3 additional patches
> Jarod has referenced is actually a bundle of 30 separate commits which
> doesn't exactly comply with our SRU (stable release udpate) policy [1].

Fair enough. I think a handful of the patches would still qualify for
SRU though.

48f1bba604f1a5a312368bad822d2c03198a3ec3 - fixes a possible oops
9df55dc861c29e43238a5644d13b5e2fb8fcdc84 - fixes a possible oops
1bdba76fc2a0bb3a1ab60ff21fba1bc9cc8fe288 - fixes a possible oops

I'd advocate for these as well, but it would seem they're not SRU
candidates, as its passed beta.

c9889354c6d36d6278ed851c74ace02d72efdd59
e081b5aead012579740501220624cafc35f22510

> LBM is a bit more lenient with regards to SRU and is an elective install
> from a user perspective.  I'll take a look at getting these bundled for
> LBM.

Note that two of those oops fixes aren't included in the patches I've got
in Fedora yet (they were just authored in the past two days).

> With regards to the 4th patch:
>
> https://patchwork.kernel.org/patch/161481/
>
> Now this patch I could see qualifying for SRU.

Hrm, if that qualifies for SRU, I'd advocate for the imon fixes too:

04c9c7d7135d0504638e02603dafa714e8d58945
4d2acb4e7a23d47b8792bce34cf874da24193ce2
08d23a4d7bf43cd7246f6546ddeab8c25d5d4e45
e156b731596795714f1428c4ec00fe9f5468e083

Pretty similar situation, makes a remote behave more completely and/or
accurately, no? (Okay, maybe a stretch, but not a big one).

> And if it were to land
> in an upstream 2.6.35.y stable release, we'd get it automatically.  Just
> curious if there are any plans to submit this patch to -stable?

Hadn't given it any thought just yet. Patch has yet to be merged in any
upstream tree, best as I know, and I hadn't really considered it as a
stable series fix, but I guess if you look at it as "fix the lacking HID
layer" instead of "enable support for a new device" it would fly.

--
Jarod Wilson
[hidden email]


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

Re: LIRC 0.8.7 Fixes for Maverick

Jeremy Kerr
In reply to this post by Mario Limonciello-2
Hi all,

Digging up an old thread here, as I've been chasing a bug with a DVB
encoder.

> 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.

This patch contains change that doesn't look to be related to IR code,
but are general changes to the cx23885 DVB driver. Patch commented
inline:

> --- a/drivers/media/video/cx23885/cx23885-core.c
> +++ b/drivers/media/video/cx23885/cx23885-core.c
> @@ -1142,7 +1142,7 @@ void cx23885_free_buffer(struct videobuf_queue *q, struct cx23885_buffer *buf)
>  
>   BUG_ON(in_interrupt());
>   videobuf_waiton(&buf->vb, 0, 0);
> - videobuf_dma_unmap(q, dma);
> + videobuf_dma_unmap(q->dev, dma);
>   videobuf_dma_free(dma);
>   btcx_riscmem_free(to_pci_dev(q->dev), &buf->risc);
>   buf->vb.state = VIDEOBUF_NEEDS_INIT;

This hunk is incorrect - videobuf_dma_unmap() takes a videobuf_queue as
its first argument. This change passes a struct device instead.

(The change to the videobuf_dma_unmap API is not in this branch)

> @@ -1953,8 +1953,12 @@ static int __devinit cx23885_initdev(struct pci_dev *pci_dev,
>   goto fail_irq;
>   }
>  
> - err = request_irq(pci_dev->irq, cx23885_irq,
> -  IRQF_SHARED | IRQF_DISABLED, dev->name, dev);
> + if (!pci_enable_msi(pci_dev))
> + err = request_irq(pci_dev->irq, cx23885_irq,
> +  IRQF_DISABLED, dev->name, dev);
> + else
> + err = request_irq(pci_dev->irq, cx23885_irq,
> +  IRQF_SHARED | IRQF_DISABLED, dev->name, dev);
>   if (err < 0) {
>   printk(KERN_ERR "%s: can't get IRQ %d\n",
>         dev->name, pci_dev->irq);
> @@ -2000,6 +2004,7 @@ static void __devexit cx23885_finidev(struct pci_dev *pci_dev)
>  
>   /* unregister stuff */
>   free_irq(pci_dev->irq, dev);
> + pci_disable_msi(pci_dev);
>  
>   cx23885_dev_unregister(dev);
>   v4l2_device_unregister(v4l2_dev);

These two hunks enable MSI for the cx23885 device, which isn't really in
line with the rest of the changes. This uncovered a problem with a DVB
card used on a motherboard that seems to have a sub-par MSI
implementation.

However, since we've already let this through to lucid-updates, we may
want to leave as-is.

So - OK for me to send a patch fixing just the first issue? Or should I
remove the MSI change too?

Cheers,


Jeremy



--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

Re: LIRC 0.8.7 Fixes for Maverick

Jeremy Kerr
Hi,

> > --- a/drivers/media/video/cx23885/cx23885-core.c
> > +++ b/drivers/media/video/cx23885/cx23885-core.c
> > @@ -1142,7 +1142,7 @@ void cx23885_free_buffer(struct videobuf_queue *q, struct cx23885_buffer *buf)
> >  
> >   BUG_ON(in_interrupt());
> >   videobuf_waiton(&buf->vb, 0, 0);
> > - videobuf_dma_unmap(q, dma);
> > + videobuf_dma_unmap(q->dev, dma);
> >   videobuf_dma_free(dma);
> >   btcx_riscmem_free(to_pci_dev(q->dev), &buf->risc);
> >   buf->vb.state = VIDEOBUF_NEEDS_INIT;
>
> This hunk is incorrect - videobuf_dma_unmap() takes a videobuf_queue as
> its first argument. This change passes a struct device instead.
>
> (The change to the videobuf_dma_unmap API is not in this branch)

Just to clarify - by 'this branch' I mean lucid's lts-backport-maverick
branch, but it's also not in maverick either. This IR patch has been
applied to both though.

Cheers,


Jeremy


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

Re: LIRC 0.8.7 Fixes for Maverick

Tim Gardner-2
On 06/20/2011 11:48 PM, Jeremy Kerr wrote:

> Hi,
>
>>> --- a/drivers/media/video/cx23885/cx23885-core.c
>>> +++ b/drivers/media/video/cx23885/cx23885-core.c
>>> @@ -1142,7 +1142,7 @@ void cx23885_free_buffer(struct videobuf_queue *q, struct cx23885_buffer *buf)
>>>
>>>   BUG_ON(in_interrupt());
>>>   videobuf_waiton(&buf->vb, 0, 0);
>>> - videobuf_dma_unmap(q, dma);
>>> + videobuf_dma_unmap(q->dev, dma);
>>>   videobuf_dma_free(dma);
>>>   btcx_riscmem_free(to_pci_dev(q->dev),&buf->risc);
>>>   buf->vb.state = VIDEOBUF_NEEDS_INIT;
>>
>> This hunk is incorrect - videobuf_dma_unmap() takes a videobuf_queue as
>> its first argument. This change passes a struct device instead.
>>
>> (The change to the videobuf_dma_unmap API is not in this branch)
>
> Just to clarify - by 'this branch' I mean lucid's lts-backport-maverick
> branch, but it's also not in maverick either. This IR patch has been
> applied to both though.
>
> Cheers,
>
>
> Jeremy
>
>

If you patch Maverick master, then the fix will get automatically
propogated to lts-backport-maverick. You should definitely send a patch
to fix the videobuf_dma_unmap() parameter mismatch.

Can you quirk your sub-par MSI implementation for nomsi ?

rtg
--
Tim Gardner [hidden email]

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

Re: LIRC 0.8.7 Fixes for Maverick

Jeremy Kerr
Hi Tim,

> If you patch Maverick master, then the fix will get automatically
> propogated to lts-backport-maverick. You should definitely send a patch
> to fix the videobuf_dma_unmap() parameter mismatch.

OK, shall do.

> Can you quirk your sub-par MSI implementation for nomsi ?

I'm still trying to work out what the problem actually is - I suspect
we're missing IRQs when MSIs are enabled. I could disable MSIs globally
on that particular board, but that might be too far-reaching.

Cheers,


Jeremy


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team