Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/hpcarm Switch hpcarm to common arm32 conf.c ; (smal...
details: https://anonhg.NetBSD.org/src/rev/eb9d1f1ce896
branches: trunk
changeset: 514483:eb9d1f1ce896
user: matt <matt%NetBSD.org@localhost>
date: Mon Sep 03 19:38:13 2001 +0000
description:
Switch hpcarm to common arm32 conf.c ; (small changes to vm_machdep.c to
make it compile under ELF)
diffstat:
sys/arch/hpcarm/conf/files.hpcarm | 5 +-
sys/arch/hpcarm/hpcarm/conf.c | 413 ------------------------------------
sys/arch/hpcarm/hpcarm/vm_machdep.c | 7 +-
3 files changed, 7 insertions(+), 418 deletions(-)
diffs (truncated from 466 to 300 lines):
diff -r 0181781dbe3e -r eb9d1f1ce896 sys/arch/hpcarm/conf/files.hpcarm
--- a/sys/arch/hpcarm/conf/files.hpcarm Mon Sep 03 19:20:27 2001 +0000
+++ b/sys/arch/hpcarm/conf/files.hpcarm Mon Sep 03 19:38:13 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.hpcarm,v 1.24 2001/08/01 07:03:45 ichiro Exp $
+# $NetBSD: files.hpcarm,v 1.25 2001/09/03 19:38:13 matt Exp $
#
# First try for arm-specific configuration info
#
@@ -18,13 +18,14 @@
file dev/md_root.c memory_disk_hooks
major {md = 18}
+file arch/arm/arm32/conf.c
+
# Standard keyboard driver
#device kbd
#file arch/hpcarm/dev/kbd.c kbd needs-flag
# Generic MD files
file arch/hpcarm/hpcarm/autoconf.c
-file arch/hpcarm/hpcarm/conf.c
file arch/hpcarm/hpcarm/cpuswitch.S
file arch/hpcarm/hpcarm/exception.S
file arch/hpcarm/hpcarm/fault.c
diff -r 0181781dbe3e -r eb9d1f1ce896 sys/arch/hpcarm/hpcarm/conf.c
--- a/sys/arch/hpcarm/hpcarm/conf.c Mon Sep 03 19:20:27 2001 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,413 +0,0 @@
-/* $NetBSD: conf.c,v 1.5 2001/09/03 05:02:18 matt Exp $ */
-
-/*
- * Copyright (c) 1994-1998 Mark Brinicombe.
- * All rights reserved.
- *
- * 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 Mark Brinicombe
- * for the NetBSD Project.
- * 4. The name of the company nor the name of the author may be used to
- * endorse or promote products derived from this software without specific
- * prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- *
- * RiscBSD kernel project
- *
- * conf.c
- *
- * Character and Block Device configuration
- * Console configuration
- *
- * Defines the structures cdevsw and constab
- *
- * Created : 17/09/94
- */
-
-#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>
-
-#include <machine/conf.h>
-
-#include "wd.h"
-#include "md.h"
-#include "sd.h"
-#include "st.h"
-#include "cd.h"
-#include "vnd.h"
-#include "ccd.h"
-#include "raid.h"
-
-/* Block devices */
-
-struct bdevsw bdevsw[] = {
- bdev_lkm_dummy(), /* 0: */
- bdev_swap_init(1, sw), /* 1: swap pseudo-device */
- bdev_lkm_dummy(), /* 2: */
- bdev_lkm_dummy(), /* 3: */
- bdev_lkm_dummy(), /* 4: */
- bdev_lkm_dummy(), /* 5: */
- bdev_lkm_dummy(), /* 6: */
- bdev_lkm_dummy(), /* 7: */
- bdev_lkm_dummy(), /* 8: */
- bdev_lkm_dummy(), /* 9: */
- 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(NWD, wd), /* 16: Internal IDE disk */
- bdev_lkm_dummy(), /* 17: */
- bdev_disk_init(NMD, md), /* 18: memory disk */
- bdev_disk_init(NVND,vnd), /* 19: vnode disk driver */
- bdev_lkm_dummy(), /* 20: */
- bdev_disk_init(NCCD,ccd), /* 21: concatenated disk driver */
- bdev_lkm_dummy(), /* 22: */
- bdev_lkm_dummy(), /* 23: */
- bdev_disk_init(NSD,sd), /* 24: SCSI disk */
- bdev_tape_init(NST,st), /* 25: SCSI tape */
- bdev_disk_init(NCD,cd), /* 26: SCSI cdrom */
- 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: */
- bdev_lkm_dummy(), /* 70: */
- bdev_disk_init(NRAID,raid), /* 71: RAIDframe disk driver */
- bdev_lkm_dummy(), /* 72: */
-};
-
-int nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]);
-
-#include "pty.h"
-#define ptstty ptytty
-#define ptsioctl ptyioctl
-#define ptctty ptytty
-#define ptcioctl ptyioctl
-#include "com.h"
-#include "lpt.h"
-#include "bpfilter.h"
-#include "ch.h"
-#include "uk.h"
-#include "ss.h"
-#include "tun.h"
-#include "audio.h"
-#include "midi.h"
-#include "sequencer.h"
-#include "ipfilter.h"
-#include "rnd.h"
-#include "sacom.h"
-#include "usb.h"
-#include "uhid.h"
-#include "ugen.h"
-#include "ugen.h"
-#include "ulpt.h"
-#include "ucom.h"
-#include "urio.h"
-#include "uscanner.h"
-#include "vcoda.h" /* coda file system */
-#include "wsdisplay.h"
-#include "wskbd.h"
-#include "wsmouse.h"
-#include "wsmux.h"
-#include "scsibus.h"
-#include "biconsdev.h"
-
-cdev_decl(sacom);
-
-/* Character devices */
-
-struct cdevsw cdevsw[] = {
- cdev_mm_init(1, mm), /* 0: /dev/{null,mem,kmem,...} */
- cdev_swap_init(1, sw), /* 1: /dev/drum (swap pseudo-device) */
- cdev_cn_init(1, cn), /* 2: virtual console */
- cdev_ctty_init(1,ctty), /* 3: controlling terminal */
- cdev_notdef(), /* 4: */
- cdev_log_init(1,log), /* 5: /dev/klog */
- cdev_ptc_init(NPTY,ptc), /* 6: pseudo-tty master */
- cdev_tty_init(NPTY,pts), /* 7: pseudo-tty slave */
- cdev_lpt_init(NLPT,lpt), /* 8: parallel printer */
- cdev_lkm_dummy(), /* 9: */
- cdev_lkm_dummy(), /* 10: simple beep device */
- cdev_lkm_dummy(), /* 11: */
- cdev_tty_init(NCOM,com), /* 12: serial port */
- cdev_lkm_dummy(), /* 13: */
- cdev_lkm_dummy(), /* 14: */
- cdev_lkm_dummy(), /* 15: */
- cdev_disk_init(NWD, wd), /* 16: ST506/ESDI/IDE disk */
- cdev_lkm_dummy(), /* 17: */
- cdev_disk_init(NMD, md), /* 18: memory disk driver */
- cdev_disk_init(NVND,vnd), /* 19: vnode disk driver */
- cdev_lkm_dummy(), /* 20: */
- cdev_disk_init(NCCD,ccd), /* 21: concatenated disk driver */
- cdev_lkm_dummy(), /* 22: */
- cdev_lkm_dummy(), /* 23: */
- cdev_disk_init(NSD,sd), /* 24: SCSI disk */
- cdev_tape_init(NST,st), /* 25: SCSI tape */
- cdev_disk_init(NCD,cd), /* 26: SCSI CD-ROM */
- cdev_ch_init(NCH,ch), /* 27: SCSI autochanger */
- cdev_uk_init(NUK,uk), /* 28: SCSI unknown */
- cdev_scanner_init(NSS,ss), /* 29: SCSI scanner */
- cdev_lkm_dummy(), /* 30: */
- cdev_lkm_dummy(), /* 31: */
- cdev_bpftun_init(NBPFILTER,bpf),/* 32: Berkeley packet filter */
- cdev_bpftun_init(NTUN,tun), /* 33: network tunnel */
- cdev_fd_init(1,filedesc), /* 34: file descriptor pseudo-device */
- cdev_lkm_init(NLKM,lkm), /* 35: loadable module driver */
- cdev_audio_init(NAUDIO,audio), /* 36: generic audio I/O */
- cdev_lkm_dummy(), /* 37: reserved */
- cdev_lkm_dummy(), /* 38: removed cpu device */
- cdev_lkm_dummy(), /* 39: reserved */
- cdev_lkm_dummy(), /* 40: reserved */
- cdev_lkm_dummy(), /* 41: reserved */
- cdev_lkm_dummy(), /* 42: reserved */
- cdev_lkm_dummy(), /* 43: reserved */
- cdev_lkm_dummy(), /* 44: reserved */
- cdev_lkm_dummy(), /* 45: reserved */
- cdev_ipf_init(NIPFILTER,ipl), /* 46: ip-filter device */
- cdev_lkm_dummy(), /* 47: reserved */
- cdev_lkm_dummy(), /* 48: reserved */
- cdev_lkm_dummy(), /* 49: reserved */
- cdev_lkm_dummy(), /* 50: reserved */
- cdev_notdef(), /* 51: reserved */
- cdev_rnd_init(NRND,rnd), /* 52: random source pseudo-device */
- cdev_notdef(), /* 53: fiq Profiler*/
- cdev_tty_init(NSACOM,sacom), /* 54: reserved */
- cdev_lkm_dummy(), /* 55: Reserved for bypass device */
- cdev_lkm_dummy(), /* 56: reserved */
- cdev_midi_init(NMIDI,midi), /* 57: MIDI I/O */
- cdev_midi_init(NSEQUENCER,sequencer), /* 58: sequencer I/O */
- cdev_vc_nb_init(NVCODA,vc_nb_), /* 59: coda file system psdev */
- cdev_wsdisplay_init(NWSDISPLAY, wsdisplay), /* 60: frame buffers, etc. */
- cdev_mouse_init(NWSKBD, wskbd), /* 61: keyboards */
- cdev_mouse_init(NWSMOUSE, wsmouse), /* 62: mice */
- cdev_lkm_dummy(), /* 63: reserved */
- cdev_usb_init(NUSB,usb), /* 64: USB controller */
- cdev_usbdev_init(NUHID,uhid), /* 65: USB generic HID */
- cdev_lpt_init(NULPT,ulpt), /* 66: USB printer */
- cdev_lkm_dummy(), /* 67: reserved */
- cdev_lkm_dummy(), /* 68: reserved */
- cdev_lkm_dummy(), /* 69: reserved */
- cdev_scsibus_init(NSCSIBUS,scsibus), /* 70: SCSI bus */
- cdev_disk_init(NRAID,raid), /* 71: RAIDframe disk driver */
- cdev_ugen_init(NUGEN,ugen), /* 72: USB generic driver */
- cdev_mouse_init(NWSMUX,wsmux), /* 73: ws multiplexor */
- cdev_tty_init(NUCOM,ucom), /* 74: USB tty */
- cdev_usbdev_init(NURIO,urio), /* 75: Diamond Rio 500 */
- cdev_ugen_init(NUSCANNER,uscanner),/* 76: USB scanner */
- cdev_notdef(), /* 77: */
- cdev_tty_init(NBICONSDEV,biconsdev), /* 78: bicons pseudo-dev */
- cdev_notdef(), /* 79: */
- cdev_notdef(), /* 80: */
- cdev_notdef(), /* 81: */
- cdev_notdef(), /* 82: */
- cdev_notdef(), /* 83: */
-};
-
-int nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]);
Home |
Main Index |
Thread Index |
Old Index