From f5359202c1be68a8a74745f00d9d6f384ef62e4d Mon Sep 17 00:00:00 2001 From: gibbs Date: Tue, 15 Sep 1998 10:03:43 +0000 Subject: autoconf.c: Convert autoconf hooks from old SCSI system to CAM. busdma_machdep.c: bus_dmamap_free() should expect the nobounce map, not a NULL one. mountroot.c: swapgeneric.c: da and od changes. symbols.raw: Nuke the old disk stat symbols. userconfig.c: Disable the SCSI listing code until it can be converted to CAM. --- sys/amd64/amd64/autoconf.c | 12 ++++-------- sys/amd64/amd64/busdma_machdep.c | 4 ++-- sys/i386/i386/autoconf.c | 12 ++++-------- sys/i386/i386/busdma_machdep.c | 4 ++-- sys/i386/i386/mountroot.c | 4 ++-- sys/i386/i386/swapgeneric.c | 14 +++++--------- sys/i386/i386/symbols.raw | 9 +-------- sys/i386/i386/userconfig.c | 13 +++++-------- 8 files changed, 25 insertions(+), 47 deletions(-) diff --git a/sys/amd64/amd64/autoconf.c b/sys/amd64/amd64/autoconf.c index 0c6748a..3b67b26 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.104 1998/09/03 20:59:28 nsouch Exp $ + * $Id: autoconf.c,v 1.105 1998/09/14 19:56:38 sos Exp $ */ /* @@ -98,9 +98,6 @@ #endif #include "scbus.h" -#if NSCBUS > 0 -#include -#endif #include @@ -174,20 +171,19 @@ find_cdrom_root() } #endif /* CD9660 */ +extern void xpt_init __P((void)); + static void configure_start() { #if NSCBUS > 0 - scsi_configure_start(); + xpt_init(); #endif } static void configure_finish() { -#if NSCBUS > 0 - scsi_configure_finish(); -#endif } /* diff --git a/sys/amd64/amd64/busdma_machdep.c b/sys/amd64/amd64/busdma_machdep.c index a09cb48..9a3542e 100644 --- a/sys/amd64/amd64/busdma_machdep.c +++ b/sys/amd64/amd64/busdma_machdep.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: busdma_machdep.c,v 1.6 1998/05/06 01:45:55 gibbs Exp $ + * $Id: busdma_machdep.c,v 1.7 1998/07/11 07:45:28 bde Exp $ */ #include @@ -346,7 +346,7 @@ bus_dmamem_free(bus_dma_tag_t dmat, void *vaddr, bus_dmamap_t map) * dmamem does not need to be bounced, so the map should be * NULL */ - if (map != NULL) + if (map != &nobounce_dmamap) panic("bus_dmamem_free: Invalid map freed\n"); free(vaddr, M_DEVBUF); } diff --git a/sys/i386/i386/autoconf.c b/sys/i386/i386/autoconf.c index 0c6748a..3b67b26 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.104 1998/09/03 20:59:28 nsouch Exp $ + * $Id: autoconf.c,v 1.105 1998/09/14 19:56:38 sos Exp $ */ /* @@ -98,9 +98,6 @@ #endif #include "scbus.h" -#if NSCBUS > 0 -#include -#endif #include @@ -174,20 +171,19 @@ find_cdrom_root() } #endif /* CD9660 */ +extern void xpt_init __P((void)); + static void configure_start() { #if NSCBUS > 0 - scsi_configure_start(); + xpt_init(); #endif } static void configure_finish() { -#if NSCBUS > 0 - scsi_configure_finish(); -#endif } /* diff --git a/sys/i386/i386/busdma_machdep.c b/sys/i386/i386/busdma_machdep.c index a09cb48..9a3542e 100644 --- a/sys/i386/i386/busdma_machdep.c +++ b/sys/i386/i386/busdma_machdep.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: busdma_machdep.c,v 1.6 1998/05/06 01:45:55 gibbs Exp $ + * $Id: busdma_machdep.c,v 1.7 1998/07/11 07:45:28 bde Exp $ */ #include @@ -346,7 +346,7 @@ bus_dmamem_free(bus_dma_tag_t dmat, void *vaddr, bus_dmamap_t map) * dmamem does not need to be bounced, so the map should be * NULL */ - if (map != NULL) + if (map != &nobounce_dmamap) panic("bus_dmamem_free: Invalid map freed\n"); free(vaddr, M_DEVBUF); } diff --git a/sys/i386/i386/mountroot.c b/sys/i386/i386/mountroot.c index 97cb676..e9b48bd 100644 --- a/sys/i386/i386/mountroot.c +++ b/sys/i386/i386/mountroot.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91 - * $Id: mountroot.c,v 1.2 1998/04/20 21:54:19 julian Exp $ + * $Id: mountroot.c,v 1.3 1998/04/23 20:59:42 julian Exp $ */ /* @@ -81,7 +81,7 @@ struct major_hack { {0, "wd"}, /* ST506 disk controller (with IDE extensions) */ {2, "fd"}, /* floppy disk */ {3, "wt"}, /* QIC-02/36 tape */ -{4, "sd"}, /* SCSI "disk" type */ +{4, "da"}, /* SCSI "disk" type */ {5, "st"}, /* SCSI "tape" type */ {6, "cd"}, /* SCSI "cdrom" type */ {7, "mcd"}, /* Mitsumi CDROM interface */ diff --git a/sys/i386/i386/swapgeneric.c b/sys/i386/i386/swapgeneric.c index bb70261..5575e62 100644 --- a/sys/i386/i386/swapgeneric.c +++ b/sys/i386/i386/swapgeneric.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)swapgeneric.c 5.5 (Berkeley) 5/9/91 - * $Id: swapgeneric.c,v 1.22 1997/09/07 12:56:40 bde Exp $ + * $Id: swapgeneric.c,v 1.23 1998/02/20 13:37:37 bde Exp $ */ #include @@ -51,12 +51,11 @@ #include "wd.h" #include "fd.h" -#include "sd.h" #include "cd.h" +#include "da.h" #include "mcd.h" #include "scd.h" #include "matcd.h" -#include "od.h" /* * Generic configuration; all in one @@ -76,12 +75,12 @@ struct genericconf { #if NFD > 0 { "fd", makedev(2, 0x00000000), }, #endif -#if NSD > 0 - { "sd", makedev(4, 0x00000000), }, -#endif #if NCD > 0 { "cd", makedev(6, 0x00000000), }, #endif +#if NDA > 0 + { "da", makedev(4, 0x00000000), }, +#endif #if NMCD > 0 { "mcd", makedev(7, 0x00000000), }, #endif @@ -91,9 +90,6 @@ struct genericconf { #if NMATCD > 0 { "matcd", makedev(17,0x00000000), }, #endif -#if NOD > 0 - { "od", makedev(20,0x00000000), }, -#endif { 0 }, }; diff --git a/sys/i386/i386/symbols.raw b/sys/i386/i386/symbols.raw index bdc3b3c..4703c30 100644 --- a/sys/i386/i386/symbols.raw +++ b/sys/i386/i386/symbols.raw @@ -1,6 +1,6 @@ # @(#)symbols.raw 7.6 (Berkeley) 5/8/91 # -# $Id: symbols.raw,v 1.11 1997/04/26 11:45:26 peter Exp $ +# $Id: symbols.raw,v 1.12 1998/03/30 09:48:20 phk Exp $ # @@ -14,15 +14,9 @@ _msgbufp # _msgbuf #iostat - _dk_busy - _dk_time - _dk_xfer - _dk_wds _tk_nin _tk_nout - _dk_seek _cp_time - _dk_wpms # _io_info #ps _nswap @@ -42,7 +36,6 @@ # _sum # _rectime # _pgintime - _dk_xfer _boottime #w _swapdev diff --git a/sys/i386/i386/userconfig.c b/sys/i386/i386/userconfig.c index 4db7718..7466dd3 100644 --- a/sys/i386/i386/userconfig.c +++ b/sys/i386/i386/userconfig.c @@ -46,7 +46,7 @@ ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF ** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ** - ** $Id: userconfig.c,v 1.106 1998/08/02 09:32:52 gpalmer Exp $ + ** $Id: userconfig.c,v 1.107 1998/09/07 13:00:58 jkh Exp $ **/ /** @@ -2385,13 +2385,11 @@ visuserconfig(void) * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: userconfig.c,v 1.106 1998/08/02 09:32:52 gpalmer Exp $ + * $Id: userconfig.c,v 1.107 1998/09/07 13:00:58 jkh Exp $ */ #include "scbus.h" -#include - #define PARM_DEVSPEC 0x1 #define PARM_INT 0x2 #define PARM_ADDR 0x3 @@ -2415,7 +2413,7 @@ typedef struct _cmd { } Cmd; -#if NSCBUS > 0 +#if 0 static void lsscsi(void); static int list_scsi(CmdParm *); #endif @@ -2514,7 +2512,7 @@ static Cmd CmdList[] = { { "po", set_device_ioaddr, int_parms }, /* port dev addr */ { "res", (CmdFunc)cpu_reset, NULL }, /* reset CPU */ { "q", quitfunc, NULL }, /* quit */ -#if NSCBUS > 0 +#if 0 { "s", list_scsi, NULL }, /* scsi */ #endif #ifdef VISUAL_USERCONFIG @@ -3281,7 +3279,7 @@ strtoul(nptr, endptr, base) return (acc); } -#if NSCBUS > 0 +#if 0 /* scsi: Support for displaying configured SCSI devices. * There is no way to edit them, and this is inconsistent * with the ISA method. This is here as a basis for further work. @@ -3298,7 +3296,6 @@ type_text(char *name) /* XXX: This is bogus */ return "device"; } -static void id_put(char *desc, int id) { if (id != SCCONF_UNSPEC) -- cgit v1.1