Skip to contentSkip to conversation

Input - Make i8042.c less picky about AUX ports [1/3]

PATCH Vojtech Pavlik 2 participants 9 messages Oct 9, 2002 Input drivers

lore
Share & tools
lore

Vojtech Pavlik

author
#0 lore raw

You can import this changeset into BK by piping this whole message to:
'| bk receive [path to repository]' or apply the patch as usual. 'bk pull bk://linux-input.bkbits.net/linux-input' should work as well.

===================================================================

[email protected], 2002-10-08 17:36:32+02:00, [email protected]
Make i8042.c even less picky about detecting an AUX port because of broken chipsets that don't support the LOOP command or report failure on the TEST command. Hopefully this won't screw any old 386/486 systems without the AUX port.

 i8042.c |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

===================================================================

drivers/input/serio/i8042.c +10 -8
diff -Nru a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
@@ -654,24 +654,26 @@
 	i8042_flush();
 
 /*
- * Internal loopback test - filters out AT-type i8042's
+ * Internal loopback test - filters out AT-type i8042's. Unfortunately
+ * SiS screwed up and their 5597 doesn't support the LOOP command even
+ * though it has an AUX port.
  */
 
 	param = 0x5a;
-	if (i8042_command(&param, I8042_CMD_AUX_LOOP) || param != 0xa5)
-		return -1;
+	if (i8042_command(&param, I8042_CMD_AUX_LOOP) || param != 0xa5) {
 
 /*
  * External connection test - filters out AT-soldered PS/2 i8042's
  * 0x00 - no error, 0x01-0x03 - clock/data stuck, 0xff - general error
  * 0xfa - no error on some notebooks which ignore the spec
- * We ignore general error, since some chips report it even under normal
- * operation.
+ * Because it's common for chipsets to return error on perfectly functioning
+ * AUX ports, we test for this only when the LOOP command failed.
  */
 
-	if (i8042_command(&param, I8042_CMD_AUX_TEST)
-	    || (param && param != 0xfa && param != 0xff))
-		return -1;
+		if (i8042_command(&param, I8042_CMD_AUX_TEST)
+		    	|| (param && param != 0xfa && param != 0xff))
+				return -1;
+	}
 
 /*
  * Bit assignment test - filters out PS/2 i8042's in AT mode

===================================================================

This BitKeeper patch contains the following changesets:
1.597.3.1
## Wrapped with gzip_uu ##

begin 664 bkpatch10681 M'XL(`*#DHST``\U5;6_;-A#^+/Z*&PKD9:UEDGJU!P]-DZ(+UB)!7H!]"VB) MBC3+I"!2<=UI_WU'V4DS%TNZH@,F&Q#$NWOTW-USIQ=P;60[]>[T[U9F)7D! MOVACIY[IC/2S3_A\H34^CTN]E..MUWB^&%>JZ2Q!^[FP60EWLC53C_G!PXE= M-W+J7;Q]=_W^Z(*0V0R.2Z%NY:6T,)L1J]L[4>?FM;!EK95O6Z',4EKA9WK9 M/[CVG%*.OX@E8WBGL4T3/J,Y8R)D,F<\C"-0[(E]GI+>R>>49HRQF(^Z:-T M,HG)"3_FB1^X#.@?,SHF*;DFD03P/^DO(II;#"2\9C"AY]^7^#')X(-8 M2*A2&G(_WDG%=32&&BJ;+$&,=>=A5PB%UNI6Q*CJY_@T:W%N8R$\@.=($H M\U8O,#0KJ\9(:\"6N.TVK=@NF;PMZ6$]V=GYX!,ET+EH%MHY6J1%5WK40< MK0:_J[>75_=^/HJBD457UVNT5096&]BLE2LDM9=YQ"D\1A30@2S-E8NT:NR MI2/OX.XY^^17B":44G+^60]D]"\O0JB@Y.>''ME555>WI?6[;.7:G[>5$^1& MI&,4>*7'VP)O^I+0@/$H9G$?H#IXGU#7$L$R24-6T'RW^\\B#A*+@IBG?1@& M23H(_HD@-P+_&?LOQN$KV">,\TG$>SY)4SH,"(MW9X.G_S@;%$;I_VHX'FD6 M49Y3[;.:W33U#$;M:OBC!L^?ZN\W2/HDCA)@Y-3=@(_PJFRLE6BAEKK9BZR M!5AI+(R@J&JT&'!$CZY&;M-N2K1O?+A6!7+NE+24T>8R^IRD[3,H6OS3UF M5[40X0K$#2'-DSO"U=S!N+K<EE!9*(7Y6Z61><R(_.88P)>5<#!0.=FBW&P MUXA6+%_!Z7!Z_.'D!H-OW&L.H>]AL,(/,Z?170(?SC=,XP1N^_,UVTU5V MWPS,<$MAFH^VG<9-9KM6@6Q;-*"]D6V!NL"=570*]:$52L2!W1,WKVE-S5U M6(-&M$+_52G5EX5P*U+F+MN$8X-.XR2$D'A?G:[;J(?H#WAYF/7!)NV]O<?Y J%V+WH#AT09ZW36_$?B+>GY\_O%DILX7IEK,@C^9AQ"GY"_?0R^/3!P`` `
end

author
#1 lore raw

Input - Add another japanese key to default atkbd table [2/3]

You can import this changeset into BK by piping this whole message to:
'| bk receive [path to repository]' or apply the patch as usual. 'bk pull bk://linux-input.bkbits.net/linux-input' should work as well.

===================================================================

[email protected], 2002-10-08 18:25:06+02:00, [email protected]
Add japanese bar key mapping to the default table in atkbd.c

 atkbd.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

===================================================================

drivers/input/keyboard/atkbd.c +1 -1
diff -Nru a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
@@ -44,7 +44,7 @@
 	  0, 49, 48, 35, 34, 21,  7,  0,  0,  0, 50, 36, 22,  8,  9,  0,
 	  0, 51, 37, 23, 24, 11, 10,  0,  0, 52, 53, 38, 39, 25, 12,  0,
 	122, 89, 40,120, 26, 13,  0,  0, 58, 54, 28, 27,  0, 43,  0,  0,
-	 85, 86, 90, 91, 92, 93, 14, 94, 95, 79,  0, 75, 71,121,  0,123,
+	 85, 86, 90, 91, 92, 93, 14, 94, 95, 79,183, 75, 71,121,  0,123,
 	 82, 83, 80, 76, 77, 72,  1, 69, 87, 78, 81, 74, 55, 73, 70, 99,
 	252,  0,  0, 65, 99,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
 	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,

===================================================================

This BitKeeper patch contains the following changesets:
1.597.3.2
## Wrapped with gzip_uu ##

begin 664 bkpatch10710 M'XL(`*GDHST``[V4;6^;,!#'7\>?XJ2^+#%W-N9)RM2NG;9IDQ:EZ@<PX`6:
M!")P$G7BP]<D42JE4M=.VX##V#Z;^]_]YNX[TR;CK;-@S5YR2[@2]/9=-1M M.L/S7ZX_:QK7]\MF9?RCEY\M_*I>;RQS\U-M\Q*VINW2$7%Y&K&/:Y..9I\^ MWW^_GC$VF<!-J>NYN3,6)A-FFW:KET5WI6VY;&IN6UUW*V,USYM5?W+M!:)P MMZ)(H@I["C&(^IP*(AV0*5$<1BP8V!7Q[#/UA-B3$J&4O0J041V"\15$G') M!:#P"7V,@>)4J!3#2Q0I(IQM"9<$8V0?X>\&?L-RN"X*>-!K79O.0*9;6)A' M6.GUNJKG[G=@2P.%^:DW2PM69TL#50W:+K*"Y^P;#)(4FSZGEXW?>3&&&MF' MDV2[JY;5O+1\D^^&;!9M-=3W4'/?19<UNBW\8P@'I1%*DA@'V%,2$_595B1& MH"E(ADDDS]/YECWW90N%0M&[%"K:0_3ZNH&L?ZCB!6=O5>$PD#BHP&@/GT!. MG%ZP)UYAC_X[>]S!=4C\#QBWN_WC8)G^I@9_@-]M$&QK_OW"&+E01QZD*S M<B:<20\H<.U@;CY*/(K=6#1\DT?"^0&Z5GK/AU)>FGS1;5:3(%2Y"BEB3_N> &C0_O!```
`
end

author
#2 lore raw

Input - Fix i8042.c for Sun [3/3]

You can import this changeset into BK by piping this whole message to:
'| bk receive [path to repository]' or apply the patch as usual. 'bk pull bk://linux-input.bkbits.net/linux-input' should work as well.

===================================================================

[email protected], 2002-10-09 09:12:00+02:00, [email protected]
Fix i8042 for Sun, recent updates broke it.

 i8042.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

===================================================================

drivers/input/serio/i8042.c +6 -6
diff -Nru a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
@@ -21,10 +21,6 @@
 #include <linux/serio.h>
 #include <linux/sched.h>
 
-#undef DEBUG
-
-#include "i8042.h"
-
 MODULE_AUTHOR("Vojtech Pavlik <[email protected]>");
 MODULE_DESCRIPTION("i8042 keyboard and mouse controller driver");
 MODULE_LICENSE("GPL");

@@ -41,6 +37,9 @@
 static int i8042_direct;
 static int i8042_dumbkbd;
 
+#undef DEBUG
+#include "i8042.h"
+
 spinlock_t i8042_lock = SPIN_LOCK_UNLOCKED;
 
 struct i8042_values {

@@ -287,7 +286,6 @@
  */
 
 static struct i8042_values i8042_kbd_values = {
-	.irq =		I8042_KBD_IRQ,
 	.irqen =	I8042_CTR_KBDINT,
 	.disable =	I8042_CTR_KBDDIS,
 	.name =		"KBD",

@@ -306,7 +304,6 @@
 };
 
 static struct i8042_values i8042_aux_values = {
-	.irq =		I8042_AUX_IRQ,
 	.irqen =	I8042_CTR_AUXINT,
 	.disable =	I8042_CTR_AUXDIS,
 	.name =		"AUX",

@@ -811,6 +808,9 @@
 
 	if (i8042_platform_init())
 		return -EBUSY;
+
+	i8042_aux_values.irq =	I8042_AUX_IRQ;
+	i8042_kbd_values.irq =	I8042_KBD_IRQ;
 
 	if (i8042_controller_init())
 		return -ENODEV;

===================================================================

This BitKeeper patch contains the following changesets:
1.717
## Wrapped with gzip_uu ##

begin 664 bkpatch10739 M'XL(`+?DHST``[647V^;,!3%G^-/<=4\=H%[P4!@RM2FZ=JHD]:EBK2'2I%C MG,"208F[28^_SI,JW;NC]:5FR.=<Z/O<G=V%:JB+J[/(/6LF$=>$R+W74 M*:M26?*SF4_RW,SM)-\H^T%ESU=VFFTKS<S_:Z%ECM5E%&'+/>PHC]M5=29 MG%],WYQ.&!L,X"P1V5+=*V#=-YL1/KN#P1.EGGF:4+D94;I84E\TU]D-8. MHF->CP(7/;\F'WE02XJ)!"<5H\/[/F</QDX>;#^J)\00?8\3KS'P0I>-@*R MD#')K0Q!PC<B+$8VQ&>+0='!/TDWA_YH^8Q)>I_>0]I$[L,@+N*FR%UH MJ3(-U3866I4P+_*5@E1;[J,>637WX)DO;]\&$.![-7A@/HN7:?+1%N5O&MR MBXNTZ>2^N[8A(\WMUIXE]X<*T"7'\\FO71.K4P?8G$>05,AI@?'CZ'Z[8]N; M@,CS:NX'#F])>:*H8>?9W/_T1^Y;\BBFKNF.RU9%'X/%D6>]RNP?.CYSP:6 MP<G@H\1*+%6#SS[@M]K[MK/\'#]5-;_@-?(X<#9F+M@;H(JB]4"1N?#Z07K MIIE<5[&"H_WFR1&[->H0@=C(-4D1&_>I*;MEG58R$]7]S*12J=)*BX\PZ(S; MY=/I^]EX\N[E5]EJ'O],=C4<[66'&TDF2J[*:C.(PSEY_@+9%QLPFW+^!``` `
end

author
#3 lore raw

Input - BK Merge changesets [4/3]

Hi!

There are a couple more changesets in the

bk://linux-input.bkbits.net/linux-input

repository - those are BK-Merge changesets and changesets for fixes we've done in parallel (the PgUp). Please pull them in as well, so that I don't have to re-clone the whole tree (I can't easily remove them).

Signature · 2 lines
Vojtech Pavlik
SuSE Labs
author
#4 lore raw

Input - Fix oops caused by cat /dev/uinput [1/3]

In reply to Vojtech Pavlik

You can import this changeset into BK by piping this whole message to:
'| bk receive [path to repository]' or apply the patch as usual. 'bk pull bk://linux-input.bkbits.net/linux-input' should work as well.

===================================================================

[email protected], 2002-10-09 12:12:55+02:00, [email protected]
Fix oops when 'cat /dev/uinput' is done. Used wait_event_interruptible().

 uinput.c |   38 ++++++++++----------------------------
 1 files changed, 10 insertions(+), 28 deletions(-)

===================================================================

drivers/input/misc/uinput.c +10 -28
diff -Nru a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c
@@ -218,43 +218,25 @@
 
 static ssize_t uinput_read(struct file *file, char *buffer, size_t count, loff_t *ppos)
 {
-	struct uinput_device	*udev;
+	struct uinput_device *udev = file->private_data;
 	int retval = 0;
-	DECLARE_WAITQUEUE(waitq, current);
 
-	udev = (struct uinput_device *)file->private_data;
+	if (udev->head == udev->tail && (udev->state & UIST_CREATED) && (file->f_flags & O_NONBLOCK))
+		return -EAGAIN;
 
-	if (udev->head == udev->tail) {
-		add_wait_queue(&udev->waitq, &waitq);
-		current->state = TASK_INTERRUPTIBLE;
-
-		while (udev->head == udev->tail) {
-			if (!(udev->state & UIST_CREATED)) {
-				retval = -ENODEV;
-				break;
-			}
-			if (file->f_flags & O_NONBLOCK) {
-				retval = -EAGAIN;
-				break;
-			}
-			if (signal_pending(current)) {
-				retval = -ERESTARTSYS;
-				break;
-			}
-			schedule();
-		}
-		current->state = TASK_RUNNING;
-		remove_wait_queue(&udev->waitq, &waitq);
-	}
+	retval = wait_event_interruptible(udev->waitq,
+		udev->head != udev->tail && (udev->state & UIST_CREATED));
 
 	if (retval)
 		return retval;
 
+	if (!(udev->state & UIST_CREATED))
+		return -ENODEV;
+
 	while (udev->head != udev->tail && retval + sizeof(struct uinput_device) <= count) {
 		if (copy_to_user(buffer + retval, &(udev->buff[udev->tail]),
-		    sizeof(struct input_event)))
-			return -EFAULT;
-		udev->tail = (udev->tail + 1)%(UINPUT_BUFFER_SIZE - 1);
+		    sizeof(struct input_event))) return -EFAULT;
+		udev->tail = (udev->tail + 1) % (UINPUT_BUFFER_SIZE - 1);
 		retval += sizeof(struct input_event);
 	}

===================================================================

This BitKeeper patch contains the following changesets:
1.718
## Wrapped with gzip_uu ##

begin 664 bkpatch453 M'XL(`#T,I#T``[65[T_:0!C'7_?^BL>8J9VCW%U[E!_!B(J.:(`@[,6RI#G; MPW9"R]HK;*9__*XMHL/HXC)+D_9X[OD^GWN>+V$7)HF(F]HR^BZ%ZZ-=^!PE MLJDE:2(,]UZM1U&DUE4_FHOJ>E?UYJX:A(M4(A4?<NGZL!1QTM2(86Z^D;\6 MHJF-NA>3J\X(H78;3GT>WHIK(:'=1C**EWSF)<=<^K,H-&3,PV0N)#?<:)YM MMF848ZH^C-@F9K6,U+!E9R[Q".$6$1ZF5KUFH378\1I[*Y]@W,V4:\9MED# MHS,@ADWJ@&F5X"IN*%-=3-VB&D38]B2@T,"%8Q.X/]"GR(7SH.?$$6+!%:^ M"&'?Y1*JGEA6TZ*_^QDX$6A,/(Q>;#B@73$4H32"4(IXCA=R.!F)@YTUV" MS>P&&CZV&57>>"&$.49'F^/+53+;GUII.XJ[ZH7!_F<R]FO$0VW/*U-3$(L M8M4RDUBVF7F<,8)YPW9YK4:9V.[IEM@\2-P_%?.A$4PH(QFCK&$6%GHE*3?5 M>X_\];?P'%=,9N$49S5J-6P"[?5GGF-O.@U#!5:?U^W*9MM62TW4-GG53B M57$K1PQ?:_D_&.R,4@($]<J'EL@X=264@HZB"5P!'U/UFV8!C-1.5JH^EP* MQ^.2M_)\4R6J!RME&%"D!5,XR),J1[[@GG("E"O)@QGL[3T$$ZF$8\FO>NQ M<SKJ=L;=,[V(EZ6FSG3&;Q.U8^#T!_V3J\'II:XC38N%3.,0*MW.1:?7+RAL MH%35M^IY?157DU+(+_Y2X\_..3$GP"N_,66+VE:C(*9GGFG5?W/@7O#\ZZ M7UKHFT)G3*4K%3LGUT!=27OHNG!>ACE+(I#Z+H.&XGSSN1JW-K%[CM!]IB M=0A$AP]P,.GUAY.Q<S(Y/^^.G.O>URY45*CU^'?A^L*]2])YVVQ8PK,X0[\! ()SK&HD&````
`
end

author
#5 lore raw

Input - Only try to enable extra keys if user requested it [2/3]

You can import this changeset into BK by piping this whole message to:
'| bk receive [path to repository]' or apply the patch as usual. 'bk pull bk://linux-input.bkbits.net/linux-input' should work as well.

===================================================================

[email protected], 2002-10-09 12:49:06+02:00, [email protected]
Don't try to enable extra keys on IBM/Chicony keyboards as this upsets several notebook keyboards. Until we find a better solution how to detect who are we talking to, we rely on the kernel command line. Use atkbd_set=4 to gain access to the extra keys.

 atkbd.c |   24 ++++++++++++++----------
 1 files changed, 14 insertions(+), 10 deletions(-)

===================================================================

drivers/input/keyboard/atkbd.c +14 -10
diff -Nru a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
@@ -280,6 +280,7 @@
 				param[1] = (test_bit(LED_COMPOSE, dev->led) ? 0x01 : 0)
 					 | (test_bit(LED_SLEEP,   dev->led) ? 0x02 : 0)
 					 | (test_bit(LED_SUSPEND, dev->led) ? 0x04 : 0)
+				         | (test_bit(LED_MISC,    dev->led) ? 0x10 : 0);
 				         | (test_bit(LED_MUTE,    dev->led) ? 0x20 : 0);
 				atkbd_command(atkbd, param, ATKBD_CMD_EX_SETLEDS);
 			}

@@ -309,8 +310,8 @@
 
 /*
  * For known special keyboards we can go ahead and set the correct set.
- * We check for NCD PS/2 Sun, NorthGate OmniKey 101 and IBM RapidAccess
- * keyboards.
+ * We check for NCD PS/2 Sun, NorthGate OmniKey 101 and
+ * IBM RapidAccess / IBM EzButton / Chicony KBP-8993 keyboards.
  */
 
 	if (atkbd->id == 0xaca1) {

@@ -319,14 +320,17 @@
 		return 3;
 	}
 
-	if (!atkbd_command(atkbd, param, ATKBD_CMD_OK_GETID)) {
-		atkbd->id = param[0] << 8 | param[1];
-		return 2;
-	}
+	if (atkbd_set != 2) 
+		if (!atkbd_command(atkbd, param, ATKBD_CMD_OK_GETID)) {
+			atkbd->id = param[0] << 8 | param[1];
+			return 2;
+		}
 
-	param[0] = 0x71;
-	if (!atkbd_command(atkbd, param, ATKBD_CMD_EX_ENABLE))
-		return 4;
+	if (atkbd_set == 4) {
+		param[0] = 0x71;
+		if (!atkbd_command(atkbd, param, ATKBD_CMD_EX_ENABLE))
+			return 4;
+	}
 
 /*
  * Try to set the set we want.

@@ -505,7 +509,7 @@
 	}
 
 	if (atkbd->set == 4) {
-		atkbd->dev.ledbit[0] |= BIT(LED_COMPOSE) | BIT(LED_SUSPEND) | BIT(LED_SLEEP) | BIT(LED_MUTE);
+		atkbd->dev.ledbit[0] |= BIT(LED_COMPOSE) | BIT(LED_SUSPEND) | BIT(LED_SLEEP) | BIT(LED_MUTE) | BIT(LED_MISC);
 		sprintf(atkbd->name, "AT Set 2 Extended keyboard");
 	} else
 		sprintf(atkbd->name, "AT Set %d keyboard", atkbd->set);

===================================================================

This BitKeeper patch contains the following changesets:
1.719
## Wrapped with gzip_uu ##

begin 664 bkpatch487 M'XL(`$@,I#T``[55;6_B1A#^C'_%G.Y#0P_LW;6-,3FG%\!*$2&@$-1*U0DM M]B;V86QD+^&XNO^]LSB0-UU[5_4,DC6S,\\^L_/,^BW,"I%W:O?9)RF"2'L+ MOV:%[-2*32'TXO:UUF&MA%E*V$\1!F+I1&GZXW4<'W"91#!O<B+3HWJYM$C M=VO1J5W[%[/+\VM-\SSH13R]$U,AP?,TF>7W/F+#UQ&29;J,N=IL1*2ZT&V M*H^A)2.$X<^FCDGL5DE;Q'+*@(:4<HN*D#"KW;*T!V(?'FB_R*>$N)109MLE M<6S'U?I=8>Z0)A!B4%<H*QCN1W2>D=8AQ!X0?O*#2)UH7_EW1/"Z"?I3]) MD/D.L4&D?)$($)\1%Y9B5T"6PJ[,GI1'&3I3OD6&<_#G@!,HH+V*P+(0L$ M*@2V@">09E(LLFSY&*O#+)5QEL!MW$:H>%D%+D4&3)1L:X191MU?:AP*(E M8FVC#'@N5(;DR3).[W"YH<Q<)#M%2D8"-\A3D0!6ON((F\2IT)6:$(#+Y2*< M(S//4L!W/$Z!!X$H"F6JY,<:=6T(CMUVM,FC0+3F=SZ:1CC1SHZ-D]LXB>\B MJ6^"K=)#F,=*H95JC</1&'N>>E#URR$F-4G;(B5UVY26BT7H"D9$2,V6ZY@O M1?$MF)7P+)?0TJ+,8OLQ^.<\-1L_L(I7D_)M5;11SI21$N5LT_WX,//5]-"O M3H\%3?ICYF><HB"_.C[;2*10K$40W\8B/CWF6)1?55KQM#,M_L_RFGR+UWZ M#P(=L#8#JM7P@<-3PHD4A9PO8GERZ??GH\&TUU+H;AOGB4BK,,O0#Y3AT@ M]5.M;U(&3!M@B_$%/\-O6$TD@B7<9CE<]?HPF1H,IINT5=9+J,++@6,5VD\
M%#O*Q"P;I6'EPI<\W4<GE=3:>P]_I?N1DH\)0,.-\ZP.VFV7==\<IT@"\; M0A;,!ENKQ;=P<AQX>.,!JP.6J=QO*O_#@5=1#5CSG*\:<'XS[/;GO5%_/A[. M+_R;0;]>AS_5>WCFF=Q"%X5_?Y"._?0QL/K++IQU,5FNYR5-@ROA+\7+ M5+S<U[QP\*P*_HCHX=$Z]/3[N/J_S_VK\^ZE7Z\_86A"A*P21M;/*A>QSJP MF3KV$INL=BT]ZYN]NWNC4>3\=2O8UD'UW0VG?A7_6>N2]^?/'6,9C?/<I1J ;4!S'+^]>$<5FY;F<WEHD-+6_`?/.$N7F!P``
`
end

author
#6 lore raw

Input - Extra escaped semicolon [3/3]

You can import this changeset into BK by piping this whole message to:
'| bk receive [path to repository]' or apply the patch as usual. 'bk pull bk://linux-input.bkbits.net/linux-input' should work as well.

===================================================================

[email protected], 2002-10-09 12:56:57+02:00, [email protected]
Fix a ; in atkbd.c that somehow got into the last cset.

 atkbd.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

===================================================================

drivers/input/keyboard/atkbd.c +1 -1
diff -Nru a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
@@ -280,7 +280,7 @@
 				param[1] = (test_bit(LED_COMPOSE, dev->led) ? 0x01 : 0)
 					 | (test_bit(LED_SLEEP,   dev->led) ? 0x02 : 0)
 					 | (test_bit(LED_SUSPEND, dev->led) ? 0x04 : 0)
-				         | (test_bit(LED_MISC,    dev->led) ? 0x10 : 0);
+				         | (test_bit(LED_MISC,    dev->led) ? 0x10 : 0)
 				         | (test_bit(LED_MUTE,    dev->led) ? 0x20 : 0);
 				atkbd_command(atkbd, param, ATKBD_CMD_EX_SETLEDS);
 			}

===================================================================

This BitKeeper patch contains the following changesets:
1.720
## Wrapped with gzip_uu ##

begin 664 bkpatch516 M'XL(`%,,I#T``[64;6O;,!#'7T>?XJ!O6KK8=_*#;(]TW=)N*^M82.GK(LM:
M[.5!P5*2=OC#SWE8"BETW5A/`B.=).[_OQ\^@ENKZZRS-#^<5B4[@L_&NJQC M%U9[ZF>['AK3KOW23+6_.^7G8[^:S1>.M?F!=*J$I:YMUB$OV.^XA[G..L/+ M3[?7[X>,]7K0+^5LI&^T@UZ/.5,OY:2PY]*5$S/S7"UG=JJ=])29-ONC#4?D M[8A(!!C%#<48BD91021#T@7R,(E#MBOL?%?VP7U"3G#%.,&190(=@'D"8Z MW"?T,07B611GD3A%GB'"P7-P2M!%]@'^;]%]IN!C=0\2WD(U^G&>>$I<*5T M8%N[2[."D7%MSIEV5\-$6@?*:N>Q+R"B-&"#1U-9]R^#,93(SO9BW:J:5*/2 M>0NU6GM8U-6ZJ]M.^V/]D!M9%_ZNS*U&@0$%F(384)H0-7E>I)JC+BB(4Q$< M&OF2-[?-BN((FYH"3;H/']OS=,KJGA"UXM5M,A1JX*'?(,<#Y\0A\\01Z]* MW8S;96<ZV+-T];L;]"M5YO9C+X@^__@-P%3P(@=K7]=-JW]'L=/6W>65 M.[Z^O+C[>G73?[-.%'K9/9OHX@3>`=X30@9X\OCK4:568[N8]H2@(*+D._L% (+'O6U]4$````
`
end

#7 lore raw

Re: Input - Only try to enable extra keys if user requested it [2/3]

In reply to Vojtech Pavlik
Quoted 4 lines · Vojtech Pavlik

Don't try to enable extra keys on IBM/Chicony keyboards as this upsets several notebook keyboards. Until we find a better solution how to detect who are we talking to, we rely on the kernel command line. Use atkbd_set=4 to gain access to the extra keys.

Surely this also wants a runtime option, or do you assume its fixable somehow ?

author
#8 lore raw

Re: Input - Only try to enable extra keys if user requested it [2/3]

Quoted 8 lines · Alan Cox
Quoted 4 lines · Vojtech Pavlik

Don't try to enable extra keys on IBM/Chicony keyboards as this upsets several notebook keyboards. Until we find a better solution how to detect who are we talking to, we rely on the kernel command line. Use atkbd_set=4 to gain access to the extra keys.

Surely this also wants a runtime option, or do you assume its fixable somehow ?

I hope I'll be able to find a way how to distinguish between the notebook keyboards and the extra-key keyboards.

I'm developing a keyboard/mouse analyzer module. ;)

On the other hand, 2.4 doesn't support this feature at all.

So rebooting or reloading the atkbd module should suffice for now.

Signature · 2 lines
Vojtech Pavlik
SuSE Labs