Merge in various pieces of current NetBSD scsi code, including but not limited

to:

* New changer driver.
* Better optical support.
* Different `done' semantics.
* New quirks for SCSI QIC tape driver, SCSI floppy drives.
* Better support for SCSI-I devices.

Everybody needs to test this.

1 files changed, 30 insertions, 37 deletions

diff --git a/sys/scsi/scsi_disk.h b/sys/scsi/scsi_disk.h
index 614e40f83b3..002812619c7 100644
--- a/sys/scsi/scsi_disk.h
+++ b/sys/scsi/scsi_disk.h
@@ -1,5 +1,5 @@
-/*	$OpenBSD: scsi_disk.h,v 1.5 1996/10/31 01:09:23 niklas Exp $	*/
-/*	$NetBSD: scsi_disk.h,v 1.9 1996/03/19 03:07:02 mycroft Exp $	*/
+/*	$OpenBSD: scsi_disk.h,v 1.6 1997/04/14 04:09:09 downsj Exp $	*/
+/*	$NetBSD: scsi_disk.h,v 1.10 1996/07/05 16:19:05 christos Exp $	*/
 
 /*
  * SCSI interface description
@@ -176,41 +176,34 @@ union disk_pages {
 		u_int8_t reserved3;
     	} rigid_geometry;
 	struct page_flex_geometry {
-	   u_char pg_code;		/* page code (should be 5) */
-	   u_char pg_length;		/* page length (should be 0x1e) */
-	   u_char xfr_rate1;
-	   u_char xfr_rate0;
-	   u_char nheads;		/* number of heads */
-	   u_char ph_sec_t;		/* physical sectors per track */
-	   u_char bytes_s_1;		/* bytes per sector (MSB) */
-	   u_char bytes_s_0;		/* bytes per sector (LSB) */
-	   u_char ncyl_1;		/* number of cylinders (MSB) */
-	   u_char ncyl_0;		/* number of cylinders (LSB) */
-	   u_char st_cyl_wp_1;		/* starting cyl., write precomp (MSB) */
-	   u_char st_cyl_wp_0;		/* starting cyl., write precomp (LSB) */
-	   u_char st_cyl_rwc_1; 	/* starting cyl., red. write cur (MSB) */
-	   u_char st_cyl_rwc_0; 	/* starting cyl., red. write cur (LSB) */
-	   u_char driv_step_1;		/* drive step rate (MSB) */
-	   u_char driv_step_0;		/* drive step rate (LSB) */
-	   u_char driv_step_w;		/* drive step pulse width */
-	   u_char head_settle_1;	/* head settle delay (MSB) */
-	   u_char head_settle_0;	/* head settle delay (LSB) */
-	   u_char motor_on;		/* motor on delay */
-	   u_char motor_off;		/* motor off delay */
-	   u_char flags;		/* various flags */
-#define MO	0x20			/* motor on (pin 16)? */
-#define SSN	0x40			/* start at sector 1  */
-#define TRDY	0x20			/* RDY (pin 34) valid */
-	   u_char step_p_cyl;		/* step pulses per cylinder */
-	   u_char write_pre;		/* write precompensation */
-	   u_char head_load;		/* head load delay */
-	   u_char head_unload;		/* head unload delay */
-	   u_char pin_34_2;		/* pin 34 (6) and pin 2 (7/11) definition */
-	   u_char pin_4_1;		/* pin 4 (8/9) and pin 1 (13) definition */
-	   u_char reserved1;
-	   u_char reserved2;
-	   u_char reserved3;
-	   u_char reserved4;
+		u_int8_t pg_code;	/* page code (should be 5) */
+		u_int8_t pg_length;	/* page length (should be 0x1e) */
+		u_int8_t xfr_rate[2];
+		u_int8_t nheads;	/* number of heads */
+		u_int8_t ph_sec_tr;	/* physical sectors per track */
+		u_int8_t bytes_s[2];	/* bytes per sector */
+		u_int8_t ncyl[2];	/* number of cylinders */
+		u_int8_t st_cyl_wp[2];	/* start cyl., write precomp */
+		u_int8_t st_cyl_rwc[2];	/* start cyl., red. write cur */
+		u_int8_t driv_step[2];	/* drive step rate */
+		u_int8_t driv_step_w;	/* drive step pulse width */
+		u_int8_t head_settle[2];/* head settle delay */
+		u_int8_t motor_on;	/* motor on delay */
+		u_int8_t motor_off;	/* motor off delay */
+		u_int8_t flags;		/* various flags */
+#define MOTOR_ON		0x20	/* motor on (pin 16)? */
+#define START_AT_SECTOR_1	0x40	/* start at sector 1  */
+#define READY_VALID		0x20	/* RDY (pin 34) valid */
+		u_int8_t step_p_cyl;	/* step pulses per cylinder */
+		u_int8_t write_pre;	/* write precompensation */
+		u_int8_t head_load;	/* head load delay */
+		u_int8_t head_unload;	/* head unload delay */
+		u_int8_t pin_34_2;	/* pin 34 (6) pin 2 (7/11) definition */
+		u_int8_t pin_4_1;	/* pin 4 (8/9) pin 1 (13) definition */
+		u_int8_t reserved1;
+		u_int8_t reserved2;
+		u_int8_t reserved3;
+		u_int8_t reserved4;
 	} flex_geometry;
 };