Changeset 132ab5d1 in mainline for uspace/lib/block/block.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, topic/msim-upgrade, topic/simplify-dev-export

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

• uspace/lib/block/block.c (modified) (15 diffs)

uspace/lib/block/block.c

@@ -49 +49 @@
 #include <macros.h>
 #include <mem.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <stdio.h>
 #include <stacktrace.h>
+#include <str_error.h>
 #include <offset.h>
 #include <inttypes.h>
@@ -380 +381 @@
  *                              device.
  *
- * @return                      EOK on success or a negative error code.
+ * @return                      EOK on success or an error code.
  */
 int block_get(block_t **block, service_id_t service_id, aoff64_t ba, int flags)
@@ -577 +578 @@
  * @param block         Block of which a reference is to be released.
  *
- * @return              EOK on success or a negative error code.
+ * @return              EOK on success or an error code.
  */
 int block_put(block_t *block)
@@ -698 +699 @@
  * @param block_size    Block size to be used for the transfer.
  *
- * @return              EOK on success or a negative return code on failure.
+ * @return              EOK on success or an error code on failure.
  */
 int block_seqread(service_id_t service_id, void *buf, size_t *bufpos,
@@ -757 +758 @@
  * @param src           Buffer for storing the data.
  *
- * @return              EOK on success or negative error code on failure.
+ * @return              EOK on success or an error code on failure.
  */
 int block_read_direct(service_id_t service_id, aoff64_t ba, size_t cnt, void *buf)
@@ -776 +777 @@
  * @param src           The data to be written.
  *
- * @return              EOK on success or negative error code on failure.
+ * @return              EOK on success or an error code on failure.
  */
 int block_write_direct(service_id_t service_id, aoff64_t ba, size_t cnt,
@@ -795 +796 @@
  * @param cnt           Number of blocks.
  *
- * @return              EOK on success or negative error code on failure.
+ * @return              EOK on success or an error code on failure.
  */
 int block_sync_cache(service_id_t service_id, aoff64_t ba, size_t cnt)
@@ -812 +813 @@
  * @param bsize         Output block size.
  *
- * @return              EOK on success or negative error code on failure.
+ * @return              EOK on success or an error code on failure.
  */
 int block_get_bsize(service_id_t service_id, size_t *bsize)
@@ -829 +830 @@
  * @param nblocks       Output number of blocks.
  *
- * @return              EOK on success or negative error code on failure.
+ * @return              EOK on success or an error code on failure.
  */
 int block_get_nblocks(service_id_t service_id, aoff64_t *nblocks)
@@ -846 +847 @@
  * @param data                  Buffer that receives the data
  * 
- * @return              EOK on success or negative error code on failure.
+ * @return              EOK on success or an error code on failure.
  */
 int block_read_bytes_direct(service_id_t service_id, aoff64_t abs_offset,
@@ -897 +898 @@
  *
  * @return Allocated TOC structure.
- * @return EOK on success or negative error code.
+ * @return EOK on success or an error code.
  *
  */
@@ -916 +917 @@
  * @param src           Buffer for storing the data.
  *
- * @return              EOK on success or negative error code on failure.
+ * @return              EOK on success or an error code on failure.
  */
 static int read_blocks(devcon_t *devcon, aoff64_t ba, size_t cnt, void *buf,
@@ -925 +926 @@
         int rc = bd_read_blocks(devcon->bd, ba, cnt, buf, size);
         if (rc != EOK) {
-                printf("Error %d reading %zu blocks starting at block %" PRIuOFF64
-                    " from device handle %" PRIun "\n", rc, cnt, ba,
+                printf("Error %s reading %zu blocks starting at block %" PRIuOFF64
+                    " from device handle %" PRIun "\n", str_error_name(rc), cnt, ba,
                     devcon->service_id);
 #ifndef NDEBUG
@@ -943 +944 @@
  * @param src           Buffer containing the data to write.
  *
- * @return              EOK on success or negative error code on failure.
+ * @return              EOK on success or an error code on failure.
  */
 static int write_blocks(devcon_t *devcon, aoff64_t ba, size_t cnt, void *data,
@@ -952 +953 @@
         int rc = bd_write_blocks(devcon->bd, ba, cnt, data, size);
         if (rc != EOK) {
-                printf("Error %d writing %zu blocks starting at block %" PRIuOFF64
-                    " to device handle %" PRIun "\n", rc, cnt, ba, devcon->service_id);
+                printf("Error %s writing %zu blocks starting at block %" PRIuOFF64
+                    " to device handle %" PRIun "\n", str_error_name(rc), cnt, ba, devcon->service_id);
 #ifndef NDEBUG
                 stacktrace_print();