From: Richard Zidlicky <rz@linux-m68k.org>
To: Vojtech Pavlik <vojtech@suse.cz>
Cc: Linux Kernel ML <linux-kernel@vger.kernel.org>
Subject: [patch] q40kbd.c fixes
Date: Wed, 11 Sep 2002 16:22:07 +0200 [thread overview]
Message-ID: <20020911162206.A3861@linux-m68k.org> (raw)
Hi,
a few small fixes, works nicely.
Richard
--- linux-m68k-2.5.x/drivers/input/serio/q40kbd.c Sat Jul 27 21:09:46 2002
+++ linux-m68k-2.5.x-my/drivers/input/serio/q40kbd.c Wed Sep 11 16:40:08 2002
@@ -47,12 +47,24 @@
MODULE_DESCRIPTION("Q40 PS/2 keyboard controller driver");
MODULE_LICENSE("GPL");
+
+static int q40kbd_open(struct serio *port)
+{
+ return 0;
+}
+static void q40kbd_close(struct serio *port)
+{
+ return 0;
+}
+
static struct serio q40kbd_port =
{
.type = SERIO_8042,
+ .name = "Q40 kbd port",
+ .phys = "Q40",
.write = NULL,
- .name = "Q40 PS/2 kbd port",
- .phys = "isa0060/serio0",
+ .open = q40kbd_open,
+ .close = q40kbd_close,
};
static void q40kbd_interrupt(int irq, void *dev_id, struct pt_regs *regs)
@@ -70,13 +82,10 @@
{
int maxread = 100;
- /* Get the keyboard controller registers (incomplete decode) */
- request_region(0x60, 16, "q40kbd");
-
/* allocate the IRQ */
request_irq(Q40_IRQ_KEYBOARD, q40kbd_interrupt, 0, "q40kbd", NULL);
- /* flush any pending input. */
+ /* flush any pending input */
while (maxread-- && (IRQ_KEYB_MASK & master_inb(INTERRUPT_REG)))
master_inb(KEYCODE_REG);
@@ -84,15 +93,17 @@
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);
+ serio_register_port(&q40kbd_port);
+ printk(KERN_INFO "serio: Q40 kbd registered\n");
}
void __exit q40kbd_exit(void)
{
- unregister_serio_port(&q40kbd_port);
+ master_outb(0,KEY_IRQ_ENABLE_REG);
+ master_outb(-1,KEYBOARD_UNLOCK_REG);
+
+ serio_unregister_port(&q40kbd_port);
free_irq(Q40_IRQ_KEYBOARD, NULL);
- release_region(0x60, 16);
}
module_init(q40kbd_init);
next reply other threads:[~2002-09-11 18:12 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2002-09-11 14:22 Richard Zidlicky [this message]
2002-09-12 5:49 ` [patch] q40kbd.c fixes Vojtech Pavlik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20020911162206.A3861@linux-m68k.org \
--to=rz@linux-m68k.org \
--cc=linux-kernel@vger.kernel.org \
--cc=vojtech@suse.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).