patch-1.3.72 linux/drivers/scsi/sd_ioctl.c

• Lines: 37
• Date: Thu Mar 7 10:17:46 1996
• Orig file: v1.3.71/linux/drivers/scsi/sd_ioctl.c
• Orig date: Sat Mar 2 10:43:40 1996

diff -u --recursive --new-file v1.3.71/linux/drivers/scsi/sd_ioctl.c linux/drivers/scsi/sd_ioctl.c
@@ -4,6 +4,7 @@
  * ioctl handling for SCSI disks
  */
 
+#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
@@ -34,13 +35,25 @@
 	if (error)
 	    return error;
 	host = rscsi_disks[MINOR(dev) >> 4].device->host;
-	diskinfo[0] = 0;
-	diskinfo[1] = 0;
-	diskinfo[2] = 0;
+
+/* default to most commonly used values */
+
+        diskinfo[0] = 0x40;
+        diskinfo[1] = 0x20;
+        diskinfo[2] = rscsi_disks[MINOR(dev) >> 4].capacity >> 11;
+
+/* override with calculated, extended default, or driver values */
+
+#ifdef CONFIG_SCSI_AUTO_BIOSP
+        scsicam_bios_param(&rscsi_disks[MINOR(dev) >> 4],
+				    dev, &diskinfo[0]);
+#else
 	if(host->hostt->bios_param != NULL)
 	    host->hostt->bios_param(&rscsi_disks[MINOR(dev) >> 4],
 				    dev,
 				    &diskinfo[0]);
+#endif
+
 	put_user(diskinfo[0], &loc->heads);
 	put_user(diskinfo[1], &loc->sectors);
 	put_user(diskinfo[2], &loc->cylinders);