Changeset 30c3898 in rtems

Timestamp:

03/03/18 12:24:42 (5 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

5, master

Children:

c4d35fb

Parents:

9d62874

git-author:

Sebastian Huber <sebastian.huber@…> (03/03/18 12:24:42)

git-committer:

Sebastian Huber <sebastian.huber@…> (05/18/18 08:44:18)

Message:

libblock: Init deps in rtems_blkdev_create()

Update #3358.

Files:

• cpukit/include/rtems/blkdev.h (modified) (1 diff)
• cpukit/libblock/src/blkdev-imfs.c (modified) (2 diffs)
• testsuites/libtests/block17/init.c (modified) (3 diffs)

cpukit/include/rtems/blkdev.h

@@ -297 +297 @@
  * @retval RTEMS_NO_MEMORY Not enough memory.
  * @retval RTEMS_UNSATISFIED Cannot create generic device node.
+ * @retval RTEMS_INCORRECT_STATE Cannot initialize bdbuf.
  *
  * @see rtems_blkdev_create_partition(), rtems_bdbuf_set_block_size(), and

cpukit/libblock/src/blkdev-imfs.c

@@ -7 +7 @@
 
 /*
- * Copyright (c) 2012 embedded brains GmbH.  All rights reserved.
+ * Copyright (c) 2012, 2018 embedded brains GmbH.  All rights reserved.
  *
  *  embedded brains GmbH
- *  Obere Lagerstr. 30
+ *  Dornierstr. 4
  *  82178 Puchheim
  *  Germany
@@ -280 +280 @@
 )
 {
-  rtems_status_code sc = RTEMS_SUCCESSFUL;
-  rtems_blkdev_imfs_context *ctx = malloc(sizeof(*ctx));
-
+  rtems_status_code sc;
+  rtems_blkdev_imfs_context *ctx;
+
+  sc = rtems_bdbuf_init();
+  if (sc != RTEMS_SUCCESSFUL) {
+    return RTEMS_INCORRECT_STATE;
+  }
+
+  ctx = malloc(sizeof(*ctx));
   if (ctx != NULL) {
     sc = rtems_disk_init_phys(

testsuites/libtests/block17/init.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2013 embedded brains GmbH.  All rights reserved.
+ * Copyright (c) 2013, 2018 embedded brains GmbH.  All rights reserved.
  *
  *  embedded brains GmbH
@@ -18 +18 @@
 
 #include <rtems/bdbuf.h>
+#include <rtems/blkdev.h>
 
 #include "tmacros.h"
@@ -25 +26 @@
 static void test(void)
 {
-  rtems_status_code sc = rtems_bdbuf_init();
+  rtems_status_code sc;
+
+  sc = rtems_bdbuf_init();
   rtems_test_assert(sc == RTEMS_INVALID_NUMBER);
+
+  sc = rtems_blkdev_create(NULL, 0, 0, NULL, NULL);
+  rtems_test_assert(sc == RTEMS_INCORRECT_STATE);
 }