[src/trunk]: src/sys/arch/hpcmips Move arch-local variable to a better namesp...

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e1804dd21acd
branches:  trunk
changeset: 750998:e1804dd21acd
user:      pooka <pooka%NetBSD.org@localhost>
date:      Thu Jan 21 01:23:14 2010 +0000

description:
Move arch-local variable to a better namespace to make build again.

diffstat:

 sys/arch/hpcmips/hpcmips/machdep.c |   8 ++++----
 sys/arch/hpcmips/include/cpu.h     |   4 ++--
 sys/arch/hpcmips/tx/tx39.c         |  11 ++++++-----
 sys/arch/hpcmips/vr/vr.c           |   8 ++++----
 4 files changed, 16 insertions(+), 15 deletions(-)

diffs (126 lines):

diff -r 06531e5c0674 -r e1804dd21acd sys/arch/hpcmips/hpcmips/machdep.c
--- a/sys/arch/hpcmips/hpcmips/machdep.c        Wed Jan 20 23:40:42 2010 +0000
+++ b/sys/arch/hpcmips/hpcmips/machdep.c        Thu Jan 21 01:23:14 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.107 2009/12/16 23:19:07 matt Exp $       */
+/*     $NetBSD: machdep.c,v 1.108 2010/01/21 01:23:14 pooka Exp $      */
 
 /*-
  * Copyright (c) 1999 Shin Takemura, All rights reserved.
@@ -108,7 +108,7 @@
  */
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.107 2009/12/16 23:19:07 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.108 2010/01/21 01:23:14 pooka Exp $");
 
 #include "opt_vr41xx.h"
 #include "opt_tx39xx.h"
@@ -192,7 +192,7 @@
 #endif
 
 /* the following is used externally (sysctl_hw) */
-char   cpu_name[40];                   /* set CPU depend xx_init() */
+char   hpcmips_cpuname[40];            /* set CPU depend xx_init() */
 
 struct cpu_info cpu_info_store;                /* only one CPU */
 int    cpuspeed = 1;                   /* approx # instr per usec. */
@@ -551,7 +551,7 @@
         * Good {morning,afternoon,evening,night}.
         */
        printf("%s%s", copyright, version);
-       sprintf(cpu_model, "%s (%s)", platid_name(&platid), cpu_name);
+       sprintf(cpu_model, "%s (%s)", platid_name(&platid), hpcmips_cpuname);
        printf("%s\n", cpu_model);
        format_bytes(pbuf, sizeof(pbuf), ctob(physmem));
        printf("total memory = %s\n", pbuf);
diff -r 06531e5c0674 -r e1804dd21acd sys/arch/hpcmips/include/cpu.h
--- a/sys/arch/hpcmips/include/cpu.h    Wed Jan 20 23:40:42 2010 +0000
+++ b/sys/arch/hpcmips/include/cpu.h    Thu Jan 21 01:23:14 2010 +0000
@@ -1,6 +1,6 @@
-/*     $NetBSD: cpu.h,v 1.12 2002/01/31 17:56:34 uch Exp $     */
+/*     $NetBSD: cpu.h,v 1.13 2010/01/21 01:23:15 pooka Exp $   */
 
 #include <mips/cpu.h>
 #ifndef _LOCORE
-extern char cpu_name[];
+extern char hpcmips_cpuname[];
 #endif
diff -r 06531e5c0674 -r e1804dd21acd sys/arch/hpcmips/tx/tx39.c
--- a/sys/arch/hpcmips/tx/tx39.c        Wed Jan 20 23:40:42 2010 +0000
+++ b/sys/arch/hpcmips/tx/tx39.c        Thu Jan 21 01:23:14 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tx39.c,v 1.40 2009/03/18 10:22:29 cegger Exp $ */
+/*     $NetBSD: tx39.c,v 1.41 2010/01/21 01:23:15 pooka Exp $ */
 
 /*-
  * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tx39.c,v 1.40 2009/03/18 10:22:29 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tx39.c,v 1.41 2010/01/21 01:23:15 pooka Exp $");
 
 #include "opt_vr41xx.h"
 #include "opt_tx39xx.h"
@@ -119,12 +119,13 @@
        switch (model) {
        default:
                /* Unknown TOSHIBA TX39-series */
-               sprintf(cpu_name, "Unknown TOSHIBA TX39-series %x", model);
+               sprintf(hpcmips_cpuname,
+                   "Unknown TOSHIBA TX39-series %x", model);
                break;
        case TMPR3912:
                tx39clock_cpuspeed(&cpuclock, &cpuspeed);
 
-               sprintf(cpu_name, "TOSHIBA TMPR3912 %d.%02d MHz",
+               sprintf(hpcmips_cpuname, "TOSHIBA TMPR3912 %d.%02d MHz",
                    cpuclock / 1000000, (cpuclock % 1000000) / 10000);
                tc->tc_chipset = __TX391X;
                break;
@@ -132,7 +133,7 @@
                tx39clock_cpuspeed(&cpuclock, &cpuspeed);
                rev = tx_conf_read(tc, TX3922_REVISION_REG);
 
-               sprintf(cpu_name, "TOSHIBA TMPR3922 rev. %x.%x "
+               sprintf(hpcmips_cpuname, "TOSHIBA TMPR3922 rev. %x.%x "
                    "%d.%02d MHz", (rev >> 4) & 0xf, rev & 0xf, 
                    cpuclock / 1000000, (cpuclock % 1000000) / 10000);
                tc->tc_chipset = __TX392X;
diff -r 06531e5c0674 -r e1804dd21acd sys/arch/hpcmips/vr/vr.c
--- a/sys/arch/hpcmips/vr/vr.c  Wed Jan 20 23:40:42 2010 +0000
+++ b/sys/arch/hpcmips/vr/vr.c  Thu Jan 21 01:23:14 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vr.c,v 1.54 2009/08/19 12:49:24 jun Exp $      */
+/*     $NetBSD: vr.c,v 1.55 2010/01/21 01:23:15 pooka Exp $    */
 
 /*-
  * Copyright (c) 1999-2002
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vr.c,v 1.54 2009/08/19 12:49:24 jun Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vr.c,v 1.55 2010/01/21 01:23:15 pooka Exp $");
 
 #include "opt_vr41xx.h"
 #include "opt_tx39xx.h"
@@ -302,14 +302,14 @@
        platform.reboot         = vr_reboot;
 
 #if NVRBCU > 0
-       sprintf(cpu_name, "NEC %s rev%d.%d %d.%03dMHz", 
+       sprintf(hpcmips_cpuname, "NEC %s rev%d.%d %d.%03dMHz", 
                vrbcu_vrip_getcpuname(),
                vrbcu_vrip_getcpumajor(),
                vrbcu_vrip_getcpuminor(),
                vrbcu_vrip_getcpuclock() / 1000000,
                (vrbcu_vrip_getcpuclock() % 1000000) / 1000);
 #else
-       sprintf(cpu_name, "NEC VR41xx");
+       sprintf(hpcmips_cpuname, "NEC VR41xx");
 #endif
 }