patch-2.1.62 linux/drivers/scsi/sr.h

• Lines: 49
• Date: Mon Nov 3 09:49:42 1997
• Orig file: v2.1.61/linux/drivers/scsi/sr.h
• Orig date: Mon Apr 14 16:28:16 1997

diff -u --recursive --new-file v2.1.61/linux/drivers/scsi/sr.h linux/drivers/scsi/sr.h
@@ -17,8 +17,6 @@
 #ifndef _SR_H
 #define _SR_H
 
-#include <linux/config.h>
-
 #include "scsi.h"
 
 typedef struct
@@ -34,13 +32,15 @@
 	unsigned 	ten:1;			/* support ten byte commands		*/
 	unsigned 	remap:1;		/* support remapping			*/
 	unsigned 	use:1;			/* is this device still supportable	*/
-	unsigned        xa_flag:1;              /* CD has XA sectors */
+        unsigned	xa_flag:1;              /* CD has XA sectors ? */
+	unsigned 	readcd_known:1;		/* drive supports READ_CD (0xbe) */
+	unsigned 	readcd_cdda:1;		/* reading audio data using READ_CD */
 	struct cdrom_device_info cdi;
 	} Scsi_CD;
 	
 extern Scsi_CD * scsi_CDs;
 
-int sr_do_ioctl(int, unsigned char*, void*, unsigned);
+int sr_do_ioctl(int, unsigned char*, void*, unsigned, int);
 
 int sr_lock_door(struct cdrom_device_info*, int);
 int sr_tray_move(struct cdrom_device_info*, int);
@@ -49,15 +49,16 @@
 int sr_get_last_session(struct cdrom_device_info*, struct cdrom_multisession*);
 int sr_get_mcn(struct cdrom_device_info*, struct cdrom_mcn*);
 int sr_reset(struct cdrom_device_info*);
+int sr_select_speed(struct cdrom_device_info *cdi, int speed);
 int sr_audio_ioctl(struct cdrom_device_info*, unsigned int, void*);
 int sr_dev_ioctl(struct cdrom_device_info*, unsigned int, unsigned long);
 
-/* vendor-specific */
-#ifdef CONFIG_BLK_DEV_SR_VENDOR
-void sr_vendor_init(int minor);
-int sr_cd_check(struct cdrom_device_info*);
 int sr_read_sector(int minor, int lba, int blksize, unsigned char *dest);
+int sr_is_xa(int minor);
 
-#endif
+/* sr_vendor.c */
+void sr_vendor_init(int minor);
+int sr_cd_check(struct cdrom_device_info*);
+int sr_set_blocklength(int minor, int blocklength);
 
 #endif