Subject: port-sparc/1068: update files.sparc and config files
To: None <gnats-admin@sun-lamp.cs.berkeley.edu>
From: Rolf Grossmann <grossman@kiss.informatik.tu-muenchen.de>
List: netbsd-bugs
Date: 05/19/1995 13:35:04
>Number: 1068
>Category: port-sparc
>Synopsis: update conf/* files to latest standards ;)
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: gnats-admin (GNATS administrator)
>State: open
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Fri May 19 13:35:03 1995
>Originator: Rolf Grossmann
>Organization:
none really ...
>Release: NetBSD-1.0A
>Environment:
not relevant
System: NetBSD kiss 1.0A NetBSD 1.0A (TIGKI2) #30: Thu May 18 19:56:49 MET DST 1995 grossman@kiss:/export/netbsd/src/sys/arch/sparc/compile/TIGKI2 sparc
>Description:
To keep up with the ongoing development and intentions to separate
architecture dependant from architecture independent files, the
scsi portion of the sparc configuration files should be updated
to include the independent files.
>How-To-Repeat:
read the files
>Fix:
you can use this patch. it works for me.
===================================================================
RCS file: /export/netbsd/mastersrc/netbsd/sys/arch/sparc/conf/GENERIC,v
retrieving revision 1.1.1.2
diff -c -r1.1.1.2 GENERIC
*** GENERIC 1995/04/03 18:32:17 1.1.1.2
--- GENERIC 1995/05/19 17:56:35
***************
*** 111,119 ****
scsibus* at esp?
! sd* at scsibus? target ? drive ?
! st* at scsibus? target ? drive ?
! cd* at scsibus? target ? drive ?
fdc0 at mainbus0
fd* at fdc0
--- 111,119 ----
scsibus* at esp?
! sd* at scsibus? target ? lun ?
! st* at scsibus? target ? lun ?
! cd* at scsibus? target ? lun ?
fdc0 at mainbus0
fd* at fdc0
===================================================================
RCS file: /export/netbsd/mastersrc/netbsd/sys/arch/sparc/conf/GENERIC_SCSI3,v
retrieving revision 1.1.1.2
diff -c -r1.1.1.2 GENERIC_SCSI3
*** GENERIC_SCSI3 1995/04/03 18:32:08 1.1.1.2
--- GENERIC_SCSI3 1995/05/19 17:57:24
***************
*** 114,123 ****
# Map scsi-id 3 to sd0; no questions asked. Map the remaining drives
# in the default order. This is because SunOS's rom swaps scsi-id 3 to
# sd0, and scsi-id 0 to sd3.
! sd0 at scsibus? target 3 drive ?
! sd* at scsibus? target ? drive ?
! st* at scsibus? target ? drive ?
! cd* at scsibus? target ? drive ?
fdc0 at mainbus0
fd* at fdc0
--- 114,123 ----
# Map scsi-id 3 to sd0; no questions asked. Map the remaining drives
# in the default order. This is because SunOS's rom swaps scsi-id 3 to
# sd0, and scsi-id 0 to sd3.
! sd0 at scsibus? target 3 lun ?
! sd* at scsibus? target ? lun ?
! st* at scsibus? target ? lun ?
! cd* at scsibus? target ? lun ?
fdc0 at mainbus0
fd* at fdc0
===================================================================
RCS file: /export/netbsd/mastersrc/netbsd/sys/arch/sparc/conf/SUN4,v
retrieving revision 1.1.1.2
diff -c -r1.1.1.2 SUN4
*** SUN4 1995/04/03 18:32:11 1.1.1.2
--- SUN4 1995/05/19 17:58:31
***************
*** 82,90 ****
scsibus* at esp?
! sd* at scsibus? target ? drive ?
! st* at scsibus? target ? drive ?
! cd* at scsibus? target ? drive ?
pseudo-device loop
pseudo-device pty 32
--- 82,90 ----
scsibus* at esp?
! sd* at scsibus? target ? lun ?
! st* at scsibus? target ? lun ?
! cd* at scsibus? target ? lun ?
pseudo-device loop
pseudo-device pty 32
===================================================================
RCS file: /export/netbsd/mastersrc/netbsd/sys/arch/sparc/conf/SUN4C,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 SUN4C
*** SUN4C 1995/02/09 19:05:07 1.1.1.1
--- SUN4C 1995/05/19 17:58:46
***************
*** 87,95 ****
scsibus* at esp?
! sd* at scsibus? target ? drive ?
! st* at scsibus? target ? drive ?
! cd* at scsibus? target ? drive ?
pseudo-device loop
pseudo-device pty 32
--- 87,95 ----
scsibus* at esp?
! sd* at scsibus? target ? lun ?
! st* at scsibus? target ? lun ?
! cd* at scsibus? target ? lun ?
pseudo-device loop
pseudo-device pty 32
===================================================================
RCS file: /export/netbsd/mastersrc/netbsd/sys/arch/sparc/conf/SUN4M,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 SUN4M
*** SUN4M 1995/02/09 19:05:07 1.1.1.1
--- SUN4M 1995/05/19 17:59:06
***************
*** 79,87 ****
scsibus* at esp?
# drives here, drives there...
! sd* at scsibus? target ? drive ?
! st* at scsibus? target ? drive ?
! cd* at scsibus? target ? drive ?
pseudo-device loop
pseudo-device pty 32
--- 79,87 ----
scsibus* at esp?
# drives here, drives there...
! sd* at scsibus? target ? lun ?
! st* at scsibus? target ? lun ?
! cd* at scsibus? target ? lun ?
pseudo-device loop
pseudo-device pty 32
===================================================================
RCS file: /export/netbsd/mastersrc/netbsd/sys/arch/sparc/conf/TDR,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 TDR
*** TDR 1995/02/09 19:05:07 1.1.1.1
--- TDR 1995/05/19 17:59:26
***************
*** 88,96 ****
scsibus* at esp?
# drives here, drives there...
! sd* at scsibus? target ? drive ?
! st* at scsibus? target ? drive ?
! cd* at scsibus? target ? drive ?
pseudo-device loop
pseudo-device pty 32
--- 88,96 ----
scsibus* at esp?
# drives here, drives there...
! sd* at scsibus? target ? lun ?
! st* at scsibus? target ? lun ?
! cd* at scsibus? target ? lun ?
pseudo-device loop
pseudo-device pty 32
===================================================================
RCS file: /export/netbsd/mastersrc/netbsd/sys/arch/sparc/conf/files.sparc,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 files.sparc
*** files.sparc 1995/05/04 01:00:00 1.1.1.1
--- files.sparc 1995/05/19 14:56:48
***************
*** 43,53 ****
device sbus at mainbus { slot = -1, offset = -1 }
file arch/sparc/dev/sbus.c sbus
! define scsi {}
! file scsi/scsi_base.c scsi
! file scsi/scsi_ioctl.c scsi
! file scsi/scsiconf.c scsi
major { sd = 7 }
major { vnd = 8 }
major { cd = 18 }
--- 43,53 ----
device sbus at mainbus { slot = -1, offset = -1 }
file arch/sparc/dev/sbus.c sbus
! #
! # Machine-independent SCSI drivers
! #
+ include "../../../scsi/files.scsi"
major { sd = 7 }
major { vnd = 8 }
major { cd = 18 }
***************
*** 59,79 ****
device esp at sbus, espdma, obio: scsi
file arch/sparc/dev/esp.c esp needs-flag
-
- device scsibus at scsi { target = -1, drive = -1 }
-
- device cd at scsibus: disk
- file scsi/cd.c cd needs-flag
- device sd at scsibus: disk
- file scsi/sd.c sd needs-flag
- device st at scsibus: tape
- file scsi/st.c st needs-flag
- device ch at scsibus: disk
- file scsi/ch.c ch needs-flag
- device uk at scsibus: disk
- file scsi/uk.c uk needs-flag
- device su at scsibus: disk
- file scsi/su.c su needs-flag
device bwtwo at sbus
file arch/sparc/dev/bwtwo.c bwtwo needs-flag
--- 59,64 ----
>Audit-Trail:
>Unformatted: