vdr/vdr-plugin-remote/misc av7110_ir-permission-666-kernel-2.4.diff av7110_ir-permission-666-kernel-2.6.diff kernel-2.4-keybdev-patch.diff runvdr.remote

Thomas Schmidt pkg-vdr-dvb-changes@lists.alioth.debian.org
Sun, 24 Oct 2004 12:44:25 +0000


Update of /cvsroot/pkg-vdr-dvb/vdr/vdr-plugin-remote/misc
In directory haydn:/tmp/cvs-serv22475/vdr/vdr-plugin-remote/misc

Added Files:
	av7110_ir-permission-666-kernel-2.4.diff 
	av7110_ir-permission-666-kernel-2.6.diff 
	kernel-2.4-keybdev-patch.diff runvdr.remote 
Log Message:
* added missing files from the upstream-source :)

--- NEW FILE: av7110_ir-permission-666-kernel-2.6.diff ---
--- av7110_ir.c.orig	Mon Mar 29 01:58:31 2004
+++ av7110_ir.c	Mon Mar 29 02:03:51 2004
@@ -188,7 +188,7 @@ int __init av7110_ir_init(void)
 	av7110_setup_irc_config(NULL, 0x0001);
 	av7110_register_irc_handler(av7110_emit_key);
 
-	e = create_proc_entry("av7110_ir", S_IFREG | S_IRUGO | S_IWUSR, NULL);
+	e = create_proc_entry("av7110_ir", S_IFREG | S_IRUGO | S_IWUGO, NULL);
 	if (e) {
 		e->write_proc = av7110_ir_write_proc;
 		e->size = 4 + 256 * sizeof(u16);

--- NEW FILE: runvdr.remote ---
#!/bin/sh

# runvdr: Loads the DVB driver and runs VDR
#
# If VDR exits abnormally, the driver will be reloaded
# and VDR restarted.
#
# Set the environment variable VDRUSR to the user id you
# want VDR to run with. If VDRUSR is not set, VDR will run
# as 'root', which is not necessarily advisable.
#
# Since this script loads the DVB driver, it must be started
# as user 'root'.
#
# Any command line parameters will be passed on to the
# actual 'vdr' program.
#
# See the main source file 'vdr.c' for copyright information and
# how to reach the author.

DVBDIR="../DVB/driver"
DVBREM="$DVBDIR/../apps/av7110_loadkeys"
VDRPRG="./vdr"
VDRCMD="$VDRPRG -w 60 -Premote $*"

LSMOD="`/sbin/lsmod | grep -w '^dvb' | wc -l`"
KILL="/usr/bin/killall -q -TERM"

# Load driver if it hasn't been loaded already:
if [ $LSMOD -eq 0 ] ; then
   (cd $DVBDIR; make insmod)
   fi

while (true) do
      # next line is _not_ required if autodetect mode is used
      $DVBREM/av7110_loadkeys $DVBREM/hauppauge.rc5 > /proc/av7110_ir 
      su $VDRUSR -c "$VDRCMD"
      if test $? -eq 0 -o $? -eq 2; then exit; fi
      date
      echo "restarting VDR"
      $KILL $VDRPRG
      sleep 10
      (cd $DVBDIR; make rmmod; make insmod)
      date
      done

--- NEW FILE: kernel-2.4-keybdev-patch.diff ---
--- keybdev.c.org	Thu Jun 26 00:10:52 2003
+++ keybdev.c	Mon Oct 13 13:58:45 2003
@@ -191,6 +191,9 @@ static struct input_handle *keybdev_conn
 	if (i == BTN_MISC)
  		return NULL;
 
+	if (dev->name[0]=='D' && dev->name[1]=='V' && dev->name[2] == 'B')
+		return NULL;
+
 	if (!(handle = kmalloc(sizeof(struct input_handle), GFP_KERNEL)))
 		return NULL;
 	memset(handle, 0, sizeof(struct input_handle));

--- NEW FILE: av7110_ir-permission-666-kernel-2.4.diff ---
--- av7110_ir.c.org	Wed May 21 16:11:17 2003
+++ av7110_ir.c	Fri Oct 10 21:07:49 2003
@@ -185,7 +185,7 @@ int __init av7110_ir_init (void)
 	av7110_setup_irc_config (NULL, 0x0001);
 	av7110_register_irc_handler (av7110_emit_key);
 
-	e = create_proc_entry ("av7110_ir", S_IFREG | S_IRUGO | S_IWUSR, NULL);
+	e = create_proc_entry ("av7110_ir", S_IFREG | S_IRUGO | S_IWUGO, NULL);
 
 	if (e) {
 		e->write_proc = av7110_ir_write_proc;