Merge branch 'upstream'

6 files changed, 41 insertions, 7 deletions

diff --git a/c/src/lib/libbsp/powerpc/t32mppc/configsim.t32 b/c/src/lib/libbsp/powerpc/t32mppc/configsim.t32
index 03070f49ed..02dc794672 100644
--- a/c/src/lib/libbsp/powerpc/t32mppc/configsim.t32
+++ b/c/src/lib/libbsp/powerpc/t32mppc/configsim.t32
@@ -1,7 +1,5 @@
 PBI=SIM
-
 SCREEN=
+HEADER=Simulator
 FONT=DEC
 FONT=SMALL
-
-HEADER=Simulator
diff --git a/cpukit/include/rtems/bspIo.h b/cpukit/include/rtems/bspIo.h
index 4fe7da3287..d5a004a7cc 100644
--- a/cpukit/include/rtems/bspIo.h
+++ b/cpukit/include/rtems/bspIo.h
@@ -64,6 +64,8 @@ extern void putk(const char *s);
  */
 extern int printk_plugin(void *context, const char *fmt, ...);
 
+extern int rtems_printf_plugin(void *context, const char *fmt, ...);
+
 /*
  *  Type definition for function which can be plugged in to
  *  certain reporting routines to redirect the output
diff --git a/cpukit/libblock/include/rtems/diskdevs.h b/cpukit/libblock/include/rtems/diskdevs.h
index 0b194096a5..6e6be5e9b7 100644
--- a/cpukit/libblock/include/rtems/diskdevs.h
+++ b/cpukit/libblock/include/rtems/diskdevs.h
@@ -61,7 +61,7 @@ typedef int (*rtems_block_device_ioctl)(
 #define RTEMS_DISK_READ_AHEAD_NO_TRIGGER ((rtems_blkdev_bnum) -1)
 
 /**
- * @brief Read-ahead control.
+ * @brief Block device read-ahead control.
  */
 typedef struct {
   /**
@@ -84,7 +84,7 @@ typedef struct {
    * be arbitrary.
    */
   rtems_blkdev_bnum next;
-} rtems_disk_read_ahread;
+} rtems_blkdev_read_ahead;
 
 /**
  * @brief Description of a disk device (logical and physical disks).
@@ -204,7 +204,7 @@ struct rtems_disk_device {
   /**
    * @brief Read-ahead control for this disk.
    */
-  rtems_disk_read_ahread read_ahead;
+  rtems_blkdev_read_ahead read_ahead;
 };
 
 /**
diff --git a/cpukit/libcsupport/Makefile.am b/cpukit/libcsupport/Makefile.am
index 46805e9080..ae233381a1 100644
--- a/cpukit/libcsupport/Makefile.am
+++ b/cpukit/libcsupport/Makefile.am
@@ -120,6 +120,7 @@ BSD_LIBC_C_FILES = src/strlcpy.c src/strlcat.c src/issetugid.c
 
 libcsupport_a_SOURCES = src/gxx_wrappers.c src/getchark.c src/printk.c \
     src/printk_plugin.c src/putk.c src/vprintk.c \
+    src/printf_plugin.c \
     src/sup_fs_location.c \
     src/sup_fs_eval_path.c \
     src/sup_fs_eval_path_generic.c \
diff --git a/cpukit/libcsupport/src/printf_plugin.c b/cpukit/libcsupport/src/printf_plugin.c
new file mode 100644
index 0000000000..87913277f9
--- /dev/null
+++ b/cpukit/libcsupport/src/printf_plugin.c
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2012 embedded brains GmbH.  All rights reserved.
+ *
+ *  embedded brains GmbH
+ *  Obere Lagerstr. 30
+ *  82178 Puchheim
+ *  Germany
+ *  <rtems@embedded-brains.de>
+ *
+ * The license and distribution terms for this file may be
+ * found in the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ */
+
+#ifdef HAVE_CONFIG_H
+  #include "config.h"
+#endif
+
+#include <rtems/bspIo.h>
+
+#include <stdio.h>
+
+int rtems_printf_plugin(void *context, const char *format, ...)
+{
+  int rv;
+  va_list ap;
+
+  va_start(ap, format);
+  rv = vprintf(format, ap);
+  va_end(ap);
+
+  return rv;
+}
diff --git a/testsuites/libtests/block13/init.c b/testsuites/libtests/block13/init.c
index 43ce38860e..fa8ebc0f0d 100644
--- a/testsuites/libtests/block13/init.c
+++ b/testsuites/libtests/block13/init.c
@@ -45,7 +45,7 @@ static const int action_sequence [READ_COUNT] = {
 
 #define UNUSED_LINE { 0, 0, 0, 0, 0, 0, 0, 0, 0 }
 
-static int expected_block_access_counts [READ_COUNT] [BLOCK_COUNT] = {
+static const int expected_block_access_counts [READ_COUNT] [BLOCK_COUNT] = {
    { 1, 0, 0, 0, 0, 0, 0, 0, 0 },
    { 1, 0, 1, 0, 0, 0, 0, 0, 0 },
    { 1, 0, 1, 1, 1, 1, 0, 0, 0 },