diff options
| author | dufault <dufault@FreeBSD.org> | 1995-04-14 15:13:26 +0000 |
|---|---|---|
| committer | dufault <dufault@FreeBSD.org> | 1995-04-14 15:13:26 +0000 |
| commit | b5add3bfece832ab565bc07d86926656e8c3968e (patch) | |
| tree | ffd6f91b9fc12c992cd5b360fc5c496348f9e9eb /sys | |
| parent | e6d068ab0bffa402f69c28119d086e79db5cdc61 (diff) | |
| download | FreeBSD-src-b5add3bfece832ab565bc07d86926656e8c3968e.zip FreeBSD-src-b5add3bfece832ab565bc07d86926656e8c3968e.tar.gz | |
Add scsi target. Add "after config" call to autoconf so that scsi
targets will be configured after all scsi busses have been configured.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/amd64/amd64/autoconf.c | 27 | ||||
| -rw-r--r-- | sys/i386/i386/autoconf.c | 27 | ||||
| -rw-r--r-- | sys/i386/i386/conf.c | 24 |
3 files changed, 74 insertions, 4 deletions
diff --git a/sys/amd64/amd64/autoconf.c b/sys/amd64/amd64/autoconf.c index ee4094d..b5cd502 100644 --- a/sys/amd64/amd64/autoconf.c +++ b/sys/amd64/amd64/autoconf.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91 - * $Id: autoconf.c,v 1.21 1995/03/16 18:11:24 bde Exp $ + * $Id: autoconf.c,v 1.22 1995/04/10 07:44:25 phk Exp $ */ /* @@ -118,6 +118,27 @@ find_cdrom_root() } #endif +#include "scbus.h" +#if NSCBUS > 0 + #include <scsi/scsiconf.h> +#endif + +void +configure_start() +{ +#if NSCBUS > 0 + scsi_configure_start(); +#endif +} + +void +configure_finish() +{ +#if NSCBUS > 0 + scsi_configure_finish(); +#endif +} + /* * Determine i/o configuration for a machine. */ @@ -125,6 +146,8 @@ void configure() { + configure_start(); + #if NISA > 0 isa_configure(); #endif @@ -133,6 +156,8 @@ configure() pci_configure(); #endif + configure_finish(); + #ifdef CD9660 #ifdef BOOTCDROM if (!mountroot) { diff --git a/sys/i386/i386/autoconf.c b/sys/i386/i386/autoconf.c index ee4094d..b5cd502 100644 --- a/sys/i386/i386/autoconf.c +++ b/sys/i386/i386/autoconf.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91 - * $Id: autoconf.c,v 1.21 1995/03/16 18:11:24 bde Exp $ + * $Id: autoconf.c,v 1.22 1995/04/10 07:44:25 phk Exp $ */ /* @@ -118,6 +118,27 @@ find_cdrom_root() } #endif +#include "scbus.h" +#if NSCBUS > 0 + #include <scsi/scsiconf.h> +#endif + +void +configure_start() +{ +#if NSCBUS > 0 + scsi_configure_start(); +#endif +} + +void +configure_finish() +{ +#if NSCBUS > 0 + scsi_configure_finish(); +#endif +} + /* * Determine i/o configuration for a machine. */ @@ -125,6 +146,8 @@ void configure() { + configure_start(); + #if NISA > 0 isa_configure(); #endif @@ -133,6 +156,8 @@ configure() pci_configure(); #endif + configure_finish(); + #ifdef CD9660 #ifdef BOOTCDROM if (!mountroot) { diff --git a/sys/i386/i386/conf.c b/sys/i386/i386/conf.c index e9be160..bf02cf5 100644 --- a/sys/i386/i386/conf.c +++ b/sys/i386/i386/conf.c @@ -42,7 +42,7 @@ * SUCH DAMAGE. * * from: @(#)conf.c 5.8 (Berkeley) 5/12/91 - * $Id: conf.c,v 1.81 1995/04/09 15:49:56 jkh Exp $ + * $Id: conf.c,v 1.82 1995/04/10 20:40:11 wollman Exp $ */ #include <sys/param.h> @@ -123,7 +123,7 @@ d_psize_t wdsize; #endif #include "worm.h" -#if WORM > 0 +#if NWORM > 0 d_open_t wormopen; d_close_t wormclose; d_strategy_t wormstrategy; @@ -139,6 +139,23 @@ d_psize_t wormsize; #define wormsize zerosize #endif +#include "sctarg.h" +#if NSCTARG > 0 +d_open_t sctargopen; +d_close_t sctargclose; +d_strategy_t sctargstrategy; +d_ioctl_t sctargioctl; +d_dump_t sctargdump; +d_psize_t sctargsize; +#else +#define sctargopen nxopen +#define sctargclose nxclose +#define sctargstrategy nxstrategy +#define sctargioctl nxioctl +#define sctargdump nxdump +#define sctargsize zerosize +#endif + #include "pt.h" #if NPT > 0 d_open_t ptopen; @@ -1194,6 +1211,9 @@ struct cdevsw cdevsw[] = nxwrite, nxioctl, nxstop, /* Talisman*/ nxreset, nxdevtotty, nxselect, nxmmap, NULL }, + { sctargopen, sctargclose, rawread, rawwrite, /*65*/ + sctargioctl, nostop, nullreset, nodevtotty,/* sctarg */ + seltrue, nommap, sctargstrategy }, }; int nchrdev = sizeof (cdevsw) / sizeof (cdevsw[0]); |
