[src/trunk]: src/sys/arch/atari/dev Use aprint_*(9) for device attach messages.

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

details:   https://anonhg.NetBSD.org/src/rev/0ecd755d7607
branches:  trunk
changeset: 368171:0ecd755d7607
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sun Jun 26 18:46:14 2022 +0000

description:
Use aprint_*(9) for device attach messages.

diffstat:

 sys/arch/atari/dev/clock.c  |   8 ++++----
 sys/arch/atari/dev/fd.c     |   6 +++---
 sys/arch/atari/dev/grf.c    |   6 +++---
 sys/arch/atari/dev/hdfd.c   |  14 +++++++-------
 sys/arch/atari/dev/ite.c    |  12 ++++++------
 sys/arch/atari/dev/ite_cc.c |  10 +++++-----
 sys/arch/atari/dev/ite_et.c |  11 ++++++-----
 7 files changed, 34 insertions(+), 33 deletions(-)

diffs (245 lines):

diff -r 713b0c8b33f6 -r 0ecd755d7607 sys/arch/atari/dev/clock.c
--- a/sys/arch/atari/dev/clock.c        Sun Jun 26 17:55:38 2022 +0000
+++ b/sys/arch/atari/dev/clock.c        Sun Jun 26 18:46:14 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: clock.c,v 1.63 2022/06/26 06:25:09 tsutsui Exp $       */
+/*     $NetBSD: clock.c,v 1.64 2022/06/26 18:46:14 tsutsui Exp $       */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.63 2022/06/26 06:25:09 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.64 2022/06/26 18:46:14 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -196,11 +196,11 @@
        clk_timecounter.tc_frequency = CLOCK_HZ;
 
        if (hz != 48 && hz != 64 && hz != 96) { /* XXX */
-               printf (": illegal value %d for systemclock, reset to %d\n\t",
+               aprint_normal(": illegal value %d for systemclock, reset to %d\n\t",
                                                                hz, 64);
                hz = 64;
        }
-       printf(": system hz %d timer-A divisor 200/%d\n", hz, divisor);
+       aprint_normal(": system hz %d timer-A divisor 200/%d\n", hz, divisor);
        tc_init(&clk_timecounter);
 
 #ifdef STATCLOCK
diff -r 713b0c8b33f6 -r 0ecd755d7607 sys/arch/atari/dev/fd.c
--- a/sys/arch/atari/dev/fd.c   Sun Jun 26 17:55:38 2022 +0000
+++ b/sys/arch/atari/dev/fd.c   Sun Jun 26 18:46:14 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fd.c,v 1.93 2022/06/26 06:25:09 tsutsui Exp $  */
+/*     $NetBSD: fd.c,v 1.94 2022/06/26 18:46:14 tsutsui Exp $  */
 
 /*
  * Copyright (c) 1995 Leo Weppelman.
@@ -44,7 +44,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.93 2022/06/26 06:25:09 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.94 2022/06/26 18:46:14 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -324,7 +324,7 @@
        int i, nfound, first_found;
 
        nfound = first_found = 0;
-       printf("\n");
+       aprint_normal("\n");
        fddeselect();
        for (i = 0; i < NR_DRIVES; i++) {
 
diff -r 713b0c8b33f6 -r 0ecd755d7607 sys/arch/atari/dev/grf.c
--- a/sys/arch/atari/dev/grf.c  Sun Jun 26 17:55:38 2022 +0000
+++ b/sys/arch/atari/dev/grf.c  Sun Jun 26 18:46:14 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: grf.c,v 1.54 2022/06/26 06:25:09 tsutsui Exp $ */
+/*     $NetBSD: grf.c,v 1.55 2022/06/26 18:46:14 tsutsui Exp $ */
 
 /*
  * Copyright (c) 1995 Leo Weppelman
@@ -46,7 +46,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.54 2022/06/26 06:25:09 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.55 2022/06/26 18:46:14 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -151,7 +151,7 @@
                atari_config_found(cfdata_gbus, NULL, &grf_auxp, grfbusprint,
                    CFARGS_NONE);
        } else {
-               printf("\n");
+               aprint_normal("\n");
                config_found(self, &grf_auxp, grfbusprint, CFARGS_NONE);
        }
 }
diff -r 713b0c8b33f6 -r 0ecd755d7607 sys/arch/atari/dev/hdfd.c
--- a/sys/arch/atari/dev/hdfd.c Sun Jun 26 17:55:38 2022 +0000
+++ b/sys/arch/atari/dev/hdfd.c Sun Jun 26 18:46:14 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hdfd.c,v 1.90 2022/06/26 06:25:09 tsutsui Exp $        */
+/*     $NetBSD: hdfd.c,v 1.91 2022/06/26 18:46:14 tsutsui Exp $        */
 
 /*-
  * Copyright (c) 1996 Leo Weppelman
@@ -91,7 +91,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hdfd.c,v 1.90 2022/06/26 06:25:09 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdfd.c,v 1.91 2022/06/26 18:46:14 tsutsui Exp $");
 
 #include "opt_ddb.h"
 
@@ -436,10 +436,10 @@
                has_fifo = 1;
        } else {
                (void)rd_fdc_reg(fddata);
-               printf(": no fifo");
+               aprint_normal(": no fifo");
        }
 
-       printf("\n");
+       aprint_normal("\n");
 
        callout_init(&fdc->sc_timo_ch, 0);
        callout_init(&fdc->sc_intr_ch, 0);
@@ -447,7 +447,7 @@
        if (intr_establish(22, USER_VEC|FAST_VEC, 0,
                           (hw_ifun_t)(has_fifo ? mfp_hdfd_fifo : mfp_hdfd_nf),
                           NULL) == NULL) {
-               printf("fdcattach: Can't establish interrupt\n");
+               aprint_error_dev(self, "Can't establish interrupt\n");
                return;
        }
 
@@ -537,10 +537,10 @@
        /* XXX Allow `flags' to override device type? */
 
        if (type)
-               printf(": %s %d cyl, %d head, %d sec\n", type->name,
+               aprint_normal(": %s %d cyl, %d head, %d sec\n", type->name,
                    type->tracks, type->heads, type->sectrac);
        else
-               printf(": density unknown\n");
+               aprint_normal(": density unknown\n");
 
        bufq_alloc(&fd->sc_q, "disksort", BUFQ_SORT_CYLINDER);
        fd->sc_cylin      = -1;
diff -r 713b0c8b33f6 -r 0ecd755d7607 sys/arch/atari/dev/ite.c
--- a/sys/arch/atari/dev/ite.c  Sun Jun 26 17:55:38 2022 +0000
+++ b/sys/arch/atari/dev/ite.c  Sun Jun 26 18:46:14 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ite.c,v 1.83 2022/06/26 06:25:09 tsutsui Exp $ */
+/*     $NetBSD: ite.c,v 1.84 2022/06/26 18:46:14 tsutsui Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -44,7 +44,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.83 2022/06/26 06:25:09 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.84 2022/06/26 18:46:14 tsutsui Exp $");
 
 #include "opt_ddb.h"
 
@@ -230,15 +230,15 @@
                splx(s);
 
                iteinit(gsc->g_itedev);
-               printf(": %dx%d", sc->rows, sc->cols);
-               printf(" repeat at (%d/100)s next at (%d/100)s",
+               aprint_normal(": %dx%d", sc->rows, sc->cols);
+               aprint_normal(" repeat at (%d/100)s next at (%d/100)s",
                    start_repeat_timeo, next_repeat_timeo);
 
                if (kbd_ite == NULL)
                        kbd_ite = sc;
                if (kbd_ite == sc)
-                       printf(" has keyboard");
-               printf("\n");
+                       aprint_normal(" has keyboard");
+               aprint_normal("\n");
                sc->flags |= ITE_ATTACHED;
        } else {
                if (con_itesoftc.grf != NULL &&
diff -r 713b0c8b33f6 -r 0ecd755d7607 sys/arch/atari/dev/ite_cc.c
--- a/sys/arch/atari/dev/ite_cc.c       Sun Jun 26 17:55:38 2022 +0000
+++ b/sys/arch/atari/dev/ite_cc.c       Sun Jun 26 18:46:14 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ite_cc.c,v 1.45 2022/06/25 03:33:29 tsutsui Exp $      */
+/*     $NetBSD: ite_cc.c,v 1.46 2022/06/26 18:46:14 tsutsui Exp $      */
 
 /*
  * Copyright (c) 1996 Leo Weppelman
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ite_cc.c,v 1.45 2022/06/25 03:33:29 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ite_cc.c,v 1.46 2022/06/26 18:46:14 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -259,12 +259,12 @@
                grf_viewsync(sc);
        }
 
-       printf(": width %d height %d", sc->g_display.gd_dwidth,
+       aprint_normal(": width %d height %d", sc->g_display.gd_dwidth,
                    sc->g_display.gd_dheight);
        if (sc->g_display.gd_colors == 2)
-               printf(" monochrome\n");
+               aprint_normal(" monochrome\n");
        else
-               printf(" colors %d\n", sc->g_display.gd_colors);
+               aprint_normal(" colors %d\n", sc->g_display.gd_colors);
        
        /*
         * try and attach an ite
diff -r 713b0c8b33f6 -r 0ecd755d7607 sys/arch/atari/dev/ite_et.c
--- a/sys/arch/atari/dev/ite_et.c       Sun Jun 26 17:55:38 2022 +0000
+++ b/sys/arch/atari/dev/ite_et.c       Sun Jun 26 18:46:14 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ite_et.c,v 1.36 2022/06/25 03:33:29 tsutsui Exp $      */
+/*     $NetBSD: ite_et.c,v 1.37 2022/06/26 18:46:14 tsutsui Exp $      */
 
 /*
  * Copyright (c) 1996 Leo Weppelman.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ite_et.c,v 1.36 2022/06/25 03:33:29 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ite_et.c,v 1.37 2022/06/26 18:46:14 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -233,11 +233,12 @@
                grf_viewsync(sc);
        }
 
-       printf(": %dx%d", sc->g_display.gd_dwidth, sc->g_display.gd_dheight);
+       aprint_normal(": %dx%d", sc->g_display.gd_dwidth,
+           sc->g_display.gd_dheight);
        if (sc->g_display.gd_colors == 2)
-               printf(" monochrome\n");
+               aprint_normal(" monochrome\n");
        else
-               printf(" colors %d\n", sc->g_display.gd_colors);
+               aprint_normal(" colors %d\n", sc->g_display.gd_colors);
        
        /*
         * try and attach an ite