Skip to content

L
linux
Commit 3aeda9bc authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds
Browse files
Options

parport_pc: Coding style 

Michael's patch fixed some of the coding style so the style is now
inconsistent. Sort the rest out
Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 73e0d48b
Show whitespace changes
Inline Side-by-side
Showing with 916 additions and 830 deletions
drivers/parport/parport_pc.c
View file @ 3aeda9bc
...@@ -56,10 +56,10 @@ ...@@ -56,10 +56,10 @@
#include <linux/pnp.h> #include <linux/pnp.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/sysctl.h> #include <linux/sysctl.h>
#include <linux/io.h>
#include <linux/uaccess.h>
#include <asm/io.h>
#include <asm/dma.h> #include <asm/dma.h>
#include <asm/uaccess.h>
#include <linux/parport.h> #include <linux/parport.h>
#include <linux/parport_pc.h> #include <linux/parport_pc.h>
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
#define ECR_TST 06 #define ECR_TST 06
#define ECR_CNF 07 #define ECR_CNF 07
#define ECR_MODE_MASK 0xe0 #define ECR_MODE_MASK 0xe0
#define ECR_WRITE(p,v) frob_econtrol((p),0xff,(v)) #define ECR_WRITE(p, v) frob_econtrol((p), 0xff, (v))
#undef DEBUG #undef DEBUG
...@@ -109,23 +109,23 @@ static int pci_registered_parport; ...@@ -109,23 +109,23 @@ static int pci_registered_parport;
static int pnp_registered_parport; static int pnp_registered_parport;
/* frob_control, but for ECR */ /* frob_control, but for ECR */
static void frob_econtrol (struct parport *pb, unsigned char m, static void frob_econtrol(struct parport *pb, unsigned char m,
unsigned char v) unsigned char v)
{ {
unsigned char ectr = 0; unsigned char ectr = 0;
if (m != 0xff) if (m != 0xff)
ectr = inb (ECONTROL (pb)); ectr = inb(ECONTROL(pb));
DPRINTK (KERN_DEBUG "frob_econtrol(%02x,%02x): %02x -> %02x\n", DPRINTK(KERN_DEBUG "frob_econtrol(%02x,%02x): %02x -> %02x\n",
m, v, ectr, (ectr & ~m) ^ v); m, v, ectr, (ectr & ~m) ^ v);
outb ((ectr & ~m) ^ v, ECONTROL (pb)); outb((ectr & ~m) ^ v, ECONTROL(pb));
} }
static __inline__ void frob_set_mode (struct parport *p, int mode) static inline void frob_set_mode(struct parport *p, int mode)
{ {
frob_econtrol (p, ECR_MODE_MASK, mode << 5); frob_econtrol(p, ECR_MODE_MASK, mode << 5);
} }
#ifdef CONFIG_PARPORT_PC_FIFO #ifdef CONFIG_PARPORT_PC_FIFO
...@@ -141,17 +141,18 @@ static int change_mode(struct parport *p, int m) ...@@ -141,17 +141,18 @@ static int change_mode(struct parport *p, int m)
unsigned char oecr; unsigned char oecr;
int mode; int mode;
DPRINTK(KERN_INFO "parport change_mode ECP-ISA to mode 0x%02x\n",m); DPRINTK(KERN_INFO "parport change_mode ECP-ISA to mode 0x%02x\n", m);
if (!priv->ecr) { if (!priv->ecr) {
printk (KERN_DEBUG "change_mode: but there's no ECR!\n"); printk(KERN_DEBUG "change_mode: but there's no ECR!\n");
return 0; return 0;
} }
/* Bits <7:5> contain the mode. */ /* Bits <7:5> contain the mode. */
oecr = inb (ECONTROL (p)); oecr = inb(ECONTROL(p));
mode = (oecr >> 5) & 0x7; mode = (oecr >> 5) & 0x7;
if (mode == m) return 0; if (mode == m)
return 0;
if (mode >= 2 && !(priv->ctr & 0x20)) { if (mode >= 2 && !(priv->ctr & 0x20)) {
/* This mode resets the FIFO, so we may /* This mode resets the FIFO, so we may
...@@ -163,19 +164,21 @@ static int change_mode(struct parport *p, int m) ...@@ -163,19 +164,21 @@ static int change_mode(struct parport *p, int m)
case ECR_ECP: /* ECP Parallel Port mode */ case ECR_ECP: /* ECP Parallel Port mode */
/* Busy wait for 200us */ /* Busy wait for 200us */
for (counter = 0; counter < 40; counter++) { for (counter = 0; counter < 40; counter++) {
if (inb (ECONTROL (p)) & 0x01) if (inb(ECONTROL(p)) & 0x01)
break;
if (signal_pending(current))
break; break;
if (signal_pending (current)) break; udelay(5);
udelay (5);
} }
/* Poll slowly. */ /* Poll slowly. */
while (!(inb (ECONTROL (p)) & 0x01)) { while (!(inb(ECONTROL(p)) & 0x01)) {
if (time_after_eq (jiffies, expire)) if (time_after_eq(jiffies, expire))
/* The FIFO is stuck. */ /* The FIFO is stuck. */
return -EBUSY; return -EBUSY;
schedule_timeout_interruptible(msecs_to_jiffies(10)); schedule_timeout_interruptible(
if (signal_pending (current)) msecs_to_jiffies(10));
if (signal_pending(current))
break; break;
} }
} }
...@@ -185,20 +188,20 @@ static int change_mode(struct parport *p, int m) ...@@ -185,20 +188,20 @@ static int change_mode(struct parport *p, int m)
/* We have to go through mode 001 */ /* We have to go through mode 001 */
oecr &= ~(7 << 5); oecr &= ~(7 << 5);
oecr |= ECR_PS2 << 5; oecr |= ECR_PS2 << 5;
ECR_WRITE (p, oecr); ECR_WRITE(p, oecr);
} }
/* Set the mode. */ /* Set the mode. */
oecr &= ~(7 << 5); oecr &= ~(7 << 5);
oecr |= m << 5; oecr |= m << 5;
ECR_WRITE (p, oecr); ECR_WRITE(p, oecr);
return 0; return 0;
} }
#ifdef CONFIG_PARPORT_1284 #ifdef CONFIG_PARPORT_1284
/* Find FIFO lossage; FIFO is reset */ /* Find FIFO lossage; FIFO is reset */
#if 0 #if 0
static int get_fifo_residue (struct parport *p) static int get_fifo_residue(struct parport *p)
{ {
int residue; int residue;
int cnfga; int cnfga;
...@@ -206,26 +209,26 @@ static int get_fifo_residue (struct parport *p) ...@@ -206,26 +209,26 @@ static int get_fifo_residue (struct parport *p)
/* Adjust for the contents of the FIFO. */ /* Adjust for the contents of the FIFO. */
for (residue = priv->fifo_depth; ; residue--) { for (residue = priv->fifo_depth; ; residue--) {
if (inb (ECONTROL (p)) & 0x2) if (inb(ECONTROL(p)) & 0x2)
/* Full up. */ /* Full up. */
break; break;
outb (0, FIFO (p)); outb(0, FIFO(p));
} }
printk (KERN_DEBUG "%s: %d PWords were left in FIFO\n", p->name, printk(KERN_DEBUG "%s: %d PWords were left in FIFO\n", p->name,
residue); residue);
/* Reset the FIFO. */ /* Reset the FIFO. */
frob_set_mode (p, ECR_PS2); frob_set_mode(p, ECR_PS2);
/* Now change to config mode and clean up. FIXME */ /* Now change to config mode and clean up. FIXME */
frob_set_mode (p, ECR_CNF); frob_set_mode(p, ECR_CNF);
cnfga = inb (CONFIGA (p)); cnfga = inb(CONFIGA(p));
printk (KERN_DEBUG "%s: cnfgA contains 0x%02x\n", p->name, cnfga); printk(KERN_DEBUG "%s: cnfgA contains 0x%02x\n", p->name, cnfga);
if (!(cnfga & (1<<2))) { if (!(cnfga & (1<<2))) {
printk (KERN_DEBUG "%s: Accounting for extra byte\n", p->name); printk(KERN_DEBUG "%s: Accounting for extra byte\n", p->name);
residue++; residue++;
} }
...@@ -233,9 +236,11 @@ static int get_fifo_residue (struct parport *p) ...@@ -233,9 +236,11 @@ static int get_fifo_residue (struct parport *p)
* PWord != 1 byte. */ * PWord != 1 byte. */
/* Back to PS2 mode. */ /* Back to PS2 mode. */
frob_set_mode (p, ECR_PS2); frob_set_mode(p, ECR_PS2);
DPRINTK (KERN_DEBUG "*** get_fifo_residue: done residue collecting (ecr = 0x%2.2x)\n", inb (ECONTROL (p))); DPRINTK(KERN_DEBUG
"*** get_fifo_residue: done residue collecting (ecr = 0x%2.2x)\n",
inb(ECONTROL(p)));
return residue; return residue;
} }
#endif /* 0 */ #endif /* 0 */
...@@ -257,8 +262,8 @@ static int clear_epp_timeout(struct parport *pb) ...@@ -257,8 +262,8 @@ static int clear_epp_timeout(struct parport *pb)
/* To clear timeout some chips require double read */ /* To clear timeout some chips require double read */
parport_pc_read_status(pb); parport_pc_read_status(pb);
r = parport_pc_read_status(pb); r = parport_pc_read_status(pb);
outb (r | 0x01, STATUS (pb)); /* Some reset by writing 1 */ outb(r | 0x01, STATUS(pb)); /* Some reset by writing 1 */
outb (r & 0xfe, STATUS (pb)); /* Others by writing 0 */ outb(r & 0xfe, STATUS(pb)); /* Others by writing 0 */
r = parport_pc_read_status(pb); r = parport_pc_read_status(pb);
return !(r & 0x01); return !(r & 0x01);
...@@ -272,7 +277,8 @@ static int clear_epp_timeout(struct parport *pb) ...@@ -272,7 +277,8 @@ static int clear_epp_timeout(struct parport *pb)
* of these are in parport_pc.h. * of these are in parport_pc.h.
*/ */
static void parport_pc_init_state(struct pardevice *dev, struct parport_state *s) static void parport_pc_init_state(struct pardevice *dev,
struct parport_state *s)
{ {
s->u.pc.ctr = 0xc; s->u.pc.ctr = 0xc;
if (dev->irq_func && if (dev->irq_func &&
...@@ -289,21 +295,22 @@ static void parport_pc_save_state(struct parport *p, struct parport_state *s) ...@@ -289,21 +295,22 @@ static void parport_pc_save_state(struct parport *p, struct parport_state *s)
const struct parport_pc_private *priv = p->physport->private_data; const struct parport_pc_private *priv = p->physport->private_data;
s->u.pc.ctr = priv->ctr; s->u.pc.ctr = priv->ctr;
if (priv->ecr) if (priv->ecr)
s->u.pc.ecr = inb (ECONTROL (p)); s->u.pc.ecr = inb(ECONTROL(p));
} }
static void parport_pc_restore_state(struct parport *p, struct parport_state *s) static void parport_pc_restore_state(struct parport *p,
struct parport_state *s)
{ {
struct parport_pc_private *priv = p->physport->private_data; struct parport_pc_private *priv = p->physport->private_data;
register unsigned char c = s->u.pc.ctr & priv->ctr_writable; register unsigned char c = s->u.pc.ctr & priv->ctr_writable;
outb (c, CONTROL (p)); outb(c, CONTROL(p));
priv->ctr = c; priv->ctr = c;
if (priv->ecr) if (priv->ecr)
ECR_WRITE (p, s->u.pc.ecr); ECR_WRITE(p, s->u.pc.ecr);
} }
#ifdef CONFIG_PARPORT_1284 #ifdef CONFIG_PARPORT_1284
static size_t parport_pc_epp_read_data (struct parport *port, void *buf, static size_t parport_pc_epp_read_data(struct parport *port, void *buf,
size_t length, int flags) size_t length, int flags)
{ {
size_t got = 0; size_t got = 0;
...@@ -316,54 +323,52 @@ static size_t parport_pc_epp_read_data (struct parport *port, void *buf, ...@@ -316,54 +323,52 @@ static size_t parport_pc_epp_read_data (struct parport *port, void *buf,
* nFault is 0 if there is at least 1 byte in the Warp's FIFO * nFault is 0 if there is at least 1 byte in the Warp's FIFO
* pError is 1 if there are 16 bytes in the Warp's FIFO * pError is 1 if there are 16 bytes in the Warp's FIFO
*/ */
status = inb (STATUS (port)); status = inb(STATUS(port));
while (!(status & 0x08) && (got < length)) { while (!(status & 0x08) && got < length) {
if ((left >= 16) && (status & 0x20) && !(status & 0x08)) { if (left >= 16 && (status & 0x20) && !(status & 0x08)) {
/* can grab 16 bytes from warp fifo */ /* can grab 16 bytes from warp fifo */
if (!((long)buf & 0x03)) { if (!((long)buf & 0x03))
insl (EPPDATA (port), buf, 4); insl(EPPDATA(port), buf, 4);
} else { else
insb (EPPDATA (port), buf, 16); insb(EPPDATA(port), buf, 16);
}
buf += 16; buf += 16;
got += 16; got += 16;
left -= 16; left -= 16;
} else { } else {
/* grab single byte from the warp fifo */ /* grab single byte from the warp fifo */
*((char *)buf) = inb (EPPDATA (port)); *((char *)buf) = inb(EPPDATA(port));
buf++; buf++;
got++; got++;
left--; left--;
} }
status = inb (STATUS (port)); status = inb(STATUS(port));
if (status & 0x01) { if (status & 0x01) {
/* EPP timeout should never occur... */ /* EPP timeout should never occur... */
printk (KERN_DEBUG "%s: EPP timeout occurred while talking to " printk(KERN_DEBUG
"w91284pic (should not have done)\n", port->name); "%s: EPP timeout occurred while talking to w91284pic (should not have done)\n", port->name);
clear_epp_timeout (port); clear_epp_timeout(port);
} }
} }
return got; return got;
} }
if ((flags & PARPORT_EPP_FAST) && (length > 1)) { if ((flags & PARPORT_EPP_FAST) && (length > 1)) {
if (!(((long)buf | length) & 0x03)) { if (!(((long)buf | length) & 0x03))
insl (EPPDATA (port), buf, (length >> 2)); insl(EPPDATA(port), buf, (length >> 2));
} else { else
insb (EPPDATA (port), buf, length); insb(EPPDATA(port), buf, length);
} if (inb(STATUS(port)) & 0x01) {
if (inb (STATUS (port)) & 0x01) { clear_epp_timeout(port);
clear_epp_timeout (port);
return -EIO; return -EIO;
} }
return length; return length;
} }
for (; got < length; got++) { for (; got < length; got++) {
*((char*)buf) = inb (EPPDATA(port)); *((char *)buf) = inb(EPPDATA(port));
buf++; buf++;
if (inb (STATUS (port)) & 0x01) { if (inb(STATUS(port)) & 0x01) {
/* EPP timeout */ /* EPP timeout */
clear_epp_timeout (port); clear_epp_timeout(port);
break; break;
} }
} }
...@@ -371,28 +376,27 @@ static size_t parport_pc_epp_read_data (struct parport *port, void *buf, ...@@ -371,28 +376,27 @@ static size_t parport_pc_epp_read_data (struct parport *port, void *buf,
return got; return got;
} }
static size_t parport_pc_epp_write_data (struct parport *port, const void *buf, static size_t parport_pc_epp_write_data(struct parport *port, const void *buf,
size_t length, int flags) size_t length, int flags)
{ {
size_t written = 0; size_t written = 0;
if ((flags & PARPORT_EPP_FAST) && (length > 1)) { if ((flags & PARPORT_EPP_FAST) && (length > 1)) {
if (!(((long)buf | length) & 0x03)) { if (!(((long)buf | length) & 0x03))
outsl (EPPDATA (port), buf, (length >> 2)); outsl(EPPDATA(port), buf, (length >> 2));
} else { else
outsb (EPPDATA (port), buf, length); outsb(EPPDATA(port), buf, length);
} if (inb(STATUS(port)) & 0x01) {
if (inb (STATUS (port)) & 0x01) { clear_epp_timeout(port);
clear_epp_timeout (port);
return -EIO; return -EIO;
} }
return length; return length;
} }
for (; written < length; written++) { for (; written < length; written++) {
outb (*((char*)buf), EPPDATA(port)); outb(*((char *)buf), EPPDATA(port));
buf++; buf++;
if (inb (STATUS(port)) & 0x01) { if (inb(STATUS(port)) & 0x01) {
clear_epp_timeout (port); clear_epp_timeout(port);
break; break;
} }
} }
...@@ -400,24 +404,24 @@ static size_t parport_pc_epp_write_data (struct parport *port, const void *buf, ...@@ -400,24 +404,24 @@ static size_t parport_pc_epp_write_data (struct parport *port, const void *buf,
return written; return written;
} }
static size_t parport_pc_epp_read_addr (struct parport *port, void *buf, static size_t parport_pc_epp_read_addr(struct parport *port, void *buf,
size_t length, int flags) size_t length, int flags)
{ {
size_t got = 0; size_t got = 0;
if ((flags & PARPORT_EPP_FAST) && (length > 1)) { if ((flags & PARPORT_EPP_FAST) && (length > 1)) {
insb (EPPADDR (port), buf, length); insb(EPPADDR(port), buf, length);
if (inb (STATUS (port)) & 0x01) { if (inb(STATUS(port)) & 0x01) {
clear_epp_timeout (port); clear_epp_timeout(port);
return -EIO; return -EIO;
} }
return length; return length;
} }
for (; got < length; got++) { for (; got < length; got++) {
*((char*)buf) = inb (EPPADDR (port)); *((char *)buf) = inb(EPPADDR(port));
buf++; buf++;
if (inb (STATUS (port)) & 0x01) { if (inb(STATUS(port)) & 0x01) {
clear_epp_timeout (port); clear_epp_timeout(port);
break; break;
} }
} }
...@@ -425,25 +429,25 @@ static size_t parport_pc_epp_read_addr (struct parport *port, void *buf, ...@@ -425,25 +429,25 @@ static size_t parport_pc_epp_read_addr (struct parport *port, void *buf,
return got; return got;
} }
static size_t parport_pc_epp_write_addr (struct parport *port, static size_t parport_pc_epp_write_addr(struct parport *port,
const void *buf, size_t length, const void *buf, size_t length,
int flags) int flags)
{ {
size_t written = 0; size_t written = 0;
if ((flags & PARPORT_EPP_FAST) && (length > 1)) { if ((flags & PARPORT_EPP_FAST) && (length > 1)) {
outsb (EPPADDR (port), buf, length); outsb(EPPADDR(port), buf, length);
if (inb (STATUS (port)) & 0x01) { if (inb(STATUS(port)) & 0x01) {
clear_epp_timeout (port); clear_epp_timeout(port);
return -EIO; return -EIO;
} }
return length; return length;
} }
for (; written < length; written++) { for (; written < length; written++) {
outb (*((char*)buf), EPPADDR (port)); outb(*((char *)buf), EPPADDR(port));
buf++; buf++;
if (inb (STATUS (port)) & 0x01) { if (inb(STATUS(port)) & 0x01) {
clear_epp_timeout (port); clear_epp_timeout(port);
break; break;
} }
} }
...@@ -451,74 +455,74 @@ static size_t parport_pc_epp_write_addr (struct parport *port, ...@@ -451,74 +455,74 @@ static size_t parport_pc_epp_write_addr (struct parport *port,
return written; return written;
} }
static size_t parport_pc_ecpepp_read_data (struct parport *port, void *buf, static size_t parport_pc_ecpepp_read_data(struct parport *port, void *buf,
size_t length, int flags) size_t length, int flags)
{ {
size_t got; size_t got;
frob_set_mode (port, ECR_EPP); frob_set_mode(port, ECR_EPP);
parport_pc_data_reverse (port); parport_pc_data_reverse(port);
parport_pc_write_control (port, 0x4); parport_pc_write_control(port, 0x4);
got = parport_pc_epp_read_data (port, buf, length, flags); got = parport_pc_epp_read_data(port, buf, length, flags);
frob_set_mode (port, ECR_PS2); frob_set_mode(port, ECR_PS2);
return got; return got;
} }
static size_t parport_pc_ecpepp_write_data (struct parport *port, static size_t parport_pc_ecpepp_write_data(struct parport *port,
const void *buf, size_t length, const void *buf, size_t length,
int flags) int flags)
{ {
size_t written; size_t written;
frob_set_mode (port, ECR_EPP); frob_set_mode(port, ECR_EPP);
parport_pc_write_control (port, 0x4); parport_pc_write_control(port, 0x4);
parport_pc_data_forward (port); parport_pc_data_forward(port);
written = parport_pc_epp_write_data (port, buf, length, flags); written = parport_pc_epp_write_data(port, buf, length, flags);
frob_set_mode (port, ECR_PS2); frob_set_mode(port, ECR_PS2);
return written; return written;
} }
static size_t parport_pc_ecpepp_read_addr (struct parport *port, void *buf, static size_t parport_pc_ecpepp_read_addr(struct parport *port, void *buf,
size_t length, int flags) size_t length, int flags)
{ {
size_t got; size_t got;
frob_set_mode (port, ECR_EPP); frob_set_mode(port, ECR_EPP);
parport_pc_data_reverse (port); parport_pc_data_reverse(port);
parport_pc_write_control (port, 0x4); parport_pc_write_control(port, 0x4);
got = parport_pc_epp_read_addr (port, buf, length, flags); got = parport_pc_epp_read_addr(port, buf, length, flags);
frob_set_mode (port, ECR_PS2); frob_set_mode(port, ECR_PS2);
return got; return got;
} }
static size_t parport_pc_ecpepp_write_addr (struct parport *port, static size_t parport_pc_ecpepp_write_addr(struct parport *port,
const void *buf, size_t length, const void *buf, size_t length,
int flags) int flags)
{ {
size_t written; size_t written;
frob_set_mode (port, ECR_EPP); frob_set_mode(port, ECR_EPP);
parport_pc_write_control (port, 0x4); parport_pc_write_control(port, 0x4);
parport_pc_data_forward (port); parport_pc_data_forward(port);
written = parport_pc_epp_write_addr (port, buf, length, flags); written = parport_pc_epp_write_addr(port, buf, length, flags);
frob_set_mode (port, ECR_PS2); frob_set_mode(port, ECR_PS2);
return written; return written;
} }
#endif /* IEEE 1284 support */ #endif /* IEEE 1284 support */
#ifdef CONFIG_PARPORT_PC_FIFO #ifdef CONFIG_PARPORT_PC_FIFO
static size_t parport_pc_fifo_write_block_pio (struct parport *port, static size_t parport_pc_fifo_write_block_pio(struct parport *port,
const void *buf, size_t length) const void *buf, size_t length)
{ {
int ret = 0; int ret = 0;
const unsigned char *bufp = buf; const unsigned char *bufp = buf;
size_t left = length; size_t left = length;
unsigned long expire = jiffies + port->physport->cad->timeout; unsigned long expire = jiffies + port->physport->cad->timeout;
const int fifo = FIFO (port); const int fifo = FIFO(port);
int poll_for = 8; /* 80 usecs */ int poll_for = 8; /* 80 usecs */
const struct parport_pc_private *priv = port->physport->private_data; const struct parport_pc_private *priv = port->physport->private_data;
const int fifo_depth = priv->fifo_depth; const int fifo_depth = priv->fifo_depth;
...@@ -526,25 +530,25 @@ static size_t parport_pc_fifo_write_block_pio (struct parport *port, ...@@ -526,25 +530,25 @@ static size_t parport_pc_fifo_write_block_pio (struct parport *port,
port = port->physport; port = port->physport;
/* We don't want to be interrupted every character. */ /* We don't want to be interrupted every character. */
parport_pc_disable_irq (port); parport_pc_disable_irq(port);
/* set nErrIntrEn and serviceIntr */ /* set nErrIntrEn and serviceIntr */
frob_econtrol (port, (1<<4) | (1<<2), (1<<4) | (1<<2)); frob_econtrol(port, (1<<4) | (1<<2), (1<<4) | (1<<2));
/* Forward mode. */ /* Forward mode. */
parport_pc_data_forward (port); /* Must be in PS2 mode */ parport_pc_data_forward(port); /* Must be in PS2 mode */
while (left) { while (left) {
unsigned char byte; unsigned char byte;
unsigned char ecrval = inb (ECONTROL (port)); unsigned char ecrval = inb(ECONTROL(port));
int i = 0; int i = 0;
if (need_resched() && time_before (jiffies, expire)) if (need_resched() && time_before(jiffies, expire))
/* Can't yield the port. */ /* Can't yield the port. */
schedule (); schedule();
/* Anyone else waiting for the port? */ /* Anyone else waiting for the port? */
if (port->waithead) { if (port->waithead) {
printk (KERN_DEBUG "Somebody wants the port\n"); printk(KERN_DEBUG "Somebody wants the port\n");
break; break;
} }
...@@ -552,21 +556,22 @@ static size_t parport_pc_fifo_write_block_pio (struct parport *port, ...@@ -552,21 +556,22 @@ static size_t parport_pc_fifo_write_block_pio (struct parport *port,
/* FIFO is full. Wait for interrupt. */ /* FIFO is full. Wait for interrupt. */
/* Clear serviceIntr */ /* Clear serviceIntr */
ECR_WRITE (port, ecrval & ~(1<<2)); ECR_WRITE(port, ecrval & ~(1<<2));
false_alarm: false_alarm:
ret = parport_wait_event (port, HZ); ret = parport_wait_event(port, HZ);
if (ret < 0) break; if (ret < 0)
break;
ret = 0; ret = 0;
if (!time_before (jiffies, expire)) { if (!time_before(jiffies, expire)) {
/* Timed out. */ /* Timed out. */
printk (KERN_DEBUG "FIFO write timed out\n"); printk(KERN_DEBUG "FIFO write timed out\n");
break; break;
} }
ecrval = inb (ECONTROL (port)); ecrval = inb(ECONTROL(port));
if (!(ecrval & (1<<2))) { if (!(ecrval & (1<<2))) {
if (need_resched() && if (need_resched() &&
time_before (jiffies, expire)) time_before(jiffies, expire))
schedule (); schedule();
goto false_alarm; goto false_alarm;
} }
...@@ -577,38 +582,38 @@ static size_t parport_pc_fifo_write_block_pio (struct parport *port, ...@@ -577,38 +582,38 @@ static size_t parport_pc_fifo_write_block_pio (struct parport *port,
/* Can't fail now. */ /* Can't fail now. */
expire = jiffies + port->cad->timeout; expire = jiffies + port->cad->timeout;
poll: poll:
if (signal_pending (current)) if (signal_pending(current))
break; break;
if (ecrval & 0x01) { if (ecrval & 0x01) {
/* FIFO is empty. Blast it full. */ /* FIFO is empty. Blast it full. */
const int n = left < fifo_depth ? left : fifo_depth; const int n = left < fifo_depth ? left : fifo_depth;
outsb (fifo, bufp, n); outsb(fifo, bufp, n);
bufp += n; bufp += n;
left -= n; left -= n;
/* Adjust the poll time. */ /* Adjust the poll time. */
if (i < (poll_for - 2)) poll_for--; if (i < (poll_for - 2))
poll_for--;
continue; continue;
} else if (i++ < poll_for) { } else if (i++ < poll_for) {
udelay (10); udelay(10);
ecrval = inb (ECONTROL (port)); ecrval = inb(ECONTROL(port));
goto poll; goto poll;
} }
/* Half-full (call me an optimist) */ /* Half-full(call me an optimist) */
byte = *bufp++; byte = *bufp++;
outb (byte, fifo); outb(byte, fifo);
left--; left--;
} }
dump_parport_state("leave fifo_write_block_pio", port);
dump_parport_state ("leave fifo_write_block_pio", port);
return length - left; return length - left;
} }
#ifdef HAS_DMA #ifdef HAS_DMA
static size_t parport_pc_fifo_write_block_dma (struct parport *port, static size_t parport_pc_fifo_write_block_dma(struct parport *port,
const void *buf, size_t length) const void *buf, size_t length)
{ {
int ret = 0; int ret = 0;
...@@ -621,7 +626,7 @@ static size_t parport_pc_fifo_write_block_dma (struct parport *port, ...@@ -621,7 +626,7 @@ static size_t parport_pc_fifo_write_block_dma (struct parport *port,
unsigned long start = (unsigned long) buf; unsigned long start = (unsigned long) buf;
unsigned long end = (unsigned long) buf + length - 1; unsigned long end = (unsigned long) buf + length - 1;
dump_parport_state ("enter fifo_write_block_dma", port); dump_parport_state("enter fifo_write_block_dma", port);
if (end < MAX_DMA_ADDRESS) { if (end < MAX_DMA_ADDRESS) {
/* If it would cross a 64k boundary, cap it at the end. */ /* If it would cross a 64k boundary, cap it at the end. */
if ((start ^ end) & ~0xffffUL) if ((start ^ end) & ~0xffffUL)
...@@ -630,7 +635,8 @@ dump_parport_state ("enter fifo_write_block_dma", port); ...@@ -630,7 +635,8 @@ dump_parport_state ("enter fifo_write_block_dma", port);
dma_addr = dma_handle = dma_map_single(dev, (void *)buf, length, dma_addr = dma_handle = dma_map_single(dev, (void *)buf, length,
DMA_TO_DEVICE); DMA_TO_DEVICE);
} else { } else {
/* above 16 MB we use a bounce buffer as ISA-DMA is not possible */ /* above 16 MB we use a bounce buffer as ISA-DMA
is not possible */
maxlen = PAGE_SIZE; /* sizeof(priv->dma_buf) */ maxlen = PAGE_SIZE; /* sizeof(priv->dma_buf) */
dma_addr = priv->dma_handle; dma_addr = priv->dma_handle;
dma_handle = 0; dma_handle = 0;
...@@ -639,12 +645,12 @@ dump_parport_state ("enter fifo_write_block_dma", port); ...@@ -639,12 +645,12 @@ dump_parport_state ("enter fifo_write_block_dma", port);
port = port->physport; port = port->physport;
/* We don't want to be interrupted every character. */ /* We don't want to be interrupted every character. */
parport_pc_disable_irq (port); parport_pc_disable_irq(port);
/* set nErrIntrEn and serviceIntr */ /* set nErrIntrEn and serviceIntr */
frob_econtrol (port, (1<<4) | (1<<2), (1<<4) | (1<<2)); frob_econtrol(port, (1<<4) | (1<<2), (1<<4) | (1<<2));
/* Forward mode. */ /* Forward mode. */
parport_pc_data_forward (port); /* Must be in PS2 mode */ parport_pc_data_forward(port); /* Must be in PS2 mode */
while (left) { while (left) {
unsigned long expire = jiffies + port->physport->cad->timeout; unsigned long expire = jiffies + port->physport->cad->timeout;
...@@ -665,10 +671,10 @@ dump_parport_state ("enter fifo_write_block_dma", port); ...@@ -665,10 +671,10 @@ dump_parport_state ("enter fifo_write_block_dma", port);
set_dma_count(port->dma, count); set_dma_count(port->dma, count);
/* Set DMA mode */ /* Set DMA mode */
frob_econtrol (port, 1<<3, 1<<3); frob_econtrol(port, 1<<3, 1<<3);
/* Clear serviceIntr */ /* Clear serviceIntr */
frob_econtrol (port, 1<<2, 0); frob_econtrol(port, 1<<2, 0);
enable_dma(port->dma); enable_dma(port->dma);
release_dma_lock(dmaflag); release_dma_lock(dmaflag);
...@@ -676,20 +682,22 @@ dump_parport_state ("enter fifo_write_block_dma", port); ...@@ -676,20 +682,22 @@ dump_parport_state ("enter fifo_write_block_dma", port);
/* assume DMA will be successful */ /* assume DMA will be successful */
left -= count; left -= count;
buf += count; buf += count;
if (dma_handle) dma_addr += count; if (dma_handle)
dma_addr += count;
/* Wait for interrupt. */ /* Wait for interrupt. */
false_alarm: false_alarm:
ret = parport_wait_event (port, HZ); ret = parport_wait_event(port, HZ);
if (ret < 0) break; if (ret < 0)
break;
ret = 0; ret = 0;
if (!time_before (jiffies, expire)) { if (!time_before(jiffies, expire)) {
/* Timed out. */ /* Timed out. */
printk (KERN_DEBUG "DMA write timed out\n"); printk(KERN_DEBUG "DMA write timed out\n");
break; break;
} }
/* Is serviceIntr set? */ /* Is serviceIntr set? */
if (!(inb (ECONTROL (port)) & (1<<2))) { if (!(inb(ECONTROL(port)) & (1<<2))) {
cond_resched(); cond_resched();
goto false_alarm; goto false_alarm;
...@@ -705,14 +713,15 @@ dump_parport_state ("enter fifo_write_block_dma", port); ...@@ -705,14 +713,15 @@ dump_parport_state ("enter fifo_write_block_dma", port);
/* Anyone else waiting for the port? */ /* Anyone else waiting for the port? */
if (port->waithead) { if (port->waithead) {
printk (KERN_DEBUG "Somebody wants the port\n"); printk(KERN_DEBUG "Somebody wants the port\n");
break; break;
} }
/* update for possible DMA residue ! */ /* update for possible DMA residue ! */
buf -= count; buf -= count;
left += count; left += count;
if (dma_handle) dma_addr -= count; if (dma_handle)
dma_addr -= count;
} }
/* Maybe got here through break, so adjust for DMA residue! */ /* Maybe got here through break, so adjust for DMA residue! */
...@@ -723,12 +732,12 @@ dump_parport_state ("enter fifo_write_block_dma", port); ...@@ -723,12 +732,12 @@ dump_parport_state ("enter fifo_write_block_dma", port);
release_dma_lock(dmaflag); release_dma_lock(dmaflag);
/* Turn off DMA mode */ /* Turn off DMA mode */
frob_econtrol (port, 1<<3, 0); frob_econtrol(port, 1<<3, 0);
if (dma_handle) if (dma_handle)
dma_unmap_single(dev, dma_handle, length, DMA_TO_DEVICE); dma_unmap_single(dev, dma_handle, length, DMA_TO_DEVICE);
dump_parport_state ("leave fifo_write_block_dma", port); dump_parport_state("leave fifo_write_block_dma", port);
return length - left; return length - left;
} }
#endif #endif
...@@ -738,13 +747,13 @@ static inline size_t parport_pc_fifo_write_block(struct parport *port, ...@@ -738,13 +747,13 @@ static inline size_t parport_pc_fifo_write_block(struct parport *port,
{ {
#ifdef HAS_DMA #ifdef HAS_DMA
if (port->dma != PARPORT_DMA_NONE) if (port->dma != PARPORT_DMA_NONE)
return parport_pc_fifo_write_block_dma (port, buf, length); return parport_pc_fifo_write_block_dma(port, buf, length);
#endif #endif
return parport_pc_fifo_write_block_pio (port, buf, length); return parport_pc_fifo_write_block_pio(port, buf, length);
} }
/* Parallel Port FIFO mode (ECP chipsets) */ /* Parallel Port FIFO mode (ECP chipsets) */
static size_t parport_pc_compat_write_block_pio (struct parport *port, static size_t parport_pc_compat_write_block_pio(struct parport *port,
const void *buf, size_t length, const void *buf, size_t length,
int flags) int flags)
{ {
...@@ -756,14 +765,16 @@ static size_t parport_pc_compat_write_block_pio (struct parport *port, ...@@ -756,14 +765,16 @@ static size_t parport_pc_compat_write_block_pio (struct parport *port,
/* Special case: a timeout of zero means we cannot call schedule(). /* Special case: a timeout of zero means we cannot call schedule().
* Also if O_NONBLOCK is set then use the default implementation. */ * Also if O_NONBLOCK is set then use the default implementation. */
if (port->physport->cad->timeout <= PARPORT_INACTIVITY_O_NONBLOCK) if (port->physport->cad->timeout <= PARPORT_INACTIVITY_O_NONBLOCK)
return parport_ieee1284_write_compat (port, buf, return parport_ieee1284_write_compat(port, buf,
length, flags); length, flags);
/* Set up parallel port FIFO mode.*/ /* Set up parallel port FIFO mode.*/
parport_pc_data_forward (port); /* Must be in PS2 mode */ parport_pc_data_forward(port); /* Must be in PS2 mode */
parport_pc_frob_control (port, PARPORT_CONTROL_STROBE, 0); parport_pc_frob_control(port, PARPORT_CONTROL_STROBE, 0);
r = change_mode (port, ECR_PPF); /* Parallel port FIFO */ r = change_mode(port, ECR_PPF); /* Parallel port FIFO */
if (r) printk (KERN_DEBUG "%s: Warning change_mode ECR_PPF failed\n", port->name); if (r)
printk(KERN_DEBUG "%s: Warning change_mode ECR_PPF failed\n",
port->name);
port->physport->ieee1284.phase = IEEE1284_PH_FWD_DATA; port->physport->ieee1284.phase = IEEE1284_PH_FWD_DATA;
...@@ -778,36 +789,35 @@ static size_t parport_pc_compat_write_block_pio (struct parport *port, ...@@ -778,36 +789,35 @@ static size_t parport_pc_compat_write_block_pio (struct parport *port,
expire = jiffies + (priv->fifo_depth * HZ * 4); expire = jiffies + (priv->fifo_depth * HZ * 4);
do { do {
/* Wait for the FIFO to empty */ /* Wait for the FIFO to empty */
r = change_mode (port, ECR_PS2); r = change_mode(port, ECR_PS2);
if (r != -EBUSY) { if (r != -EBUSY)
break; break;
} } while (time_before(jiffies, expire));
} while (time_before (jiffies, expire));
if (r == -EBUSY) { if (r == -EBUSY) {
printk (KERN_DEBUG "%s: FIFO is stuck\n", port->name); printk(KERN_DEBUG "%s: FIFO is stuck\n", port->name);
/* Prevent further data transfer. */ /* Prevent further data transfer. */
frob_set_mode (port, ECR_TST); frob_set_mode(port, ECR_TST);
/* Adjust for the contents of the FIFO. */ /* Adjust for the contents of the FIFO. */
for (written -= priv->fifo_depth; ; written++) { for (written -= priv->fifo_depth; ; written++) {
if (inb (ECONTROL (port)) & 0x2) { if (inb(ECONTROL(port)) & 0x2) {
/* Full up. */ /* Full up. */
break; break;
} }
outb (0, FIFO (port)); outb(0, FIFO(port));
} }
/* Reset the FIFO and return to PS2 mode. */ /* Reset the FIFO and return to PS2 mode. */
frob_set_mode (port, ECR_PS2); frob_set_mode(port, ECR_PS2);
} }
r = parport_wait_peripheral (port, r = parport_wait_peripheral(port,
PARPORT_STATUS_BUSY, PARPORT_STATUS_BUSY,
PARPORT_STATUS_BUSY); PARPORT_STATUS_BUSY);
if (r) if (r)
printk (KERN_DEBUG printk(KERN_DEBUG
"%s: BUSY timeout (%d) in compat_write_block_pio\n", "%s: BUSY timeout (%d) in compat_write_block_pio\n",
port->name, r); port->name, r);
...@@ -818,7 +828,7 @@ static size_t parport_pc_compat_write_block_pio (struct parport *port, ...@@ -818,7 +828,7 @@ static size_t parport_pc_compat_write_block_pio (struct parport *port,
/* ECP */ /* ECP */
#ifdef CONFIG_PARPORT_1284 #ifdef CONFIG_PARPORT_1284
static size_t parport_pc_ecp_write_block_pio (struct parport *port, static size_t parport_pc_ecp_write_block_pio(struct parport *port,
const void *buf, size_t length, const void *buf, size_t length,
int flags) int flags)
{ {
...@@ -830,36 +840,38 @@ static size_t parport_pc_ecp_write_block_pio (struct parport *port, ...@@ -830,36 +840,38 @@ static size_t parport_pc_ecp_write_block_pio (struct parport *port,
/* Special case: a timeout of zero means we cannot call schedule(). /* Special case: a timeout of zero means we cannot call schedule().
* Also if O_NONBLOCK is set then use the default implementation. */ * Also if O_NONBLOCK is set then use the default implementation. */
if (port->physport->cad->timeout <= PARPORT_INACTIVITY_O_NONBLOCK) if (port->physport->cad->timeout <= PARPORT_INACTIVITY_O_NONBLOCK)
return parport_ieee1284_ecp_write_data (port, buf, return parport_ieee1284_ecp_write_data(port, buf,
length, flags); length, flags);
/* Switch to forward mode if necessary. */ /* Switch to forward mode if necessary. */
if (port->physport->ieee1284.phase != IEEE1284_PH_FWD_IDLE) { if (port->physport->ieee1284.phase != IEEE1284_PH_FWD_IDLE) {
/* Event 47: Set nInit high. */ /* Event 47: Set nInit high. */
parport_frob_control (port, parport_frob_control(port,
PARPORT_CONTROL_INIT PARPORT_CONTROL_INIT
| PARPORT_CONTROL_AUTOFD, | PARPORT_CONTROL_AUTOFD,
PARPORT_CONTROL_INIT PARPORT_CONTROL_INIT
| PARPORT_CONTROL_AUTOFD); | PARPORT_CONTROL_AUTOFD);
/* Event 49: PError goes high. */ /* Event 49: PError goes high. */
r = parport_wait_peripheral (port, r = parport_wait_peripheral(port,
PARPORT_STATUS_PAPEROUT, PARPORT_STATUS_PAPEROUT,
PARPORT_STATUS_PAPEROUT); PARPORT_STATUS_PAPEROUT);
if (r) { if (r) {
printk (KERN_DEBUG "%s: PError timeout (%d) " printk(KERN_DEBUG "%s: PError timeout (%d) "
"in ecp_write_block_pio\n", port->name, r); "in ecp_write_block_pio\n", port->name, r);
} }
} }
/* Set up ECP parallel port mode.*/ /* Set up ECP parallel port mode.*/
parport_pc_data_forward (port); /* Must be in PS2 mode */ parport_pc_data_forward(port); /* Must be in PS2 mode */
parport_pc_frob_control (port, parport_pc_frob_control(port,
PARPORT_CONTROL_STROBE | PARPORT_CONTROL_STROBE |
PARPORT_CONTROL_AUTOFD, PARPORT_CONTROL_AUTOFD,
0); 0);
r = change_mode (port, ECR_ECP); /* ECP FIFO */ r = change_mode(port, ECR_ECP); /* ECP FIFO */
if (r) printk (KERN_DEBUG "%s: Warning change_mode ECR_ECP failed\n", port->name); if (r)
printk(KERN_DEBUG "%s: Warning change_mode ECR_ECP failed\n",
port->name);
port->physport->ieee1284.phase = IEEE1284_PH_FWD_DATA; port->physport->ieee1284.phase = IEEE1284_PH_FWD_DATA;
/* Write the data to the FIFO. */ /* Write the data to the FIFO. */
...@@ -873,55 +885,54 @@ static size_t parport_pc_ecp_write_block_pio (struct parport *port, ...@@ -873,55 +885,54 @@ static size_t parport_pc_ecp_write_block_pio (struct parport *port,
expire = jiffies + (priv->fifo_depth * (HZ * 4)); expire = jiffies + (priv->fifo_depth * (HZ * 4));
do { do {
/* Wait for the FIFO to empty */ /* Wait for the FIFO to empty */
r = change_mode (port, ECR_PS2); r = change_mode(port, ECR_PS2);
if (r != -EBUSY) { if (r != -EBUSY)
break; break;
} } while (time_before(jiffies, expire));
} while (time_before (jiffies, expire));
if (r == -EBUSY) { if (r == -EBUSY) {
printk (KERN_DEBUG "%s: FIFO is stuck\n", port->name); printk(KERN_DEBUG "%s: FIFO is stuck\n", port->name);
/* Prevent further data transfer. */ /* Prevent further data transfer. */
frob_set_mode (port, ECR_TST); frob_set_mode(port, ECR_TST);
/* Adjust for the contents of the FIFO. */ /* Adjust for the contents of the FIFO. */
for (written -= priv->fifo_depth; ; written++) { for (written -= priv->fifo_depth; ; written++) {
if (inb (ECONTROL (port)) & 0x2) { if (inb(ECONTROL(port)) & 0x2) {
/* Full up. */ /* Full up. */
break; break;
} }
outb (0, FIFO (port)); outb(0, FIFO(port));
} }
/* Reset the FIFO and return to PS2 mode. */ /* Reset the FIFO and return to PS2 mode. */
frob_set_mode (port, ECR_PS2); frob_set_mode(port, ECR_PS2);
/* Host transfer recovery. */ /* Host transfer recovery. */
parport_pc_data_reverse (port); /* Must be in PS2 mode */ parport_pc_data_reverse(port); /* Must be in PS2 mode */
udelay (5); udelay(5);
parport_frob_control (port, PARPORT_CONTROL_INIT, 0); parport_frob_control(port, PARPORT_CONTROL_INIT, 0);
r = parport_wait_peripheral (port, PARPORT_STATUS_PAPEROUT, 0); r = parport_wait_peripheral(port, PARPORT_STATUS_PAPEROUT, 0);
if (r) if (r)
printk (KERN_DEBUG "%s: PE,1 timeout (%d) " printk(KERN_DEBUG "%s: PE,1 timeout (%d) "
"in ecp_write_block_pio\n", port->name, r); "in ecp_write_block_pio\n", port->name, r);
parport_frob_control (port, parport_frob_control(port,
PARPORT_CONTROL_INIT, PARPORT_CONTROL_INIT,
PARPORT_CONTROL_INIT); PARPORT_CONTROL_INIT);
r = parport_wait_peripheral (port, r = parport_wait_peripheral(port,
PARPORT_STATUS_PAPEROUT, PARPORT_STATUS_PAPEROUT,
PARPORT_STATUS_PAPEROUT); PARPORT_STATUS_PAPEROUT);
if (r) if (r)
printk (KERN_DEBUG "%s: PE,2 timeout (%d) " printk(KERN_DEBUG "%s: PE,2 timeout (%d) "
"in ecp_write_block_pio\n", port->name, r); "in ecp_write_block_pio\n", port->name, r);
} }
r = parport_wait_peripheral (port, r = parport_wait_peripheral(port,
PARPORT_STATUS_BUSY, PARPORT_STATUS_BUSY,
PARPORT_STATUS_BUSY); PARPORT_STATUS_BUSY);
if(r) if (r)
printk (KERN_DEBUG printk(KERN_DEBUG
"%s: BUSY timeout (%d) in ecp_write_block_pio\n", "%s: BUSY timeout (%d) in ecp_write_block_pio\n",
port->name, r); port->name, r);
...@@ -931,7 +942,7 @@ static size_t parport_pc_ecp_write_block_pio (struct parport *port, ...@@ -931,7 +942,7 @@ static size_t parport_pc_ecp_write_block_pio (struct parport *port,
} }
#if 0 #if 0
static size_t parport_pc_ecp_read_block_pio (struct parport *port, static size_t parport_pc_ecp_read_block_pio(struct parport *port,
void *buf, size_t length, void *buf, size_t length,
int flags) int flags)
{ {
...@@ -944,13 +955,13 @@ static size_t parport_pc_ecp_read_block_pio (struct parport *port, ...@@ -944,13 +955,13 @@ static size_t parport_pc_ecp_read_block_pio (struct parport *port,
char *bufp = buf; char *bufp = buf;
port = port->physport; port = port->physport;
DPRINTK (KERN_DEBUG "parport_pc: parport_pc_ecp_read_block_pio\n"); DPRINTK(KERN_DEBUG "parport_pc: parport_pc_ecp_read_block_pio\n");
dump_parport_state ("enter fcn", port); dump_parport_state("enter fcn", port);
/* Special case: a timeout of zero means we cannot call schedule(). /* Special case: a timeout of zero means we cannot call schedule().
* Also if O_NONBLOCK is set then use the default implementation. */ * Also if O_NONBLOCK is set then use the default implementation. */
if (port->cad->timeout <= PARPORT_INACTIVITY_O_NONBLOCK) if (port->cad->timeout <= PARPORT_INACTIVITY_O_NONBLOCK)
return parport_ieee1284_ecp_read_data (port, buf, return parport_ieee1284_ecp_read_data(port, buf,
length, flags); length, flags);
if (port->ieee1284.mode == IEEE1284_MODE_ECPRLE) { if (port->ieee1284.mode == IEEE1284_MODE_ECPRLE) {
...@@ -966,87 +977,90 @@ dump_parport_state ("enter fcn", port); ...@@ -966,87 +977,90 @@ dump_parport_state ("enter fcn", port);
* go through software emulation. Otherwise we may have to throw * go through software emulation. Otherwise we may have to throw
* away data. */ * away data. */
if (length < fifofull) if (length < fifofull)
return parport_ieee1284_ecp_read_data (port, buf, return parport_ieee1284_ecp_read_data(port, buf,
length, flags); length, flags);
if (port->ieee1284.phase != IEEE1284_PH_REV_IDLE) { if (port->ieee1284.phase != IEEE1284_PH_REV_IDLE) {
/* change to reverse-idle phase (must be in forward-idle) */ /* change to reverse-idle phase (must be in forward-idle) */
/* Event 38: Set nAutoFd low (also make sure nStrobe is high) */ /* Event 38: Set nAutoFd low (also make sure nStrobe is high) */
parport_frob_control (port, parport_frob_control(port,
PARPORT_CONTROL_AUTOFD PARPORT_CONTROL_AUTOFD
| PARPORT_CONTROL_STROBE, | PARPORT_CONTROL_STROBE,
PARPORT_CONTROL_AUTOFD); PARPORT_CONTROL_AUTOFD);
parport_pc_data_reverse (port); /* Must be in PS2 mode */ parport_pc_data_reverse(port); /* Must be in PS2 mode */
udelay (5); udelay(5);
/* Event 39: Set nInit low to initiate bus reversal */ /* Event 39: Set nInit low to initiate bus reversal */
parport_frob_control (port, parport_frob_control(port,
PARPORT_CONTROL_INIT, PARPORT_CONTROL_INIT,
0); 0);
/* Event 40: Wait for nAckReverse (PError) to go low */ /* Event 40: Wait for nAckReverse (PError) to go low */
r = parport_wait_peripheral (port, PARPORT_STATUS_PAPEROUT, 0); r = parport_wait_peripheral(port, PARPORT_STATUS_PAPEROUT, 0);
if (r) { if (r) {
printk (KERN_DEBUG "%s: PE timeout Event 40 (%d) " printk(KERN_DEBUG "%s: PE timeout Event 40 (%d) "
"in ecp_read_block_pio\n", port->name, r); "in ecp_read_block_pio\n", port->name, r);
return 0; return 0;
} }
} }
/* Set up ECP FIFO mode.*/ /* Set up ECP FIFO mode.*/
/* parport_pc_frob_control (port, /* parport_pc_frob_control(port,
PARPORT_CONTROL_STROBE | PARPORT_CONTROL_STROBE |
PARPORT_CONTROL_AUTOFD, PARPORT_CONTROL_AUTOFD,
PARPORT_CONTROL_AUTOFD); */ PARPORT_CONTROL_AUTOFD); */
r = change_mode (port, ECR_ECP); /* ECP FIFO */ r = change_mode(port, ECR_ECP); /* ECP FIFO */
if (r) printk (KERN_DEBUG "%s: Warning change_mode ECR_ECP failed\n", port->name); if (r)
printk(KERN_DEBUG "%s: Warning change_mode ECR_ECP failed\n",
port->name);
port->ieee1284.phase = IEEE1284_PH_REV_DATA; port->ieee1284.phase = IEEE1284_PH_REV_DATA;
/* the first byte must be collected manually */ /* the first byte must be collected manually */
dump_parport_state ("pre 43", port); dump_parport_state("pre 43", port);
/* Event 43: Wait for nAck to go low */ /* Event 43: Wait for nAck to go low */
r = parport_wait_peripheral (port, PARPORT_STATUS_ACK, 0); r = parport_wait_peripheral(port, PARPORT_STATUS_ACK, 0);
if (r) { if (r) {
/* timed out while reading -- no data */ /* timed out while reading -- no data */
printk (KERN_DEBUG "PIO read timed out (initial byte)\n"); printk(KERN_DEBUG "PIO read timed out (initial byte)\n");
goto out_no_data; goto out_no_data;
} }
/* read byte */ /* read byte */
*bufp++ = inb (DATA (port)); *bufp++ = inb(DATA(port));
left--; left--;
dump_parport_state ("43-44", port); dump_parport_state("43-44", port);
/* Event 44: nAutoFd (HostAck) goes high to acknowledge */ /* Event 44: nAutoFd (HostAck) goes high to acknowledge */
parport_pc_frob_control (port, parport_pc_frob_control(port,
PARPORT_CONTROL_AUTOFD, PARPORT_CONTROL_AUTOFD,
0); 0);
dump_parport_state ("pre 45", port); dump_parport_state("pre 45", port);
/* Event 45: Wait for nAck to go high */ /* Event 45: Wait for nAck to go high */
/* r = parport_wait_peripheral (port, PARPORT_STATUS_ACK, PARPORT_STATUS_ACK); */ /* r = parport_wait_peripheral(port, PARPORT_STATUS_ACK,
dump_parport_state ("post 45", port); PARPORT_STATUS_ACK); */
r = 0; dump_parport_state("post 45", port);
r = 0;
if (r) { if (r) {
/* timed out while waiting for peripheral to respond to ack */ /* timed out while waiting for peripheral to respond to ack */
printk (KERN_DEBUG "ECP PIO read timed out (waiting for nAck)\n"); printk(KERN_DEBUG "ECP PIO read timed out (waiting for nAck)\n");
/* keep hold of the byte we've got already */ /* keep hold of the byte we've got already */
goto out_no_data; goto out_no_data;
} }
/* Event 46: nAutoFd (HostAck) goes low to accept more data */ /* Event 46: nAutoFd (HostAck) goes low to accept more data */
parport_pc_frob_control (port, parport_pc_frob_control(port,
PARPORT_CONTROL_AUTOFD, PARPORT_CONTROL_AUTOFD,
PARPORT_CONTROL_AUTOFD); PARPORT_CONTROL_AUTOFD);
dump_parport_state ("rev idle", port); dump_parport_state("rev idle", port);
/* Do the transfer. */ /* Do the transfer. */
while (left > fifofull) { while (left > fifofull) {
int ret; int ret;
unsigned long expire = jiffies + port->cad->timeout; unsigned long expire = jiffies + port->cad->timeout;
unsigned char ecrval = inb (ECONTROL (port)); unsigned char ecrval = inb(ECONTROL(port));
if (need_resched() && time_before (jiffies, expire)) if (need_resched() && time_before(jiffies, expire))
/* Can't yield the port. */ /* Can't yield the port. */
schedule (); schedule();
/* At this point, the FIFO may already be full. In /* At this point, the FIFO may already be full. In
* that case ECP is already holding back the * that case ECP is already holding back the
...@@ -1056,34 +1070,35 @@ dump_parport_state ("rev idle", port); ...@@ -1056,34 +1070,35 @@ dump_parport_state ("rev idle", port);
if (ecrval & 0x01) { if (ecrval & 0x01) {
/* FIFO is empty. Wait for interrupt. */ /* FIFO is empty. Wait for interrupt. */
dump_parport_state ("FIFO empty", port); dump_parport_state("FIFO empty", port);
/* Anyone else waiting for the port? */ /* Anyone else waiting for the port? */
if (port->waithead) { if (port->waithead) {
printk (KERN_DEBUG "Somebody wants the port\n"); printk(KERN_DEBUG "Somebody wants the port\n");
break; break;
} }
/* Clear serviceIntr */ /* Clear serviceIntr */
ECR_WRITE (port, ecrval & ~(1<<2)); ECR_WRITE(port, ecrval & ~(1<<2));
false_alarm: false_alarm:
dump_parport_state ("waiting", port); dump_parport_state("waiting", port);
ret = parport_wait_event (port, HZ); ret = parport_wait_event(port, HZ);
DPRINTK (KERN_DEBUG "parport_wait_event returned %d\n", ret); DPRINTK(KERN_DEBUG "parport_wait_event returned %d\n",
ret);
if (ret < 0) if (ret < 0)
break; break;
ret = 0; ret = 0;
if (!time_before (jiffies, expire)) { if (!time_before(jiffies, expire)) {
/* Timed out. */ /* Timed out. */
dump_parport_state ("timeout", port); dump_parport_state("timeout", port);
printk (KERN_DEBUG "PIO read timed out\n"); printk(KERN_DEBUG "PIO read timed out\n");
break; break;
} }
ecrval = inb (ECONTROL (port)); ecrval = inb(ECONTROL(port));
if (!(ecrval & (1<<2))) { if (!(ecrval & (1<<2))) {
if (need_resched() && if (need_resched() &&
time_before (jiffies, expire)) { time_before(jiffies, expire)) {
schedule (); schedule();
} }
goto false_alarm; goto false_alarm;
} }
...@@ -1097,42 +1112,42 @@ dump_parport_state ("timeout", port); ...@@ -1097,42 +1112,42 @@ dump_parport_state ("timeout", port);
if (ecrval & 0x02) { if (ecrval & 0x02) {
/* FIFO is full. */ /* FIFO is full. */
dump_parport_state ("FIFO full", port); dump_parport_state("FIFO full", port);
insb (fifo, bufp, fifo_depth); insb(fifo, bufp, fifo_depth);
bufp += fifo_depth; bufp += fifo_depth;
left -= fifo_depth; left -= fifo_depth;
continue; continue;
} }
DPRINTK (KERN_DEBUG "*** ecp_read_block_pio: reading one byte from the FIFO\n"); DPRINTK(KERN_DEBUG "*** ecp_read_block_pio: reading one byte from the FIFO\n");
/* FIFO not filled. We will cycle this loop for a while /* FIFO not filled. We will cycle this loop for a while
* and either the peripheral will fill it faster, * and either the peripheral will fill it faster,
* tripping a fast empty with insb, or we empty it. */ * tripping a fast empty with insb, or we empty it. */
*bufp++ = inb (fifo); *bufp++ = inb(fifo);
left--; left--;
} }
/* scoop up anything left in the FIFO */ /* scoop up anything left in the FIFO */
while (left && !(inb (ECONTROL (port) & 0x01))) { while (left && !(inb(ECONTROL(port) & 0x01))) {
*bufp++ = inb (fifo); *bufp++ = inb(fifo);
left--; left--;
} }
port->ieee1284.phase = IEEE1284_PH_REV_IDLE; port->ieee1284.phase = IEEE1284_PH_REV_IDLE;
dump_parport_state ("rev idle2", port); dump_parport_state("rev idle2", port);
out_no_data: out_no_data:
/* Go to forward idle mode to shut the peripheral up (event 47). */ /* Go to forward idle mode to shut the peripheral up (event 47). */
parport_frob_control (port, PARPORT_CONTROL_INIT, PARPORT_CONTROL_INIT); parport_frob_control(port, PARPORT_CONTROL_INIT, PARPORT_CONTROL_INIT);
/* event 49: PError goes high */ /* event 49: PError goes high */
r = parport_wait_peripheral (port, r = parport_wait_peripheral(port,
PARPORT_STATUS_PAPEROUT, PARPORT_STATUS_PAPEROUT,
PARPORT_STATUS_PAPEROUT); PARPORT_STATUS_PAPEROUT);
if (r) { if (r) {
printk (KERN_DEBUG printk(KERN_DEBUG
"%s: PE timeout FWDIDLE (%d) in ecp_read_block_pio\n", "%s: PE timeout FWDIDLE (%d) in ecp_read_block_pio\n",
port->name, r); port->name, r);
} }
...@@ -1141,14 +1156,14 @@ dump_parport_state ("rev idle2", port); ...@@ -1141,14 +1156,14 @@ dump_parport_state ("rev idle2", port);
/* Finish up. */ /* Finish up. */
{ {
int lost = get_fifo_residue (port); int lost = get_fifo_residue(port);
if (lost) if (lost)
/* Shouldn't happen with compliant peripherals. */ /* Shouldn't happen with compliant peripherals. */
printk (KERN_DEBUG "%s: DATA LOSS (%d bytes)!\n", printk(KERN_DEBUG "%s: DATA LOSS (%d bytes)!\n",
port->name, lost); port->name, lost);
} }
dump_parport_state ("fwd idle", port); dump_parport_state("fwd idle", port);
return length - left; return length - left;
} }
#endif /* 0 */ #endif /* 0 */
...@@ -1164,8 +1179,7 @@ dump_parport_state ("fwd idle", port); ...@@ -1164,8 +1179,7 @@ dump_parport_state ("fwd idle", port);
/* GCC is not inlining extern inline function later overwriten to non-inline, /* GCC is not inlining extern inline function later overwriten to non-inline,
so we use outlined_ variants here. */ so we use outlined_ variants here. */
static const struct parport_operations parport_pc_ops = static const struct parport_operations parport_pc_ops = {
{
.write_data = parport_pc_write_data, .write_data = parport_pc_write_data,
.read_data = parport_pc_read_data, .read_data = parport_pc_read_data,
...@@ -1205,45 +1219,51 @@ static const struct parport_operations parport_pc_ops = ...@@ -1205,45 +1219,51 @@ static const struct parport_operations parport_pc_ops =
/* Super-IO chipset detection, Winbond, SMSC */ /* Super-IO chipset detection, Winbond, SMSC */
static void __devinit show_parconfig_smsc37c669(int io, int key) static void __devinit show_parconfig_smsc37c669(int io, int key)
{ {
int cr1,cr4,cra,cr23,cr26,cr27,i=0; int cr1, cr4, cra, cr23, cr26, cr27, i = 0;
static const char *const modes[]={ static const char *const modes[] = {
"SPP and Bidirectional (PS/2)", "SPP and Bidirectional (PS/2)",
"EPP and SPP", "EPP and SPP",
"ECP", "ECP",
"ECP and EPP" }; "ECP and EPP" };
outb(key,io); outb(key, io);
outb(key,io); outb(key, io);
outb(1,io); outb(1, io);
cr1=inb(io+1); cr1 = inb(io + 1);
outb(4,io); outb(4, io);
cr4=inb(io+1); cr4 = inb(io + 1);
outb(0x0a,io); outb(0x0a, io);
cra=inb(io+1); cra = inb(io + 1);
outb(0x23,io); outb(0x23, io);
cr23=inb(io+1); cr23 = inb(io + 1);
outb(0x26,io); outb(0x26, io);
cr26=inb(io+1); cr26 = inb(io + 1);
outb(0x27,io); outb(0x27, io);
cr27=inb(io+1); cr27 = inb(io + 1);
outb(0xaa,io); outb(0xaa, io);
if (verbose_probing) { if (verbose_probing) {
printk (KERN_INFO "SMSC 37c669 LPT Config: cr_1=0x%02x, 4=0x%02x, " printk(KERN_INFO
"SMSC 37c669 LPT Config: cr_1=0x%02x, 4=0x%02x, "
"A=0x%2x, 23=0x%02x, 26=0x%02x, 27=0x%02x\n", "A=0x%2x, 23=0x%02x, 26=0x%02x, 27=0x%02x\n",
cr1,cr4,cra,cr23,cr26,cr27); cr1, cr4, cra, cr23, cr26, cr27);
/* The documentation calls DMA and IRQ-Lines by letters, so /* The documentation calls DMA and IRQ-Lines by letters, so
the board maker can/will wire them the board maker can/will wire them
appropriately/randomly... G=reserved H=IDE-irq, */ appropriately/randomly... G=reserved H=IDE-irq, */
printk (KERN_INFO "SMSC LPT Config: io=0x%04x, irq=%c, dma=%c, " printk(KERN_INFO
"fifo threshold=%d\n", cr23*4, "SMSC LPT Config: io=0x%04x, irq=%c, dma=%c, fifo threshold=%d\n",
(cr27 &0x0f) ? 'A'-1+(cr27 &0x0f): '-', cr23 * 4,
(cr26 &0x0f) ? 'A'-1+(cr26 &0x0f): '-', cra & 0x0f); (cr27 & 0x0f) ? 'A' - 1 + (cr27 & 0x0f) : '-',
(cr26 & 0x0f) ? 'A' - 1 + (cr26 & 0x0f) : '-',
cra & 0x0f);
printk(KERN_INFO "SMSC LPT Config: enabled=%s power=%s\n", printk(KERN_INFO "SMSC LPT Config: enabled=%s power=%s\n",
(cr23*4 >=0x100) ?"yes":"no", (cr1 & 4) ? "yes" : "no"); (cr23 * 4 >= 0x100) ? "yes" : "no",
printk(KERN_INFO "SMSC LPT Config: Port mode=%s, EPP version =%s\n", (cr1 & 4) ? "yes" : "no");
(cr1 & 0x08 ) ? "Standard mode only (SPP)" : modes[cr4 & 0x03], printk(KERN_INFO
"SMSC LPT Config: Port mode=%s, EPP version =%s\n",
(cr1 & 0x08) ? "Standard mode only (SPP)"
: modes[cr4 & 0x03],
(cr4 & 0x40) ? "1.7" : "1.9"); (cr4 & 0x40) ? "1.7" : "1.9");
} }
...@@ -1258,7 +1278,7 @@ static void __devinit show_parconfig_smsc37c669(int io, int key) ...@@ -1258,7 +1278,7 @@ static void __devinit show_parconfig_smsc37c669(int io, int key)
printk(KERN_INFO "Super-IO: too many chips!\n"); printk(KERN_INFO "Super-IO: too many chips!\n");
} else { } else {
int d; int d;
switch (cr23*4) { switch (cr23 * 4) {
case 0x3bc: case 0x3bc:
superios[i].io = 0x3bc; superios[i].io = 0x3bc;
superios[i].irq = 7; superios[i].irq = 7;
...@@ -1271,11 +1291,11 @@ static void __devinit show_parconfig_smsc37c669(int io, int key) ...@@ -1271,11 +1291,11 @@ static void __devinit show_parconfig_smsc37c669(int io, int key)
superios[i].io = 0x278; superios[i].io = 0x278;
superios[i].irq = 5; superios[i].irq = 5;
} }
d=(cr26 &0x0f); d = (cr26 & 0x0f);
if((d==1) || (d==3)) if (d == 1 || d == 3)
superios[i].dma= d; superios[i].dma = d;
else else
superios[i].dma= PARPORT_DMA_NONE; superios[i].dma = PARPORT_DMA_NONE;
} }
} }
} }
...@@ -1283,7 +1303,7 @@ static void __devinit show_parconfig_smsc37c669(int io, int key) ...@@ -1283,7 +1303,7 @@ static void __devinit show_parconfig_smsc37c669(int io, int key)
static void __devinit show_parconfig_winbond(int io, int key) static void __devinit show_parconfig_winbond(int io, int key)
{ {
int cr30,cr60,cr61,cr70,cr74,crf0,i=0; int cr30, cr60, cr61, cr70, cr74, crf0, i = 0;
static const char *const modes[] = { static const char *const modes[] = {
"Standard (SPP) and Bidirectional(PS/2)", /* 0 */ "Standard (SPP) and Bidirectional(PS/2)", /* 0 */
"EPP-1.9 and SPP", "EPP-1.9 and SPP",
...@@ -1300,36 +1320,39 @@ static void __devinit show_parconfig_winbond(int io, int key) ...@@ -1300,36 +1320,39 @@ static void __devinit show_parconfig_winbond(int io, int key)
/* The registers are called compatible-PnP because the /* The registers are called compatible-PnP because the
register layout is modelled after ISA-PnP, the access register layout is modelled after ISA-PnP, the access
method is just another ... */ method is just another ... */
outb(key,io); outb(key, io);
outb(key,io); outb(key, io);
outb(0x07,io); /* Register 7: Select Logical Device */ outb(0x07, io); /* Register 7: Select Logical Device */
outb(0x01,io+1); /* LD1 is Parallel Port */ outb(0x01, io + 1); /* LD1 is Parallel Port */
outb(0x30,io); outb(0x30, io);
cr30=inb(io+1); cr30 = inb(io + 1);
outb(0x60,io); outb(0x60, io);
cr60=inb(io+1); cr60 = inb(io + 1);
outb(0x61,io); outb(0x61, io);
cr61=inb(io+1); cr61 = inb(io + 1);
outb(0x70,io); outb(0x70, io);
cr70=inb(io+1); cr70 = inb(io + 1);
outb(0x74,io); outb(0x74, io);
cr74=inb(io+1); cr74 = inb(io + 1);
outb(0xf0,io); outb(0xf0, io);
crf0=inb(io+1); crf0 = inb(io + 1);
outb(0xaa,io); outb(0xaa, io);
if (verbose_probing) { if (verbose_probing) {
printk(KERN_INFO "Winbond LPT Config: cr_30=%02x 60,61=%02x%02x " printk(KERN_INFO
"70=%02x 74=%02x, f0=%02x\n", cr30,cr60,cr61,cr70,cr74,crf0); "Winbond LPT Config: cr_30=%02x 60,61=%02x%02x 70=%02x 74=%02x, f0=%02x\n",
cr30, cr60, cr61, cr70, cr74, crf0);
printk(KERN_INFO "Winbond LPT Config: active=%s, io=0x%02x%02x irq=%d, ", printk(KERN_INFO "Winbond LPT Config: active=%s, io=0x%02x%02x irq=%d, ",
(cr30 & 0x01) ? "yes":"no", cr60,cr61,cr70&0x0f ); (cr30 & 0x01) ? "yes" : "no", cr60, cr61, cr70 & 0x0f);
if ((cr74 & 0x07) > 3) if ((cr74 & 0x07) > 3)
printk("dma=none\n"); printk("dma=none\n");
else else
printk("dma=%d\n",cr74 & 0x07); printk("dma=%d\n", cr74 & 0x07);
printk(KERN_INFO "Winbond LPT Config: irqtype=%s, ECP fifo threshold=%d\n", printk(KERN_INFO
"Winbond LPT Config: irqtype=%s, ECP fifo threshold=%d\n",
irqtypes[crf0>>7], (crf0>>3)&0x0f); irqtypes[crf0>>7], (crf0>>3)&0x0f);
printk(KERN_INFO "Winbond LPT Config: Port mode=%s\n", modes[crf0 & 0x07]); printk(KERN_INFO "Winbond LPT Config: Port mode=%s\n",
modes[crf0 & 0x07]);
} }
if (cr30 & 0x01) { /* the settings can be interrogated later ... */ if (cr30 & 0x01) { /* the settings can be interrogated later ... */
...@@ -1346,32 +1369,49 @@ static void __devinit show_parconfig_winbond(int io, int key) ...@@ -1346,32 +1369,49 @@ static void __devinit show_parconfig_winbond(int io, int key)
} }
} }
static void __devinit decode_winbond(int efer, int key, int devid, int devrev, int oldid) static void __devinit decode_winbond(int efer, int key, int devid,
int devrev, int oldid)
{ {
const char *type = "unknown"; const char *type = "unknown";
int id,progif=2; int id, progif = 2;
if (devid == devrev) if (devid == devrev)
/* simple heuristics, we happened to read some /* simple heuristics, we happened to read some
non-winbond register */ non-winbond register */
return; return;
id=(devid<<8) | devrev; id = (devid << 8) | devrev;
/* Values are from public data sheets pdf files, I can just /* Values are from public data sheets pdf files, I can just
confirm 83977TF is correct :-) */ confirm 83977TF is correct :-) */
if (id == 0x9771) type="83977F/AF"; if (id == 0x9771)
else if (id == 0x9773) type="83977TF / SMSC 97w33x/97w34x"; type = "83977F/AF";
else if (id == 0x9774) type="83977ATF"; else if (id == 0x9773)
else if ((id & ~0x0f) == 0x5270) type="83977CTF / SMSC 97w36x"; type = "83977TF / SMSC 97w33x/97w34x";
else if ((id & ~0x0f) == 0x52f0) type="83977EF / SMSC 97w35x"; else if (id == 0x9774)
else if ((id & ~0x0f) == 0x5210) type="83627"; type = "83977ATF";
else if ((id & ~0x0f) == 0x6010) type="83697HF"; else if ((id & ~0x0f) == 0x5270)
else if ((oldid &0x0f ) == 0x0a) { type="83877F"; progif=1;} type = "83977CTF / SMSC 97w36x";
else if ((oldid &0x0f ) == 0x0b) { type="83877AF"; progif=1;} else if ((id & ~0x0f) == 0x52f0)
else if ((oldid &0x0f ) == 0x0c) { type="83877TF"; progif=1;} type = "83977EF / SMSC 97w35x";
else if ((oldid &0x0f ) == 0x0d) { type="83877ATF"; progif=1;} else if ((id & ~0x0f) == 0x5210)
else progif=0; type = "83627";
else if ((id & ~0x0f) == 0x6010)
type = "83697HF";
else if ((oldid & 0x0f) == 0x0a) {
type = "83877F";
progif = 1;
} else if ((oldid & 0x0f) == 0x0b) {
type = "83877AF";
progif = 1;
} else if ((oldid & 0x0f) == 0x0c) {
type = "83877TF";
progif = 1;
} else if ((oldid & 0x0f) == 0x0d) {
type = "83877ATF";
progif = 1;
} else
progif = 0;
if (verbose_probing) if (verbose_probing)
printk(KERN_INFO "Winbond chip at EFER=0x%x key=0x%02x " printk(KERN_INFO "Winbond chip at EFER=0x%x key=0x%02x "
...@@ -1379,7 +1419,7 @@ static void __devinit decode_winbond(int efer, int key, int devid, int devrev, i ...@@ -1379,7 +1419,7 @@ static void __devinit decode_winbond(int efer, int key, int devid, int devrev, i
efer, key, devid, devrev, oldid, type); efer, key, devid, devrev, oldid, type);
if (progif == 2) if (progif == 2)
show_parconfig_winbond(efer,key); show_parconfig_winbond(efer, key);
} }
static void __devinit decode_smsc(int efer, int key, int devid, int devrev) static void __devinit decode_smsc(int efer, int key, int devid, int devrev)
...@@ -1393,13 +1433,18 @@ static void __devinit decode_smsc(int efer, int key, int devid, int devrev) ...@@ -1393,13 +1433,18 @@ static void __devinit decode_smsc(int efer, int key, int devid, int devrev)
non-smsc register */ non-smsc register */
return; return;
func=NULL; func = NULL;
id=(devid<<8) | devrev; id = (devid << 8) | devrev;
if (id==0x0302) {type="37c669"; func=show_parconfig_smsc37c669;} if (id == 0x0302) {
else if (id==0x6582) type="37c665IR"; type = "37c669";
else if (devid==0x65) type="37c665GT"; func = show_parconfig_smsc37c669;
else if (devid==0x66) type="37c666GT"; } else if (id == 0x6582)
type = "37c665IR";
else if (devid == 0x65)
type = "37c665GT";
else if (devid == 0x66)
type = "37c666GT";
if (verbose_probing) if (verbose_probing)
printk(KERN_INFO "SMSC chip at EFER=0x%x " printk(KERN_INFO "SMSC chip at EFER=0x%x "
...@@ -1407,138 +1452,138 @@ static void __devinit decode_smsc(int efer, int key, int devid, int devrev) ...@@ -1407,138 +1452,138 @@ static void __devinit decode_smsc(int efer, int key, int devid, int devrev)
efer, key, devid, devrev, type); efer, key, devid, devrev, type);
if (func) if (func)
func(efer,key); func(efer, key);
} }
static void __devinit winbond_check(int io, int key) static void __devinit winbond_check(int io, int key)
{ {
int devid,devrev,oldid,x_devid,x_devrev,x_oldid; int devid, devrev, oldid, x_devid, x_devrev, x_oldid;
if (!request_region(io, 3, __func__)) if (!request_region(io, 3, __func__))
return; return;
/* First probe without key */ /* First probe without key */
outb(0x20,io); outb(0x20, io);
x_devid=inb(io+1); x_devid = inb(io + 1);
outb(0x21,io); outb(0x21, io);
x_devrev=inb(io+1); x_devrev = inb(io + 1);
outb(0x09,io); outb(0x09, io);
x_oldid=inb(io+1); x_oldid = inb(io + 1);
outb(key,io); outb(key, io);
outb(key,io); /* Write Magic Sequence to EFER, extended outb(key, io); /* Write Magic Sequence to EFER, extended
funtion enable register */ funtion enable register */
outb(0x20,io); /* Write EFIR, extended function index register */ outb(0x20, io); /* Write EFIR, extended function index register */
devid=inb(io+1); /* Read EFDR, extended function data register */ devid = inb(io + 1); /* Read EFDR, extended function data register */
outb(0x21,io); outb(0x21, io);
devrev=inb(io+1); devrev = inb(io + 1);
outb(0x09,io); outb(0x09, io);
oldid=inb(io+1); oldid = inb(io + 1);
outb(0xaa,io); /* Magic Seal */ outb(0xaa, io); /* Magic Seal */
if ((x_devid == devid) && (x_devrev == devrev) && (x_oldid == oldid)) if ((x_devid == devid) && (x_devrev == devrev) && (x_oldid == oldid))
goto out; /* protection against false positives */ goto out; /* protection against false positives */
decode_winbond(io,key,devid,devrev,oldid); decode_winbond(io, key, devid, devrev, oldid);
out: out:
release_region(io, 3); release_region(io, 3);
} }
static void __devinit winbond_check2(int io,int key) static void __devinit winbond_check2(int io, int key)
{ {
int devid,devrev,oldid,x_devid,x_devrev,x_oldid; int devid, devrev, oldid, x_devid, x_devrev, x_oldid;
if (!request_region(io, 3, __func__)) if (!request_region(io, 3, __func__))
return; return;
/* First probe without the key */ /* First probe without the key */
outb(0x20,io+2); outb(0x20, io + 2);
x_devid=inb(io+2); x_devid = inb(io + 2);
outb(0x21,io+1); outb(0x21, io + 1);
x_devrev=inb(io+2); x_devrev = inb(io + 2);
outb(0x09,io+1); outb(0x09, io + 1);
x_oldid=inb(io+2); x_oldid = inb(io + 2);
outb(key,io); /* Write Magic Byte to EFER, extended outb(key, io); /* Write Magic Byte to EFER, extended
funtion enable register */ funtion enable register */
outb(0x20,io+2); /* Write EFIR, extended function index register */ outb(0x20, io + 2); /* Write EFIR, extended function index register */
devid=inb(io+2); /* Read EFDR, extended function data register */ devid = inb(io + 2); /* Read EFDR, extended function data register */
outb(0x21,io+1); outb(0x21, io + 1);
devrev=inb(io+2); devrev = inb(io + 2);
outb(0x09,io+1); outb(0x09, io + 1);
oldid=inb(io+2); oldid = inb(io + 2);
outb(0xaa,io); /* Magic Seal */ outb(0xaa, io); /* Magic Seal */
if ((x_devid == devid) && (x_devrev == devrev) && (x_oldid == oldid)) if (x_devid == devid && x_devrev == devrev && x_oldid == oldid)
goto out; /* protection against false positives */ goto out; /* protection against false positives */
decode_winbond(io,key,devid,devrev,oldid); decode_winbond(io, key, devid, devrev, oldid);
out: out:
release_region(io, 3); release_region(io, 3);
} }
static void __devinit smsc_check(int io, int key) static void __devinit smsc_check(int io, int key)
{ {
int id,rev,oldid,oldrev,x_id,x_rev,x_oldid,x_oldrev; int id, rev, oldid, oldrev, x_id, x_rev, x_oldid, x_oldrev;
if (!request_region(io, 3, __func__)) if (!request_region(io, 3, __func__))
return; return;
/* First probe without the key */ /* First probe without the key */
outb(0x0d,io); outb(0x0d, io);
x_oldid=inb(io+1); x_oldid = inb(io + 1);
outb(0x0e,io); outb(0x0e, io);
x_oldrev=inb(io+1); x_oldrev = inb(io + 1);
outb(0x20,io); outb(0x20, io);
x_id=inb(io+1); x_id = inb(io + 1);
outb(0x21,io); outb(0x21, io);
x_rev=inb(io+1); x_rev = inb(io + 1);
outb(key,io); outb(key, io);
outb(key,io); /* Write Magic Sequence to EFER, extended outb(key, io); /* Write Magic Sequence to EFER, extended
funtion enable register */ funtion enable register */
outb(0x0d,io); /* Write EFIR, extended function index register */ outb(0x0d, io); /* Write EFIR, extended function index register */
oldid=inb(io+1); /* Read EFDR, extended function data register */ oldid = inb(io + 1); /* Read EFDR, extended function data register */
outb(0x0e,io); outb(0x0e, io);
oldrev=inb(io+1); oldrev = inb(io + 1);
outb(0x20,io); outb(0x20, io);
id=inb(io+1); id = inb(io + 1);
outb(0x21,io); outb(0x21, io);
rev=inb(io+1); rev = inb(io + 1);
outb(0xaa,io); /* Magic Seal */ outb(0xaa, io); /* Magic Seal */
if ((x_id == id) && (x_oldrev == oldrev) && if (x_id == id && x_oldrev == oldrev &&
(x_oldid == oldid) && (x_rev == rev)) x_oldid == oldid && x_rev == rev)
goto out; /* protection against false positives */ goto out; /* protection against false positives */
decode_smsc(io,key,oldid,oldrev); decode_smsc(io, key, oldid, oldrev);
out: out:
release_region(io, 3); release_region(io, 3);
} }
static void __devinit detect_and_report_winbond (void) static void __devinit detect_and_report_winbond(void)
{ {
if (verbose_probing) if (verbose_probing)
printk(KERN_DEBUG "Winbond Super-IO detection, now testing ports 3F0,370,250,4E,2E ...\n"); printk(KERN_DEBUG "Winbond Super-IO detection, now testing ports 3F0,370,250,4E,2E ...\n");
winbond_check(0x3f0,0x87); winbond_check(0x3f0, 0x87);
winbond_check(0x370,0x87); winbond_check(0x370, 0x87);
winbond_check(0x2e ,0x87); winbond_check(0x2e , 0x87);
winbond_check(0x4e ,0x87); winbond_check(0x4e , 0x87);
winbond_check(0x3f0,0x86); winbond_check(0x3f0, 0x86);
winbond_check2(0x250,0x88); winbond_check2(0x250, 0x88);
winbond_check2(0x250,0x89); winbond_check2(0x250, 0x89);
} }
static void __devinit detect_and_report_smsc (void) static void __devinit detect_and_report_smsc(void)
{ {
if (verbose_probing) if (verbose_probing)
printk(KERN_DEBUG "SMSC Super-IO detection, now testing Ports 2F0, 370 ...\n"); printk(KERN_DEBUG "SMSC Super-IO detection, now testing Ports 2F0, 370 ...\n");
smsc_check(0x3f0,0x55); smsc_check(0x3f0, 0x55);
smsc_check(0x370,0x55); smsc_check(0x370, 0x55);
smsc_check(0x3f0,0x44); smsc_check(0x3f0, 0x44);
smsc_check(0x370,0x44); smsc_check(0x370, 0x44);
} }
static void __devinit detect_and_report_it87(void) static void __devinit detect_and_report_it87(void)
...@@ -1573,7 +1618,7 @@ static void __devinit detect_and_report_it87(void) ...@@ -1573,7 +1618,7 @@ static void __devinit detect_and_report_it87(void)
} }
#endif /* CONFIG_PARPORT_PC_SUPERIO */ #endif /* CONFIG_PARPORT_PC_SUPERIO */
static int get_superio_dma (struct parport *p) static int get_superio_dma(struct parport *p)
{ {
int i = 0; int i = 0;
...@@ -1584,7 +1629,7 @@ static int get_superio_dma (struct parport *p) ...@@ -1584,7 +1629,7 @@ static int get_superio_dma (struct parport *p)
return PARPORT_DMA_NONE; return PARPORT_DMA_NONE;
} }
static int get_superio_irq (struct parport *p) static int get_superio_irq(struct parport *p)
{ {
int i = 0; int i = 0;
...@@ -1621,19 +1666,19 @@ static int parport_SPP_supported(struct parport *pb) ...@@ -1621,19 +1666,19 @@ static int parport_SPP_supported(struct parport *pb)
/* Do a simple read-write test to make sure the port exists. */ /* Do a simple read-write test to make sure the port exists. */
w = 0xc; w = 0xc;
outb (w, CONTROL (pb)); outb(w, CONTROL(pb));
/* Is there a control register that we can read from? Some /* Is there a control register that we can read from? Some
* ports don't allow reads, so read_control just returns a * ports don't allow reads, so read_control just returns a
* software copy. Some ports _do_ allow reads, so bypass the * software copy. Some ports _do_ allow reads, so bypass the
* software copy here. In addition, some bits aren't * software copy here. In addition, some bits aren't
* writable. */ * writable. */
r = inb (CONTROL (pb)); r = inb(CONTROL(pb));
if ((r & 0xf) == w) { if ((r & 0xf) == w) {
w = 0xe; w = 0xe;
outb (w, CONTROL (pb)); outb(w, CONTROL(pb));
r = inb (CONTROL (pb)); r = inb(CONTROL(pb));
outb (0xc, CONTROL (pb)); outb(0xc, CONTROL(pb));
if ((r & 0xf) == w) if ((r & 0xf) == w)
return PARPORT_MODE_PCSPP; return PARPORT_MODE_PCSPP;
} }
...@@ -1641,18 +1686,18 @@ static int parport_SPP_supported(struct parport *pb) ...@@ -1641,18 +1686,18 @@ static int parport_SPP_supported(struct parport *pb)
if (user_specified) if (user_specified)
/* That didn't work, but the user thinks there's a /* That didn't work, but the user thinks there's a
* port here. */ * port here. */
printk (KERN_INFO "parport 0x%lx (WARNING): CTR: " printk(KERN_INFO "parport 0x%lx (WARNING): CTR: "
"wrote 0x%02x, read 0x%02x\n", pb->base, w, r); "wrote 0x%02x, read 0x%02x\n", pb->base, w, r);
/* Try the data register. The data lines aren't tri-stated at /* Try the data register. The data lines aren't tri-stated at
* this stage, so we expect back what we wrote. */ * this stage, so we expect back what we wrote. */
w = 0xaa; w = 0xaa;
parport_pc_write_data (pb, w); parport_pc_write_data(pb, w);
r = parport_pc_read_data (pb); r = parport_pc_read_data(pb);
if (r == w) { if (r == w) {
w = 0x55; w = 0x55;
parport_pc_write_data (pb, w); parport_pc_write_data(pb, w);
r = parport_pc_read_data (pb); r = parport_pc_read_data(pb);
if (r == w) if (r == w)
return PARPORT_MODE_PCSPP; return PARPORT_MODE_PCSPP;
} }
...@@ -1660,9 +1705,9 @@ static int parport_SPP_supported(struct parport *pb) ...@@ -1660,9 +1705,9 @@ static int parport_SPP_supported(struct parport *pb)
if (user_specified) { if (user_specified) {
/* Didn't work, but the user is convinced this is the /* Didn't work, but the user is convinced this is the
* place. */ * place. */
printk (KERN_INFO "parport 0x%lx (WARNING): DATA: " printk(KERN_INFO "parport 0x%lx (WARNING): DATA: "
"wrote 0x%02x, read 0x%02x\n", pb->base, w, r); "wrote 0x%02x, read 0x%02x\n", pb->base, w, r);
printk (KERN_INFO "parport 0x%lx: You gave this address, " printk(KERN_INFO "parport 0x%lx: You gave this address, "
"but there is probably no parallel port there!\n", "but there is probably no parallel port there!\n",
pb->base); pb->base);
} }
...@@ -1693,32 +1738,32 @@ static int parport_ECR_present(struct parport *pb) ...@@ -1693,32 +1738,32 @@ static int parport_ECR_present(struct parport *pb)
struct parport_pc_private *priv = pb->private_data; struct parport_pc_private *priv = pb->private_data;
unsigned char r = 0xc; unsigned char r = 0xc;
outb (r, CONTROL (pb)); outb(r, CONTROL(pb));
if ((inb (ECONTROL (pb)) & 0x3) == (r & 0x3)) { if ((inb(ECONTROL(pb)) & 0x3) == (r & 0x3)) {
outb (r ^ 0x2, CONTROL (pb)); /* Toggle bit 1 */ outb(r ^ 0x2, CONTROL(pb)); /* Toggle bit 1 */
r = inb (CONTROL (pb)); r = inb(CONTROL(pb));
if ((inb (ECONTROL (pb)) & 0x2) == (r & 0x2)) if ((inb(ECONTROL(pb)) & 0x2) == (r & 0x2))
goto no_reg; /* Sure that no ECR register exists */ goto no_reg; /* Sure that no ECR register exists */
} }
if ((inb (ECONTROL (pb)) & 0x3 ) != 0x1) if ((inb(ECONTROL(pb)) & 0x3) != 0x1)
goto no_reg; goto no_reg;
ECR_WRITE (pb, 0x34); ECR_WRITE(pb, 0x34);
if (inb (ECONTROL (pb)) != 0x35) if (inb(ECONTROL(pb)) != 0x35)
goto no_reg; goto no_reg;
priv->ecr = 1; priv->ecr = 1;
outb (0xc, CONTROL (pb)); outb(0xc, CONTROL(pb));
/* Go to mode 000 */ /* Go to mode 000 */
frob_set_mode (pb, ECR_SPP); frob_set_mode(pb, ECR_SPP);
return 1; return 1;
no_reg: no_reg:
outb (0xc, CONTROL (pb)); outb(0xc, CONTROL(pb));
return 0; return 0;
} }
...@@ -1747,16 +1792,18 @@ static int parport_PS2_supported(struct parport *pb) ...@@ -1747,16 +1792,18 @@ static int parport_PS2_supported(struct parport *pb)
clear_epp_timeout(pb); clear_epp_timeout(pb);
/* try to tri-state the buffer */ /* try to tri-state the buffer */
parport_pc_data_reverse (pb); parport_pc_data_reverse(pb);
parport_pc_write_data(pb, 0x55); parport_pc_write_data(pb, 0x55);
if (parport_pc_read_data(pb) != 0x55) ok++; if (parport_pc_read_data(pb) != 0x55)
ok++;
parport_pc_write_data(pb, 0xaa); parport_pc_write_data(pb, 0xaa);
if (parport_pc_read_data(pb) != 0xaa) ok++; if (parport_pc_read_data(pb) != 0xaa)
ok++;
/* cancel input mode */ /* cancel input mode */
parport_pc_data_forward (pb); parport_pc_data_forward(pb);
if (ok) { if (ok) {
pb->modes |= PARPORT_MODE_TRISTATE; pb->modes |= PARPORT_MODE_TRISTATE;
...@@ -1776,44 +1823,44 @@ static int parport_ECP_supported(struct parport *pb) ...@@ -1776,44 +1823,44 @@ static int parport_ECP_supported(struct parport *pb)
int pword; int pword;
struct parport_pc_private *priv = pb->private_data; struct parport_pc_private *priv = pb->private_data;
/* Translate ECP intrLine to ISA irq value */ /* Translate ECP intrLine to ISA irq value */
static const int intrline[]= { 0, 7, 9, 10, 11, 14, 15, 5 }; static const int intrline[] = { 0, 7, 9, 10, 11, 14, 15, 5 };
/* If there is no ECR, we have no hope of supporting ECP. */ /* If there is no ECR, we have no hope of supporting ECP. */
if (!priv->ecr) if (!priv->ecr)
return 0; return 0;
/* Find out FIFO depth */ /* Find out FIFO depth */
ECR_WRITE (pb, ECR_SPP << 5); /* Reset FIFO */ ECR_WRITE(pb, ECR_SPP << 5); /* Reset FIFO */
ECR_WRITE (pb, ECR_TST << 5); /* TEST FIFO */ ECR_WRITE(pb, ECR_TST << 5); /* TEST FIFO */
for (i=0; i < 1024 && !(inb (ECONTROL (pb)) & 0x02); i++) for (i = 0; i < 1024 && !(inb(ECONTROL(pb)) & 0x02); i++)
outb (0xaa, FIFO (pb)); outb(0xaa, FIFO(pb));
/* /*
* Using LGS chipset it uses ECR register, but * Using LGS chipset it uses ECR register, but
* it doesn't support ECP or FIFO MODE * it doesn't support ECP or FIFO MODE
*/ */
if (i == 1024) { if (i == 1024) {
ECR_WRITE (pb, ECR_SPP << 5); ECR_WRITE(pb, ECR_SPP << 5);
return 0; return 0;
} }
priv->fifo_depth = i; priv->fifo_depth = i;
if (verbose_probing) if (verbose_probing)
printk (KERN_DEBUG "0x%lx: FIFO is %d bytes\n", pb->base, i); printk(KERN_DEBUG "0x%lx: FIFO is %d bytes\n", pb->base, i);
/* Find out writeIntrThreshold */ /* Find out writeIntrThreshold */
frob_econtrol (pb, 1<<2, 1<<2); frob_econtrol(pb, 1<<2, 1<<2);
frob_econtrol (pb, 1<<2, 0); frob_econtrol(pb, 1<<2, 0);
for (i = 1; i <= priv->fifo_depth; i++) { for (i = 1; i <= priv->fifo_depth; i++) {
inb (FIFO (pb)); inb(FIFO(pb));
udelay (50); udelay(50);
if (inb (ECONTROL (pb)) & (1<<2)) if (inb(ECONTROL(pb)) & (1<<2))
break; break;
} }
if (i <= priv->fifo_depth) { if (i <= priv->fifo_depth) {
if (verbose_probing) if (verbose_probing)
printk (KERN_DEBUG "0x%lx: writeIntrThreshold is %d\n", printk(KERN_DEBUG "0x%lx: writeIntrThreshold is %d\n",
pb->base, i); pb->base, i);
} else } else
/* Number of bytes we know we can write if we get an /* Number of bytes we know we can write if we get an
...@@ -1823,20 +1870,20 @@ static int parport_ECP_supported(struct parport *pb) ...@@ -1823,20 +1870,20 @@ static int parport_ECP_supported(struct parport *pb)
priv->writeIntrThreshold = i; priv->writeIntrThreshold = i;
/* Find out readIntrThreshold */ /* Find out readIntrThreshold */
frob_set_mode (pb, ECR_PS2); /* Reset FIFO and enable PS2 */ frob_set_mode(pb, ECR_PS2); /* Reset FIFO and enable PS2 */
parport_pc_data_reverse (pb); /* Must be in PS2 mode */ parport_pc_data_reverse(pb); /* Must be in PS2 mode */
frob_set_mode (pb, ECR_TST); /* Test FIFO */ frob_set_mode(pb, ECR_TST); /* Test FIFO */
frob_econtrol (pb, 1<<2, 1<<2); frob_econtrol(pb, 1<<2, 1<<2);
frob_econtrol (pb, 1<<2, 0); frob_econtrol(pb, 1<<2, 0);
for (i = 1; i <= priv->fifo_depth; i++) { for (i = 1; i <= priv->fifo_depth; i++) {
outb (0xaa, FIFO (pb)); outb(0xaa, FIFO(pb));
if (inb (ECONTROL (pb)) & (1<<2)) if (inb(ECONTROL(pb)) & (1<<2))
break; break;
} }
if (i <= priv->fifo_depth) { if (i <= priv->fifo_depth) {
if (verbose_probing) if (verbose_probing)
printk (KERN_INFO "0x%lx: readIntrThreshold is %d\n", printk(KERN_INFO "0x%lx: readIntrThreshold is %d\n",
pb->base, i); pb->base, i);
} else } else
/* Number of bytes we can read if we get an interrupt. */ /* Number of bytes we can read if we get an interrupt. */
...@@ -1844,23 +1891,23 @@ static int parport_ECP_supported(struct parport *pb) ...@@ -1844,23 +1891,23 @@ static int parport_ECP_supported(struct parport *pb)
priv->readIntrThreshold = i; priv->readIntrThreshold = i;
ECR_WRITE (pb, ECR_SPP << 5); /* Reset FIFO */ ECR_WRITE(pb, ECR_SPP << 5); /* Reset FIFO */
ECR_WRITE (pb, 0xf4); /* Configuration mode */ ECR_WRITE(pb, 0xf4); /* Configuration mode */
config = inb (CONFIGA (pb)); config = inb(CONFIGA(pb));
pword = (config >> 4) & 0x7; pword = (config >> 4) & 0x7;
switch (pword) { switch (pword) {
case 0: case 0:
pword = 2; pword = 2;
printk (KERN_WARNING "0x%lx: Unsupported pword size!\n", printk(KERN_WARNING "0x%lx: Unsupported pword size!\n",
pb->base); pb->base);
break; break;
case 2: case 2:
pword = 4; pword = 4;
printk (KERN_WARNING "0x%lx: Unsupported pword size!\n", printk(KERN_WARNING "0x%lx: Unsupported pword size!\n",
pb->base); pb->base);
break; break;
default: default:
printk (KERN_WARNING "0x%lx: Unknown implementation ID\n", printk(KERN_WARNING "0x%lx: Unknown implementation ID\n",
pb->base); pb->base);
/* Assume 1 */ /* Assume 1 */
case 1: case 1:
...@@ -1869,28 +1916,29 @@ static int parport_ECP_supported(struct parport *pb) ...@@ -1869,28 +1916,29 @@ static int parport_ECP_supported(struct parport *pb)
priv->pword = pword; priv->pword = pword;
if (verbose_probing) { if (verbose_probing) {
printk (KERN_DEBUG "0x%lx: PWord is %d bits\n", pb->base, 8 * pword); printk(KERN_DEBUG "0x%lx: PWord is %d bits\n",
pb->base, 8 * pword);
printk (KERN_DEBUG "0x%lx: Interrupts are ISA-%s\n", pb->base, printk(KERN_DEBUG "0x%lx: Interrupts are ISA-%s\n", pb->base,
config & 0x80 ? "Level" : "Pulses"); config & 0x80 ? "Level" : "Pulses");
configb = inb (CONFIGB (pb)); configb = inb(CONFIGB(pb));
printk (KERN_DEBUG "0x%lx: ECP port cfgA=0x%02x cfgB=0x%02x\n", printk(KERN_DEBUG "0x%lx: ECP port cfgA=0x%02x cfgB=0x%02x\n",
pb->base, config, configb); pb->base, config, configb);
printk (KERN_DEBUG "0x%lx: ECP settings irq=", pb->base); printk(KERN_DEBUG "0x%lx: ECP settings irq=", pb->base);
if ((configb >>3) & 0x07) if ((configb >> 3) & 0x07)
printk("%d",intrline[(configb >>3) & 0x07]); printk("%d", intrline[(configb >> 3) & 0x07]);
else else
printk("<none or set by other means>"); printk("<none or set by other means>");
printk (" dma="); printk(" dma=");
if( (configb & 0x03 ) == 0x00) if ((configb & 0x03) == 0x00)
printk("<none or set by other means>\n"); printk("<none or set by other means>\n");
else else
printk("%d\n",configb & 0x07); printk("%d\n", configb & 0x07);
} }
/* Go back to mode 000 */ /* Go back to mode 000 */
frob_set_mode (pb, ECR_SPP); frob_set_mode(pb, ECR_SPP);
return 1; return 1;
} }
...@@ -1905,10 +1953,10 @@ static int parport_ECPPS2_supported(struct parport *pb) ...@@ -1905,10 +1953,10 @@ static int parport_ECPPS2_supported(struct parport *pb)
if (!priv->ecr) if (!priv->ecr)
return 0; return 0;
oecr = inb (ECONTROL (pb)); oecr = inb(ECONTROL(pb));
ECR_WRITE (pb, ECR_PS2 << 5); ECR_WRITE(pb, ECR_PS2 << 5);
result = parport_PS2_supported(pb); result = parport_PS2_supported(pb);
ECR_WRITE (pb, oecr); ECR_WRITE(pb, oecr);
return result; return result;
} }
...@@ -1932,16 +1980,15 @@ static int parport_EPP_supported(struct parport *pb) ...@@ -1932,16 +1980,15 @@ static int parport_EPP_supported(struct parport *pb)
*/ */
/* If EPP timeout bit clear then EPP available */ /* If EPP timeout bit clear then EPP available */
if (!clear_epp_timeout(pb)) { if (!clear_epp_timeout(pb))
return 0; /* No way to clear timeout */ return 0; /* No way to clear timeout */
}
/* Check for Intel bug. */ /* Check for Intel bug. */
if (priv->ecr) { if (priv->ecr) {
unsigned char i; unsigned char i;
for (i = 0x00; i < 0x80; i += 0x20) { for (i = 0x00; i < 0x80; i += 0x20) {
ECR_WRITE (pb, i); ECR_WRITE(pb, i);
if (clear_epp_timeout (pb)) { if (clear_epp_timeout(pb)) {
/* Phony EPP in ECP. */ /* Phony EPP in ECP. */
return 0; return 0;
} }
...@@ -1965,17 +2012,16 @@ static int parport_ECPEPP_supported(struct parport *pb) ...@@ -1965,17 +2012,16 @@ static int parport_ECPEPP_supported(struct parport *pb)
int result; int result;
unsigned char oecr; unsigned char oecr;
if (!priv->ecr) { if (!priv->ecr)
return 0; return 0;
}
oecr = inb (ECONTROL (pb)); oecr = inb(ECONTROL(pb));
/* Search for SMC style EPP+ECP mode */ /* Search for SMC style EPP+ECP mode */
ECR_WRITE (pb, 0x80); ECR_WRITE(pb, 0x80);
outb (0x04, CONTROL (pb)); outb(0x04, CONTROL(pb));
result = parport_EPP_supported(pb); result = parport_EPP_supported(pb);
ECR_WRITE (pb, oecr); ECR_WRITE(pb, oecr);
if (result) { if (result) {
/* Set up access functions to use ECP+EPP hardware. */ /* Set up access functions to use ECP+EPP hardware. */
...@@ -1993,11 +2039,25 @@ static int parport_ECPEPP_supported(struct parport *pb) ...@@ -1993,11 +2039,25 @@ static int parport_ECPEPP_supported(struct parport *pb)
/* Don't bother probing for modes we know we won't use. */ /* Don't bother probing for modes we know we won't use. */
static int __devinit parport_PS2_supported(struct parport *pb) { return 0; } static int __devinit parport_PS2_supported(struct parport *pb) { return 0; }
#ifdef CONFIG_PARPORT_PC_FIFO #ifdef CONFIG_PARPORT_PC_FIFO
static int parport_ECP_supported(struct parport *pb) { return 0; } static int parport_ECP_supported(struct parport *pb)
{
return 0;
}
#endif #endif
static int __devinit parport_EPP_supported(struct parport *pb) { return 0; } static int __devinit parport_EPP_supported(struct parport *pb)
static int __devinit parport_ECPEPP_supported(struct parport *pb){return 0;} {
static int __devinit parport_ECPPS2_supported(struct parport *pb){return 0;} return 0;
}
static int __devinit parport_ECPEPP_supported(struct parport *pb)
{
return 0;
}
static int __devinit parport_ECPPS2_supported(struct parport *pb)
{
return 0;
}
#endif /* No IEEE 1284 support */ #endif /* No IEEE 1284 support */
...@@ -2007,17 +2067,17 @@ static int __devinit parport_ECPPS2_supported(struct parport *pb){return 0;} ...@@ -2007,17 +2067,17 @@ static int __devinit parport_ECPPS2_supported(struct parport *pb){return 0;}
static int programmable_irq_support(struct parport *pb) static int programmable_irq_support(struct parport *pb)
{ {
int irq, intrLine; int irq, intrLine;
unsigned char oecr = inb (ECONTROL (pb)); unsigned char oecr = inb(ECONTROL(pb));
static const int lookup[8] = { static const int lookup[8] = {
PARPORT_IRQ_NONE, 7, 9, 10, 11, 14, 15, 5 PARPORT_IRQ_NONE, 7, 9, 10, 11, 14, 15, 5
}; };
ECR_WRITE (pb, ECR_CNF << 5); /* Configuration MODE */ ECR_WRITE(pb, ECR_CNF << 5); /* Configuration MODE */
intrLine = (inb (CONFIGB (pb)) >> 3) & 0x07; intrLine = (inb(CONFIGB(pb)) >> 3) & 0x07;
irq = lookup[intrLine]; irq = lookup[intrLine];
ECR_WRITE (pb, oecr); ECR_WRITE(pb, oecr);
return irq; return irq;
} }
...@@ -2028,16 +2088,16 @@ static int irq_probe_ECP(struct parport *pb) ...@@ -2028,16 +2088,16 @@ static int irq_probe_ECP(struct parport *pb)
irqs = probe_irq_on(); irqs = probe_irq_on();
ECR_WRITE (pb, ECR_SPP << 5); /* Reset FIFO */ ECR_WRITE(pb, ECR_SPP << 5); /* Reset FIFO */
ECR_WRITE (pb, (ECR_TST << 5) | 0x04); ECR_WRITE(pb, (ECR_TST << 5) | 0x04);
ECR_WRITE (pb, ECR_TST << 5); ECR_WRITE(pb, ECR_TST << 5);
/* If Full FIFO sure that writeIntrThreshold is generated */ /* If Full FIFO sure that writeIntrThreshold is generated */
for (i=0; i < 1024 && !(inb (ECONTROL (pb)) & 0x02) ; i++) for (i = 0; i < 1024 && !(inb(ECONTROL(pb)) & 0x02) ; i++)
outb (0xaa, FIFO (pb)); outb(0xaa, FIFO(pb));
pb->irq = probe_irq_off(irqs); pb->irq = probe_irq_off(irqs);
ECR_WRITE (pb, ECR_SPP << 5); ECR_WRITE(pb, ECR_SPP << 5);
if (pb->irq <= 0) if (pb->irq <= 0)
pb->irq = PARPORT_IRQ_NONE; pb->irq = PARPORT_IRQ_NONE;
...@@ -2058,16 +2118,16 @@ static int irq_probe_EPP(struct parport *pb) ...@@ -2058,16 +2118,16 @@ static int irq_probe_EPP(struct parport *pb)
unsigned char oecr; unsigned char oecr;
if (pb->modes & PARPORT_MODE_PCECR) if (pb->modes & PARPORT_MODE_PCECR)
oecr = inb (ECONTROL (pb)); oecr = inb(ECONTROL(pb));
irqs = probe_irq_on(); irqs = probe_irq_on();
if (pb->modes & PARPORT_MODE_PCECR) if (pb->modes & PARPORT_MODE_PCECR)
frob_econtrol (pb, 0x10, 0x10); frob_econtrol(pb, 0x10, 0x10);
clear_epp_timeout(pb); clear_epp_timeout(pb);
parport_pc_frob_control (pb, 0x20, 0x20); parport_pc_frob_control(pb, 0x20, 0x20);
parport_pc_frob_control (pb, 0x10, 0x10); parport_pc_frob_control(pb, 0x10, 0x10);
clear_epp_timeout(pb); clear_epp_timeout(pb);
/* Device isn't expecting an EPP read /* Device isn't expecting an EPP read
...@@ -2076,9 +2136,9 @@ static int irq_probe_EPP(struct parport *pb) ...@@ -2076,9 +2136,9 @@ static int irq_probe_EPP(struct parport *pb)
parport_pc_read_epp(pb); parport_pc_read_epp(pb);
udelay(20); udelay(20);
pb->irq = probe_irq_off (irqs); pb->irq = probe_irq_off(irqs);
if (pb->modes & PARPORT_MODE_PCECR) if (pb->modes & PARPORT_MODE_PCECR)
ECR_WRITE (pb, oecr); ECR_WRITE(pb, oecr);
parport_pc_write_control(pb, 0xc); parport_pc_write_control(pb, 0xc);
if (pb->irq <= 0) if (pb->irq <= 0)
...@@ -2135,28 +2195,28 @@ static int parport_irq_probe(struct parport *pb) ...@@ -2135,28 +2195,28 @@ static int parport_irq_probe(struct parport *pb)
/* --- DMA detection -------------------------------------- */ /* --- DMA detection -------------------------------------- */
/* Only if chipset conforms to ECP ISA Interface Standard */ /* Only if chipset conforms to ECP ISA Interface Standard */
static int programmable_dma_support (struct parport *p) static int programmable_dma_support(struct parport *p)
{ {
unsigned char oecr = inb (ECONTROL (p)); unsigned char oecr = inb(ECONTROL(p));
int dma; int dma;
frob_set_mode (p, ECR_CNF); frob_set_mode(p, ECR_CNF);
dma = inb (CONFIGB(p)) & 0x07; dma = inb(CONFIGB(p)) & 0x07;
/* 000: Indicates jumpered 8-bit DMA if read-only. /* 000: Indicates jumpered 8-bit DMA if read-only.
100: Indicates jumpered 16-bit DMA if read-only. */ 100: Indicates jumpered 16-bit DMA if read-only. */
if ((dma & 0x03) == 0) if ((dma & 0x03) == 0)
dma = PARPORT_DMA_NONE; dma = PARPORT_DMA_NONE;
ECR_WRITE (p, oecr); ECR_WRITE(p, oecr);
return dma; return dma;
} }
static int parport_dma_probe (struct parport *p) static int parport_dma_probe(struct parport *p)
{ {
const struct parport_pc_private *priv = p->private_data; const struct parport_pc_private *priv = p->private_data;
if (priv->ecr) if (priv->ecr) /* ask ECP chipset first */
p->dma = programmable_dma_support(p); /* ask ECP chipset first */ p->dma = programmable_dma_support(p);
if (p->dma == PARPORT_DMA_NONE) { if (p->dma == PARPORT_DMA_NONE) {
/* ask known Super-IO chips proper, although these /* ask known Super-IO chips proper, although these
claim ECP compatible, some don't report their DMA claim ECP compatible, some don't report their DMA
...@@ -2214,7 +2274,7 @@ struct parport *parport_pc_probe_port(unsigned long int base, ...@@ -2214,7 +2274,7 @@ struct parport *parport_pc_probe_port(unsigned long int base,
if (!base_res) if (!base_res)
goto out4; goto out4;
memcpy(ops, &parport_pc_ops, sizeof (struct parport_operations)); memcpy(ops, &parport_pc_ops, sizeof(struct parport_operations));
priv->ctr = 0xc; priv->ctr = 0xc;
priv->ctr_writable = ~0x10; priv->ctr_writable = ~0x10;
priv->ecr = 0; priv->ecr = 0;
...@@ -2241,7 +2301,7 @@ struct parport *parport_pc_probe_port(unsigned long int base, ...@@ -2241,7 +2301,7 @@ struct parport *parport_pc_probe_port(unsigned long int base,
if (!parport_EPP_supported(p)) if (!parport_EPP_supported(p))
parport_ECPEPP_supported(p); parport_ECPEPP_supported(p);
} }
if (!parport_SPP_supported (p)) if (!parport_SPP_supported(p))
/* No port. */ /* No port. */
goto out5; goto out5;
if (priv->ecr) if (priv->ecr)
...@@ -2249,7 +2309,7 @@ struct parport *parport_pc_probe_port(unsigned long int base, ...@@ -2249,7 +2309,7 @@ struct parport *parport_pc_probe_port(unsigned long int base,
else else
parport_PS2_supported(p); parport_PS2_supported(p);
p->size = (p->modes & PARPORT_MODE_EPP)?8:3; p->size = (p->modes & PARPORT_MODE_EPP) ? 8 : 3;
printk(KERN_INFO "%s: PC-style at 0x%lx", p->name, p->base); printk(KERN_INFO "%s: PC-style at 0x%lx", p->name, p->base);
if (p->base_hi && priv->ecr) if (p->base_hi && priv->ecr)
...@@ -2290,16 +2350,23 @@ struct parport *parport_pc_probe_port(unsigned long int base, ...@@ -2290,16 +2350,23 @@ struct parport *parport_pc_probe_port(unsigned long int base,
if (p->dma != PARPORT_DMA_NONE) { if (p->dma != PARPORT_DMA_NONE) {
printk(", dma %d", p->dma); printk(", dma %d", p->dma);
p->modes |= PARPORT_MODE_DMA; p->modes |= PARPORT_MODE_DMA;
} } else
else printk(", using FIFO"); printk(", using FIFO");
} } else
else
/* We can't use the DMA channel after all. */ /* We can't use the DMA channel after all. */
p->dma = PARPORT_DMA_NONE; p->dma = PARPORT_DMA_NONE;
#endif /* Allowed to use FIFO/DMA */ #endif /* Allowed to use FIFO/DMA */
printk(" ["); printk(" [");
#define printmode(x) {if(p->modes&PARPORT_MODE_##x){printk("%s%s",f?",":"",#x);f++;}}
#define printmode(x) \
{\
if (p->modes & PARPORT_MODE_##x) {\
printk("%s%s", f ? "," : "", #x);\
f++;\
} \
}
{ {
int f = 0; int f = 0;
printmode(PCSPP); printmode(PCSPP);
...@@ -2311,7 +2378,7 @@ struct parport *parport_pc_probe_port(unsigned long int base, ...@@ -2311,7 +2378,7 @@ struct parport *parport_pc_probe_port(unsigned long int base,
} }
#undef printmode #undef printmode
#ifndef CONFIG_PARPORT_1284 #ifndef CONFIG_PARPORT_1284
printk ("(,...)"); printk("(,...)");
#endif /* CONFIG_PARPORT_1284 */ #endif /* CONFIG_PARPORT_1284 */
printk("]\n"); printk("]\n");
if (probedirq != PARPORT_IRQ_NONE) if (probedirq != PARPORT_IRQ_NONE)
...@@ -2330,7 +2397,7 @@ struct parport *parport_pc_probe_port(unsigned long int base, ...@@ -2330,7 +2397,7 @@ struct parport *parport_pc_probe_port(unsigned long int base,
if (p->irq != PARPORT_IRQ_NONE) { if (p->irq != PARPORT_IRQ_NONE) {
if (request_irq(p->irq, parport_irq_handler, if (request_irq(p->irq, parport_irq_handler,
irqflags, p->name, p)) { irqflags, p->name, p)) {
printk (KERN_WARNING "%s: irq %d in use, " printk(KERN_WARNING "%s: irq %d in use, "
"resorting to polled operation\n", "resorting to polled operation\n",
p->name, p->irq); p->name, p->irq);
p->irq = PARPORT_IRQ_NONE; p->irq = PARPORT_IRQ_NONE;
...@@ -2340,8 +2407,8 @@ struct parport *parport_pc_probe_port(unsigned long int base, ...@@ -2340,8 +2407,8 @@ struct parport *parport_pc_probe_port(unsigned long int base,
#ifdef CONFIG_PARPORT_PC_FIFO #ifdef CONFIG_PARPORT_PC_FIFO
#ifdef HAS_DMA #ifdef HAS_DMA
if (p->dma != PARPORT_DMA_NONE) { if (p->dma != PARPORT_DMA_NONE) {
if (request_dma (p->dma, p->name)) { if (request_dma(p->dma, p->name)) {
printk (KERN_WARNING "%s: dma %d in use, " printk(KERN_WARNING "%s: dma %d in use, "
"resorting to PIO operation\n", "resorting to PIO operation\n",
p->name, p->dma); p->name, p->dma);
p->dma = PARPORT_DMA_NONE; p->dma = PARPORT_DMA_NONE;
...@@ -2351,8 +2418,8 @@ struct parport *parport_pc_probe_port(unsigned long int base, ...@@ -2351,8 +2418,8 @@ struct parport *parport_pc_probe_port(unsigned long int base,
PAGE_SIZE, PAGE_SIZE,
&priv->dma_handle, &priv->dma_handle,
GFP_KERNEL); GFP_KERNEL);
if (! priv->dma_buf) { if (!priv->dma_buf) {
printk (KERN_WARNING "%s: " printk(KERN_WARNING "%s: "
"cannot get buffer for DMA, " "cannot get buffer for DMA, "
"resorting to PIO operation\n", "resorting to PIO operation\n",
p->name); p->name);
...@@ -2371,10 +2438,10 @@ struct parport *parport_pc_probe_port(unsigned long int base, ...@@ -2371,10 +2438,10 @@ struct parport *parport_pc_probe_port(unsigned long int base,
* Put the ECP detected port in PS2 mode. * Put the ECP detected port in PS2 mode.
* Do this also for ports that have ECR but don't do ECP. * Do this also for ports that have ECR but don't do ECP.
*/ */
ECR_WRITE (p, 0x34); ECR_WRITE(p, 0x34);
parport_pc_write_data(p, 0); parport_pc_write_data(p, 0);
parport_pc_data_forward (p); parport_pc_data_forward(p);
/* Now that we've told the sharing engine about the port, and /* Now that we've told the sharing engine about the port, and
found out its characteristics, let the high-level drivers found out its characteristics, let the high-level drivers
...@@ -2382,7 +2449,7 @@ struct parport *parport_pc_probe_port(unsigned long int base, ...@@ -2382,7 +2449,7 @@ struct parport *parport_pc_probe_port(unsigned long int base,
spin_lock(&ports_lock); spin_lock(&ports_lock);
list_add(&priv->list, &ports_list); list_add(&priv->list, &ports_list);
spin_unlock(&ports_lock); spin_unlock(&ports_lock);
parport_announce_port (p); parport_announce_port(p);
return p; return p;
...@@ -2395,18 +2462,17 @@ struct parport *parport_pc_probe_port(unsigned long int base, ...@@ -2395,18 +2462,17 @@ struct parport *parport_pc_probe_port(unsigned long int base,
out4: out4:
parport_put_port(p); parport_put_port(p);
out3: out3:
kfree (priv); kfree(priv);
out2: out2:
kfree (ops); kfree(ops);
out1: out1:
if (pdev) if (pdev)
platform_device_unregister(pdev); platform_device_unregister(pdev);
return NULL; return NULL;
} }
EXPORT_SYMBOL(parport_pc_probe_port);
EXPORT_SYMBOL (parport_pc_probe_port); void parport_pc_unregister_port(struct parport *p)
void parport_pc_unregister_port (struct parport *p)
{ {
struct parport_pc_private *priv = p->private_data; struct parport_pc_private *priv = p->private_data;
struct parport_operations *ops = p->ops; struct parport_operations *ops = p->ops;
...@@ -2432,17 +2498,16 @@ void parport_pc_unregister_port (struct parport *p) ...@@ -2432,17 +2498,16 @@ void parport_pc_unregister_port (struct parport *p)
priv->dma_buf, priv->dma_buf,
priv->dma_handle); priv->dma_handle);
#endif #endif
kfree (p->private_data); kfree(p->private_data);
parport_put_port(p); parport_put_port(p);
kfree (ops); /* hope no-one cached it */ kfree(ops); /* hope no-one cached it */
} }
EXPORT_SYMBOL(parport_pc_unregister_port);
EXPORT_SYMBOL (parport_pc_unregister_port);
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
/* ITE support maintained by Rich Liu <richliu@poorman.org> */ /* ITE support maintained by Rich Liu <richliu@poorman.org> */
static int __devinit sio_ite_8872_probe (struct pci_dev *pdev, int autoirq, static int __devinit sio_ite_8872_probe(struct pci_dev *pdev, int autoirq,
int autodma, int autodma,
const struct parport_pc_via_data *via) const struct parport_pc_via_data *via)
{ {
...@@ -2454,73 +2519,74 @@ static int __devinit sio_ite_8872_probe (struct pci_dev *pdev, int autoirq, ...@@ -2454,73 +2519,74 @@ static int __devinit sio_ite_8872_probe (struct pci_dev *pdev, int autoirq,
int irq; int irq;
int i; int i;
DPRINTK (KERN_DEBUG "sio_ite_8872_probe()\n"); DPRINTK(KERN_DEBUG "sio_ite_8872_probe()\n");
// make sure which one chip /* make sure which one chip */
for(i = 0; i < 5; i++) { for (i = 0; i < 5; i++) {
base_res = request_region(inta_addr[i], 32, "it887x"); base_res = request_region(inta_addr[i], 32, "it887x");
if (base_res) { if (base_res) {
int test; int test;
pci_write_config_dword (pdev, 0x60, pci_write_config_dword(pdev, 0x60,
0xe5000000 | inta_addr[i]); 0xe5000000 | inta_addr[i]);
pci_write_config_dword (pdev, 0x78, pci_write_config_dword(pdev, 0x78,
0x00000000 | inta_addr[i]); 0x00000000 | inta_addr[i]);
test = inb (inta_addr[i]); test = inb(inta_addr[i]);
if (test != 0xff) break; if (test != 0xff)
break;
release_region(inta_addr[i], 0x8); release_region(inta_addr[i], 0x8);
} }
} }
if(i >= 5) { if (i >= 5) {
printk (KERN_INFO "parport_pc: cannot find ITE8872 INTA\n"); printk(KERN_INFO "parport_pc: cannot find ITE8872 INTA\n");
return 0; return 0;
} }
type = inb (inta_addr[i] + 0x18); type = inb(inta_addr[i] + 0x18);
type &= 0x0f; type &= 0x0f;
switch (type) { switch (type) {
case 0x2: case 0x2:
printk (KERN_INFO "parport_pc: ITE8871 found (1P)\n"); printk(KERN_INFO "parport_pc: ITE8871 found (1P)\n");
ite8872set = 0x64200000; ite8872set = 0x64200000;
break; break;
case 0xa: case 0xa:
printk (KERN_INFO "parport_pc: ITE8875 found (1P)\n"); printk(KERN_INFO "parport_pc: ITE8875 found (1P)\n");
ite8872set = 0x64200000; ite8872set = 0x64200000;
break; break;
case 0xe: case 0xe:
printk (KERN_INFO "parport_pc: ITE8872 found (2S1P)\n"); printk(KERN_INFO "parport_pc: ITE8872 found (2S1P)\n");
ite8872set = 0x64e00000; ite8872set = 0x64e00000;
break; break;
case 0x6: case 0x6:
printk (KERN_INFO "parport_pc: ITE8873 found (1S)\n"); printk(KERN_INFO "parport_pc: ITE8873 found (1S)\n");
return 0; return 0;
case 0x8: case 0x8:
DPRINTK (KERN_DEBUG "parport_pc: ITE8874 found (2S)\n"); DPRINTK(KERN_DEBUG "parport_pc: ITE8874 found (2S)\n");
return 0; return 0;
default: default:
printk (KERN_INFO "parport_pc: unknown ITE887x\n"); printk(KERN_INFO "parport_pc: unknown ITE887x\n");
printk (KERN_INFO "parport_pc: please mail 'lspci -nvv' " printk(KERN_INFO "parport_pc: please mail 'lspci -nvv' "
"output to Rich.Liu@ite.com.tw\n"); "output to Rich.Liu@ite.com.tw\n");
return 0; return 0;
} }
pci_read_config_byte (pdev, 0x3c, &ite8872_irq); pci_read_config_byte(pdev, 0x3c, &ite8872_irq);
pci_read_config_dword (pdev, 0x1c, &ite8872_lpt); pci_read_config_dword(pdev, 0x1c, &ite8872_lpt);
ite8872_lpt &= 0x0000ff00; ite8872_lpt &= 0x0000ff00;
pci_read_config_dword (pdev, 0x20, &ite8872_lpthi); pci_read_config_dword(pdev, 0x20, &ite8872_lpthi);
ite8872_lpthi &= 0x0000ff00; ite8872_lpthi &= 0x0000ff00;
pci_write_config_dword (pdev, 0x6c, 0xe3000000 | ite8872_lpt); pci_write_config_dword(pdev, 0x6c, 0xe3000000 | ite8872_lpt);
pci_write_config_dword (pdev, 0x70, 0xe3000000 | ite8872_lpthi); pci_write_config_dword(pdev, 0x70, 0xe3000000 | ite8872_lpthi);
pci_write_config_dword (pdev, 0x80, (ite8872_lpthi<<16) | ite8872_lpt); pci_write_config_dword(pdev, 0x80, (ite8872_lpthi<<16) | ite8872_lpt);
// SET SPP&EPP , Parallel Port NO DMA , Enable All Function /* SET SPP&EPP , Parallel Port NO DMA , Enable All Function */
// SET Parallel IRQ /* SET Parallel IRQ */
pci_write_config_dword (pdev, 0x9c, pci_write_config_dword(pdev, 0x9c,
ite8872set | (ite8872_irq * 0x11111)); ite8872set | (ite8872_irq * 0x11111));
DPRINTK (KERN_DEBUG "ITE887x: The IRQ is %d.\n", ite8872_irq); DPRINTK(KERN_DEBUG "ITE887x: The IRQ is %d.\n", ite8872_irq);
DPRINTK (KERN_DEBUG "ITE887x: The PARALLEL I/O port is 0x%x.\n", DPRINTK(KERN_DEBUG "ITE887x: The PARALLEL I/O port is 0x%x.\n",
ite8872_lpt); ite8872_lpt);
DPRINTK (KERN_DEBUG "ITE887x: The PARALLEL I/O porthi is 0x%x.\n", DPRINTK(KERN_DEBUG "ITE887x: The PARALLEL I/O porthi is 0x%x.\n",
ite8872_lpthi); ite8872_lpthi);
/* Let the user (or defaults) steer us away from interrupts */ /* Let the user (or defaults) steer us away from interrupts */
...@@ -2532,14 +2598,14 @@ static int __devinit sio_ite_8872_probe (struct pci_dev *pdev, int autoirq, ...@@ -2532,14 +2598,14 @@ static int __devinit sio_ite_8872_probe (struct pci_dev *pdev, int autoirq,
* Release the resource so that parport_pc_probe_port can get it. * Release the resource so that parport_pc_probe_port can get it.
*/ */
release_resource(base_res); release_resource(base_res);
if (parport_pc_probe_port (ite8872_lpt, ite8872_lpthi, if (parport_pc_probe_port(ite8872_lpt, ite8872_lpthi,
irq, PARPORT_DMA_NONE, &pdev->dev, 0)) { irq, PARPORT_DMA_NONE, &pdev->dev, 0)) {
printk (KERN_INFO printk(KERN_INFO
"parport_pc: ITE 8872 parallel port: io=0x%X", "parport_pc: ITE 8872 parallel port: io=0x%X",
ite8872_lpt); ite8872_lpt);
if (irq != PARPORT_IRQ_NONE) if (irq != PARPORT_IRQ_NONE)
printk (", irq=%d", irq); printk(", irq=%d", irq);
printk ("\n"); printk("\n");
return 1; return 1;
} }
...@@ -2548,7 +2614,7 @@ static int __devinit sio_ite_8872_probe (struct pci_dev *pdev, int autoirq, ...@@ -2548,7 +2614,7 @@ static int __devinit sio_ite_8872_probe (struct pci_dev *pdev, int autoirq,
/* VIA 8231 support by Pavel Fedin <sonic_amiga@rambler.ru> /* VIA 8231 support by Pavel Fedin <sonic_amiga@rambler.ru>
based on VIA 686a support code by Jeff Garzik <jgarzik@pobox.com> */ based on VIA 686a support code by Jeff Garzik <jgarzik@pobox.com> */
static int __devinitdata parport_init_mode = 0; static int __devinitdata parport_init_mode;
/* Data for two known VIA chips */ /* Data for two known VIA chips */
static struct parport_pc_via_data via_686a_data __devinitdata = { static struct parport_pc_via_data via_686a_data __devinitdata = {
...@@ -2570,7 +2636,7 @@ static struct parport_pc_via_data via_8231_data __devinitdata = { ...@@ -2570,7 +2636,7 @@ static struct parport_pc_via_data via_8231_data __devinitdata = {
0xF6 0xF6
}; };
static int __devinit sio_via_probe (struct pci_dev *pdev, int autoirq, static int __devinit sio_via_probe(struct pci_dev *pdev, int autoirq,
int autodma, int autodma,
const struct parport_pc_via_data *via) const struct parport_pc_via_data *via)
{ {
...@@ -2582,8 +2648,7 @@ static int __devinit sio_via_probe (struct pci_dev *pdev, int autoirq, ...@@ -2582,8 +2648,7 @@ static int __devinit sio_via_probe (struct pci_dev *pdev, int autoirq,
printk(KERN_DEBUG "parport_pc: VIA 686A/8231 detected\n"); printk(KERN_DEBUG "parport_pc: VIA 686A/8231 detected\n");
switch(parport_init_mode) switch (parport_init_mode) {
{
case 1: case 1:
printk(KERN_DEBUG "parport_pc: setting SPP mode\n"); printk(KERN_DEBUG "parport_pc: setting SPP mode\n");
siofunc = VIA_FUNCTION_PARPORT_SPP; siofunc = VIA_FUNCTION_PARPORT_SPP;
...@@ -2611,7 +2676,8 @@ static int __devinit sio_via_probe (struct pci_dev *pdev, int autoirq, ...@@ -2611,7 +2676,8 @@ static int __devinit sio_via_probe (struct pci_dev *pdev, int autoirq,
have_epp = 1; have_epp = 1;
break; break;
default: default:
printk(KERN_DEBUG "parport_pc: probing current configuration\n"); printk(KERN_DEBUG
"parport_pc: probing current configuration\n");
siofunc = VIA_FUNCTION_PROBE; siofunc = VIA_FUNCTION_PROBE;
break; break;
} }
...@@ -2624,17 +2690,14 @@ static int __devinit sio_via_probe (struct pci_dev *pdev, int autoirq, ...@@ -2624,17 +2690,14 @@ static int __devinit sio_via_probe (struct pci_dev *pdev, int autoirq,
/* Bits 1-0: Parallel Port Mode / Enable */ /* Bits 1-0: Parallel Port Mode / Enable */
outb(via->viacfg_function, VIA_CONFIG_INDEX); outb(via->viacfg_function, VIA_CONFIG_INDEX);
tmp = inb (VIA_CONFIG_DATA); tmp = inb(VIA_CONFIG_DATA);
/* Bit 5: EPP+ECP enable; bit 7: PS/2 bidirectional port enable */ /* Bit 5: EPP+ECP enable; bit 7: PS/2 bidirectional port enable */
outb(via->viacfg_parport_control, VIA_CONFIG_INDEX); outb(via->viacfg_parport_control, VIA_CONFIG_INDEX);
tmp2 = inb (VIA_CONFIG_DATA); tmp2 = inb(VIA_CONFIG_DATA);
if (siofunc == VIA_FUNCTION_PROBE) if (siofunc == VIA_FUNCTION_PROBE) {
{
siofunc = tmp & VIA_FUNCTION_PARPORT_DISABLE; siofunc = tmp & VIA_FUNCTION_PARPORT_DISABLE;
ppcontrol = tmp2; ppcontrol = tmp2;
} } else {
else
{
tmp &= ~VIA_FUNCTION_PARPORT_DISABLE; tmp &= ~VIA_FUNCTION_PARPORT_DISABLE;
tmp |= siofunc; tmp |= siofunc;
outb(via->viacfg_function, VIA_CONFIG_INDEX); outb(via->viacfg_function, VIA_CONFIG_INDEX);
...@@ -2649,12 +2712,13 @@ static int __devinit sio_via_probe (struct pci_dev *pdev, int autoirq, ...@@ -2649,12 +2712,13 @@ static int __devinit sio_via_probe (struct pci_dev *pdev, int autoirq,
outb(via->viacfg_parport_base, VIA_CONFIG_INDEX); outb(via->viacfg_parport_base, VIA_CONFIG_INDEX);
port1 = inb(VIA_CONFIG_DATA) << 2; port1 = inb(VIA_CONFIG_DATA) << 2;
printk (KERN_DEBUG "parport_pc: Current parallel port base: 0x%X\n",port1); printk(KERN_DEBUG "parport_pc: Current parallel port base: 0x%X\n",
if ((port1 == 0x3BC) && have_epp) port1);
{ if (port1 == 0x3BC && have_epp) {
outb(via->viacfg_parport_base, VIA_CONFIG_INDEX); outb(via->viacfg_parport_base, VIA_CONFIG_INDEX);
outb((0x378 >> 2), VIA_CONFIG_DATA); outb((0x378 >> 2), VIA_CONFIG_DATA);
printk(KERN_DEBUG "parport_pc: Parallel port base changed to 0x378\n"); printk(KERN_DEBUG
"parport_pc: Parallel port base changed to 0x378\n");
port1 = 0x378; port1 = 0x378;
} }
...@@ -2674,14 +2738,13 @@ static int __devinit sio_via_probe (struct pci_dev *pdev, int autoirq, ...@@ -2674,14 +2738,13 @@ static int __devinit sio_via_probe (struct pci_dev *pdev, int autoirq,
pci_read_config_byte(pdev, via->via_pci_parport_irq_reg, &tmp); pci_read_config_byte(pdev, via->via_pci_parport_irq_reg, &tmp);
irq = ((tmp & VIA_IRQCONTROL_PARALLEL) >> 4); irq = ((tmp & VIA_IRQCONTROL_PARALLEL) >> 4);
if (siofunc == VIA_FUNCTION_PARPORT_ECP) if (siofunc == VIA_FUNCTION_PARPORT_ECP) {
{
/* Bits 3-2: PnP Routing for Parallel Port DMA */ /* Bits 3-2: PnP Routing for Parallel Port DMA */
pci_read_config_byte(pdev, via->via_pci_parport_dma_reg, &tmp); pci_read_config_byte(pdev, via->via_pci_parport_dma_reg, &tmp);
dma = ((tmp & VIA_DMACONTROL_PARALLEL) >> 2); dma = ((tmp & VIA_DMACONTROL_PARALLEL) >> 2);
} } else
else /* if ECP not enabled, DMA is not enabled, assumed
/* if ECP not enabled, DMA is not enabled, assumed bogus 'dma' value */ bogus 'dma' value */
dma = PARPORT_DMA_NONE; dma = PARPORT_DMA_NONE;
/* Let the user (or defaults) steer us away from interrupts and DMA */ /* Let the user (or defaults) steer us away from interrupts and DMA */
...@@ -2693,11 +2756,15 @@ static int __devinit sio_via_probe (struct pci_dev *pdev, int autoirq, ...@@ -2693,11 +2756,15 @@ static int __devinit sio_via_probe (struct pci_dev *pdev, int autoirq,
dma = PARPORT_DMA_NONE; dma = PARPORT_DMA_NONE;
switch (port1) { switch (port1) {
case 0x3bc: port2 = 0x7bc; break; case 0x3bc:
case 0x378: port2 = 0x778; break; port2 = 0x7bc; break;
case 0x278: port2 = 0x678; break; case 0x378:
port2 = 0x778; break;
case 0x278:
port2 = 0x678; break;
default: default:
printk(KERN_INFO "parport_pc: Weird VIA parport base 0x%X, ignoring\n", printk(KERN_INFO
"parport_pc: Weird VIA parport base 0x%X, ignoring\n",
port1); port1);
return 0; return 0;
} }
...@@ -2716,14 +2783,14 @@ static int __devinit sio_via_probe (struct pci_dev *pdev, int autoirq, ...@@ -2716,14 +2783,14 @@ static int __devinit sio_via_probe (struct pci_dev *pdev, int autoirq,
} }
/* finally, do the probe with values obtained */ /* finally, do the probe with values obtained */
if (parport_pc_probe_port (port1, port2, irq, dma, &pdev->dev, 0)) { if (parport_pc_probe_port(port1, port2, irq, dma, &pdev->dev, 0)) {
printk (KERN_INFO printk(KERN_INFO
"parport_pc: VIA parallel port: io=0x%X", port1); "parport_pc: VIA parallel port: io=0x%X", port1);
if (irq != PARPORT_IRQ_NONE) if (irq != PARPORT_IRQ_NONE)
printk (", irq=%d", irq); printk(", irq=%d", irq);
if (dma != PARPORT_DMA_NONE) if (dma != PARPORT_DMA_NONE)
printk (", dma=%d", dma); printk(", dma=%d", dma);
printk ("\n"); printk("\n");
return 1; return 1;
} }
...@@ -2813,8 +2880,8 @@ static struct parport_pc_pci { ...@@ -2813,8 +2880,8 @@ static struct parport_pc_pci {
struct { /* BAR (base address registers) numbers in the config struct { /* BAR (base address registers) numbers in the config
space header */ space header */
int lo; int lo;
int hi; /* -1 if not there, >6 for offset-method (max int hi;
BAR is 6) */ /* -1 if not there, >6 for offset-method (max BAR is 6) */
} addr[4]; } addr[4];
/* If set, this is called immediately after pci_enable_device. /* If set, this is called immediately after pci_enable_device.
...@@ -2875,11 +2942,14 @@ static struct parport_pc_pci { ...@@ -2875,11 +2942,14 @@ static struct parport_pc_pci {
/* oxsemi_pcie_pport */ { 1, { { 0, 1 }, } }, /* oxsemi_pcie_pport */ { 1, { { 0, 1 }, } },
/* aks_0100 */ { 1, { { 0, -1 }, } }, /* aks_0100 */ { 1, { { 0, -1 }, } },
/* mobility_pp */ { 1, { { 0, 1 }, } }, /* mobility_pp */ { 1, { { 0, 1 }, } },
/* netmos_9705 */ { 1, { { 0, -1 }, } }, /* untested */
/* netmos_9715 */ { 2, { { 0, 1 }, { 2, 3 },} }, /* untested */ /* The netmos entries below are untested */
/* netmos_9755 */ { 2, { { 0, 1 }, { 2, 3 },} }, /* untested */ /* netmos_9705 */ { 1, { { 0, -1 }, } },
/* netmos_9805 */ { 1, { { 0, -1 }, } }, /* untested */ /* netmos_9715 */ { 2, { { 0, 1 }, { 2, 3 },} },
/* netmos_9815 */ { 2, { { 0, -1 }, { 2, -1 }, } }, /* untested */ /* netmos_9755 */ { 2, { { 0, 1 }, { 2, 3 },} },
/* netmos_9805 */ { 1, { { 0, -1 }, } },
/* netmos_9815 */ { 2, { { 0, -1 }, { 2, -1 }, } },
/* quatech_sppxp100 */ { 1, { { 0, 1 }, } }, /* quatech_sppxp100 */ { 1, { { 0, 1 }, } },
}; };
...@@ -2908,7 +2978,7 @@ static const struct pci_device_id parport_pc_pci_tbl[] = { ...@@ -2908,7 +2978,7 @@ static const struct pci_device_id parport_pc_pci_tbl[] = {
{ PCI_VENDOR_ID_LAVA, PCI_DEVICE_ID_LAVA_BOCA_IOPPAR, { PCI_VENDOR_ID_LAVA, PCI_DEVICE_ID_LAVA_BOCA_IOPPAR,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, boca_ioppar }, PCI_ANY_ID, PCI_ANY_ID, 0, 0, boca_ioppar },
{ PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050, { PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050,
PCI_SUBVENDOR_ID_EXSYS, PCI_SUBDEVICE_ID_EXSYS_4014, 0,0, plx_9050 }, PCI_SUBVENDOR_ID_EXSYS, PCI_SUBDEVICE_ID_EXSYS_4014, 0, 0, plx_9050 },
/* PCI_VENDOR_ID_TIMEDIA/SUNIX has many differing cards ...*/ /* PCI_VENDOR_ID_TIMEDIA/SUNIX has many differing cards ...*/
{ 0x1409, 0x7168, 0x1409, 0x4078, 0, 0, timedia_4078a }, { 0x1409, 0x7168, 0x1409, 0x4078, 0, 0, timedia_4078a },
{ 0x1409, 0x7168, 0x1409, 0x4079, 0, 0, timedia_4079h }, { 0x1409, 0x7168, 0x1409, 0x4079, 0, 0, timedia_4079h },
...@@ -2942,7 +3012,8 @@ static const struct pci_device_id parport_pc_pci_tbl[] = { ...@@ -2942,7 +3012,8 @@ static const struct pci_device_id parport_pc_pci_tbl[] = {
{ 0x9710, 0x9805, 0x1000, 0x0010, 0, 0, titan_1284p1 }, { 0x9710, 0x9805, 0x1000, 0x0010, 0, 0, titan_1284p1 },
{ 0x9710, 0x9815, 0x1000, 0x0020, 0, 0, titan_1284p2 }, { 0x9710, 0x9815, 0x1000, 0x0020, 0, 0, titan_1284p2 },
/* PCI_VENDOR_ID_AVLAB/Intek21 has another bunch of cards ...*/ /* PCI_VENDOR_ID_AVLAB/Intek21 has another bunch of cards ...*/
{ 0x14db, 0x2120, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1p}, /* AFAVLAB_TK9902 */ /* AFAVLAB_TK9902 */
{ 0x14db, 0x2120, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1p},
{ 0x14db, 0x2121, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_2p}, { 0x14db, 0x2121, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_2p},
{ PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_16PCI952PP, { PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_16PCI952PP,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, oxsemi_952 }, PCI_ANY_ID, PCI_ANY_ID, 0, 0, oxsemi_952 },
...@@ -2985,14 +3056,14 @@ static const struct pci_device_id parport_pc_pci_tbl[] = { ...@@ -2985,14 +3056,14 @@ static const struct pci_device_id parport_pc_pci_tbl[] = {
PCI_ANY_ID, PCI_ANY_ID, 0, 0, quatech_sppxp100 }, PCI_ANY_ID, PCI_ANY_ID, 0, 0, quatech_sppxp100 },
{ 0, } /* terminate list */ { 0, } /* terminate list */
}; };
MODULE_DEVICE_TABLE(pci,parport_pc_pci_tbl); MODULE_DEVICE_TABLE(pci, parport_pc_pci_tbl);
struct pci_parport_data { struct pci_parport_data {
int num; int num;
struct parport *ports[2]; struct parport *ports[2];
}; };
static int parport_pc_pci_probe (struct pci_dev *dev, static int parport_pc_pci_probe(struct pci_dev *dev,
const struct pci_device_id *id) const struct pci_device_id *id)
{ {
int err, count, n, i = id->driver_data; int err, count, n, i = id->driver_data;
...@@ -3005,7 +3076,8 @@ static int parport_pc_pci_probe (struct pci_dev *dev, ...@@ -3005,7 +3076,8 @@ static int parport_pc_pci_probe (struct pci_dev *dev,
/* This is a PCI card */ /* This is a PCI card */
i -= last_sio; i -= last_sio;
count = 0; count = 0;
if ((err = pci_enable_device (dev)) != 0) err = pci_enable_device(dev);
if (err)
return err; return err;
data = kmalloc(sizeof(struct pci_parport_data), GFP_KERNEL); data = kmalloc(sizeof(struct pci_parport_data), GFP_KERNEL);
...@@ -3013,7 +3085,7 @@ static int parport_pc_pci_probe (struct pci_dev *dev, ...@@ -3013,7 +3085,7 @@ static int parport_pc_pci_probe (struct pci_dev *dev,
return -ENOMEM; return -ENOMEM;
if (cards[i].preinit_hook && if (cards[i].preinit_hook &&
cards[i].preinit_hook (dev, PARPORT_IRQ_NONE, PARPORT_DMA_NONE)) { cards[i].preinit_hook(dev, PARPORT_IRQ_NONE, PARPORT_DMA_NONE)) {
kfree(data); kfree(data);
return -ENODEV; return -ENODEV;
} }
...@@ -3023,10 +3095,10 @@ static int parport_pc_pci_probe (struct pci_dev *dev, ...@@ -3023,10 +3095,10 @@ static int parport_pc_pci_probe (struct pci_dev *dev,
int hi = cards[i].addr[n].hi; int hi = cards[i].addr[n].hi;
int irq; int irq;
unsigned long io_lo, io_hi; unsigned long io_lo, io_hi;
io_lo = pci_resource_start (dev, lo); io_lo = pci_resource_start(dev, lo);
io_hi = 0; io_hi = 0;
if ((hi >= 0) && (hi <= 6)) if ((hi >= 0) && (hi <= 6))
io_hi = pci_resource_start (dev, hi); io_hi = pci_resource_start(dev, hi);
else if (hi > 6) else if (hi > 6)
io_lo += hi; /* Reinterpret the meaning of io_lo += hi; /* Reinterpret the meaning of
"hi" as an offset (see SYBA "hi" as an offset (see SYBA
...@@ -3034,14 +3106,14 @@ static int parport_pc_pci_probe (struct pci_dev *dev, ...@@ -3034,14 +3106,14 @@ static int parport_pc_pci_probe (struct pci_dev *dev,
/* TODO: test if sharing interrupts works */ /* TODO: test if sharing interrupts works */
irq = dev->irq; irq = dev->irq;
if (irq == IRQ_NONE) { if (irq == IRQ_NONE) {
printk (KERN_DEBUG printk(KERN_DEBUG
"PCI parallel port detected: %04x:%04x, I/O at %#lx(%#lx)\n", "PCI parallel port detected: %04x:%04x, I/O at %#lx(%#lx)\n",
parport_pc_pci_tbl[i + last_sio].vendor, parport_pc_pci_tbl[i + last_sio].vendor,
parport_pc_pci_tbl[i + last_sio].device, parport_pc_pci_tbl[i + last_sio].device,
io_lo, io_hi); io_lo, io_hi);
irq = PARPORT_IRQ_NONE; irq = PARPORT_IRQ_NONE;
} else { } else {
printk (KERN_DEBUG printk(KERN_DEBUG
"PCI parallel port detected: %04x:%04x, I/O at %#lx(%#lx), IRQ %d\n", "PCI parallel port detected: %04x:%04x, I/O at %#lx(%#lx), IRQ %d\n",
parport_pc_pci_tbl[i + last_sio].vendor, parport_pc_pci_tbl[i + last_sio].vendor,
parport_pc_pci_tbl[i + last_sio].device, parport_pc_pci_tbl[i + last_sio].device,
...@@ -3058,7 +3130,7 @@ static int parport_pc_pci_probe (struct pci_dev *dev, ...@@ -3058,7 +3130,7 @@ static int parport_pc_pci_probe (struct pci_dev *dev,
data->num = count; data->num = count;
if (cards[i].postinit_hook) if (cards[i].postinit_hook)
cards[i].postinit_hook (dev, count == 0); cards[i].postinit_hook(dev, count == 0);
if (count) { if (count) {
pci_set_drvdata(dev, data); pci_set_drvdata(dev, data);
...@@ -3092,7 +3164,7 @@ static struct pci_driver parport_pc_pci_driver = { ...@@ -3092,7 +3164,7 @@ static struct pci_driver parport_pc_pci_driver = {
.remove = __devexit_p(parport_pc_pci_remove), .remove = __devexit_p(parport_pc_pci_remove),
}; };
static int __init parport_pc_init_superio (int autoirq, int autodma) static int __init parport_pc_init_superio(int autoirq, int autodma)
{ {
const struct pci_device_id *id; const struct pci_device_id *id;
struct pci_dev *pdev = NULL; struct pci_dev *pdev = NULL;
...@@ -3103,8 +3175,9 @@ static int __init parport_pc_init_superio (int autoirq, int autodma) ...@@ -3103,8 +3175,9 @@ static int __init parport_pc_init_superio (int autoirq, int autodma)
if (id == NULL || id->driver_data >= last_sio) if (id == NULL || id->driver_data >= last_sio)
continue; continue;
if (parport_pc_superio_info[id->driver_data].probe if (parport_pc_superio_info[id->driver_data].probe(
(pdev, autoirq, autodma,parport_pc_superio_info[id->driver_data].via)) { pdev, autoirq, autodma,
parport_pc_superio_info[id->driver_data].via)) {
ret++; ret++;
} }
} }
...@@ -3113,7 +3186,10 @@ static int __init parport_pc_init_superio (int autoirq, int autodma) ...@@ -3113,7 +3186,10 @@ static int __init parport_pc_init_superio (int autoirq, int autodma)
} }
#else #else
static struct pci_driver parport_pc_pci_driver; static struct pci_driver parport_pc_pci_driver;
static int __init parport_pc_init_superio(int autoirq, int autodma) {return 0;} static int __init parport_pc_init_superio(int autoirq, int autodma)
{
return 0;
}
#endif /* CONFIG_PCI */ #endif /* CONFIG_PCI */
#ifdef CONFIG_PNP #ifdef CONFIG_PNP
...@@ -3126,44 +3202,45 @@ static const struct pnp_device_id parport_pc_pnp_tbl[] = { ...@@ -3126,44 +3202,45 @@ static const struct pnp_device_id parport_pc_pnp_tbl[] = {
{ } { }
}; };
MODULE_DEVICE_TABLE(pnp,parport_pc_pnp_tbl); MODULE_DEVICE_TABLE(pnp, parport_pc_pnp_tbl);
static int parport_pc_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *id) static int parport_pc_pnp_probe(struct pnp_dev *dev,
const struct pnp_device_id *id)
{ {
struct parport *pdata; struct parport *pdata;
unsigned long io_lo, io_hi; unsigned long io_lo, io_hi;
int dma, irq; int dma, irq;
if (pnp_port_valid(dev,0) && if (pnp_port_valid(dev, 0) &&
!(pnp_port_flags(dev,0) & IORESOURCE_DISABLED)) { !(pnp_port_flags(dev, 0) & IORESOURCE_DISABLED)) {
io_lo = pnp_port_start(dev,0); io_lo = pnp_port_start(dev, 0);
} else } else
return -EINVAL; return -EINVAL;
if (pnp_port_valid(dev,1) && if (pnp_port_valid(dev, 1) &&
!(pnp_port_flags(dev,1) & IORESOURCE_DISABLED)) { !(pnp_port_flags(dev, 1) & IORESOURCE_DISABLED)) {
io_hi = pnp_port_start(dev,1); io_hi = pnp_port_start(dev, 1);
} else } else
io_hi = 0; io_hi = 0;
if (pnp_irq_valid(dev,0) && if (pnp_irq_valid(dev, 0) &&
!(pnp_irq_flags(dev,0) & IORESOURCE_DISABLED)) { !(pnp_irq_flags(dev, 0) & IORESOURCE_DISABLED)) {
irq = pnp_irq(dev,0); irq = pnp_irq(dev, 0);
} else } else
irq = PARPORT_IRQ_NONE; irq = PARPORT_IRQ_NONE;
if (pnp_dma_valid(dev,0) && if (pnp_dma_valid(dev, 0) &&
!(pnp_dma_flags(dev,0) & IORESOURCE_DISABLED)) { !(pnp_dma_flags(dev, 0) & IORESOURCE_DISABLED)) {
dma = pnp_dma(dev,0); dma = pnp_dma(dev, 0);
} else } else
dma = PARPORT_DMA_NONE; dma = PARPORT_DMA_NONE;
dev_info(&dev->dev, "reported by %s\n", dev->protocol->name); dev_info(&dev->dev, "reported by %s\n", dev->protocol->name);
if (!(pdata = parport_pc_probe_port(io_lo, io_hi, pdata = parport_pc_probe_port(io_lo, io_hi, irq, dma, &dev->dev, 0);
irq, dma, &dev->dev, 0))) if (pdata == NULL)
return -ENODEV; return -ENODEV;
pnp_set_drvdata(dev,pdata); pnp_set_drvdata(dev, pdata);
return 0; return 0;
} }
...@@ -3205,7 +3282,7 @@ static struct platform_driver parport_pc_platform_driver = { ...@@ -3205,7 +3282,7 @@ static struct platform_driver parport_pc_platform_driver = {
/* This is called by parport_pc_find_nonpci_ports (in asm/parport.h) */ /* This is called by parport_pc_find_nonpci_ports (in asm/parport.h) */
static int __devinit __attribute__((unused)) static int __devinit __attribute__((unused))
parport_pc_find_isa_ports (int autoirq, int autodma) parport_pc_find_isa_ports(int autoirq, int autodma)
{ {
int count = 0; int count = 0;
...@@ -3229,7 +3306,7 @@ parport_pc_find_isa_ports (int autoirq, int autodma) ...@@ -3229,7 +3306,7 @@ parport_pc_find_isa_ports (int autoirq, int autodma)
* autoirq is PARPORT_IRQ_NONE, PARPORT_IRQ_AUTO, or PARPORT_IRQ_PROBEONLY * autoirq is PARPORT_IRQ_NONE, PARPORT_IRQ_AUTO, or PARPORT_IRQ_PROBEONLY
* autodma is PARPORT_DMA_NONE or PARPORT_DMA_AUTO * autodma is PARPORT_DMA_NONE or PARPORT_DMA_AUTO
*/ */
static void __init parport_pc_find_ports (int autoirq, int autodma) static void __init parport_pc_find_ports(int autoirq, int autodma)
{ {
int count = 0, err; int count = 0, err;
...@@ -3263,11 +3340,18 @@ static void __init parport_pc_find_ports (int autoirq, int autodma) ...@@ -3263,11 +3340,18 @@ static void __init parport_pc_find_ports (int autoirq, int autodma)
* syntax and keep in mind that code below is a cleaned up version. * syntax and keep in mind that code below is a cleaned up version.
*/ */
static int __initdata io[PARPORT_PC_MAX_PORTS+1] = { [0 ... PARPORT_PC_MAX_PORTS] = 0 }; static int __initdata io[PARPORT_PC_MAX_PORTS+1] = {
static int __initdata io_hi[PARPORT_PC_MAX_PORTS+1] = [0 ... PARPORT_PC_MAX_PORTS] = 0
{ [0 ... PARPORT_PC_MAX_PORTS] = PARPORT_IOHI_AUTO }; };
static int __initdata dmaval[PARPORT_PC_MAX_PORTS] = { [0 ... PARPORT_PC_MAX_PORTS-1] = PARPORT_DMA_NONE }; static int __initdata io_hi[PARPORT_PC_MAX_PORTS+1] = {
static int __initdata irqval[PARPORT_PC_MAX_PORTS] = { [0 ... PARPORT_PC_MAX_PORTS-1] = PARPORT_IRQ_PROBEONLY }; [0 ... PARPORT_PC_MAX_PORTS] = PARPORT_IOHI_AUTO
};
static int __initdata dmaval[PARPORT_PC_MAX_PORTS] = {
[0 ... PARPORT_PC_MAX_PORTS-1] = PARPORT_DMA_NONE
};
static int __initdata irqval[PARPORT_PC_MAX_PORTS] = {
[0 ... PARPORT_PC_MAX_PORTS-1] = PARPORT_IRQ_PROBEONLY
};
static int __init parport_parse_param(const char *s, int *val, static int __init parport_parse_param(const char *s, int *val,
int automatic, int none, int nofifo) int automatic, int none, int nofifo)
...@@ -3308,18 +3392,19 @@ static int __init parport_parse_dma(const char *dmastr, int *val) ...@@ -3308,18 +3392,19 @@ static int __init parport_parse_dma(const char *dmastr, int *val)
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
static int __init parport_init_mode_setup(char *str) static int __init parport_init_mode_setup(char *str)
{ {
printk(KERN_DEBUG "parport_pc.c: Specified parameter parport_init_mode=%s\n", str); printk(KERN_DEBUG
"parport_pc.c: Specified parameter parport_init_mode=%s\n", str);
if (!strcmp (str, "spp"))
parport_init_mode=1; if (!strcmp(str, "spp"))
if (!strcmp (str, "ps2")) parport_init_mode = 1;
parport_init_mode=2; if (!strcmp(str, "ps2"))
if (!strcmp (str, "epp")) parport_init_mode = 2;
parport_init_mode=3; if (!strcmp(str, "epp"))
if (!strcmp (str, "ecp")) parport_init_mode = 3;
parport_init_mode=4; if (!strcmp(str, "ecp"))
if (!strcmp (str, "ecpepp")) parport_init_mode = 4;
parport_init_mode=5; if (!strcmp(str, "ecpepp"))
parport_init_mode = 5;
return 1; return 1;
} }
#endif #endif
...@@ -3343,7 +3428,8 @@ module_param(verbose_probing, int, 0644); ...@@ -3343,7 +3428,8 @@ module_param(verbose_probing, int, 0644);
#endif #endif
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
static char *init_mode; static char *init_mode;
MODULE_PARM_DESC(init_mode, "Initialise mode for VIA VT8231 port (spp, ps2, epp, ecp or ecpepp)"); MODULE_PARM_DESC(init_mode,
"Initialise mode for VIA VT8231 port (spp, ps2, epp, ecp or ecpepp)");
module_param(init_mode, charp, 0); module_param(init_mode, charp, 0);
#endif #endif
...@@ -3374,7 +3460,7 @@ static int __init parse_parport_params(void) ...@@ -3374,7 +3460,7 @@ static int __init parse_parport_params(void)
irqval[0] = val; irqval[0] = val;
break; break;
default: default:
printk (KERN_WARNING printk(KERN_WARNING
"parport_pc: irq specified " "parport_pc: irq specified "
"without base address. Use 'io=' " "without base address. Use 'io=' "
"to specify one\n"); "to specify one\n");
...@@ -3387,7 +3473,7 @@ static int __init parse_parport_params(void) ...@@ -3387,7 +3473,7 @@ static int __init parse_parport_params(void)
dmaval[0] = val; dmaval[0] = val;
break; break;
default: default:
printk (KERN_WARNING printk(KERN_WARNING
"parport_pc: dma specified " "parport_pc: dma specified "
"without base address. Use 'io=' " "without base address. Use 'io=' "
"to specify one\n"); "to specify one\n");
...@@ -3398,7 +3484,7 @@ static int __init parse_parport_params(void) ...@@ -3398,7 +3484,7 @@ static int __init parse_parport_params(void)
#else #else
static int parport_setup_ptr __initdata = 0; static int parport_setup_ptr __initdata;
/* /*
* Acceptable parameters: * Acceptable parameters:
...@@ -3409,7 +3495,7 @@ static int parport_setup_ptr __initdata = 0; ...@@ -3409,7 +3495,7 @@ static int parport_setup_ptr __initdata = 0;
* *
* IRQ/DMA may be numeric or 'auto' or 'none' * IRQ/DMA may be numeric or 'auto' or 'none'
*/ */
static int __init parport_setup (char *str) static int __init parport_setup(char *str)
{ {
char *endptr; char *endptr;
char *sep; char *sep;
...@@ -3421,15 +3507,15 @@ static int __init parport_setup (char *str) ...@@ -3421,15 +3507,15 @@ static int __init parport_setup (char *str)
return 1; return 1;
} }
if (!strncmp (str, "auto", 4)) { if (!strncmp(str, "auto", 4)) {
irqval[0] = PARPORT_IRQ_AUTO; irqval[0] = PARPORT_IRQ_AUTO;
dmaval[0] = PARPORT_DMA_AUTO; dmaval[0] = PARPORT_DMA_AUTO;
return 1; return 1;
} }
val = simple_strtoul (str, &endptr, 0); val = simple_strtoul(str, &endptr, 0);
if (endptr == str) { if (endptr == str) {
printk (KERN_WARNING "parport=%s not understood\n", str); printk(KERN_WARNING "parport=%s not understood\n", str);
return 1; return 1;
} }
...@@ -3463,7 +3549,7 @@ static int __init parse_parport_params(void) ...@@ -3463,7 +3549,7 @@ static int __init parse_parport_params(void)
return io[0] == PARPORT_DISABLE; return io[0] == PARPORT_DISABLE;
} }
__setup ("parport=", parport_setup); __setup("parport=", parport_setup);
/* /*
* Acceptable parameters: * Acceptable parameters:
...@@ -3471,7 +3557,7 @@ __setup ("parport=", parport_setup); ...@@ -3471,7 +3557,7 @@ __setup ("parport=", parport_setup);
* parport_init_mode=[spp|ps2|epp|ecp|ecpepp] * parport_init_mode=[spp|ps2|epp|ecp|ecpepp]
*/ */
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
__setup("parport_init_mode=",parport_init_mode_setup); __setup("parport_init_mode=", parport_init_mode_setup);
#endif #endif
#endif #endif
...@@ -3495,13 +3581,13 @@ static int __init parport_pc_init(void) ...@@ -3495,13 +3581,13 @@ static int __init parport_pc_init(void)
for (i = 0; i < PARPORT_PC_MAX_PORTS; i++) { for (i = 0; i < PARPORT_PC_MAX_PORTS; i++) {
if (!io[i]) if (!io[i])
break; break;
if ((io_hi[i]) == PARPORT_IOHI_AUTO) if (io_hi[i] == PARPORT_IOHI_AUTO)
io_hi[i] = 0x400 + io[i]; io_hi[i] = 0x400 + io[i];
parport_pc_probe_port(io[i], io_hi[i], parport_pc_probe_port(io[i], io_hi[i],
irqval[i], dmaval[i], NULL, 0); irqval[i], dmaval[i], NULL, 0);
} }
} else } else
parport_pc_find_ports (irqval[0], dmaval[0]); parport_pc_find_ports(irqval[0], dmaval[0]);
return 0; return 0;
} }
...@@ -3509,9 +3595,9 @@ static int __init parport_pc_init(void) ...@@ -3509,9 +3595,9 @@ static int __init parport_pc_init(void)
static void __exit parport_pc_exit(void) static void __exit parport_pc_exit(void)
{ {
if (pci_registered_parport) if (pci_registered_parport)
pci_unregister_driver (&parport_pc_pci_driver); pci_unregister_driver(&parport_pc_pci_driver);
if (pnp_registered_parport) if (pnp_registered_parport)
pnp_unregister_driver (&parport_pc_pnp_driver); pnp_unregister_driver(&parport_pc_pnp_driver);
platform_driver_unregister(&parport_pc_platform_driver); platform_driver_unregister(&parport_pc_platform_driver);
while (!list_empty(&ports_list)) { while (!list_empty(&ports_list)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7