Rename NetBSD/news to NetBSD/newsmips.

This commit is contained in:
thorpej 1998-03-04 22:14:13 +00:00
parent 775d60ecd7
commit 157b712178
34 changed files with 118 additions and 118 deletions

View File

@ -1,9 +1,9 @@
#
# NEWS3400 config file
#
# $NetBSD: GENERIC,v 1.1 1998/02/18 13:48:03 tsubai Exp $
# $NetBSD: GENERIC,v 1.2 1998/03/04 22:14:13 thorpej Exp $
#
include "arch/news/conf/std.news"
include "arch/newsmips/conf/std.newsmips"
maxusers 16

View File

@ -1,15 +1,15 @@
# $NetBSD: Makefile.newsmips,v 1.2 1998/03/03 07:38:40 thorpej Exp $
# $NetBSD: Makefile.newsmips,v 1.3 1998/03/04 22:14:14 thorpej Exp $
# Makefile for NetBSD
#
# This makefile is constructed from a machine description:
# config machineid
# Most changes should be made in the machine description
# /sys/arch/news/conf/``machineid''
# /sys/arch/newsmips/conf/``machineid''
# after which you should do
# config machineid
# Machine generic makefile changes should be made in
# /sys/arch/news/conf/Makefile.news
# /sys/arch/newsmips/conf/Makefile.newsmips
# after which config should be rerun for all machines of that type.
#
# N.B.: NO DEPENDENCIES ON FOLLOWING FLAGS ARE VISIBLE TO MAKEFILE
@ -41,12 +41,12 @@ COPTS?= -O2
#S!= cd ../../../..; pwd
S= ../../../..
.endif
NEWS= $S/arch/news
NEWS= $S/arch/newsmips
MIPS= $S/arch/mips
INCLUDES= -I. -I$S/arch -I$S -nostdinc
CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL \
-Dnews ${GP}
-Dnewsmips ${GP}
CWARNFLAGS= -Werror -Wall -Wno-parentheses
GP?= -G 0
CFLAGS= ${DEBUG} ${COPTS} ${CWARNFLAGS} -mno-abicalls -mno-half-pic
@ -162,12 +162,12 @@ links:
sh makelinks && rm -f dontlink
SRCS= ${MIPS}/mips/locore.S ${MIPS}/mips/fp.S \
${NEWS}/news/locore_machdep.S \
${NEWS}/newsmips/locore_machdep.S \
param.c ioconf.c ${CFILES} ${SFILES}
depend: .depend
.depend: ${SRCS} assym.h param.c
${MKDEP} ${AFLAGS} ${CPPFLAGS} ${MIPS}/mips/locore.S ${MIPS}/mips/fp.S
${MKDEP} ${AFLAGS} ${CPPFLAGS} ${NEWS}/news/locore_machdep.S
${MKDEP} ${AFLAGS} ${CPPFLAGS} ${NEWS}/newsmips/locore_machdep.S
${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \
@ -196,7 +196,7 @@ locore.o: ${MIPS}/mips/locore.S ${MIPS}/mips/locore_r2000.S ${MIPS}/mips/locore_
fp.o: ${MIPS}/mips/fp.S assym.h
${NORMAL_S}
locore_machdep.o: ${NEWS}/news/locore_machdep.S assym.h
locore_machdep.o: ${NEWS}/newsmips/locore_machdep.S assym.h
${NORMAL_S}
%RULES

View File

@ -1,9 +1,9 @@
#
# NEWS3400 config file
#
# $NetBSD: WAPIKO,v 1.1 1998/02/18 13:48:04 tsubai Exp $
# $NetBSD: WAPIKO,v 1.2 1998/03/04 22:14:14 thorpej Exp $
#
include "arch/news/conf/std.news"
include "arch/newsmips/conf/std.newsmips"
maxusers 16

View File

@ -1,4 +1,4 @@
# $NetBSD: files.newsmips,v 1.1 1998/02/18 13:48:04 tsubai Exp $
# $NetBSD: files.newsmips,v 1.2 1998/03/04 22:14:15 thorpej Exp $
# NEWS-specific configuration info
# maxpartitions must be first item in files.${ARCH}.
@ -11,39 +11,39 @@ attach mainbus at root
device hb { [addr = -1], [level = -1] }
attach hb at mainbus
file arch/news/dev/hb.c hb
file arch/newsmips/dev/hb.c hb
#device iop { [addr = -1], [level = -1] }
#attach iop at mainbus
#file arch/news/dev/iop.c iop
#file arch/newsmips/dev/iop.c iop
device cpu
attach cpu at mainbus
file arch/news/news/cpu.c cpu
file arch/newsmips/newsmips/cpu.c cpu
device mkclock
attach mkclock at hb
file arch/news/news/clock.c mkclock
file arch/newsmips/newsmips/clock.c mkclock
#device le: ifnet, ether, arp
attach le at hb
file arch/news/dev/if_le.c le needs-count
file arch/newsmips/dev/if_le.c le needs-count
device ms
attach ms at hb
file arch/news/dev/ms.c ms needs-count
file arch/newsmips/dev/ms.c ms needs-count
device kb
attach kb at hb
file arch/news/dev/kb.c kb needs-count
file arch/news/dev/kbms_if.c kb | ms
file arch/news/dev/keyconf.c kb
file arch/news/dev/kb_ctrl.c kb
file arch/news/dev/kb_encode.c kb
file arch/newsmips/dev/kb.c kb needs-count
file arch/newsmips/dev/kbms_if.c kb | ms
file arch/newsmips/dev/keyconf.c kb
file arch/newsmips/dev/kb_ctrl.c kb
file arch/newsmips/dev/kb_encode.c kb
device zsc { [channel = -1] }
attach zsc at hb
file arch/news/dev/zs.c zsc needs-count
file arch/newsmips/dev/zs.c zsc needs-count
file dev/ic/z8530sc.c zsc
device zstty: tty
@ -52,35 +52,35 @@ file dev/ic/z8530tty.c zstty needs-count
device fb
attach fb at hb
file arch/news/dev/fb.c fb needs-count
file arch/news/dev/fb_conf.c fb
file arch/news/dev/fb_mfbs.c fb
file arch/news/dev/fb_probe.c fb
file arch/news/dev/fb_start.c fb
file arch/news/dev/fb_sub.c fb
file arch/news/dev/fbbm_253.c fb
#file arch/news/dev/fbbm_lcdm.c fb
file arch/news/dev/bmcons.c fb
file arch/news/dev/bitmapif.c fb
file arch/news/dev/fnt.c fb
file arch/news/dev/fnt24.c fb
file arch/news/dev/vt100.c fb
file arch/news/dev/vt100esc.c fb
file arch/news/dev/vt100if.c fb
file arch/newsmips/dev/fb.c fb needs-count
file arch/newsmips/dev/fb_conf.c fb
file arch/newsmips/dev/fb_mfbs.c fb
file arch/newsmips/dev/fb_probe.c fb
file arch/newsmips/dev/fb_start.c fb
file arch/newsmips/dev/fb_sub.c fb
file arch/newsmips/dev/fbbm_253.c fb
#file arch/newsmips/dev/fbbm_lcdm.c fb
file arch/newsmips/dev/bmcons.c fb
file arch/newsmips/dev/bitmapif.c fb
file arch/newsmips/dev/fnt.c fb
file arch/newsmips/dev/fnt24.c fb
file arch/newsmips/dev/vt100.c fb
file arch/newsmips/dev/vt100esc.c fb
file arch/newsmips/dev/vt100if.c fb
device fdc {}
attach fdc at hb
device fd: disk
attach fd at fdc
file arch/news/dev/fd.c fdc | fd needs-count
file arch/newsmips/dev/fd.c fdc | fd needs-count
file arch/news/news/autoconf.c
file arch/news/news/conf.c
file arch/news/news/machdep.c
file arch/news/news/news_trap.c
file arch/news/news/disksubr.c
file arch/news/news/mainbus.c
file arch/news/news/cpu_cons.c
file arch/newsmips/newsmips/autoconf.c
file arch/newsmips/newsmips/conf.c
file arch/newsmips/newsmips/machdep.c
file arch/newsmips/newsmips/newsmips_trap.c
file arch/newsmips/newsmips/disksubr.c
file arch/newsmips/newsmips/mainbus.c
file arch/newsmips/newsmips/cpu_cons.c
file dev/cons.c
major {md = 2}
@ -96,6 +96,6 @@ major { cd = 16 }
major { st = 17 }
device sc: scsi
file arch/news/dev/scsi_1185.c sc needs-count
file arch/news/dev/sc_wrap.c sc
file arch/newsmips/dev/scsi_1185.c sc needs-count
file arch/newsmips/dev/sc_wrap.c sc
attach sc at hb

View File

@ -1,5 +1,5 @@
machine news mips
machine newsmips mips
options SWAPPAGER # paging
options VNODEPAGER # mmap() of files

View File

@ -43,10 +43,10 @@
#include <machine/framebuf.h>
#include <news/dev/fbreg.h>
#include <news/dev/vt100.h>
#include <news/dev/fbdefs.h>
#include <news/dev/bitmapif.h>
#include <newsmips/dev/fbreg.h>
#include <newsmips/dev/vt100.h>
#include <newsmips/dev/fbdefs.h>
#include <newsmips/dev/bitmapif.h>
extern int bm_todo;
extern int tmode;

View File

@ -60,7 +60,7 @@
#include <machine/autoconf.h>
#include "fb.h"
#include <news/dev/sccparam.h>
#include <newsmips/dev/sccparam.h>
#include <dev/cons.h>
@ -864,7 +864,7 @@ cnfont(port)
#ifdef CPU_SINGLE
#include <machine/framebuf.h>
#include <news/dev/fbdefs.h>
#include <newsmips/dev/fbdefs.h>
int lastcount;
int start_dimmer = 1;

View File

@ -54,7 +54,7 @@
#include <machine/autoconf.h>
#include <machine/framebuf.h>
#include <news/dev/fbreg.h>
#include <newsmips/dev/fbreg.h>
#define FB_USED 1
#define VIDEO_USED 2

View File

@ -52,7 +52,7 @@
#include <sys/cdefs.h>
#include <sys/types.h>
#include <machine/framebuf.h>
#include <news/dev/fbdefs.h>
#include <newsmips/dev/fbdefs.h>
#define NFBDEV (NNWB253 + NLFBM)

View File

@ -40,8 +40,8 @@
#include <sys/param.h>
#include <machine/framebuf.h>
#include <news/dev/fbreg.h>
#include <news/dev/fbdefs.h>
#include <newsmips/dev/fbreg.h>
#include <newsmips/dev/fbdefs.h>
u_short mfbstarttab16[16] =
{

View File

@ -49,7 +49,7 @@
#include <sys/exec.h>
#endif
#include <news/dev/fbdefs.h>
#include <newsmips/dev/fbdefs.h>
extern int badaddr();

View File

@ -44,8 +44,8 @@
#include <machine/framebuf.h>
#include <news/dev/fbreg.h>
#include <news/dev/fbdefs.h>
#include <newsmips/dev/fbreg.h>
#include <newsmips/dev/fbdefs.h>
#define spl7 splhigh
#ifdef CPU_SINGLE

View File

@ -54,7 +54,7 @@
#include <machine/framebuf.h>
#include <machine/locore.h>
#include <news/dev/fbreg.h>
#include <newsmips/dev/fbreg.h>
#ifdef CPU_DOUBLE
#ifdef IPC_MRX

View File

@ -51,8 +51,8 @@
#include <machine/framebuf.h>
#include <machine/locore.h>
#include <news/dev/fbreg.h>
#include <news/dev/fbdefs.h>
#include <newsmips/dev/fbreg.h>
#include <newsmips/dev/fbdefs.h>
extern int fb_error();
extern int nofunc();

View File

@ -52,8 +52,8 @@
#include <machine/framebuf.h>
#include <machine/locore.h>
#include <news/dev/fbreg.h>
#include <news/dev/fbdefs.h>
#include <newsmips/dev/fbreg.h>
#include <newsmips/dev/fbdefs.h>
extern int nofunc();
extern int fb_error();

View File

@ -42,7 +42,7 @@
# define ipc_phys(x) (x)
#else /* CPU_SINGLE */
# include <sys/param.h>
# include <news/newsipc/newsipc.h>
# include <newsmips/newsipc/newsipc.h>
# ifdef mips
# define ipc_phys(x) K0_TT0(x)
# else /* mips */

View File

@ -52,10 +52,10 @@
#include <machine/keyboard.h>
#include <machine/autoconf.h>
#include <news/dev/kbreg.h>
#include <newsmips/dev/kbreg.h>
#ifdef CPU_SINGLE
#include <news/dev/scc.h>
#include <newsmips/dev/scc.h>
#else
#include "../iop/iopvar.h"
#endif

View File

@ -45,7 +45,7 @@
#ifdef IPC_MRX
#include <sys/ioctl.h>
#include <machine/keyboard.h>
#include <news/dev/kbreg.h>
#include <newsmips/dev/kbreg.h>
#else
#include <sys/ioctl.h>
#include <sys/param.h>
@ -53,7 +53,7 @@
#include <sys/types.h>
#include <sys/proc.h>
#include <machine/keyboard.h>
#include <news/dev/kbreg.h>
#include <newsmips/dev/kbreg.h>
#endif
extern int tmode;
@ -81,7 +81,7 @@ Key_table *key_table_addr = default_table;
#include <sys/tty.h>
#include <sys/time.h>
#include <machine/mouse.h>
#include <news/dev/scc.h>
#include <newsmips/dev/scc.h>
extern int bmcnrint();
extern void rst_dimmer_cnt __P((void));

View File

@ -43,7 +43,7 @@
#include <sys/types.h>
#include <sys/ioctl.h>
#include <machine/keyboard.h>
#include <news/dev/kbreg.h>
#include <newsmips/dev/kbreg.h>
#include <sys/malloc.h>
#define KM_ASCII 0 /* XXX */

View File

@ -44,7 +44,7 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <machine/adrsmap.h>
#include <news/dev/scc.h>
#include <newsmips/dev/scc.h>
typedef struct kbm_sw {
u_char *stat_port; /* Status port */

View File

@ -42,7 +42,7 @@
#include <sys/systm.h>
#include <machine/keyboard.h>
#include <news/dev/kbreg.h>
#include <newsmips/dev/kbreg.h>
#define FN(n,name,addr,len1,str1,len2,str2) {addr, {len1, str1}, {len2, str2}}

View File

@ -60,8 +60,8 @@
#include <machine/mouse.h>
#include <machine/autoconf.h>
#include <news/dev/msreg.h>
#include <news/dev/scc.h>
#include <newsmips/dev/msreg.h>
#include <newsmips/dev/scc.h>
#ifndef mips
#define volatile

View File

@ -16,10 +16,10 @@
#include <dev/scsipi/scsiconf.h>
#include <dev/scsipi/scsi_message.h>
#include <news/dev/scsireg.h>
#include <news/dev/scsic.h>
#include <news/dev/dmac_0448.h>
#include <news/dev/screg_1185.h>
#include <newsmips/dev/scsireg.h>
#include <newsmips/dev/scsic.h>
#include <newsmips/dev/dmac_0448.h>
#include <newsmips/dev/screg_1185.h>
#include <machine/locore.h>
#include <machine/adrsmap.h>

View File

@ -72,17 +72,17 @@
#include <machine/pte.h>
#include <machine/cpu.h>
#include <news/dev/screg_1185.h>
#include <news/dev/scsic.h>
#include <newsmips/dev/screg_1185.h>
#include <newsmips/dev/scsic.h>
#ifdef news3400
# include <news/dev/dmac_0448.h>
# include <newsmips/dev/dmac_0448.h>
# ifndef NDMACMAP
# define NDMACMAP 144
# endif
#endif
#include <news/dev/scsireg.h>
#include <newsmips/dev/scsireg.h>
#include <machine/locore.h>
#include <machine/machConst.h>

View File

@ -43,10 +43,10 @@
#include <sys/systm.h>
#include <machine/framebuf.h>
#include <machine/keyboard.h>
#include <news/dev/kbreg.h>
#include <news/dev/fbdefs.h>
#include <news/dev/vt100.h>
#include <news/dev/bitmapif.h>
#include <newsmips/dev/kbreg.h>
#include <newsmips/dev/fbdefs.h>
#include <newsmips/dev/vt100.h>
#include <newsmips/dev/bitmapif.h>
#define spl4 cpu_spl1
extern int cpu_spl1();
@ -66,7 +66,7 @@ extern int cpu_spl1();
#endif
#ifdef CPU_SINGLE
#include <news/dev/scc.h>
#include <newsmips/dev/scc.h>
#endif
extern Key_string key_str;

View File

@ -42,7 +42,7 @@
* vt100 emulator header
*/
#include <news/dev/vt100esc.h>
#include <newsmips/dev/vt100esc.h>
/*
* terminal mode

View File

@ -48,13 +48,13 @@
#include <machine/framebuf.h>
#include <machine/keyboard.h>
#include <news/dev/vt100.h>
#include <news/dev/bitmapif.h>
#include <news/dev/fbdefs.h>
#include <news/dev/kbreg.h>
#include <newsmips/dev/vt100.h>
#include <newsmips/dev/bitmapif.h>
#include <newsmips/dev/fbdefs.h>
#include <newsmips/dev/kbreg.h>
#if CPU_SINGLE
#include <news/dev/scc.h>
#include <newsmips/dev/scc.h>
#endif
#ifdef IPC_MRX

View File

@ -50,8 +50,8 @@
#endif /* IPC_MRX */
#if CPU_SINGLE
#include <news/dev/scc.h>
#include <news/dev/sccparam.h>
#include <newsmips/dev/scc.h>
#include <newsmips/dev/sccparam.h>
#endif /* CPU_SINGLE */
#ifdef IPC_MRX

View File

@ -1,4 +1,4 @@
/* from $NetBSD: param.h,v 1.1 1998/02/18 13:48:22 tsubai Exp $ */
/* from $NetBSD: param.h,v 1.2 1998/03/04 22:20:50 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -52,8 +52,8 @@
* Machine dependent constants for mips-based NEWS.
*/
#define _MACHINE news
#define MACHINE "news"
#define _MACHINE newsmips
#define MACHINE "newsmips"
#define MID_MACHINE MID_MIPS
#define KERNBASE 0x80000000 /* start of kernel virtual */

View File

@ -1,5 +1,5 @@
/* $NetBSD: reloc.h,v 1.1 1998/02/18 13:48:26 tsubai Exp $ */
/* $NetBSD: reloc.h,v 1.2 1998/03/04 22:20:51 thorpej Exp $ */
#include <mips/reloc.h>
#define relocation_info_news reloc_info_mips
#define relocation_info_newsmips reloc_info_mips

View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.1 1998/02/18 13:48:29 tsubai Exp $ */
/* $NetBSD: autoconf.c,v 1.2 1998/03/04 22:22:36 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -60,7 +60,7 @@
#include <sys/reboot.h>
#include <sys/device.h>
#include <news/news/machid.h>
#include <newsmips/newsmips/machid.h>
#include <machine/cpu.h>
void dumpconf __P((void)); /* XXX */

View File

@ -50,7 +50,7 @@
#include <machine/autoconf.h>
#include <machine/adrsmap.h>
#include <news/news/clockreg.h>
#include <newsmips/newsmips/clockreg.h>
static int clockmatch __P((struct device *, struct cfdata *, void *));
static void clockattach __P((struct device *, struct device *, void *));

View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.6 1998/02/25 23:28:25 thorpej Exp $ */
/* $NetBSD: machdep.c,v 1.7 1998/03/04 22:22:37 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -43,7 +43,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.6 1998/02/25 23:28:25 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.7 1998/03/04 22:22:37 thorpej Exp $");
/* from: Utah Hdr: machdep.c 1.63 91/04/24 */
@ -89,9 +89,9 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.6 1998/02/25 23:28:25 thorpej Exp $");
#include <machine/adrsmap.h>
#include <machine/machConst.h>
#include <news/news/trap.h>
#include <news/news/clockreg.h>
#include <news/news/machid.h>
#include <newsmips/newsmips/trap.h>
#include <newsmips/newsmips/clockreg.h>
#include <newsmips/newsmips/machid.h>
#include <dev/cons.h>
/* the following is used externally (sysctl_hw) */

View File

@ -1,4 +1,4 @@
/* $NetBSD: newsmips_trap.c,v 1.1 1998/02/18 13:48:32 tsubai Exp $ */
/* $NetBSD: newsmips_trap.c,v 1.2 1998/03/04 22:22:37 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -68,7 +68,7 @@
#include <machine/mips_opcode.h>
#include <mips/locore.h> /* wbflush() */
#include <news/dev/scc.h>
#include <newsmips/dev/scc.h>
#include <sys/socket.h>
#include <sys/mbuf.h>
@ -92,7 +92,7 @@ struct ifnet; struct ethercom;
#include <sys/cdefs.h>
#include <sys/syslog.h>
#include <news/news/trap.h>
#include <newsmips/newsmips/trap.h>
#include <machine/autoconf.h>
#include <machine/adrsmap.h>
@ -196,7 +196,7 @@ news3400_errintr()
}
#endif
#include <news/dev/dmac_0448.h>
#include <newsmips/dev/dmac_0448.h>
/*
* news3400 - INT0 service routine.