All of lore.kernel.org
 help / color / mirror / Atom feed
* [parisc-linux] The new PS/2 Keyboard Driver
@ 2000-10-26 20:05 Thomas Marteau
  2000-10-26 23:50 ` Helge Deller
  0 siblings, 1 reply; 4+ messages in thread
From: Thomas Marteau @ 2000-10-26 20:05 UTC (permalink / raw)
  To: parisc-linux

[-- Attachment #1: Type: text/plain, Size: 2508 bytes --]


Hello everyone,

We've just updated the PS/2 keyboard driver. The leds and interrupt
functions work really well on a 712 workstation and also B132 now. The
updated driver files are available on our website. It works better than
under HP UX for the B 132 ;->

http://www.esiee.fr/~djoudim

The ESIEE Port Team in Paris.

Here is the patch:

diff -urN linux/drivers/char/gsc_ps2.c linux-parisc/drivers/char/gsc_ps2.c
--- linux/drivers/char/gsc_ps2.c Thu Oct 26 21:06:54 2000
+++ linux-parisc/drivers/char/gsc_ps2.c Thu Oct 26 21:34:00 2000
@@ -7,6 +7,11 @@
  *
  * Okay, the filename is somewhat suboptimal.  It turns out this
  *  will work for Dino's psaux ports as well.
+ *
+ * 2000/10/26 Debacker Xavier (debackex@esiee.fr)
+ *   Marteau Thomas (marteaut@esiee.fr)
+ *    Djoudi Malek (djoudim@esiee.fr)
+ * fixed leds control
  */

 #include <asm/hardware.h>
@@ -198,7 +203,7 @@

 static void lasi_kbd_interrupt(int irq, void *dev, struct pt_regs *regs)
 {
- void *hpa = dev;
+ hpa = dev;

  kbd_pt_regs = regs;

@@ -233,6 +238,7 @@
 static struct kbd_ops gsc_ps2_kbd_ops = {
  translate: pckbd_translate,
  init_hw: gsc_ps2_init_hw,
+ leds:  ps2kbd_leds,
  sysrq_key: 0x54,
  sysrq_xlate: pckbd_sysrq_xlate,
 };
diff -urN linux/drivers/char/keyb_at.c linux-parisc/drivers/char/keyb_at.c
--- linux/drivers/char/keyb_at.c Thu Oct 26 21:07:00 2000
+++ linux-parisc/drivers/char/keyb_at.c Thu Oct 26 21:23:16 2000
@@ -47,7 +47,12 @@
 #define CODE_ESCAPE12 8

 #define K_NONE  0x7f
-
+/*
+ * 2000/10/26 Debacker Xavier (debackex@esiee.fr)
+ *  Marteau Thomas (marteaut@esiee.fr)
+ *  Djoudi Malek (djoudim@esiee.fr)
+ * fixed some keysym defines and SC_LIM
+ */
 #define K_ESC  0x01
 #define K_F1  0x3b
 #define K_F2  0x3c
@@ -79,8 +84,8 @@
 #define K_EQLS  0x0d
 #define K_BKSP  0x0e
 #define K_INS  110
-#define K_HOME  K_NONE
-#define K_PGUP  K_NONE
+#define K_HOME  102
+#define K_PGUP  104
 #define K_NUML  69
 #define KP_SLH  0x62
 #define KP_STR  0x37
@@ -99,9 +104,9 @@
 #define K_LSBK  0x1a
 #define K_RSBK  0x1b
 #define K_ENTR  0x1c
-#define K_DEL  0xe
-#define K_END  K_NONE
-#define K_PGDN  K_NONE
+#define K_DEL  111
+#define K_END  107
+#define K_PGDN  109
 #define KP_7  0x47
 #define KP_8  0x48
 #define KP_9  0x49
@@ -234,7 +239,7 @@
  * they needed not before. It does not matter that there are duplicates, as
  * long as no duplication occurs for any single keyboard.
  */
-#define SC_LIM 89
+#define SC_LIM 128

 #define FOCUS_PF1 85           /* actual code! */
 #define FOCUS_PF2 89


[-- Attachment #2: keyb.patch --]
[-- Type: application/octet-stream, Size: 2254 bytes --]

diff -urN linux/drivers/char/gsc_ps2.c linux-parisc/drivers/char/gsc_ps2.c
--- linux/drivers/char/gsc_ps2.c	Thu Oct 26 21:06:54 2000
+++ linux-parisc/drivers/char/gsc_ps2.c	Thu Oct 26 21:34:00 2000
@@ -7,6 +7,11 @@
  *
  *	Okay, the filename is somewhat suboptimal.  It turns out this
  * 	will work for Dino's psaux ports as well.
+ *
+ *	2000/10/26	Debacker Xavier (debackex@esiee.fr)
+ *			Marteau Thomas (marteaut@esiee.fr)
+ * 			Djoudi Malek (djoudim@esiee.fr)
+ *	fixed leds control
  */
 
 #include <asm/hardware.h>
@@ -198,7 +203,7 @@
 
 static void lasi_kbd_interrupt(int irq, void *dev, struct pt_regs *regs)
 {
-	void *hpa = dev;
+	hpa = dev;
 
 	kbd_pt_regs = regs;
 
@@ -233,6 +238,7 @@
 static struct kbd_ops gsc_ps2_kbd_ops = {
 	translate:	pckbd_translate,
 	init_hw:	gsc_ps2_init_hw,
+	leds:		ps2kbd_leds,
 	sysrq_key:	0x54,
 	sysrq_xlate:	pckbd_sysrq_xlate,
 };
diff -urN linux/drivers/char/keyb_at.c linux-parisc/drivers/char/keyb_at.c
--- linux/drivers/char/keyb_at.c	Thu Oct 26 21:07:00 2000
+++ linux-parisc/drivers/char/keyb_at.c	Thu Oct 26 21:23:16 2000
@@ -47,7 +47,12 @@
 #define CODE_ESCAPE12	8
 
 #define K_NONE		0x7f
-
+/*
+ * 2000/10/26	Debacker Xavier (debackex@esiee.fr)
+ *		Marteau Thomas (marteaut@esiee.fr)
+ *		Djoudi Malek (djoudim@esiee.fr)
+ * fixed some keysym defines and SC_LIM
+ */
 #define K_ESC		0x01
 #define K_F1		0x3b
 #define K_F2		0x3c
@@ -79,8 +84,8 @@
 #define K_EQLS		0x0d
 #define K_BKSP		0x0e
 #define K_INS		110
-#define K_HOME		K_NONE
-#define K_PGUP		K_NONE
+#define K_HOME		102
+#define K_PGUP		104
 #define K_NUML		69
 #define KP_SLH		0x62
 #define KP_STR		0x37
@@ -99,9 +104,9 @@
 #define K_LSBK		0x1a
 #define K_RSBK		0x1b
 #define K_ENTR		0x1c
-#define K_DEL		0xe
-#define K_END		K_NONE
-#define K_PGDN		K_NONE
+#define K_DEL		111
+#define K_END		107
+#define K_PGDN		109
 #define KP_7		0x47
 #define KP_8		0x48
 #define KP_9		0x49
@@ -234,7 +239,7 @@
  * they needed not before. It does not matter that there are duplicates, as
  * long as no duplication occurs for any single keyboard.
  */
-#define SC_LIM 89
+#define SC_LIM 128
 
 #define FOCUS_PF1 85           /* actual code! */
 #define FOCUS_PF2 89

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [parisc-linux] The new PS/2 Keyboard Driver
  2000-10-26 20:05 [parisc-linux] The new PS/2 Keyboard Driver Thomas Marteau
@ 2000-10-26 23:50 ` Helge Deller
  2000-11-01  0:45   ` Helge Deller
  0 siblings, 1 reply; 4+ messages in thread
From: Helge Deller @ 2000-10-26 23:50 UTC (permalink / raw)
  To: Thomas Marteau, parisc-linux

On Thursday 26 October 2000 22:05, Thomas Marteau wrote:

> > 
> Hello everyone,
> 
> We've just updated the PS/2 keyboard driver. The leds and interrupt
> functions work really well on a 712 workstation and also B132 now. The
> updated driver files are available on our website. It works better than
> under HP UX for the B 132 ;->
> 
> http://www.esiee.fr/~djoudim
> 
> The ESIEE Port Team in Paris.
> 
> Here is the patch:
> 
> diff -urN linux/drivers/char/gsc_ps2.c linux-parisc/drivers/char/gsc_ps2.c
> --- linux/drivers/char/gsc_ps2.c Thu Oct 26 21:06:54 2000
> +++ linux-parisc/drivers/char/gsc_ps2.c Thu Oct 26 21:34:00 2000
> @@ -7,6 +7,11 @@
>  [.............]

> diff -urN linux/drivers/char/keyb_at.c linux-parisc/drivers/char/keyb_at.c
> --- linux/drivers/char/keyb_at.c Thu Oct 26 21:07:00 2000
> +++ linux-parisc/drivers/char/keyb_at.c Thu Oct 26 21:23:16 2000
> [........]

Hi Thomas,

Thanks for your patch. 
But I don't think it's a good idea to change a common file like keyb_at.c, 
which is used in most other arches too. This patch surely breaks their 
keyboard support and more than that I'm sure, that Linus will not accept this 
patch, when the time is come to integrate parisc into the official kernel.

Isn't there any other solution as for example to #ifdef the code or create a 
new keyb_at.c for parisc (Yes I know, both of those aren't clean too.) ?

Helge Deller

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [parisc-linux] The new PS/2 Keyboard Driver
  2000-10-26 23:50 ` Helge Deller
@ 2000-11-01  0:45   ` Helge Deller
  2000-11-01  7:48     ` Brian S. Julin
  0 siblings, 1 reply; 4+ messages in thread
From: Helge Deller @ 2000-11-01  0:45 UTC (permalink / raw)
  To: Thomas Marteau, parisc-linux

On Friday 27 October 2000 01:50, Helge Deller wrote:
> On Thursday 26 October 2000 22:05, Thomas Marteau wrote:
> 
> > > 
> > Hello everyone,
> > 
> > We've just updated the PS/2 keyboard driver. The leds and interrupt
> > functions work really well on a 712 workstation and also B132 now. The
> > updated driver files are available on our website. It works better than
> > under HP UX for the B 132 ;->
> > 
> > http://www.esiee.fr/~djoudim
> > 
> > The ESIEE Port Team in Paris.
> > 
> > Here is the patch:
> > 
> > diff -urN linux/drivers/char/gsc_ps2.c linux-parisc/drivers/char/gsc_ps2.c
> > --- linux/drivers/char/gsc_ps2.c Thu Oct 26 21:06:54 2000
> > +++ linux-parisc/drivers/char/gsc_ps2.c Thu Oct 26 21:34:00 2000
> > @@ -7,6 +7,11 @@
> >  [.............]
> 
> > diff -urN linux/drivers/char/keyb_at.c linux-parisc/drivers/char/keyb_at.c
> > --- linux/drivers/char/keyb_at.c Thu Oct 26 21:07:00 2000
> > +++ linux-parisc/drivers/char/keyb_at.c Thu Oct 26 21:23:16 2000
> > [........]
> 
> Hi Thomas,
> 
> Thanks for your patch. 
> But I don't think it's a good idea to change a common file like keyb_at.c, 
> which is used in most other arches too. This patch surely breaks their 
> keyboard support and more than that I'm sure, that Linus will not accept 
this 
> patch, when the time is come to integrate parisc into the official kernel.
> 
> Isn't there any other solution as for example to #ifdef the code or create 
a 
> new keyb_at.c for parisc (Yes I know, both of those aren't clean too.) ?
> 
> Helge Deller


Hi folks,

I need to correct myself on this topic. The ESIEE-team made a great patch and 
didn't changed any globally used file.  keyb_at.c is just used in the current 
parisc-port, and so it's ok to change that file.

I just committed their changes to the CVS, and in the same cycle tried to 
clean up the code. In the same step I renamed the original filenames to some 
hopefully better ones.

Since I don't own myself a real HP PS/2 keyboard (it's just an PC-AT one with 
a small DIN to PS/2-connector), it would be great to get some feedback if I 
did the Right Thing.

Helge.

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [parisc-linux] The new PS/2 Keyboard Driver
  2000-11-01  0:45   ` Helge Deller
@ 2000-11-01  7:48     ` Brian S. Julin
  0 siblings, 0 replies; 4+ messages in thread
From: Brian S. Julin @ 2000-11-01  7:48 UTC (permalink / raw)
  To: Helge Deller; +Cc: parisc-linux


Probably best not to worry about cleaning keyboard drivers up too much.
The current USB code will be followed by linux-input style drivers at
some point.  In fact I started a HIL linux-input style driver, which
would abstract the PS2 port/HIL ports and allow a standard keyboard module
to be hooked into the abstracted serio port.  I will work on it more when
time permits.

--
Brian S. Julin

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2000-11-01  7:46 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2000-10-26 20:05 [parisc-linux] The new PS/2 Keyboard Driver Thomas Marteau
2000-10-26 23:50 ` Helge Deller
2000-11-01  0:45   ` Helge Deller
2000-11-01  7:48     ` Brian S. Julin

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.