Changeset 6279149 in rtems for c/src/lib/libbsp/mips/csb350

Timestamp:

Oct 8, 2014, 9:04:56 PM (6 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.11, 5, master

Children:

6adacd89

Parents:

8536b67

git-author:

Joel Sherrill <joel.sherrill@…> (10/08/14 21:04:56)

git-committer:

Joel Sherrill <joel.sherrill@…> (10/10/14 15:17:09)

Message:

Add console-polled.h and update all BSPs that should use it.

The file console-polled.h provides the prototypes for the three
required methods when implementing a single port polled console
driver. This paradigm is common on simulators and simple hardware.

+ Updated the BSPs Makefile.am to make console-polled.h available.
+ Regenerated the BSPs preinstall.sm.
+ Updated console support files to include <bsp/console-polled.h>.
+ Updated console support files to make printk() support method static.

Location:

c/src/lib/libbsp/mips/csb350

Files:

• Makefile.am (modified) (1 diff)
• console/console-io.c (modified) (3 diffs)
• preinstall.am (modified) (1 diff)

c/src/lib/libbsp/mips/csb350/Makefile.am

@@ -17 +17 @@
 nodist_include_HEADERS = include/bspopts.h
 nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
+nodist_include_bsp_HEADERS += ../../shared/include/console-polled.h
 DISTCLEANFILES = include/bspopts.h
 nodist_include_HEADERS += ../../shared/include/coverhd.h

c/src/lib/libbsp/mips/csb350/console/console-io.c

@@ -2 +2 @@
  *  This file contains the hardware specific portions of the TTY driver
  *  for the serial ports on the csb350.
- *
- *  Logic based on the jmr3904-io.c file in newlib 1.8.2
- *
+ */
+
+/*
  *  COPYRIGHT (c) 1989-2000.
  *  On-Line Applications Research Corporation (OAR).
@@ -14 +14 @@
 
 #include <bsp.h>
+#include <bsp/console-polled.h>
 #include <rtems/libio.h>
 #include <libcpu/au1x00.h>
@@ -81 +82 @@
 }
 
-int csb250_get_char(void)
+static int csb250_get_char(void)
 {
   return console_inbyte_nonblocking(0);

c/src/lib/libbsp/mips/csb350/preinstall.am

@@ -70 +70 @@
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
 
+$(PROJECT_INCLUDE)/bsp/console-polled.h: ../../shared/include/console-polled.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/console-polled.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/console-polled.h
+
 $(PROJECT_INCLUDE)/coverhd.h: ../../shared/include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp)
         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h