Changeset b7fd2a0 in mainline for uspace/drv/block/ata_bd/ata_bd.c


Ignore:
Timestamp:
2018-01-13T03:10:29Z (7 years ago)
Author:
Jiří Zárevúcky <zarevucky.jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
a53ed3a
Parents:
36f0738
Message:

Use errno_t in all uspace and kernel code.

Change type of every variable, parameter and return value that holds an
<errno.h> constant to either errno_t (the usual case), or sys_errno_t
(some places in kernel). This is for the purpose of self-documentation,
as well as for type-checking with a bit of type definition hackery.

Although this is a massive commit, it is a simple text replacement, and thus
is very easy to verify. Simply do the following:

`
git checkout <this commit's hash>
git reset HEAD
git add .
tools/srepl '\berrno_t\b' int
git add .
tools/srepl '\bsys_errno_t\b' sysarg_t
git reset
git diff
`

While this doesn't ensure that the replacements are correct, it does ensure
that the commit doesn't do anything except those replacements. Since errno_t
is typedef'd to int in the usual case (and sys_errno_t to sysarg_t), even if
incorrect, this commit cannot change behavior.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/drv/block/ata_bd/ata_bd.c

    r36f0738 rb7fd2a0  
    8282static const size_t identify_data_size = 512;
    8383
    84 static int ata_bd_init_io(ata_ctrl_t *ctrl);
     84static errno_t ata_bd_init_io(ata_ctrl_t *ctrl);
    8585static void ata_bd_fini_io(ata_ctrl_t *ctrl);
    8686
    87 static int ata_bd_open(bd_srvs_t *, bd_srv_t *);
    88 static int ata_bd_close(bd_srv_t *);
    89 static int ata_bd_read_blocks(bd_srv_t *, uint64_t ba, size_t cnt, void *buf,
     87static errno_t ata_bd_open(bd_srvs_t *, bd_srv_t *);
     88static errno_t ata_bd_close(bd_srv_t *);
     89static errno_t ata_bd_read_blocks(bd_srv_t *, uint64_t ba, size_t cnt, void *buf,
    9090    size_t);
    91 static int ata_bd_read_toc(bd_srv_t *, uint8_t session, void *buf, size_t);
    92 static int ata_bd_write_blocks(bd_srv_t *, uint64_t ba, size_t cnt,
     91static errno_t ata_bd_read_toc(bd_srv_t *, uint8_t session, void *buf, size_t);
     92static errno_t ata_bd_write_blocks(bd_srv_t *, uint64_t ba, size_t cnt,
    9393    const void *buf, size_t);
    94 static int ata_bd_get_block_size(bd_srv_t *, size_t *);
    95 static int ata_bd_get_num_blocks(bd_srv_t *, aoff64_t *);
    96 static int ata_bd_sync_cache(bd_srv_t *, aoff64_t, size_t);
    97 
    98 static int ata_rcmd_read(disk_t *disk, uint64_t ba, size_t cnt,
     94static errno_t ata_bd_get_block_size(bd_srv_t *, size_t *);
     95static errno_t ata_bd_get_num_blocks(bd_srv_t *, aoff64_t *);
     96static errno_t ata_bd_sync_cache(bd_srv_t *, aoff64_t, size_t);
     97
     98static errno_t ata_rcmd_read(disk_t *disk, uint64_t ba, size_t cnt,
    9999    void *buf);
    100 static int ata_rcmd_write(disk_t *disk, uint64_t ba, size_t cnt,
     100static errno_t ata_rcmd_write(disk_t *disk, uint64_t ba, size_t cnt,
    101101    const void *buf);
    102 static int ata_rcmd_flush_cache(disk_t *disk);
    103 static int disk_init(ata_ctrl_t *ctrl, disk_t *d, int disk_id);
    104 static int ata_identify_dev(disk_t *disk, void *buf);
    105 static int ata_identify_pkt_dev(disk_t *disk, void *buf);
    106 static int ata_cmd_packet(disk_t *disk, const void *cpkt, size_t cpkt_size,
     102static errno_t ata_rcmd_flush_cache(disk_t *disk);
     103static errno_t disk_init(ata_ctrl_t *ctrl, disk_t *d, int disk_id);
     104static errno_t ata_identify_dev(disk_t *disk, void *buf);
     105static errno_t ata_identify_pkt_dev(disk_t *disk, void *buf);
     106static errno_t ata_cmd_packet(disk_t *disk, const void *cpkt, size_t cpkt_size,
    107107    void *obuf, size_t obuf_size, size_t *rcvd_size);
    108 static int ata_pcmd_inquiry(disk_t *disk, void *obuf, size_t obuf_size,
     108static errno_t ata_pcmd_inquiry(disk_t *disk, void *obuf, size_t obuf_size,
    109109    size_t *rcvd_size);
    110 static int ata_pcmd_read_12(disk_t *disk, uint64_t ba, size_t cnt,
     110static errno_t ata_pcmd_read_12(disk_t *disk, uint64_t ba, size_t cnt,
    111111    void *obuf, size_t obuf_size);
    112 static int ata_pcmd_read_capacity(disk_t *disk, uint64_t *nblocks,
     112static errno_t ata_pcmd_read_capacity(disk_t *disk, uint64_t *nblocks,
    113113    size_t *block_size);
    114 static int ata_pcmd_read_toc(disk_t *disk, uint8_t ses,
     114static errno_t ata_pcmd_read_toc(disk_t *disk, uint8_t ses,
    115115    void *obuf, size_t obuf_size);
    116116static void disk_print_summary(disk_t *d);
    117 static int coord_calc(disk_t *d, uint64_t ba, block_coord_t *bc);
     117static errno_t coord_calc(disk_t *d, uint64_t ba, block_coord_t *bc);
    118118static void coord_sc_program(ata_ctrl_t *ctrl, const block_coord_t *bc,
    119119    uint16_t scnt);
    120 static int wait_status(ata_ctrl_t *ctrl, unsigned set, unsigned n_reset,
     120static errno_t wait_status(ata_ctrl_t *ctrl, unsigned set, unsigned n_reset,
    121121    uint8_t *pstatus, unsigned timeout);
    122122
    … …  
    143143
    144144/** Initialize ATA controller. */
    145 int ata_ctrl_init(ata_ctrl_t *ctrl, ata_base_t *res)
     145errno_t ata_ctrl_init(ata_ctrl_t *ctrl, ata_base_t *res)
    146146{
    147147        int i;
    148         int rc;
     148        errno_t rc;
    149149        int n_disks;
    150150
    … …  
    209209
    210210/** Remove ATA controller. */
    211 int ata_ctrl_remove(ata_ctrl_t *ctrl)
     211errno_t ata_ctrl_remove(ata_ctrl_t *ctrl)
    212212{
    213213        int i;
    214         int rc;
     214        errno_t rc;
    215215
    216216        ddf_msg(LVL_DEBUG, ": ata_ctrl_remove()");
    … …  
    234234
    235235/** Surprise removal of ATA controller. */
    236 int ata_ctrl_gone(ata_ctrl_t *ctrl)
     236errno_t ata_ctrl_gone(ata_ctrl_t *ctrl)
    237237{
    238238        int i;
    239         int rc;
     239        errno_t rc;
    240240
    241241        ddf_msg(LVL_DEBUG, "ata_ctrl_gone()");
    … …  
    308308
    309309/** Enable device I/O. */
    310 static int ata_bd_init_io(ata_ctrl_t *ctrl)
    311 {
    312         int rc;
     310static errno_t ata_bd_init_io(ata_ctrl_t *ctrl)
     311{
     312        errno_t rc;
    313313        void *vaddr;
    314314
    … …  
    344344 * the disk structure.
    345345 */
    346 static int disk_init(ata_ctrl_t *ctrl, disk_t *d, int disk_id)
     346static errno_t disk_init(ata_ctrl_t *ctrl, disk_t *d, int disk_id)
    347347{
    348348        identify_data_t idata;
    … …  
    356356        size_t block_size;
    357357        size_t pos, len;
    358         int rc;
     358        errno_t rc;
    359359        unsigned i;
    360360
    … …  
    498498}
    499499
    500 static int ata_bd_open(bd_srvs_t *bds, bd_srv_t *bd)
    501 {
    502         return EOK;
    503 }
    504 
    505 static int ata_bd_close(bd_srv_t *bd)
     500static errno_t ata_bd_open(bd_srvs_t *bds, bd_srv_t *bd)
     501{
     502        return EOK;
     503}
     504
     505static errno_t ata_bd_close(bd_srv_t *bd)
    506506{
    507507        return EOK;
    … …  
    509509
    510510/** Read multiple blocks from the device. */
    511 static int ata_bd_read_blocks(bd_srv_t *bd, uint64_t ba, size_t cnt,
     511static errno_t ata_bd_read_blocks(bd_srv_t *bd, uint64_t ba, size_t cnt,
    512512    void *buf, size_t size)
    513513{
    514514        disk_t *disk = bd_srv_disk(bd);
    515         int rc;
     515        errno_t rc;
    516516
    517517        if (size < cnt * disk->block_size)
    … …  
    538538
    539539/** Read TOC from device. */
    540 static int ata_bd_read_toc(bd_srv_t *bd, uint8_t session, void *buf, size_t size)
     540static errno_t ata_bd_read_toc(bd_srv_t *bd, uint8_t session, void *buf, size_t size)
    541541{
    542542        disk_t *disk = bd_srv_disk(bd);
    … …  
    546546
    547547/** Write multiple blocks to the device. */
    548 static int ata_bd_write_blocks(bd_srv_t *bd, uint64_t ba, size_t cnt,
     548static errno_t ata_bd_write_blocks(bd_srv_t *bd, uint64_t ba, size_t cnt,
    549549    const void *buf, size_t size)
    550550{
    551551        disk_t *disk = bd_srv_disk(bd);
    552         int rc;
     552        errno_t rc;
    553553
    554554        if (disk->dev_type != ata_reg_dev)
    … …  
    572572
    573573/** Get device block size. */
    574 static int ata_bd_get_block_size(bd_srv_t *bd, size_t *rbsize)
     574static errno_t ata_bd_get_block_size(bd_srv_t *bd, size_t *rbsize)
    575575{
    576576        disk_t *disk = bd_srv_disk(bd);
    … …  
    581581
    582582/** Get device number of blocks. */
    583 static int ata_bd_get_num_blocks(bd_srv_t *bd, aoff64_t *rnb)
     583static errno_t ata_bd_get_num_blocks(bd_srv_t *bd, aoff64_t *rnb)
    584584{
    585585        disk_t *disk = bd_srv_disk(bd);
    … …  
    590590
    591591/** Flush cache. */
    592 static int ata_bd_sync_cache(bd_srv_t *bd, uint64_t ba, size_t cnt)
     592static errno_t ata_bd_sync_cache(bd_srv_t *bd, uint64_t ba, size_t cnt)
    593593{
    594594        disk_t *disk = bd_srv_disk(bd);
    … …  
    602602
    603603/** PIO data-in command protocol. */
    604 static int ata_pio_data_in(disk_t *disk, void *obuf, size_t obuf_size,
     604static errno_t ata_pio_data_in(disk_t *disk, void *obuf, size_t obuf_size,
    605605    size_t blk_size, size_t nblocks)
    606606{
    … …  
    633633
    634634/** PIO data-out command protocol. */
    635 static int ata_pio_data_out(disk_t *disk, const void *buf, size_t buf_size,
     635static errno_t ata_pio_data_out(disk_t *disk, const void *buf, size_t buf_size,
    636636    size_t blk_size, size_t nblocks)
    637637{
    … …  
    662662
    663663/** PIO non-data command protocol. */
    664 static int ata_pio_nondata(disk_t *disk)
     664static errno_t ata_pio_nondata(disk_t *disk)
    665665{
    666666        ata_ctrl_t *ctrl = disk->ctrl;
    … …  
    687687 *                      not present). EIO if device responds with error.
    688688 */
    689 static int ata_identify_dev(disk_t *disk, void *buf)
     689static errno_t ata_identify_dev(disk_t *disk, void *buf)
    690690{
    691691        ata_ctrl_t *ctrl = disk->ctrl;
    … …  
    739739 * @param buf           Pointer to a 512-byte buffer.
    740740 */
    741 static int ata_identify_pkt_dev(disk_t *disk, void *buf)
     741static errno_t ata_identify_pkt_dev(disk_t *disk, void *buf)
    742742{
    743743        ata_ctrl_t *ctrl = disk->ctrl;
    … …  
    772772 * @return EOK on success, EIO on error.
    773773 */
    774 static int ata_cmd_packet(disk_t *disk, const void *cpkt, size_t cpkt_size,
     774static errno_t ata_cmd_packet(disk_t *disk, const void *cpkt, size_t cpkt_size,
    775775    void *obuf, size_t obuf_size, size_t *rcvd_size)
    776776{
    … …  
    860860 * @return EOK on success, EIO on error.
    861861 */
    862 static int ata_pcmd_inquiry(disk_t *disk, void *obuf, size_t obuf_size,
     862static errno_t ata_pcmd_inquiry(disk_t *disk, void *obuf, size_t obuf_size,
    863863    size_t *rcvd_size)
    864864{
    865865        uint8_t cpb[12];
    866866        scsi_cdb_inquiry_t *cp = (scsi_cdb_inquiry_t *)cpb;
    867         int rc;
     867        errno_t rc;
    868868
    869869        memset(cpb, 0, sizeof(cpb));
    … …  
    893893 * @return EOK on success, EIO on error.
    894894 */
    895 static int ata_pcmd_read_capacity(disk_t *disk, uint64_t *nblocks,
     895static errno_t ata_pcmd_read_capacity(disk_t *disk, uint64_t *nblocks,
    896896    size_t *block_size)
    897897{
    … …  
    899899        scsi_read_capacity_10_data_t data;
    900900        size_t rsize;
    901         int rc;
     901        errno_t rc;
    902902
    903903        memset(&cdb, 0, sizeof(cdb));
    … …  
    930930 * @return EOK on success, EIO on error.
    931931 */
    932 static int ata_pcmd_read_12(disk_t *disk, uint64_t ba, size_t cnt,
     932static errno_t ata_pcmd_read_12(disk_t *disk, uint64_t ba, size_t cnt,
    933933    void *obuf, size_t obuf_size)
    934934{
    935935        scsi_cdb_read_12_t cp;
    936         int rc;
     936        errno_t rc;
    937937
    938938        if (ba > UINT32_MAX)
    … …  
    969969 * @return EOK on success, EIO on error.
    970970 */
    971 static int ata_pcmd_read_toc(disk_t *disk, uint8_t session, void *obuf,
     971static errno_t ata_pcmd_read_toc(disk_t *disk, uint8_t session, void *obuf,
    972972    size_t obuf_size)
    973973{
    974974        uint8_t cpb[12];
    975975        scsi_cdb_read_toc_t *cp = (scsi_cdb_read_toc_t *)cpb;
    976         int rc;
     976        errno_t rc;
    977977
    978978        memset(cpb, 0, sizeof(cpb));
    … …  
    10011001 * @return EOK on success, EIO on error.
    10021002 */
    1003 static int ata_rcmd_read(disk_t *disk, uint64_t ba, size_t blk_cnt,
     1003static errno_t ata_rcmd_read(disk_t *disk, uint64_t ba, size_t blk_cnt,
    10041004    void *buf)
    10051005{
    … …  
    10071007        uint8_t drv_head;
    10081008        block_coord_t bc;
    1009         int rc;
     1009        errno_t rc;
    10101010
    10111011        /* Silence warning. */
    … …  
    10611061 * @return EOK on success, EIO on error.
    10621062 */
    1063 static int ata_rcmd_write(disk_t *disk, uint64_t ba, size_t cnt,
     1063static errno_t ata_rcmd_write(disk_t *disk, uint64_t ba, size_t cnt,
    10641064    const void *buf)
    10651065{
    … …  
    10671067        uint8_t drv_head;
    10681068        block_coord_t bc;
    1069         int rc;
     1069        errno_t rc;
    10701070
    10711071        /* Silence warning. */
    … …  
    11171117 * @return EOK on success, EIO on error.
    11181118 */
    1119 static int ata_rcmd_flush_cache(disk_t *disk)
     1119static errno_t ata_rcmd_flush_cache(disk_t *disk)
    11201120{
    11211121        ata_ctrl_t *ctrl = disk->ctrl;
    11221122        uint8_t drv_head;
    1123         int rc;
     1123        errno_t rc;
    11241124
    11251125        /* New value for Drive/Head register */
    … …  
    11591159 * @return EOK on success or EINVAL if block index is past end of device.
    11601160 */
    1161 static int coord_calc(disk_t *d, uint64_t ba, block_coord_t *bc)
     1161static errno_t coord_calc(disk_t *d, uint64_t ba, block_coord_t *bc)
    11621162{
    11631163        uint64_t c;
    … …  
    12461246 * @return              EOK on success, EIO on timeout.
    12471247 */
    1248 static int wait_status(ata_ctrl_t *ctrl, unsigned set, unsigned n_reset,
     1248static errno_t wait_status(ata_ctrl_t *ctrl, unsigned set, unsigned n_reset,
    12491249    uint8_t *pstatus, unsigned timeout)
    12501250{
Note: See TracChangeset for help on using the changeset viewer.