[src/trunk]: src/sys/arch/news68k Backout previous because:

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

details:   https://anonhg.NetBSD.org/src/rev/b6140b4f5f67
branches:  trunk
changeset: 572048:b6140b4f5f67
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Wed Dec 15 14:03:52 2004 +0000

description:
Backout previous because:
- we should fix genassym.sh to generate proper unsigned values rather than
  remove use of such values in each source
- 0xe0dc0000 is port to control LED so INTIOBASE1700_OFF is not proper name
- these LED debug code didn't work on news1200 and it should be fixed anyway

diffstat:

 sys/arch/news68k/include/cpu.h       |  3 +--
 sys/arch/news68k/news68k/genassym.cf |  3 +--
 sys/arch/news68k/news68k/locore.s    |  4 ++--
 3 files changed, 4 insertions(+), 6 deletions(-)

diffs (52 lines):

diff -r 3f82b684037a -r b6140b4f5f67 sys/arch/news68k/include/cpu.h
--- a/sys/arch/news68k/include/cpu.h    Wed Dec 15 10:26:29 2004 +0000
+++ b/sys/arch/news68k/include/cpu.h    Wed Dec 15 14:03:52 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.20 2004/12/15 04:56:13 jmc Exp $     */
+/*     $NetBSD: cpu.h,v 1.21 2004/12/15 14:03:52 tsutsui Exp $ */
 
 /*
  * Copyright (c) 1982, 1990, 1993
@@ -265,7 +265,6 @@
 #define ROMBASE                (0xe0000000)
 
 #define INTIOBASE1700  (0xe0c00000)
-#define INTIOBASE1700_OFF      (0xe0dc0000-INTIOBASE1700)
 #define INTIOTOP1700   (0xe1d00000) /* XXX */
 #define EXTIOBASE1700  (0xf0f00000)
 #define EXTIOTOP1700   (0xf1000000) /* XXX */
diff -r 3f82b684037a -r b6140b4f5f67 sys/arch/news68k/news68k/genassym.cf
--- a/sys/arch/news68k/news68k/genassym.cf      Wed Dec 15 10:26:29 2004 +0000
+++ b/sys/arch/news68k/news68k/genassym.cf      Wed Dec 15 14:03:52 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: genassym.cf,v 1.16 2004/12/15 04:56:13 jmc Exp $
+#      $NetBSD: genassym.cf,v 1.17 2004/12/15 14:03:52 tsutsui Exp $
 
 #
 # Copyright (c) 1982, 1990, 1993
@@ -142,7 +142,6 @@
 
 # magic
 define INTIOBASE1700           INTIOBASE1700
-define INTIOBASE1700_OFF       INTIOBASE1700_OFF
 define INTIOTOP1700            INTIOTOP1700
 define EXTIOBASE1700           EXTIOBASE1700
 define EXTIOTOP1700            EXTIOTOP1700
diff -r 3f82b684037a -r b6140b4f5f67 sys/arch/news68k/news68k/locore.s
--- a/sys/arch/news68k/news68k/locore.s Wed Dec 15 10:26:29 2004 +0000
+++ b/sys/arch/news68k/news68k/locore.s Wed Dec 15 14:03:52 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.s,v 1.35 2004/12/15 04:56:13 jmc Exp $  */
+/*     $NetBSD: locore.s,v 1.36 2004/12/15 14:03:52 tsutsui Exp $      */
 
 /*
  * Copyright (c) 1980, 1990, 1993
@@ -1156,7 +1156,7 @@
 
 ASENTRY_NOPROFILE(debug_led2)
        movl    _C_LABEL(intiobase),%d1
-       addl    #INTIOBASE1700_OFF,%d1
+       addl    #(0xe0dc0000-INTIOBASE1700),%d1
        movl    %d1,%a0
        movl    %d0,%a0@