[src/trunk]: src/sys/arch/hpcmips clean up header file.

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys/arch/hpcmips clean up header file.
From: uch <uch%NetBSD.org@localhost>
Date: Fri, 24 Jan 2020 10:23:13 +0000
details:   https://anonhg.NetBSD.org/src/rev/61cda59fe092
branches:  trunk
changeset: 521491:61cda59fe092
user:      uch <uch%NetBSD.org@localhost>
date:      Thu Jan 31 17:56:33 2002 +0000

description:
clean up header file.

diffstat:

 sys/arch/hpcmips/hpcmips/autoconf.c |  17 ++++++++------
 sys/arch/hpcmips/hpcmips/machdep.c  |   9 ++-----
 sys/arch/hpcmips/hpcmips/machdep.h  |  42 -------------------------------------
 sys/arch/hpcmips/include/cpu.h      |   5 +++-
 sys/arch/hpcmips/include/vmparam.h  |   9 ++++---
 sys/arch/hpcmips/isa/isa_machdep.c  |   3 +-
 sys/arch/hpcmips/tx/tx39.c          |   5 +--
 sys/arch/hpcmips/vr/vr.c            |   4 +--
 sys/arch/hpcmips/vr/vrpiu.c         |   3 +-
 9 files changed, 27 insertions(+), 70 deletions(-)

diffs (246 lines):

diff -r 274837baa051 -r 61cda59fe092 sys/arch/hpcmips/hpcmips/autoconf.c
--- a/sys/arch/hpcmips/hpcmips/autoconf.c       Thu Jan 31 17:41:38 2002 +0000
+++ b/sys/arch/hpcmips/hpcmips/autoconf.c       Thu Jan 31 17:56:33 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: autoconf.c,v 1.11 2001/09/16 15:45:42 uch Exp $        */
+/*     $NetBSD: autoconf.c,v 1.12 2002/01/31 17:56:33 uch Exp $        */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.11 2001/09/16 15:45:42 uch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.12 2002/01/31 17:56:33 uch Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -54,10 +54,12 @@
 #include <machine/sysconf.h>
 #include <machine/config_hook.h>
 
-#include <hpcmips/hpcmips/machdep.h>
+void makebootdev(const char *);
 
+struct device *booted_device;
+int booted_partition;
 static char __booted_device_name[16];
-static void get_device(char *);
+static void get_device(const char *);
 
 /*
  * Setup the system to run on the current machine.
@@ -97,17 +99,18 @@
 }
 
 void
-makebootdev(char *cp)
+makebootdev(const char *cp)
 {
 
        strncpy(__booted_device_name, cp, 16);
 }
 
 static void
-get_device(char *name)
+get_device(const char *name)
 {
        int loop, unit, part;
-       char buf[32], *cp;
+       char buf[32];
+       const char *cp;
        struct device *dv;
 
        if (strncmp(name, "/dev/", 5) == 0)
diff -r 274837baa051 -r 61cda59fe092 sys/arch/hpcmips/hpcmips/machdep.c
--- a/sys/arch/hpcmips/hpcmips/machdep.c        Thu Jan 31 17:41:38 2002 +0000
+++ b/sys/arch/hpcmips/hpcmips/machdep.c        Thu Jan 31 17:56:33 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.68 2002/01/31 16:25:54 uch Exp $ */
+/*     $NetBSD: machdep.c,v 1.69 2002/01/31 17:56:33 uch Exp $ */
 
 /*-
  * Copyright (c) 1999 Shin Takemura, All rights reserved.
@@ -73,7 +73,7 @@
  */
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.68 2002/01/31 16:25:54 uch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.69 2002/01/31 17:56:33 uch Exp $");
 
 #include "opt_vr41xx.h"
 #include "opt_tx39xx.h"
@@ -107,8 +107,6 @@
 #include <machine/platid_mask.h>
 #include <machine/kloader.h>
 
-#include <hpcmips/hpcmips/machdep.h>
-
 #ifdef KGDB
 #include <sys/kgdb.h>
 #endif
@@ -167,8 +165,7 @@
 static struct bootinfo bi_copy;
 struct bootinfo *bootinfo;
 char booted_kernel[128];
-struct device *booted_device;
-int booted_partition;
+extern void makebootdev(const char *);
 
 /* maps for VM objects */
 struct vm_map *exec_map;
diff -r 274837baa051 -r 61cda59fe092 sys/arch/hpcmips/hpcmips/machdep.h
--- a/sys/arch/hpcmips/hpcmips/machdep.h        Thu Jan 31 17:41:38 2002 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-/*     $NetBSD: machdep.h,v 1.7 2001/09/17 17:03:45 uch Exp $  */
-
-/*
- * Copyright (c) 1998 Jonathan Stone.  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 Jonathan Stone for
- *      the NetBSD Project.
- * 4. The name of the author may not 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 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.
- */
-
-extern char cpu_name[];
-extern struct device *booted_device;
-extern int booted_partition;
-
-#include <sys/kcore.h>
-extern phys_ram_seg_t mem_clusters[];
-extern int mem_cluster_cnt;
-
-int    badaddr(void *, u_int);
-void   makebootdev(char *);
diff -r 274837baa051 -r 61cda59fe092 sys/arch/hpcmips/include/cpu.h
--- a/sys/arch/hpcmips/include/cpu.h    Thu Jan 31 17:41:38 2002 +0000
+++ b/sys/arch/hpcmips/include/cpu.h    Thu Jan 31 17:56:33 2002 +0000
@@ -1,3 +1,6 @@
-/*     $NetBSD: cpu.h,v 1.11 2001/09/04 06:23:16 simonb Exp $  */
+/*     $NetBSD: cpu.h,v 1.12 2002/01/31 17:56:34 uch Exp $     */
 
 #include <mips/cpu.h>
+#ifndef _LOCORE
+extern char cpu_name[];
+#endif
diff -r 274837baa051 -r 61cda59fe092 sys/arch/hpcmips/include/vmparam.h
--- a/sys/arch/hpcmips/include/vmparam.h        Thu Jan 31 17:41:38 2002 +0000
+++ b/sys/arch/hpcmips/include/vmparam.h        Thu Jan 31 17:56:33 2002 +0000
@@ -1,11 +1,12 @@
-/*     $NetBSD: vmparam.h,v 1.3 2000/12/01 17:57:44 tsutsui Exp $      */
+/*     $NetBSD: vmparam.h,v 1.4 2002/01/31 17:56:34 uch Exp $  */
 
 #include <mips/vmparam.h>
+#include <sys/kcore.h>
 
-/*
- * hpcmips has one physical memory segment.
- */
 #define        VM_PHYSSEG_MAX          5
 
 #define        VM_NFREELIST            1
 #define        VM_FREELIST_DEFAULT     0
+
+extern phys_ram_seg_t mem_clusters[];
+extern int mem_cluster_cnt;
diff -r 274837baa051 -r 61cda59fe092 sys/arch/hpcmips/isa/isa_machdep.c
--- a/sys/arch/hpcmips/isa/isa_machdep.c        Thu Jan 31 17:41:38 2002 +0000
+++ b/sys/arch/hpcmips/isa/isa_machdep.c        Thu Jan 31 17:56:33 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: isa_machdep.c,v 1.23 2002/01/29 18:53:14 uch Exp $     */
+/*     $NetBSD: isa_machdep.c,v 1.24 2002/01/31 17:56:35 uch Exp $     */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -53,7 +53,6 @@
 
 #include <dev/hpc/hpciovar.h>
 
-#include <hpcmips/hpcmips/machdep.h>
 #include <hpcmips/vr/vripif.h>
 
 #include "locators.h"
diff -r 274837baa051 -r 61cda59fe092 sys/arch/hpcmips/tx/tx39.c
--- a/sys/arch/hpcmips/tx/tx39.c        Thu Jan 31 17:41:38 2002 +0000
+++ b/sys/arch/hpcmips/tx/tx39.c        Thu Jan 31 17:56:33 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tx39.c,v 1.30 2002/01/29 18:53:14 uch Exp $ */
+/*     $NetBSD: tx39.c,v 1.31 2002/01/31 17:56:35 uch Exp $ */
 
 /*-
  * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -49,14 +49,13 @@
 #include <machine/locore.h>   /* cpu_id */
 #include <machine/bootinfo.h> /* bootinfo */
 #include <machine/sysconf.h>  /* platform */
+#include <machine/vmparam.h>  /* mem_cluster */
 
 #include <machine/platid.h>
 #include <machine/platid_mask.h>
 
 #include <machine/bus.h>
 
-#include <hpcmips/hpcmips/machdep.h> /* cpu_name, mem_cluster */
-
 #include <hpcmips/tx/tx39biureg.h>
 #include <hpcmips/tx/tx39reg.h>
 #include <hpcmips/tx/tx39var.h>
diff -r 274837baa051 -r 61cda59fe092 sys/arch/hpcmips/vr/vr.c
--- a/sys/arch/hpcmips/vr/vr.c  Thu Jan 31 17:41:38 2002 +0000
+++ b/sys/arch/hpcmips/vr/vr.c  Thu Jan 31 17:56:33 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vr.c,v 1.35 2002/01/04 14:11:52 takemura Exp $ */
+/*     $NetBSD: vr.c,v 1.36 2002/01/31 17:56:35 uch Exp $      */
 
 /*-
  * Copyright (c) 1999-2002
@@ -53,8 +53,6 @@
 
 #include <dev/hpc/hpckbdvar.h>
 
-#include <hpcmips/hpcmips/machdep.h>   /* cpu_name, mem_cluster */
-
 #include <hpcmips/vr/vr.h>
 #include <hpcmips/vr/vr_asm.h>
 #include <hpcmips/vr/vrcpudef.h>
diff -r 274837baa051 -r 61cda59fe092 sys/arch/hpcmips/vr/vrpiu.c
--- a/sys/arch/hpcmips/vr/vrpiu.c       Thu Jan 31 17:41:38 2002 +0000
+++ b/sys/arch/hpcmips/vr/vrpiu.c       Thu Jan 31 17:56:33 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vrpiu.c,v 1.18 2002/01/27 14:18:13 takemura Exp $      */
+/*     $NetBSD: vrpiu.c,v 1.19 2002/01/31 17:56:35 uch Exp $   */
 
 /*
  * Copyright (c) 1999-2001 Shin Takemura All rights reserved.
@@ -52,7 +52,6 @@
 #include <dev/hpc/hpcbatteryvar.h>
 #include <dev/hpc/hpcbatterytable.h>
 
-#include <hpcmips/hpcmips/machdep.h>
 #include <hpcmips/vr/vrcpudef.h>
 #include <hpcmips/vr/vripif.h>
 #include <hpcmips/vr/cmureg.h>
Prev by Date: [src/trunk]: src/distrib/sets/lists/comp Add include/arm/swi.h for SoftWareIn...
Next by Date: [src/trunk]: src/lib/libc Make it possible for ctags to be a host tool.
Previous by Thread: [src/trunk]: src/distrib/sets/lists/comp Add include/arm/swi.h for SoftWareIn...
Next by Thread: [src/trunk]: src/lib/libc Make it possible for ctags to be a host tool.
Indexes:
Home | Main Index | Thread Index | Old Index