diff --git a/packages/sysutils/kmod/modprobe.d/blacklist.conf b/packages/sysutils/kmod/modprobe.d/blacklist.conf index 00cefdc34d..608c38b33f 100644 --- a/packages/sysutils/kmod/modprobe.d/blacklist.conf +++ b/packages/sysutils/kmod/modprobe.d/blacklist.conf @@ -4,3 +4,4 @@ blacklist 8250 blacklist 8250_pnp +blacklist xpad diff --git a/packages/sysutils/remote/eventlircd/patches/eventlircd-42-002-custom_config.patch b/packages/sysutils/remote/eventlircd/patches/eventlircd-42-002-custom_config.patch index c0fd57d45c..ad1b4fa78d 100644 --- a/packages/sysutils/remote/eventlircd/patches/eventlircd-42-002-custom_config.patch +++ b/packages/sysutils/remote/eventlircd/patches/eventlircd-42-002-custom_config.patch @@ -4,9 +4,11 @@ index f580cc6..6befeed 100644 +++ b/udev/lircd_helper.in @@ -41,7 +41,11 @@ case "${ACTION}" in daemon="${daemon} --uinput" - daemon="${daemon} --output=@localstatedir@/run/lirc/lircd-${devname_instance}" - daemon="${daemon} --pidfile=@localstatedir@/run/lirc/lircd-${devname_instance}.pid" +- daemon="${daemon} --output=@localstatedir@/run/lirc/lircd-${devname_instance}" +- daemon="${daemon} --pidfile=@localstatedir@/run/lirc/lircd-${devname_instance}.pid" - daemon="${daemon} ${lircd_conf}" ++ daemon="${daemon} --output=@localstatedir@/run/lirc/lircd" ++ daemon="${daemon} --pidfile=@localstatedir@/run/lirc/lircd-${devname_instance}.pid" + if test -e "/storage/.config/lircd.conf" ; then + daemon="${daemon} /storage/.config/lircd.conf" + else diff --git a/packages/sysutils/remote/eventlircd/udev.d/98-lircd.rules b/packages/sysutils/remote/eventlircd/udev.d/98-lircd.rules index efbe6743fb..99dbd09c30 100644 --- a/packages/sysutils/remote/eventlircd/udev.d/98-lircd.rules +++ b/packages/sysutils/remote/eventlircd/udev.d/98-lircd.rules @@ -36,10 +36,21 @@ ENV{ID_VENDOR_ID}=="0fe9", ENV{ID_MODEL_ID}=="9010", \ ENV{lircd_driver}="dvico", \ ENV{lircd_conf}="/etc/lirc/lircd.conf" +### Microsoft Xbox DVD dongle ENV{ID_VENDOR_ID}=="045e", ENV{ID_MODEL_ID}=="0284", \ ENV{lircd_driver}="default", \ ENV{lircd_conf}="/etc/lirc/lircd.conf.xbox" +### Gamester Xbox DVD dongle +ENV{ID_VENDOR_ID}=="040b", ENV{ID_MODEL_ID}=="6521", \ + ENV{lircd_driver}="default", \ + ENV{lircd_conf}="/etc/lirc/lircd.conf.xbox" + +### Chinese Manufacturers Xbox DVD dongle +ENV{ID_VENDOR_ID}=="ffff", ENV{ID_MODEL_ID}=="ffff", \ + ENV{lircd_driver}="default", \ + ENV{lircd_conf}="/etc/lirc/lircd.conf.xbox" + # Enable wake-on-usb for the USB remotes. ENV{lircd_driver}=="?*", ENV{lircd_conf}=="?*", RUN+="wakeup_enable" diff --git a/packages/sysutils/remote/lirc/install b/packages/sysutils/remote/lirc/install index c2f7ca49e2..7abdbbf1f0 100755 --- a/packages/sysutils/remote/lirc/install +++ b/packages/sysutils/remote/lirc/install @@ -33,7 +33,7 @@ mkdir -p $INSTALL/usr/sbin cp $PKG_BUILD/daemons/lircmd $INSTALL/usr/sbin # do we need this? mkdir -p $INSTALL/etc/lirc - cp $PKG_BUILD/remotes/xbox/lircd.conf.xbox $INSTALL/etc/lirc + cp $PKG_DIR/lircd.conf.xbox $INSTALL/etc/lirc mkdir -p $INSTALL/usr/bin cp $PKG_BUILD/tools/.libs/ircat $INSTALL/usr/bin # do we need this? diff --git a/packages/sysutils/remote/lirc/lircd.conf.xbox b/packages/sysutils/remote/lirc/lircd.conf.xbox new file mode 100644 index 0000000000..d7cd33e9ee --- /dev/null +++ b/packages/sysutils/remote/lirc/lircd.conf.xbox @@ -0,0 +1,43 @@ +begin remote + + name XboxDVDDongle + bits 8 + eps 30 + aeps 100 + + one 0 0 + zero 0 0 + gap 163983 + toggle_bit_mask 0x0 + + begin codes + LEFT 0xA9 + UP 0xA6 + RIGHT 0xA8 + DOWN 0xA7 + SELECT 0x0B + 1 0xCE + 2 0xCD + 3 0xCC + 4 0xCB + 5 0xCA + 6 0xC9 + 7 0xC8 + 8 0xC7 + 9 0xC6 + 0 0xCF + MENU 0xF7 + DISPLAY 0xD5 + REVERSE 0xE2 + FORWARD 0xE3 + PLAY 0xEA + PAUSE 0xE6 + STOP 0xE0 + SKIP- 0xDD + SKIP+ 0xDF + TITLE 0xE5 + INFO 0xC3 + BACK 0xD8 + end codes + +end remote