Changeset ede1a41 in rtems

Timestamp:

06/21/16 11:12:31 (7 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

5, master

Children:

506bfc8

Parents:

e8020d1

git-author:

Sebastian Huber <sebastian.huber@…> (06/21/16 11:12:31)

git-committer:

Sebastian Huber <sebastian.huber@…> (06/22/16 05:29:26)

Message:

Make rtems/print.h independent of rtems/bspIo.h

Files:

• c/src/lib/libbsp/shared/src/irq-default-handler.c (modified) (1 diff)
• c/src/libchip/rtc/ds1375.c (modified) (1 diff)
• cpukit/include/rtems/bspIo.h (modified) (1 diff)
• cpukit/include/rtems/print.h (modified) (3 diffs)
• cpukit/libcsupport/src/printk_plugin.c (modified) (1 diff)
• cpukit/libdrvmgr/drvmgr_translate_check.c (modified) (1 diff)
• cpukit/libfs/src/devfs/devfs_show.c (modified) (1 diff)
• cpukit/libfs/src/jffs2/include/linux/kernel-rtems.h (modified) (1 diff)
• cpukit/libmisc/mouse/mouse_parser.c (modified) (1 diff)
• cpukit/libmisc/mouse/serial_mouse.c (modified) (1 diff)
• testsuites/libtests/block08/bdbuf_tests.h (modified) (1 diff)
• testsuites/samples/cdtest/main.cc (modified) (1 diff)
• testsuites/sptests/spprintk/init.c (modified) (1 diff)
• testsuites/support/include/buffer_test_io.h (modified) (1 diff)

c/src/lib/libbsp/shared/src/irq-default-handler.c

@@ -15 +15 @@
 #include <inttypes.h>
 
-#include <rtems/print.h>
+#include <rtems/bspIo.h>
 
 #include <bsp/irq-generic.h>

c/src/libchip/rtc/ds1375.c

@@ -52 +52 @@
 
 #include <rtems.h>
+#include <rtems/bspIo.h>
 #include <rtems/rtc.h>
 #include <rtems/score/sysstate.h>

cpukit/include/rtems/bspIo.h

@@ -123 +123 @@
 extern void rtems_putc(char c);
 
-/**
- * Type definition for function which can be plugged in to
- * certain reporting routines to redirect the output.
- *
- * Use the RTEMS Print interface to call these functions. Do not
- * directly use them.
- *
- * If the user provides their own "printf plugin", then they may
- * redirect those reports as they see fit.
- */
-typedef int (*rtems_print_plugin_t)(void *, const char *format, va_list ap);
-
 /**@}*/
 

cpukit/include/rtems/print.h

@@ -19 +19 @@
 #define _RTEMS_PRINT_H
 
-#include <stdbool.h>
-#include <stddef.h>
+#include <rtems/score/basedefs.h>
+
+#include <stdarg.h>
 #include <stdio.h>
-
-#include <rtems/bspIo.h>
 
 #ifdef __cplusplus
@@ -37 +36 @@
 
 /**
+ * Type definition for function which can be plugged in to certain reporting
+ * routines to redirect the output.
+ *
+ * Use the RTEMS Print interface to call these functions. Do not directly use
+ * them.
+ *
+ * If the user provides their own printer, then they may redirect those reports
+ * as they see fit.
+ */
+typedef int (*rtems_print_printer)(void *, const char *format, va_list ap);
+
+/**
  * Type definition for the printer structure used to access the kernel print
  * support.
@@ -42 +53 @@
 typedef struct rtems_printer {
   void                *context;
-  rtems_print_plugin_t printer;
+  rtems_print_printer  printer;
 } rtems_printer;
 

cpukit/libcsupport/src/printk_plugin.c

@@ -20 +20 @@
 
 #include <rtems/print.h>
+#include <rtems/bspIo.h>
 
 static int printk_plugin(

cpukit/libdrvmgr/drvmgr_translate_check.c

@@ -9 +9 @@
 
 #include <drvmgr/drvmgr.h>
+
+#include <rtems/bspIo.h>
 
 /* Calls drvmgr_translate() to translate an address range and check the result,

cpukit/libfs/src/devfs/devfs_show.c

@@ -17 +17 @@
 
 #include "devfs.h"
+
+#include <rtems/bspIo.h>
 
 void devFS_Show(void)

cpukit/libfs/src/jffs2/include/linux/kernel-rtems.h

@@ -19 +19 @@
 
 #include <rtems.h>
-#include <rtems/print.h>
+#include <rtems/bspIo.h>
 
 static inline char *do_kmemdup(const char *s, size_t n)

cpukit/libmisc/mouse/mouse_parser.c

@@ -41 +41 @@
 
 #include <rtems.h>
+#include <rtems/bspIo.h>
 #include <rtems/mouse_parser.h>
 #include <rtems/mw_uid.h>

cpukit/libmisc/mouse/serial_mouse.c

@@ -21 +21 @@
 #include <fcntl.h>
 
+#include <rtems/bspIo.h>
 #include <rtems/libio.h>
 #include <termios.h>

testsuites/libtests/block08/bdbuf_tests.h

@@ -17 +17 @@
 #include <string.h>
 #include <errno.h>
+#include <rtems/bspIo.h>
 #include <rtems/diskdevs.h>
 #include <rtems/bdbuf.h>

testsuites/samples/cdtest/main.cc

@@ -24 +24 @@
 
 #include <rtems.h>
+#include <rtems/bspIo.h>
 #include <rtems/test.h>
 

testsuites/sptests/spprintk/init.c

@@ -25 +25 @@
 #define TESTS_USE_PRINTK
 #include <tmacros.h>
-#include <rtems/print.h>
 
 const char rtems_test_name[] = "SPPRINTK";

testsuites/support/include/buffer_test_io.h

@@ -6 +6 @@
 #define __BUFFER_TEST_IO_h
 
+#include <rtems/bspIo.h>
 #include <rtems/test.h>