summaryrefslogtreecommitdiffstats
path: root/cpukit/libblock/include/rtems
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/libblock/include/rtems
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/libblock/include/rtems')
-rw-r--r--cpukit/libblock/include/rtems/blkdev.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/cpukit/libblock/include/rtems/blkdev.h b/cpukit/libblock/include/rtems/blkdev.h
index 81e2dfa0da..99f857379b 100644
--- a/cpukit/libblock/include/rtems/blkdev.h
+++ b/cpukit/libblock/include/rtems/blkdev.h
@@ -16,7 +16,7 @@
#include <rtems.h>
#include <rtems/diskdevs.h>
-#include <rtems/bspIo.h>
+#include <rtems/print.h>
#include <sys/ioctl.h>
#include <stdio.h>
@@ -348,15 +348,14 @@ void rtems_blkdev_print_stats(
uint32_t media_block_size,
uint32_t media_block_count,
uint32_t block_size,
- rtems_printk_plugin_t print,
- void *print_arg
+ const rtems_printer* printer
);
/**
* @brief Block device statistics command.
*/
void rtems_blkstats(
- FILE *output,
+ const rtems_printer *printer,
const char *device,
bool reset
);