[src/trunk]: src/sys/arch/news68k/news68k - Rename ctrl_led in locore.s to ct...

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

details:   https://anonhg.NetBSD.org/src/rev/0e2a433824cc
branches:  trunk
changeset: 574379:0e2a433824cc
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sun Feb 27 07:57:29 2005 +0000

description:
- Rename ctrl_led in locore.s to ctrl_led_phys since it has
  PA of CTRL_LED port.
- Restore ctrl_led in machdep.c and store VA of CTRL_LED port to it.

diffstat:

 sys/arch/news68k/news68k/locore.s  |  12 ++++++------
 sys/arch/news68k/news68k/machdep.c |   9 ++++++---
 2 files changed, 12 insertions(+), 9 deletions(-)

diffs (105 lines):

diff -r 09b5fdd33f1b -r 0e2a433824cc sys/arch/news68k/news68k/locore.s
--- a/sys/arch/news68k/news68k/locore.s Sun Feb 27 05:40:06 2005 +0000
+++ b/sys/arch/news68k/news68k/locore.s Sun Feb 27 07:57:29 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.s,v 1.37 2004/12/15 17:30:46 tsutsui Exp $      */
+/*     $NetBSD: locore.s,v 1.38 2005/02/27 07:57:29 tsutsui Exp $      */
 
 /*
  * Copyright (c) 1980, 1990, 1993
@@ -249,7 +249,7 @@
 
        RELOC(ctrl_power, %a0);
        movl    #CTRL_POWER1200,%a0@    | CTRL_POWER port for news1200
-       RELOC(ctrl_led, %a0);
+       RELOC(ctrl_led_phys, %a0);
        movl    #CTRL_LED1200,%a0@      | CTRL_LED port for news1200
        jra     Lcom030
 
@@ -297,7 +297,7 @@
 
        RELOC(ctrl_power, %a0);
        movl    #CTRL_POWER1700,%a0@    | CTRL_POWER port for news1700
-       RELOC(ctrl_led, %a0);
+       RELOC(ctrl_led_phys, %a0);
        movl    #CTRL_LED1700,%a0@      | CTRL_LED port for news1700
 Lcom030:
 
@@ -1156,7 +1156,7 @@
  * used as break point before printf enabled
  */
 ASENTRY_NOPROFILE(debug_led)
-       RELOC(ctrl_led,%a0)             | assume %a5 still has base address
+       RELOC(ctrl_led_phys,%a0)        | assume %a5 still has base address
        movl    %d0,%a0@
 
 1:     nop
@@ -1168,7 +1168,7 @@
  * similar to debug_led(), but used after MMU enabled
  */
 ASENTRY_NOPROFILE(debug_led2)
-       movl    _C_LABEL(ctrl_led),%d1
+       movl    _C_LABEL(ctrl_led_phys),%d1
        subl    _C_LABEL(intiobase_phys),%d1
        addl    _C_LABEL(intiobase),%d1
        movl    %d1,%a0
@@ -1253,7 +1253,7 @@
 GLOBAL(ctrl_power)
        .long   0               | PA of power control port
 
-GLOBAL(ctrl_led)
+GLOBAL(ctrl_led_phys)
        .long   0               | PA of LED control port
 
 GLOBAL(cache_ctl)
diff -r 09b5fdd33f1b -r 0e2a433824cc sys/arch/news68k/news68k/machdep.c
--- a/sys/arch/news68k/news68k/machdep.c        Sun Feb 27 05:40:06 2005 +0000
+++ b/sys/arch/news68k/news68k/machdep.c        Sun Feb 27 07:57:29 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.55 2005/02/11 15:03:56 yamt Exp $        */
+/*     $NetBSD: machdep.c,v 1.56 2005/02/27 07:57:29 tsutsui Exp $     */
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -77,7 +77,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.55 2005/02/11 15:03:56 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.56 2005/02/27 07:57:29 tsutsui Exp $");
 
 #include "opt_ddb.h"
 #include "opt_compat_netbsd.h"
@@ -156,6 +156,7 @@
 extern paddr_t avail_start, avail_end;
 extern int end, *esym;
 extern u_int lowram;
+extern u_int ctrl_led_phys;
 
 /* prototypes for local functions */
 static void identifycpu(void);
@@ -808,7 +809,7 @@
 static volatile u_char *dip_switch, *int_status;
 
 volatile u_char *idrom_addr, *ctrl_ast, *ctrl_int2;
-volatile u_char *lance_mem, *sccport0a;
+volatile u_char *lance_mem, *ctrl_led, *sccport0a;
 
 #ifdef news1700
 static volatile u_char *ctrl_parity, *ctrl_parity_clr, *parity_vector;
@@ -880,6 +881,7 @@
 
        lance_mem       = (u_char *)IIOV(0xe0e00000);
        sccport0a       = (u_char *)IIOV(0xe0d40002);
+       ctrl_led        = (u_char *)IIOV(ctrl_led_phys);
 
        p = (u_char *)idrom_addr;
        q = (u_char *)&idrom;
@@ -970,6 +972,7 @@
 
        lance_mem       = (u_char *)IIOV(0xe1a00000);
        sccport0a       = (u_char *)IIOV(0xe1780002);
+       ctrl_led        = (u_char *)IIOV(ctrl_led_phys);
 
        p = (u_char *)idrom_addr;
        q = (u_char *)&idrom;