patch-1.3.9 linux/drivers/scsi/sr.c

• Lines: 65
• Date: Tue Jul 11 07:56:04 1995
• Orig file: v1.3.8/linux/drivers/scsi/sr.c
• Orig date: Fri Jul 7 08:54:51 1995

diff -u --recursive --new-file v1.3.8/linux/drivers/scsi/sr.c linux/drivers/scsi/sr.c
@@ -13,6 +13,10 @@
  *
  *	    Modified by Eric Youngdale eric@aib.com to support loadable
  *	    low-level scsi drivers.
+ *
+ *	 Modified by Thomas Quinot thomas@melchior.frmug.fr.net to
+ *	 provide auto-eject.
+ *
  */
 
 #ifdef MODULE
@@ -39,7 +43,7 @@
 #include "constants.h"
 
 #define MAX_RETRIES 3
-#define SR_TIMEOUT 15000
+#define SR_TIMEOUT (150 * HZ)
 
 static void sr_init(void);
 static void sr_finish(void);
@@ -69,9 +73,13 @@
 {
 	sync_dev(inode->i_rdev);
 	if(! --scsi_CDs[MINOR(inode->i_rdev)].device->access_count)
-	sr_ioctl(inode, NULL, SCSI_IOCTL_DOORUNLOCK, 0);
+        {
+            sr_ioctl(inode, NULL, SCSI_IOCTL_DOORUNLOCK, 0);
+	    if (scsi_CDs[MINOR(inode->i_rdev)].auto_eject)
+                sr_ioctl(inode, NULL, CDROMEJECT, 0);
+        }
 	if (scsi_CDs[MINOR(inode->i_rdev)].device->host->hostt->usage_count)
-	(*scsi_CDs[MINOR(inode->i_rdev)].device->host->hostt->usage_count)--;
+            (*scsi_CDs[MINOR(inode->i_rdev)].device->host->hostt->usage_count)--;
 	if(sr_template.usage_count) (*sr_template.usage_count)--;
 }
 
@@ -302,6 +310,11 @@
  *
  *   kraxel@cs.tu-berlin.de (Gerd Knorr)
  */
+/*
+ * 19950704 operator@melchior.frmug.fr.net (Thomas Quinot)
+ *
+ *   - SONY:	Same as Nec.
+ */
 
 static void sr_photocd(struct inode *inode)
 {
@@ -481,7 +494,7 @@
             printk ("sr_photocd: multisession CD detected. start: %lu\n",sector);
 #endif
         break;
-        
+                
     case SCSI_MAN_NEC_OLDCDR:
     case SCSI_MAN_UNKNOWN:
     default:
@@ -1057,6 +1070,7 @@
 	scsi_CDs[i].use = 1;
 	scsi_CDs[i].ten = 1;
 	scsi_CDs[i].remap = 1;
+	scsi_CDs[i].auto_eject = 0; /* Default is not to eject upon unmount. */
 	sr_sizes[i] = scsi_CDs[i].capacity;
     }