From e2bbd05483795f82106dd43a577037fd3bda8ee6 Mon Sep 17 00:00:00 2001
From: Greg Frost <gregfrost1@bigpond.com>
Date: Sun, 19 Jul 2009 08:59:29 +0930
Subject: lirc: prelim dvico dual4 rev 2 remote work

---
 abs/core-testing/lirc/PKGBUILD      | 13 +++++++++----
 abs/core-testing/lirc/dvicoIR.rules | 14 ++++++++++++--
 abs/core-testing/lirc/lirc.fdi      | 11 +++++++++++
 3 files changed, 32 insertions(+), 6 deletions(-)
 create mode 100644 abs/core-testing/lirc/lirc.fdi

diff --git a/abs/core-testing/lirc/PKGBUILD b/abs/core-testing/lirc/PKGBUILD
index 30c5052..6c5cbf6 100644
--- a/abs/core-testing/lirc/PKGBUILD
+++ b/abs/core-testing/lirc/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=lirc
 pkgver=0.8.5CVS
-pkgrel=12
+pkgrel=14
 _kernver=2.6.28-LinHES
 pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel"
 arch=(i686 x86_64)
@@ -22,7 +22,8 @@ source=(http://www.blushingpenguin.com/mark/lmilk/lirc-0.8.5-CVS-pvr150.tar.bz2
 	lirc_mod_mce.patch
 	hw_commandir.c
 	hw_commandir.h
-	dvicoIR.rules)
+	dvicoIR.rules
+        lirc.fdi)
 
 build() {
 	# configure
@@ -67,8 +68,11 @@ build() {
 	rm $startdir/pkg/lib/modules/$_kernver/kernel/drivers/misc/commandir.ko
 
 	# Add a udev rule for the DVICO remote so that if there is more than 
-	# one hiddev device, the systm cant get confused.
+	# one hiddev device, the system cant get confused.
 	install -D -m644 $srcdir/dvicoIR.rules $pkgdir/etc/udev/rules.d/dvicoIR.rules
+
+	# Add the fdi file to prevent the Dvico dual 4 remotes from screwing up keyboard interaction.
+	install -D -m644 $srcdir/lirc.fdi $pkgdir/usr/share/hal/fdi/preprobe/20thirdparty/lirc.fdi
 }
 md5sums=('b96dae91b566143b3af433fa2714ec9a'
          '1753acd774f50b638e6173d364de53fd'
@@ -78,4 +82,5 @@ md5sums=('b96dae91b566143b3af433fa2714ec9a'
          'd299b696b007fc9b663a73cc1758a1ef'
          'f059f4030afc682c9539a03bf837c1cf'
          '4e698654cc44fc6c4163814acda5a7ee'
-         'd79400e2e3069b14039ca07d3317965c')
+         '9a3a6dc03647ee6674a166dfb884ddd6'
+         '664fb04b51396628300daf8befd0db77')
diff --git a/abs/core-testing/lirc/dvicoIR.rules b/abs/core-testing/lirc/dvicoIR.rules
index 5d6d066..ada5466 100644
--- a/abs/core-testing/lirc/dvicoIR.rules
+++ b/abs/core-testing/lirc/dvicoIR.rules
@@ -1,5 +1,15 @@
-# Added to get DVICO remote to be consistant device
+# This rule is for the Dvico Dual Digital 4 Rev 2. It has 2 IR modules 
+# identified, only the first of which is connected to the receiver.
+# The KERNELS=="*-1" part of this rule makes sure that the first 
+# device is the one that gets the symlink.
+KERNEL=="event*", \
+    KERNELS=="*-1", \
+    ATTRS{manufacturer}=="Dvico", \
+    ATTRS{idVendor}=="0fe9", \
+    ATTRS{idProduct}=="db98", \
+    SYMLINK="input/irremote"
+
+# This rule is for the older style USB DVICO remote dongles.
 SUBSYSTEMS=="usb", KERNEL=="hiddev*", \
     ATTRS{product}=="DVICO USB HID Remocon V1.00", \
     SYMLINK+="usb/dvicoIR"
-
diff --git a/abs/core-testing/lirc/lirc.fdi b/abs/core-testing/lirc/lirc.fdi
new file mode 100644
index 0000000..7a8c8ad
--- /dev/null
+++ b/abs/core-testing/lirc/lirc.fdi
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deviceinfo version="0.2">
+  <device>
+     <!-- This rule prevents the Dvico dual digital4 rev 2
+          remote input device from making your keyboard act wierd>
+     <match key="info.product" contains_ncase="IR-receiver inside an USB DVB receiver">
+        <merge key="info.ignore" type="bool">true</merge>
+     </match>
+  </device>
+</deviceinfo>
-- 
cgit v0.12


From cc8edc447eb08fbaefc37fba12f50291ba62dd63 Mon Sep 17 00:00:00 2001
From: Greg Frost <gregfrost1@bigpond.com>
Date: Sun, 19 Jul 2009 10:08:24 +0930
Subject: lirc: add python to makedepends

---
 abs/core-testing/lirc/PKGBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/abs/core-testing/lirc/PKGBUILD b/abs/core-testing/lirc/PKGBUILD
index 6c5cbf6..5406783 100644
--- a/abs/core-testing/lirc/PKGBUILD
+++ b/abs/core-testing/lirc/PKGBUILD
@@ -10,7 +10,7 @@ arch=(i686 x86_64)
 url="http://www.lirc.org/"
 license=('GPL')
 depends=('lirc-utils=0.8.5CVS' 'kernel26>=2.6.27' 'kernel26<2.6.29' 'iguanaIR')
-#makedepends=('help2man')
+makedepends=('python')
 replaces=('lirc+pctv')
 options=('!makeflags')
 install=$pkgname.install
-- 
cgit v0.12


From 315f3d8cd73888122339fe0fe9c47da5e3e56c72 Mon Sep 17 00:00:00 2001
From: Greg Frost <gregfrost1@bigpond.com>
Date: Sun, 19 Jul 2009 10:21:34 +0930
Subject: system-templates: update preview.jpg for some remotes

---
 abs/core-testing/system-templates/PKGBUILD         |   2 +-
 .../templates/remotes/AOpen-EA65/lircd.conf.ea65   |  73 ++++
 .../templates/remotes/AOpen-EA65/lircrc.ea65       | 381 ++++++++++++++++++
 .../templates/remotes/AOpen-EA65/preview.jpg       | Bin 0 -> 76036 bytes
 .../remotes/ASUS-DiGiMatrix/lircd.conf.asus        |  56 +++
 .../remotes/ASUS-DiGiMatrix/lircd.conf.digimatrix  | 152 ++++++++
 .../templates/remotes/ASUS-DiGiMatrix/preview.jpg  | Bin 0 -> 28706 bytes
 .../lircd.conf.dvico-dual-digital4                 |  81 ++++
 .../lircrc.dvico-dual-digital4                     | 430 +++++++++++++++++++++
 .../remotes/Dvico-Dual-Digital4-rev2/preview.jpg   | Bin 0 -> 34354 bytes
 .../remotes/asus-digitmatrix/lircd.conf.asus       |  56 ---
 .../remotes/asus-digitmatrix/lircd.conf.digimatrix | 152 --------
 .../templates/remotes/asus-digitmatrix/preview.jpg | Bin 1587 -> 0 bytes
 .../templates/remotes/ea65/lircd.conf.ea65         |  73 ----
 .../templates/remotes/ea65/lircrc.ea65             | 381 ------------------
 .../templates/remotes/ea65/preview.jpg             | Bin 1587 -> 0 bytes
 .../templates/remotes/imon-pad/preview.jpg         | Bin 1587 -> 35870 bytes
 .../templates/remotes/imon/preview.jpg             | Bin 1587 -> 25799 bytes
 18 files changed, 1174 insertions(+), 663 deletions(-)
 create mode 100644 abs/core-testing/system-templates/templates/remotes/AOpen-EA65/lircd.conf.ea65
 create mode 100644 abs/core-testing/system-templates/templates/remotes/AOpen-EA65/lircrc.ea65
 create mode 100644 abs/core-testing/system-templates/templates/remotes/AOpen-EA65/preview.jpg
 create mode 100644 abs/core-testing/system-templates/templates/remotes/ASUS-DiGiMatrix/lircd.conf.asus
 create mode 100644 abs/core-testing/system-templates/templates/remotes/ASUS-DiGiMatrix/lircd.conf.digimatrix
 create mode 100644 abs/core-testing/system-templates/templates/remotes/ASUS-DiGiMatrix/preview.jpg
 create mode 100644 abs/core-testing/system-templates/templates/remotes/Dvico-Dual-Digital4-rev2/lircd.conf.dvico-dual-digital4
 create mode 100644 abs/core-testing/system-templates/templates/remotes/Dvico-Dual-Digital4-rev2/lircrc.dvico-dual-digital4
 create mode 100644 abs/core-testing/system-templates/templates/remotes/Dvico-Dual-Digital4-rev2/preview.jpg
 delete mode 100644 abs/core-testing/system-templates/templates/remotes/asus-digitmatrix/lircd.conf.asus
 delete mode 100644 abs/core-testing/system-templates/templates/remotes/asus-digitmatrix/lircd.conf.digimatrix
 delete mode 100644 abs/core-testing/system-templates/templates/remotes/asus-digitmatrix/preview.jpg
 delete mode 100644 abs/core-testing/system-templates/templates/remotes/ea65/lircd.conf.ea65
 delete mode 100644 abs/core-testing/system-templates/templates/remotes/ea65/lircrc.ea65
 delete mode 100644 abs/core-testing/system-templates/templates/remotes/ea65/preview.jpg

diff --git a/abs/core-testing/system-templates/PKGBUILD b/abs/core-testing/system-templates/PKGBUILD
index b911335..ed6856f 100755
--- a/abs/core-testing/system-templates/PKGBUILD
+++ b/abs/core-testing/system-templates/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=system-templates
 pkgver=1.0
-pkgrel=27
+pkgrel=28
 conflicts=( )
 pkgdesc="Templates used for system configuration"
 depends=()
diff --git a/abs/core-testing/system-templates/templates/remotes/AOpen-EA65/lircd.conf.ea65 b/abs/core-testing/system-templates/templates/remotes/AOpen-EA65/lircd.conf.ea65
new file mode 100644
index 0000000..a10181d
--- /dev/null
+++ b/abs/core-testing/system-templates/templates/remotes/AOpen-EA65/lircd.conf.ea65
@@ -0,0 +1,73 @@
+#
+#  Config file for AOpen XC Cube EA65, EA65-II
+#  Max Krasnyanskiy <maxk@qualcomm.com>
+#
+
+begin remote
+  name  EA65
+  bits  24
+  eps   10
+  aeps  100
+
+  gap           960000
+  toggle_bit    0
+
+  begin codes
+	tv/pvr      0x0014814c
+        photo       0x0017810e
+        htpc        0x0011811b
+        dvd/vcd     0x00128100
+        cd/mp3      0x00138152
+        fm          0x00158111
+        video       0x0016810f
+
+        1           0x0041810b
+        2           0x00428115
+        3           0x00438112
+        4           0x00448141
+        5           0x00458119
+        6           0x00468116
+        7           0x00478150
+        8           0x0048811a
+        9           0x00498155
+        *           0x00328156
+        0           0x00408158
+        #           0x0030814d
+        
+        menu        0x00188104
+        exit        0x001d8154
+        enter       0x001e8101
+        up          0x00198159
+        down        0x001a811c
+        left        0x001c8102
+        right       0x001b815d
+
+ 	vol+        0x00298103
+ 	vol-        0x002a814e
+ 	ch+         0x002c8113
+ 	ch-         0x002d8117
+ 	mute        0x00288105
+ 	tune+       0x002e8144
+ 	tune-       0x002f8148
+ 	mem         0x00318145
+ 	scan        0x00278151
+
+ 	display     0x0034811f
+ 	eject       0x0035815c
+ 	rwnd        0x00228118
+ 	ffwd        0x00218110
+ 	rec         0x002b810a
+ 	repeate     0x0038815a
+ 	prev        0x00238107
+ 	next        0x00248114
+ 	time/shift  0x00338108
+ 	stop        0x0020811d
+ 	play/pause  0x001f8109
+
+        play-pause  0x0080811d
+        stop-eject  0x00238107
+        mode-       0x00ff1080
+        mode+       0x00ff1180
+  end codes
+end remote
+
diff --git a/abs/core-testing/system-templates/templates/remotes/AOpen-EA65/lircrc.ea65 b/abs/core-testing/system-templates/templates/remotes/AOpen-EA65/lircrc.ea65
new file mode 100644
index 0000000..fd96d42
--- /dev/null
+++ b/abs/core-testing/system-templates/templates/remotes/AOpen-EA65/lircrc.ea65
@@ -0,0 +1,381 @@
+#
+# Max Krasnyanskiy <maxk@qualcomm.com>
+#
+
+#
+# Xine key bindings.
+#
+
+# start playback
+begin
+	button = dvd/vcd
+	prog   = xine
+	repeat = 1
+	config = Play
+end
+
+# playback pause toggle
+begin
+	button = play/pause
+	prog   = xine
+	repeat = 1
+	config = Pause
+end
+
+# stop playback
+begin
+	button = stop
+	prog   = xine
+	repeat = 1
+	config = Stop
+end
+
+# eject the current medium
+begin
+	button = eject
+	prog   = xine
+	repeat = 1
+	config = Eject
+end
+
+# scan playlist to grab stream infos
+begin
+	button = mem
+	prog   = xine
+	repeat = 1
+	config = ScanPlaylistInfo
+end
+
+# set position to -60 seconds in current stream
+begin
+	button = rwnd
+	prog   = xine
+	repeat = 1
+	config = SeekRelative-60
+end
+
+# set position to +60 seconds in current stream
+begin
+	button = ffwd
+	prog   = xine
+	repeat = 1
+	config = SeekRelative+60
+end
+
+# increment playback speed
+begin
+	button = tune+
+	prog   = xine
+	repeat = 1
+	config = SpeedFaster
+end
+
+# decrement playback speed
+begin
+	button = tune-
+	prog   = xine
+	repeat = 1
+	config = SpeedSlower
+end
+
+# increment audio volume
+begin
+	button = vol+
+	prog   = xine
+	repeat = 1
+	config = Volume+
+end
+
+# decrement audio volume
+begin
+	button = vol-
+	prog   = xine
+	repeat = 1
+	config = Volume-
+end
+
+# audio muting toggle
+begin
+	button = mute
+	prog   = xine
+	repeat = 1
+	config = Mute
+end
+
+# select next audio channel
+begin
+	button = ch+
+	prog   = xine
+	repeat = 1
+	config = AudioChannelNext
+end
+
+# select previous audio channel
+begin
+	button = ch-
+	prog   = xine
+	repeat = 1
+	config = AudioChannelPrior
+end
+
+# interlaced mode toggle
+begin
+	button = scan
+	prog   = xine
+	repeat = 1
+	config = ToggleInterleave
+end
+
+# cycle aspect ratio values
+begin
+	button = display
+	prog   = xine
+	repeat = 1
+	config = ToggleAspectRatio
+end
+
+# jump to Title Menu
+begin
+	button = menu
+	prog   = xine
+	repeat = 1
+	config = TitleMenu
+end
+
+# menu navigate up
+begin
+	button = up
+	prog   = xine
+	repeat = 1
+	config = EventUp
+end
+
+# menu navigate down
+begin
+	button = down
+	prog   = xine
+	repeat = 1
+	config = EventDown
+end
+
+# menu navigate left
+begin
+	button = left
+	prog   = xine
+	repeat = 1
+	config = EventLeft
+end
+
+# menu navigate right
+begin
+	button = right
+	prog   = xine
+	repeat = 1
+	config = EventRight
+end
+
+# menu select
+begin
+	button = enter
+	prog   = xine
+	repeat = 1
+	config = EventSelect
+end
+
+# jump to next chapter
+begin
+	button = next
+	prog   = xine
+	repeat = 1
+	config = EventNext
+end
+
+# jump to previous chapter
+begin
+	button = prev
+	prog   = xine
+	repeat = 1
+	config = EventPrior
+end
+
+# select a subtitle file
+begin
+	button = repeat
+	prog   = xine
+	repeat = 1
+	config = SubSelector
+end
+
+# enter the number 0
+begin
+	button = 0
+	prog   = xine
+	repeat = 1
+	config = Number0
+end
+
+# enter the number 1
+begin
+	button = 1
+	prog   = xine
+	repeat = 1
+	config = Number1
+end
+
+# enter the number 2
+begin
+	button = 2
+	prog   = xine
+	repeat = 1
+	config = Number2
+end
+
+# enter the number 3
+begin
+	button = 3
+	prog   = xine
+	repeat = 1
+	config = Number3
+end
+
+# enter the number 4
+begin
+	button = 4
+	prog   = xine
+	repeat = 1
+	config = Number4
+end
+
+# enter the number 5
+begin
+	button = 5
+	prog   = xine
+	repeat = 1
+	config = Number5
+end
+
+# enter the number 6
+begin
+	button = 6
+	prog   = xine
+	repeat = 1
+	config = Number6
+end
+
+# enter the number 7
+begin
+	button = 7
+	prog   = xine
+	repeat = 1
+	config = Number7
+end
+
+# enter the number 8
+begin
+	button = 8
+	prog   = xine
+	repeat = 1
+	config = Number8
+end
+
+# enter the number 9
+begin
+	button = 9
+	prog   = xine
+	repeat = 1
+	config = Number9
+end
+
+# quit the program
+begin
+	button = exit
+	prog   = xine
+	repeat = 1
+	config = Quit
+end
+
+##
+# End of xine key bindings.
+##
+
+## MPlayer lirc setup
+
+# Show OSD
+begin
+	prog = mplayer
+	button = menu
+	repeat = 1
+	config = osd
+end
+
+# Pause playback
+begin
+	prog = mplayer
+	button = play/pause
+	repeat = 1
+	config = pause
+end
+
+# Stop playback and exit
+begin
+	prog = mplayer
+	button = stop
+	repeat = 1
+	config = stop #quit
+end
+
+# Mute
+begin
+	prog = mplayer
+	button = mute
+	repeat = 1
+	config = mute
+end
+
+# Seek back 10 seconds
+begin
+	prog = mplayer
+	button = rwnd
+	repeat = 1
+	config = seek -10
+end
+
+# Seek forward 30 seconds
+begin
+	prog = mplayer
+	button = ffwd
+	repeat = 1
+	config = seek +10
+end
+
+# Quit
+begin
+	prog = mplayer
+	button = exit
+	repeat = 1
+	config = quit
+end
+
+# Seek forward 10 minutes
+begin
+	prog = mplayer
+	button = next
+	repeat = 1
+	config = seek +600
+end
+
+# Seek backward 10 minutes
+begin
+	prog = mplayer
+	button = prev
+	repeat = 1
+	config = seek -600
+end
+
+# Toggle full-screen
+begin
+	prog = mplayer
+	button = display
+	repeat = 1
+	config = vo_fullscreen
+end
diff --git a/abs/core-testing/system-templates/templates/remotes/AOpen-EA65/preview.jpg b/abs/core-testing/system-templates/templates/remotes/AOpen-EA65/preview.jpg
new file mode 100644
index 0000000..2fc223c
Binary files /dev/null and b/abs/core-testing/system-templates/templates/remotes/AOpen-EA65/preview.jpg differ
diff --git a/abs/core-testing/system-templates/templates/remotes/ASUS-DiGiMatrix/lircd.conf.asus b/abs/core-testing/system-templates/templates/remotes/ASUS-DiGiMatrix/lircd.conf.asus
new file mode 100644
index 0000000..ceadbf0
--- /dev/null
+++ b/abs/core-testing/system-templates/templates/remotes/ASUS-DiGiMatrix/lircd.conf.asus
@@ -0,0 +1,56 @@
+#
+# contributed by Tibor Sipos <tibors@moravia-it.com> and 
+#                Stefan Jahn <stefan@lkcc.org>
+#
+# brand:	     Asus
+# model:	     Asus TV-Box Remote Control
+#
+
+begin remote
+
+  name		Asus TV-Box IR
+
+  bits		8
+  eps		30
+  aeps		100
+  one           0     0
+  zero          0     0
+  gap           1399999
+  toggle_bit	0
+
+	begin codes
+	  0			0x0000000000000000
+	  1			0x0000000000000008
+	  2			0x0000000000000010
+	  3			0x0000000000000018
+	  4			0x0000000000000020
+	  5			0x0000000000000028
+	  6			0x0000000000000030
+	  7			0x0000000000000038
+	  8			0x0000000000000040
+	  9			0x0000000000000048
+	  PREV			0x0000000000000050
+	  ENTER			0x0000000000000058
+	  CH+			0x0000000000000060
+	  CH-			0x0000000000000068
+	  VOL+			0x0000000000000070
+	  VOL-			0x0000000000000078
+	  MAXIMIZE		0x0000000000000080
+	  MUTE			0x0000000000000088
+	  POWER			0x0000000000000090
+	  MENU			0x0000000000000098
+	  UP			0x00000000000000A0
+	  DOWN			0x00000000000000A8
+	  LEFT			0x00000000000000B0
+	  RIGHT			0x00000000000000B8
+	  CAPTION		0x00000000000000C0
+	  MTS/SAP		0x00000000000000C8
+	  DISPLAY		0x00000000000000D0
+	  SCAN			0x00000000000000D8
+	  RED			0x00000000000000E0
+	  GREEN			0x00000000000000E8
+	  YELLOW		0x00000000000000F0
+	  BLUE			0x00000000000000F8
+        end codes
+
+end remote
diff --git a/abs/core-testing/system-templates/templates/remotes/ASUS-DiGiMatrix/lircd.conf.digimatrix b/abs/core-testing/system-templates/templates/remotes/ASUS-DiGiMatrix/lircd.conf.digimatrix
new file mode 100644
index 0000000..a6e9abd
--- /dev/null
+++ b/abs/core-testing/system-templates/templates/remotes/ASUS-DiGiMatrix/lircd.conf.digimatrix
@@ -0,0 +1,152 @@
+#
+# this config file was automatically generated
+# using lirc-0.7.0pre7(it87) on Sun Aug 29 17:33:17 2004
+#
+# contributed by 
+#
+# brand:                       ASUS
+# model no. of remote control: DigiMatrix
+# devices being controlled by this remote:
+#
+
+begin remote
+
+  name  ASUS_DigiMatrix
+  bits           16
+  flags SPACE_ENC
+  eps            30
+  aeps          100
+
+  header       8057  4071
+  one           479  1534
+  zero          479   531
+  ptrail        491
+  pre_data_bits   8
+  pre_data       0x35
+  gap          25647
+  toggle_bit      0
+
+
+      begin codes
+          up                       0x000000000000E817
+          down                     0x00000000000018E7
+          enter                    0x000000000000D02F
+          left                     0x0000000000009867
+          right                    0x00000000000058A7
+          1                        0x00000000000000FF
+          2                        0x000000000000807F
+          3                        0x00000000000040BF
+          4                        0x000000000000C03F
+          5                        0x00000000000020DF
+          6                        0x000000000000A05F
+          7                        0x000000000000609F
+          8                        0x000000000000E01F
+          9                        0x00000000000010EF
+          0                        0x000000000000906F
+          on_off                   0x000000000000B04F
+          dvd_vcd                  0x000000000000F00F
+          tv                       0x00000000000008F7
+          os_start                 0x00000000000030CF
+          photo                    0x00000000000048B7
+          home                     0x00000000000044BB
+          back                     0x000000000000A857
+          ch+                      0x000000000000B847
+          stop                     0x000000000000946B
+          play                     0x000000000000C43B
+          vol+                     0x000000000000F807
+          ch-                      0x0000000000007887
+          step-                    0x000000000000E41B
+          step+                    0x000000000000649B
+          vol-                     0x00000000000004FB
+          pause                    0x00000000000024DB
+          pre                      0x00000000000014EB
+          next                     0x000000000000A45B
+          mute                     0x000000000000847B
+          rec                      0x000000000000D42B
+          subtitle                 0x000000000000C837
+          menu                     0x00000000000038C7
+          dvd_audio                0x00000000000050AF
+          ui_size                  0x0000000000008877
+          ui_on_off                0x00000000000028D7
+      end codes
+
+end remote
+
+
+#
+# this config file was automatically generated
+# using lirc-0.7.2(it87) on Sun Aug 28 18:13:15 2005
+#
+# contributed by 
+#
+# brand:                       ASUS
+# model no. of remote control: DigiMatrix Mark 2
+# devices being controlled by this remote:
+#
+
+begin remote
+
+  name  ASUS_DigiMatrixMk2
+  bits            8
+  flags SPACE_ENC
+  eps            30
+  aeps          100
+
+  header       2666  1378
+  one           260   741
+  zero          260   279
+  ptrail        251
+  pre_data_bits   1
+  pre_data       0x0
+  post_data_bits  8
+  post_data      0x3
+  gap          10826
+  min_repeat      1
+  toggle_bit      0
+
+
+      begin codes
+          power                    0x0000000000000084
+          tv_dvr                   0x0000000000000044
+          fm                       0x00000000000000C4
+          os_start                 0x0000000000000024
+          music                    0x00000000000000A4
+          pictures                 0x0000000000000064
+          video                    0x00000000000000E4
+          dvd_menu                 0x0000000000000014
+          up                       0x000000000000004C
+          down                     0x00000000000000E0
+          left                     0x0000000000000010
+          right                    0x0000000000000040
+          back                     0x00000000000000B4
+          ok                       0x0000000000000088
+          back_fwd                 0x0000000000000074
+          rew                      0x0000000000000094
+          play_pause               0x0000000000000054
+          fwd                      0x00000000000000D4
+          step-                    0x0000000000000098
+          stop                     0x0000000000000048
+          step+                    0x0000000000000090
+          vol+                     0x0000000000000058
+          vol-                     0x00000000000000D8
+          home                     0x00000000000000C8
+          ch+                      0x0000000000000050
+          ch-                      0x00000000000000D0
+          mute                     0x0000000000000038
+          rec                      0x0000000000000028
+          pc                       0x0000000000000030
+          1                        0x00000000000000B8
+          2                        0x00000000000000A8
+          3                        0x00000000000000B0
+          4                        0x0000000000000078
+          5                        0x0000000000000068
+          6                        0x0000000000000070
+          7                        0x00000000000000F8
+          8                        0x00000000000000E8
+          9                        0x00000000000000F0
+          0                        0x0000000000000018
+          ui_size                  0x0000000000000004
+          repeat                   0x0000000000000008
+      end codes
+
+end remote
diff --git a/abs/core-testing/system-templates/templates/remotes/ASUS-DiGiMatrix/preview.jpg b/abs/core-testing/system-templates/templates/remotes/ASUS-DiGiMatrix/preview.jpg
new file mode 100644
index 0000000..250d6a1
Binary files /dev/null and b/abs/core-testing/system-templates/templates/remotes/ASUS-DiGiMatrix/preview.jpg differ
diff --git a/abs/core-testing/system-templates/templates/remotes/Dvico-Dual-Digital4-rev2/lircd.conf.dvico-dual-digital4 b/abs/core-testing/system-templates/templates/remotes/Dvico-Dual-Digital4-rev2/lircd.conf.dvico-dual-digital4
new file mode 100644
index 0000000..2d2b9ac
--- /dev/null
+++ b/abs/core-testing/system-templates/templates/remotes/Dvico-Dual-Digital4-rev2/lircd.conf.dvico-dual-digital4
@@ -0,0 +1,81 @@
+# Please make this file available to others
+# by sending it to <lirc@bartelmus.de>
+#
+# this config file was automatically generated
+# using lirc-0.8.0(userspace) on Mon Mar  5 16:00:35 2007
+#
+# contributed by: Soth
+#
+# brand:  DViCO FusionHDTV DVB-T Dual Digital
+# model no. of remote control: Fusion MCE
+# devices being controlled by this remote:
+#
+
+begin remote
+
+    name  DViCO_Dual_Digital
+    bits           16
+    eps            30
+    aeps          100
+  
+    one             0     0
+    zero            0     0
+    pre_data_bits   16
+    pre_data       0x1
+    gap            251756
+    toggle_bit      0   
+   
+    begin codes
+#starting at the top
+        dtv                      0x0179
+        mp3                      0x0187
+        dvd                      0x0185
+        cpf                      0x016C
+#outer circle clockwise from top
+        tvpower                  0x0164
+        guide                    0x016D
+        info                     0x0166
+        alttab                   0x000F
+        skip                     0x00A3
+        start                    0x001C
+        replay                   0x00A5
+        dvdmenu                  0x008B
+        back                     0x009E
+        setup                    0x008D
+#inner circle
+        up                       0x0067
+        down                     0x006C
+        left                     0x0069
+        right                    0x006A
+        ok                       0x0160
+#volume and channel
+        voldn                    0x0072
+        volup                    0x0073
+        chup                     0x0192
+        chdn                     0x0193
+#keypad
+        camera                   0x00D4
+        live                     0x0182
+        folder                   0x0086
+        1                        0x0002
+        2                        0x0003
+        3                        0x0004
+        4                        0x0005
+        5                        0x0006
+        6                        0x0007
+        7                        0x0008
+        8                        0x0009
+        9                        0x000A
+        aspect                   0x0173
+        0                        0x000B
+        zoom                     0x0174
+#play buttons
+        rew                      0x00A8
+        playpause                0x00A4
+        ff                       0x00D0
+        mute                     0x0071
+        stop                     0x0080
+        rec                      0x00A7
+        power                    0x0074
+    end codes 
+end remote
diff --git a/abs/core-testing/system-templates/templates/remotes/Dvico-Dual-Digital4-rev2/lircrc.dvico-dual-digital4 b/abs/core-testing/system-templates/templates/remotes/Dvico-Dual-Digital4-rev2/lircrc.dvico-dual-digital4
new file mode 100644
index 0000000..7c75f01
--- /dev/null
+++ b/abs/core-testing/system-templates/templates/remotes/Dvico-Dual-Digital4-rev2/lircrc.dvico-dual-digital4
@@ -0,0 +1,430 @@
+# lircrc.example.DVICO-nativelirc
+# 2004-07-04, Chris Pascoe
+# mailto:linuxdvb@itee.uq.edu.au
+# Save this file in ~/.mythtv/lircrc
+#
+# Note the "repeat =" strings in the volume and channel.
+# This means that if you hold down the key, every nth instance will be
+# passed.  This depends on your system, so you may want to increase or
+# decrease this and see what happens.  repeat = 1 is probably too
+# fast.
+
+### Top 4 buttons ###
+ 
+# DTV - Change focus for PiP (to change channel in the other window)
+begin
+    prog = mythtv
+    button = dtv
+    config = B
+end    
+ 
+begin
+    prog = mythtv
+    button = mp3
+    config = Ctrl+M
+end
+ 
+begin
+    prog = mythtv
+    button = dvd
+    config = Ctrl+D
+end
+ 
+begin
+    prog = mythtv
+    button = cpf
+    config = 
+end
+ 
+### Outer Circle (clockwise from the top) ### 
+ 
+begin
+    prog = mythtv
+    button = tvpower
+    config = Esc
+end
+  
+begin
+    prog = mythtv
+    button = guide
+    config = S
+end
+  
+begin
+    prog = mythtv
+    button = info
+    config = I
+end
+ 
+#swap the pip windows
+begin 
+    prog = mythtv
+    button = alttab
+    config = N
+end
+ 
+#commercial skip forwards
+begin
+    prog = mythtv
+    button = skip
+    config = Z
+end
+  
+begin
+    prog = mythtv
+    button = start
+    config = Return
+end
+ 
+#commercial skip backwards
+begin
+    prog = mythtv
+    button = replay
+    config = Q
+end  
+ 
+begin
+    prog = mythtv
+    button = dvdmenu
+#    config = undefined
+end
+ 
+begin
+    prog = mythtv
+    button = back
+    config = Esc
+end
+    
+begin
+    prog = mythtv
+    button = setup
+    config = undefined
+end
+  
+### Inner Circle ###
+  
+begin
+    prog = mythtv
+    button = up
+    config = Up
+end
+  
+begin
+    prog = mythtv
+    button = down
+    config = Down
+end
+  
+begin
+    prog = mythtv
+    button = left
+    config = Left
+end
+  
+begin
+    prog = mythtv
+    button = right
+    config = Right
+end
+  
+begin
+    prog = mythtv
+    button = ok
+    config = Return
+end
+ 
+### Volume and Channel ###
+  
+begin
+  prog = mythtv
+  button = voldn
+  repeat = 1
+  config = F10
+end
+  
+begin
+    prog = mythtv
+    button = volup
+    repeat = 1
+    config = F11
+end
+  
+begin
+    prog = mythtv
+    button = chup
+    config = Up
+end
+  
+begin
+    prog = mythtv
+    button = chdn
+    config = Down
+end
+ 
+### Keypad ###
+ 
+begin
+    prog = mythtv
+    button = camera
+    config = P
+end
+ 
+begin
+    prog = mythtv
+    button = live
+#    config = undefined
+end
+ 
+begin
+    prog = mythtv
+    button = folder
+    config = C
+end
+  
+begin
+    prog = mythtv
+    button = 1
+    config = 1
+    config = return
+end
+  
+begin
+    prog = mythtv
+    button = 2
+    config = 2
+    config = return
+end
+  
+begin
+    prog = mythtv
+    button = 3
+    config = 3
+    config = return
+end
+  
+begin
+    prog = mythtv
+    button = 4
+    config = 4
+    config = return
+end
+  
+begin
+    prog = mythtv
+    button = 5
+    config = 5
+    config = return
+end
+  
+begin
+    prog = mythtv
+    button = 6
+    config = 6
+    config = return
+end
+  
+begin
+    prog = mythtv
+    button = 7
+    config = 7
+    config = return
+end
+  
+begin
+    prog = mythtv
+    button = 8
+    config = 8
+    config = return
+end
+  
+begin
+    prog = mythtv
+    button = 9
+    config = 9
+    config = return
+end
+ 
+begin
+    prog = mythtv
+    button = aspect
+    config = W
+end    
+ 
+begin
+    prog = mythtv
+    button = 0
+    config = 0
+    config = return
+end
+ 
+# Toggle PiP on/off
+begin
+    prog = mythtv
+    button = zoom
+    config = V
+end
+  
+### Play buttons ###
+  
+begin
+    prog = mythtv
+    button = rew
+    config = Left
+#    config = seek -180
+end
+  
+begin
+    prog = mythtv
+    button = playpause
+    config = ctrl+p
+end
+  
+begin
+    prog = mythtv
+    button = ff
+    config = Right
+#    config = seek +180
+end
+    
+begin
+    prog = mythtv
+    button = mute
+    config = |
+end
+  
+begin
+    prog = mythtv
+    button = stop
+    config = P
+end
+  
+begin
+    prog = mythtv
+    button = rec
+    config = R
+end
+  
+begin
+    prog = mythtv
+    button = power
+    config = Esc
+end
+ 
+# Xine
+  
+begin
+    prog = xine
+    button = playpause
+    repeat = 3
+    config = Play
+end
+  
+begin
+    prog = xine
+    button = stop
+    repeat = 3
+    config = Pause
+end
+  
+begin
+    prog = xine
+    button = back
+    config = Quit
+end
+  
+begin
+    prog = xine
+    button = tv_onoff
+    config = Quit
+end
+  
+begin
+    prog = xine
+    button = right
+    repeat = 3
+    config = SeekRelative+10
+end
+  
+begin
+    prog = xine
+    button = left
+    repeat = 3
+    config = SeekRelative-10
+end
+  
+begin
+    prog = xine
+    button = ff
+    repeat = 3
+    config = SeekRelative+30
+end
+  
+begin
+    prog = xine
+    button = rew
+    repeat = 3
+    config = SeekRelative-30
+end
+  
+begin
+    prog = xine
+    button = skip
+    repeat = 3
+    config = SeekRelative+300
+end
+  
+begin
+    prog = xine
+    button = replay
+    repeat = 3
+    config = SeekRelative-300
+end
+  
+begin
+    prog = xine
+    button = up
+    repeat = 1
+    config = EventUp
+end
+  
+begin
+    prog = xine
+    button = down
+    repeat = 1
+    config = EventDown
+end
+  
+begin
+    prog = xine
+    button = ok
+    repeat = 0
+    config = EventSelect
+end
+  
+begin
+    prog = xine
+    button = guide
+    repeat = 0
+    config = Menu
+end
+  
+begin
+    prog = xine
+    button = setup
+    repeat = 0
+    config = Menu
+end
+  
+begin
+    prog = xine
+    button = volup
+    repeat = 1
+    config = Volume+
+end
+  
+begin
+    prog = xine
+    button = voldn
+    repeat = 1
+    config = Volume-
+end
diff --git a/abs/core-testing/system-templates/templates/remotes/Dvico-Dual-Digital4-rev2/preview.jpg b/abs/core-testing/system-templates/templates/remotes/Dvico-Dual-Digital4-rev2/preview.jpg
new file mode 100644
index 0000000..f3956fa
Binary files /dev/null and b/abs/core-testing/system-templates/templates/remotes/Dvico-Dual-Digital4-rev2/preview.jpg differ
diff --git a/abs/core-testing/system-templates/templates/remotes/asus-digitmatrix/lircd.conf.asus b/abs/core-testing/system-templates/templates/remotes/asus-digitmatrix/lircd.conf.asus
deleted file mode 100644
index ceadbf0..0000000
--- a/abs/core-testing/system-templates/templates/remotes/asus-digitmatrix/lircd.conf.asus
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# contributed by Tibor Sipos <tibors@moravia-it.com> and 
-#                Stefan Jahn <stefan@lkcc.org>
-#
-# brand:	     Asus
-# model:	     Asus TV-Box Remote Control
-#
-
-begin remote
-
-  name		Asus TV-Box IR
-
-  bits		8
-  eps		30
-  aeps		100
-  one           0     0
-  zero          0     0
-  gap           1399999
-  toggle_bit	0
-
-	begin codes
-	  0			0x0000000000000000
-	  1			0x0000000000000008
-	  2			0x0000000000000010
-	  3			0x0000000000000018
-	  4			0x0000000000000020
-	  5			0x0000000000000028
-	  6			0x0000000000000030
-	  7			0x0000000000000038
-	  8			0x0000000000000040
-	  9			0x0000000000000048
-	  PREV			0x0000000000000050
-	  ENTER			0x0000000000000058
-	  CH+			0x0000000000000060
-	  CH-			0x0000000000000068
-	  VOL+			0x0000000000000070
-	  VOL-			0x0000000000000078
-	  MAXIMIZE		0x0000000000000080
-	  MUTE			0x0000000000000088
-	  POWER			0x0000000000000090
-	  MENU			0x0000000000000098
-	  UP			0x00000000000000A0
-	  DOWN			0x00000000000000A8
-	  LEFT			0x00000000000000B0
-	  RIGHT			0x00000000000000B8
-	  CAPTION		0x00000000000000C0
-	  MTS/SAP		0x00000000000000C8
-	  DISPLAY		0x00000000000000D0
-	  SCAN			0x00000000000000D8
-	  RED			0x00000000000000E0
-	  GREEN			0x00000000000000E8
-	  YELLOW		0x00000000000000F0
-	  BLUE			0x00000000000000F8
-        end codes
-
-end remote
diff --git a/abs/core-testing/system-templates/templates/remotes/asus-digitmatrix/lircd.conf.digimatrix b/abs/core-testing/system-templates/templates/remotes/asus-digitmatrix/lircd.conf.digimatrix
deleted file mode 100644
index a6e9abd..0000000
--- a/abs/core-testing/system-templates/templates/remotes/asus-digitmatrix/lircd.conf.digimatrix
+++ /dev/null
@@ -1,152 +0,0 @@
-#
-# this config file was automatically generated
-# using lirc-0.7.0pre7(it87) on Sun Aug 29 17:33:17 2004
-#
-# contributed by 
-#
-# brand:                       ASUS
-# model no. of remote control: DigiMatrix
-# devices being controlled by this remote:
-#
-
-begin remote
-
-  name  ASUS_DigiMatrix
-  bits           16
-  flags SPACE_ENC
-  eps            30
-  aeps          100
-
-  header       8057  4071
-  one           479  1534
-  zero          479   531
-  ptrail        491
-  pre_data_bits   8
-  pre_data       0x35
-  gap          25647
-  toggle_bit      0
-
-
-      begin codes
-          up                       0x000000000000E817
-          down                     0x00000000000018E7
-          enter                    0x000000000000D02F
-          left                     0x0000000000009867
-          right                    0x00000000000058A7
-          1                        0x00000000000000FF
-          2                        0x000000000000807F
-          3                        0x00000000000040BF
-          4                        0x000000000000C03F
-          5                        0x00000000000020DF
-          6                        0x000000000000A05F
-          7                        0x000000000000609F
-          8                        0x000000000000E01F
-          9                        0x00000000000010EF
-          0                        0x000000000000906F
-          on_off                   0x000000000000B04F
-          dvd_vcd                  0x000000000000F00F
-          tv                       0x00000000000008F7
-          os_start                 0x00000000000030CF
-          photo                    0x00000000000048B7
-          home                     0x00000000000044BB
-          back                     0x000000000000A857
-          ch+                      0x000000000000B847
-          stop                     0x000000000000946B
-          play                     0x000000000000C43B
-          vol+                     0x000000000000F807
-          ch-                      0x0000000000007887
-          step-                    0x000000000000E41B
-          step+                    0x000000000000649B
-          vol-                     0x00000000000004FB
-          pause                    0x00000000000024DB
-          pre                      0x00000000000014EB
-          next                     0x000000000000A45B
-          mute                     0x000000000000847B
-          rec                      0x000000000000D42B
-          subtitle                 0x000000000000C837
-          menu                     0x00000000000038C7
-          dvd_audio                0x00000000000050AF
-          ui_size                  0x0000000000008877
-          ui_on_off                0x00000000000028D7
-      end codes
-
-end remote
-
-
-#
-# this config file was automatically generated
-# using lirc-0.7.2(it87) on Sun Aug 28 18:13:15 2005
-#
-# contributed by 
-#
-# brand:                       ASUS
-# model no. of remote control: DigiMatrix Mark 2
-# devices being controlled by this remote:
-#
-
-begin remote
-
-  name  ASUS_DigiMatrixMk2
-  bits            8
-  flags SPACE_ENC
-  eps            30
-  aeps          100
-
-  header       2666  1378
-  one           260   741
-  zero          260   279
-  ptrail        251
-  pre_data_bits   1
-  pre_data       0x0
-  post_data_bits  8
-  post_data      0x3
-  gap          10826
-  min_repeat      1
-  toggle_bit      0
-
-
-      begin codes
-          power                    0x0000000000000084
-          tv_dvr                   0x0000000000000044
-          fm                       0x00000000000000C4
-          os_start                 0x0000000000000024
-          music                    0x00000000000000A4
-          pictures                 0x0000000000000064
-          video                    0x00000000000000E4
-          dvd_menu                 0x0000000000000014
-          up                       0x000000000000004C
-          down                     0x00000000000000E0
-          left                     0x0000000000000010
-          right                    0x0000000000000040
-          back                     0x00000000000000B4
-          ok                       0x0000000000000088
-          back_fwd                 0x0000000000000074
-          rew                      0x0000000000000094
-          play_pause               0x0000000000000054
-          fwd                      0x00000000000000D4
-          step-                    0x0000000000000098
-          stop                     0x0000000000000048
-          step+                    0x0000000000000090
-          vol+                     0x0000000000000058
-          vol-                     0x00000000000000D8
-          home                     0x00000000000000C8
-          ch+                      0x0000000000000050
-          ch-                      0x00000000000000D0
-          mute                     0x0000000000000038
-          rec                      0x0000000000000028
-          pc                       0x0000000000000030
-          1                        0x00000000000000B8
-          2                        0x00000000000000A8
-          3                        0x00000000000000B0
-          4                        0x0000000000000078
-          5                        0x0000000000000068
-          6                        0x0000000000000070
-          7                        0x00000000000000F8
-          8                        0x00000000000000E8
-          9                        0x00000000000000F0
-          0                        0x0000000000000018
-          ui_size                  0x0000000000000004
-          repeat                   0x0000000000000008
-      end codes
-
-end remote
diff --git a/abs/core-testing/system-templates/templates/remotes/asus-digitmatrix/preview.jpg b/abs/core-testing/system-templates/templates/remotes/asus-digitmatrix/preview.jpg
deleted file mode 100644
index a034186..0000000
Binary files a/abs/core-testing/system-templates/templates/remotes/asus-digitmatrix/preview.jpg and /dev/null differ
diff --git a/abs/core-testing/system-templates/templates/remotes/ea65/lircd.conf.ea65 b/abs/core-testing/system-templates/templates/remotes/ea65/lircd.conf.ea65
deleted file mode 100644
index a10181d..0000000
--- a/abs/core-testing/system-templates/templates/remotes/ea65/lircd.conf.ea65
+++ /dev/null
@@ -1,73 +0,0 @@
-#
-#  Config file for AOpen XC Cube EA65, EA65-II
-#  Max Krasnyanskiy <maxk@qualcomm.com>
-#
-
-begin remote
-  name  EA65
-  bits  24
-  eps   10
-  aeps  100
-
-  gap           960000
-  toggle_bit    0
-
-  begin codes
-	tv/pvr      0x0014814c
-        photo       0x0017810e
-        htpc        0x0011811b
-        dvd/vcd     0x00128100
-        cd/mp3      0x00138152
-        fm          0x00158111
-        video       0x0016810f
-
-        1           0x0041810b
-        2           0x00428115
-        3           0x00438112
-        4           0x00448141
-        5           0x00458119
-        6           0x00468116
-        7           0x00478150
-        8           0x0048811a
-        9           0x00498155
-        *           0x00328156
-        0           0x00408158
-        #           0x0030814d
-        
-        menu        0x00188104
-        exit        0x001d8154
-        enter       0x001e8101
-        up          0x00198159
-        down        0x001a811c
-        left        0x001c8102
-        right       0x001b815d
-
- 	vol+        0x00298103
- 	vol-        0x002a814e
- 	ch+         0x002c8113
- 	ch-         0x002d8117
- 	mute        0x00288105
- 	tune+       0x002e8144
- 	tune-       0x002f8148
- 	mem         0x00318145
- 	scan        0x00278151
-
- 	display     0x0034811f
- 	eject       0x0035815c
- 	rwnd        0x00228118
- 	ffwd        0x00218110
- 	rec         0x002b810a
- 	repeate     0x0038815a
- 	prev        0x00238107
- 	next        0x00248114
- 	time/shift  0x00338108
- 	stop        0x0020811d
- 	play/pause  0x001f8109
-
-        play-pause  0x0080811d
-        stop-eject  0x00238107
-        mode-       0x00ff1080
-        mode+       0x00ff1180
-  end codes
-end remote
-
diff --git a/abs/core-testing/system-templates/templates/remotes/ea65/lircrc.ea65 b/abs/core-testing/system-templates/templates/remotes/ea65/lircrc.ea65
deleted file mode 100644
index fd96d42..0000000
--- a/abs/core-testing/system-templates/templates/remotes/ea65/lircrc.ea65
+++ /dev/null
@@ -1,381 +0,0 @@
-#
-# Max Krasnyanskiy <maxk@qualcomm.com>
-#
-
-#
-# Xine key bindings.
-#
-
-# start playback
-begin
-	button = dvd/vcd
-	prog   = xine
-	repeat = 1
-	config = Play
-end
-
-# playback pause toggle
-begin
-	button = play/pause
-	prog   = xine
-	repeat = 1
-	config = Pause
-end
-
-# stop playback
-begin
-	button = stop
-	prog   = xine
-	repeat = 1
-	config = Stop
-end
-
-# eject the current medium
-begin
-	button = eject
-	prog   = xine
-	repeat = 1
-	config = Eject
-end
-
-# scan playlist to grab stream infos
-begin
-	button = mem
-	prog   = xine
-	repeat = 1
-	config = ScanPlaylistInfo
-end
-
-# set position to -60 seconds in current stream
-begin
-	button = rwnd
-	prog   = xine
-	repeat = 1
-	config = SeekRelative-60
-end
-
-# set position to +60 seconds in current stream
-begin
-	button = ffwd
-	prog   = xine
-	repeat = 1
-	config = SeekRelative+60
-end
-
-# increment playback speed
-begin
-	button = tune+
-	prog   = xine
-	repeat = 1
-	config = SpeedFaster
-end
-
-# decrement playback speed
-begin
-	button = tune-
-	prog   = xine
-	repeat = 1
-	config = SpeedSlower
-end
-
-# increment audio volume
-begin
-	button = vol+
-	prog   = xine
-	repeat = 1
-	config = Volume+
-end
-
-# decrement audio volume
-begin
-	button = vol-
-	prog   = xine
-	repeat = 1
-	config = Volume-
-end
-
-# audio muting toggle
-begin
-	button = mute
-	prog   = xine
-	repeat = 1
-	config = Mute
-end
-
-# select next audio channel
-begin
-	button = ch+
-	prog   = xine
-	repeat = 1
-	config = AudioChannelNext
-end
-
-# select previous audio channel
-begin
-	button = ch-
-	prog   = xine
-	repeat = 1
-	config = AudioChannelPrior
-end
-
-# interlaced mode toggle
-begin
-	button = scan
-	prog   = xine
-	repeat = 1
-	config = ToggleInterleave
-end
-
-# cycle aspect ratio values
-begin
-	button = display
-	prog   = xine
-	repeat = 1
-	config = ToggleAspectRatio
-end
-
-# jump to Title Menu
-begin
-	button = menu
-	prog   = xine
-	repeat = 1
-	config = TitleMenu
-end
-
-# menu navigate up
-begin
-	button = up
-	prog   = xine
-	repeat = 1
-	config = EventUp
-end
-
-# menu navigate down
-begin
-	button = down
-	prog   = xine
-	repeat = 1
-	config = EventDown
-end
-
-# menu navigate left
-begin
-	button = left
-	prog   = xine
-	repeat = 1
-	config = EventLeft
-end
-
-# menu navigate right
-begin
-	button = right
-	prog   = xine
-	repeat = 1
-	config = EventRight
-end
-
-# menu select
-begin
-	button = enter
-	prog   = xine
-	repeat = 1
-	config = EventSelect
-end
-
-# jump to next chapter
-begin
-	button = next
-	prog   = xine
-	repeat = 1
-	config = EventNext
-end
-
-# jump to previous chapter
-begin
-	button = prev
-	prog   = xine
-	repeat = 1
-	config = EventPrior
-end
-
-# select a subtitle file
-begin
-	button = repeat
-	prog   = xine
-	repeat = 1
-	config = SubSelector
-end
-
-# enter the number 0
-begin
-	button = 0
-	prog   = xine
-	repeat = 1
-	config = Number0
-end
-
-# enter the number 1
-begin
-	button = 1
-	prog   = xine
-	repeat = 1
-	config = Number1
-end
-
-# enter the number 2
-begin
-	button = 2
-	prog   = xine
-	repeat = 1
-	config = Number2
-end
-
-# enter the number 3
-begin
-	button = 3
-	prog   = xine
-	repeat = 1
-	config = Number3
-end
-
-# enter the number 4
-begin
-	button = 4
-	prog   = xine
-	repeat = 1
-	config = Number4
-end
-
-# enter the number 5
-begin
-	button = 5
-	prog   = xine
-	repeat = 1
-	config = Number5
-end
-
-# enter the number 6
-begin
-	button = 6
-	prog   = xine
-	repeat = 1
-	config = Number6
-end
-
-# enter the number 7
-begin
-	button = 7
-	prog   = xine
-	repeat = 1
-	config = Number7
-end
-
-# enter the number 8
-begin
-	button = 8
-	prog   = xine
-	repeat = 1
-	config = Number8
-end
-
-# enter the number 9
-begin
-	button = 9
-	prog   = xine
-	repeat = 1
-	config = Number9
-end
-
-# quit the program
-begin
-	button = exit
-	prog   = xine
-	repeat = 1
-	config = Quit
-end
-
-##
-# End of xine key bindings.
-##
-
-## MPlayer lirc setup
-
-# Show OSD
-begin
-	prog = mplayer
-	button = menu
-	repeat = 1
-	config = osd
-end
-
-# Pause playback
-begin
-	prog = mplayer
-	button = play/pause
-	repeat = 1
-	config = pause
-end
-
-# Stop playback and exit
-begin
-	prog = mplayer
-	button = stop
-	repeat = 1
-	config = stop #quit
-end
-
-# Mute
-begin
-	prog = mplayer
-	button = mute
-	repeat = 1
-	config = mute
-end
-
-# Seek back 10 seconds
-begin
-	prog = mplayer
-	button = rwnd
-	repeat = 1
-	config = seek -10
-end
-
-# Seek forward 30 seconds
-begin
-	prog = mplayer
-	button = ffwd
-	repeat = 1
-	config = seek +10
-end
-
-# Quit
-begin
-	prog = mplayer
-	button = exit
-	repeat = 1
-	config = quit
-end
-
-# Seek forward 10 minutes
-begin
-	prog = mplayer
-	button = next
-	repeat = 1
-	config = seek +600
-end
-
-# Seek backward 10 minutes
-begin
-	prog = mplayer
-	button = prev
-	repeat = 1
-	config = seek -600
-end
-
-# Toggle full-screen
-begin
-	prog = mplayer
-	button = display
-	repeat = 1
-	config = vo_fullscreen
-end
diff --git a/abs/core-testing/system-templates/templates/remotes/ea65/preview.jpg b/abs/core-testing/system-templates/templates/remotes/ea65/preview.jpg
deleted file mode 100644
index a034186..0000000
Binary files a/abs/core-testing/system-templates/templates/remotes/ea65/preview.jpg and /dev/null differ
diff --git a/abs/core-testing/system-templates/templates/remotes/imon-pad/preview.jpg b/abs/core-testing/system-templates/templates/remotes/imon-pad/preview.jpg
index a034186..a2e46a3 100644
Binary files a/abs/core-testing/system-templates/templates/remotes/imon-pad/preview.jpg and b/abs/core-testing/system-templates/templates/remotes/imon-pad/preview.jpg differ
diff --git a/abs/core-testing/system-templates/templates/remotes/imon/preview.jpg b/abs/core-testing/system-templates/templates/remotes/imon/preview.jpg
index a034186..0829118 100644
Binary files a/abs/core-testing/system-templates/templates/remotes/imon/preview.jpg and b/abs/core-testing/system-templates/templates/remotes/imon/preview.jpg differ
-- 
cgit v0.12


From a8497f7436ef800137be60cf37a6907ba06b928e Mon Sep 17 00:00:00 2001
From: Greg Frost <gregfrost1@bigpond.com>
Date: Sun, 19 Jul 2009 13:58:05 +0930
Subject: runit-scripts: tidy lirc run script

---
 abs/core-testing/runit-scripts/PKGBUILD            |  2 +-
 .../runit-scripts/runitscripts/services/lircd/run  | 90 ++++++++++------------
 2 files changed, 43 insertions(+), 49 deletions(-)

diff --git a/abs/core-testing/runit-scripts/PKGBUILD b/abs/core-testing/runit-scripts/PKGBUILD
index 7fe22bf..4c84b82 100755
--- a/abs/core-testing/runit-scripts/PKGBUILD
+++ b/abs/core-testing/runit-scripts/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=runit-scripts
 pkgver=1.8.0
-pkgrel=91
+pkgrel=92
 pkgdesc="collection of startup scripts for runit"
 url="http://smarden.org/runit/"
 license="BSD"
diff --git a/abs/core-testing/runit-scripts/runitscripts/services/lircd/run b/abs/core-testing/runit-scripts/runitscripts/services/lircd/run
index 6d67537..3473fa6 100755
--- a/abs/core-testing/runit-scripts/runitscripts/services/lircd/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/lircd/run
@@ -1,26 +1,32 @@
 #!/bin/bash
+
 exec 2>&1
 export TERM=linux
+
 . /etc/rc.conf
 . /etc/rc.d/functions
 
 #since what we do may not be enough
 #if your one of those people, this is where you place your stuff
+
 LOG=/tmp/lirc.log
+
 if [ -f $LOG ]
 then
-	rm -f $LOG
+    rm -f $LOG
 fi
+
 if [ -f /etc/runit/lirc.sh ]
 then
     #program must not terminate.
 
-	stat_runit "Starting lirc"
+    stat_runit "Starting lirc"
 	
     /etc/runit/lirc.sh
 else
     . /etc/systemconfig
     stat_runit "Starting lirc"
+
     [ -e /etc/sv/lircd/.runtime ] || mkdir -p /etc/sv/lircd/.runtime
 
     function dvico_detect {
@@ -35,15 +41,26 @@ else
     num_lirc=`ls -la /dev/lirc[0-9] 2>/dev/null |wc -l `
     num_lirc=$((num_lirc-1))
 
-    #/dev/ttys0 (COM1), port 0x3f8, irq 4
-    #/dev/ttys1 (COM2), port 0x2f8, irq 3
-    #/dev/ttys2 (COM3), port 0x3e8, irq 4
-    #/dev/ttys3 (COM4), port 0x2e8, irq 3
+    serial_port=""
+
     if [ x$ReceiverType = xSerial ]
     then
-        case $ReceiverSerialport in
+        serial_port=$ReceiverSerialport
+    elid [ x$HostBlasterType = xSerial ]
+    then
+        serial_port=$HostSerialPort_blasterlirc
+    fi
+
+    if [ -n "$serial_port" ]
+    then
+        #/dev/ttyS0 (COM1), port 0x3f8, irq 4
+        #/dev/ttyS1 (COM2), port 0x2f8, irq 3
+    	#/dev/ttyS2 (COM3), port 0x3e8, irq 4
+    	#/dev/ttyS3 (COM4), port 0x2e8, irq 3
+
+        case $serial_port in
         ttyS0)
-                FLAGS="io=0x3f8  irq=4"
+               FLAGS="io=0x3f8  irq=4"
                ;;
         ttyS1)
                FLAGS="io=0x2f8  irq=3"
@@ -52,81 +69,58 @@ else
                FLAGS="io=0x3e8  irq=4"
                ;;
         ttyS3)
-               FLAGS="io=0x2f8  irq=3"
+               FLAGS="io=0x2e8  irq=3"
                ;;
         esac
-        /usr/bin/setserial /dev/$ReceiverSerialport uart none
-	sleep  .5
+        /usr/bin/setserial /dev/serial_port uart none
+	sleep 0.5
         /sbin/modprobe lirc_serial $FLAGS
-	sleep .5
-    elif [ x$HostBlasterType = xSerial ]
-    then
-            case $HostSerialPort_blasterlirc in
-            ttyS0)
-                    FLAGS="io=0x3f8  irq=4"
-                   ;;
-            ttyS1)
-                   FLAGS="io=0x2f8  irq=3"
-                   ;;
-            ttyS2)
-                   FLAGS="io=0x3e8  irq=4"
-                   ;;
-            ttyS3)
-                   FLAGS="io=0x2f8  irq=3"
-                   ;;
-            esac
-            /usr/bin/setserial /dev/$ReceiverSerialport uart none
-            sleep .5
-           /sbin/modprobe lirc_serial $FLAGS
-           sleep .5
+	sleep 0.5
     fi
 
     dvico_detect
+
     if [ x$HostBlasterType = xCommandIR -o x$ReceiverType = xCommandIR ]
     then
         CMD="/usr/sbin/lircd -n  --driver=commandir"
 	printhl "	Using commandir"
         $CMD >>$LOG 2>>$LOG
-   elif [  x$HostBlasterType = xiguanaIR-usb -o x$ReceiverType = xiguanaIR-usb ]
-   then
+    elif [  x$HostBlasterType = xiguanaIR-usb -o x$ReceiverType = xiguanaIR-usb ]
+    then
 	sv start igdaemon
         CMD="/usr/sbin/lircd -n  --driver=iguanaIR"
 	printhl "       Using iguanaIR usb"
         $CMD >>$LOG 2>>$LOG
     else
         LASTCMD=""
+
         for i in `seq 1 $num_lirc`
         do
             CMD="/usr/sbin/lircd -d /dev/lirc$i --output=/dev/lircd$i --pidfile=/var/run/lircd$i.pid --listen=876$i"
-#            echo $CMD
 	    printhl "	Device $i"
             $CMD >>$LOG 2>>$LOG
             LASTCMD="--connect=localhost:876$i   $LASTCMD    "
         done
+
         if [ $RunDvico = "true" -a $num_lirc -lt 0 ]
         then
-	        #only run dvicio
-	        LCMD="/usr/sbin/lircd -n -d /dev/usb/dvicoIR --driver=dvico  --output /dev/lircd"
-	    #      echo $LCMD
-		printhl "	Device Dvicio"
-		
-	        exec $LCMD >>$LOG 2>>$LOG
+	    #only run Dvico
+	    LCMD="/usr/sbin/lircd -n -d /dev/usb/dvicoIR --driver=dvico  --output /dev/lircd"
+	    printhl "	Device Dvicio"
+	    exec $LCMD >>$LOG 2>>$LOG
         elif [ $RunDvico = true -a $num_lirc -gt -1  ]
         then
-            #chain them together
+            # Chain them together.
             i=$((i+1))
             CMD="/usr/sbin/lircd -d /dev/usb/dvicoIR --driver=dvico  --output=/dev/lircd$i --pidfile=/var/run/lircd$i.pid --listen=876$i"
-    #        echo $CMD
             $CMD >> $LOG
             LASTCMD="--connect=localhost:876$i   $LASTCMD    "
-		printhl "	Device Dvicio"
+	    printhl "	Device Dvicio"
 		
             /usr/sbin/lircd -n -d /dev/lirc0 --output /dev/lircd  $LASTCMD  >>$LOG 2>>$LOG
         else
-        LCMD="/usr/sbin/lircd -n -d /dev/lirc0 --output /dev/lircd  $LASTCMD"
-    #       echo $LCMD
-        
-        exec $LCMD >>$LOG 2>>$LOG
+            LCMD="/usr/sbin/lircd -n -d /dev/lirc0 --output /dev/lircd  $LASTCMD"
+            exec $LCMD >>$LOG 2>>$LOG
         fi
     fi
 fi
-- 
cgit v0.12


From 1a13bb8bdc2d9f727201113e234eecfd868eda03 Mon Sep 17 00:00:00 2001
From: Greg Frost <gregfrost1@bigpond.com>
Date: Sun, 19 Jul 2009 14:34:33 +0930
Subject: runit-scripts: unbork and add Dvico dual4 rev2 support

---
 abs/core-testing/runit-scripts/PKGBUILD            |  2 +-
 .../runit-scripts/runitscripts/services/lircd/run  | 56 +++++++++++++---------
 2 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/abs/core-testing/runit-scripts/PKGBUILD b/abs/core-testing/runit-scripts/PKGBUILD
index 4c84b82..aa26834 100755
--- a/abs/core-testing/runit-scripts/PKGBUILD
+++ b/abs/core-testing/runit-scripts/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=runit-scripts
 pkgver=1.8.0
-pkgrel=92
+pkgrel=93
 pkgdesc="collection of startup scripts for runit"
 url="http://smarden.org/runit/"
 license="BSD"
diff --git a/abs/core-testing/runit-scripts/runitscripts/services/lircd/run b/abs/core-testing/runit-scripts/runitscripts/services/lircd/run
index 3473fa6..7067b90 100755
--- a/abs/core-testing/runit-scripts/runitscripts/services/lircd/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/lircd/run
@@ -30,7 +30,7 @@ else
     [ -e /etc/sv/lircd/.runtime ] || mkdir -p /etc/sv/lircd/.runtime
 
     function dvico_detect {
-        if [ x$Remotetype = "xdvico" ]
+        if [ x$Remotetype = "xdvico" ] || [ x$Remotetype = "xDvico-Dual-Digital4-rev2" ]
         then
             RunDvico=true
         else
@@ -46,7 +46,7 @@ else
     if [ x$ReceiverType = xSerial ]
     then
         serial_port=$ReceiverSerialport
-    elid [ x$HostBlasterType = xSerial ]
+    elif [ x$HostBlasterType = xSerial ]
     then
         serial_port=$HostSerialPort_blasterlirc
     fi
@@ -85,11 +85,13 @@ else
         CMD="/usr/sbin/lircd -n  --driver=commandir"
 	printhl "	Using commandir"
         $CMD >>$LOG 2>>$LOG
+echo $CMD
     elif [  x$HostBlasterType = xiguanaIR-usb -o x$ReceiverType = xiguanaIR-usb ]
     then
 	sv start igdaemon
         CMD="/usr/sbin/lircd -n  --driver=iguanaIR"
 	printhl "       Using iguanaIR usb"
+echo $CMD
         $CMD >>$LOG 2>>$LOG
     else
         LASTCMD=""
@@ -98,29 +100,39 @@ else
         do
             CMD="/usr/sbin/lircd -d /dev/lirc$i --output=/dev/lircd$i --pidfile=/var/run/lircd$i.pid --listen=876$i"
 	    printhl "	Device $i"
+echo $CMD
             $CMD >>$LOG 2>>$LOG
             LASTCMD="--connect=localhost:876$i   $LASTCMD    "
         done
 
-        if [ $RunDvico = "true" -a $num_lirc -lt 0 ]
-        then
-	    #only run Dvico
-	    LCMD="/usr/sbin/lircd -n -d /dev/usb/dvicoIR --driver=dvico  --output /dev/lircd"
-	    printhl "	Device Dvicio"
-	    exec $LCMD >>$LOG 2>>$LOG
-        elif [ $RunDvico = true -a $num_lirc -gt -1  ]
-        then
-            # Chain them together.
-            i=$((i+1))
-            CMD="/usr/sbin/lircd -d /dev/usb/dvicoIR --driver=dvico  --output=/dev/lircd$i --pidfile=/var/run/lircd$i.pid --listen=876$i"
-            $CMD >> $LOG
-            LASTCMD="--connect=localhost:876$i   $LASTCMD    "
-	    printhl "	Device Dvicio"
-		
-            /usr/sbin/lircd -n -d /dev/lirc0 --output /dev/lircd  $LASTCMD  >>$LOG 2>>$LOG
-        else
-            LCMD="/usr/sbin/lircd -n -d /dev/lirc0 --output /dev/lircd  $LASTCMD"
-            exec $LCMD >>$LOG 2>>$LOG
-        fi
+	if [ $RunDvico = "true" ]
+	then
+	    if [ x$Remotetype = "xdvico" ]
+            then
+                LCMD="/usr/sbin/lircd -n -d /dev/usb/dvicoIR --driver=dvico  --output /dev/lircd"
+            else
+                LCMD="/usr/sbin/lircd -n -d /dev/input/irremote --driver=devinput  --output /dev/lircd"
+            fi
+
+	    if [ $num_lirc -lt 0 ]
+	    then
+		# Only run Dvico
+		printhl "   Device $Remotetype"
+echo $LCMD
+            	exec $LCMD >>$LOG 2>>$LOG
+	    elif [ $num_lirc -gt -1  ]
+	    then
+                i=$((i+1))
+                CMD="$LCMD --output=/dev/lircd$i --pidfile=/var/run/lircd$i.pid --listen=876$i"
+                $CMD >> $LOG
+                LASTCMD="--connect=localhost:876$i   $LASTCMD    "
+	        printhl "	Device Dvico"
+		/usr/sbin/lircd -n -d /dev/lirc0 --output /dev/lircd  $LASTCMD  >>$LOG 2>>$LOG
+	    fi
+	else
+	    LCMD="/usr/sbin/lircd -n -d /dev/lirc0 --output /dev/lircd  $LASTCMD"
+echo $LCMD
+     	    exec $LCMD >>$LOG 2>>$LOG
+	fi
     fi
 fi
-- 
cgit v0.12


From 4cb1ab858b9ad93a2bc16b3e9966dee4c2043ddd Mon Sep 17 00:00:00 2001
From: Greg Frost <gregfrost1@bigpond.com>
Date: Sun, 19 Jul 2009 15:43:04 +0930
Subject: system-templates: autodetection of Dvico DD4-rev2

---
 abs/core-testing/system-templates/PKGBUILD                          | 2 +-
 abs/core-testing/system-templates/templates/remotes/receiver_usb.id | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/abs/core-testing/system-templates/PKGBUILD b/abs/core-testing/system-templates/PKGBUILD
index ed6856f..904db3c 100755
--- a/abs/core-testing/system-templates/PKGBUILD
+++ b/abs/core-testing/system-templates/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=system-templates
 pkgver=1.0
-pkgrel=28
+pkgrel=29
 conflicts=( )
 pkgdesc="Templates used for system configuration"
 depends=()
diff --git a/abs/core-testing/system-templates/templates/remotes/receiver_usb.id b/abs/core-testing/system-templates/templates/remotes/receiver_usb.id
index 71b37d1..f76442a 100644
--- a/abs/core-testing/system-templates/templates/remotes/receiver_usb.id
+++ b/abs/core-testing/system-templates/templates/remotes/receiver_usb.id
@@ -4,6 +4,7 @@
 0bc7:0004|ATI_Remote_Wonder|    " ATI Remote Wonder"
 0e9c:0000|streamzap|    "Streamzap Remote"
 0fe9:9010|dvico|   "DVICO Remote:"
+0fe9:db98|Dvico-Dual-Digital4-rev2| "Dvico Dual Digital4 rev2 0fe9/db98"
 6253:0100|Twinhan_USB|  "the VisionPlus is a Twinhan clone "
 1509:9242|mceusb|  "FIC eHome Infrared Transceiver 1509/9242"
 1934:0602|mceusb|  "Fintek eHome Infrared Transceiver 1934/0602"
@@ -31,3 +32,4 @@
 1784:0007|mceusb|  "Topseed HP eHome Infrared Transceiver 1784/0007"
 1784:0008|mceusb|  "Topseed eHome Infrared Transceiver 1784/0008"
 045e:006d|mceusb-old|  "USB Microsoft IR Transceiver Driver 045e/006d"
+
-- 
cgit v0.12