o Merge with Linux 2.1.116.

 o New Newport console code.
 o New G364 console code.

1 files changed, 27 insertions, 3 deletions

diff --git a/include/linux/parport_pc.h b/include/linux/parport_pc.h
index 45f4c0fb8..b61a970a7 100644
--- a/include/linux/parport_pc.h
+++ b/include/linux/parport_pc.h
@@ -8,19 +8,41 @@
 #define ECONTROL 0x402
 #define CONFIGB  0x401
 #define CONFIGA  0x400
-#define EPPREG   0x4
+#define EPPDATA  0x4
+#define EPPADDR  0x3
 #define CONTROL  0x2
 #define STATUS   0x1
 #define DATA     0
 
+extern int parport_pc_epp_clear_timeout(struct parport *pb);
+
+
 extern __inline__ void parport_pc_write_epp(struct parport *p, unsigned char d)
 {
-	outb(d, p->base+EPPREG);
+	outb(d, p->base+EPPDATA);
 }
 
 extern __inline__ unsigned char parport_pc_read_epp(struct parport *p)
 {
-	return inb(p->base+EPPREG);
+	return inb(p->base+EPPDATA);
+}
+
+extern __inline__ void parport_pc_write_epp_addr(struct parport *p, unsigned char d)
+{
+	outb(d, p->base+EPPADDR);
+}
+
+extern __inline__ unsigned char parport_pc_read_epp_addr(struct parport *p)
+{
+	return inb(p->base+EPPADDR);
+}
+
+extern __inline__ int parport_pc_check_epp_timeout(struct parport *p)
+{
+	if (!(inb(p->base+STATUS) & 1))
+		return 0;
+	parport_pc_epp_clear_timeout(p);
+	return 1;
 }
 
 extern __inline__ unsigned char parport_pc_read_configb(struct parport *p)
@@ -96,6 +118,8 @@ extern void parport_pc_release_resources(struct parport *p);
 
 extern int parport_pc_claim_resources(struct parport *p);
 
+extern void parport_pc_init_state(struct parport_state *s);
+
 extern void parport_pc_save_state(struct parport *p, struct parport_state *s);
 
 extern void parport_pc_restore_state(struct parport *p, struct parport_state *s);