This commit is contained in:
parent
9025257fd1
commit
e81f1874fc
@ -45,7 +45,6 @@ The remotes of most DVB devices show up as event devices in
|
||||
didn't. Unplug the device and plug it in again to make
|
||||
/dev/input/ir appear.
|
||||
|
||||
- cp /usr/share/lirc/remotes/linux-input-layer-lircd.conf
|
||||
/etc/lircd.conf
|
||||
- cp /usr/share/lirc/remotes/devinput/lircd.conf.devinput /etc/lircd.conf
|
||||
|
||||
- rclirc start; chkconfig lirc on
|
||||
|
@ -1 +1,2 @@
|
||||
lirc
|
||||
liblirc_client0
|
||||
obsoletes "lirc-<targettype> < 0.8.5"
|
||||
|
@ -1,364 +0,0 @@
|
||||
begin remote
|
||||
name linux-input-layer
|
||||
bits 32
|
||||
begin codes
|
||||
ESC 0x10001
|
||||
1 0x10002
|
||||
2 0x10003
|
||||
3 0x10004
|
||||
4 0x10005
|
||||
5 0x10006
|
||||
6 0x10007
|
||||
7 0x10008
|
||||
8 0x10009
|
||||
9 0x1000a
|
||||
0 0x1000b
|
||||
MINUS 0x1000c
|
||||
EQUAL 0x1000d
|
||||
BACKSPACE 0x1000e
|
||||
TAB 0x1000f
|
||||
Q 0x10010
|
||||
W 0x10011
|
||||
E 0x10012
|
||||
R 0x10013
|
||||
T 0x10014
|
||||
Y 0x10015
|
||||
U 0x10016
|
||||
I 0x10017
|
||||
O 0x10018
|
||||
P 0x10019
|
||||
LEFTBRACE 0x1001a
|
||||
RIGHTBRACE 0x1001b
|
||||
ENTER 0x1001c
|
||||
LEFTCTRL 0x1001d
|
||||
A 0x1001e
|
||||
S 0x1001f
|
||||
D 0x10020
|
||||
F 0x10021
|
||||
G 0x10022
|
||||
H 0x10023
|
||||
J 0x10024
|
||||
K 0x10025
|
||||
L 0x10026
|
||||
SEMICOLON 0x10027
|
||||
APOSTROPHE 0x10028
|
||||
GRAVE 0x10029
|
||||
LEFTSHIFT 0x1002a
|
||||
BACKSLASH 0x1002b
|
||||
Z 0x1002c
|
||||
X 0x1002d
|
||||
C 0x1002e
|
||||
V 0x1002f
|
||||
B 0x10030
|
||||
N 0x10031
|
||||
M 0x10032
|
||||
COMMA 0x10033
|
||||
DOT 0x10034
|
||||
SLASH 0x10035
|
||||
RIGHTSHIFT 0x10036
|
||||
KPASTERISK 0x10037
|
||||
LEFTALT 0x10038
|
||||
SPACE 0x10039
|
||||
CAPSLOCK 0x1003a
|
||||
F1 0x1003b
|
||||
F2 0x1003c
|
||||
F3 0x1003d
|
||||
F4 0x1003e
|
||||
F5 0x1003f
|
||||
F6 0x10040
|
||||
F7 0x10041
|
||||
F8 0x10042
|
||||
F9 0x10043
|
||||
F10 0x10044
|
||||
NUMLOCK 0x10045
|
||||
SCROLLLOCK 0x10046
|
||||
KP7 0x10047
|
||||
KP8 0x10048
|
||||
KP9 0x10049
|
||||
KPMINUS 0x1004a
|
||||
KP4 0x1004b
|
||||
KP5 0x1004c
|
||||
KP6 0x1004d
|
||||
KPPLUS 0x1004e
|
||||
KP1 0x1004f
|
||||
KP2 0x10050
|
||||
KP3 0x10051
|
||||
KP0 0x10052
|
||||
KPDOT 0x10053
|
||||
103RD 0x10054
|
||||
F13 0x10055
|
||||
102ND 0x10056
|
||||
F11 0x10057
|
||||
F12 0x10058
|
||||
F14 0x10059
|
||||
F15 0x1005a
|
||||
F16 0x1005b
|
||||
F17 0x1005c
|
||||
F18 0x1005d
|
||||
F19 0x1005e
|
||||
F20 0x1005f
|
||||
KPENTER 0x10060
|
||||
RIGHTCTRL 0x10061
|
||||
KPSLASH 0x10062
|
||||
SYSRQ 0x10063
|
||||
RIGHTALT 0x10064
|
||||
LINEFEED 0x10065
|
||||
HOME 0x10066
|
||||
UP 0x10067
|
||||
PAGEUP 0x10068
|
||||
LEFT 0x10069
|
||||
RIGHT 0x1006a
|
||||
END 0x1006b
|
||||
DOWN 0x1006c
|
||||
PAGEDOWN 0x1006d
|
||||
INSERT 0x1006e
|
||||
DELETE 0x1006f
|
||||
MACRO 0x10070
|
||||
MUTE 0x10071
|
||||
VOLUMEDOWN 0x10072
|
||||
VOLUMEUP 0x10073
|
||||
POWER 0x10074
|
||||
KPEQUAL 0x10075
|
||||
KPPLUSMINUS 0x10076
|
||||
PAUSE 0x10077
|
||||
F21 0x10078
|
||||
F22 0x10079
|
||||
F23 0x1007a
|
||||
F24 0x1007b
|
||||
KPCOMMA 0x1007c
|
||||
LEFTMETA 0x1007d
|
||||
RIGHTMETA 0x1007e
|
||||
COMPOSE 0x1007f
|
||||
STOP 0x10080
|
||||
AGAIN 0x10081
|
||||
PROPS 0x10082
|
||||
UNDO 0x10083
|
||||
FRONT 0x10084
|
||||
COPY 0x10085
|
||||
OPEN 0x10086
|
||||
PASTE 0x10087
|
||||
FIND 0x10088
|
||||
CUT 0x10089
|
||||
HELP 0x1008a
|
||||
MENU 0x1008b
|
||||
CALC 0x1008c
|
||||
SETUP 0x1008d
|
||||
SLEEP 0x1008e
|
||||
WAKEUP 0x1008f
|
||||
FILE 0x10090
|
||||
SENDFILE 0x10091
|
||||
DELETEFILE 0x10092
|
||||
XFER 0x10093
|
||||
PROG1 0x10094
|
||||
PROG2 0x10095
|
||||
WWW 0x10096
|
||||
MSDOS 0x10097
|
||||
COFFEE 0x10098
|
||||
DIRECTION 0x10099
|
||||
CYCLEWINDOWS 0x1009a
|
||||
MAIL 0x1009b
|
||||
BOOKMARKS 0x1009c
|
||||
COMPUTER 0x1009d
|
||||
BACK 0x1009e
|
||||
FORWARD 0x1009f
|
||||
CLOSECD 0x100a0
|
||||
EJECTCD 0x100a1
|
||||
EJECTCLOSECD 0x100a2
|
||||
NEXTSONG 0x100a3
|
||||
PLAYPAUSE 0x100a4
|
||||
PREVIOUSSONG 0x100a5
|
||||
STOPCD 0x100a6
|
||||
RECORD 0x100a7
|
||||
REWIND 0x100a8
|
||||
PHONE 0x100a9
|
||||
ISO 0x100aa
|
||||
CONFIG 0x100ab
|
||||
HOMEPAGE 0x100ac
|
||||
REFRESH 0x100ad
|
||||
EXIT 0x100ae
|
||||
MOVE 0x100af
|
||||
EDIT 0x100b0
|
||||
SCROLLUP 0x100b1
|
||||
SCROLLDOWN 0x100b2
|
||||
KPLEFTPAREN 0x100b3
|
||||
KPRIGHTPAREN 0x100b4
|
||||
INTL1 0x100b5
|
||||
INTL2 0x100b6
|
||||
INTL3 0x100b7
|
||||
INTL4 0x100b8
|
||||
INTL5 0x100b9
|
||||
INTL6 0x100ba
|
||||
INTL7 0x100bb
|
||||
INTL8 0x100bc
|
||||
INTL9 0x100bd
|
||||
LANG1 0x100be
|
||||
LANG2 0x100bf
|
||||
LANG3 0x100c0
|
||||
LANG4 0x100c1
|
||||
LANG5 0x100c2
|
||||
LANG6 0x100c3
|
||||
LANG7 0x100c4
|
||||
LANG8 0x100c5
|
||||
LANG9 0x100c6
|
||||
PLAYCD 0x100c8
|
||||
PAUSECD 0x100c9
|
||||
PROG3 0x100ca
|
||||
PROG4 0x100cb
|
||||
SUSPEND 0x100cd
|
||||
CLOSE 0x100ce
|
||||
PLAY 0x100cf
|
||||
FASTFORWARD 0x100d0
|
||||
BASSBOOST 0x100d1
|
||||
PRINT 0x100d2
|
||||
HP 0x100d3
|
||||
CAMERA 0x100d4
|
||||
SOUND 0x100d5
|
||||
QUESTION 0x100d6
|
||||
EMAIL 0x100d7
|
||||
CHAT 0x100d8
|
||||
SEARCH 0x100d9
|
||||
CONNECT 0x100da
|
||||
FINANCE 0x100db
|
||||
SPORT 0x100dc
|
||||
SHOP 0x100dd
|
||||
ALTERASE 0x100de
|
||||
CANCEL 0x100df
|
||||
BRIGHTNESSDOWN 0x100e0
|
||||
BRIGHTNESSUP 0x100e1
|
||||
MEDIA 0x100e2
|
||||
UNKNOWN 0x100f0
|
||||
BTN_MISC 0x10100
|
||||
BTN_0 0x10100
|
||||
BTN_1 0x10101
|
||||
BTN_2 0x10102
|
||||
BTN_3 0x10103
|
||||
BTN_4 0x10104
|
||||
BTN_5 0x10105
|
||||
BTN_6 0x10106
|
||||
BTN_7 0x10107
|
||||
BTN_8 0x10108
|
||||
BTN_9 0x10109
|
||||
BTN_MOUSE 0x10110
|
||||
BTN_LEFT 0x10110
|
||||
BTN_RIGHT 0x10111
|
||||
BTN_MIDDLE 0x10112
|
||||
BTN_SIDE 0x10113
|
||||
BTN_EXTRA 0x10114
|
||||
BTN_FORWARD 0x10115
|
||||
BTN_BACK 0x10116
|
||||
BTN_TASK 0x10117
|
||||
BTN_JOYSTICK 0x10120
|
||||
BTN_TRIGGER 0x10120
|
||||
BTN_THUMB 0x10121
|
||||
BTN_THUMB2 0x10122
|
||||
BTN_TOP 0x10123
|
||||
BTN_TOP2 0x10124
|
||||
BTN_PINKIE 0x10125
|
||||
BTN_BASE 0x10126
|
||||
BTN_BASE2 0x10127
|
||||
BTN_BASE3 0x10128
|
||||
BTN_BASE4 0x10129
|
||||
BTN_BASE5 0x1012a
|
||||
BTN_BASE6 0x1012b
|
||||
BTN_DEAD 0x1012f
|
||||
BTN_GAMEPAD 0x10130
|
||||
BTN_A 0x10130
|
||||
BTN_B 0x10131
|
||||
BTN_C 0x10132
|
||||
BTN_X 0x10133
|
||||
BTN_Y 0x10134
|
||||
BTN_Z 0x10135
|
||||
BTN_TL 0x10136
|
||||
BTN_TR 0x10137
|
||||
BTN_TL2 0x10138
|
||||
BTN_TR2 0x10139
|
||||
BTN_SELECT 0x1013a
|
||||
BTN_START 0x1013b
|
||||
BTN_MODE 0x1013c
|
||||
BTN_THUMBL 0x1013d
|
||||
BTN_THUMBR 0x1013e
|
||||
BTN_DIGI 0x10140
|
||||
BTN_TOOL_PEN 0x10140
|
||||
BTN_TOOL_RUBBER 0x10141
|
||||
BTN_TOOL_BRUSH 0x10142
|
||||
BTN_TOOL_PENCIL 0x10143
|
||||
BTN_TOOL_AIRBRUSH 0x10144
|
||||
BTN_TOOL_FINGER 0x10145
|
||||
BTN_TOOL_MOUSE 0x10146
|
||||
BTN_TOOL_LENS 0x10147
|
||||
BTN_TOUCH 0x1014a
|
||||
BTN_STYLUS 0x1014b
|
||||
BTN_STYLUS2 0x1014c
|
||||
BTN_WHEEL 0x10150
|
||||
BTN_GEAR_DOWN 0x10150
|
||||
BTN_GEAR_UP 0x10151
|
||||
OK 0x10160
|
||||
SELECT 0x10161
|
||||
GOTO 0x10162
|
||||
CLEAR 0x10163
|
||||
POWER2 0x10164
|
||||
OPTION 0x10165
|
||||
INFO 0x10166
|
||||
TIME 0x10167
|
||||
VENDOR 0x10168
|
||||
ARCHIVE 0x10169
|
||||
PROGRAM 0x1016a
|
||||
CHANNEL 0x1016b
|
||||
FAVORITES 0x1016c
|
||||
EPG 0x1016d
|
||||
PVR 0x1016e
|
||||
MHP 0x1016f
|
||||
LANGUAGE 0x10170
|
||||
TITLE 0x10171
|
||||
SUBTITLE 0x10172
|
||||
ANGLE 0x10173
|
||||
ZOOM 0x10174
|
||||
MODE 0x10175
|
||||
KEYBOARD 0x10176
|
||||
SCREEN 0x10177
|
||||
PC 0x10178
|
||||
TV 0x10179
|
||||
TV2 0x1017a
|
||||
VCR 0x1017b
|
||||
VCR2 0x1017c
|
||||
SAT 0x1017d
|
||||
SAT2 0x1017e
|
||||
CD 0x1017f
|
||||
TAPE 0x10180
|
||||
RADIO 0x10181
|
||||
TUNER 0x10182
|
||||
PLAYER 0x10183
|
||||
TEXT 0x10184
|
||||
DVD 0x10185
|
||||
AUX 0x10186
|
||||
MP3 0x10187
|
||||
AUDIO 0x10188
|
||||
VIDEO 0x10189
|
||||
DIRECTORY 0x1018a
|
||||
LIST 0x1018b
|
||||
MEMO 0x1018c
|
||||
CALENDAR 0x1018d
|
||||
RED 0x1018e
|
||||
GREEN 0x1018f
|
||||
YELLOW 0x10190
|
||||
BLUE 0x10191
|
||||
CHANNELUP 0x10192
|
||||
CHANNELDOWN 0x10193
|
||||
FIRST 0x10194
|
||||
LAST 0x10195
|
||||
AB 0x10196
|
||||
NEXT 0x10197
|
||||
RESTART 0x10198
|
||||
SLOW 0x10199
|
||||
SHUFFLE 0x1019a
|
||||
BREAK 0x1019b
|
||||
PREVIOUS 0x1019c
|
||||
DIGITS 0x1019d
|
||||
TEEN 0x1019e
|
||||
TWEN 0x1019f
|
||||
DEL_EOL 0x101c0
|
||||
DEL_EOS 0x101c1
|
||||
INS_LINE 0x101c2
|
||||
DEL_LINE 0x101c3
|
||||
end codes
|
||||
end remote
|
@ -1,169 +0,0 @@
|
||||
Index: lirc-0.8.3/drivers/lirc_imon/lirc_imon.c
|
||||
===================================================================
|
||||
--- lirc-0.8.3.orig/drivers/lirc_imon/lirc_imon.c
|
||||
+++ lirc-0.8.3/drivers/lirc_imon/lirc_imon.c
|
||||
@@ -73,9 +73,9 @@
|
||||
|
||||
|
||||
#define MOD_AUTHOR "Venky Raju <dev@venky.ws>"
|
||||
-#define MOD_DESC "Driver for Soundgraph iMON MultiMedia IR/VFD"
|
||||
+#define MOD_DESC "Driver for Soundgraph iMON MultiMedia IR/VFD w/imon pad2keys patch"
|
||||
#define MOD_NAME "lirc_imon"
|
||||
-#define MOD_VERSION "0.3"
|
||||
+#define MOD_VERSION "0.3p2k"
|
||||
|
||||
#define VFD_MINOR_BASE 144 /* Same as LCD */
|
||||
#define DEVFS_MODE (S_IFCHR | S_IRUSR | S_IWUSR | \
|
||||
@@ -91,6 +91,7 @@
|
||||
#define TRUE 1
|
||||
#define FALSE 0
|
||||
|
||||
+#define CURSOR_LIMIT 16
|
||||
|
||||
/* ------------------------------------------------------------
|
||||
* P R O T O T Y P E S
|
||||
@@ -177,6 +178,10 @@ struct imon_context {
|
||||
atomic_t busy; /* write in progress */
|
||||
int status; /* status of tx completion */
|
||||
} tx;
|
||||
+
|
||||
+ int key_x;
|
||||
+ int key_y;
|
||||
+ int last_count; /* number of times pressed */
|
||||
};
|
||||
|
||||
#define LOCK_CONTEXT down(&context->sem)
|
||||
@@ -248,6 +253,9 @@ static int is_lcd = 1;
|
||||
static int is_lcd; /* If LIRC_IMON_LCD not defined, default to non-LCD */
|
||||
#endif
|
||||
|
||||
+/* pad2keys module parameter. pad2keys patch active? */
|
||||
+static int pad2keys_active = 0;
|
||||
+
|
||||
#if !defined(KERNEL_2_5)
|
||||
|
||||
#define MAX_DEVICES 4 /* In case there's more than one iMON device */
|
||||
@@ -271,12 +279,16 @@ extern devfs_handle_t usb_devfs_handle;
|
||||
|
||||
MODULE_AUTHOR(MOD_AUTHOR);
|
||||
MODULE_DESCRIPTION(MOD_DESC);
|
||||
+MODULE_VERSION(MOD_VERSION); /* MBr: was missing */
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_DEVICE_TABLE(usb, imon_usb_id_table);
|
||||
|
||||
module_param(debug, int, 0);
|
||||
MODULE_PARM_DESC(debug, "Debug messages: 0=no, 1=yes(default: no)");
|
||||
|
||||
+module_param (pad2keys_active, int, 0);
|
||||
+MODULE_PARM_DESC (pad2keys_active, "pad2keys patch active: 0=no, 1=yes (default: no)");
|
||||
+
|
||||
#ifdef LIRC_IMON_LCD
|
||||
module_param(is_lcd, int, 1);
|
||||
MODULE_PARM_DESC(is_lcd, "The device is an LCD: 0=no (it's a VFD), "
|
||||
@@ -766,6 +778,11 @@ static int ir_open(void *data)
|
||||
context->rx.initial_space = 1;
|
||||
context->rx.prev_bit = 0;
|
||||
|
||||
+ /* init pad context for pad2keys */
|
||||
+ context ->key_x = 0;
|
||||
+ context ->key_y = 0;
|
||||
+ context ->last_count = 0;
|
||||
+
|
||||
usb_fill_int_urb(context->rx_urb, context->dev,
|
||||
usb_rcvintpipe(context->dev,
|
||||
context->rx_endpoint->bEndpointAddress),
|
||||
@@ -915,6 +932,94 @@ static inline void incoming_packet(struc
|
||||
|
||||
if (context->ir_onboard_decode) {
|
||||
/* The signals have been decoded onboard the iMON controller */
|
||||
+
|
||||
+ if (pad2keys_active)
|
||||
+ {
|
||||
+ /* imon pad2keys patch
|
||||
+ *
|
||||
+ * make PAD and mouse buttons available for use with VDR,
|
||||
+ * based on pad-mouse-emu patch from venky's forum
|
||||
+ *
|
||||
+ * last change: M.Brakemeier 2007-10-14
|
||||
+ *
|
||||
+ * generated PAD key codes:
|
||||
+ * Mouse_N 0x690281B7
|
||||
+ * Mouse_S 0x688291B7
|
||||
+ * Mouse_W 0x6A8281B7
|
||||
+ * Mouse_E 0x688A81B7
|
||||
+ *
|
||||
+ * mouse buttons (non-synthetic):
|
||||
+ * MouseRightClick 0x688481B7
|
||||
+ * MouseLeftClick 0x688301B7
|
||||
+ */
|
||||
+ if((buf[0] & 0x40) &&
|
||||
+ !(buf[1] & 0x01 || buf[1] >> 2 & 0x01))
|
||||
+ {
|
||||
+ int rel_x = (buf[1] & 0x08) | (buf[1] & 0x10) >> 2 | (buf[1] & 0x20) >> 4 | (buf[1] & 0x40) >> 6;
|
||||
+ int rel_y = (buf[2] & 0x08) | (buf[2] & 0x10) >> 2 | (buf[2] & 0x20) >> 4 | (buf[2] & 0x40) >> 6;
|
||||
+
|
||||
+ if(buf[0] & 0x02)
|
||||
+ rel_x |= ~0x10+1;
|
||||
+ if(buf[0] & 0x01)
|
||||
+ rel_y |= ~0x10+1;
|
||||
+
|
||||
+ /* keyboard direction key emulation */
|
||||
+ if( context->last_count > 32 )
|
||||
+ { /* Hopefully eliminate drift*/
|
||||
+ context->last_count=0;
|
||||
+ context->key_y=0;
|
||||
+ context->key_x=0;
|
||||
+ }
|
||||
+ context->last_count++;
|
||||
+
|
||||
+ /* limit decoded events */
|
||||
+ if(abs(context->key_x) > CURSOR_LIMIT || abs(context->key_y) > CURSOR_LIMIT )
|
||||
+ {
|
||||
+ if(abs(context->key_y ) > abs(context->key_x))
|
||||
+ { /* mouse s/n */
|
||||
+ if(context->key_y > 0 && rel_y > 0)
|
||||
+ { /* mouse s */
|
||||
+ buf[0] = 0x68;
|
||||
+ buf[1] = 0x82;
|
||||
+ buf[2] = 0x91;
|
||||
+ }
|
||||
+ else if(context->key_y < 0 && rel_y < 0)
|
||||
+ { /* mouse n */
|
||||
+ buf[0] = 0x69;
|
||||
+ buf[1] = 0x02;
|
||||
+ buf[2] = 0x81;
|
||||
+ }
|
||||
+ }
|
||||
+ else
|
||||
+ { /* mouse e/w*/
|
||||
+ if(context->key_x > 0 && rel_x > 0 )
|
||||
+ { /* mouse e */
|
||||
+ buf[0] = 0x68;
|
||||
+ buf[1] = 0x8A;
|
||||
+ buf[2] = 0x81;
|
||||
+ }
|
||||
+ else if(context->key_x < 0 && rel_x < 0 )
|
||||
+ { /* mouse w */
|
||||
+ buf[0] = 0x6A;
|
||||
+ buf[1] = 0x82;
|
||||
+ buf[2] = 0x81;
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ context->key_x += rel_x;
|
||||
+ context->key_y += rel_y;
|
||||
+
|
||||
+ return; /* discard those key codes */
|
||||
+ }
|
||||
+ }
|
||||
+ /* a key was pressed, reset count */
|
||||
+ context->key_x = 0;
|
||||
+ context->key_y = 0;
|
||||
+ context->last_count = 0;
|
||||
+ }
|
||||
+
|
||||
lirc_buffer_write_1(context->plugin->rbuf, buf);
|
||||
wake_up(&context->plugin->rbuf->wait_poll);
|
||||
return;
|
@ -1,22 +0,0 @@
|
||||
--- lirc-0.8.4/drivers/kcompat.h 2009/02/23 00:02:43 1.1
|
||||
+++ lirc-0.8.4/drivers/kcompat.h 2009/02/23 00:16:42
|
||||
@@ -374,5 +374,9 @@
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 11)
|
||||
#define DEFINE_SPINLOCK(x) spinlock_t x = SPIN_LOCK_UNLOCKED
|
||||
#endif
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
|
||||
+#define info(args...) printk(KERN_INFO KBUILD_MODNAME args)
|
||||
+#define warn(args...) printk(KERN_WARNING KBUILD_MODNAME args)
|
||||
+#endif
|
||||
|
||||
#endif /* _KCOMPAT_H */
|
||||
--- lirc-0.8.4/drivers/lirc_cmdir/commandir.c 2009/02/23 00:15:27 1.1
|
||||
+++ lirc-0.8.4/drivers/lirc_cmdir/commandir.c 2009/02/23 00:15:35
|
||||
@@ -25,6 +25,7 @@
|
||||
#include <linux/usb.h>
|
||||
#include <linux/smp_lock.h>
|
||||
#include "commandir.h"
|
||||
+#include "kcompat.h"
|
||||
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
|
||||
#include <linux/sched.h>
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a803ae84b81e6c145bafc880835df44501d75d5e572d8a92d45209df15b581c0
|
||||
size 694420
|
22
lirc-0.8.5-ftdi.diff
Normal file
22
lirc-0.8.5-ftdi.diff
Normal file
@ -0,0 +1,22 @@
|
||||
The ftdi driver is only compiled if headers are present. Remove it from the static list.
|
||||
Index: lirc-0.8.5/configure.ac
|
||||
===================================================================
|
||||
--- lirc-0.8.5.orig/configure.ac
|
||||
+++ lirc-0.8.5/configure.ac
|
||||
@@ -122,6 +122,8 @@ dnl this could be _much_ more sophistica
|
||||
AC_MSG_CHECKING([for which drivers can be installed on this system])
|
||||
AC_MSG_RESULT()
|
||||
|
||||
+# this list must only contain userspace drivers without external
|
||||
+# (header/library) dependencies!
|
||||
possible_drivers="(none) \
|
||||
(userspace) \
|
||||
(accent) \
|
||||
@@ -129,7 +131,6 @@ possible_drivers="(none) \
|
||||
(creative) \
|
||||
(ea65) \
|
||||
(exaudio) \
|
||||
- (ftdi) \
|
||||
(irlink) \
|
||||
(irreal) \
|
||||
(livedrive_midi) \
|
3
lirc-0.8.5.tar.bz2
Normal file
3
lirc-0.8.5.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0b1594d9eacf278c66c8137b75f9a0a354e663b011ab373c7a207e63b45abcb6
|
||||
size 716760
|
@ -1,4 +1,18 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon May 25 11:29:16 CEST 2009 - lnussel@suse.de
|
||||
|
||||
- new versio 0.8.5
|
||||
* added support for Winbond 8769L CIR port (e.g. found on Acer
|
||||
Aspire 6530G) (Juan J. Garcia de Soria)
|
||||
* added support for FTDI FT232-based IR Receiver
|
||||
* Linux input event generation using uinput
|
||||
* standardised namespace following Linux input conventions
|
||||
* added support for Awox RF/IR Remote (Arif)
|
||||
* added support for new iMon LCD devices
|
||||
* added support for Antec-branded iMon LCD and VFD devices
|
||||
- imon patch no longer needed
|
||||
|
||||
--------------------------------------------------------------------
|
||||
Mon Feb 23 01:11:00 CET 2009 - ro@suse.de
|
||||
|
||||
- fix build with current kernel
|
||||
|
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package lirc-kernel (Version 0.8.4MACRO)
|
||||
# spec file for package lirc-kernel (Version 0.8.5MACRO)
|
||||
#
|
||||
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
@ -24,15 +24,12 @@ BuildRequires: kernel-source kernel-syms module-init-tools
|
||||
License: GPL v2 or later
|
||||
Group: System/Kernel
|
||||
Summary: LIRC kernel modules
|
||||
Version: 0.8.4%{?snapshot:_%snapshot}
|
||||
Version: 0.8.5%{?snapshot:_%snapshot}
|
||||
Release: 1
|
||||
Source0: lirc-%{?snapshot}%{!?snapshot:%version}.tar.bz2
|
||||
Source1: Makefile.module
|
||||
Source2: Makefile.modsub
|
||||
#Patch0: lirc-0.8.4pre1-kernel-2.6.27.diff
|
||||
# http://brakemeier.de/electronics/vdr/lirc-imon.html
|
||||
Patch1: lirc-0.8.3pre1-imon-pad2keys.patch
|
||||
Patch2: lirc-0.8.4-2.6.28.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
ExcludeArch: s390 s390x
|
||||
%suse_kernel_module_package -n lirc kdump um debug
|
||||
@ -47,33 +44,6 @@ License: GPL v2 or later
|
||||
Summary: LIRC kernel modules
|
||||
Group: System/Kernel
|
||||
Recommends: lirc
|
||||
# Modules: lirc_atiusb.ko lirc_igorplugusb.ko lirc_imon2.ko lirc_imon.ko lirc_mceusb2.ko lirc_mceusb.ko lirc_streamzap.ko lirc_ttusbir.ko
|
||||
Supplements: modalias(usb:v03EBp0002d*dc*dsc*dp*ic*isc*ip*)
|
||||
Supplements: modalias(usb:v03EEp2501d*dc*dsc*dp*ic*isc*ip*)
|
||||
Supplements: modalias(usb:v040Bp6521d*dc*dsc*dp*ic*isc*ip*)
|
||||
Supplements: modalias(usb:v043Ep9803d*dc*dsc*dp*ic*isc*ip*)
|
||||
Supplements: modalias(usb:v045Ep006Dd*dc*dsc*dp*ic*isc*ip*)
|
||||
Supplements: modalias(usb:v045Ep00A0d*dc*dsc*dp*ic*isc*ip*)
|
||||
Supplements: modalias(usb:v045Ep0284d*dc*dsc*dp*ic*isc*ip*)
|
||||
Supplements: modalias(usb:v0471p060[23C]d*dc*dsc*dp*ic*isc*ip*)
|
||||
Supplements: modalias(usb:v0471p0815d*dc*dsc*dp*ic*isc*ip*)
|
||||
Supplements: modalias(usb:v04E8pFF30d*dc*dsc*dp*ic*isc*ip*)
|
||||
Supplements: modalias(usb:v0609p031Dd*dc*dsc*dp*ic*isc*ip*)
|
||||
Supplements: modalias(usb:v0609p0322d*dc*dsc*dp*ic*isc*ip*)
|
||||
Supplements: modalias(usb:v0AA8p8001d*dc*dsc*dp*ic*isc*ip*)
|
||||
Supplements: modalias(usb:v0AA8pFFDAd*dc*dsc*dp*ic*isc*ip*)
|
||||
Supplements: modalias(usb:v0B48p2003d*dc*dsc*dp*ic*isc*ip*)
|
||||
Supplements: modalias(usb:v0BC7p000[23456789ABCDEF]d*dc*dsc*dp*ic*isc*ip*)
|
||||
Supplements: modalias(usb:v0E9Cp0000d*dc*dsc*dp*ic*isc*ip*)
|
||||
Supplements: modalias(usb:v107Bp3009d*dc*dsc*dp*ic*isc*ip*)
|
||||
Supplements: modalias(usb:v1308pC001d*dc*dsc*dp*ic*isc*ip*)
|
||||
Supplements: modalias(usb:v1460p9150d*dc*dsc*dp*ic*isc*ip*)
|
||||
Supplements: modalias(usb:v1509p9242d*dc*dsc*dp*ic*isc*ip*)
|
||||
Supplements: modalias(usb:v15C2pFFD[AC]d*dc*dsc*dp*ic*isc*ip*)
|
||||
Supplements: modalias(usb:v1784p0001d*dc*dsc*dp*ic*isc*ip*)
|
||||
Supplements: modalias(usb:v179Dp0010d*dc*dsc*dp*ic*isc*ip*)
|
||||
Supplements: modalias(usb:v195Dp7002d*dc*dsc*dp*ic*isc*ip*)
|
||||
# Generated with: extract-modaliases lirc-kmp-default.rpm
|
||||
|
||||
%description -n lirc-KMP
|
||||
LIRC kernel modules are required to support certain hardware such as
|
||||
@ -83,13 +53,7 @@ receivers for the serial port.
|
||||
|
||||
%prep
|
||||
%setup -q -n lirc-%{?snapshot}%{!?snapshot:%version}
|
||||
pushd drivers
|
||||
cp -av lirc_imon lirc_imon2
|
||||
mv lirc_imon2/lirc_imon.c lirc_imon2/lirc_imon2.c
|
||||
popd
|
||||
#%patch0 -p0
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
#patch0 -p0
|
||||
autoreconf -f -i
|
||||
PYTHON=/usr/bin/python \
|
||||
./configure --with-driver=all
|
||||
@ -120,6 +84,17 @@ for flavor in %flavors_to_build; do
|
||||
done
|
||||
|
||||
%changelog
|
||||
* Mon May 25 2009 lnussel@suse.de
|
||||
- new versio 0.8.5
|
||||
* added support for Winbond 8769L CIR port (e.g. found on Acer
|
||||
Aspire 6530G) (Juan J. Garcia de Soria)
|
||||
* added support for FTDI FT232-based IR Receiver
|
||||
* Linux input event generation using uinput
|
||||
* standardised namespace following Linux input conventions
|
||||
* added support for Awox RF/IR Remote (Arif)
|
||||
* added support for new iMon LCD devices
|
||||
* added support for Antec-branded iMon LCD and VFD devices
|
||||
- imon patch no longer needed
|
||||
* Mon Feb 23 2009 ro@suse.de
|
||||
- fix build with current kernel
|
||||
(info and warn vanished, use printk)
|
||||
|
18
lirc.changes
18
lirc.changes
@ -1,3 +1,21 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon May 25 16:17:54 CEST 2009 - lnussel@suse.de
|
||||
|
||||
- split package to lirc, lirc-remotes, lirc-devel and liblirc_client0
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon May 25 11:29:16 CEST 2009 - lnussel@suse.de
|
||||
|
||||
- new versio 0.8.5
|
||||
* added support for Winbond 8769L CIR port (e.g. found on Acer
|
||||
Aspire 6530G) (Juan J. Garcia de Soria)
|
||||
* added support for FTDI FT232-based IR Receiver
|
||||
* Linux input event generation using uinput
|
||||
* standardised namespace following Linux input conventions
|
||||
* added support for Awox RF/IR Remote (Arif)
|
||||
* added support for new iMon LCD devices
|
||||
* added support for Antec-branded iMon LCD and VFD devices
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 7 12:34:56 CET 2009 - olh@suse.de
|
||||
|
||||
|
117
lirc.spec
117
lirc.spec
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package lirc (Version 0.8.4MACRO)
|
||||
# spec file for package lirc (Version 0.8.5MACRO)
|
||||
#
|
||||
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
@ -48,25 +48,26 @@ AutoReqProv: on
|
||||
Obsoletes: lirc-64bit
|
||||
%endif
|
||||
#
|
||||
Version: 0.8.4%{?snapshot:_%snapshot}
|
||||
Version: 0.8.5%{?snapshot:_%snapshot}
|
||||
Release: 1
|
||||
PreReq: %fillup_prereq %insserv_prereq
|
||||
Summary: Tools for Infrared Receivers
|
||||
Summary: LIRC remote definitions
|
||||
Source0: lirc-%{?snapshot}%{!?snapshot:%version}.tar.bz2
|
||||
Source4: rc.lirc
|
||||
Source5: sysconfig.lirc
|
||||
Source6: fix-remote-keys.pl
|
||||
Source7: http://linux.bytesex.org/v4l2/linux-input-layer-lircd.conf
|
||||
Source8: README.SUSE
|
||||
Source9: 51-lirc.rules
|
||||
#Patch0: lirc-hw.diff
|
||||
Patch1: lirc-sockets-in-var.diff
|
||||
Patch2: imon2_conf.patch
|
||||
Patch3: lirc-0.8.5-ftdi.diff
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Requires: udev
|
||||
Suggests: lirc-kmp
|
||||
Provides: lirc-devel
|
||||
Supplements: lirc-kmp
|
||||
Recommends: lirc-remotes
|
||||
|
||||
%description
|
||||
LIRC is a package that supports receiving and sending IR signals with
|
||||
@ -75,6 +76,62 @@ and sends IR signals, a mouse daemon that translates IR signals to
|
||||
mouse movements, and a couple of user programs that allow you to
|
||||
control your computer with a remote control.
|
||||
|
||||
This package contains a collection of configuration files for various
|
||||
remotes.
|
||||
|
||||
|
||||
|
||||
%package devel
|
||||
License: GPL v2 or later
|
||||
Summary: LIRC development files
|
||||
Group: Hardware/Other
|
||||
Requires: %{name} = %{version}
|
||||
# files were in lirc package previously
|
||||
Conflicts: lirc <= 0.8.4
|
||||
|
||||
%description devel
|
||||
LIRC is a package that supports receiving and sending IR signals with
|
||||
the most common IR remote controls. It contains a daemon that decodes
|
||||
and sends IR signals, a mouse daemon that translates IR signals to
|
||||
mouse movements, and a couple of user programs that allow you to
|
||||
control your computer with a remote control.
|
||||
|
||||
|
||||
|
||||
%package remotes
|
||||
License: GPL v2 or later
|
||||
Summary: Tools for Infrared Receivers
|
||||
Group: Hardware/Other
|
||||
# files were in lirc package previously
|
||||
Conflicts: lirc <= 0.8.4
|
||||
|
||||
%description remotes
|
||||
LIRC is a package that supports receiving and sending IR signals with
|
||||
the most common IR remote controls. It contains a daemon that decodes
|
||||
and sends IR signals, a mouse daemon that translates IR signals to
|
||||
mouse movements, and a couple of user programs that allow you to
|
||||
control your computer with a remote control.
|
||||
|
||||
|
||||
|
||||
%package -n liblirc_client0
|
||||
License: GPL v2 or later
|
||||
Summary: LIRC client library
|
||||
Group: Hardware/Other
|
||||
Recommends: lirc = %{version}
|
||||
# files were in lirc package previously
|
||||
Conflicts: lirc <= 0.8.4
|
||||
|
||||
%description -n liblirc_client0
|
||||
LIRC is a package that supports receiving and sending IR signals with
|
||||
the most common IR remote controls. It contains a daemon that decodes
|
||||
and sends IR signals, a mouse daemon that translates IR signals to
|
||||
mouse movements, and a couple of user programs that allow you to
|
||||
control your computer with a remote control.
|
||||
|
||||
This package only contains the client library. To actually use LIRC the
|
||||
lircd daemon from the 'lirc' package has to be configured and started.
|
||||
|
||||
|
||||
|
||||
%prep
|
||||
@ -82,6 +139,7 @@ control your computer with a remote control.
|
||||
#%patch0 -p1 -b .hw
|
||||
%patch1 -p1 -b .var
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
cp %{SOURCE8} .
|
||||
#find . -type d -name CVS -print0 | xargs -0 -- rm -rf
|
||||
#find . -name .cvsignore -print0 | xargs -0 -- rm -rf
|
||||
@ -95,6 +153,8 @@ sed -i -e 's/linux\/i2c-dev\.h/foobarblah.h/' configure.ac
|
||||
autoreconf -vfi
|
||||
PYTHON=/usr/bin/python \
|
||||
CFLAGS="%{optflags}" ./configure \
|
||||
--disable-static \
|
||||
--disable-dependency-tracking \
|
||||
--prefix=%{_prefix} \
|
||||
--mandir=%{_mandir} \
|
||||
--libdir=%{_libdir} \
|
||||
@ -118,7 +178,6 @@ make -C tools DESTDIR=%{buildroot} install
|
||||
make -C doc DESTDIR=%{buildroot} install
|
||||
mkdir -p %{buildroot}/usr/share/lirc
|
||||
cp -a remotes %{buildroot}/usr/share/lirc
|
||||
cp -a %{SOURCE7} %{buildroot}/usr/share/lirc/remotes
|
||||
install -d -m 755 %{buildroot}/dev
|
||||
mkdir -p %{buildroot}/var/run/lirc
|
||||
mkfifo %{buildroot}/var/run/lirc/lircm
|
||||
@ -142,14 +201,16 @@ rm -f %{buildroot}%{_libdir}/liblirc_client.la
|
||||
#
|
||||
# get rid of useless contrib stuff
|
||||
rm contrib/lirc.*
|
||||
%if 0%suse_version > 1020
|
||||
%fdupes $RPM_BUILD_ROOT
|
||||
%endif
|
||||
#
|
||||
# ghost file
|
||||
install -D -m 644 /dev/null %{buildroot}/etc/lircd.conf
|
||||
# hide python dependency
|
||||
chmod 644 %{buildroot}%{_bindir}/pronto2lirc
|
||||
#
|
||||
#
|
||||
%if 0%suse_version > 1020
|
||||
%fdupes $RPM_BUILD_ROOT
|
||||
%endif
|
||||
|
||||
%files
|
||||
%defattr (-,root,root)
|
||||
@ -157,33 +218,45 @@ chmod 644 %{buildroot}%{_bindir}/pronto2lirc
|
||||
%doc README.SUSE
|
||||
%doc doc/html doc/images doc/lirc.hwdb doc/lirc.css doc/irxevent.keys
|
||||
%doc contrib
|
||||
%dir /usr/include/lirc
|
||||
/usr/include/lirc/lirc_client.h
|
||||
%{_libdir}/liblirc_client.*
|
||||
#%attr (600,root,root) %dev(c,61,0) /dev/lirc # => udev
|
||||
%dir /var/run/lirc
|
||||
/var/run/lirc/lircm
|
||||
%attr(0755,root,root)/usr/bin/*
|
||||
/usr/sbin/*
|
||||
/usr/share/lirc
|
||||
/etc/init.d/lirc
|
||||
/var/adm/fillup-templates/sysconfig.lirc
|
||||
%dir /etc/udev
|
||||
%dir /etc/udev/rules.d
|
||||
/etc/udev/rules.d/51-lirc.rules
|
||||
%config /etc/udev/rules.d/51-lirc.rules
|
||||
%doc %_mandir/man1/*
|
||||
%doc %_mandir/man8/*
|
||||
%ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/lircd.conf
|
||||
|
||||
%files devel
|
||||
%defattr (-,root,root)
|
||||
%dir %{_includedir}/lirc
|
||||
%{_includedir}/lirc/lirc_client.h
|
||||
%{_libdir}/liblirc_client.so
|
||||
|
||||
%files remotes
|
||||
%defattr (-,root,root)
|
||||
%{_datadir}/lirc
|
||||
|
||||
%files -n liblirc_client0
|
||||
%defattr (-,root,root)
|
||||
%{_libdir}/liblirc_client.so.*
|
||||
|
||||
%preun
|
||||
%stop_on_removal lirc
|
||||
|
||||
%post
|
||||
/sbin/ldconfig
|
||||
%{fillup_and_insserv lirc}
|
||||
|
||||
%post -n liblirc_client0 -p /sbin/ldconfig
|
||||
|
||||
%postun -n liblirc_client0 -p /sbin/ldconfig
|
||||
|
||||
%postun
|
||||
/sbin/ldconfig
|
||||
%restart_on_update lirc
|
||||
%{insserv_cleanup}
|
||||
|
||||
@ -191,6 +264,18 @@ chmod 644 %{buildroot}%{_bindir}/pronto2lirc
|
||||
rm -rf %{buildroot}
|
||||
|
||||
%changelog
|
||||
* Mon May 25 2009 lnussel@suse.de
|
||||
- split package to lirc, lirc-remotes, lirc-devel and liblirc_client0
|
||||
* Mon May 25 2009 lnussel@suse.de
|
||||
- new versio 0.8.5
|
||||
* added support for Winbond 8769L CIR port (e.g. found on Acer
|
||||
Aspire 6530G) (Juan J. Garcia de Soria)
|
||||
* added support for FTDI FT232-based IR Receiver
|
||||
* Linux input event generation using uinput
|
||||
* standardised namespace following Linux input conventions
|
||||
* added support for Awox RF/IR Remote (Arif)
|
||||
* added support for new iMon LCD devices
|
||||
* added support for Antec-branded iMon LCD and VFD devices
|
||||
* Wed Jan 07 2009 olh@suse.de
|
||||
- obsolete old -XXbit packages (bnc#437293)
|
||||
* Thu Nov 13 2008 lnussel@suse.de
|
||||
@ -221,7 +306,7 @@ rm -rf %{buildroot}
|
||||
* Thu Apr 10 2008 ro@suse.de
|
||||
- added baselibs.conf file to build xxbit packages
|
||||
for multilib support
|
||||
* Thu Feb 21 2008 crrodriguez@suse.de
|
||||
* Fri Feb 22 2008 crrodriguez@suse.de
|
||||
- add missing insserv_prereq
|
||||
- add missing calls to restart_on_update and stop_on_removal macros
|
||||
* Fri Aug 10 2007 lnussel@suse.de
|
||||
|
Loading…
x
Reference in New Issue
Block a user