From: John Weber <john.weber@linux.org>
To: linux-kernel@vger.kernel.org
Subject: [PATCH] Toshiba Laptop Support and IRQ Locks
Date: Fri, 02 Aug 2002 12:03:31 -0400 [thread overview]
Message-ID: <3D4AAD53.7010008@linux.org> (raw)
Hi,
Toshiba laptop support is broken. Here's my rookie attempt at fixing it.
--- linux-2.5.30/drivers/char/toshiba.c 2002-08-01 17:16:39.000000000 -0400
+++ linux-bleed/drivers/char/toshiba.c 2002-08-02 11:37:14.000000000 -0400
@@ -82,6 +82,8 @@
static int tosh_fn = 0;
+extern rwlock_t tosh_lock;
+
MODULE_PARM(tosh_fn, "i");
MODULE_LICENSE("GPL");
@@ -114,11 +116,10 @@
if (tosh_fn!=0) {
scan = inb(tosh_fn);
} else {
-
save_flags(flags);
-
cli();
+
write_lock_irq(&tosh_lock);
outb(0x8e, 0xe4);
scan = inb(0xe5);
-
restore_flags(flags);
+
write_unlock_irq(&tosh_lock);
}
return (int) scan;
@@ -141,35 +142,32 @@
if (tosh_id==0xfccb) {
if (eax==0xfe00) {
/* fan status */
-
save_flags(flags);
-
cli();
+
write_lock_irq(&tosh_lock);
outb(0xbe, 0xe4);
al = inb(0xe5);
-
restore_flags(flags);
+
write_unlock_irq(&tosh_lock);
regs->eax = 0x00;
regs->ecx = (unsigned int) (al & 0x01);
}
if ((eax==0xff00) && (ecx==0x0000)) {
/* fan off */
-
save_flags(flags);
-
cli();
+
write_lock_irq(&tosh_lock);
outb(0xbe, 0xe4);
al = inb(0xe5);
outb(0xbe, 0xe4);
outb (al | 0x01, 0xe5);
-
restore_flags(flags);
+
write_unlock_irq(&tosh_lock);
regs->eax = 0x00;
regs->ecx = 0x00;
}
if ((eax==0xff00) && (ecx==0x0001)) {
/* fan on */
-
save_flags(flags);
-
cli();
+
write_lock_irq(&tosh_lock);
outb(0xbe, 0xe4);
al = inb(0xe5);
outb(0xbe, 0xe4);
outb(al & 0xfe, 0xe5);
-
restore_flags(flags);
+
write_unlock_irq(&tosh_lock);
regs->eax = 0x00;
regs->ecx = 0x01;
}
@@ -180,33 +178,30 @@
if (tosh_id==0xfccc) {
if (eax==0xfe00) {
/* fan status */
-
save_flags(flags);
-
cli();
+
write_lock_irq(&tosh_lock);
outb(0xe0, 0xe4);
al = inb(0xe5);
-
restore_flags(flags);
+
write_unlock_irq(&tosh_lock);
regs->eax = 0x00;
regs->ecx = al & 0x01;
}
if ((eax==0xff00) && (ecx==0x0000)) {
/* fan off */
-
save_flags(flags);
-
cli();
+
write_lock_irq(&tosh_lock);
outb(0xe0, 0xe4);
al = inb(0xe5);
outw(0xe0 | ((al & 0xfe) << 8), 0xe4);
-
restore_flags(flags);
+
write_unlock_irq(&tosh_lock);
regs->eax = 0x00;
regs->ecx = 0x00;
}
if ((eax==0xff00) && (ecx==0x0001)) {
/* fan on */
-
save_flags(flags);
-
cli();
+
write_lock_irq(&tosh_lock);
outb(0xe0, 0xe4);
al = inb(0xe5);
outw(0xe0 | ((al | 0x01) << 8), 0xe4);
-
restore_flags(flags);
+
write_unlock_irq(&tosh_lock);
regs->eax = 0x00;
regs->ecx = 0x01;
}
next reply other threads:[~2002-08-02 16:01 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2002-08-02 16:03 John Weber [this message]
2002-08-02 17:55 ` [PATCH] Toshiba Laptop Support and IRQ Locks Alan Cox
2002-08-02 19:40 ` Jonathan Buzzard
2002-08-02 19:49 ` Brian Gerst
2002-08-04 4:27 ` Jonathan Buzzard
2002-08-02 23:05 ` John Weber
-- strict thread matches above, loose matches on Subject: below --
2002-09-10 22:25 rwhron
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=3D4AAD53.7010008@linux.org \
--to=john.weber@linux.org \
--cc=linux-kernel@vger.kernel.org \
/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