Changeset f4424cfb in rtems

Timestamp:

Aug 9, 2018, 7:20:33 AM (2 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

5, master

Children:

0e6f7dc4

Parents:

aac36d15

git-author:

Sebastian Huber <sebastian.huber@…> (08/09/18 07:20:33)

git-committer:

Sebastian Huber <sebastian.huber@…> (08/10/18 05:14:43)

Message:

bsps/sparc: Move polled APBUART functions

This reduces the link-time dependencies and avoids copy-and-paste.

Files:

• bsps/sparc/include/bsp/apbuart.h (modified) (2 diffs)
• bsps/sparc/include/bsp/apbuart_termios.h (modified) (1 diff)
• bsps/sparc/leon3/console/printk_support.c (modified) (1 diff)
• bsps/sparc/shared/uart/apbuart_cons.c (modified) (2 diffs)
• bsps/sparc/shared/uart/apbuart_polled.c (added)
• bsps/sparc/shared/uart/apbuart_termios.c (modified) (1 diff)
• c/src/lib/libbsp/sparc/leon3/Makefile.am (modified) (2 diffs)

bsps/sparc/include/bsp/apbuart.h

@@ -21 +21 @@
 
 #include <ambapp.h>
+#include <grlib.h>
 
 #ifdef __cplusplus
@@ -54 +55 @@
 #define APBUART_STATUS_RF 0x400
 
+void apbuart_outbyte_polled(
+  struct apbuart_regs *regs,
+  unsigned char ch,
+  int do_cr_on_newline,
+  int wait_sent
+);
+
+int apbuart_inbyte_nonblocking(struct apbuart_regs *regs);
+
 #ifdef __cplusplus
 }

bsps/sparc/include/bsp/apbuart_termios.h

@@ -35 +35 @@
 const rtems_termios_device_handler apbuart_handler_polled;
 
-/*
- *  apbuart_outbyte_polled
- *
- *  This routine transmits a character using polling.
- */
-void apbuart_outbyte_polled(
-  struct apbuart_regs *regs,
-  unsigned char ch,
-  int do_cr_on_newline,
-  int wait_sent
-);
-
-/*
- *  apbuart_inbyte_nonblocking
- *
- *  This routine polls for a character.
- */
-int apbuart_inbyte_nonblocking(struct apbuart_regs *regs);
-
 #ifdef __cplusplus
 }

bsps/sparc/leon3/console/printk_support.c

@@ -24 +24 @@
 #include <stdio.h>
 #include <bsp/apbuart.h>
-#include <bsp/apbuart_termios.h>
 
 int leon3_debug_uart_index __attribute__((weak)) = 0;

bsps/sparc/shared/uart/apbuart_cons.c

@@ -43 +43 @@
 
 /* LEON3 Low level transmit/receive functions provided by debug-uart code */
-extern void apbuart_outbyte_polled(
-  struct apbuart_regs *regs,
-  unsigned char ch,
-  int do_cr_on_newline,
-  int wait_sent);
-extern int apbuart_inbyte_nonblocking(struct apbuart_regs *regs);
 #ifdef LEON3
 extern struct apbuart_regs *leon3_debug_uart; /* The debug UART */
@@ -386 +380 @@
 #endif
 
-#ifndef LEON3
-/* This routine transmits a character, it will busy-wait until on character
- * fits in the APBUART Transmit FIFO
- */
-void apbuart_outbyte_polled(
-  struct apbuart_regs *regs,
-  unsigned char ch,
-  int do_cr_on_newline,
-  int wait_sent)
-{
-send:
-        while ((regs->status & LEON_REG_UART_STATUS_THE) == 0) {
-                /* Lower bus utilization while waiting for UART */
-                asm volatile ("nop"::); asm volatile ("nop"::);
-                asm volatile ("nop"::); asm volatile ("nop"::);
-                asm volatile ("nop"::); asm volatile ("nop"::);
-                asm volatile ("nop"::); asm volatile ("nop"::);
-        }
-        regs->data = (unsigned int) ch;
-
-        if ((ch == '\n') && do_cr_on_newline) {
-                ch = '\r';
-                goto send;
-        }
-
-        /* Wait until the character has been sent? */
-        if (wait_sent) {
-                while ((regs->status & LEON_REG_UART_STATUS_THE) == 0)
-                        ;
-        }
-}
-
-/* This routine polls for one character, return EOF if no character is available */
-int apbuart_inbyte_nonblocking(struct apbuart_regs *regs)
-{
-        if (regs->status & LEON_REG_UART_STATUS_ERR) {
-                regs->status = ~LEON_REG_UART_STATUS_ERR;
-        }
-
-        if ((regs->status & LEON_REG_UART_STATUS_DR) == 0)
-                return EOF;
-
-        return (int)regs->data;
-}
-#endif
-
 static bool first_open(
         rtems_termios_tty *tty,

bsps/sparc/shared/uart/apbuart_termios.c

@@ -243 +243 @@
 }
 
-/*
- *  apbuart_outbyte_polled
- *
- *  This routine transmits a character using polling.
- */
-void apbuart_outbyte_polled(
-  struct apbuart_regs *regs,
-  unsigned char ch,
-  int do_cr_on_newline,
-  int wait_sent
-)
-{
-send:
-  while ( (regs->status & APBUART_STATUS_TE) == 0 ) {
-    /* Lower bus utilization while waiting for UART */
-    __asm__ volatile ("nop"::); __asm__ volatile ("nop"::);
-    __asm__ volatile ("nop"::); __asm__ volatile ("nop"::);
-    __asm__ volatile ("nop"::); __asm__ volatile ("nop"::);
-    __asm__ volatile ("nop"::); __asm__ volatile ("nop"::);
-  }
-
-  if ((ch == '\n') && do_cr_on_newline) {
-    regs->data = (unsigned int) '\r';
-    do_cr_on_newline = 0;
-    goto send;
-  }
-  regs->data = (unsigned int) ch;
-
-  /* Wait until the character has been sent? */
-  if (wait_sent) {
-    while ((regs->status & APBUART_STATUS_TE) == 0)
-      ;
-  }
-}
-
-/*
- *  apbuart_inbyte_nonblocking
- *
- *  This routine polls for a character.
- */
-int apbuart_inbyte_nonblocking(struct apbuart_regs *regs)
-{
-  /* Clear errors */
-  if (regs->status & APBUART_STATUS_ERR)
-    regs->status = ~APBUART_STATUS_ERR;
-
-  if ((regs->status & APBUART_STATUS_DR) == 0)
-    return -1;
-  else
-    return (int) regs->data;
-}
-
 const rtems_termios_device_handler apbuart_handler_interrupt = {
   .first_open = apbuart_first_open_interrupt,

c/src/lib/libbsp/sparc/leon3/Makefile.am

@@ -69 +69 @@
 librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/uart/cons.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/uart/apbuart_cons.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/uart/apbuart_polled.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/uart/apbuart_termios.c
 # debugio
 librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/leon3/console/printk_support.c
@@ -117 +119 @@
 librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/spw/grspw_pkt.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/spw/grspw_router.c
-
-# UART
-librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/uart/apbuart_termios.c
 
 # I2CMST