Merge with Linux 2.4.0-test12.

7 files changed, 756 insertions, 114 deletions

diff --git a/drivers/parport/ChangeLog b/drivers/parport/ChangeLog
index 1314e9f9d..8d3c572ab 100644
--- a/drivers/parport/ChangeLog
+++ b/drivers/parport/ChangeLog
@@ -1,3 +1,9 @@
+2000-11-21  Tim Waugh  <twaugh@redhat.com>
+
+	* parport_pc.c (parport_pc_ecp_write_block_pio): Fix
+	reverse-to-forward logic.  Spotted by Roland Kuck
+	<rci@cityweb.de>.
+
 2000-09-16  Cesar Eduardo Barros  <cesarb@nitnet.com.br>
 
 	* parport_pc.c (sio_via_686a_probe): Handle case
diff --git a/drivers/parport/Makefile b/drivers/parport/Makefile
index 95a778e96..f2f7b1d70 100644
--- a/drivers/parport/Makefile
+++ b/drivers/parport/Makefile
@@ -26,6 +26,7 @@ obj-$(CONFIG_PARPORT_AMIGA)	+= parport_amiga.o
 obj-$(CONFIG_PARPORT_MFC3)	+= parport_mfc3.o
 obj-$(CONFIG_PARPORT_ATARI)	+= parport_atari.o
 obj-$(CONFIG_PARPORT_SUNBPP)	+= parport_sunbpp.o
+obj-$(CONFIG_PARPORT_GSC)	+= parport_gsc.o
 
 # Extract lists of the multi-part drivers.
 # The 'int-*' lists are the intermediate files used to build the multi's.
diff --git a/drivers/parport/parport_amiga.c b/drivers/parport/parport_amiga.c
index 3c675b88e..e5314cec9 100644
--- a/drivers/parport/parport_amiga.c
+++ b/drivers/parport/parport_amiga.c
@@ -1,4 +1,4 @@
-/* Low-level parallel port routines for the Amiga buildin port
+/* Low-level parallel port routines for the Amiga built-in port
  *
  * Author: Joerg Dorchain <joerg@dorchain.net>
  *
@@ -6,9 +6,9 @@
  * lp_intern. code.
  *
  * The built-in Amiga parallel port provides one port at a fixed address
- * with 8 bisdirecttional data lines (D0 - D7) and 3 bidirectional status
- * lines (BUSY, POUT, SEL), 1 output control line /STROBE (raised automatically in
- * hardware when the data register is accessed), and 1 input control line
+ * with 8 bidirectional data lines (D0 - D7) and 3 bidirectional status
+ * lines (BUSY, POUT, SEL), 1 output control line /STROBE (raised automatically
+ * in hardware when the data register is accessed), and 1 input control line
  * /ACK, able to cause an interrupt, but both not directly settable by
  * software.
  */
@@ -20,22 +20,24 @@
 #include <asm/setup.h>
 #include <asm/amigahw.h>
 #include <asm/irq.h>
+#include <asm/io.h>
 #include <asm/amigaints.h>
 
 #undef DEBUG
 #ifdef DEBUG
 #define DPRINTK printk
 #else
-static inline void DPRINTK(void *nothing, ...) {}
+#define DPRINTK(x...)	do { } while (0)
 #endif
 
 static struct parport *this_port = NULL;
 
 static void amiga_write_data(struct parport *p, unsigned char data)
 {
-DPRINTK("write_data %c\n",data);
+	DPRINTK("write_data %c\n",data);
 	/* Triggers also /STROBE. This behavior cannot be changed */
 	ciaa.prb = data;
+	mb();
 }
 
 static unsigned char amiga_read_data(struct parport *p)
@@ -71,13 +73,13 @@ static unsigned char control_amiga_to_pc(unsigned char control)
 
 static void amiga_write_control(struct parport *p, unsigned char control)
 {
-DPRINTK("write_control %02x\n",control);
+	DPRINTK("write_control %02x\n",control);
 	/* No implementation possible */
 }
 	
 static unsigned char amiga_read_control( struct parport *p)
 {
-DPRINTK("read_control \n");
+	DPRINTK("read_control \n");
 	return control_amiga_to_pc(0);
 }
 
@@ -85,7 +87,7 @@ static unsigned char amiga_frob_control( struct parport *p, unsigned char mask,
 {
 	unsigned char old;
 
-DPRINTK("frob_control mask %02x, value %02x\n",mask,val);
+	DPRINTK("frob_control mask %02x, value %02x\n",mask,val);
 	old = amiga_read_control(p);
 	amiga_write_control(p, (old & ~mask) ^ val);
 	return old;
@@ -130,7 +132,7 @@ static unsigned char amiga_read_status(struct parport *p)
 	unsigned char status;
 
 	status = status_amiga_to_pc(ciab.pra & 7);
-DPRINTK("read_status %02x\n", status);
+	DPRINTK("read_status %02x\n", status);
 	return status;
 }
 
@@ -154,12 +156,14 @@ static void amiga_data_forward(struct parport *p)
 {
 	DPRINTK("forward\n");
 	ciaa.ddrb = 0xff; /* all pins output */
+	mb();
 }
 
 static void amiga_data_reverse(struct parport *p)
 {
 	DPRINTK("reverse\n");
 	ciaa.ddrb = 0; /* all pins input */
+	mb();
 }
 
 static void amiga_init_state(struct pardevice *dev, struct parport_state *s)
@@ -172,18 +176,22 @@ static void amiga_init_state(struct pardevice *dev, struct parport_state *s)
 
 static void amiga_save_state(struct parport *p, struct parport_state *s)
 {
+	mb();
 	s->u.amiga.data = ciaa.prb;
 	s->u.amiga.datadir = ciaa.ddrb;
 	s->u.amiga.status = ciab.pra & 7;
 	s->u.amiga.statusdir = ciab.ddra & 7;
+	mb();
 }
 
 static void amiga_restore_state(struct parport *p, struct parport_state *s)
 {
+	mb();
 	ciaa.prb = s->u.amiga.data;
 	ciaa.ddrb = s->u.amiga.datadir;
 	ciab.pra |= (ciab.pra & 0xf8) | s->u.amiga.status;
 	ciab.ddra |= (ciab.ddra & 0xf8) | s->u.amiga.statusdir;
+	mb();
 }
 
 static void amiga_inc_use_count(void)
@@ -238,56 +246,58 @@ static struct parport_operations pp_amiga_ops = {
 int __init parport_amiga_init(void)
 {
 	struct parport *p;
+	int err;
 
-	if (MACH_IS_AMIGA && AMIGAHW_PRESENT(AMI_PARALLEL)) {
-		if (!request_mem_region(CIAA_PHYSADDR+0x100, 1, "parallel"))
-			return 0;
-		ciaa.ddrb = 0xff;
-		ciab.ddra &= 0xf8;
-		if (!(p = parport_register_port((unsigned long)&ciaa.prb,
-					IRQ_AMIGA_CIAA_FLG, PARPORT_DMA_NONE,
-					&pp_amiga_ops))) {
-			release_mem_region(CIAA_PHYSADDR+0x100, 1);
-			return 0;
-		}
-		if (!request_irq(IRQ_AMIGA_CIAA_FLG, amiga_interrupt, 0, p->name, p)) {
-			parport_unregister_port (p);
-			release_mem_region(CIAA_PHYSADDR+0x100, 1);
-			return 0;
-		}
-
-		this_port = p;
-		printk(KERN_INFO "%s: Amiga built-in port using irq\n", p->name);
-		/* XXX: set operating mode */
-		parport_proc_register(p);
-
-		parport_announce_port(p);
-
-		return 1;
-
-	}
-	return 0;
-}
+	if (!MACH_IS_AMIGA || !AMIGAHW_PRESENT(AMI_PARALLEL))
+		return -ENODEV;
 
-#ifdef MODULE
+	err = -EBUSY;
+	if (!request_mem_region(CIAA_PHYSADDR-1+0x100, 0x100, "parallel"))
+		goto out_mem;
 
-MODULE_AUTHOR("Joerg Dorchain <joerg@dorchain.net>");
-MODULE_DESCRIPTION("Parport Driver for Amiga builtin Port");
-MODULE_SUPPORTED_DEVICE("Amiga builtin Parallel Port");
+	ciaa.ddrb = 0xff;
+	ciab.ddra &= 0xf8;
+	mb();
 
-int init_module(void)
-{
-	return ! parport_amiga_init();
+	p = parport_register_port((unsigned long)&ciaa.prb, IRQ_AMIGA_CIAA_FLG,
+				   PARPORT_DMA_NONE, &pp_amiga_ops);
+	if (!p)
+		goto out_port;
+
+	err = request_irq(IRQ_AMIGA_CIAA_FLG, amiga_interrupt, 0, p->name, p);
+	if (err)
+		goto out_irq;
+
+	this_port = p;
+	printk(KERN_INFO "%s: Amiga built-in port using irq\n", p->name);
+	/* XXX: set operating mode */
+	parport_proc_register(p);
+
+	parport_announce_port(p);
+
+	return 0;
+
+out_irq:
+	parport_unregister_port(p);
+out_port:
+	release_mem_region(CIAA_PHYSADDR-1+0x100, 0x100);
+out_mem:
+	return err;
 }
 
-void cleanup_module(void)
+void __exit parport_amiga_exit(void)
 {
 	if (this_port->irq != PARPORT_IRQ_NONE)
 		free_irq(IRQ_AMIGA_CIAA_FLG, this_port);
 	parport_proc_unregister(this_port);
 	parport_unregister_port(this_port);
-	release_mem_region(CIAA_PHYSADDR+0x100, 1);
+	release_mem_region(CIAA_PHYSADDR-1+0x100, 0x100);
 }
-#endif
 
 
+MODULE_AUTHOR("Joerg Dorchain <joerg@dorchain.net>");
+MODULE_DESCRIPTION("Parport Driver for Amiga builtin Port");
+MODULE_SUPPORTED_DEVICE("Amiga builtin Parallel Port");
+
+module_init(parport_amiga_init)
+module_exit(parport_amiga_exit)
diff --git a/drivers/parport/parport_atari.c b/drivers/parport/parport_atari.c
index 8df0e5a33..c6ee0ac4b 100644
--- a/drivers/parport/parport_atari.c
+++ b/drivers/parport/parport_atari.c
@@ -113,6 +113,46 @@ parport_atari_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 }
 
 static void
+parport_atari_enable_irq(struct parport *p)
+{
+	enable_irq(IRQ_MFP_BUSY);
+}
+
+static void
+parport_atari_disable_irq(struct parport *p)
+{
+	disable_irq(IRQ_MFP_BUSY);
+}
+
+static void
+parport_atari_data_forward(struct parport *p)
+{
+	unsigned long flags;
+
+	save_flags(flags);
+	cli();
+	/* Soundchip port B as output. */
+	sound_ym.rd_data_reg_sel = 7;
+	sound_ym.wd_data = sound_ym.rd_data_reg_sel | 0x40;
+	restore_flags(flags);
+}
+
+static void
+parport_atari_data_reverse(struct parport *p)
+{
+#if 0 /* too dangerous, can kill sound chip */
+	unsigned long flags;
+
+	save_flags(flags);
+	cli();
+	/* Soundchip port B as input. */
+	sound_ym.rd_data_reg_sel = 7;
+	sound_ym.wd_data = sound_ym.rd_data_reg_sel & ~0x40;
+	restore_flags(flags);
+#endif
+}
+
+static void
 parport_atari_inc_use_count(void)
 {
 	MOD_INC_USE_COUNT;
@@ -134,11 +174,11 @@ static struct parport_operations parport_atari_ops = {
 
 	parport_atari_read_status,
 
-	NULL, /* enable_irq - FIXME */
-	NULL, /* disable_irq - FIXME */
+	parport_atari_enable_irq,
+	parport_atari_disable_irq,
 
-	NULL, /* data_forward - FIXME */
-	NULL, /* data_reverse - FIXME */
+	parport_atari_data_forward,
+	parport_atari_data_reverse,
 
 	parport_atari_init_state,
 	parport_atari_save_state,
@@ -147,18 +187,18 @@ static struct parport_operations parport_atari_ops = {
 	parport_atari_inc_use_count,
 	parport_atari_dec_use_count,
 
-	NULL, /* epp_write_data */
-	NULL, /* epp_read_data */
-	NULL, /* epp_write_addr */
-	NULL, /* epp_read_addr */
+	parport_ieee1284_epp_write_data,
+	parport_ieee1284_epp_read_data,
+	parport_ieee1284_epp_write_addr,
+	parport_ieee1284_epp_read_addr,
 
-	NULL, /* ecp_write_data */
-	NULL, /* ecp_read_data */
-	NULL, /* ecp_write_addr */
+	parport_ieee1284_ecp_write_data,
+	parport_ieee1284_ecp_read_data,
+	parport_ieee1284_ecp_write_addr,
 
-	NULL, /* compat_write_data */
-	NULL, /* nibble_read_data */
-	NULL, /* byte_read_data */
+	parport_ieee1284_write_compat,
+	parport_ieee1284_read_nibble,
+	parport_ieee1284_read_byte,
 };
 
 
diff --git a/drivers/parport/parport_gsc.c b/drivers/parport/parport_gsc.c
new file mode 100644
index 000000000..8e4b177e3
--- /dev/null
+++ b/drivers/parport/parport_gsc.c
@@ -0,0 +1,573 @@
+/*
+ *      Low-level parallel-support for PC-style hardware integrated in the 
+ *	LASI-Controller (on GSC-Bus) for HP-PARISC Workstations
+ *
+ *	This program is free software; you can redistribute it and/or modify
+ *	it under the terms of the GNU General Public License as published by
+ *      the Free Software Foundation; either version 2 of the License, or
+ *      (at your option) any later version.
+ *
+ *	by Helge Deller <deller@gmx.de>
+ *
+ * 
+ * based on parport_pc.c by 
+ * 	    Grant Guenther <grant@torque.net>
+ * 	    Phil Blundell <Philip.Blundell@pobox.com>
+ *          Tim Waugh <tim@cyberelk.demon.co.uk>
+ *	    Jose Renau <renau@acm.org>
+ *          David Campbell <campbell@torque.net>
+ *          Andrea Arcangeli
+ */
+
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/sched.h>
+#include <linux/delay.h>
+#include <linux/errno.h>
+#include <linux/interrupt.h>
+#include <linux/ioport.h>
+#include <linux/kernel.h>
+#include <linux/malloc.h>
+#include <linux/pci.h>
+#include <linux/sysctl.h>
+
+#include <asm/io.h>
+#include <asm/dma.h>
+#include <asm/uaccess.h>
+
+#include <linux/parport.h>
+#include <asm/gsc.h>
+#include <asm/pdc.h>
+#include <asm/hardware.h>
+#include <asm/parport_gsc.h>
+
+
+#undef DEBUG	/* undef for production */
+
+#ifdef DEBUG
+#define DPRINTK  printk
+#else
+#define DPRINTK(stuff...)
+#endif
+
+
+/*
+ * Clear TIMEOUT BIT in EPP MODE
+ *
+ * This is also used in SPP detection.
+ */
+static int clear_epp_timeout(struct parport *pb)
+{
+	unsigned char r;
+
+	if (!(parport_gsc_read_status(pb) & 0x01))
+		return 1;
+
+	/* To clear timeout some chips require double read */
+	parport_gsc_read_status(pb);
+	r = parport_gsc_read_status(pb);
+	parport_writeb (r | 0x01, STATUS (pb)); /* Some reset by writing 1 */
+	parport_writeb (r & 0xfe, STATUS (pb)); /* Others by writing 0 */
+	r = parport_gsc_read_status(pb);
+
+	return !(r & 0x01);
+}
+
+/*
+ * Access functions.
+ *
+ * Most of these aren't static because they may be used by the
+ * parport_xxx_yyy macros.  extern __inline__ versions of several
+ * of these are in parport_gsc.h.
+ */
+
+static void parport_gsc_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+{
+	DPRINTK(__FILE__ ": got IRQ\n");
+	parport_generic_irq(irq, (struct parport *) dev_id, regs);
+}
+
+void parport_gsc_write_data(struct parport *p, unsigned char d)
+{
+	DPRINTK(__FILE__ ": write (0x%02x) %c \n", d, d);
+	parport_writeb (d, DATA (p));
+}
+
+unsigned char parport_gsc_read_data(struct parport *p)
+{
+#ifdef DEBUG
+	unsigned char c = parport_readb (DATA (p));
+	DPRINTK(__FILE__ ": read (0x%02x) %c\n", c,c);
+	return c;
+#else
+	return parport_readb (DATA (p));
+#endif
+}
+
+void parport_gsc_write_control(struct parport *p, unsigned char d)
+{
+	const unsigned char wm = (PARPORT_CONTROL_STROBE |
+				  PARPORT_CONTROL_AUTOFD |
+				  PARPORT_CONTROL_INIT |
+				  PARPORT_CONTROL_SELECT);
+
+	/* Take this out when drivers have adapted to the newer interface. */
+	if (d & 0x20) {
+		printk (KERN_DEBUG "%s (%s): use data_reverse for this!\n",
+			p->name, p->cad->name);
+		parport_gsc_data_reverse (p);
+	}
+
+	__parport_gsc_frob_control (p, wm, d & wm);
+}
+
+unsigned char parport_gsc_read_control(struct parport *p)
+{
+	const unsigned char wm = (PARPORT_CONTROL_STROBE |
+				  PARPORT_CONTROL_AUTOFD |
+				  PARPORT_CONTROL_INIT |
+				  PARPORT_CONTROL_SELECT);
+	const struct parport_gsc_private *priv = p->physport->private_data;
+	return priv->ctr & wm; /* Use soft copy */
+}
+
+unsigned char parport_gsc_frob_control (struct parport *p, unsigned char mask,
+				       unsigned char val)
+{
+	const unsigned char wm = (PARPORT_CONTROL_STROBE |
+				  PARPORT_CONTROL_AUTOFD |
+				  PARPORT_CONTROL_INIT |
+				  PARPORT_CONTROL_SELECT);
+
+	/* Take this out when drivers have adapted to the newer interface. */
+	if (mask & 0x20) {
+		printk (KERN_DEBUG "%s (%s): use data_%s for this!\n",
+			p->name, p->cad->name,
+			(val & 0x20) ? "reverse" : "forward");
+		if (val & 0x20)
+			parport_gsc_data_reverse (p);
+		else
+			parport_gsc_data_forward (p);
+	}
+
+	/* Restrict mask and val to control lines. */
+	mask &= wm;
+	val &= wm;
+
+	return __parport_gsc_frob_control (p, mask, val);
+}
+
+unsigned char parport_gsc_read_status(struct parport *p)
+{
+	return parport_readb (STATUS (p));
+}
+
+void parport_gsc_disable_irq(struct parport *p)
+{
+	__parport_gsc_frob_control (p, 0x10, 0);
+}
+
+void parport_gsc_enable_irq(struct parport *p)
+{
+	__parport_gsc_frob_control (p, 0x10, 0x10);
+}
+
+void parport_gsc_data_forward (struct parport *p)
+{
+	__parport_gsc_frob_control (p, 0x20, 0);
+}
+
+void parport_gsc_data_reverse (struct parport *p)
+{
+	__parport_gsc_frob_control (p, 0x20, 0x20);
+}
+
+void parport_gsc_init_state(struct pardevice *dev, struct parport_state *s)
+{
+	s->u.pc.ctr = 0xc | (dev->irq_func ? 0x10 : 0x0);
+}
+
+void parport_gsc_save_state(struct parport *p, struct parport_state *s)
+{
+	s->u.pc.ctr = parport_readb (CONTROL (p));
+}
+
+void parport_gsc_restore_state(struct parport *p, struct parport_state *s)
+{
+	parport_writeb (s->u.pc.ctr, CONTROL (p));
+}
+
+void parport_gsc_inc_use_count(void)
+{
+#ifdef MODULE
+	MOD_INC_USE_COUNT;
+#endif
+}
+
+void parport_gsc_dec_use_count(void)
+{
+#ifdef MODULE
+	MOD_DEC_USE_COUNT;
+#endif
+}
+
+
+struct parport_operations parport_gsc_ops = 
+{
+	write_data:	parport_gsc_write_data,
+	read_data:	parport_gsc_read_data,
+
+	write_control:	parport_gsc_write_control,
+	read_control:	parport_gsc_read_control,
+	frob_control:	parport_gsc_frob_control,
+
+	read_status:	parport_gsc_read_status,
+
+	enable_irq:	parport_gsc_enable_irq,
+	disable_irq:	parport_gsc_disable_irq,
+
+	data_forward:	parport_gsc_data_forward,
+	data_reverse:	parport_gsc_data_reverse,
+
+	init_state:	parport_gsc_init_state,
+	save_state:	parport_gsc_save_state,
+	restore_state:	parport_gsc_restore_state,
+
+	inc_use_count:	parport_gsc_inc_use_count,
+	dec_use_count:	parport_gsc_dec_use_count,
+
+	epp_write_data:	parport_ieee1284_epp_write_data,
+	epp_read_data:	parport_ieee1284_epp_read_data,
+	epp_write_addr:	parport_ieee1284_epp_write_addr,
+	epp_read_addr:	parport_ieee1284_epp_read_addr,
+
+	ecp_write_data:	parport_ieee1284_ecp_write_data,
+	ecp_read_data:	parport_ieee1284_ecp_read_data,
+	ecp_write_addr:	parport_ieee1284_ecp_write_addr,
+
+	compat_write_data: 	parport_ieee1284_write_compat,
+	nibble_read_data:	parport_ieee1284_read_nibble,
+	byte_read_data:		parport_ieee1284_read_byte,
+};
+
+/* --- Mode detection ------------------------------------- */
+
+/*
+ * Checks for port existence, all ports support SPP MODE
+ */
+static int __devinit parport_SPP_supported(struct parport *pb)
+{
+	unsigned char r, w;
+
+	/*
+	 * first clear an eventually pending EPP timeout 
+	 * I (sailer@ife.ee.ethz.ch) have an SMSC chipset
+	 * that does not even respond to SPP cycles if an EPP
+	 * timeout is pending
+	 */
+	clear_epp_timeout(pb);
+
+	/* Do a simple read-write test to make sure the port exists. */
+	w = 0xc;
+	parport_writeb (w, CONTROL (pb));
+
+	/* Is there a control register that we can read from?  Some
+	 * ports don't allow reads, so read_control just returns a
+	 * software copy. Some ports _do_ allow reads, so bypass the
+	 * software copy here.  In addition, some bits aren't
+	 * writable. */
+	r = parport_readb (CONTROL (pb));
+	if ((r & 0xf) == w) {
+		w = 0xe;
+		parport_writeb (w, CONTROL (pb));
+		r = parport_readb (CONTROL (pb));
+		parport_writeb (0xc, CONTROL (pb));
+		if ((r & 0xf) == w)
+			return PARPORT_MODE_PCSPP;
+	}
+
+	/* Try the data register.  The data lines aren't tri-stated at
+	 * this stage, so we expect back what we wrote. */
+	w = 0xaa;
+	parport_gsc_write_data (pb, w);
+	r = parport_gsc_read_data (pb);
+	if (r == w) {
+		w = 0x55;
+		parport_gsc_write_data (pb, w);
+		r = parport_gsc_read_data (pb);
+		if (r == w)
+			return PARPORT_MODE_PCSPP;
+	}
+
+	return 0;
+}
+
+/* Detect PS/2 support.
+ *
+ * Bit 5 (0x20) sets the PS/2 data direction; setting this high
+ * allows us to read data from the data lines.  In theory we would get back
+ * 0xff but any peripheral attached to the port may drag some or all of the
+ * lines down to zero.  So if we get back anything that isn't the contents
+ * of the data register we deem PS/2 support to be present. 
+ *
+ * Some SPP ports have "half PS/2" ability - you can't turn off the line
+ * drivers, but an external peripheral with sufficiently beefy drivers of
+ * its own can overpower them and assert its own levels onto the bus, from
+ * where they can then be read back as normal.  Ports with this property
+ * and the right type of device attached are likely to fail the SPP test,
+ * (as they will appear to have stuck bits) and so the fact that they might
+ * be misdetected here is rather academic. 
+ */
+
+static int __devinit parport_PS2_supported(struct parport *pb)
+{
+	int ok = 0;
+  
+	clear_epp_timeout(pb);
+
+	/* try to tri-state the buffer */
+	parport_gsc_data_reverse (pb);
+	
+	parport_gsc_write_data(pb, 0x55);
+	if (parport_gsc_read_data(pb) != 0x55) ok++;
+
+	parport_gsc_write_data(pb, 0xaa);
+	if (parport_gsc_read_data(pb) != 0xaa) ok++;
+
+	/* cancel input mode */
+	parport_gsc_data_forward (pb);
+
+	if (ok) {
+		pb->modes |= PARPORT_MODE_TRISTATE;
+	} else {
+		struct parport_gsc_private *priv = pb->private_data;
+		priv->ctr_writable &= ~0x20;
+	}
+
+	return ok;
+}
+
+
+/* --- Initialisation code -------------------------------- */
+
+struct parport *__devinit parport_gsc_probe_port (unsigned long base,
+						 unsigned long base_hi,
+						 int irq, int dma,
+						 struct pci_dev *dev)
+{
+	struct parport_gsc_private *priv;
+	struct parport_operations *ops;
+	struct parport tmp;
+	struct parport *p = &tmp;
+
+	if (check_region(base, 3)) 
+	    return NULL;
+	    
+	priv = kmalloc (sizeof (struct parport_gsc_private), GFP_KERNEL);
+	if (!priv) {
+		printk (KERN_DEBUG "parport (0x%lx): no memory!\n", base);
+		return NULL;
+	}
+	ops = kmalloc (sizeof (struct parport_operations), GFP_KERNEL);
+	if (!ops) {
+		printk (KERN_DEBUG "parport (0x%lx): no memory for ops!\n",
+			base);
+		kfree (priv);
+		return NULL;
+	}
+	memcpy (ops, &parport_gsc_ops, sizeof (struct parport_operations));
+	priv->ctr = 0xc;
+	priv->ctr_writable = 0xff;
+	priv->dma_buf = 0;
+	priv->dma_handle = 0;
+	priv->dev = dev;
+	p->base = base;
+	p->base_hi = base_hi;
+	p->irq = irq;
+	p->dma = dma;
+	p->modes = PARPORT_MODE_PCSPP | PARPORT_MODE_SAFEININT;
+	p->ops = ops;
+	p->private_data = priv;
+	p->physport = p;
+	if (!parport_SPP_supported (p)) {
+		/* No port. */
+		kfree (priv);
+		return NULL;
+	}
+	parport_PS2_supported (p);
+
+	if (!(p = parport_register_port(base, PARPORT_IRQ_NONE,
+					PARPORT_DMA_NONE, ops))) {
+		kfree (priv);
+		kfree (ops);
+		return NULL;
+	}
+
+	p->base_hi = base_hi;
+	p->modes = tmp.modes;
+	p->size = (p->modes & PARPORT_MODE_EPP)?8:3;
+	p->private_data = priv;
+
+	printk(KERN_INFO "%s: PC-style at 0x%lx", p->name, p->base);
+	p->irq = irq;
+	if (p->irq == PARPORT_IRQ_AUTO) {
+		p->irq = PARPORT_IRQ_NONE;
+	}
+	if (p->irq != PARPORT_IRQ_NONE) {
+		printk(", irq %d", p->irq);
+
+		if (p->dma == PARPORT_DMA_AUTO) {
+			p->dma = PARPORT_DMA_NONE;
+		}
+	}
+	if (p->dma == PARPORT_DMA_AUTO) /* To use DMA, giving the irq
+                                           is mandatory (see above) */
+		p->dma = PARPORT_DMA_NONE;
+
+	printk(" [");
+#define printmode(x) {if(p->modes&PARPORT_MODE_##x){printk("%s%s",f?",":"",#x);f++;}}
+	{
+		int f = 0;
+		printmode(PCSPP);
+		printmode(TRISTATE);
+		printmode(COMPAT)
+		printmode(EPP);
+//		printmode(ECP);
+//		printmode(DMA);
+	}
+#undef printmode
+	printk("]\n");
+	parport_proc_register(p);
+
+	request_region (p->base, 3, p->name);
+	if (p->size > 3)
+		request_region (p->base + 3, p->size - 3, p->name);
+	if (p->modes & PARPORT_MODE_ECP)
+		request_region (p->base_hi, 3, p->name);
+
+	if (p->irq != PARPORT_IRQ_NONE) {
+		if (request_irq (p->irq, parport_gsc_interrupt,
+				 0, p->name, p)) {
+			printk (KERN_WARNING "%s: irq %d in use, "
+				"resorting to polled operation\n",
+				p->name, p->irq);
+			p->irq = PARPORT_IRQ_NONE;
+			p->dma = PARPORT_DMA_NONE;
+		}
+	}
+
+	/* Done probing.  Now put the port into a sensible start-up state. */
+
+	parport_gsc_write_data(p, 0);
+	parport_gsc_data_forward (p);
+
+	/* Now that we've told the sharing engine about the port, and
+	   found out its characteristics, let the high-level drivers
+	   know about it. */
+	parport_announce_port (p);
+
+	return p;
+}
+
+
+#define PARPORT_GSC_OFFSET 0x800
+
+static int __initdata parport_count;
+
+static int __init 
+parport_init_chip(struct hp_device *d, struct pa_iodc_driver *dri)
+{
+	unsigned long port;
+	int irq;
+
+	irq = busdevice_alloc_irq(d); 
+
+	if (!irq) {
+	    printk("IRQ not found for parallel device at 0x%p\n", d->hpa);
+	    return -ENODEV;
+	}
+
+	port = ((unsigned long) d->hpa) + PARPORT_GSC_OFFSET;
+	
+	/* 
+	    some older machines with ASP-chip don't support the enhanced parport modes 
+	*/
+	if (!pdc_add_valid( (void *)(port+4))) {
+	    /* Initialize bidirectional-mode (0x10) & data-tranfer-mode #1 (0x20) */
+	    printk("%s: initialize bidirectional-mode.\n", __FUNCTION__);
+	    parport_writeb ( (0x10 + 0x20), port + 4);
+	} else {
+	    printk("%s: enhanced parport-modes not supported.\n", __FUNCTION__);
+	}
+	
+	if (parport_gsc_probe_port(port, 0, 
+		    irq, /* PARPORT_IRQ_NONE */
+		    PARPORT_DMA_NONE, NULL))
+	    parport_count++;
+
+	return 0;
+}
+
+static struct pa_iodc_driver parport_drivers_for[] __initdata = {
+  {HPHW_FIO, 0x0, 0x0, 0x74, 0x0, 0,			/* 715/64 */
+	DRIVER_CHECK_SVERSION + DRIVER_CHECK_HWTYPE,
+	"parallel device", "HP 7xx - Series", (void *) parport_init_chip},
+  { 0 }
+};
+
+int __init 
+parport_gsc_init ( void )
+{
+	parport_count = 0;
+	
+	register_driver(parport_drivers_for);
+
+	return parport_count;
+}
+
+/* Exported symbols. */
+EXPORT_NO_SYMBOLS;
+
+
+#ifdef MODULE
+
+MODULE_AUTHOR("Helge Deller <deller@gmx.de>");
+MODULE_DESCRIPTION("HP-PARISC PC-style parallel port driver");
+MODULE_SUPPORTED_DEVICE("integrated PC-style parallel port");
+
+int init_module(void)
+{	
+	return !parport_gsc_init ();
+}
+
+void cleanup_module(void)
+{
+	struct parport *p = parport_enumerate(), *tmp;
+	while (p) {
+		tmp = p->next;
+		if (p->modes & PARPORT_MODE_PCSPP) { 
+			struct parport_gsc_private *priv = p->private_data;
+			struct parport_operations *ops = p->ops;
+			if (p->dma != PARPORT_DMA_NONE)
+				free_dma(p->dma);
+			if (p->irq != PARPORT_IRQ_NONE)
+				free_irq(p->irq, p);
+			release_region(p->base, 3);
+			if (p->size > 3)
+				release_region(p->base + 3, p->size - 3);
+			if (p->modes & PARPORT_MODE_ECP)
+				release_region(p->base_hi, 3);
+			parport_proc_unregister(p);
+			if (priv->dma_buf)
+				pci_free_consistent(priv->dev, PAGE_SIZE,
+						    priv->dma_buf,
+						    priv->dma_handle);
+			kfree (p->private_data);
+			parport_unregister_port(p);
+			kfree (ops); /* hope no-one cached it */
+		}
+		p = tmp;
+	}
+}
+#endif
diff --git a/drivers/parport/parport_mfc3.c b/drivers/parport/parport_mfc3.c
index 19045439e..51e80b4ce 100644
--- a/drivers/parport/parport_mfc3.c
+++ b/drivers/parport/parport_mfc3.c
@@ -332,75 +332,83 @@ static struct parport_operations pp_mfc3_ops = {
 int __init parport_mfc3_init(void)
 {
 	struct parport *p;
-	int pias = 0;
+	int pias;
 	struct pia *pp;
 	struct zorro_dev *z = NULL;
 
 	if (!MACH_IS_AMIGA)
-		return 0;
+		return -ENODEV;
 
 	while ((z = zorro_find_device(ZORRO_PROD_BSC_MULTIFACE_III, z))) {
 		unsigned long piabase = z->resource.start+PIABASE;
 		if (!request_mem_region(piabase, sizeof(struct pia), "PIA"))
 			continue;
+
 		pp = (struct pia *)ZTWO_VADDR(piabase);
-		if (pias < MAX_MFC) {
-			pp->crb = 0;
-			pp->pddrb = 255; /* all data pins output */
-			pp->crb = PIA_DDR|32|8;
-			dummy = pp->pddrb; /* reading clears interrupt */
-			pp->cra = 0;
-			pp->pddra = 0xe0; /* /RESET,  /DIR ,/AUTO-FEED output */
-			pp->cra = PIA_DDR;
-			pp->ppra = 0; /* reset printer */
-			udelay(10);
-			pp->ppra = 128;
-			if ((p = parport_register_port((unsigned long)pp,
-				IRQ_AMIGA_PORTS, PARPORT_DMA_NONE,
-				&pp_mfc3_ops))) {
-				this_port[pias++] = p;
-				printk(KERN_INFO "%s: Multiface III port using irq\n", p->name);
-				/* XXX: set operating mode */
-				parport_proc_register(p);
-
-				if (p->irq != PARPORT_IRQ_NONE)
-					if (use_cnt++ == 0)
-						if (request_irq(IRQ_AMIGA_PORTS, mfc3_interrupt, SA_SHIRQ, p->name, &pp_mfc3_ops))
-							use_cnt--;
-
-				p->private_data = (void *)piabase;
-				parport_announce_port (p);
-			}
+		pp->crb = 0;
+		pp->pddrb = 255; /* all data pins output */
+		pp->crb = PIA_DDR|32|8;
+		dummy = pp->pddrb; /* reading clears interrupt */
+		pp->cra = 0;
+		pp->pddra = 0xe0; /* /RESET,  /DIR ,/AUTO-FEED output */
+		pp->cra = PIA_DDR;
+		pp->ppra = 0; /* reset printer */
+		udelay(10);
+		pp->ppra = 128;
+		p = parport_register_port((unsigned long)pp, IRQ_AMIGA_PORTS,
+					  PARPORT_DMA_NONE, &pp_mfc3_ops);
+		if (!p)
+			goto out_port;
+
+		if (p->irq != PARPORT_IRQ_NONE) {
+			if (use_cnt++ == 0)
+				if (request_irq(IRQ_AMIGA_PORTS, mfc3_interrupt, SA_SHIRQ, p->name, &pp_mfc3_ops))
+					goto out_irq;
 		}
-	}
-	return pias;
-}
 
-#ifdef MODULE
+		this_port[pias++] = p;
+		printk(KERN_INFO "%s: Multiface III port using irq\n", p->name);
+		/* XXX: set operating mode */
+		parport_proc_register(p);
 
-MODULE_AUTHOR("Joerg Dorchain <joerg@dorchain.net>");
-MODULE_DESCRIPTION("Parport Driver for Multiface 3 expansion cards Paralllel Port");
-MODULE_SUPPORTED_DEVICE("Multiface 3 Parallel Port");
+		p->private_data = (void *)piabase;
+		parport_announce_port (p);
 
-int init_module(void)
-{
-	return ! parport_mfc3_init();
+		if (pias >= MAX_MFC)
+			break;
+		continue;
+
+	out_irq:
+		parport_unregister_port(p);
+	out_port:
+		release_mem_region(piabase, sizeof(struct pia));
+	}
+
+	return pias ? 0 : -ENODEV;
 }
 
-void cleanup_module(void)
+void __exit parport_mfc3_exit(void)
 {
 	int i;
 
-	for (i = 0; i < MAX_MFC; i++)
-		if (this_port[i] != NULL) {
-			if (p->irq != PARPORT_IRQ_NONE) 
-				if (--use_cnt == 0) 
-			free_irq(IRQ_AMIGA_PORTS, &pp_mfc3_ops);
-			parport_proc_unregister(this_port[i]);
-			parport_unregister_port(this_port[i]);
-			release_mem_region(ZTWO_PADDR(this_port[i]->private_data), sizeof(struct pia));
+	for (i = 0; i < MAX_MFC; i++) {
+		if (!this_port[i])
+			continue;
+		if (!this_port[i]->irq != PARPORT_IRQ_NONE) {
+			if (--use_cnt == 0) 
+				free_irq(IRQ_AMIGA_PORTS, &pp_mfc3_ops);
 		}
+		parport_proc_unregister(this_port[i]);
+		parport_unregister_port(this_port[i]);
+		release_mem_region(ZTWO_PADDR(this_port[i]->private_data), sizeof(struct pia));
+	}
 }
-#endif
 
 
+MODULE_AUTHOR("Joerg Dorchain <joerg@dorchain.net>");
+MODULE_DESCRIPTION("Parport Driver for Multiface 3 expansion cards Paralllel Port");
+MODULE_SUPPORTED_DEVICE("Multiface 3 Parallel Port");
+
+module_init(parport_mfc3_init)
+module_exit(parport_mfc3_exit)
+
diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c
index 952eaec41..fe6721c34 100644
--- a/drivers/parport/parport_pc.c
+++ b/drivers/parport/parport_pc.c
@@ -778,9 +778,13 @@ size_t parport_pc_ecp_write_block_pio (struct parport *port,
 	/* Switch to forward mode if necessary. */
 	if (port->physport->ieee1284.phase != IEEE1284_PH_FWD_IDLE) {
 		/* Event 47: Set nInit high. */
-		parport_frob_control (port, PARPORT_CONTROL_INIT, 0);
+		parport_frob_control (port,
+				      PARPORT_CONTROL_INIT
+				      | PARPORT_CONTROL_AUTOFD,
+				      PARPORT_CONTROL_INIT
+				      | PARPORT_CONTROL_AUTOFD);
 
-		/* Event 40: PError goes high. */
+		/* Event 49: PError goes high. */
 		r = parport_wait_peripheral (port,
 					     PARPORT_STATUS_PAPEROUT,
 					     PARPORT_STATUS_PAPEROUT);