[src/trunk]: src/sys/arch/arm/xilinx Fix build.

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

details:   https://anonhg.NetBSD.org/src/rev/2b580d57c63c
branches:  trunk
changeset: 372113:2b580d57c63c
user:      skrll <skrll%NetBSD.org@localhost>
date:      Thu Oct 27 07:57:46 2022 +0000

description:
Fix build.
Sprinkle some consistency

diffstat:

 sys/arch/arm/xilinx/zynq_uart.c |  11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diffs (41 lines):

diff -r a1022a8991a1 -r 2b580d57c63c sys/arch/arm/xilinx/zynq_uart.c
--- a/sys/arch/arm/xilinx/zynq_uart.c   Thu Oct 27 06:49:51 2022 +0000
+++ b/sys/arch/arm/xilinx/zynq_uart.c   Thu Oct 27 07:57:46 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: zynq_uart.c,v 1.4 2022/10/26 23:38:07 riastradh Exp $  */
+/*     $NetBSD: zynq_uart.c,v 1.5 2022/10/27 07:57:46 skrll Exp $      */
 
 /*
  * Copyright (c) 2012  Genetec Corporation.  All rights reserved.
@@ -96,7 +96,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zynq_uart.c,v 1.4 2022/10/26 23:38:07 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zynq_uart.c,v 1.5 2022/10/27 07:57:46 skrll Exp $");
 
 #include "opt_soc.h"
 #include "opt_console.h"
@@ -1904,10 +1904,9 @@
 
        c = 0xff & bus_space_read_4(iot, ioh, UART_TX_RX_FIFO);
 
-       {
+       if (!db_active) {
                int cn_trapped __unused = 0;
-               if (!db_active) {
-                       cn_check_magic(dev, c, zynquart_cnm_state);
+               cn_check_magic(dev, c, zynquart_cnm_state);
        }
        splx(s);
        return (c);
@@ -1923,8 +1922,8 @@
 
        if (!READAHEAD_IS_FULL() &&
            !(bus_space_read_4(iot, ioh, UART_CHANNEL_STS) & STS_REMPTY)) {
+               int cn_trapped __unused = 0;
 
-               int __attribute__((__unused__))cn_trapped = 0;
                cin = bus_space_read_4(iot, ioh, UART_TX_RX_FIFO);
                cn_check_magic(dev, cin & 0xff, zynquart_cnm_state);
                zynquart_readahead_in = (zynquart_readahead_in + 1) &