[parisc-linux-cvs] linux-2.5 varenet

[Thibaut VARENE]

--Apple-Mail-3-397212780
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain;
	charset=ISO-8859-1;
	format=flowed


Le jeudi, 7 nov 2002, =E0 17:24 Europe/Paris, Thibaut Varene a =E9crit :

> CVSROOT:	/var/cvs
> Module name:	linux-2.5
> Changes by:	varenet	02/11/07 09:24:48
>
> Modified files:
> 	drivers/input/keyboard: hil_kbd.c
> 	drivers/input/mouse: hil_ptr.c
>
> Log message:
> Updated hil files to reflect linux/input.h
> The boot time printk needs work (see the #warning).
>

I think that the dev.name value needs some changes to reflect new input=20=

layer naming (see atkbd.c for instance).

HTH


Thibaut VARENE
The PA/Linux ESIEE Team
http://pateam.esiee.fr/


--Apple-Mail-3-397212780
Content-Disposition: attachment;
	filename=hil.diff
Content-Transfer-Encoding: 7bit
Content-Type: application/octet-stream;
	x-unix-mode=0640;
	name="hil.diff"

diff -Nru /work/pa/CVS-mirror/linux-2.5/drivers/input/keyboard/hil_kbd.c linux-2.5/drivers/input/keyboard/hil_kbd.c
--- /work/pa/CVS-mirror/linux-2.5/drivers/input/keyboard/hil_kbd.c	2002-11-07 05:04:36.000000000 +0100
+++ linux-2.5/drivers/input/keyboard/hil_kbd.c	2002-11-07 16:56:04.000000000 +0100
@@ -384,10 +384,10 @@
 
 	kbd->dev.name = strlen(kbd->rnm) ? kbd->rnm : HIL_GENERIC_NAME;
 
-	kbd->dev.idbus		= BUS_HIL;
-	kbd->dev.idvendor	= SERIO_HIL;
-	kbd->dev.idproduct	= 0x0001; /* TODO: get from kbd->rsc */
-	kbd->dev.idversion	= 0x0100; /* TODO: get from kbd->rsc */
+	kbd->dev.id.bustype	= BUS_HIL;
+	kbd->dev.id.vendor	= SERIO_HIL;
+	kbd->dev.id.product	= 0x0001; /* TODO: get from kbd->rsc */
+	kbd->dev.id.version	= 0x0100; /* TODO: get from kbd->rsc */
 
 	kbd->dev.evbit[0] |= BIT(EV_KEY);
 
@@ -397,7 +397,7 @@
 	}
 	clear_bit(0, kbd->dev.keybit);
 
-#if 1
+#if 0
 	/* XXX: HACK !!!
 	 * remove this call if hp_psaux.c/hp_keyb.c is converted
 	 * to the input layer... */
@@ -405,8 +405,9 @@
 #endif
 	
 	input_register_device(&kbd->dev);
-	printk(KERN_INFO "input%d: %s on hil%d\n",
-		kbd->dev.number, "HIL keyboard", 0);
+#warning TODO Boottime printk needs update, as well as dev.name.
+	printk(KERN_INFO "input: %s, %s on hil%d\n",
+		kbd->dev.name, "HIL keyboard", 0);
 
 	/* HIL keyboards don't have a numlock key,
 	 * simulate a up-down sequence of numlock to 
@@ -446,7 +447,7 @@
 {
 	serio_unregister_device(&hil_kbd_serio_dev);
 
-#if 1
+#if 0
 	/* XXX: HACK !!!
 	 * remove this call if hp_psaux.c/hp_keyb.c is converted
 	 * to the input layer... */
diff -Nru /work/pa/CVS-mirror/linux-2.5/drivers/input/mouse/hil_ptr.c linux-2.5/drivers/input/mouse/hil_ptr.c
--- /work/pa/CVS-mirror/linux-2.5/drivers/input/mouse/hil_ptr.c	2002-11-07 05:04:36.000000000 +0100
+++ linux-2.5/drivers/input/mouse/hil_ptr.c	2002-11-07 16:56:15.000000000 +0100
@@ -365,14 +365,15 @@
 
 	ptr->dev.name = strlen(ptr->rnm) ? ptr->rnm : HIL_GENERIC_NAME;
 
-	ptr->dev.idbus = BUS_HIL;
-	ptr->dev.idvendor = SERIO_HIL;
-	ptr->dev.idproduct = 0x0001; /* TODO: get from ptr->rsc */
-	ptr->dev.idversion = 0x0100; /* TODO: get from ptr->rsc */
+	ptr->dev.id.bustype = BUS_HIL;
+	ptr->dev.id.vendor = SERIO_HIL;
+	ptr->dev.id.product = 0x0001; /* TODO: get from ptr->rsc */
+	ptr->dev.id.version = 0x0100; /* TODO: get from ptr->rsc */
 
 	input_register_device(&ptr->dev);
-	printk(KERN_INFO "input%d: %s on hil%d\n",
-		ptr->dev.number, 
+#warning TODO Boottime printk needs update, as well as dev.name.
+	printk(KERN_INFO "input: %s, %s on hil%d\n",
+		ptr->dev.name, 
 		(btntype == BTN_MOUSE) ? "HIL mouse":"HIL tablet or touchpad",
 		0);
 

--Apple-Mail-3-397212780
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
	charset=US-ASCII;
	format=flowed



--Apple-Mail-3-397212780--