Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-settings

This commit is contained in:
Stephan Raue 2013-03-19 01:07:29 +01:00
commit bafb0574da
4 changed files with 299 additions and 28 deletions

View File

@ -25,6 +25,11 @@ SUBSYSTEM=="lirc", DRIVERS=="lirc_xbox", \
ENV{lircd_driver}="default", \
ENV{lircd_conf}="/etc/lirc/lircd.conf.xbox"
### RPi GPIO IR Receiver
SUBSYSTEM=="lirc", DRIVERS=="lirc_rpi", \
ENV{lircd_driver}="default", \
ENV{lircd_conf}="/etc/lirc/lircd.conf.rpi"
#-------------------------------------------------------------------------------
# Ask lircd_helper to handle USB devices that do not show up as lirc devices
# and are supported by lircd. Remote controls that are USB HID devices that show

View File

@ -0,0 +1,283 @@
# /etc/lirc/lircd.conf.rpi
#
# Lirc config for lirc_rpi (GPIO) receiver.
# Enables use of MCE Remote, Apple MacMini and XBOX remote.
# Should work with any generic receiver
#
########
#
# brand: HP/Philips/Microsoft/Other
# model no. of remote control: Media Center Edition remote
# devices being controlled by this remote: myriad of devices with Media Center Edition receivers
#
# RC-6 config file
#
# source: http://home.hccnet.nl/m.majoor/projects_remote_control.htm
# http://home.hccnet.nl/m.majoor/pronto.pdf
#
# used by: Philips
#
#########
#
# Philips Media Center Edition remote control
# For use with the USB MCE ir receiver
#
# Dan Conti dconti|acm.wwu.edu
#
# Updated with codes for MCE 2005 Remote additional buttons
# *, #, Teletext, Red, Green, Yellow & Blue Buttons
# Note: TV power button transmits no code until programmed.
# Updated 12th September 2005
# Graham Auld - mce|graham.auld.me.uk
#
# Radio, Print, RecTV are only available on the HP Media Center remote control
#
#
# Updated with codes for MCE 2007 Remote additional buttons
# Visualization, Aspect, SlideShow, Eject
# Note:
# Blue, Yellow, Green, Red, and Teletext buttons do not exist on some HP remote
begin remote
name mceusb
bits 16
flags RC6|CONST_LENGTH
eps 30
aeps 100
header 2667 889
one 444 444
zero 444 444
pre_data_bits 21
pre_data 0x37FF0
gap 105000
toggle_bit 22
rc6_mask 0x100000000
min_repeat 4
# uncomment to suppress unwanted repeats
suppress_repeat 4
begin codes
#seen on HP Pavilion dv3t remote --Tim Mann, 3 Nov 2009
KEY_VIDEO 0x00007b7f
KEY_PLAYPAUSE 0x00007b91
#unused by HP remote
KEY_BLUE 0x00007ba1
KEY_YELLOW 0x00007ba2
KEY_GREEN 0x00007ba3
KEY_RED 0x00007ba4
KEY_TEXT 0x00007ba5
#ba6 - bae unused
BA6 0x00007ba6
BA7 0x00007ba7
BA8 0x00007ba8
BA9 0x00007ba9
BAA 0x00007baa
BAB 0x00007bab
BAC 0x00007bac
BAD 0x00007bad
BAE 0x00007bae
KEY_RADIO 0x00007baf
Print 0x00007bb1
#bb2 - bb4 unused
BB2 0x00007bb2
BB3 0x00007bb3
BB4 0x00007bb4
KEY_VIDEO 0x00007bb5
KEY_CAMERA 0x00007bb6
KEY_PVR 0x00007bb7
KEY_AUDIO 0x00007bb8
KEY_TV 0x00007bb9
#bba - bbf unused
BBA 0x00007bba
BBB 0x00007bbb
BBC 0x00007bbc
BBD 0x00007bbd
BBE 0x00007bbe
BBF 0x00007bbf
#bc1 - bca unused
BC1 0x00007bc1
BC2 0x00007bc2
BC3 0x00007bc3
BC4 0x00007bc4
BC5 0x00007bc5
BC6 0x00007bc6
BC7 0x00007bc7
BC8 0x00007bc8
BC9 0x00007bc9
BCA 0x00007bca
KEY_EJECTCD 0x00007bcb
SlideShow 0x00007bcc
Visualization 0x00007bcd
#bce - bcf unused
BCE 0x00007bce
BCF 0x00007bcf
#bd1 - bd7 unused
BD1 0x00007bd1
BD2 0x00007bd2
BD3 0x00007bd3
BD4 0x00007bd4
BD5 0x00007bd5
BD6 0x00007bd6
BD7 0x00007bd7
KEY_ANGLE 0x00007bd8
KEY_EPG 0x00007bd9
KEY_TV 0x00007bda
KEY_DVD 0x00007bdb
#NoGap
KEY_BACK 0x00007bdc
KEY_OK 0x00007bdd
KEY_RIGHT 0x00007bde
KEY_LEFT 0x00007bdf
KEY_DOWN 0x00007be0
KEY_UP 0x00007be1
#NoGap
KEY_NUMERIC_STAR 0x00007be2
KEY_NUMERIC_POUND 0x00007be3
#NoGap
KEY_PREVIOUS 0x00007be4
KEY_NEXT 0x00007be5
KEY_STOP 0x00007be6
KEY_PAUSE 0x00007be7
KEY_RECORD 0x00007be8
KEY_PLAY 0x00007be9
KEY_REWIND 0x00007bea
KEY_FORWARD 0x00007beb
#NoGap
KEY_CHANNELDOWN 0x00007bec
KEY_CHANNELUP 0x00007bed
KEY_VOLUMEDOWN 0x00007bee
KEY_VOLUMEUP 0x00007bef
#NoGap
KEY_INFO 0x00007bf0
KEY_MUTE 0x00007bf1
KEY_HOME 0x00007bf2
KEY_POWER 0x00007bf3
#NoGap
KEY_ENTER 0x00007bf4
KEY_CLEAR 0x00007bf5
#NoGap
KEY_9 0x00007bf6
KEY_8 0x00007bf7
KEY_7 0x00007bf8
KEY_6 0x00007bf9
KEY_5 0x00007bfa
KEY_4 0x00007bfb
KEY_3 0x00007bfc
KEY_2 0x00007bfd
KEY_1 0x00007bfe
KEY_0 0x00007bff
end codes
end remote
# this config file was automatically generated
# using lirc-0.8.2(macmini) on Tue Dec 11 11:35:26 2007
#
# contributed by Sebastian Schaetzel
#
# brand: Apple
# model no. of remote control: A1156
# devices being controlled by this remote: Mac mini, MacBookPro 15"
# SantaRosa (3.1), MacBook2
#
begin remote
name Apple_A1156
bits 8
eps 30
aeps 100
one 0 0
zero 0 0
pre_data_bits 24
pre_data 0x87EE81
gap 211982
toggle_bit_mask 0x0
ignore_mask 0x0000ff01
begin codes
KEY_VOLUMEUP 0x0B
KEY_VOLUMEDOWN 0x0D
KEY_REWIND 0x08
KEY_FORWARD 0x07
KEY_PLAYPAUSE 0x04
KEY_MENU 0x02
end codes
end remote
# Please make this file available to others
# by sending it to <lirc@bartelmus.de>
#
# this config file was automatically generated
# using lirc-0.9.1-git(default) on Sat Jan 26 21:54:39 2013
#
# contributed by
#
# brand: Microsoft
# model: Xbox DVD Remote
# devices being controlled by this remote: xbox
begin remote
name XboxDVDDongle
bits 8
eps 30
aeps 100
one 0 0
zero 0 0
gap 63950
min_repeat 4
suppress_repeat 4
# uncomment to suppress unwanted repeats
# toggle_bit_mask 0x72
toggle_bit_mask 0xE1
begin codes
KEY_OK 0x0B
KEY_OK 0xEA
KEY_STOP 0xE0
KEY_PAUSE 0xE6
KEY_NEXT 0xDF
KEY_PREVIOUS 0xDD
KEY_FASTFORWARD 0xE3
KEY_REWIND 0xE2
KEY_PROG1 0xD5
KEY_EPG 0xE5
KEY_INFO 0xC3
KEY_UP 0xA6
KEY_DOWN 0xA7
KEY_LEFT 0xA9
KEY_RIGHT 0xA8
KEY_MENU 0xF7
KEY_EXIT 0xD8
KEY_0 0xCF
KEY_1 0xCE
KEY_2 0xCD
KEY_3 0xCC
KEY_4 0xCB
KEY_5 0xCA
KEY_6 0xC9
KEY_7 0xC8
KEY_8 0xC7
KEY_9 0xC6
end codes
end remote

View File

@ -34,6 +34,7 @@ mkdir -p $INSTALL/usr/sbin
mkdir -p $INSTALL/etc/lirc
cp $PKG_DIR/config/lircd.conf.xbox $INSTALL/etc/lirc
cp $PKG_DIR/config/lircd.conf.rpi $INSTALL/etc/lirc
mkdir -p $INSTALL/usr/bin
cp $PKG_BUILD/tools/.libs/ircat $INSTALL/usr/bin # do we need this?

View File

@ -32,8 +32,6 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y
# CONFIG_AUDIT_ARCH is not set
CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
CONFIG_X86_32_SMP=y
CONFIG_X86_HT=y
CONFIG_X86_32_LAZY_GS=y
CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx"
CONFIG_ARCH_SUPPORTS_UPROBES=y
@ -46,6 +44,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
# General setup
#
CONFIG_EXPERIMENTAL=y
CONFIG_BROKEN_ON_SMP=y
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_CROSS_COMPILE=""
CONFIG_LOCALVERSION=""
@ -76,7 +75,6 @@ CONFIG_HAVE_GENERIC_HARDIRQS=y
CONFIG_GENERIC_HARDIRQS=y
CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_GENERIC_IRQ_SHOW=y
CONFIG_GENERIC_PENDING_IRQ=y
CONFIG_IRQ_FORCED_THREADING=y
CONFIG_SPARSE_IRQ=y
CONFIG_CLOCKSOURCE_WATCHDOG=y
@ -106,12 +104,8 @@ CONFIG_BSD_PROCESS_ACCT=y
#
# RCU Subsystem
#
CONFIG_TREE_RCU=y
CONFIG_TINY_RCU=y
# CONFIG_PREEMPT_RCU is not set
CONFIG_RCU_FANOUT=32
CONFIG_RCU_FANOUT_LEAF=16
# CONFIG_RCU_FANOUT_EXACT is not set
CONFIG_RCU_FAST_NO_HZ=y
# CONFIG_TREE_RCU_TRACE is not set
# CONFIG_IKCONFIG is not set
CONFIG_LOG_BUF_SHIFT=16
@ -183,7 +177,6 @@ CONFIG_HAVE_OPTPROBES=y
CONFIG_HAVE_ARCH_TRACEHOOK=y
CONFIG_HAVE_DMA_ATTRS=y
CONFIG_HAVE_DMA_CONTIGUOUS=y
CONFIG_USE_GENERIC_SMP_HELPERS=y
CONFIG_GENERIC_SMP_IDLE_THREAD=y
CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
CONFIG_HAVE_DMA_API_DEBUG=y
@ -221,7 +214,6 @@ CONFIG_MODULE_UNLOAD=y
# CONFIG_MODVERSIONS is not set
# CONFIG_MODULE_SRCVERSION_ALL is not set
# CONFIG_MODULE_SIG is not set
CONFIG_STOP_MACHINE=y
CONFIG_BLOCK=y
CONFIG_LBDAF=y
CONFIG_BLK_DEV_BSG=y
@ -265,16 +257,14 @@ CONFIG_INLINE_READ_UNLOCK=y
CONFIG_INLINE_READ_UNLOCK_IRQ=y
CONFIG_INLINE_WRITE_UNLOCK=y
CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
CONFIG_MUTEX_SPIN_ON_OWNER=y
# CONFIG_FREEZER is not set
#
# Processor type and features
#
CONFIG_ZONE_DMA=y
CONFIG_SMP=y
# CONFIG_SMP is not set
CONFIG_X86_MPPARSE=y
# CONFIG_X86_BIGSMP is not set
# CONFIG_X86_EXTENDED_PLATFORM is not set
CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
# CONFIG_X86_32_IRIS is not set
@ -333,15 +323,15 @@ CONFIG_CPU_SUP_INTEL=y
CONFIG_HPET_TIMER=y
CONFIG_HPET_EMULATE_RTC=y
CONFIG_DMI=y
CONFIG_NR_CPUS=2
# CONFIG_SCHED_SMT is not set
# CONFIG_SCHED_MC is not set
CONFIG_NR_CPUS=1
# CONFIG_PREEMPT_NONE is not set
CONFIG_PREEMPT_VOLUNTARY=y
# CONFIG_PREEMPT is not set
CONFIG_X86_UP_APIC=y
CONFIG_X86_UP_IOAPIC=y
CONFIG_X86_LOCAL_APIC=y
CONFIG_X86_IO_APIC=y
CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
# CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set
CONFIG_X86_MCE=y
CONFIG_X86_MCE_INTEL=y
# CONFIG_X86_MCE_AMD is not set
@ -398,6 +388,7 @@ CONFIG_TRANSPARENT_HUGEPAGE=y
# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_NEED_PER_CPU_KM=y
CONFIG_CLEANCACHE=y
CONFIG_FRONTSWAP=y
# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
@ -425,7 +416,6 @@ CONFIG_KEXEC=y
CONFIG_PHYSICAL_START=0x1000000
# CONFIG_RELOCATABLE is not set
CONFIG_PHYSICAL_ALIGN=0x1000000
# CONFIG_HOTPLUG_CPU is not set
# CONFIG_COMPAT_VDSO is not set
CONFIG_CMDLINE_BOOL=y
CONFIG_CMDLINE="root=/dev/ram0 rdinit=/init processor.max_cstate=2"
@ -530,11 +520,11 @@ CONFIG_PCIEASPM_DEFAULT=y
# CONFIG_PCIEASPM_POWERSAVE is not set
# CONFIG_PCIEASPM_PERFORMANCE is not set
CONFIG_ARCH_SUPPORTS_MSI=y
CONFIG_PCI_MSI=y
# CONFIG_PCI_MSI is not set
# CONFIG_PCI_DEBUG is not set
# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
# CONFIG_PCI_STUB is not set
CONFIG_HT_IRQ=y
# CONFIG_HT_IRQ is not set
# CONFIG_PCI_IOV is not set
# CONFIG_PCI_PRI is not set
# CONFIG_PCI_PASID is not set
@ -729,9 +719,6 @@ CONFIG_LLC=y
CONFIG_DNS_RESOLVER=y
# CONFIG_BATMAN_ADV is not set
# CONFIG_OPENVSWITCH is not set
CONFIG_RPS=y
CONFIG_RFS_ACCEL=y
CONFIG_XPS=y
CONFIG_BQL=y
#
@ -3019,13 +3006,10 @@ CONFIG_ARCH_WANT_FRAME_POINTERS=y
# CONFIG_FRAME_POINTER is not set
# CONFIG_BOOT_PRINTK_DELAY is not set
# CONFIG_RCU_TORTURE_TEST is not set
CONFIG_RCU_CPU_STALL_TIMEOUT=60
# CONFIG_RCU_CPU_STALL_INFO is not set
# CONFIG_RCU_TRACE is not set
# CONFIG_BACKTRACE_SELF_TEST is not set
# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
# CONFIG_DEBUG_PER_CPU_MAPS is not set
# CONFIG_LKDTM is not set
# CONFIG_NOTIFIER_ERROR_INJECTION is not set
# CONFIG_FAULT_INJECTION is not set
@ -3114,7 +3098,6 @@ CONFIG_CRYPTO_MANAGER2=y
# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
# CONFIG_CRYPTO_GF128MUL is not set
# CONFIG_CRYPTO_NULL is not set
# CONFIG_CRYPTO_PCRYPT is not set
CONFIG_CRYPTO_WORKQUEUE=y
# CONFIG_CRYPTO_CRYPTD is not set
# CONFIG_CRYPTO_AUTHENC is not set
@ -3248,7 +3231,6 @@ CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT=y
CONFIG_HAS_DMA=y
CONFIG_CHECK_SIGNATURE=y
CONFIG_CPU_RMAP=y
CONFIG_DQL=y
CONFIG_NLATTR=y
CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y