Changeset b7fd2a0 in mainline for uspace/drv/audio/sb16


Ignore:
Timestamp:
2018-01-13T03:10:29Z (8 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.

Location:
uspace/drv/audio/sb16
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • uspace/drv/audio/sb16/dsp.c

    r36f0738 rb7fd2a0  
    8989}
    9090
    91 static inline int dsp_read(sb_dsp_t *dsp, uint8_t *data)
     91static inline errno_t dsp_read(sb_dsp_t *dsp, uint8_t *data)
    9292{
    9393        assert(data);
    … …  
    106106}
    107107
    108 static inline int dsp_write(sb_dsp_t *dsp, uint8_t data)
     108static inline errno_t dsp_write(sb_dsp_t *dsp, uint8_t data)
    109109{
    110110        assert(dsp);
    … …  
    159159}
    160160
    161 static inline int setup_dma(sb_dsp_t *dsp, uintptr_t pa, size_t size)
     161static inline errno_t setup_dma(sb_dsp_t *dsp, uintptr_t pa, size_t size)
    162162{
    163163        async_sess_t *sess = ddf_dev_parent_sess_get(dsp->sb_dev);
    … …  
    168168}
    169169
    170 static inline int setup_buffer(sb_dsp_t *dsp, size_t size)
     170static inline errno_t setup_buffer(sb_dsp_t *dsp, size_t size)
    171171{
    172172        assert(dsp);
    … …  
    178178        void *buffer = AS_AREA_ANY;
    179179       
    180         int ret = dmamem_map_anonymous(size, DMAMEM_16MiB | 0x0000ffff,
     180        errno_t ret = dmamem_map_anonymous(size, DMAMEM_16MiB | 0x0000ffff,
    181181            AS_AREA_WRITE | AS_AREA_READ, 0, &pa, &buffer);
    182182        if (ret != EOK) {
    … …  
    202202}
    203203
    204 int sb_dsp_init(sb_dsp_t *dsp, sb16_regs_t *regs, ddf_dev_t *dev,
     204errno_t sb_dsp_init(sb_dsp_t *dsp, sb16_regs_t *regs, ddf_dev_t *dev,
    205205    int dma8, int dma16)
    206206{
    … …  
    215215        dsp_reset(dsp);
    216216        uint8_t response;
    217         const int ret = dsp_read(dsp, &response);
     217        const errno_t ret = dsp_read(dsp, &response);
    218218        if (ret != EOK) {
    219219                ddf_log_error("Failed to read DSP reset response value.");
    … …  
    294294}
    295295
    296 int sb_dsp_get_buffer_position(sb_dsp_t *dsp, size_t *pos)
     296errno_t sb_dsp_get_buffer_position(sb_dsp_t *dsp, size_t *pos)
    297297{
    298298        if (dsp->state == DSP_NO_BUFFER)
    … …  
    304304        // TODO: Assumes DMA 16
    305305        size_t remain;
    306         int rc = hw_res_dma_channel_remain(sess, dsp->dma16_channel, &remain);
     306        errno_t rc = hw_res_dma_channel_remain(sess, dsp->dma16_channel, &remain);
    307307        if (rc == EOK) {
    308308                *pos = dsp->buffer.size - remain;
    … …  
    311311}
    312312
    313 int sb_dsp_test_format(sb_dsp_t *dsp, unsigned *channels, unsigned *rate,
     313errno_t sb_dsp_test_format(sb_dsp_t *dsp, unsigned *channels, unsigned *rate,
    314314  pcm_sample_format_t *format)
    315315{
    316         int ret = EOK;
     316        errno_t ret = EOK;
    317317        if (*channels == 0 || *channels > 2) {
    318318                *channels = 2;
    … …  
    336336}
    337337
    338 int sb_dsp_set_event_session(sb_dsp_t *dsp, async_sess_t *session)
     338errno_t sb_dsp_set_event_session(sb_dsp_t *dsp, async_sess_t *session)
    339339{
    340340        assert(dsp);
    … …  
    353353}
    354354
    355 int sb_dsp_get_buffer(sb_dsp_t *dsp, void **buffer, size_t *size)
     355errno_t sb_dsp_get_buffer(sb_dsp_t *dsp, void **buffer, size_t *size)
    356356{
    357357        assert(dsp);
    … …  
    364364        assert(dsp->buffer.data == NULL);
    365365
    366         const int ret = setup_buffer(dsp, *size);
     366        const errno_t ret = setup_buffer(dsp, *size);
    367367        if (ret == EOK) {
    368368                ddf_log_debug("Providing buffer: %p, %zu B.",
    … …  
    378378}
    379379
    380 int sb_dsp_release_buffer(sb_dsp_t *dsp)
     380errno_t sb_dsp_release_buffer(sb_dsp_t *dsp)
    381381{
    382382        assert(dsp);
    … …  
    392392}
    393393
    394 int sb_dsp_start_playback(sb_dsp_t *dsp, unsigned frames,
     394errno_t sb_dsp_start_playback(sb_dsp_t *dsp, unsigned frames,
    395395    unsigned channels, unsigned sampling_rate, pcm_sample_format_t format)
    396396{
    … …  
    441441}
    442442
    443 int sb_dsp_stop_playback(sb_dsp_t *dsp, bool immediate)
     443errno_t sb_dsp_stop_playback(sb_dsp_t *dsp, bool immediate)
    444444{
    445445        assert(dsp);
    … …  
    471471}
    472472
    473 int sb_dsp_start_capture(sb_dsp_t *dsp, unsigned frames,
     473errno_t sb_dsp_start_capture(sb_dsp_t *dsp, unsigned frames,
    474474    unsigned channels, unsigned sampling_rate, pcm_sample_format_t format)
    475475{
    … …  
    517517}
    518518
    519 int sb_dsp_stop_capture(sb_dsp_t *dsp, bool immediate)
     519errno_t sb_dsp_stop_capture(sb_dsp_t *dsp, bool immediate)
    520520{
    521521        assert(dsp);

  • uspace/drv/audio/sb16/dsp.h

    r36f0738 rb7fd2a0  
    7676} sb_dsp_t;
    7777
    78 int sb_dsp_init(sb_dsp_t *dsp, sb16_regs_t *regs, ddf_dev_t *dev,
     78errno_t sb_dsp_init(sb_dsp_t *dsp, sb16_regs_t *regs, ddf_dev_t *dev,
    7979    int dma8, int dma16);
    8080void sb_dsp_interrupt(sb_dsp_t *dsp);
    8181unsigned sb_dsp_query_cap(sb_dsp_t *dsp, audio_cap_t cap);
    82 int sb_dsp_get_buffer_position(sb_dsp_t *dsp, size_t *size);
    83 int sb_dsp_test_format(sb_dsp_t *dsp, unsigned *channels, unsigned *rate,
     82errno_t sb_dsp_get_buffer_position(sb_dsp_t *dsp, size_t *size);
     83errno_t sb_dsp_test_format(sb_dsp_t *dsp, unsigned *channels, unsigned *rate,
    8484  pcm_sample_format_t *format);
    85 int sb_dsp_get_buffer(sb_dsp_t *dsp, void **buffer, size_t *size);
    86 int sb_dsp_set_event_session(sb_dsp_t *dsp, async_sess_t *session);
     85errno_t sb_dsp_get_buffer(sb_dsp_t *dsp, void **buffer, size_t *size);
     86errno_t sb_dsp_set_event_session(sb_dsp_t *dsp, async_sess_t *session);
    8787async_sess_t * sb_dsp_get_event_session(sb_dsp_t *dsp);
    88 int sb_dsp_release_buffer(sb_dsp_t *dsp);
    89 int sb_dsp_start_playback(sb_dsp_t *dsp, unsigned frames,
     88errno_t sb_dsp_release_buffer(sb_dsp_t *dsp);
     89errno_t sb_dsp_start_playback(sb_dsp_t *dsp, unsigned frames,
    9090    unsigned channels, unsigned sample_rate, pcm_sample_format_t format);
    91 int sb_dsp_stop_playback(sb_dsp_t *dsp, bool immediate);
    92 int sb_dsp_start_capture(sb_dsp_t *dsp, unsigned frames,
     91errno_t sb_dsp_stop_playback(sb_dsp_t *dsp, bool immediate);
     92errno_t sb_dsp_start_capture(sb_dsp_t *dsp, unsigned frames,
    9393    unsigned channels, unsigned sample_rate, pcm_sample_format_t format);
    94 int sb_dsp_stop_capture(sb_dsp_t *dsp, bool immediate);
     94errno_t sb_dsp_stop_capture(sb_dsp_t *dsp, bool immediate);
    9595
    9696#endif

  • uspace/drv/audio/sb16/main.c

    r36f0738 rb7fd2a0  
    4747#define NAME "sb16"
    4848
    49 static int sb_add_device(ddf_dev_t *device);
    50 static int sb_get_res(ddf_dev_t *device, addr_range_t **pp_sb_regs,
     49static errno_t sb_add_device(ddf_dev_t *device);
     50static errno_t sb_get_res(ddf_dev_t *device, addr_range_t **pp_sb_regs,
    5151    addr_range_t **pp_mpu_regs, int *irq, int *dma8, int *dma16);
    52 static int sb_enable_interrupt(ddf_dev_t *device, int irq);
     52static errno_t sb_enable_interrupt(ddf_dev_t *device, int irq);
    5353
    5454static driver_ops_t sb_driver_ops = {
    … …  
    8787 * @return Error code.
    8888 */
    89 static int sb_add_device(ddf_dev_t *device)
     89static errno_t sb_add_device(ddf_dev_t *device)
    9090{
    9191        bool handler_regd = false;
    … …  
    9696
    9797        sb16_t *soft_state = ddf_dev_data_alloc(device, sizeof(sb16_t));
    98         int rc = soft_state ? EOK : ENOMEM;
     98        errno_t rc = soft_state ? EOK : ENOMEM;
    9999        if (rc != EOK) {
    100100                ddf_log_error("Failed to allocate sb16 structure.");
    … …  
    173173}
    174174
    175 static int sb_get_res(ddf_dev_t *device, addr_range_t **pp_sb_regs,
     175static errno_t sb_get_res(ddf_dev_t *device, addr_range_t **pp_sb_regs,
    176176    addr_range_t **pp_mpu_regs, int *irq, int *dma8, int *dma16)
    177177{
    … …  
    184184        hw_res_list_parsed_t hw_res;
    185185        hw_res_list_parsed_init(&hw_res);
    186         const int ret = hw_res_get_list_parsed(parent_sess, &hw_res, 0);
     186        const errno_t ret = hw_res_get_list_parsed(parent_sess, &hw_res, 0);
    187187        if (ret != EOK) {
    188188                return ret;
    … …  
    241241}
    242242
    243 static int sb_enable_interrupt(ddf_dev_t *device, int irq)
     243static errno_t sb_enable_interrupt(ddf_dev_t *device, int irq)
    244244{
    245245        async_sess_t *parent_sess = ddf_dev_parent_sess_get(device);

  • uspace/drv/audio/sb16/mixer.c

    r36f0738 rb7fd2a0  
    123123}
    124124
    125 int sb_mixer_init(sb_mixer_t *mixer, sb16_regs_t *regs, sb_mixer_type_t type)
     125errno_t sb_mixer_init(sb_mixer_t *mixer, sb16_regs_t *regs, sb_mixer_type_t type)
    126126{
    127127        assert(mixer);
    … …  
    149149}
    150150
    151 int sb_mixer_get_control_item_info(const sb_mixer_t *mixer, unsigned item,
     151errno_t sb_mixer_get_control_item_info(const sb_mixer_t *mixer, unsigned item,
    152152    const char** name, unsigned *levels)
    153153{
    … …  
    171171 * @return Error code.
    172172 */
    173 int sb_mixer_get_control_item_value(const sb_mixer_t *mixer, unsigned item,
     173errno_t sb_mixer_get_control_item_value(const sb_mixer_t *mixer, unsigned item,
    174174    unsigned *value)
    175175{
    … …  
    194194 * @return Error code.
    195195 */
    196 int sb_mixer_set_control_item_value(const sb_mixer_t *mixer, unsigned item,
     196errno_t sb_mixer_set_control_item_value(const sb_mixer_t *mixer, unsigned item,
    197197    unsigned value)
    198198{

  • uspace/drv/audio/sb16/mixer.h

    r36f0738 rb7fd2a0  
    5151
    5252const char * sb_mixer_type_str(sb_mixer_type_t type);
    53 int sb_mixer_init(sb_mixer_t *mixer, sb16_regs_t *regs, sb_mixer_type_t type);
     53errno_t sb_mixer_init(sb_mixer_t *mixer, sb16_regs_t *regs, sb_mixer_type_t type);
    5454int sb_mixer_get_control_item_count(const sb_mixer_t *mixer);
    55 int sb_mixer_get_control_item_info(const sb_mixer_t *mixer, unsigned index,
     55errno_t sb_mixer_get_control_item_info(const sb_mixer_t *mixer, unsigned index,
    5656    const char **name, unsigned *levels);
    57 int sb_mixer_get_control_item_value(const sb_mixer_t *mixer, unsigned index,
     57errno_t sb_mixer_get_control_item_value(const sb_mixer_t *mixer, unsigned index,
    5858    unsigned *value);
    59 int sb_mixer_set_control_item_value(const sb_mixer_t *mixer, unsigned index,
     59errno_t sb_mixer_set_control_item_value(const sb_mixer_t *mixer, unsigned index,
    6060    unsigned value);
    6161#endif

  • uspace/drv/audio/sb16/mixer_iface.c

    r36f0738 rb7fd2a0  
    4646}
    4747
    48 static int sb_get_info(ddf_fun_t *fun, const char** name, unsigned *items)
     48static errno_t sb_get_info(ddf_fun_t *fun, const char** name, unsigned *items)
    4949{
    5050        sb_mixer_t *mixer = fun_to_mixer(fun);
    … …  
    5858}
    5959
    60 static int sb_get_item_info(ddf_fun_t *fun, unsigned item, const char** name,
     60static errno_t sb_get_item_info(ddf_fun_t *fun, unsigned item, const char** name,
    6161    unsigned *max_level)
    6262{
    … …  
    6565}
    6666
    67 static int sb_set_item_level(ddf_fun_t *fun, unsigned item, unsigned value)
     67static errno_t sb_set_item_level(ddf_fun_t *fun, unsigned item, unsigned value)
    6868{
    6969        sb_mixer_t *mixer = fun_to_mixer(fun);
    … …  
    7171}
    7272
    73 static int sb_get_item_level(ddf_fun_t *fun, unsigned item, unsigned *value)
     73static errno_t sb_get_item_level(ddf_fun_t *fun, unsigned item, unsigned *value)
    7474{
    7575        sb_mixer_t *mixer = fun_to_mixer(fun);

  • uspace/drv/audio/sb16/pcm_iface.c

    r36f0738 rb7fd2a0  
    4747}
    4848
    49 static int sb_get_info_str(ddf_fun_t *fun, const char** name)
     49static errno_t sb_get_info_str(ddf_fun_t *fun, const char** name)
    5050{
    5151        if (name)
    … …  
    5959}
    6060
    61 static int sb_test_format(ddf_fun_t *fun, unsigned *channels, unsigned *rate,
     61static errno_t sb_test_format(ddf_fun_t *fun, unsigned *channels, unsigned *rate,
    6262    pcm_sample_format_t *format)
    6363{
    6464        return sb_dsp_test_format(fun_to_dsp(fun), channels, rate, format);
    6565}
    66 static int sb_get_buffer(ddf_fun_t *fun, void **buffer, size_t *size)
     66static errno_t sb_get_buffer(ddf_fun_t *fun, void **buffer, size_t *size)
    6767{
    6868        return sb_dsp_get_buffer(fun_to_dsp(fun), buffer, size);
    6969}
    7070
    71 static int sb_get_buffer_position(ddf_fun_t *fun, size_t *size)
     71static errno_t sb_get_buffer_position(ddf_fun_t *fun, size_t *size)
    7272{
    7373        return sb_dsp_get_buffer_position(fun_to_dsp(fun), size);
    7474}
    7575
    76 static int sb_set_event_session(ddf_fun_t *fun, async_sess_t *sess)
     76static errno_t sb_set_event_session(ddf_fun_t *fun, async_sess_t *sess)
    7777{
    7878        return sb_dsp_set_event_session(fun_to_dsp(fun), sess);
    … …  
    8484}
    8585
    86 static int sb_release_buffer(ddf_fun_t *fun)
     86static errno_t sb_release_buffer(ddf_fun_t *fun)
    8787{
    8888        return sb_dsp_release_buffer(fun_to_dsp(fun));
    8989}
    9090
    91 static int sb_start_playback(ddf_fun_t *fun, unsigned frames,
     91static errno_t sb_start_playback(ddf_fun_t *fun, unsigned frames,
    9292    unsigned channels, unsigned sample_rate, pcm_sample_format_t format)
    9393{
    … …  
    9696}
    9797
    98 static int sb_stop_playback(ddf_fun_t *fun, bool immediate)
     98static errno_t sb_stop_playback(ddf_fun_t *fun, bool immediate)
    9999{
    100100        return sb_dsp_stop_playback(fun_to_dsp(fun), immediate);
    101101}
    102102
    103 static int sb_start_capture(ddf_fun_t *fun, unsigned frames,
     103static errno_t sb_start_capture(ddf_fun_t *fun, unsigned frames,
    104104    unsigned channels, unsigned sample_rate, pcm_sample_format_t format)
    105105{
    … …  
    108108}
    109109
    110 static int sb_stop_capture(ddf_fun_t *fun, bool immediate)
     110static errno_t sb_stop_capture(ddf_fun_t *fun, bool immediate)
    111111{
    112112        return sb_dsp_stop_capture(fun_to_dsp(fun), immediate);

  • uspace/drv/audio/sb16/sb16.c

    r36f0738 rb7fd2a0  
    9494}
    9595
    96 int sb16_init_sb16(sb16_t *sb, addr_range_t *regs, ddf_dev_t *dev, int dma8,
     96errno_t sb16_init_sb16(sb16_t *sb, addr_range_t *regs, ddf_dev_t *dev, int dma8,
    9797    int dma16)
    9898{
    … …  
    100100
    101101        /* Setup registers */
    102         int ret = pio_enable_range(regs, (void **) &sb->regs);
     102        errno_t ret = pio_enable_range(regs, (void **) &sb->regs);
    103103        if (ret != EOK)
    104104                return ret;
    … …  
    179179}
    180180
    181 int sb16_init_mpu(sb16_t *sb, addr_range_t *regs)
     181errno_t sb16_init_mpu(sb16_t *sb, addr_range_t *regs)
    182182{
    183183        sb->mpu_regs = NULL;

  • uspace/drv/audio/sb16/sb16.h

    r36f0738 rb7fd2a0  
    5353size_t sb16_irq_code_size(void);
    5454void sb16_irq_code(addr_range_t *regs, int dma8, int dma16, irq_cmd_t cmds[], irq_pio_range_t ranges[]);
    55 int sb16_init_sb16(sb16_t *sb, addr_range_t *regs, ddf_dev_t *dev, int dma8, int dma16);
    56 int sb16_init_mpu(sb16_t *sb, addr_range_t *regs);
     55errno_t sb16_init_sb16(sb16_t *sb, addr_range_t *regs, ddf_dev_t *dev, int dma8, int dma16);
     56errno_t sb16_init_mpu(sb16_t *sb, addr_range_t *regs);
    5757void sb16_interrupt(sb16_t *sb);
    5858
Note: See TracChangeset for help on using the changeset viewer.