Merge branch 'HEAD' of ssh://cesman@knoppmyth.net/mount/repository/LinHES-PKGBUILD

20 files changed, 615 insertions, 70 deletions

diff --git a/abs/core-testing/lirc/PKGBUILD b/abs/core-testing/lirc/PKGBUILD
index 30c5052..5406783 100644
--- a/abs/core-testing/lirc/PKGBUILD
+++ b/abs/core-testing/lirc/PKGBUILD
@@ -3,14 +3,14 @@
 
 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)
 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
@@ -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>
diff --git a/abs/core-testing/runit-scripts/PKGBUILD b/abs/core-testing/runit-scripts/PKGBUILD
index 7fe22bf..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=91
+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 6d67537..7067b90 100755
--- a/abs/core-testing/runit-scripts/runitscripts/services/lircd/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/lircd/run
@@ -1,30 +1,36 @@
 #!/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 {
-        if [ x$Remotetype = "xdvico" ]
+        if [ x$Remotetype = "xdvico" ] || [ x$Remotetype = "xDvico-Dual-Digital4-rev2" ]
         then
             RunDvico=true
         else
@@ -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
+    elif [ 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,70 @@ 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
+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=""
+
         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"
+echo $CMD
             $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
-        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"
-    #        echo $CMD
-            $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"
-    #       echo $LCMD
-        
-        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
diff --git a/abs/core-testing/system-templates/PKGBUILD b/abs/core-testing/system-templates/PKGBUILD
index b911335..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=27
+pkgrel=29
 conflicts=( )
 pkgdesc="Templates used for system configuration"
 depends=()
diff --git a/abs/core-testing/system-templates/templates/remotes/ea65/lircd.conf.ea65 b/abs/core-testing/system-templates/templates/remotes/AOpen-EA65/lircd.conf.ea65
index a10181d..a10181d 100644
--- a/abs/core-testing/system-templates/templates/remotes/ea65/lircd.conf.ea65
+++ b/abs/core-testing/system-templates/templates/remotes/AOpen-EA65/lircd.conf.ea65
diff --git a/abs/core-testing/system-templates/templates/remotes/ea65/lircrc.ea65 b/abs/core-testing/system-templates/templates/remotes/AOpen-EA65/lircrc.ea65
index fd96d42..fd96d42 100644
--- a/abs/core-testing/system-templates/templates/remotes/ea65/lircrc.ea65
+++ b/abs/core-testing/system-templates/templates/remotes/AOpen-EA65/lircrc.ea65
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
--- /dev/null
+++ b/abs/core-testing/system-templates/templates/remotes/AOpen-EA65/preview.jpg
diff --git a/abs/core-testing/system-templates/templates/remotes/asus-digitmatrix/lircd.conf.asus b/abs/core-testing/system-templates/templates/remotes/ASUS-DiGiMatrix/lircd.conf.asus
index ceadbf0..ceadbf0 100644
--- a/abs/core-testing/system-templates/templates/remotes/asus-digitmatrix/lircd.conf.asus
+++ b/abs/core-testing/system-templates/templates/remotes/ASUS-DiGiMatrix/lircd.conf.asus
diff --git a/abs/core-testing/system-templates/templates/remotes/asus-digitmatrix/lircd.conf.digimatrix b/abs/core-testing/system-templates/templates/remotes/ASUS-DiGiMatrix/lircd.conf.digimatrix
index a6e9abd..a6e9abd 100644
--- a/abs/core-testing/system-templates/templates/remotes/asus-digitmatrix/lircd.conf.digimatrix
+++ b/abs/core-testing/system-templates/templates/remotes/ASUS-DiGiMatrix/lircd.conf.digimatrix
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
--- /dev/null
+++ b/abs/core-testing/system-templates/templates/remotes/ASUS-DiGiMatrix/preview.jpg
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
--- /dev/null
+++ b/abs/core-testing/system-templates/templates/remotes/Dvico-Dual-Digital4-rev2/preview.jpg
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
--- a/abs/core-testing/system-templates/templates/remotes/asus-digitmatrix/preview.jpg
+++ /dev/null
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
--- a/abs/core-testing/system-templates/templates/remotes/ea65/preview.jpg
+++ /dev/null
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
--- a/abs/core-testing/system-templates/templates/remotes/imon-pad/preview.jpg
+++ b/abs/core-testing/system-templates/templates/remotes/imon-pad/preview.jpg
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
--- a/abs/core-testing/system-templates/templates/remotes/imon/preview.jpg
+++ b/abs/core-testing/system-templates/templates/remotes/imon/preview.jpg
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"
+