GNOME.org
 

[gnome-lirc-properties] Fix MCE remotes detection

commit 2d3e5095460205b9f97d1aec6416879268fc6bf2
Author: Bastien Nocera <hadess hadess net>
Date:   Mon May 17 15:41:42 2010 +0100

    Fix MCE remotes detection
    
    From lirc 0.8.6 onwards, lirc_mceusb2 doesn't exist anymore, and
    has been merged into lirc_mceusb.
    
    So rename all the uses of lirc_mceusb2, and remove the duplicate
    Pinnacle receiver's definition.

 configure.ac        |    4 +-
 data/overrides.conf |    7 ---
 data/receivers.conf |  144 ++++++++++++++++++++++++---------------------------
 3 files changed, 70 insertions(+), 85 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 0643e78..977b6f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,8 +66,8 @@ else
 	  HAVE_LIRCD="no"
   elif [[ "$LIRCD_MAJOR" -eq "0" ]] && \
 	  [[ "$LIRCD_MINOR" -eq "8" ]] && \
-	  [[ "$LIRCD_MICRO" -lt "4" ]]; then
-	  AC_MSG_WARN([lircd >= 0.8.4 is required, you have $LIRCD_VERSION])
+	  [[ "$LIRCD_MICRO" -lt "6" ]]; then
+	  AC_MSG_WARN([lircd >= 0.8.6 is required, you have $LIRCD_VERSION])
 	  HAVE_LIRCD="no"
   fi
 fi
diff --git a/data/overrides.conf b/data/overrides.conf
index 9e04194..a679b11 100644
--- a/data/overrides.conf
+++ b/data/overrides.conf
@@ -12,13 +12,6 @@ lirc-driver        = default
 vendor-id          = 0x0e9c
 product-id         = 0x0000
 
-[Pinnacle: Remote Kit]
-compatible-remotes = mceusb
-kernel-module = lirc_mceusb2
-lirc-driver   = default
-vendor-id     = 0x2304
-product-id    = 0x0225
-
 [Microsoft: Windows Media Center Remote]
 compatible-remotes = mceusb
 kernel-module = lirc_mceusb
diff --git a/data/receivers.conf b/data/receivers.conf
index a21cafb..2a9e654 100644
--- a/data/receivers.conf
+++ b/data/receivers.conf
@@ -101,207 +101,207 @@ kernel-module = lirc_imon
 product-id = 0x0045
 vendor-id = 0x15c2
 
-# from drivers/lirc_mceusb2/lirc_mceusb2.c, line 134
+# from drivers/lirc_mceusb/lirc_mceusb.c, line 134
 [Philips: eHome Infrared Receiver]
-kernel-module = lirc_mceusb2
+kernel-module = lirc_mceusb
 product-id = 0x0608
 vendor-id = 0x0471
 
-# from drivers/lirc_mceusb2/lirc_mceusb2.c, line 136
+# from drivers/lirc_mceusb/lirc_mceusb.c, line 136
 [Philips: Philips Infrared Transceiver - HP branded]
-kernel-module = lirc_mceusb2
+kernel-module = lirc_mceusb
 product-id = 0x060c
 vendor-id = 0x0471
 
-# from drivers/lirc_mceusb2/lirc_mceusb2.c, line 138
+# from drivers/lirc_mceusb/lirc_mceusb.c, line 138
 [Philips: Philips SRM5100]
-kernel-module = lirc_mceusb2
+kernel-module = lirc_mceusb
 product-id = 0x060d
 vendor-id = 0x0471
 
-# from drivers/lirc_mceusb2/lirc_mceusb2.c, line 140
+# from drivers/lirc_mceusb/lirc_mceusb.c, line 140
 [Philips: Philips Infrared Transceiver - Omaura]
-kernel-module = lirc_mceusb2
+kernel-module = lirc_mceusb
 product-id = 0x060f
 vendor-id = 0x0471
 
-# from drivers/lirc_mceusb2/lirc_mceusb2.c, line 142
+# from drivers/lirc_mceusb/lirc_mceusb.c, line 142
 [Philips: Philips Infrared Transceiver - Spinel plus]
-kernel-module = lirc_mceusb2
+kernel-module = lirc_mceusb
 product-id = 0x0613
 vendor-id = 0x0471
 
-# from drivers/lirc_mceusb2/lirc_mceusb2.c, line 144
+# from drivers/lirc_mceusb/lirc_mceusb.c, line 144
 [Philips: eHome Infrared Receiver]
-kernel-module = lirc_mceusb2
+kernel-module = lirc_mceusb
 product-id = 0x0815
 vendor-id = 0x0471
 
-# from drivers/lirc_mceusb2/lirc_mceusb2.c, line 146
+# from drivers/lirc_mceusb/lirc_mceusb.c, line 146
 [SMK Manufacturing: eHome Infrared Receiver]
-kernel-module = lirc_mceusb2
+kernel-module = lirc_mceusb
 product-id = 0x031d
 vendor-id = 0x0609
 
-# from drivers/lirc_mceusb2/lirc_mceusb2.c, line 148
+# from drivers/lirc_mceusb/lirc_mceusb.c, line 148
 [SMK Manufacturing: eHome Infrared Receiver]
-kernel-module = lirc_mceusb2
+kernel-module = lirc_mceusb
 product-id = 0x0322
 vendor-id = 0x0609
 
-# from drivers/lirc_mceusb2/lirc_mceusb2.c, line 150
+# from drivers/lirc_mceusb/lirc_mceusb.c, line 150
 [SMK Manufacturing: bundled with Hauppauge PVR-150]
-kernel-module = lirc_mceusb2
+kernel-module = lirc_mceusb
 product-id = 0x0334
 vendor-id = 0x0609
 
-# from drivers/lirc_mceusb2/lirc_mceusb2.c, line 152
+# from drivers/lirc_mceusb/lirc_mceusb.c, line 152
 [Tatung: Tatung eHome Infrared Transceiver]
-kernel-module = lirc_mceusb2
+kernel-module = lirc_mceusb
 product-id = 0x9150
 vendor-id = 0x1460
 
-# from drivers/lirc_mceusb2/lirc_mceusb2.c, line 154
+# from drivers/lirc_mceusb/lirc_mceusb.c, line 154
 [Shuttle: Shuttle eHome Infrared Transceiver]
-kernel-module = lirc_mceusb2
+kernel-module = lirc_mceusb
 product-id = 0xc001
 vendor-id = 0x1308
 
-# from drivers/lirc_mceusb2/lirc_mceusb2.c, line 156
+# from drivers/lirc_mceusb/lirc_mceusb.c, line 156
 [Shuttle: eHome Infrared Receiver]
-kernel-module = lirc_mceusb2
+kernel-module = lirc_mceusb
 product-id = 0xc001
 vendor-id = 0x051c
 
-# from drivers/lirc_mceusb2/lirc_mceusb2.c, line 158
+# from drivers/lirc_mceusb/lirc_mceusb.c, line 158
 [Gateway: Gateway eHome Infrared Transceiver]
-kernel-module = lirc_mceusb2
+kernel-module = lirc_mceusb
 product-id = 0x3009
 vendor-id = 0x107b
 
-# from drivers/lirc_mceusb2/lirc_mceusb2.c, line 160
+# from drivers/lirc_mceusb/lirc_mceusb.c, line 160
 [Mitsumi: eHome Infrared Receiver]
-kernel-module = lirc_mceusb2
+kernel-module = lirc_mceusb
 product-id = 0x2501
 vendor-id = 0x03ee
 
-# from drivers/lirc_mceusb2/lirc_mceusb2.c, line 162
+# from drivers/lirc_mceusb/lirc_mceusb.c, line 162
 [TopSeed Technology: Topseed eHome Infrared Transceiver]
-kernel-module = lirc_mceusb2
+kernel-module = lirc_mceusb
 product-id = 0x0001
 vendor-id = 0x1784
 
-# from drivers/lirc_mceusb2/lirc_mceusb2.c, line 164
+# from drivers/lirc_mceusb/lirc_mceusb.c, line 164
 [TopSeed Technology: Topseed HP eHome Infrared Transceiver]
-kernel-module = lirc_mceusb2
+kernel-module = lirc_mceusb
 product-id = 0x0006
 vendor-id = 0x1784
 
-# from drivers/lirc_mceusb2/lirc_mceusb2.c, line 166
+# from drivers/lirc_mceusb/lirc_mceusb.c, line 166
 [TopSeed Technology: Topseed eHome Infrared Transceiver]
-kernel-module = lirc_mceusb2
+kernel-module = lirc_mceusb
 product-id = 0x0007
 vendor-id = 0x1784
 
-# from drivers/lirc_mceusb2/lirc_mceusb2.c, line 168
+# from drivers/lirc_mceusb/lirc_mceusb.c, line 168
 [TopSeed Technology: Topseed eHome Infrared Transceiver]
-kernel-module = lirc_mceusb2
+kernel-module = lirc_mceusb
 product-id = 0x0008
 vendor-id = 0x1784
 
-# from drivers/lirc_mceusb2/lirc_mceusb2.c, line 170
+# from drivers/lirc_mceusb/lirc_mceusb.c, line 170
 [Ricavision: Ricavision internal Infrared Transceiver]
-kernel-module = lirc_mceusb2
+kernel-module = lirc_mceusb
 product-id = 0x0010
 vendor-id = 0x179d
 
-# from drivers/lirc_mceusb2/lirc_mceusb2.c, line 172
+# from drivers/lirc_mceusb/lirc_mceusb.c, line 172
 [Itron Technology iONE: Libra-Q11 IR remote]
-kernel-module = lirc_mceusb2
+kernel-module = lirc_mceusb
 product-id = 0x7002
 vendor-id = 0x195d
 
-# from drivers/lirc_mceusb2/lirc_mceusb2.c, line 174
+# from drivers/lirc_mceusb/lirc_mceusb.c, line 174
 [FIC: FIC eHome Infrared Transceiver]
-kernel-module = lirc_mceusb2
+kernel-module = lirc_mceusb
 product-id = 0x9242
 vendor-id = 0x1509
 
-# from drivers/lirc_mceusb2/lirc_mceusb2.c, line 176
+# from drivers/lirc_mceusb/lirc_mceusb.c, line 176
 [LG Electronics USA: eHome Infrared Receiver]
-kernel-module = lirc_mceusb2
+kernel-module = lirc_mceusb
 product-id = 0x9803
 vendor-id = 0x043e
 
-# from drivers/lirc_mceusb2/lirc_mceusb2.c, line 178
+# from drivers/lirc_mceusb/lirc_mceusb.c, line 178
 [Microsoft: eHome Infrared Receiver]
-kernel-module = lirc_mceusb2
+kernel-module = lirc_mceusb
 product-id = 0x00a0
 vendor-id = 0x045e
 
-# from drivers/lirc_mceusb2/lirc_mceusb2.c, line 180
+# from drivers/lirc_mceusb/lirc_mceusb.c, line 180
 [Formosa Industrial Computing: eHome Infrared Receiver]
-kernel-module = lirc_mceusb2
+kernel-module = lirc_mceusb
 product-id = 0xe015
 vendor-id = 0x147a
 
-# from drivers/lirc_mceusb2/lirc_mceusb2.c, line 182
+# from drivers/lirc_mceusb/lirc_mceusb.c, line 182
 [Formosa Industrial Computing: eHome Infrared Receiver]
-kernel-module = lirc_mceusb2
+kernel-module = lirc_mceusb
 product-id = 0xe016
 vendor-id = 0x147a
 
-# from drivers/lirc_mceusb2/lirc_mceusb2.c, line 184
+# from drivers/lirc_mceusb/lirc_mceusb.c, line 184
 [Formosa Industrial Computing: Formosa aim / Trust MCE Infrared Receiver]
-kernel-module = lirc_mceusb2
+kernel-module = lirc_mceusb
 product-id = 0xe017
 vendor-id = 0x147a
 
-# from drivers/lirc_mceusb2/lirc_mceusb2.c, line 186
+# from drivers/lirc_mceusb/lirc_mceusb.c, line 186
 [Formosa Industrial Computing: Formosa Industrial Computing / Beanbag Emulation Device]
-kernel-module = lirc_mceusb2
+kernel-module = lirc_mceusb
 product-id = 0xe018
 vendor-id = 0x147a
 
-# from drivers/lirc_mceusb2/lirc_mceusb2.c, line 188
+# from drivers/lirc_mceusb/lirc_mceusb.c, line 188
 [Fintek: Fintek eHome Infrared Transceiver]
-kernel-module = lirc_mceusb2
+kernel-module = lirc_mceusb
 product-id = 0x0602
 vendor-id = 0x1934
 
-# from drivers/lirc_mceusb2/lirc_mceusb2.c, line 190
+# from drivers/lirc_mceusb/lirc_mceusb.c, line 190
 [Fintek: Fintek eHome Infrared Transceiver (in the AOpen MP45)]
-kernel-module = lirc_mceusb2
+kernel-module = lirc_mceusb
 product-id = 0x0702
 vendor-id = 0x1934
 
-# from drivers/lirc_mceusb2/lirc_mceusb2.c, line 192
+# from drivers/lirc_mceusb/lirc_mceusb.c, line 192
 [Pinnacle Systems, Inc. (hex): Pinnacle Remote Kit]
-kernel-module = lirc_mceusb2
+kernel-module = lirc_mceusb
 product-id = 0x0225
 vendor-id = 0x2304
 
-# from drivers/lirc_mceusb2/lirc_mceusb2.c, line 194
+# from drivers/lirc_mceusb/lirc_mceusb.c, line 194
 [Elitegroup Computer Systems (ECS): Elitegroup Computer Systems IR]
-kernel-module = lirc_mceusb2
+kernel-module = lirc_mceusb
 product-id = 0x0f38
 vendor-id = 0x1019
 
-# from drivers/lirc_mceusb2/lirc_mceusb2.c, line 196
+# from drivers/lirc_mceusb/lirc_mceusb.c, line 196
 [Wistron: eHome Infrared Receiver]
-kernel-module = lirc_mceusb2
+kernel-module = lirc_mceusb
 product-id = 0x0002
 vendor-id = 0x0fb8
 
-# from drivers/lirc_mceusb2/lirc_mceusb2.c, line 198
+# from drivers/lirc_mceusb/lirc_mceusb.c, line 198
 [Compro: Compro K100]
-kernel-module = lirc_mceusb2
+kernel-module = lirc_mceusb
 product-id = 0x3020
 vendor-id = 0x185b
 
-# from drivers/lirc_mceusb2/lirc_mceusb2.c, line 200
+# from drivers/lirc_mceusb/lirc_mceusb.c, line 200
 [Northstar Systems: Northstar Systems eHome Infrared Transceiver]
-kernel-module = lirc_mceusb2
+kernel-module = lirc_mceusb
 product-id = 0xe004
 vendor-id = 0x04eb
 
@@ -464,14 +464,6 @@ mceusb-vendor = Microsoft Corp.
 cmdir-vendor = Cygnal
 
 # from overrides.conf
-[Pinnacle: Remote Kit]
-product-id = 0x0225
-vendor-id = 0x2304
-lirc-driver = default
-kernel-module = lirc_mceusb2
-compatible-remotes = mceusb
-
-# from overrides.conf
 [Microsoft: Windows Media Center Remote]
 product-id = 0x006d
 vendor-id = 0x045e
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]