* RE: Info on dn_keyb.c
@ 2002-02-01 9:08 Emmanuel Fuste
2002-07-10 22:49 ` James Simmons
0 siblings, 1 reply; 6+ messages in thread
From: Emmanuel Fuste @ 2002-02-01 9:08 UTC (permalink / raw)
To: jsimmons; +Cc: linux-kernel
>How is in charge of it and where can I get docs on the hardware so I can
>port the driver to the input api?
It was Peter De Schrijver who made the M68K Apollo DN port.
I have the hardware docs on paper. I could try to send you the relevant parts
or help you to port it.
I no longuer have Apollo DN hardware on hand but if someone in France who read
LKML want to made a donation, he can contact me.
Manu.
^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: Info on dn_keyb.c
2002-02-01 9:08 Info on dn_keyb.c Emmanuel Fuste
@ 2002-07-10 22:49 ` James Simmons
2002-07-11 6:30 ` Geert Uytterhoeven
0 siblings, 1 reply; 6+ messages in thread
From: James Simmons @ 2002-07-10 22:49 UTC (permalink / raw)
To: Emmanuel Fuste; +Cc: Linux Kernel Mailing List, linux-m68k
> >How is in charge of it and where can I get docs on the hardware so I can
> >port the driver to the input api?
>
> It was Peter De Schrijver who made the M68K Apollo DN port.
> I have the hardware docs on paper. I could try to send you the relevant parts
> or help you to port it.
Could you send me the docs. Its time to port the keyboard driver over to
the input api.
> I no longuer have Apollo DN hardware on hand but if someone in France who
> read LKML want to made a donation, he can contact me.
Did someone send you anything.
^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: Info on dn_keyb.c
2002-07-10 22:49 ` James Simmons
@ 2002-07-11 6:30 ` Geert Uytterhoeven
2002-07-11 12:35 ` m68k and input api Richard Zidlicky
0 siblings, 1 reply; 6+ messages in thread
From: Geert Uytterhoeven @ 2002-07-11 6:30 UTC (permalink / raw)
To: James Simmons
Cc: Emmanuel Fuste, Peter De Schrijver, Linux Kernel Mailing List,
Linux/m68k
On Wed, 10 Jul 2002, James Simmons wrote:
> > >How is in charge of it and where can I get docs on the hardware so I can
> > >port the driver to the input api?
> >
> > It was Peter De Schrijver who made the M68K Apollo DN port.
> > I have the hardware docs on paper. I could try to send you the relevant parts
> > or help you to port it.
>
> Could you send me the docs. Its time to port the keyboard driver over to
> the input api.
FYI, you need the following patch (from Linux/m68k CVS) to make the current
dn_keyb.c compile:
--- linux-2.5.25/drivers/char/dn_keyb.c Fri Jul 14 21:20:22 2000
+++ linux-m68k-2.5.25/drivers/char/dn_keyb.c Mon Jun 17 11:39:09 2002
@@ -5,6 +5,7 @@
#include <linux/delay.h>
#include <linux/timer.h>
#include <linux/kd.h>
+#include <linux/kbd_ll.h>
#include <linux/random.h>
#include <linux/kernel.h>
#include <linux/module.h>
@@ -19,8 +20,6 @@
#include "busmouse.h"
-/* extern void handle_scancode(unsigned char,int ); */
-
#define DNKEY_CAPS 0x7e
#define BREAK_FLAG 0x80
#define DNKEY_REPEAT_DELAY 50
@@ -336,7 +335,8 @@
static short mouse_byte_count=0;
static u_char mouse_packet[3];
- short mouse_buttons;
+ short buttons;
+ int dx, dy;
mouse_packet[mouse_byte_count++]=mouse_data;
@@ -347,24 +347,12 @@
/* printk("modechange: %d\n",mouse_packet[1]); */
if(kbd_mode==APOLLO_KBD_MODE_KEYB)
dn_keyb_process_key_event(mouse_packet[2]);
- }
+ }
if((mouse_packet[0] & 0x8f) == 0x80) {
- if(mouse_update_allowed) {
- mouse_ready=1;
- mouse_buttons=(mouse_packet[0] >> 4) & 0x7;
- mouse_dx+=mouse_packet[1] == 0xff ? 0 : (signed char)mouse_packet[1];
- mouse_dy+=mouse_packet[2] == 0xff ? 0 : (signed char)mouse_packet[2];
- wake_up_interruptible(&mouse_wait);
- if (mouse_dx < -2048)
- mouse_dx = -2048;
- else if (mouse_dx > 2048)
- mouse_dx = 2048;
- if (mouse_dy < -2048)
- mouse_dy = -2048;
- else if (mouse_dy > 2048)
- mouse_dy = 2048;
- kill_fasync(&mouse_fasyncptr, SIGIO, POLL_IN);
- }
+ buttons = (mouse_packet[0] >> 4) & 0x7;
+ dx = mouse_packet[1] == 0xff ? 0 : (signed char)mouse_packet[1];
+ dy = mouse_packet[2] == 0xff ? 0 : (signed char)mouse_packet[2];
+ busmouse_add_movementbuttons(msedev, dx, dy, buttons);
mouse_byte_count=0;
/* printk("mouse: %d, %d, %x\n",mouse_x,mouse_y,buttons); */
}
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 6+ messages in thread* m68k and input api
2002-07-11 6:30 ` Geert Uytterhoeven
@ 2002-07-11 12:35 ` Richard Zidlicky
2002-07-11 21:39 ` James Simmons
0 siblings, 1 reply; 6+ messages in thread
From: Richard Zidlicky @ 2002-07-11 12:35 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: James Simmons, Emmanuel Fuste, Peter De Schrijver,
Linux Kernel Mailing List, Linux/m68k
Hi,
isn't it time to simply drop in all of the input layer into
our 2.5 CVS branch and fix it later? I certainly won't mind if
my keyboard doesn't work for a while and I am sure that fixing
it will be actually *much* easier than hunting together all
the input-api pieces.
Richard
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: m68k and input api
2002-07-11 12:35 ` m68k and input api Richard Zidlicky
@ 2002-07-11 21:39 ` James Simmons
0 siblings, 0 replies; 6+ messages in thread
From: James Simmons @ 2002-07-11 21:39 UTC (permalink / raw)
To: Richard Zidlicky
Cc: Geert Uytterhoeven, Emmanuel Fuste, Peter De Schrijver,
Linux Kernel Mailing List, Linux/m68k
> isn't it time to simply drop in all of the input layer into
> our 2.5 CVS branch and fix it later? I certainly won't mind if
> my keyboard doesn't work for a while and I am sure that fixing
> it will be actually *much* easier than hunting together all
> the input-api pieces.
Great!!! The stuff I sent was the latest stuff that will be going in soon.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] Q40 input api support.
@ 2002-01-31 18:19 James Simmons
2002-01-31 18:47 ` Info on dn_keyb.c James Simmons
0 siblings, 1 reply; 6+ messages in thread
From: James Simmons @ 2002-01-31 18:19 UTC (permalink / raw)
To: linux-m68k; +Cc: Linux Kernel Mailing List
This patch ports q40 PS/2 controller support over to the input api. Please
try it out. It is against the latest dave jones tree.
. ---
|o_o |
|:_/ | Give Micro$oft the Bird!!!!
// \ \ Use Linux!!!!
(| | )
/'_ _/`\
___)=(___/
diff -urN -X /home/jsimmons/dontdiff linux-2.5.2-dj7/drivers/input/serio/Config.in linux/drivers/input/serio/Config.in
--- linux-2.5.2-dj7/drivers/input/serio/Config.in Tue Jan 29 17:36:39 2002
+++ linux/drivers/input/serio/Config.in Thu Jan 31 11:06:02 2002
@@ -7,6 +7,7 @@
dep_tristate ' i8042 PC Keyboard controller' CONFIG_SERIO_I8042 $CONFIG_SERIO $CONFIG_ISA
dep_tristate ' Serial port line discipline' CONFIG_SERIO_SERPORT $CONFIG_SERIO
dep_tristate ' ct82c710 Aux port controller' CONFIG_SERIO_CT82C710 $CONFIG_SERIO $CONFIG_ISA
+dep_tristate ' Q40 keyboard controller' CONFIG_SERIO_Q40KBD $CONFIG_SERIO
dep_tristate ' Parallel port keyboard adapter' CONFIG_SERIO_PARKBD $CONFIG_SERIO $CONFIG_PARPORT
if [ "$CONFIG_ARCH_ACORN" = "y" ]; then
diff -urN -X /home/jsimmons/dontdiff linux-2.5.2-dj7/drivers/input/serio/Makefile linux/drivers/input/serio/Makefile
--- linux-2.5.2-dj7/drivers/input/serio/Makefile Tue Jan 29 17:36:39 2002
+++ linux/drivers/input/serio/Makefile Thu Jan 31 10:49:53 2002
@@ -18,6 +18,7 @@
obj-$(CONFIG_SERIO_SERPORT) += serport.o
obj-$(CONFIG_SERIO_CT82C710) += ct82c710.o
obj-$(CONFIG_SERIO_RPCKBD) += rpckbd.o
+obj-$(CONFIG_SERIO_Q40KBD) += q40kbd.o
# The global Rules.make.
diff -urN -X /home/jsimmons/dontdiff linux-2.5.2-dj7/drivers/input/serio/q40kbd.c linux/drivers/input/serio/q40kbd.c
--- linux-2.5.2-dj7/drivers/input/serio/q40kbd.c Wed Dec 31 16:00:00 1969
+++ linux/drivers/input/serio/q40kbd.c Thu Jan 31 10:41:56 2002
@@ -0,0 +1,104 @@
+/*
+ * $Id: q40kbd.c,v 1.9 2002/01/23 06:20:52 jsimmons Exp $
+ *
+ * Copyright (c) 2000-2001 Vojtech Pavlik
+ *
+ * Based on the work of:
+ * unknown author
+ */
+
+/*
+ * Q40 PS/2 keyboard controller driver for Linux/m68k
+ */
+
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Should you need to contact me, the author, you can do so either by
+ * e-mail - mail your message to <vojtech@ucw.cz>, or by paper mail:
+ * Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/serio.h>
+
+#include <asm/keyboard.h>
+#include <asm/bitops.h>
+#include <asm/io.h>
+#include <asm/uaccess.h>
+#include <asm/q40_master.h>
+#include <asm/irq.h>
+#include <asm/q40ints.h>
+
+MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
+MODULE_DESCRIPTION("Q40 PS/2 keyboard controller driver");
+MODULE_LICENSE("GPL");
+
+static inline void q40kbd_write(unsigned char val)
+{
+ /* FIXME! We need a way how to write to the keyboard! */
+}
+
+static struct serio q40kbd_port =
+{
+ type: SERIO_8042,
+ write: q40kbd_write,
+ name: "Q40 PS/2 kbd port",
+ phys: "isa0060/serio0",
+};
+
+static void q40kbd_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+{
+ unsigned long flags;
+
+ if (IRQ_KEYB_MASK & master_inb(INTERRUPT_REG))
+ if (q40kbd_port.dev)
+ q40kbd_port.dev->interrupt(&q40kbd_port, master_inb(KEYCODE_REG), 0);
+
+ master_outb(-1, KEYBOARD_UNLOCK_REG);
+}
+
+void __init q40kbd_init(void)
+{
+ int maxread = 100;
+
+ /* Get the keyboard controller registers (incomplete decode) */
+ request_region(0x60, 16, "q40kbd");
+
+ /* allocate the IRQ */
+ request_irq(Q40_IRQ_KEYBOARD, keyboard_interrupt, 0, "q40kbd", NULL);
+
+ /* flush any pending input. */
+ while (maxread-- && (IRQ_KEYB_MASK & master_inb(INTERRUPT_REG)))
+ master_inb(KEYCODE_REG);
+
+ /* off we go */
+ master_outb(-1,KEYBOARD_UNLOCK_REG);
+ master_outb(1,KEY_IRQ_ENABLE_REG);
+
+ register_serio_port(&q40kbd_port);
+ printk(KERN_INFO "serio: Q40 PS/2 kbd port irq %d\n", Q40_IRQ_KEYBOARD);
+}
+
+void __exit q40kbd_exit(void)
+{
+ unregister_serio_port(&q40kbd_port);
+ free_irq(Q40_IRQ_KEYBOARD, NULL);
+ release_region(0x60, 16);
+}
+
+module_init(q40kbd_init);
+module_exit(q40kbd_exit);
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2002-07-11 21:37 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2002-02-01 9:08 Info on dn_keyb.c Emmanuel Fuste
2002-07-10 22:49 ` James Simmons
2002-07-11 6:30 ` Geert Uytterhoeven
2002-07-11 12:35 ` m68k and input api Richard Zidlicky
2002-07-11 21:39 ` James Simmons
-- strict thread matches above, loose matches on Subject: below --
2002-01-31 18:19 [PATCH] Q40 input api support James Simmons
2002-01-31 18:47 ` Info on dn_keyb.c James Simmons
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.