XT disk driver [patches]

Andrzej Krzysztofowicz (ankry@green.mif.pg.gda.pl)
Thu, 9 Apr 1998 13:29:10 +0200 (CEST)

Hi
I attach corrected versions of xd.c patches against 2.1.9[34] and
Alan's 2.0.34pre7. Please don't apply previous patches (they are buggy).

Andrzej

************************************************************************
diff --unified --new-file --recursive --exclude-from exclude linux.vanilla/drivers/block/xd.c linux/drivers/block/xd.c
--- linux-2.1.93/drivers/block/xd.c.old Wed Apr 8 20:12:26 1998
+++ linux/drivers/block/xd.c Wed Apr 8 20:28:12 1998
@@ -706,8 +706,7 @@
switch (address) {
case 0x00000:
case 0xC8000: break; /*initial: 0x320 */
- case 0xCA000: if (xd[3]<=0) xd_iobase = 0x324;
- break;
+ case 0xCA000: xd_iobase = 0x324;
case 0xD0000: /*5150CX*/
case 0xD8000: break; /*5150CX & 5150XL*/
default: printk("xd_dtc_init_controller: unsupported BIOS address %06x\n",address);
************************************************************************
diff --unified --new-file --recursive --exclude-from exclude linux.vanilla/drivers/block/xd.c linux/drivers/block/xd.c
--- linux-2.0.34pre7/drivers/block/xd.c.old Wed Apr 8 20:35:34 1998
+++ linux/drivers/block/xd.c Wed Apr 8 20:37:25 1998
@@ -163,8 +163,6 @@
static u_short xd_iobase = 0x320;
static int xd_geo[XD_MAXDRIVES*3] = { 0,0,0,0,0,0 };

-static int xd[5];
-
static volatile int xdc_busy = 0;
static struct wait_queue *xdc_wait = NULL;

@@ -706,8 +704,7 @@
switch ((u_long) address) {
case 0x00000:
case 0xC8000: break; /*initial: 0x320 */
- case 0xCA000: if (xd[3]<=0) xd_iobase = 0x324;
- break;
+ case 0xCA000: xd_iobase = 0x324;
case 0xD0000: /*5150CX*/
case 0xD8000: break; /*5150CX & 5150XL*/
default: printk("xd_dtc_init_controller: unsupported BIOS address %p\n",address);
************************************************************************

-- 
=======================================================================
  Andrzej M. Krzysztofowicz               ankry@mif.pg.gda.pl
  tel.  (0-58) 347 14 61
Wydz.Fizyki Technicznej i Matematyki Stosowanej Politechniki Gdanskiej


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu