Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/sbmips/sbmips Use evbmips/evbmips/conf_common.c sin...



details:   https://anonhg.NetBSD.org/src/rev/65883391e0e3
branches:  trunk
changeset: 534634:65883391e0e3
user:      simonb <simonb%NetBSD.org@localhost>
date:      Wed Jul 31 04:04:53 2002 +0000

description:
Use evbmips/evbmips/conf_common.c since the sbmips port's conf.c was
mostly in-sync with the evbmips one.  The kttcp device has changed
device number; users who have created that will need to re-create it.

diffstat:

 sys/arch/sbmips/sbmips/conf.c |  500 +----------------------------------------
 1 files changed, 14 insertions(+), 486 deletions(-)

diffs (truncated from 509 to 300 lines):

diff -r 2f803a032f19 -r 65883391e0e3 sys/arch/sbmips/sbmips/conf.c
--- a/sys/arch/sbmips/sbmips/conf.c     Wed Jul 31 03:42:54 2002 +0000
+++ b/sys/arch/sbmips/sbmips/conf.c     Wed Jul 31 04:04:53 2002 +0000
@@ -1,491 +1,19 @@
-/* $NetBSD: conf.c,v 1.6 2002/07/19 16:38:24 thorpej Exp $ */
-
-/*
- * Copyright (c) 1992, 1993
- *     The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Ralph Campbell.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
+/* $NetBSD: conf.c,v 1.7 2002/07/31 04:04:53 simonb Exp $ */
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: conf.c,v 1.6 2002/07/19 16:38:24 thorpej Exp $");
-
-#include "opt_systrace.h"
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/buf.h>
-#include <sys/ioctl.h>
-#include <sys/tty.h>
-#include <sys/conf.h>
-#include <sys/vnode.h>
-
-bdev_decl(sw);
-cdev_decl(sw);
-
-#include "st.h"
-bdev_decl(st);
-#include "cd.h"
-bdev_decl(cd);
-#include "wd.h"
-bdev_decl(wd);
-#include "sd.h"
-bdev_decl(sd);
-#include "vnd.h"
-bdev_decl(vnd);
-#include "raid.h"
-bdev_decl(raid);
-#include "ccd.h"
-bdev_decl(ccd);
-#include "md.h"
-bdev_decl(md);
-#include "ld.h"
-bdev_decl(ld);
-
-struct bdevsw bdevsw[] =
-{
-       bdev_notdef(),                  /* 0: XXX PC-ish floppy disk driver */
-       bdev_swap_init(1,sw),           /* 1: swap pseudo-device */
-       bdev_tape_init(NST,st),         /* 2: SCSI tape */
-       bdev_disk_init(NCD,cd),         /* 3: SCSI CD-ROM */
-       bdev_disk_init(NWD,wd),         /* 4: IDE disk driver */
-       bdev_notdef(),                  /* 5 */
-       bdev_disk_init(NMD,md),         /* 6: memory disk driver */
-       bdev_disk_init(NCCD,ccd),       /* 7: concatenated disk driver */
-       bdev_disk_init(NSD,sd),         /* 8: SCSI disk driver */
-       bdev_disk_init(NVND,vnd),       /* 9: vnode disk driver */
-       bdev_lkm_dummy(),               /* 10 */
-       bdev_lkm_dummy(),               /* 11 */
-       bdev_lkm_dummy(),               /* 12 */
-       bdev_lkm_dummy(),               /* 13 */
-       bdev_lkm_dummy(),               /* 14 */
-       bdev_lkm_dummy(),               /* 15 */
-       bdev_disk_init(NRAID,raid),     /* 16: RAIDframe disk driver */
-       bdev_disk_init(NLD,ld),         /* 17: logical disk driver */
-       bdev_lkm_dummy(),               /* 18 */
-       bdev_lkm_dummy(),               /* 19 */
-       bdev_lkm_dummy(),               /* 20 */
-       bdev_lkm_dummy(),               /* 21 */
-       bdev_lkm_dummy(),               /* 22 */
-       bdev_lkm_dummy(),               /* 23 */
-       bdev_lkm_dummy(),               /* 24 */
-       bdev_lkm_dummy(),               /* 25 */
-       bdev_lkm_dummy(),               /* 26 */
-       bdev_lkm_dummy(),               /* 27 */
-       bdev_lkm_dummy(),               /* 28 */
-       bdev_lkm_dummy(),               /* 29 */
-       bdev_lkm_dummy(),               /* 30 */
-       bdev_lkm_dummy(),               /* 31 */
-       bdev_lkm_dummy(),               /* 32 */
-       bdev_lkm_dummy(),               /* 33 */
-       bdev_lkm_dummy(),               /* 34 */
-       bdev_lkm_dummy(),               /* 35 */
-       bdev_lkm_dummy(),               /* 36 */
-       bdev_lkm_dummy(),               /* 37 */
-       bdev_lkm_dummy(),               /* 38 */
-       bdev_lkm_dummy(),               /* 39 */
-       bdev_lkm_dummy(),               /* 40 */
-       bdev_lkm_dummy(),               /* 41 */
-       bdev_lkm_dummy(),               /* 42 */
-       bdev_lkm_dummy(),               /* 43 */
-       bdev_lkm_dummy(),               /* 44 */
-       bdev_lkm_dummy(),               /* 45 */
-       bdev_lkm_dummy(),               /* 46 */
-       bdev_lkm_dummy(),               /* 47 */
-       bdev_lkm_dummy(),               /* 48 */
-       bdev_lkm_dummy(),               /* 49 */
-       bdev_lkm_dummy(),               /* 50 */
-       bdev_lkm_dummy(),               /* 51 */
-       bdev_lkm_dummy(),               /* 52 */
-       bdev_lkm_dummy(),               /* 53 */
-       bdev_lkm_dummy(),               /* 54 */
-       bdev_lkm_dummy(),               /* 55 */
-       bdev_lkm_dummy(),               /* 56 */
-       bdev_lkm_dummy(),               /* 57 */
-       bdev_lkm_dummy(),               /* 58 */
-       bdev_lkm_dummy(),               /* 59 */
-       bdev_lkm_dummy(),               /* 60 */
-       bdev_lkm_dummy(),               /* 61 */
-       bdev_lkm_dummy(),               /* 62 */
-       bdev_lkm_dummy(),               /* 63 */
-       bdev_lkm_dummy(),               /* 64 */
-       bdev_lkm_dummy(),               /* 65 */
-       bdev_lkm_dummy(),               /* 66 */
-       bdev_lkm_dummy(),               /* 67 */
-       bdev_lkm_dummy(),               /* 68 */
-       bdev_lkm_dummy(),               /* 69 */
-};
-int    nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]);
-
-
-#ifdef IKOS
-cdev_decl(ikoscons);
-#else
-#ifdef JTAGCONSOLE
-cdev_decl(sbjcn);
-#else
-#include "sbscn.h"
-cdev_decl(sbscn);
-#endif
-#endif
-
-cdev_decl(cn);
-cdev_decl(ctty);
-#define        mmread  mmrw
-#define        mmwrite mmrw
-cdev_decl(mm);
-#include "pty.h"
-#define        ptstty          ptytty
-#define        ptsioctl        ptyioctl
-cdev_decl(pts);
-#define        ptctty          ptytty
-#define        ptcioctl        ptyioctl
-cdev_decl(ptc);
-cdev_decl(log);
-#include "tun.h"
-cdev_decl(tun);
-cdev_decl(sd);
-cdev_decl(vnd);
-cdev_decl(ccd);
-dev_type_open(filedescopen);
-#include "bpfilter.h"
-cdev_decl(bpf);
-cdev_decl(st);
-cdev_decl(cd);
-#include "ch.h"
-cdev_decl(ch);
-#include "audio.h"
-cdev_decl(audio);
-#include "com.h"
-cdev_decl(com);
-cdev_decl(kbd);
-cdev_decl(ms);
-#include "lpt.h"
-cdev_decl(lpt);
-cdev_decl(md);
-cdev_decl(raid);
-#include "ses.h"
-cdev_decl(ses);
-#include "ss.h"
-cdev_decl(ss);
-#include "uk.h"
-cdev_decl(uk);
-cdev_decl(fd);
-#include "ipfilter.h"
-cdev_decl(ipl);
-cdev_decl(wd);
-#include "satlink.h"
-cdev_decl(satlink);
-#include "midi.h"
-cdev_decl(midi);
-#include "sequencer.h"
-cdev_decl(music);
-#include "mlx.h"
-cdev_decl(mlx);
-
-#include "cy.h"
-cdev_decl(cy);
-#include "cz.h"
-cdev_decl(cztty);
-
-#include "se.h"
-#include "rnd.h"
-
-#include "wsdisplay.h"
-cdev_decl(wsdisplay);
-#include "wskbd.h"
-cdev_decl(wskbd);
-#include "wsmouse.h"
-cdev_decl(wsmouse);
-#include "wsmux.h"
-cdev_decl(wsmux);
-
-#include "spkr.h"
-cdev_decl(spkr);
-
-#include "scsibus.h"
-cdev_decl(scsibus);
-
-#include "esh.h"
-cdev_decl(esh_fp);
-
-#include "usb.h"
-cdev_decl(usb); 
-#include "uhid.h"
-cdev_decl(uhid);
-#include "ugen.h"
-cdev_decl(ugen);
-#include "ulpt.h"
-cdev_decl(ulpt);
-#include "ucom.h"
-cdev_decl(ucom);
-#include "urio.h"
-cdev_decl(urio);
-#include "uscanner.h"
-cdev_decl(uscanner);
+__KERNEL_RCSID(0, "$NetBSD: conf.c,v 1.7 2002/07/31 04:04:53 simonb Exp $");
 
-#include "isdn.h"
-#include "isdnctl.h"
-#include "isdntrc.h"
-#include "isdnbchan.h"
-#include "isdntel.h"
-cdev_decl(isdn);
-cdev_decl(isdnctl);
-cdev_decl(isdntrc);
-cdev_decl(isdnbchan);
-cdev_decl(isdntel);
-
-#include <altq/altqconf.h>
-
-#include "clockctl.h"
-cdev_decl(clockctl);
-#include "kttcp.h"
-cdev_decl(kttcp);
-
-#include "pci.h"
-cdev_decl(pci);
-
-struct cdevsw cdevsw[] =
-{
-       cdev_cn_init(1,cn),             /* 0: virtual console */
-       cdev_ctty_init(1,ctty),         /* 1: controlling terminal */
-       cdev_mm_init(1,mm),             /* 2: /dev/{null,mem,kmem,...} */
-       cdev_swap_init(1,sw),           /* 3: /dev/drum (swap pseudo-device) */
-       cdev_tty_init(NPTY,pts),        /* 4: pseudo-tty slave */
-       cdev_ptc_init(NPTY,ptc),        /* 5: pseudo-tty master */
-       cdev_log_init(1,log),           /* 6: /dev/klog */
-       cdev_bpftun_init(NTUN,tun),     /* 7: network tunnel */
-       cdev_disk_init(NSD,sd),         /* 8: SCSI disk */
-       cdev_disk_init(NVND,vnd),       /* 9: vnode disk driver */
-       cdev_fd_init(1,filedesc),       /* 10: file descriptor pseudo-dev */
-       cdev_bpftun_init(NBPFILTER,bpf), /* 11: Berkeley packet filter */
-       cdev_tape_init(NST,st),         /* 12: SCSI tape */
-       cdev_disk_init(NCD,cd),         /* 13: SCSI CD-ROM */
-       cdev_ch_init(NCH,ch),           /* 14: SCSI autochanger */



Home | Main Index | Thread Index | Old Index