Changeset 5a6cc679 in mainline for uspace/drv/block/usbmast/scsi_ms.c

Timestamp:

2018-01-31T02:21:24Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

a0a9cc2

Parents:

132ab5d1

Message:

Merge commit '50f19b7ee8e94570b5c63896736c4eb49cfa18db' into forwardport

Not all ints are converted to errno_t in xhci tree yet, however it compiles and works

File:

• uspace/drv/block/usbmast/scsi_ms.c (modified) (10 diffs)

uspace/drv/block/usbmast/scsi_ms.c

@@ -72 +72 @@
 }
 
-static int usb_massstor_unit_ready(usbmast_fun_t *mfun)
+static errno_t usb_massstor_unit_ready(usbmast_fun_t *mfun)
 {
         scsi_cmd_t cmd;
         scsi_cdb_test_unit_ready_t cdb;
-        int rc;
+        errno_t rc;
 
         memset(&cdb, 0, sizeof(cdb));
@@ -107 +107 @@
  * XXX This is too simplified.
  */
-static int usbmast_run_cmd(usbmast_fun_t *mfun, scsi_cmd_t *cmd)
+static errno_t usbmast_run_cmd(usbmast_fun_t *mfun, scsi_cmd_t *cmd)
 {
         uint8_t sense_key;
         scsi_sense_data_t sense_buf;
-        int rc;
+        errno_t rc;
 
         do {
@@ -162 +162 @@
  * @return              Error code
  */
-int usbmast_inquiry(usbmast_fun_t *mfun, usbmast_inquiry_data_t *inq_res)
+errno_t usbmast_inquiry(usbmast_fun_t *mfun, usbmast_inquiry_data_t *inq_res)
 {
         scsi_std_inquiry_data_t inq_data;
         scsi_cmd_t cmd;
         scsi_cdb_inquiry_t cdb;
-        int rc;
+        errno_t rc;
 
         memset(&cdb, 0, sizeof(cdb));
@@ -231 +231 @@
  * @return              Error code.
  */
-int usbmast_request_sense(usbmast_fun_t *mfun, void *buf, size_t size)
+errno_t usbmast_request_sense(usbmast_fun_t *mfun, void *buf, size_t size)
 {
         scsi_cmd_t cmd;
         scsi_cdb_request_sense_t cdb;
-        int rc;
+        errno_t rc;
 
         memset(&cdb, 0, sizeof(cdb));
@@ -272 +272 @@
  * @return              Error code.
  */
-int usbmast_read_capacity(usbmast_fun_t *mfun, uint32_t *nblocks,
+errno_t usbmast_read_capacity(usbmast_fun_t *mfun, uint32_t *nblocks,
     uint32_t *block_size)
 {
@@ -278 +278 @@
         scsi_cdb_read_capacity_10_t cdb;
         scsi_read_capacity_10_data_t data;
-        int rc;
+        errno_t rc;
 
         memset(&cdb, 0, sizeof(cdb));
@@ -323 +323 @@
  * @return              Error code
  */
-int usbmast_read(usbmast_fun_t *mfun, uint64_t ba, size_t nblocks, void *buf)
+errno_t usbmast_read(usbmast_fun_t *mfun, uint64_t ba, size_t nblocks, void *buf)
 {
         scsi_cmd_t cmd;
         scsi_cdb_read_10_t cdb;
-        int rc;
+        errno_t rc;
 
         if (ba > UINT32_MAX)
@@ -378 +378 @@
  * @return              Error code
  */
-int usbmast_write(usbmast_fun_t *mfun, uint64_t ba, size_t nblocks,
+errno_t usbmast_write(usbmast_fun_t *mfun, uint64_t ba, size_t nblocks,
     const void *data)
 {
         scsi_cmd_t cmd;
         scsi_cdb_write_10_t cdb;
-        int rc;
+        errno_t rc;
 
         if (ba > UINT32_MAX)
@@ -428 +428 @@
  * @return              Error code
  */
-int usbmast_sync_cache(usbmast_fun_t *mfun, uint64_t ba, size_t nblocks)
+errno_t usbmast_sync_cache(usbmast_fun_t *mfun, uint64_t ba, size_t nblocks)
 {
         if (ba > UINT32_MAX)
@@ -447 +447 @@
         };
 
-        const int rc = usbmast_run_cmd(mfun, &cmd);
+        const errno_t rc = usbmast_run_cmd(mfun, &cmd);
 
         if (rc != EOK) {