summaryrefslogtreecommitdiffstats
path: root/cpukit/libmisc/fb
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/libmisc/fb
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/libmisc/fb')
-rw-r--r--cpukit/libmisc/fb/mw_print.c23
-rw-r--r--cpukit/libmisc/fb/mw_uid.h9
2 files changed, 15 insertions, 17 deletions
diff --git a/cpukit/libmisc/fb/mw_print.c b/cpukit/libmisc/fb/mw_print.c
index 8f4e465da2..25a3456c80 100644
--- a/cpukit/libmisc/fb/mw_print.c
+++ b/cpukit/libmisc/fb/mw_print.c
@@ -43,12 +43,13 @@ void uid_print_message(
struct MW_UID_MESSAGE *uid
)
{
- uid_print_message_with_plugin( NULL, printk_plugin, uid );
+ rtems_printer printer;
+ rtems_print_printer_printk(&printer);
+ uid_print_message_with_plugin( &printer, uid );
}
void uid_print_message_with_plugin(
- void *context,
- rtems_printk_plugin_t handler,
+ const rtems_printer *printer,
struct MW_UID_MESSAGE *uid
)
{
@@ -56,11 +57,11 @@ void uid_print_message_with_plugin(
switch (uid->type) {
case MV_UID_INVALID:
- (*handler)( context, "MV_UID_INVALID\n" );
+ rtems_printf( printer, "MV_UID_INVALID\n" );
break;
case MV_UID_REL_POS:
- (*handler)(
- context,
+ rtems_printf(
+ printer,
"MV_UID_REL_POS - %s x=%d y=%d z=%d\n",
uid_buttons( uid->m.pos.btns, buttons, sizeof(buttons)),
uid->m.pos.x, /* x location */
@@ -69,8 +70,8 @@ void uid_print_message_with_plugin(
);
break;
case MV_UID_ABS_POS:
- (*handler)(
- context,
+ rtems_printf(
+ printer,
"MV_UID_ABS_POS - %s x=%d y=%d z=%d\n",
uid_buttons( uid->m.pos.btns, buttons, sizeof(buttons)),
uid->m.pos.x, /* x location */
@@ -79,7 +80,7 @@ void uid_print_message_with_plugin(
);
break;
case MV_UID_KBD:
- (*handler)( context,
+ rtems_printf( printer,
"MV_UID_KBD - code=0x%04x modifiers=0x%02x mode=0x%02x\n",
uid->m.kbd.code, /* keycode or scancode */
uid->m.kbd.modifiers, /* key modifiers */
@@ -87,10 +88,10 @@ void uid_print_message_with_plugin(
);
break;
case MV_UID_TIMER:
- (*handler)( context, "MV_UID_TIMER\n" );
+ rtems_printf( printer, "MV_UID_TIMER\n" );
break;
default:
- (*handler)( context, "Invalid device type\n" );
+ rtems_printf( printer, "Invalid device type\n" );
break;
}
diff --git a/cpukit/libmisc/fb/mw_uid.h b/cpukit/libmisc/fb/mw_uid.h
index 8a10a8f38c..aa88392d26 100644
--- a/cpukit/libmisc/fb/mw_uid.h
+++ b/cpukit/libmisc/fb/mw_uid.h
@@ -18,7 +18,7 @@
#define _MW_UID_H
#include <sys/types.h>
-#include <rtems/bspIo.h>
+#include <rtems/print.h>
/**
* @defgroup libmisc_fb_mw Input Devices for MicroWindows
@@ -179,14 +179,11 @@ void uid_print_message(
* This methods prints the specified UID message using your fprintf
* style method of choice.
*
- * @param[in] context is a pointer to a data area which may be
- * used by some print handlers
- * @param[in] handler is the fprintf style method to invoke
+ * @param[in] RTEMS printer
* @param[in] uid points to the message to print
*/
void uid_print_message_with_plugin(
- void *context,
- rtems_printk_plugin_t handler,
+ const rtems_printer *printer,
struct MW_UID_MESSAGE *uid
);