Make NEW_SCSICONF the default way of doing things

It will need to be changed
but it's the better starting point..

also add '?' to wildcarding in SCSI identification of devices..
so we can catch all PIONEER	CD 6??* devices instead of having
separate entries for the 600, 602, 604X, 624X etc..

it's getting so we should have a small regexp routine in the kernel
maybe just a little one..  matching CDX-6[0-9][0-9][ A-Z] would be better

there will be drastic changes in this
but this is the best starting point..

1 files changed, 1 insertions, 67 deletions

diff --git a/sys/scsi/scsi_tape.h b/sys/scsi/scsi_tape.h
index 6512dbf..04d9b03 100644
--- a/sys/scsi/scsi_tape.h
+++ b/sys/scsi/scsi_tape.h
@@ -21,7 +21,7 @@
 /*
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  *
- *	$Id: scsi_tape.h,v 1.14 1995/11/30 07:43:46 pst Exp $
+ *	$Id: scsi_tape.h,v 1.15 1995/12/09 20:42:32 phk Exp $
  */
 #ifndef	SCSI_SCSI_TAPE_H
 #define SCSI_SCSI_TAPE_H 1
@@ -244,70 +244,4 @@ struct	tape_pages
 };
 
 
-
-
-#ifndef NEW_SCSICONF
-/**********************************************************************
-			from the scsi2 spec
-                Value Tracks Density(bpi) Code Type  Reference     Note
-                0x1     9       800       NRZI  R    X3.22-1983    2
-                0x2     9      1600       PE    R    X3.39-1986    2
-                0x3     9      6250       GCR   R    X3.54-1986    2
-                0x5    4/9     8000       GCR   C    X3.136-1986   1
-                0x6     9      3200       PE    R    X3.157-1987   2
-                0x7     4      6400       IMFM  C    X3.116-1986   1
-                0x8     4      8000       GCR   CS   X3.158-1986   1
-                0x9    18     37871       GCR   C    X3B5/87-099   2
-                0xA    22      6667       MFM   C    X3B5/86-199   1
-                0xB     4      1600       PE    C    X3.56-1986    1
-                0xC    24     12690       GCR   C    HI-TC1        1,5
-                0xD    24     25380       GCR   C    HI-TC2        1,5
-                0xF    15     10000       GCR   C    QIC-120       1,5
-                0x10   18     10000       GCR   C    QIC-150       1,5
-                0x11   26     16000       GCR   C    QIC-320(525?) 1,5
-                0x12   30     51667       RLL   C    QIC-1350      1,5
-                0x13    1     61000       DDS   CS    X3B5/88-185A 4
-                0x14    1     43245       RLL   CS    X3.202-1991  4
-                0x15    1     45434       RLL   CS    ECMA TC17    4
-                0x16   48     10000       MFM   C     X3.193-1990  1
-                0x17   48     42500       MFM   C     X3B5/91-174  1
-
-                where Code means:
-                NRZI Non Return to Zero, change on ones
-                GCR  Group Code Recording
-                PE   Phase Encoded
-                IMFM Inverted Modified Frequency Modulation
-                MFM  Modified Frequency Modulation
-                DDS  Dat Data Storage
-                RLL  Run Length Encoding
-
-                where Type means:
-                R    Real-to-Real
-                C    Cartridge
-                CS   cassette
-
-                where Notes means:
-                1    Serial Recorded
-                2    Parallel Recorded
-                3    Old format know as QIC-11
-                4    Helical Scan
-                5    Not ANSI standard, rather industry standard.
-
-********************************************************************/
-
-#define	HALFINCH_800	0x01
-#define	HALFINCH_1600	0x02
-#define	HALFINCH_6250	0x03
-#define	QIC_11		0x04	/* from Archive 150S Theory of Op. XXX	*/
-#define QIC_24		0x05	/* may be bad, works for CIPHER ST150S XXX */
-#define QIC_120		0x0f
-#define QIC_150		0x10
-#define QIC_320		0x11
-#define QIC_525		0x11
-#define QIC_1320	0x12
-#define DDS		0x13
-#define DAT_1		0x13
-#define QIC_3080	0x29
-#endif /* NEW_SCSICONF */
-
 #endif /*SCSI_SCSI_TAPE_H*/