[src/trunk]: src/sys/arch/prep rename reset_ibm_generic() -> reset_prep_gener...

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

details:   https://anonhg.NetBSD.org/src/rev/c66c29cf0ab0
branches:  trunk
changeset: 526328:c66c29cf0ab0
user:      nonaka <nonaka%NetBSD.org@localhost>
date:      Thu May 02 14:48:27 2002 +0000

description:
rename reset_ibm_generic() -> reset_prep_generic().

diffstat:

 sys/arch/prep/include/platform.h  |   4 ++--
 sys/arch/prep/prep/ibm_6050.c     |   4 ++--
 sys/arch/prep/prep/ibm_7248.c     |   4 ++--
 sys/arch/prep/prep/ibm_machdep.c  |  20 +-------------------
 sys/arch/prep/prep/mot_ulmb60xa.c |   4 ++--
 sys/arch/prep/prep/platform.c     |  20 +++++++++++++++++++-
 6 files changed, 28 insertions(+), 28 deletions(-)

diffs (141 lines):

diff -r 05d0c1d011b9 -r c66c29cf0ab0 sys/arch/prep/include/platform.h
--- a/sys/arch/prep/include/platform.h  Thu May 02 14:44:17 2002 +0000
+++ b/sys/arch/prep/include/platform.h  Thu May 02 14:48:27 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: platform.h,v 1.3 2002/02/26 16:09:15 kleink Exp $      */
+/*     $NetBSD: platform.h,v 1.4 2002/05/02 14:48:27 nonaka Exp $      */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -66,6 +66,7 @@
 void pci_intr_nofixup(int, int, int *);
 void cpu_setup_unknown(struct device *);
 void reset_unknown(void);
+void reset_prep_generic(void);
 
 /* IBM */
 extern struct plattab plattab_ibm;
@@ -73,7 +74,6 @@
 extern struct platform platform_ibm_7248;
 
 void cpu_setup_ibm_generic(struct device *);
-void reset_ibm_generic(void);
 
 void pci_intr_fixup_ibm_6050(int, int, int *);
 void pci_intr_fixup_ibm_7248(int, int, int *);
diff -r 05d0c1d011b9 -r c66c29cf0ab0 sys/arch/prep/prep/ibm_6050.c
--- a/sys/arch/prep/prep/ibm_6050.c     Thu May 02 14:44:17 2002 +0000
+++ b/sys/arch/prep/prep/ibm_6050.c     Thu May 02 14:48:27 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ibm_6050.c,v 1.3 2002/02/26 00:30:11 kleink Exp $      */
+/*     $NetBSD: ibm_6050.c,v 1.4 2002/05/02 14:48:27 nonaka Exp $      */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
        pci_intr_fixup_ibm_6050,                /* pci_intr_fixup */
        ext_intr_ivr,                           /* ext_intr */
        cpu_setup_ibm_generic,                  /* cpu_setup */
-       reset_ibm_generic,                      /* reset */
+       reset_prep_generic,                     /* reset */
 };
 
 void
diff -r 05d0c1d011b9 -r c66c29cf0ab0 sys/arch/prep/prep/ibm_7248.c
--- a/sys/arch/prep/prep/ibm_7248.c     Thu May 02 14:44:17 2002 +0000
+++ b/sys/arch/prep/prep/ibm_7248.c     Thu May 02 14:48:27 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ibm_7248.c,v 1.3 2002/05/02 14:38:41 nonaka Exp $      */
+/*     $NetBSD: ibm_7248.c,v 1.4 2002/05/02 14:48:27 nonaka Exp $      */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
        pci_intr_fixup_ibm_7248,                /* pci_intr_fixup */
        ext_intr_ivr,                           /* ext_intr */
        cpu_setup_ibm_generic,                  /* cpu_setup */
-       reset_ibm_generic,                      /* reset */
+       reset_prep_generic,                     /* reset */
 };
 
 void
diff -r 05d0c1d011b9 -r c66c29cf0ab0 sys/arch/prep/prep/ibm_machdep.c
--- a/sys/arch/prep/prep/ibm_machdep.c  Thu May 02 14:44:17 2002 +0000
+++ b/sys/arch/prep/prep/ibm_machdep.c  Thu May 02 14:48:27 2002 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: ibm_machdep.c,v 1.3 2002/04/25 20:40:16 nonaka Exp $        */
+/*      $NetBSD: ibm_machdep.c,v 1.4 2002/05/02 14:48:27 nonaka Exp $        */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -64,21 +64,3 @@
        /* Enable L2 cache */
        *(volatile u_char *)(PREP_BUS_SPACE_IO + 0x81c) = l2ctrl | 0xc0;
 }
-
-void
-reset_ibm_generic(void)
-{
-       int msr;
-       u_char reg;
-
-       asm volatile("mfmsr %0" : "=r"(msr));
-       msr |= PSL_IP;
-       asm volatile("mtmsr %0" :: "r"(msr));
-
-       reg = *(volatile u_char *)(PREP_BUS_SPACE_IO + 0x92);
-       reg &= ~1UL;
-       *(volatile u_char *)(PREP_BUS_SPACE_IO + 0x92) = reg;
-       reg = *(volatile u_char *)(PREP_BUS_SPACE_IO + 0x92);
-       reg |= 1;
-       *(volatile u_char *)(PREP_BUS_SPACE_IO + 0x92) = reg;
-}
diff -r 05d0c1d011b9 -r c66c29cf0ab0 sys/arch/prep/prep/mot_ulmb60xa.c
--- a/sys/arch/prep/prep/mot_ulmb60xa.c Thu May 02 14:44:17 2002 +0000
+++ b/sys/arch/prep/prep/mot_ulmb60xa.c Thu May 02 14:48:27 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mot_ulmb60xa.c,v 1.1 2002/02/26 16:09:15 kleink Exp $  */
+/*     $NetBSD: mot_ulmb60xa.c,v 1.2 2002/05/02 14:48:27 nonaka Exp $  */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -79,7 +79,7 @@
        pci_intr_fixup_mot_ulmb60xa,            /* pci_intr_fixup */
        ext_intr_ivr,                           /* ext_intr */
        cpu_setup_unknown,                      /* cpu_setup */
-       reset_ibm_generic,                      /* reset */
+       reset_prep_generic,                     /* reset */
 };
 
 static int
diff -r 05d0c1d011b9 -r c66c29cf0ab0 sys/arch/prep/prep/platform.c
--- a/sys/arch/prep/prep/platform.c     Thu May 02 14:44:17 2002 +0000
+++ b/sys/arch/prep/prep/platform.c     Thu May 02 14:48:27 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: platform.c,v 1.4 2002/02/26 16:09:15 kleink Exp $      */
+/*     $NetBSD: platform.c,v 1.5 2002/05/02 14:48:27 nonaka Exp $      */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -123,3 +123,21 @@
 reset_unknown(void)
 {
 }
+
+void
+reset_prep_generic(void)
+{
+       int msr;
+       u_char reg;
+
+       asm volatile("mfmsr %0" : "=r"(msr));
+       msr |= PSL_IP;
+       asm volatile("mtmsr %0" :: "r"(msr));
+
+       reg = *(volatile u_char *)(PREP_BUS_SPACE_IO + 0x92);
+       reg &= ~1UL;
+       *(volatile u_char *)(PREP_BUS_SPACE_IO + 0x92) = reg;
+       reg = *(volatile u_char *)(PREP_BUS_SPACE_IO + 0x92);
+       reg |= 1;
+       *(volatile u_char *)(PREP_BUS_SPACE_IO + 0x92) = reg;
+}