Changeset c3e1401 in rtems

Timestamp:

10/24/22 13:37:16 (3 months ago)

Author:

Alex White <alex.white@…>

Branches:

master

Children:

e012671

Parents:

24098722

git-author:

Alex White <alex.white@…> (10/24/22 13:37:16)

git-committer:

Joel Sherrill <joel@…> (11/29/22 22:59:26)

Message:

bsps/microblaze: Fix console interrupt build errors

This fixes build errors seen when building with console interrupts
enabled. A few places were missing bspopts.h includes, and one of the
UART functions was not defined.

Location:

bsps/microblaze

Files:

• include/dev/serial/uartlite.h (modified) (1 diff)
• include/dev/serial/uartlite_l.h (modified) (1 diff)
• shared/dev/serial/uartlite.c (modified) (2 diffs)

bsps/microblaze/include/dev/serial/uartlite.h

@@ -37 +37 @@
 #define LIBBSP_MICROBLAZE_SHARED_UARTLITE_H
 
+#include <bspopts.h>
 #include <rtems/termiostypes.h>
 

bsps/microblaze/include/dev/serial/uartlite_l.h

@@ -235 +235 @@
         XUL_SR_RX_FIFO_VALID_DATA)
 
+#ifdef __rtems__
+/****************************************************************************/
+/**
+*
+* Check to see if the transmitter is empty.
+*
+* @param        BaseAddress is the  base address of the device
+*
+* @return       TRUE if the transmitter is empty, FALSE otherwise.
+*
+* @note         C-style Signature:
+*               int XUartLite_IsTransmitEmpty(u32 BaseAddress);
+*
+*****************************************************************************/
+#define XUartLite_IsTransmitEmpty(BaseAddress) \
+  ((XUartLite_GetStatusReg((BaseAddress)) & XUL_SR_TX_FIFO_EMPTY) == \
+        XUL_SR_TX_FIFO_EMPTY)
+#endif /* __rtems__ */
 
 /****************************************************************************/

bsps/microblaze/shared/dev/serial/uartlite.c

@@ -36 +36 @@
 #include <bsp/irq.h>
 #include <dev/serial/uartlite.h>
+#include <bspopts.h>
 
 #ifdef BSP_MICROBLAZE_FPGA_CONSOLE_INTERRUPTS
@@ -48 +49 @@
   }
 
-  while ( ctx->transmitting && !XUartLite_IsTransmitEmpty( ctx ) ) {
+  while ( ctx->transmitting && !XUartLite_IsTransmitEmpty( ctx->address ) ) {
     rtems_termios_dequeue_characters( tty, 1 );
   }