Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/luna68k/dev Use proper macro for device register ad...



details:   https://anonhg.NetBSD.org/src/rev/a883130646f8
branches:  trunk
changeset: 985685:a883130646f8
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sat Sep 04 12:38:13 2021 +0000

description:
Use proper macro for device register addresses.

diffstat:

 sys/arch/luna68k/dev/siotty.c |  11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diffs (53 lines):

diff -r 2b95f53bb108 -r a883130646f8 sys/arch/luna68k/dev/siotty.c
--- a/sys/arch/luna68k/dev/siotty.c     Sat Sep 04 12:37:46 2021 +0000
+++ b/sys/arch/luna68k/dev/siotty.c     Sat Sep 04 12:38:13 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: siotty.c,v 1.47 2020/12/29 17:17:14 tsutsui Exp $ */
+/* $NetBSD: siotty.c,v 1.48 2021/09/04 12:38:13 tsutsui Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: siotty.c,v 1.47 2020/12/29 17:17:14 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siotty.c,v 1.48 2021/09/04 12:38:13 tsutsui Exp $");
 
 #include "opt_ddb.h"
 
@@ -49,6 +49,7 @@
 #include <sys/kauth.h>
 #include <sys/kmem.h>
 
+#include <machine/board.h>
 #include <machine/cpu.h>
 
 #include <luna68k/dev/sioreg.h>
@@ -711,7 +712,7 @@
  * boot/reset/poweron.  ROM monitor emits one line message on CH.A.
  */
        struct sioreg *sio;
-       sio = (struct sioreg *)0x51000000 + channel;
+       sio = (struct sioreg *)OBIO_SIO + channel;
 
        syscons.cn_dev = makedev(cdevsw_lookup_major(&siotty_cdevsw),
                                 channel);
@@ -735,7 +736,7 @@
        struct sioreg *sio;
        int s, c;
 
-       sio = (struct sioreg *)0x51000000 + ((int)dev & 0x1);
+       sio = (struct sioreg *)OBIO_SIO + ((int)dev & 0x1);
        s = splhigh();
        while ((getsiocsr(sio) & RR_RXRDY) == 0)
                continue;
@@ -751,7 +752,7 @@
        struct sioreg *sio;
        int s;
 
-       sio = (struct sioreg *)0x51000000 + ((int)dev & 0x1);
+       sio = (struct sioreg *)OBIO_SIO + ((int)dev & 0x1);
        s = splhigh();
        while ((getsiocsr(sio) & RR_TXRDY) == 0)
                continue;



Home | Main Index | Thread Index | Old Index