Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/aarch64/aarch64 add default statements, use PRI?64 ...



details:   https://anonhg.NetBSD.org/src/rev/7d59f1faadf4
branches:  trunk
changeset: 320711:7d59f1faadf4
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Jul 17 00:29:55 2018 +0000

description:
add default statements, use PRI?64 instead of ll?

diffstat:

 sys/arch/aarch64/aarch64/cpu.c |  19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

diffs (68 lines):

diff -r e6d95d8294a9 -r 7d59f1faadf4 sys/arch/aarch64/aarch64/cpu.c
--- a/sys/arch/aarch64/aarch64/cpu.c    Tue Jul 17 00:29:20 2018 +0000
+++ b/sys/arch/aarch64/aarch64/cpu.c    Tue Jul 17 00:29:55 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.2 2018/07/09 06:19:53 ryo Exp $ */
+/* $NetBSD: cpu.c,v 1.3 2018/07/17 00:29:55 christos Exp $ */
 
 /*
  * Copyright (c) 2017 Ryo Shimizu <ryo%nerv.org@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: cpu.c,v 1.2 2018/07/09 06:19:53 ryo Exp $");
+__KERNEL_RCSID(1, "$NetBSD: cpu.c,v 1.3 2018/07/17 00:29:55 christos Exp $");
 
 #include "locators.h"
 #include "opt_arm_debug.h"
@@ -227,6 +227,10 @@
                        cunit = &cinfo->dcache;
                        cacheable = "Unified";
                        break;
+               default:
+                       cunit = &cinfo->dcache;
+                       cacheable = "*UNK*";
+                       break;
                }
 
                switch (cunit->cache_type) {
@@ -239,6 +243,9 @@
                case CACHE_TYPE_PIPT:
                        cachetype = "PIPT";
                        break;
+               default:
+                       cachetype = "*UNK*";
+                       break;
                }
 
                purging = cunit->cache_purging;
@@ -318,8 +325,8 @@
         * CTR - Cache Type Register
         */
        ctr = reg_ctr_el0_read();
-       aprint_normal_dev(self, "Cache Writeback Granule %lluB,"
-           " Exclusives Reservation Granule %lluB\n",
+       aprint_normal_dev(self, "Cache Writeback Granule %" PRIu64 "B,"
+           " Exclusives Reservation Granule %" PRIu64 "B\n",
            __SHIFTOUT(ctr, CTR_EL0_CWG_LINE) * 4,
            __SHIFTOUT(ctr, CTR_EL0_ERG_LINE) * 4);
 
@@ -356,7 +363,7 @@
        mvfr1 = reg_mvfr1_el1_read();
 
 
-       aprint_normal_dev(self, "revID=0x%llx", revidr);
+       aprint_normal_dev(self, "revID=0x%" PRIx64, revidr);
 
        /* ID_AA64DFR0_EL1 */
        switch (__SHIFTOUT(dfr0, ID_AA64DFR0_EL1_PMUVER)) {
@@ -397,7 +404,7 @@
 
 
 
-       aprint_normal_dev(self, "auxID=0x%llx", aidr);
+       aprint_normal_dev(self, "auxID=0x%" PRIx64, aidr);
 
        /* PFR0 */
        switch (__SHIFTOUT(pfr0, ID_AA64PFR0_EL1_GIC)) {



Home | Main Index | Thread Index | Old Index