updates and new test cases

4 files changed, 282 insertions, 0 deletions

diff --git a/testsuites/libtests/block09/Makefile.am b/testsuites/libtests/block09/Makefile.am
new file mode 100644
index 0000000000..a59029463e
--- /dev/null
+++ b/testsuites/libtests/block09/Makefile.am
@@ -0,0 +1,27 @@
+##
+## $Id$
+##
+
+MANAGERS = io semaphore event
+
+rtems_tests_PROGRAMS = block09
+block09_SOURCES = init.c
+
+dist_rtems_tests_DATA = block09.scn block09.doc
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
+
+block09_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
+
+AM_CPPFLAGS += -I$(top_srcdir)/../support/include
+
+LINK_OBJS = $(block09_OBJECTS) $(block09_LDADD)
+LINK_LIBS = $(block09_LDLIBS)
+
+block09$(EXEEXT): $(block09_OBJECTS) $(block09_DEPENDENCIES)
+	@rm -f block09$(EXEEXT)
+	$(make-exe)
+
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/block09/block09.doc b/testsuites/libtests/block09/block09.doc
new file mode 100644
index 0000000000..ec118a86a5
--- /dev/null
+++ b/testsuites/libtests/block09/block09.doc
@@ -0,0 +1,27 @@
+#
+# $Id$
+#
+# Copyright (c) 2010
+# embedded brains GmbH
+# Obere Lagerstr. 30
+# D-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.
+#
+
+This file describes the directives and concepts tested by this test set.
+
+test set name: block09
+
+directives:
+
+  rtems_bdbuf_read
+  rtems_bdbuf_sync
+
+concepts:
+
++ Disk driver error handling..
diff --git a/testsuites/libtests/block09/block09.scn b/testsuites/libtests/block09/block09.scn
new file mode 100644
index 0000000000..c9fd1d459b
--- /dev/null
+++ b/testsuites/libtests/block09/block09.scn
@@ -0,0 +1,2 @@
+*** TEST BLOCK 9 ***
+*** END OF TEST BLOCK 9 ***
diff --git a/testsuites/libtests/block09/init.c b/testsuites/libtests/block09/init.c
new file mode 100644
index 0000000000..e413a1f748
--- /dev/null
+++ b/testsuites/libtests/block09/init.c
@@ -0,0 +1,226 @@
+/**
+ * @file
+ *
+ * @ingroup test_bdbuf
+ *
+ * @brief Bdbuf test for disk driver error handling..
+ */
+
+/*
+ * Copyright (c) 2009
+ * embedded brains GmbH
+ * Obere Lagerstr. 30
+ * D-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.
+ */
+
+#include <assert.h>
+#include <errno.h>
+
+#include <rtems.h>
+#include <rtems/bdbuf.h>
+#include <rtems/diskdevs.h>
+
+#define ASSERT_SC(sc) assert((sc) == RTEMS_SUCCESSFUL)
+
+#define BLOCK_SIZE sizeof(char)
+
+#define BLOCK_COUNT 4
+
+#define BLOCK_READ_IO_ERROR 0
+#define BLOCK_READ_UNSATISFIED 1
+#define BLOCK_READ_SUCCESSFUL 2
+#define BLOCK_WRITE_IO_ERROR 3
+
+static char disk_data [BLOCK_COUNT];
+
+static const rtems_driver_address_table disk_ops = {
+  .initialization_entry = NULL,
+  RTEMS_GENERIC_BLOCK_DEVICE_DRIVER_ENTRIES
+};
+
+static int disk_ioctl(rtems_disk_device *dd, uint32_t req, void *arg)
+{
+  rtems_status_code sc = RTEMS_SUCCESSFUL;
+
+  if (req == RTEMS_BLKIO_REQUEST) {
+    rtems_blkdev_request *r = arg;
+    uint32_t i = 0;
+
+    for (i = 0; i < r->bufnum; ++i) {
+      rtems_blkdev_sg_buffer *sg = &r->bufs [i];
+      char *buf = sg->buffer;
+
+      if (sg->length != 1) {
+        return -1;
+      }
+
+      switch (r->req) {
+        case RTEMS_BLKDEV_REQ_READ:
+          switch (sg->block) {
+            case BLOCK_READ_IO_ERROR:
+              sc = RTEMS_IO_ERROR;
+              break;
+            case BLOCK_READ_UNSATISFIED:
+              sc = RTEMS_UNSATISFIED;
+              break;
+            case BLOCK_READ_SUCCESSFUL:
+            case BLOCK_WRITE_IO_ERROR:
+              *buf = disk_data [sg->block];
+              break;
+            default:
+              return -1;
+          }
+          break;
+        case RTEMS_BLKDEV_REQ_WRITE:
+          switch (sg->block) {
+            case BLOCK_READ_IO_ERROR:
+            case BLOCK_READ_UNSATISFIED:
+            case BLOCK_READ_SUCCESSFUL:
+              disk_data [sg->block] = *buf;
+              break;
+            case BLOCK_WRITE_IO_ERROR:
+              sc = RTEMS_IO_ERROR;
+              break;
+            default:
+              return -1;
+          }
+          break;
+        default:
+          return -1;
+      }
+    }
+
+    r->req_done(r->done_arg, sc);
+
+    return 0;
+  } else {
+    return rtems_blkdev_ioctl(dd, req, arg);
+  }
+}
+
+rtems_status_code disk_register(
+  uint32_t block_size,
+  rtems_blkdev_bnum block_count,
+  dev_t *dev_ptr
+)
+{
+  rtems_status_code sc = RTEMS_SUCCESSFUL;
+  rtems_device_major_number major = 0;
+  dev_t dev = 0;
+
+  sc = rtems_io_register_driver(0, &disk_ops, &major);
+  ASSERT_SC(sc);
+
+  dev = rtems_filesystem_make_dev_t(major, 0);
+
+  sc = rtems_disk_create_phys(
+    dev,
+    block_size,
+    block_count,
+    disk_ioctl,
+    NULL,
+    NULL
+  );
+  ASSERT_SC(sc);
+
+  *dev_ptr = dev;
+
+  return RTEMS_SUCCESSFUL;
+}
+
+static void check_read(
+  dev_t dev,
+  rtems_blkdev_bnum block,
+  rtems_status_code expected_sc
+)
+{
+  rtems_status_code sc = RTEMS_SUCCESSFUL;
+  rtems_bdbuf_buffer *bd = NULL;
+
+  sc = rtems_bdbuf_read(dev, block, &bd);
+  assert(sc == expected_sc);
+
+  if (sc == RTEMS_SUCCESSFUL) {
+    sc = rtems_bdbuf_release(bd);
+    ASSERT_SC(sc);
+  }
+}
+
+static rtems_task Init(rtems_task_argument argument)
+{
+  rtems_status_code sc = RTEMS_SUCCESSFUL;
+  rtems_bdbuf_buffer *bd = NULL;
+  dev_t dev = 0;
+
+  printk("\n\n*** TEST BLOCK 9 ***\n");
+
+  sc = rtems_disk_io_initialize();
+  ASSERT_SC(sc);
+
+  sc = disk_register(BLOCK_SIZE, BLOCK_COUNT, &dev);
+  ASSERT_SC(sc);
+
+  check_read(dev, BLOCK_READ_IO_ERROR, RTEMS_IO_ERROR);
+  check_read(dev, BLOCK_READ_UNSATISFIED, RTEMS_UNSATISFIED);
+  check_read(dev, BLOCK_READ_SUCCESSFUL, RTEMS_SUCCESSFUL);
+  check_read(dev, BLOCK_WRITE_IO_ERROR, RTEMS_SUCCESSFUL);
+
+  /* Check write IO error */
+
+  sc = rtems_bdbuf_read(dev, BLOCK_WRITE_IO_ERROR, &bd);
+  ASSERT_SC(sc);
+
+  bd->buffer [0] = 1;
+
+  sc = rtems_bdbuf_sync(bd);
+  ASSERT_SC(sc);
+
+  sc = rtems_bdbuf_read(dev, BLOCK_WRITE_IO_ERROR, &bd);
+  ASSERT_SC(sc);
+
+  assert(bd->buffer [0] == 0);
+
+  sc = rtems_bdbuf_release(bd);
+  ASSERT_SC(sc);
+
+  /* Check write to deleted disk */
+
+  sc = rtems_bdbuf_read(dev, BLOCK_READ_SUCCESSFUL, &bd);
+  ASSERT_SC(sc);
+
+  sc = rtems_disk_delete(dev);
+  ASSERT_SC(sc);
+
+  sc = rtems_bdbuf_sync(bd);
+  ASSERT_SC(sc);
+
+  printk("*** END OF TEST BLOCK 9 ***\n");
+
+  exit(0);
+}
+
+#define CONFIGURE_INIT
+
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_LIBBLOCK
+
+#define CONFIGURE_USE_IMFS_AS_BASE_FILESYSTEM
+
+#define CONFIGURE_MAXIMUM_TASKS 3
+#define CONFIGURE_MAXIMUM_DRIVERS 4
+#define CONFIGURE_MAXIMUM_SEMAPHORES 5
+
+#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
+
+#define CONFIGURE_BDBUF_BUFFER_MIN_SIZE BLOCK_SIZE
+#define CONFIGURE_BDBUF_BUFFER_MAX_SIZE BLOCK_SIZE
+#define CONFIGURE_BDBUF_CACHE_MEMORY_SIZE (BLOCK_SIZE * BLOCK_COUNT)
+
+#include <rtems/confdefs.h>