1 files changed, 38 insertions, 10 deletions

diff --git a/bsps/riscv/griscv/console/printk_support.c b/bsps/riscv/griscv/console/printk_support.c
index f232203520..f3af16be4d 100644
--- a/bsps/riscv/griscv/console/printk_support.c
+++ b/bsps/riscv/griscv/console/printk_support.c
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
+
 /*
  *  This file contains the TTY driver for the GRLIb APBUART
  *
@@ -10,9 +12,26 @@
  *  COPYRIGHT (c) 2011.
  *  Aeroflex Gaisler.
  *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include <bsp.h>
@@ -24,9 +43,10 @@
 #include <stdio.h>
 #include <grlib/apbuart.h>
 #include <grlib/ambapp.h>
+#include <grlib/io.h>
 
 int grlib_debug_uart_index __attribute__((weak)) = 0;
-struct apbuart_regs *grlib_debug_uart = NULL;
+apbuart *grlib_debug_uart = NULL;
 
 /* Before UART driver has registered (or when no UART is available), calls to
  * printk that gets to bsp_out_char() will be filling data into the
@@ -68,13 +88,17 @@ static void bsp_debug_uart_init(void)
                                  VENDOR_GAISLER, GAISLER_APBUART,
                                  ambapp_find_by_idx, (void *)&i);
   if (adev) {
+    uint32_t ctrl;
+
     /* Found a matching debug console, initialize debug uart if present
      * for printk
      */
     apb = (struct ambapp_apb_info *)adev->devinfo;
-    grlib_debug_uart = (struct apbuart_regs *)apb->start;
-    grlib_debug_uart->ctrl |= APBUART_CTRL_RE | APBUART_CTRL_TE;
-    grlib_debug_uart->status = 0;
+    grlib_debug_uart = (apbuart *)apb->start;
+    ctrl = grlib_load_32(&grlib_debug_uart->ctrl);
+    ctrl |= APBUART_CTRL_RE | APBUART_CTRL_TE;
+    grlib_store_32(&grlib_debug_uart->ctrl, ctrl);
+    grlib_store_32(&grlib_debug_uart->status, 0);
   }
 }
 
@@ -88,10 +112,14 @@ RTEMS_SYSINIT_ITEM(
 static void bsp_out_char(char c)
 {
   if (grlib_debug_uart == NULL) {
+    uint32_t ctrl;
+
     /* Try to assign standard UART address to debug driver to pass some tests */
-    grlib_debug_uart = (struct apbuart_regs *) 0x80000100;
-    grlib_debug_uart->ctrl |= APBUART_CTRL_RE | APBUART_CTRL_TE;
-    grlib_debug_uart->status = 0;
+    grlib_debug_uart = (apbuart *) 0x80000100;
+    ctrl = grlib_load_32(&grlib_debug_uart->ctrl);
+    ctrl |= APBUART_CTRL_RE | APBUART_CTRL_TE;
+    grlib_store_32(&grlib_debug_uart->ctrl, ctrl);
+    grlib_store_32(&grlib_debug_uart->status, 0);
     /* Local debug buffer when UART driver has not registered */
     /*
     pre_printk_dbgbuf[pre_printk_pos++] = c;