Changeset 5a6cc679 in mainline for uspace/srv/bd/sata_bd/sata_bd.c

Timestamp:

2018-01-31T02:21:24Z (8 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/srv/bd/sata_bd/sata_bd.c (modified) (10 diffs)

uspace/srv/bd/sata_bd/sata_bd.c

@@ -60 +60 @@
 static int disk_count;
 
-static int sata_bd_open(bd_srvs_t *, bd_srv_t *);
-static int sata_bd_close(bd_srv_t *);
-static int sata_bd_read_blocks(bd_srv_t *, aoff64_t, size_t, void *, size_t);
-static int sata_bd_write_blocks(bd_srv_t *, aoff64_t, size_t, const void *, size_t);
-static int sata_bd_get_block_size(bd_srv_t *, size_t *);
-static int sata_bd_get_num_blocks(bd_srv_t *, aoff64_t *);
+static errno_t sata_bd_open(bd_srvs_t *, bd_srv_t *);
+static errno_t sata_bd_close(bd_srv_t *);
+static errno_t sata_bd_read_blocks(bd_srv_t *, aoff64_t, size_t, void *, size_t);
+static errno_t sata_bd_write_blocks(bd_srv_t *, aoff64_t, size_t, const void *, size_t);
+static errno_t sata_bd_get_block_size(bd_srv_t *, size_t *);
+static errno_t sata_bd_get_num_blocks(bd_srv_t *, aoff64_t *);
 
 static bd_ops_t sata_bd_ops = {
@@ -88 +88 @@
  *
  */
-static int scan_device_tree(devman_handle_t funh)
+static errno_t scan_device_tree(devman_handle_t funh)
 {
         devman_handle_t devh;
         devman_handle_t *cfuns;
         size_t count, i;
-        int rc;
+        errno_t rc;
                 
         /* If device is SATA, add device to the disk array. */
@@ -148 +148 @@
  *
  */
-static int get_sata_disks(void)
+static errno_t get_sata_disks(void)
 {
         devman_handle_t root_fun;
-        int rc;
+        errno_t rc;
         
         disk_count = 0;
@@ -190 +190 @@
 
 /** Open device. */
-static int sata_bd_open(bd_srvs_t *bds, bd_srv_t *bd)
+static errno_t sata_bd_open(bd_srvs_t *bds, bd_srv_t *bd)
 {
         return EOK;
@@ -196 +196 @@
 
 /** Close device. */
-static int sata_bd_close(bd_srv_t *bd)
+static errno_t sata_bd_close(bd_srv_t *bd)
 {
         return EOK;
@@ -202 +202 @@
 
 /** Read blocks from partition. */
-static int sata_bd_read_blocks(bd_srv_t *bd, aoff64_t ba, size_t cnt, void *buf,
+static errno_t sata_bd_read_blocks(bd_srv_t *bd, aoff64_t ba, size_t cnt, void *buf,
     size_t size)
 {
@@ -214 +214 @@
 
 /** Write blocks to partition. */
-static int sata_bd_write_blocks(bd_srv_t *bd, aoff64_t ba, size_t cnt,
+static errno_t sata_bd_write_blocks(bd_srv_t *bd, aoff64_t ba, size_t cnt,
     const void *buf, size_t size)
 {
@@ -226 +226 @@
 
 /** Get device block size. */
-static int sata_bd_get_block_size(bd_srv_t *bd, size_t *rsize)
+static errno_t sata_bd_get_block_size(bd_srv_t *bd, size_t *rsize)
 {
         sata_bd_dev_t *sbd = bd_srv_sata(bd);
@@ -235 +235 @@
 
 /** Get number of blocks on device. */
-static int sata_bd_get_num_blocks(bd_srv_t *bd, aoff64_t *rnb)
+static errno_t sata_bd_get_num_blocks(bd_srv_t *bd, aoff64_t *rnb)
 {
         sata_bd_dev_t *sbd = bd_srv_sata(bd);
@@ -246 +246 @@
 int main(int argc, char **argv)
 {
-        int rc;
+        errno_t rc;
         category_id_t disk_cat;