patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / drivers / block / paride / epat.c

diff --git a/drivers/block/paride/epat.c b/drivers/block/paride/epat.c
index 4f090dc..55d1c0a 100644 (file)
--- a/drivers/block/paride/epat.c
+++ b/drivers/block/paride/epat.c
@@ -31,6 +31,12 @@
 #define j44(a,b)               (((a>>4)&0x0f)+(b&0xf0))
 #define j53(a,b)               (((a>>3)&0x1f)+((b<<4)&0xe0))
 
+static int epatc8;
+
+module_param(epatc8, int, 0);
+MODULE_PARM_DESC(epatc8, "support for the Shuttle EP1284 chip, "
+       "used in any recent Imation SuperDisk (LS-120) drive.");
+
 /* cont =  0   IDE register file
    cont =  1   IDE control registers
    cont =  2   internal EPAT registers
@@ -209,15 +215,18 @@ static void epat_connect ( PIA *pi )
 {       pi->saved_r0 = r0();
         pi->saved_r2 = r2();
 
-#ifdef CONFIG_PARIDE_EPATC8
        /* Initialize the chip */
-        CPP(0);CPP(0x40);CPP(0xe0);              
-        w0(0);w2(1);w2(4);
-        WR(0x8,0x12);WR(0xc,0x14);WR(0x12,0x10);
-        WR(0xe,0xf);WR(0xf,4);
-     /* WR(0xe,0xa);WR(0xf,4); */
-        WR(0xe,0xd);WR(0xf,0);
-     /* CPP(0x30); */
+       CPP(0);
+
+       if (epatc8) {
+               CPP(0x40);CPP(0xe0);
+               w0(0);w2(1);w2(4);
+               WR(0x8,0x12);WR(0xc,0x14);WR(0x12,0x10);
+               WR(0xe,0xf);WR(0xf,4);
+               /* WR(0xe,0xa);WR(0xf,4); */
+               WR(0xe,0xd);WR(0xf,0);
+               /* CPP(0x30); */
+       }
 
         /* Connect to the chip */
        CPP(0xe0);
@@ -227,15 +236,10 @@ static void epat_connect ( PIA *pi )
           /* Request EPP */
           w0(0x40);w2(6);w2(7);w2(4);w2(0xc);w2(4);
         }
-#else
-       CPP(0); CPP(0xe0);
-       w0(0); w2(1); w2(4);
-       if (pi->mode >= 3) {
-               w0(0); w2(1); w2(4); w2(0xc);
-               w0(0x40); w2(6); w2(7); w2(4); w2(0xc); w2(4);
+
+       if (!epatc8) {
+               WR(8,0x10); WR(0xc,0x14); WR(0xa,0x38); WR(0x12,0x10);
        }
-       WR(8,0x10); WR(0xc,0x14); WR(0xa,0x38); WR(0x12,0x10);
-#endif
 }
 
 static void epat_disconnect (PIA *pi)
@@ -320,6 +324,9 @@ static struct pi_protocol epat = {
 
 static int __init epat_init(void)
 {
+#ifdef CONFIG_PARIDE_EPATC8
+       epatc8 = 1;
+#endif
        return pi_register(&epat)-1;
 }