patch-2.1.93 linux/drivers/block/xd.c

• Lines: 21
• Date: Sat Apr 4 09:36:10 1998
• Orig file: v2.1.92/linux/drivers/block/xd.c
• Orig date: Sun Jan 4 10:40:15 1998

diff -u --recursive --new-file v2.1.92/linux/drivers/block/xd.c linux/drivers/block/xd.c
@@ -208,6 +208,7 @@
 		for (j = 1; j < (sizeof(xd_sigs) / sizeof(xd_sigs[0])) && !found; j++)
 			if (check_signature(xd_bases[i] + xd_sigs[j].offset,xd_sigs[j].string,strlen(xd_sigs[j].string))) {
 				*controller = j;
+				xd_type = j;
 				*address = xd_bases[i];
 				found++;
 			}
@@ -705,9 +706,10 @@
 	switch (address) {
 		case 0x00000:
 		case 0xC8000:	break;			/*initial: 0x320 */
-		case 0xCA000:	xd_iobase = 0x324; break;
+		case 0xCA000:	if (xd[3]<=0) xd_iobase = 0x324; 
+				break;
 		case 0xD0000:				/*5150CX*/
-		case 0xD8000:	break;			/*5150CX*/
+		case 0xD8000:	break;			/*5150CX & 5150XL*/
 		default:        printk("xd_dtc_init_controller: unsupported BIOS address %06x\n",address);
 				break;
 	}