summaryrefslogtreecommitdiffstats
path: root/cpukit/score
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2016-05-20 18:39:50 +1000
committerChris Johns <chrisj@rtems.org>2016-05-25 15:47:34 +1000
commit24d0ee57a4d95f99be6e7e60bd162a30daf0638d (patch)
tree94239c8cc6b21813ca44b6ca89da73f9038914cc /cpukit/score
parentpsxtests/psxmsgq01: Fix typo (diff)
downloadrtems-24d0ee57a4d95f99be6e7e60bd162a30daf0638d.tar.bz2
cpukit, testsuite: Add rtems_printf and rtems_printer support.
This change adds rtems_printf and related functions and wraps the RTEMS print plugin support into a user API. All references to the plugin are removed and replaced with the rtems_printer interface. Printk and related functions are made to return a valid number of characters formatted and output. The function attribute to check printf functions has been added to rtems_printf and printk. No changes to remove warrnings are part of this patch set. The testsuite has been moved over to the rtems_printer. The testsuite has a mix of rtems_printer access and direct print control via the tmacros.h header file. The support for begink/endk has been removed as it served no purpose and only confused the code base. The testsuite has not been refactored to use rtems_printf. This is future work.
Diffstat (limited to 'cpukit/score')
-rw-r--r--cpukit/score/src/cpusetprintsupport.c30
1 files changed, 13 insertions, 17 deletions
diff --git a/cpukit/score/src/cpusetprintsupport.c b/cpukit/score/src/cpusetprintsupport.c
index 76851d3043..83345d985c 100644
--- a/cpukit/score/src/cpusetprintsupport.c
+++ b/cpukit/score/src/cpusetprintsupport.c
@@ -23,16 +23,15 @@
#include <stdio.h>
#include <ctype.h>
#include <inttypes.h>
-#include <rtems/bspIo.h>
+#include <rtems/print.h>
#include <rtems/score/cpusetimpl.h>
#ifdef __RTEMS_HAVE_SYS_CPUSET_H__
void _CPU_set_Show_with_plugin(
- void *context,
- rtems_printk_plugin_t print,
- const char *description,
- const cpu_set_t *cpuset
+ const rtems_printer *printer,
+ const char *description,
+ const cpu_set_t *cpuset
);
/*
@@ -42,21 +41,16 @@
* print plugin .
*/
void _CPU_set_Show_with_plugin(
- void *context,
- rtems_printk_plugin_t print,
- const char *description,
- const cpu_set_t *cpuset
+ const rtems_printer *printer,
+ const char *description,
+ const cpu_set_t *cpuset
)
{
int i;
-
- if ( !print )
- return;
-
- (*print)(context ,"%s: ", description);
+ rtems_printf(printer ,"%s: ", description);
for(i=0; i<_NCPUWORDS; i++)
- (*print)(context ,"%x", cpuset->__bits[i]);
- (*print)(context ,"\n");
+ rtems_printf(printer ,"%x", cpuset->__bits[i]);
+ rtems_printf(printer ,"\n");
}
/*
@@ -67,7 +61,9 @@
*/
void _CPU_set_Show( const char *description, const cpu_set_t *cpuset)
{
- _CPU_set_Show_with_plugin( NULL, printk_plugin, description, cpuset );
+ rtems_printer printer;
+ rtems_print_printer_printk( &printer );
+ _CPU_set_Show_with_plugin( &printer, description, cpuset );
}
/*