Index: uspace/drv/audio/hdaudio/codec.c =================================================================== --- uspace/drv/audio/hdaudio/codec.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/audio/hdaudio/codec.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -46,5 +46,5 @@ #include "stream.h" -static int hda_ccmd(hda_codec_t *codec, int node, uint32_t vid, uint32_t payload, +static errno_t hda_ccmd(hda_codec_t *codec, int node, uint32_t vid, uint32_t payload, uint32_t *resp) { @@ -66,5 +66,5 @@ (payload & 0xffff); } - int rc = hda_cmd(codec->hda, verb, resp); + errno_t rc = hda_cmd(codec->hda, verb, resp); /* if (resp != NULL) { @@ -78,5 +78,5 @@ } -static int hda_get_parameter(hda_codec_t *codec, int node, hda_param_id_t param, +static errno_t hda_get_parameter(hda_codec_t *codec, int node, hda_param_id_t param, uint32_t *resp) { @@ -84,8 +84,8 @@ } -static int hda_get_subnc(hda_codec_t *codec, int node, int *startnode, +static errno_t hda_get_subnc(hda_codec_t *codec, int node, int *startnode, int *nodecount) { - int rc; + errno_t rc; uint32_t resp; @@ -103,8 +103,8 @@ /** Get Function Group Type */ -static int hda_get_fgrp_type(hda_codec_t *codec, int node, bool *unsol, +static errno_t hda_get_fgrp_type(hda_codec_t *codec, int node, bool *unsol, hda_fgrp_type_t *type) { - int rc; + errno_t rc; uint32_t resp; @@ -119,8 +119,8 @@ } -static int hda_get_clist_len(hda_codec_t *codec, int node, bool *longform, +static errno_t hda_get_clist_len(hda_codec_t *codec, int node, bool *longform, int *items) { - int rc; + errno_t rc; uint32_t resp; @@ -135,15 +135,15 @@ } -static int hda_get_clist_entry(hda_codec_t *codec, int node, int n, uint32_t *resp) +static errno_t hda_get_clist_entry(hda_codec_t *codec, int node, int n, uint32_t *resp) { return hda_ccmd(codec, node, hda_clist_entry_get, n, resp); } -static int hda_get_eapd_btl_enable(hda_codec_t *codec, int node, uint32_t *resp) +static errno_t hda_get_eapd_btl_enable(hda_codec_t *codec, int node, uint32_t *resp) { return hda_ccmd(codec, node, hda_eapd_btl_enable_get, 0, resp); } -static int hda_set_eapd_btl_enable(hda_codec_t *codec, int node, uint8_t payload) +static errno_t hda_set_eapd_btl_enable(hda_codec_t *codec, int node, uint8_t payload) { return hda_ccmd(codec, node, hda_eapd_btl_enable_set, payload, NULL); @@ -151,5 +151,5 @@ /** Get Suppported PCM Size, Rates */ -static int hda_get_supp_rates(hda_codec_t *codec, int node, uint32_t *rates) +static errno_t hda_get_supp_rates(hda_codec_t *codec, int node, uint32_t *rates) { return hda_get_parameter(codec, node, hda_supp_rates, rates); @@ -157,15 +157,15 @@ /** Get Suppported Stream Formats */ -static int hda_get_supp_formats(hda_codec_t *codec, int node, uint32_t *fmts) +static errno_t hda_get_supp_formats(hda_codec_t *codec, int node, uint32_t *fmts) { return hda_get_parameter(codec, node, hda_supp_formats, fmts); } -static int hda_set_converter_fmt(hda_codec_t *codec, int node, uint16_t fmt) +static errno_t hda_set_converter_fmt(hda_codec_t *codec, int node, uint16_t fmt) { return hda_ccmd(codec, node, hda_converter_fmt_set, fmt, NULL); } -static int hda_set_converter_ctl(hda_codec_t *codec, int node, uint8_t stream, +static errno_t hda_set_converter_ctl(hda_codec_t *codec, int node, uint8_t stream, uint8_t channel) { @@ -176,12 +176,12 @@ } -static int hda_set_pin_ctl(hda_codec_t *codec, int node, uint8_t pctl) +static errno_t hda_set_pin_ctl(hda_codec_t *codec, int node, uint8_t pctl) { return hda_ccmd(codec, node, hda_pin_ctl_set, pctl, NULL); } -static int hda_get_pin_ctl(hda_codec_t *codec, int node, uint8_t *pctl) -{ - int rc; +static errno_t hda_get_pin_ctl(hda_codec_t *codec, int node, uint8_t *pctl) +{ + errno_t rc; uint32_t resp; @@ -195,8 +195,8 @@ /** Get Audio Widget Capabilities */ -static int hda_get_aw_caps(hda_codec_t *codec, int node, +static errno_t hda_get_aw_caps(hda_codec_t *codec, int node, hda_awidget_type_t *type, uint32_t *caps) { - int rc; + errno_t rc; uint32_t resp; @@ -212,5 +212,5 @@ /** Get Pin Capabilities */ -static int hda_get_pin_caps(hda_codec_t *codec, int node, uint32_t *caps) +static errno_t hda_get_pin_caps(hda_codec_t *codec, int node, uint32_t *caps) { return hda_get_parameter(codec, node, hda_pin_caps, caps); @@ -218,5 +218,5 @@ /** Get Power State */ -static int hda_get_power_state(hda_codec_t *codec, int node, uint32_t *pstate) +static errno_t hda_get_power_state(hda_codec_t *codec, int node, uint32_t *pstate) { return hda_ccmd(codec, node, hda_power_state_get, 0, pstate); @@ -224,10 +224,10 @@ /** Get Configuration Default */ -static int hda_get_cfg_def(hda_codec_t *codec, int node, uint32_t *cfgdef) +static errno_t hda_get_cfg_def(hda_codec_t *codec, int node, uint32_t *cfgdef) { return hda_ccmd(codec, node, hda_cfg_def_get, 0, cfgdef); } -static int hda_get_conn_sel(hda_codec_t *codec, int node, uint32_t *conn) +static errno_t hda_get_conn_sel(hda_codec_t *codec, int node, uint32_t *conn) { return hda_ccmd(codec, node, hda_conn_sel_get, 0, conn); @@ -235,10 +235,10 @@ /** Get Amplifier Gain / Mute */ -static int hda_get_amp_gain_mute(hda_codec_t *codec, int node, uint16_t payload, +static errno_t hda_get_amp_gain_mute(hda_codec_t *codec, int node, uint16_t payload, uint32_t *resp) { // ddf_msg(LVL_NOTE, "hda_get_amp_gain_mute(codec, %d, %x)", // node, payload); - int rc = hda_ccmd(codec, node, hda_amp_gain_mute_get, payload, resp); + errno_t rc = hda_ccmd(codec, node, hda_amp_gain_mute_get, payload, resp); // ddf_msg(LVL_NOTE, "hda_get_amp_gain_mute(codec, %d, %x, resp=%x)", // node, payload, *resp); @@ -247,10 +247,10 @@ /** Get GP I/O Count */ -static int hda_get_gpio_cnt(hda_codec_t *codec, int node, uint32_t *resp) +static errno_t hda_get_gpio_cnt(hda_codec_t *codec, int node, uint32_t *resp) { return hda_get_parameter(codec, node, hda_gpio_cnt, resp); } -static int hda_set_amp_gain_mute(hda_codec_t *codec, int node, uint16_t payload) +static errno_t hda_set_amp_gain_mute(hda_codec_t *codec, int node, uint16_t payload) { // ddf_msg(LVL_NOTE, "hda_set_amp_gain_mute(codec, %d, %x)", @@ -259,10 +259,10 @@ } -static int hda_set_out_amp_max(hda_codec_t *codec, uint8_t aw) +static errno_t hda_set_out_amp_max(hda_codec_t *codec, uint8_t aw) { uint32_t ampcaps; uint32_t gmleft, gmright; uint32_t offset; - int rc; + errno_t rc; rc = hda_get_parameter(codec, aw, @@ -294,5 +294,5 @@ } -static int hda_set_in_amp_max(hda_codec_t *codec, uint8_t aw) +static errno_t hda_set_in_amp_max(hda_codec_t *codec, uint8_t aw) { uint32_t ampcaps; @@ -300,5 +300,5 @@ uint32_t offset; int i; - int rc; + errno_t rc; rc = hda_get_parameter(codec, aw, @@ -332,7 +332,7 @@ } -static int hda_clist_dump(hda_codec_t *codec, uint8_t aw) -{ - int rc; +static errno_t hda_clist_dump(hda_codec_t *codec, uint8_t aw) +{ + errno_t rc; bool longform; int len; @@ -394,7 +394,7 @@ } -static int hda_pin_init(hda_codec_t *codec, uint8_t aw) -{ - int rc; +static errno_t hda_pin_init(hda_codec_t *codec, uint8_t aw) +{ + errno_t rc; uint32_t cfgdef; uint32_t pcaps; @@ -471,7 +471,7 @@ /** Init power-control in wiget capable of doing so. */ -static int hda_power_ctl_init(hda_codec_t *codec, uint8_t aw) -{ - int rc; +static errno_t hda_power_ctl_init(hda_codec_t *codec, uint8_t aw) +{ + errno_t rc; uint32_t pwrstate; @@ -491,5 +491,5 @@ { hda_codec_t *codec; - int rc; + errno_t rc; int sfg, nfg; int saw, naw; @@ -639,7 +639,7 @@ } -int hda_out_converter_setup(hda_codec_t *codec, hda_stream_t *stream) -{ - int rc; +errno_t hda_out_converter_setup(hda_codec_t *codec, hda_stream_t *stream) +{ + errno_t rc; int out_aw; int i; @@ -666,7 +666,7 @@ } -int hda_in_converter_setup(hda_codec_t *codec, hda_stream_t *stream) -{ - int rc; +errno_t hda_in_converter_setup(hda_codec_t *codec, hda_stream_t *stream) +{ + errno_t rc; /* Configure converter */ Index: uspace/drv/audio/hdaudio/codec.h =================================================================== --- uspace/drv/audio/hdaudio/codec.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/audio/hdaudio/codec.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -52,6 +52,6 @@ extern hda_codec_t *hda_codec_init(hda_t *, uint8_t); extern void hda_codec_fini(hda_codec_t *); -extern int hda_out_converter_setup(hda_codec_t *, hda_stream_t *); -extern int hda_in_converter_setup(hda_codec_t *, hda_stream_t *); +extern errno_t hda_out_converter_setup(hda_codec_t *, hda_stream_t *); +extern errno_t hda_in_converter_setup(hda_codec_t *, hda_stream_t *); #endif Index: uspace/drv/audio/hdaudio/hdactl.c =================================================================== --- uspace/drv/audio/hdaudio/hdactl.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/audio/hdaudio/hdactl.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -64,5 +64,5 @@ * to read as 0. */ -static int hda_ctl_reg16_set_reset(uint16_t *reg, uint16_t mask) +static errno_t hda_ctl_reg16_set_reset(uint16_t *reg, uint16_t mask) { uint16_t val; @@ -116,5 +116,5 @@ * */ -static int hda_rb_size_select(uint8_t sizecap, uint8_t *selsz) +static errno_t hda_rb_size_select(uint8_t sizecap, uint8_t *selsz) { int i; @@ -146,5 +146,5 @@ /** Initialize the CORB */ -static int hda_corb_init(hda_t *hda) +static errno_t hda_corb_init(hda_t *hda) { uint8_t ctl; @@ -152,5 +152,5 @@ uint8_t sizecap; uint8_t selsz; - int rc; + errno_t rc; ddf_msg(LVL_NOTE, "hda_corb_init()"); @@ -237,5 +237,5 @@ /** Initialize the RIRB */ -static int hda_rirb_init(hda_t *hda) +static errno_t hda_rirb_init(hda_t *hda) { uint8_t ctl; @@ -243,5 +243,5 @@ uint8_t sizecap; uint8_t selsz; - int rc; + errno_t rc; ddf_msg(LVL_NOTE, "hda_rirb_init()"); @@ -372,5 +372,5 @@ /** Write to CORB */ -static int hda_corb_write(hda_t *hda, uint32_t *data, size_t count) +static errno_t hda_corb_write(hda_t *hda, uint32_t *data, size_t count) { size_t avail; @@ -414,5 +414,5 @@ } -static int hda_rirb_read(hda_t *hda, hda_rirb_entry_t *data) +static errno_t hda_rirb_read(hda_t *hda, hda_rirb_entry_t *data) { size_t wp; @@ -436,5 +436,5 @@ } -static int hda_solrb_read(hda_t *hda, hda_rirb_entry_t *data, size_t count) +static errno_t hda_solrb_read(hda_t *hda, hda_rirb_entry_t *data, size_t count) { hda_rirb_entry_t resp; @@ -490,5 +490,5 @@ uint32_t intctl; int cnt; - int rc; + errno_t rc; ctl = calloc(1, sizeof(hda_ctl_t)); @@ -615,7 +615,7 @@ } -int hda_cmd(hda_t *hda, uint32_t verb, uint32_t *resp) -{ - int rc; +errno_t hda_cmd(hda_t *hda, uint32_t verb, uint32_t *resp) +{ + errno_t rc; hda_rirb_entry_t rentry; @@ -639,5 +639,5 @@ { hda_rirb_entry_t resp; - int rc; + errno_t rc; while (true) { Index: uspace/drv/audio/hdaudio/hdactl.h =================================================================== --- uspace/drv/audio/hdaudio/hdactl.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/audio/hdaudio/hdactl.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -78,5 +78,5 @@ extern void hda_ctl_fini(hda_ctl_t *); extern void hda_ctl_interrupt(hda_ctl_t *); -extern int hda_cmd(hda_t *, uint32_t, uint32_t *); +extern errno_t hda_cmd(hda_t *, uint32_t, uint32_t *); extern void hda_ctl_dump_info(hda_ctl_t *); Index: uspace/drv/audio/hdaudio/hdaudio.c =================================================================== --- uspace/drv/audio/hdaudio/hdaudio.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/audio/hdaudio/hdaudio.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -52,9 +52,9 @@ #define NAME "hdaudio" -static int hda_dev_add(ddf_dev_t *dev); -static int hda_dev_remove(ddf_dev_t *dev); -static int hda_dev_gone(ddf_dev_t *dev); -static int hda_fun_online(ddf_fun_t *fun); -static int hda_fun_offline(ddf_fun_t *fun); +static errno_t hda_dev_add(ddf_dev_t *dev); +static errno_t hda_dev_remove(ddf_dev_t *dev); +static errno_t hda_dev_gone(ddf_dev_t *dev); +static errno_t hda_fun_online(ddf_fun_t *fun); +static errno_t hda_fun_offline(ddf_fun_t *fun); static void hdaudio_interrupt(ipc_call_t *, ddf_dev_t *); @@ -148,5 +148,5 @@ }; -static int hda_dev_add(ddf_dev_t *dev) +static errno_t hda_dev_add(ddf_dev_t *dev) { ddf_fun_t *fun_pcm = NULL; @@ -160,5 +160,5 @@ int i; void *regs = NULL; - int rc; + errno_t rc; ddf_msg(LVL_NOTE, "hda_dev_add()"); @@ -318,8 +318,8 @@ } -static int hda_dev_remove(ddf_dev_t *dev) +static errno_t hda_dev_remove(ddf_dev_t *dev) { hda_t *hda = (hda_t *)ddf_dev_data_get(dev); - int rc; + errno_t rc; ddf_msg(LVL_DEBUG, "hda_dev_remove(%p)", dev); @@ -340,8 +340,8 @@ } -static int hda_dev_gone(ddf_dev_t *dev) +static errno_t hda_dev_gone(ddf_dev_t *dev) { hda_t *hda = (hda_t *)ddf_dev_data_get(dev); - int rc; + errno_t rc; ddf_msg(LVL_DEBUG, "hda_dev_remove(%p)", dev); @@ -356,5 +356,5 @@ } -static int hda_fun_online(ddf_fun_t *fun) +static errno_t hda_fun_online(ddf_fun_t *fun) { ddf_msg(LVL_DEBUG, "hda_fun_online()"); @@ -362,5 +362,5 @@ } -static int hda_fun_offline(ddf_fun_t *fun) +static errno_t hda_fun_offline(ddf_fun_t *fun) { ddf_msg(LVL_DEBUG, "hda_fun_offline()"); Index: uspace/drv/audio/hdaudio/pcm_iface.c =================================================================== --- uspace/drv/audio/hdaudio/pcm_iface.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/audio/hdaudio/pcm_iface.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -47,19 +47,19 @@ #include "stream.h" -static int hda_get_info_str(ddf_fun_t *, const char **); +static errno_t hda_get_info_str(ddf_fun_t *, const char **); static unsigned hda_query_cap(ddf_fun_t *, audio_cap_t); -static int hda_test_format(ddf_fun_t *, unsigned *, unsigned *, +static errno_t hda_test_format(ddf_fun_t *, unsigned *, unsigned *, pcm_sample_format_t *); -static int hda_get_buffer(ddf_fun_t *, void **, size_t *); -static int hda_get_buffer_position(ddf_fun_t *, size_t *); -static int hda_set_event_session(ddf_fun_t *, async_sess_t *); +static errno_t hda_get_buffer(ddf_fun_t *, void **, size_t *); +static errno_t hda_get_buffer_position(ddf_fun_t *, size_t *); +static errno_t hda_set_event_session(ddf_fun_t *, async_sess_t *); static async_sess_t *hda_get_event_session(ddf_fun_t *); -static int hda_release_buffer(ddf_fun_t *); -static int hda_start_playback(ddf_fun_t *, unsigned, unsigned, unsigned, +static errno_t hda_release_buffer(ddf_fun_t *); +static errno_t hda_start_playback(ddf_fun_t *, unsigned, unsigned, unsigned, pcm_sample_format_t); -static int hda_stop_playback(ddf_fun_t *, bool); -static int hda_start_capture(ddf_fun_t *, unsigned, unsigned, unsigned, +static errno_t hda_stop_playback(ddf_fun_t *, bool); +static errno_t hda_start_capture(ddf_fun_t *, unsigned, unsigned, unsigned, pcm_sample_format_t); -static int hda_stop_capture(ddf_fun_t *, bool); +static errno_t hda_stop_capture(ddf_fun_t *, bool); audio_pcm_iface_t hda_pcm_iface = { @@ -90,5 +90,5 @@ } -static int hda_get_info_str(ddf_fun_t *fun, const char **name) +static errno_t hda_get_info_str(ddf_fun_t *fun, const char **name) { ddf_msg(LVL_NOTE, "hda_get_info_str()"); @@ -124,8 +124,8 @@ } -static int hda_test_format(ddf_fun_t *fun, unsigned *channels, +static errno_t hda_test_format(ddf_fun_t *fun, unsigned *channels, unsigned *rate, pcm_sample_format_t *format) { - int rc = EOK; + errno_t rc = EOK; ddf_msg(LVL_NOTE, "hda_test_format(%u, %u, %d)\n", @@ -150,8 +150,8 @@ } -static int hda_get_buffer(ddf_fun_t *fun, void **buffer, size_t *size) -{ - hda_t *hda = fun_to_hda(fun); - int rc; +static errno_t hda_get_buffer(ddf_fun_t *fun, void **buffer, size_t *size) +{ + hda_t *hda = fun_to_hda(fun); + errno_t rc; hda_lock(hda); @@ -183,5 +183,5 @@ } -static int hda_get_buffer_position(ddf_fun_t *fun, size_t *pos) +static errno_t hda_get_buffer_position(ddf_fun_t *fun, size_t *pos) { ddf_msg(LVL_NOTE, "hda_get_buffer_position()"); @@ -189,5 +189,5 @@ } -static int hda_set_event_session(ddf_fun_t *fun, async_sess_t *sess) +static errno_t hda_set_event_session(ddf_fun_t *fun, async_sess_t *sess) { hda_t *hda = fun_to_hda(fun); @@ -215,5 +215,5 @@ } -static int hda_release_buffer(ddf_fun_t *fun) +static errno_t hda_release_buffer(ddf_fun_t *fun) { hda_t *hda = fun_to_hda(fun); @@ -234,9 +234,9 @@ } -static int hda_start_playback(ddf_fun_t *fun, unsigned frames, +static errno_t hda_start_playback(ddf_fun_t *fun, unsigned frames, unsigned channels, unsigned rate, pcm_sample_format_t format) { hda_t *hda = fun_to_hda(fun); - int rc; + errno_t rc; ddf_msg(LVL_NOTE, "hda_start_playback()"); @@ -275,5 +275,5 @@ } -static int hda_stop_playback(ddf_fun_t *fun, bool immediate) +static errno_t hda_stop_playback(ddf_fun_t *fun, bool immediate) { hda_t *hda = fun_to_hda(fun); @@ -293,9 +293,9 @@ } -static int hda_start_capture(ddf_fun_t *fun, unsigned frames, unsigned channels, +static errno_t hda_start_capture(ddf_fun_t *fun, unsigned frames, unsigned channels, unsigned rate, pcm_sample_format_t format) { hda_t *hda = fun_to_hda(fun); - int rc; + errno_t rc; ddf_msg(LVL_NOTE, "hda_start_capture()"); @@ -334,5 +334,5 @@ } -static int hda_stop_capture(ddf_fun_t *fun, bool immediate) +static errno_t hda_stop_capture(ddf_fun_t *fun, bool immediate) { hda_t *hda = fun_to_hda(fun); Index: uspace/drv/audio/hdaudio/stream.c =================================================================== --- uspace/drv/audio/hdaudio/stream.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/audio/hdaudio/stream.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -49,5 +49,5 @@ #include "stream.h" -int hda_stream_buffers_alloc(hda_t *hda, hda_stream_buffers_t **rbufs) +errno_t hda_stream_buffers_alloc(hda_t *hda, hda_stream_buffers_t **rbufs) { void *bdl; @@ -57,5 +57,5 @@ size_t i; // size_t j, k; - int rc; + errno_t rc; bufs = calloc(1, sizeof(hda_stream_buffers_t)); Index: uspace/drv/audio/hdaudio/stream.h =================================================================== --- uspace/drv/audio/hdaudio/stream.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/audio/hdaudio/stream.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -77,5 +77,5 @@ } hda_stream_t; -extern int hda_stream_buffers_alloc(hda_t *, hda_stream_buffers_t **); +extern errno_t hda_stream_buffers_alloc(hda_t *, hda_stream_buffers_t **); extern void hda_stream_buffers_free(hda_stream_buffers_t *); extern hda_stream_t *hda_stream_create(hda_t *, hda_stream_dir_t, Index: uspace/drv/audio/sb16/dsp.c =================================================================== --- uspace/drv/audio/sb16/dsp.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/audio/sb16/dsp.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -89,5 +89,5 @@ } -static inline int dsp_read(sb_dsp_t *dsp, uint8_t *data) +static inline errno_t dsp_read(sb_dsp_t *dsp, uint8_t *data) { assert(data); @@ -106,5 +106,5 @@ } -static inline int dsp_write(sb_dsp_t *dsp, uint8_t data) +static inline errno_t dsp_write(sb_dsp_t *dsp, uint8_t data) { assert(dsp); @@ -159,5 +159,5 @@ } -static inline int setup_dma(sb_dsp_t *dsp, uintptr_t pa, size_t size) +static inline errno_t setup_dma(sb_dsp_t *dsp, uintptr_t pa, size_t size) { async_sess_t *sess = ddf_dev_parent_sess_get(dsp->sb_dev); @@ -168,5 +168,5 @@ } -static inline int setup_buffer(sb_dsp_t *dsp, size_t size) +static inline errno_t setup_buffer(sb_dsp_t *dsp, size_t size) { assert(dsp); @@ -178,5 +178,5 @@ void *buffer = AS_AREA_ANY; - int ret = dmamem_map_anonymous(size, DMAMEM_16MiB | 0x0000ffff, + errno_t ret = dmamem_map_anonymous(size, DMAMEM_16MiB | 0x0000ffff, AS_AREA_WRITE | AS_AREA_READ, 0, &pa, &buffer); if (ret != EOK) { @@ -202,5 +202,5 @@ } -int sb_dsp_init(sb_dsp_t *dsp, sb16_regs_t *regs, ddf_dev_t *dev, +errno_t sb_dsp_init(sb_dsp_t *dsp, sb16_regs_t *regs, ddf_dev_t *dev, int dma8, int dma16) { @@ -215,5 +215,5 @@ dsp_reset(dsp); uint8_t response; - const int ret = dsp_read(dsp, &response); + const errno_t ret = dsp_read(dsp, &response); if (ret != EOK) { ddf_log_error("Failed to read DSP reset response value."); @@ -294,5 +294,5 @@ } -int sb_dsp_get_buffer_position(sb_dsp_t *dsp, size_t *pos) +errno_t sb_dsp_get_buffer_position(sb_dsp_t *dsp, size_t *pos) { if (dsp->state == DSP_NO_BUFFER) @@ -304,5 +304,5 @@ // TODO: Assumes DMA 16 size_t remain; - int rc = hw_res_dma_channel_remain(sess, dsp->dma16_channel, &remain); + errno_t rc = hw_res_dma_channel_remain(sess, dsp->dma16_channel, &remain); if (rc == EOK) { *pos = dsp->buffer.size - remain; @@ -311,8 +311,8 @@ } -int sb_dsp_test_format(sb_dsp_t *dsp, unsigned *channels, unsigned *rate, +errno_t sb_dsp_test_format(sb_dsp_t *dsp, unsigned *channels, unsigned *rate, pcm_sample_format_t *format) { - int ret = EOK; + errno_t ret = EOK; if (*channels == 0 || *channels > 2) { *channels = 2; @@ -336,5 +336,5 @@ } -int sb_dsp_set_event_session(sb_dsp_t *dsp, async_sess_t *session) +errno_t sb_dsp_set_event_session(sb_dsp_t *dsp, async_sess_t *session) { assert(dsp); @@ -353,5 +353,5 @@ } -int sb_dsp_get_buffer(sb_dsp_t *dsp, void **buffer, size_t *size) +errno_t sb_dsp_get_buffer(sb_dsp_t *dsp, void **buffer, size_t *size) { assert(dsp); @@ -364,5 +364,5 @@ assert(dsp->buffer.data == NULL); - const int ret = setup_buffer(dsp, *size); + const errno_t ret = setup_buffer(dsp, *size); if (ret == EOK) { ddf_log_debug("Providing buffer: %p, %zu B.", @@ -378,5 +378,5 @@ } -int sb_dsp_release_buffer(sb_dsp_t *dsp) +errno_t sb_dsp_release_buffer(sb_dsp_t *dsp) { assert(dsp); @@ -392,5 +392,5 @@ } -int sb_dsp_start_playback(sb_dsp_t *dsp, unsigned frames, +errno_t sb_dsp_start_playback(sb_dsp_t *dsp, unsigned frames, unsigned channels, unsigned sampling_rate, pcm_sample_format_t format) { @@ -441,5 +441,5 @@ } -int sb_dsp_stop_playback(sb_dsp_t *dsp, bool immediate) +errno_t sb_dsp_stop_playback(sb_dsp_t *dsp, bool immediate) { assert(dsp); @@ -471,5 +471,5 @@ } -int sb_dsp_start_capture(sb_dsp_t *dsp, unsigned frames, +errno_t sb_dsp_start_capture(sb_dsp_t *dsp, unsigned frames, unsigned channels, unsigned sampling_rate, pcm_sample_format_t format) { @@ -517,5 +517,5 @@ } -int sb_dsp_stop_capture(sb_dsp_t *dsp, bool immediate) +errno_t sb_dsp_stop_capture(sb_dsp_t *dsp, bool immediate) { assert(dsp); Index: uspace/drv/audio/sb16/dsp.h =================================================================== --- uspace/drv/audio/sb16/dsp.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/audio/sb16/dsp.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -76,21 +76,21 @@ } sb_dsp_t; -int sb_dsp_init(sb_dsp_t *dsp, sb16_regs_t *regs, ddf_dev_t *dev, +errno_t sb_dsp_init(sb_dsp_t *dsp, sb16_regs_t *regs, ddf_dev_t *dev, int dma8, int dma16); void sb_dsp_interrupt(sb_dsp_t *dsp); unsigned sb_dsp_query_cap(sb_dsp_t *dsp, audio_cap_t cap); -int sb_dsp_get_buffer_position(sb_dsp_t *dsp, size_t *size); -int sb_dsp_test_format(sb_dsp_t *dsp, unsigned *channels, unsigned *rate, +errno_t sb_dsp_get_buffer_position(sb_dsp_t *dsp, size_t *size); +errno_t sb_dsp_test_format(sb_dsp_t *dsp, unsigned *channels, unsigned *rate, pcm_sample_format_t *format); -int sb_dsp_get_buffer(sb_dsp_t *dsp, void **buffer, size_t *size); -int sb_dsp_set_event_session(sb_dsp_t *dsp, async_sess_t *session); +errno_t sb_dsp_get_buffer(sb_dsp_t *dsp, void **buffer, size_t *size); +errno_t sb_dsp_set_event_session(sb_dsp_t *dsp, async_sess_t *session); async_sess_t * sb_dsp_get_event_session(sb_dsp_t *dsp); -int sb_dsp_release_buffer(sb_dsp_t *dsp); -int sb_dsp_start_playback(sb_dsp_t *dsp, unsigned frames, +errno_t sb_dsp_release_buffer(sb_dsp_t *dsp); +errno_t sb_dsp_start_playback(sb_dsp_t *dsp, unsigned frames, unsigned channels, unsigned sample_rate, pcm_sample_format_t format); -int sb_dsp_stop_playback(sb_dsp_t *dsp, bool immediate); -int sb_dsp_start_capture(sb_dsp_t *dsp, unsigned frames, +errno_t sb_dsp_stop_playback(sb_dsp_t *dsp, bool immediate); +errno_t sb_dsp_start_capture(sb_dsp_t *dsp, unsigned frames, unsigned channels, unsigned sample_rate, pcm_sample_format_t format); -int sb_dsp_stop_capture(sb_dsp_t *dsp, bool immediate); +errno_t sb_dsp_stop_capture(sb_dsp_t *dsp, bool immediate); #endif Index: uspace/drv/audio/sb16/main.c =================================================================== --- uspace/drv/audio/sb16/main.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/audio/sb16/main.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -47,8 +47,8 @@ #define NAME "sb16" -static int sb_add_device(ddf_dev_t *device); -static int sb_get_res(ddf_dev_t *device, addr_range_t **pp_sb_regs, +static errno_t sb_add_device(ddf_dev_t *device); +static errno_t sb_get_res(ddf_dev_t *device, addr_range_t **pp_sb_regs, addr_range_t **pp_mpu_regs, int *irq, int *dma8, int *dma16); -static int sb_enable_interrupt(ddf_dev_t *device, int irq); +static errno_t sb_enable_interrupt(ddf_dev_t *device, int irq); static driver_ops_t sb_driver_ops = { @@ -87,5 +87,5 @@ * @return Error code. */ -static int sb_add_device(ddf_dev_t *device) +static errno_t sb_add_device(ddf_dev_t *device) { bool handler_regd = false; @@ -96,5 +96,5 @@ sb16_t *soft_state = ddf_dev_data_alloc(device, sizeof(sb16_t)); - int rc = soft_state ? EOK : ENOMEM; + errno_t rc = soft_state ? EOK : ENOMEM; if (rc != EOK) { ddf_log_error("Failed to allocate sb16 structure."); @@ -173,5 +173,5 @@ } -static int sb_get_res(ddf_dev_t *device, addr_range_t **pp_sb_regs, +static errno_t sb_get_res(ddf_dev_t *device, addr_range_t **pp_sb_regs, addr_range_t **pp_mpu_regs, int *irq, int *dma8, int *dma16) { @@ -184,5 +184,5 @@ hw_res_list_parsed_t hw_res; hw_res_list_parsed_init(&hw_res); - const int ret = hw_res_get_list_parsed(parent_sess, &hw_res, 0); + const errno_t ret = hw_res_get_list_parsed(parent_sess, &hw_res, 0); if (ret != EOK) { return ret; @@ -241,5 +241,5 @@ } -static int sb_enable_interrupt(ddf_dev_t *device, int irq) +static errno_t sb_enable_interrupt(ddf_dev_t *device, int irq) { async_sess_t *parent_sess = ddf_dev_parent_sess_get(device); Index: uspace/drv/audio/sb16/mixer.c =================================================================== --- uspace/drv/audio/sb16/mixer.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/audio/sb16/mixer.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -123,5 +123,5 @@ } -int sb_mixer_init(sb_mixer_t *mixer, sb16_regs_t *regs, sb_mixer_type_t type) +errno_t sb_mixer_init(sb_mixer_t *mixer, sb16_regs_t *regs, sb_mixer_type_t type) { assert(mixer); @@ -149,5 +149,5 @@ } -int sb_mixer_get_control_item_info(const sb_mixer_t *mixer, unsigned item, +errno_t sb_mixer_get_control_item_info(const sb_mixer_t *mixer, unsigned item, const char** name, unsigned *levels) { @@ -171,5 +171,5 @@ * @return Error code. */ -int sb_mixer_get_control_item_value(const sb_mixer_t *mixer, unsigned item, +errno_t sb_mixer_get_control_item_value(const sb_mixer_t *mixer, unsigned item, unsigned *value) { @@ -194,5 +194,5 @@ * @return Error code. */ -int sb_mixer_set_control_item_value(const sb_mixer_t *mixer, unsigned item, +errno_t sb_mixer_set_control_item_value(const sb_mixer_t *mixer, unsigned item, unsigned value) { Index: uspace/drv/audio/sb16/mixer.h =================================================================== --- uspace/drv/audio/sb16/mixer.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/audio/sb16/mixer.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -51,11 +51,11 @@ const char * sb_mixer_type_str(sb_mixer_type_t type); -int sb_mixer_init(sb_mixer_t *mixer, sb16_regs_t *regs, sb_mixer_type_t type); +errno_t sb_mixer_init(sb_mixer_t *mixer, sb16_regs_t *regs, sb_mixer_type_t type); int sb_mixer_get_control_item_count(const sb_mixer_t *mixer); -int sb_mixer_get_control_item_info(const sb_mixer_t *mixer, unsigned index, +errno_t sb_mixer_get_control_item_info(const sb_mixer_t *mixer, unsigned index, const char **name, unsigned *levels); -int sb_mixer_get_control_item_value(const sb_mixer_t *mixer, unsigned index, +errno_t sb_mixer_get_control_item_value(const sb_mixer_t *mixer, unsigned index, unsigned *value); -int sb_mixer_set_control_item_value(const sb_mixer_t *mixer, unsigned index, +errno_t sb_mixer_set_control_item_value(const sb_mixer_t *mixer, unsigned index, unsigned value); #endif Index: uspace/drv/audio/sb16/mixer_iface.c =================================================================== --- uspace/drv/audio/sb16/mixer_iface.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/audio/sb16/mixer_iface.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -46,5 +46,5 @@ } -static int sb_get_info(ddf_fun_t *fun, const char** name, unsigned *items) +static errno_t sb_get_info(ddf_fun_t *fun, const char** name, unsigned *items) { sb_mixer_t *mixer = fun_to_mixer(fun); @@ -58,5 +58,5 @@ } -static int sb_get_item_info(ddf_fun_t *fun, unsigned item, const char** name, +static errno_t sb_get_item_info(ddf_fun_t *fun, unsigned item, const char** name, unsigned *max_level) { @@ -65,5 +65,5 @@ } -static int sb_set_item_level(ddf_fun_t *fun, unsigned item, unsigned value) +static errno_t sb_set_item_level(ddf_fun_t *fun, unsigned item, unsigned value) { sb_mixer_t *mixer = fun_to_mixer(fun); @@ -71,5 +71,5 @@ } -static int sb_get_item_level(ddf_fun_t *fun, unsigned item, unsigned *value) +static errno_t sb_get_item_level(ddf_fun_t *fun, unsigned item, unsigned *value) { sb_mixer_t *mixer = fun_to_mixer(fun); Index: uspace/drv/audio/sb16/pcm_iface.c =================================================================== --- uspace/drv/audio/sb16/pcm_iface.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/audio/sb16/pcm_iface.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -47,5 +47,5 @@ } -static int sb_get_info_str(ddf_fun_t *fun, const char** name) +static errno_t sb_get_info_str(ddf_fun_t *fun, const char** name) { if (name) @@ -59,20 +59,20 @@ } -static int sb_test_format(ddf_fun_t *fun, unsigned *channels, unsigned *rate, +static errno_t sb_test_format(ddf_fun_t *fun, unsigned *channels, unsigned *rate, pcm_sample_format_t *format) { return sb_dsp_test_format(fun_to_dsp(fun), channels, rate, format); } -static int sb_get_buffer(ddf_fun_t *fun, void **buffer, size_t *size) +static errno_t sb_get_buffer(ddf_fun_t *fun, void **buffer, size_t *size) { return sb_dsp_get_buffer(fun_to_dsp(fun), buffer, size); } -static int sb_get_buffer_position(ddf_fun_t *fun, size_t *size) +static errno_t sb_get_buffer_position(ddf_fun_t *fun, size_t *size) { return sb_dsp_get_buffer_position(fun_to_dsp(fun), size); } -static int sb_set_event_session(ddf_fun_t *fun, async_sess_t *sess) +static errno_t sb_set_event_session(ddf_fun_t *fun, async_sess_t *sess) { return sb_dsp_set_event_session(fun_to_dsp(fun), sess); @@ -84,10 +84,10 @@ } -static int sb_release_buffer(ddf_fun_t *fun) +static errno_t sb_release_buffer(ddf_fun_t *fun) { return sb_dsp_release_buffer(fun_to_dsp(fun)); } -static int sb_start_playback(ddf_fun_t *fun, unsigned frames, +static errno_t sb_start_playback(ddf_fun_t *fun, unsigned frames, unsigned channels, unsigned sample_rate, pcm_sample_format_t format) { @@ -96,10 +96,10 @@ } -static int sb_stop_playback(ddf_fun_t *fun, bool immediate) +static errno_t sb_stop_playback(ddf_fun_t *fun, bool immediate) { return sb_dsp_stop_playback(fun_to_dsp(fun), immediate); } -static int sb_start_capture(ddf_fun_t *fun, unsigned frames, +static errno_t sb_start_capture(ddf_fun_t *fun, unsigned frames, unsigned channels, unsigned sample_rate, pcm_sample_format_t format) { @@ -108,5 +108,5 @@ } -static int sb_stop_capture(ddf_fun_t *fun, bool immediate) +static errno_t sb_stop_capture(ddf_fun_t *fun, bool immediate) { return sb_dsp_stop_capture(fun_to_dsp(fun), immediate); Index: uspace/drv/audio/sb16/sb16.c =================================================================== --- uspace/drv/audio/sb16/sb16.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/audio/sb16/sb16.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -94,5 +94,5 @@ } -int sb16_init_sb16(sb16_t *sb, addr_range_t *regs, ddf_dev_t *dev, int dma8, +errno_t sb16_init_sb16(sb16_t *sb, addr_range_t *regs, ddf_dev_t *dev, int dma8, int dma16) { @@ -100,5 +100,5 @@ /* Setup registers */ - int ret = pio_enable_range(regs, (void **) &sb->regs); + errno_t ret = pio_enable_range(regs, (void **) &sb->regs); if (ret != EOK) return ret; @@ -179,5 +179,5 @@ } -int sb16_init_mpu(sb16_t *sb, addr_range_t *regs) +errno_t sb16_init_mpu(sb16_t *sb, addr_range_t *regs) { sb->mpu_regs = NULL; Index: uspace/drv/audio/sb16/sb16.h =================================================================== --- uspace/drv/audio/sb16/sb16.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/audio/sb16/sb16.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -53,6 +53,6 @@ size_t sb16_irq_code_size(void); void sb16_irq_code(addr_range_t *regs, int dma8, int dma16, irq_cmd_t cmds[], irq_pio_range_t ranges[]); -int sb16_init_sb16(sb16_t *sb, addr_range_t *regs, ddf_dev_t *dev, int dma8, int dma16); -int sb16_init_mpu(sb16_t *sb, addr_range_t *regs); +errno_t sb16_init_sb16(sb16_t *sb, addr_range_t *regs, ddf_dev_t *dev, int dma8, int dma16); +errno_t sb16_init_mpu(sb16_t *sb, addr_range_t *regs); void sb16_interrupt(sb16_t *sb); Index: uspace/drv/block/ahci/ahci.c =================================================================== --- uspace/drv/block/ahci/ahci.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/block/ahci/ahci.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -109,14 +109,14 @@ } -static int get_sata_device_name(ddf_fun_t *, size_t, char *); -static int get_num_blocks(ddf_fun_t *, uint64_t *); -static int get_block_size(ddf_fun_t *, size_t *); -static int read_blocks(ddf_fun_t *, uint64_t, size_t, void *); -static int write_blocks(ddf_fun_t *, uint64_t, size_t, void *); - -static int ahci_identify_device(sata_dev_t *); -static int ahci_set_highest_ultra_dma_mode(sata_dev_t *); -static int ahci_rb_fpdma(sata_dev_t *, uintptr_t, uint64_t); -static int ahci_wb_fpdma(sata_dev_t *, uintptr_t, uint64_t); +static errno_t get_sata_device_name(ddf_fun_t *, size_t, char *); +static errno_t get_num_blocks(ddf_fun_t *, uint64_t *); +static errno_t get_block_size(ddf_fun_t *, size_t *); +static errno_t read_blocks(ddf_fun_t *, uint64_t, size_t, void *); +static errno_t write_blocks(ddf_fun_t *, uint64_t, size_t, void *); + +static errno_t ahci_identify_device(sata_dev_t *); +static errno_t ahci_set_highest_ultra_dma_mode(sata_dev_t *); +static errno_t ahci_rb_fpdma(sata_dev_t *, uintptr_t, uint64_t); +static errno_t ahci_wb_fpdma(sata_dev_t *, uintptr_t, uint64_t); static void ahci_sata_devices_create(ahci_dev_t *, ddf_dev_t *); @@ -124,5 +124,5 @@ static void ahci_ahci_hw_start(ahci_dev_t *); -static int ahci_dev_add(ddf_dev_t *); +static errno_t ahci_dev_add(ddf_dev_t *); static void ahci_get_model_name(uint16_t *, char *); @@ -177,5 +177,5 @@ * */ -static int get_sata_device_name(ddf_fun_t *fun, +static errno_t get_sata_device_name(ddf_fun_t *fun, size_t sata_dev_name_length, char *sata_dev_name) { @@ -193,5 +193,5 @@ * */ -static int get_num_blocks(ddf_fun_t *fun, uint64_t *num_blocks) +static errno_t get_num_blocks(ddf_fun_t *fun, uint64_t *num_blocks) { sata_dev_t *sata = fun_sata_dev(fun); @@ -208,5 +208,5 @@ * */ -static int get_block_size(ddf_fun_t *fun, size_t *block_size) +static errno_t get_block_size(ddf_fun_t *fun, size_t *block_size) { sata_dev_t *sata = fun_sata_dev(fun); @@ -225,5 +225,5 @@ * */ -static int read_blocks(ddf_fun_t *fun, uint64_t blocknum, +static errno_t read_blocks(ddf_fun_t *fun, uint64_t blocknum, size_t count, void *buf) { @@ -232,5 +232,5 @@ uintptr_t phys; void *ibuf = AS_AREA_ANY; - int rc = dmamem_map_anonymous(sata->block_size, DMAMEM_4GiB, + errno_t rc = dmamem_map_anonymous(sata->block_size, DMAMEM_4GiB, AS_AREA_READ | AS_AREA_WRITE, 0, &phys, &ibuf); if (rc != EOK) { @@ -268,5 +268,5 @@ * */ -static int write_blocks(ddf_fun_t *fun, uint64_t blocknum, +static errno_t write_blocks(ddf_fun_t *fun, uint64_t blocknum, size_t count, void *buf) { @@ -275,5 +275,5 @@ uintptr_t phys; void *ibuf = AS_AREA_ANY; - int rc = dmamem_map_anonymous(sata->block_size, DMAMEM_4GiB, + errno_t rc = dmamem_map_anonymous(sata->block_size, DMAMEM_4GiB, AS_AREA_READ | AS_AREA_WRITE, 0, &phys, &ibuf); if (rc != EOK) { @@ -424,5 +424,5 @@ * */ -static int ahci_identify_device(sata_dev_t *sata) +static errno_t ahci_identify_device(sata_dev_t *sata) { if (sata->is_invalid_device) { @@ -434,5 +434,5 @@ uintptr_t phys; sata_identify_data_t *idata = AS_AREA_ANY; - int rc = dmamem_map_anonymous(SATA_IDENTIFY_DEVICE_BUFFER_LENGTH, + errno_t rc = dmamem_map_anonymous(SATA_IDENTIFY_DEVICE_BUFFER_LENGTH, DMAMEM_4GiB, AS_AREA_READ | AS_AREA_WRITE, 0, &phys, (void *) &idata); @@ -605,5 +605,5 @@ * */ -static int ahci_set_highest_ultra_dma_mode(sata_dev_t *sata) +static errno_t ahci_set_highest_ultra_dma_mode(sata_dev_t *sata) { if (sata->is_invalid_device) { @@ -628,5 +628,5 @@ uintptr_t phys; sata_identify_data_t *idata = AS_AREA_ANY; - int rc = dmamem_map_anonymous(SATA_SET_FEATURE_BUFFER_LENGTH, + errno_t rc = dmamem_map_anonymous(SATA_SET_FEATURE_BUFFER_LENGTH, DMAMEM_4GiB, AS_AREA_READ | AS_AREA_WRITE, 0, &phys, (void *) &idata); @@ -734,5 +734,5 @@ * */ -static int ahci_rb_fpdma(sata_dev_t *sata, uintptr_t phys, uint64_t blocknum) +static errno_t ahci_rb_fpdma(sata_dev_t *sata, uintptr_t phys, uint64_t blocknum) { if (sata->is_invalid_device) { @@ -822,5 +822,5 @@ * */ -static int ahci_wb_fpdma(sata_dev_t *sata, uintptr_t phys, uint64_t blocknum) +static errno_t ahci_wb_fpdma(sata_dev_t *sata, uintptr_t phys, uint64_t blocknum) { if (sata->is_invalid_device) { @@ -949,5 +949,5 @@ /* Allocate and init retfis structure. */ - int rc = dmamem_map_anonymous(size, DMAMEM_4GiB, + errno_t rc = dmamem_map_anonymous(size, DMAMEM_4GiB, AS_AREA_READ | AS_AREA_WRITE, 0, &phys, &virt_fb); if (rc != EOK) @@ -1038,9 +1038,9 @@ * */ -static int ahci_sata_create(ahci_dev_t *ahci, ddf_dev_t *dev, +static errno_t ahci_sata_create(ahci_dev_t *ahci, ddf_dev_t *dev, volatile ahci_port_t *port, unsigned int port_num) { ddf_fun_t *fun = NULL; - int rc; + errno_t rc; sata_dev_t *sata = ahci_sata_allocate(ahci, port); @@ -1185,5 +1185,5 @@ int irq_cap; - int rc = register_interrupt_handler(dev, + errno_t rc = register_interrupt_handler(dev, hw_res_parsed.irqs.irqs[0], ahci_interrupt, &ct, &irq_cap); if (rc != EOK) { @@ -1255,5 +1255,5 @@ * */ -static int ahci_dev_add(ddf_dev_t *dev) +static errno_t ahci_dev_add(ddf_dev_t *dev) { ahci_dev_t *ahci = ahci_ahci_create(dev); Index: uspace/drv/block/ata_bd/ata_bd.c =================================================================== --- uspace/drv/block/ata_bd/ata_bd.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/block/ata_bd/ata_bd.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -82,41 +82,41 @@ static const size_t identify_data_size = 512; -static int ata_bd_init_io(ata_ctrl_t *ctrl); +static errno_t ata_bd_init_io(ata_ctrl_t *ctrl); static void ata_bd_fini_io(ata_ctrl_t *ctrl); -static int ata_bd_open(bd_srvs_t *, bd_srv_t *); -static int ata_bd_close(bd_srv_t *); -static int ata_bd_read_blocks(bd_srv_t *, uint64_t ba, size_t cnt, void *buf, +static errno_t ata_bd_open(bd_srvs_t *, bd_srv_t *); +static errno_t ata_bd_close(bd_srv_t *); +static errno_t ata_bd_read_blocks(bd_srv_t *, uint64_t ba, size_t cnt, void *buf, size_t); -static int ata_bd_read_toc(bd_srv_t *, uint8_t session, void *buf, size_t); -static int ata_bd_write_blocks(bd_srv_t *, uint64_t ba, size_t cnt, +static errno_t ata_bd_read_toc(bd_srv_t *, uint8_t session, void *buf, size_t); +static errno_t ata_bd_write_blocks(bd_srv_t *, uint64_t ba, size_t cnt, const void *buf, size_t); -static int ata_bd_get_block_size(bd_srv_t *, size_t *); -static int ata_bd_get_num_blocks(bd_srv_t *, aoff64_t *); -static int ata_bd_sync_cache(bd_srv_t *, aoff64_t, size_t); - -static int ata_rcmd_read(disk_t *disk, uint64_t ba, size_t cnt, +static errno_t ata_bd_get_block_size(bd_srv_t *, size_t *); +static errno_t ata_bd_get_num_blocks(bd_srv_t *, aoff64_t *); +static errno_t ata_bd_sync_cache(bd_srv_t *, aoff64_t, size_t); + +static errno_t ata_rcmd_read(disk_t *disk, uint64_t ba, size_t cnt, void *buf); -static int ata_rcmd_write(disk_t *disk, uint64_t ba, size_t cnt, +static errno_t ata_rcmd_write(disk_t *disk, uint64_t ba, size_t cnt, const void *buf); -static int ata_rcmd_flush_cache(disk_t *disk); -static int disk_init(ata_ctrl_t *ctrl, disk_t *d, int disk_id); -static int ata_identify_dev(disk_t *disk, void *buf); -static int ata_identify_pkt_dev(disk_t *disk, void *buf); -static int ata_cmd_packet(disk_t *disk, const void *cpkt, size_t cpkt_size, +static errno_t ata_rcmd_flush_cache(disk_t *disk); +static errno_t disk_init(ata_ctrl_t *ctrl, disk_t *d, int disk_id); +static errno_t ata_identify_dev(disk_t *disk, void *buf); +static errno_t ata_identify_pkt_dev(disk_t *disk, void *buf); +static errno_t ata_cmd_packet(disk_t *disk, const void *cpkt, size_t cpkt_size, void *obuf, size_t obuf_size, size_t *rcvd_size); -static int ata_pcmd_inquiry(disk_t *disk, void *obuf, size_t obuf_size, +static errno_t ata_pcmd_inquiry(disk_t *disk, void *obuf, size_t obuf_size, size_t *rcvd_size); -static int ata_pcmd_read_12(disk_t *disk, uint64_t ba, size_t cnt, +static errno_t ata_pcmd_read_12(disk_t *disk, uint64_t ba, size_t cnt, void *obuf, size_t obuf_size); -static int ata_pcmd_read_capacity(disk_t *disk, uint64_t *nblocks, +static errno_t ata_pcmd_read_capacity(disk_t *disk, uint64_t *nblocks, size_t *block_size); -static int ata_pcmd_read_toc(disk_t *disk, uint8_t ses, +static errno_t ata_pcmd_read_toc(disk_t *disk, uint8_t ses, void *obuf, size_t obuf_size); static void disk_print_summary(disk_t *d); -static int coord_calc(disk_t *d, uint64_t ba, block_coord_t *bc); +static errno_t coord_calc(disk_t *d, uint64_t ba, block_coord_t *bc); static void coord_sc_program(ata_ctrl_t *ctrl, const block_coord_t *bc, uint16_t scnt); -static int wait_status(ata_ctrl_t *ctrl, unsigned set, unsigned n_reset, +static errno_t wait_status(ata_ctrl_t *ctrl, unsigned set, unsigned n_reset, uint8_t *pstatus, unsigned timeout); @@ -143,8 +143,8 @@ /** Initialize ATA controller. */ -int ata_ctrl_init(ata_ctrl_t *ctrl, ata_base_t *res) +errno_t ata_ctrl_init(ata_ctrl_t *ctrl, ata_base_t *res) { int i; - int rc; + errno_t rc; int n_disks; @@ -209,8 +209,8 @@ /** Remove ATA controller. */ -int ata_ctrl_remove(ata_ctrl_t *ctrl) +errno_t ata_ctrl_remove(ata_ctrl_t *ctrl) { int i; - int rc; + errno_t rc; ddf_msg(LVL_DEBUG, ": ata_ctrl_remove()"); @@ -234,8 +234,8 @@ /** Surprise removal of ATA controller. */ -int ata_ctrl_gone(ata_ctrl_t *ctrl) +errno_t ata_ctrl_gone(ata_ctrl_t *ctrl) { int i; - int rc; + errno_t rc; ddf_msg(LVL_DEBUG, "ata_ctrl_gone()"); @@ -308,7 +308,7 @@ /** Enable device I/O. */ -static int ata_bd_init_io(ata_ctrl_t *ctrl) -{ - int rc; +static errno_t ata_bd_init_io(ata_ctrl_t *ctrl) +{ + errno_t rc; void *vaddr; @@ -344,5 +344,5 @@ * the disk structure. */ -static int disk_init(ata_ctrl_t *ctrl, disk_t *d, int disk_id) +static errno_t disk_init(ata_ctrl_t *ctrl, disk_t *d, int disk_id) { identify_data_t idata; @@ -356,5 +356,5 @@ size_t block_size; size_t pos, len; - int rc; + errno_t rc; unsigned i; @@ -498,10 +498,10 @@ } -static int ata_bd_open(bd_srvs_t *bds, bd_srv_t *bd) -{ - return EOK; -} - -static int ata_bd_close(bd_srv_t *bd) +static errno_t ata_bd_open(bd_srvs_t *bds, bd_srv_t *bd) +{ + return EOK; +} + +static errno_t ata_bd_close(bd_srv_t *bd) { return EOK; @@ -509,9 +509,9 @@ /** Read multiple blocks from the device. */ -static int ata_bd_read_blocks(bd_srv_t *bd, uint64_t ba, size_t cnt, +static errno_t ata_bd_read_blocks(bd_srv_t *bd, uint64_t ba, size_t cnt, void *buf, size_t size) { disk_t *disk = bd_srv_disk(bd); - int rc; + errno_t rc; if (size < cnt * disk->block_size) @@ -538,5 +538,5 @@ /** Read TOC from device. */ -static int ata_bd_read_toc(bd_srv_t *bd, uint8_t session, void *buf, size_t size) +static errno_t ata_bd_read_toc(bd_srv_t *bd, uint8_t session, void *buf, size_t size) { disk_t *disk = bd_srv_disk(bd); @@ -546,9 +546,9 @@ /** Write multiple blocks to the device. */ -static int ata_bd_write_blocks(bd_srv_t *bd, uint64_t ba, size_t cnt, +static errno_t ata_bd_write_blocks(bd_srv_t *bd, uint64_t ba, size_t cnt, const void *buf, size_t size) { disk_t *disk = bd_srv_disk(bd); - int rc; + errno_t rc; if (disk->dev_type != ata_reg_dev) @@ -572,5 +572,5 @@ /** Get device block size. */ -static int ata_bd_get_block_size(bd_srv_t *bd, size_t *rbsize) +static errno_t ata_bd_get_block_size(bd_srv_t *bd, size_t *rbsize) { disk_t *disk = bd_srv_disk(bd); @@ -581,5 +581,5 @@ /** Get device number of blocks. */ -static int ata_bd_get_num_blocks(bd_srv_t *bd, aoff64_t *rnb) +static errno_t ata_bd_get_num_blocks(bd_srv_t *bd, aoff64_t *rnb) { disk_t *disk = bd_srv_disk(bd); @@ -590,5 +590,5 @@ /** Flush cache. */ -static int ata_bd_sync_cache(bd_srv_t *bd, uint64_t ba, size_t cnt) +static errno_t ata_bd_sync_cache(bd_srv_t *bd, uint64_t ba, size_t cnt) { disk_t *disk = bd_srv_disk(bd); @@ -602,5 +602,5 @@ /** PIO data-in command protocol. */ -static int ata_pio_data_in(disk_t *disk, void *obuf, size_t obuf_size, +static errno_t ata_pio_data_in(disk_t *disk, void *obuf, size_t obuf_size, size_t blk_size, size_t nblocks) { @@ -633,5 +633,5 @@ /** PIO data-out command protocol. */ -static int ata_pio_data_out(disk_t *disk, const void *buf, size_t buf_size, +static errno_t ata_pio_data_out(disk_t *disk, const void *buf, size_t buf_size, size_t blk_size, size_t nblocks) { @@ -662,5 +662,5 @@ /** PIO non-data command protocol. */ -static int ata_pio_nondata(disk_t *disk) +static errno_t ata_pio_nondata(disk_t *disk) { ata_ctrl_t *ctrl = disk->ctrl; @@ -687,5 +687,5 @@ * not present). EIO if device responds with error. */ -static int ata_identify_dev(disk_t *disk, void *buf) +static errno_t ata_identify_dev(disk_t *disk, void *buf) { ata_ctrl_t *ctrl = disk->ctrl; @@ -739,5 +739,5 @@ * @param buf Pointer to a 512-byte buffer. */ -static int ata_identify_pkt_dev(disk_t *disk, void *buf) +static errno_t ata_identify_pkt_dev(disk_t *disk, void *buf) { ata_ctrl_t *ctrl = disk->ctrl; @@ -772,5 +772,5 @@ * @return EOK on success, EIO on error. */ -static int ata_cmd_packet(disk_t *disk, const void *cpkt, size_t cpkt_size, +static errno_t ata_cmd_packet(disk_t *disk, const void *cpkt, size_t cpkt_size, void *obuf, size_t obuf_size, size_t *rcvd_size) { @@ -860,10 +860,10 @@ * @return EOK on success, EIO on error. */ -static int ata_pcmd_inquiry(disk_t *disk, void *obuf, size_t obuf_size, +static errno_t ata_pcmd_inquiry(disk_t *disk, void *obuf, size_t obuf_size, size_t *rcvd_size) { uint8_t cpb[12]; scsi_cdb_inquiry_t *cp = (scsi_cdb_inquiry_t *)cpb; - int rc; + errno_t rc; memset(cpb, 0, sizeof(cpb)); @@ -893,5 +893,5 @@ * @return EOK on success, EIO on error. */ -static int ata_pcmd_read_capacity(disk_t *disk, uint64_t *nblocks, +static errno_t ata_pcmd_read_capacity(disk_t *disk, uint64_t *nblocks, size_t *block_size) { @@ -899,5 +899,5 @@ scsi_read_capacity_10_data_t data; size_t rsize; - int rc; + errno_t rc; memset(&cdb, 0, sizeof(cdb)); @@ -930,9 +930,9 @@ * @return EOK on success, EIO on error. */ -static int ata_pcmd_read_12(disk_t *disk, uint64_t ba, size_t cnt, +static errno_t ata_pcmd_read_12(disk_t *disk, uint64_t ba, size_t cnt, void *obuf, size_t obuf_size) { scsi_cdb_read_12_t cp; - int rc; + errno_t rc; if (ba > UINT32_MAX) @@ -969,10 +969,10 @@ * @return EOK on success, EIO on error. */ -static int ata_pcmd_read_toc(disk_t *disk, uint8_t session, void *obuf, +static errno_t ata_pcmd_read_toc(disk_t *disk, uint8_t session, void *obuf, size_t obuf_size) { uint8_t cpb[12]; scsi_cdb_read_toc_t *cp = (scsi_cdb_read_toc_t *)cpb; - int rc; + errno_t rc; memset(cpb, 0, sizeof(cpb)); @@ -1001,5 +1001,5 @@ * @return EOK on success, EIO on error. */ -static int ata_rcmd_read(disk_t *disk, uint64_t ba, size_t blk_cnt, +static errno_t ata_rcmd_read(disk_t *disk, uint64_t ba, size_t blk_cnt, void *buf) { @@ -1007,5 +1007,5 @@ uint8_t drv_head; block_coord_t bc; - int rc; + errno_t rc; /* Silence warning. */ @@ -1061,5 +1061,5 @@ * @return EOK on success, EIO on error. */ -static int ata_rcmd_write(disk_t *disk, uint64_t ba, size_t cnt, +static errno_t ata_rcmd_write(disk_t *disk, uint64_t ba, size_t cnt, const void *buf) { @@ -1067,5 +1067,5 @@ uint8_t drv_head; block_coord_t bc; - int rc; + errno_t rc; /* Silence warning. */ @@ -1117,9 +1117,9 @@ * @return EOK on success, EIO on error. */ -static int ata_rcmd_flush_cache(disk_t *disk) +static errno_t ata_rcmd_flush_cache(disk_t *disk) { ata_ctrl_t *ctrl = disk->ctrl; uint8_t drv_head; - int rc; + errno_t rc; /* New value for Drive/Head register */ @@ -1159,5 +1159,5 @@ * @return EOK on success or EINVAL if block index is past end of device. */ -static int coord_calc(disk_t *d, uint64_t ba, block_coord_t *bc) +static errno_t coord_calc(disk_t *d, uint64_t ba, block_coord_t *bc) { uint64_t c; @@ -1246,5 +1246,5 @@ * @return EOK on success, EIO on timeout. */ -static int wait_status(ata_ctrl_t *ctrl, unsigned set, unsigned n_reset, +static errno_t wait_status(ata_ctrl_t *ctrl, unsigned set, unsigned n_reset, uint8_t *pstatus, unsigned timeout) { Index: uspace/drv/block/ata_bd/ata_bd.h =================================================================== --- uspace/drv/block/ata_bd/ata_bd.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/block/ata_bd/ata_bd.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -153,7 +153,7 @@ } ata_fun_t; -extern int ata_ctrl_init(ata_ctrl_t *, ata_base_t *); -extern int ata_ctrl_remove(ata_ctrl_t *); -extern int ata_ctrl_gone(ata_ctrl_t *); +extern errno_t ata_ctrl_init(ata_ctrl_t *, ata_base_t *); +extern errno_t ata_ctrl_remove(ata_ctrl_t *); +extern errno_t ata_ctrl_gone(ata_ctrl_t *); extern bd_ops_t ata_bd_ops; Index: uspace/drv/block/ata_bd/main.c =================================================================== --- uspace/drv/block/ata_bd/main.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/block/ata_bd/main.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -41,9 +41,9 @@ #include "main.h" -static int ata_dev_add(ddf_dev_t *dev); -static int ata_dev_remove(ddf_dev_t *dev); -static int ata_dev_gone(ddf_dev_t *dev); -static int ata_fun_online(ddf_fun_t *fun); -static int ata_fun_offline(ddf_fun_t *fun); +static errno_t ata_dev_add(ddf_dev_t *dev); +static errno_t ata_dev_remove(ddf_dev_t *dev); +static errno_t ata_dev_gone(ddf_dev_t *dev); +static errno_t ata_fun_online(ddf_fun_t *fun); +static errno_t ata_fun_offline(ddf_fun_t *fun); static void ata_bd_connection(ipc_callid_t, ipc_call_t *, void *); @@ -62,9 +62,9 @@ }; -static int ata_get_res(ddf_dev_t *dev, ata_base_t *ata_res) +static errno_t ata_get_res(ddf_dev_t *dev, ata_base_t *ata_res) { async_sess_t *parent_sess; hw_res_list_parsed_t hw_res; - int rc; + errno_t rc; parent_sess = ddf_dev_parent_sess_get(dev); @@ -108,9 +108,9 @@ * @return EOK on success or an error code. */ -static int ata_dev_add(ddf_dev_t *dev) +static errno_t ata_dev_add(ddf_dev_t *dev) { ata_ctrl_t *ctrl; ata_base_t res; - int rc; + errno_t rc; rc = ata_get_res(dev, &res); @@ -151,8 +151,8 @@ } -int ata_fun_create(disk_t *disk) +errno_t ata_fun_create(disk_t *disk) { ata_ctrl_t *ctrl = disk->ctrl; - int rc; + errno_t rc; char *fun_name = NULL; ddf_fun_t *fun = NULL; @@ -212,7 +212,7 @@ } -int ata_fun_remove(disk_t *disk) -{ - int rc; +errno_t ata_fun_remove(disk_t *disk) +{ + errno_t rc; char *fun_name; @@ -250,7 +250,7 @@ } -int ata_fun_unbind(disk_t *disk) -{ - int rc; +errno_t ata_fun_unbind(disk_t *disk) +{ + errno_t rc; char *fun_name; @@ -282,5 +282,5 @@ } -static int ata_dev_remove(ddf_dev_t *dev) +static errno_t ata_dev_remove(ddf_dev_t *dev) { ata_ctrl_t *ctrl = (ata_ctrl_t *)ddf_dev_data_get(dev); @@ -291,5 +291,5 @@ } -static int ata_dev_gone(ddf_dev_t *dev) +static errno_t ata_dev_gone(ddf_dev_t *dev) { ata_ctrl_t *ctrl = (ata_ctrl_t *)ddf_dev_data_get(dev); @@ -300,5 +300,5 @@ } -static int ata_fun_online(ddf_fun_t *fun) +static errno_t ata_fun_online(ddf_fun_t *fun) { ddf_msg(LVL_DEBUG, "ata_fun_online()"); @@ -306,5 +306,5 @@ } -static int ata_fun_offline(ddf_fun_t *fun) +static errno_t ata_fun_offline(ddf_fun_t *fun) { ddf_msg(LVL_DEBUG, "ata_fun_offline()"); Index: uspace/drv/block/ata_bd/main.h =================================================================== --- uspace/drv/block/ata_bd/main.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/block/ata_bd/main.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -38,7 +38,7 @@ #include "ata_bd.h" -extern int ata_fun_create(disk_t *); -extern int ata_fun_remove(disk_t *); -extern int ata_fun_unbind(disk_t *); +extern errno_t ata_fun_create(disk_t *); +extern errno_t ata_fun_remove(disk_t *); +extern errno_t ata_fun_unbind(disk_t *); #endif Index: uspace/drv/block/ddisk/ddisk.c =================================================================== --- uspace/drv/block/ddisk/ddisk.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/block/ddisk/ddisk.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -56,9 +56,9 @@ #define DDISK_CMD_IRQ_DEASSERT 0x4 -static int ddisk_dev_add(ddf_dev_t *); -static int ddisk_dev_remove(ddf_dev_t *); -static int ddisk_dev_gone(ddf_dev_t *); -static int ddisk_fun_online(ddf_fun_t *); -static int ddisk_fun_offline(ddf_fun_t *); +static errno_t ddisk_dev_add(ddf_dev_t *); +static errno_t ddisk_dev_remove(ddf_dev_t *); +static errno_t ddisk_dev_gone(ddf_dev_t *); +static errno_t ddisk_fun_online(ddf_fun_t *); +static errno_t ddisk_fun_offline(ddf_fun_t *); static void ddisk_bd_connection(ipc_callid_t, ipc_call_t *, void *); @@ -117,11 +117,11 @@ } ddisk_t; -static int ddisk_bd_open(bd_srvs_t *, bd_srv_t *); -static int ddisk_bd_close(bd_srv_t *); -static int ddisk_bd_read_blocks(bd_srv_t *, aoff64_t, size_t, void *, size_t); -static int ddisk_bd_write_blocks(bd_srv_t *, aoff64_t, size_t, const void *, +static errno_t ddisk_bd_open(bd_srvs_t *, bd_srv_t *); +static errno_t ddisk_bd_close(bd_srv_t *); +static errno_t ddisk_bd_read_blocks(bd_srv_t *, aoff64_t, size_t, void *, size_t); +static errno_t ddisk_bd_write_blocks(bd_srv_t *, aoff64_t, size_t, const void *, size_t); -static int ddisk_bd_get_block_size(bd_srv_t *, size_t *); -static int ddisk_bd_get_num_blocks(bd_srv_t *, aoff64_t *); +static errno_t ddisk_bd_get_block_size(bd_srv_t *, size_t *); +static errno_t ddisk_bd_get_num_blocks(bd_srv_t *, aoff64_t *); bd_ops_t ddisk_bd_ops = { @@ -188,10 +188,10 @@ } -int ddisk_bd_open(bd_srvs_t *bds, bd_srv_t *bd) -{ - return EOK; -} - -int ddisk_bd_close(bd_srv_t *bd) +errno_t ddisk_bd_open(bd_srvs_t *bds, bd_srv_t *bd) +{ + return EOK; +} + +errno_t ddisk_bd_close(bd_srv_t *bd) { return EOK; @@ -199,5 +199,5 @@ static -int ddisk_rw_block(ddisk_t *ddisk, bool read, aoff64_t ba, void *buf) +errno_t ddisk_rw_block(ddisk_t *ddisk, bool read, aoff64_t ba, void *buf) { fibril_mutex_lock(&ddisk->lock); @@ -236,10 +236,10 @@ static -int ddisk_bd_rw_blocks(bd_srv_t *bd, aoff64_t ba, size_t cnt, void *buf, +errno_t ddisk_bd_rw_blocks(bd_srv_t *bd, aoff64_t ba, size_t cnt, void *buf, size_t size, bool is_read) { ddisk_t *ddisk = (ddisk_t *) bd->srvs->sarg; aoff64_t i; - int rc; + errno_t rc; if (size < cnt * DDISK_BLOCK_SIZE) @@ -256,5 +256,5 @@ } -int ddisk_bd_read_blocks(bd_srv_t *bd, aoff64_t ba, size_t cnt, void *buf, +errno_t ddisk_bd_read_blocks(bd_srv_t *bd, aoff64_t ba, size_t cnt, void *buf, size_t size) { @@ -262,5 +262,5 @@ } -int ddisk_bd_write_blocks(bd_srv_t *bd, aoff64_t ba, size_t cnt, +errno_t ddisk_bd_write_blocks(bd_srv_t *bd, aoff64_t ba, size_t cnt, const void *buf, size_t size) { @@ -268,5 +268,5 @@ } -int ddisk_bd_get_block_size(bd_srv_t *bd, size_t *rsize) +errno_t ddisk_bd_get_block_size(bd_srv_t *bd, size_t *rsize) { *rsize = DDISK_BLOCK_SIZE; @@ -274,5 +274,5 @@ } -int ddisk_bd_get_num_blocks(bd_srv_t *bd, aoff64_t *rnb) +errno_t ddisk_bd_get_num_blocks(bd_srv_t *bd, aoff64_t *rnb) { ddisk_t *ddisk = (ddisk_t *) bd->srvs->sarg; @@ -282,9 +282,9 @@ } -static int ddisk_get_res(ddf_dev_t *dev, ddisk_res_t *ddisk_res) +static errno_t ddisk_get_res(ddf_dev_t *dev, ddisk_res_t *ddisk_res) { async_sess_t *parent_sess; hw_res_list_parsed_t hw_res; - int rc; + errno_t rc; parent_sess = ddf_dev_parent_sess_get(dev); @@ -317,7 +317,7 @@ } -static int ddisk_fun_create(ddisk_t *ddisk) -{ - int rc; +static errno_t ddisk_fun_create(ddisk_t *ddisk) +{ + errno_t rc; ddf_fun_t *fun = NULL; @@ -350,7 +350,7 @@ } -static int ddisk_fun_remove(ddisk_t *ddisk) -{ - int rc; +static errno_t ddisk_fun_remove(ddisk_t *ddisk) +{ + errno_t rc; if (ddisk->fun == NULL) @@ -381,7 +381,7 @@ } -static int ddisk_fun_unbind(ddisk_t *ddisk) -{ - int rc; +static errno_t ddisk_fun_unbind(ddisk_t *ddisk) +{ + errno_t rc; if (ddisk->fun == NULL) @@ -410,9 +410,9 @@ * @return EOK on success or an error code. */ -static int ddisk_dev_add(ddf_dev_t *dev) +static errno_t ddisk_dev_add(ddf_dev_t *dev) { ddisk_t *ddisk; ddisk_res_t res; - int rc; + errno_t rc; /* @@ -530,7 +530,7 @@ -static int ddisk_dev_remove_common(ddisk_t *ddisk, bool surprise) -{ - int rc; +static errno_t ddisk_dev_remove_common(ddisk_t *ddisk, bool surprise) +{ + errno_t rc; if (!surprise) @@ -558,5 +558,5 @@ } -static int ddisk_dev_remove(ddf_dev_t *dev) +static errno_t ddisk_dev_remove(ddf_dev_t *dev) { ddisk_t *ddisk = (ddisk_t *) ddf_dev_data_get(dev); @@ -566,5 +566,5 @@ } -static int ddisk_dev_gone(ddf_dev_t *dev) +static errno_t ddisk_dev_gone(ddf_dev_t *dev) { ddisk_t *ddisk = (ddisk_t *) ddf_dev_data_get(dev); @@ -574,5 +574,5 @@ } -static int ddisk_fun_online(ddf_fun_t *fun) +static errno_t ddisk_fun_online(ddf_fun_t *fun) { ddf_msg(LVL_DEBUG, "ddisk_fun_online()"); @@ -580,5 +580,5 @@ } -static int ddisk_fun_offline(ddf_fun_t *fun) +static errno_t ddisk_fun_offline(ddf_fun_t *fun) { ddf_msg(LVL_DEBUG, "ddisk_fun_offline()"); Index: uspace/drv/block/usbmast/bo_trans.c =================================================================== --- uspace/drv/block/usbmast/bo_trans.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/block/usbmast/bo_trans.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -58,7 +58,7 @@ * @return Error code */ -int usb_massstor_cmd(usbmast_fun_t *mfun, uint32_t tag, scsi_cmd_t *cmd) -{ - int rc; +errno_t usb_massstor_cmd(usbmast_fun_t *mfun, uint32_t tag, scsi_cmd_t *cmd) +{ + errno_t rc; if (cmd->data_in && cmd->data_out) @@ -192,5 +192,5 @@ * @return Error code */ -int usb_massstor_reset(usbmast_dev_t *mdev) +errno_t usb_massstor_reset(usbmast_dev_t *mdev) { return usb_control_request_set( @@ -234,5 +234,5 @@ uint8_t max_lun; size_t data_recv_len; - int rc = usb_control_request_get( + errno_t rc = usb_control_request_get( usb_device_get_default_pipe(mdev->usb_dev), USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_INTERFACE, Index: uspace/drv/block/usbmast/bo_trans.h =================================================================== --- uspace/drv/block/usbmast/bo_trans.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/block/usbmast/bo_trans.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -86,6 +86,6 @@ } scsi_cmd_t; -extern int usb_massstor_cmd(usbmast_fun_t *, uint32_t, scsi_cmd_t *); -extern int usb_massstor_reset(usbmast_dev_t *); +extern errno_t usb_massstor_cmd(usbmast_fun_t *, uint32_t, scsi_cmd_t *); +extern errno_t usb_massstor_reset(usbmast_dev_t *); extern void usb_massstor_reset_recovery(usbmast_dev_t *); extern int usb_massstor_get_max_lun(usbmast_dev_t *); Index: uspace/drv/block/usbmast/main.c =================================================================== --- uspace/drv/block/usbmast/main.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/block/usbmast/main.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -77,15 +77,15 @@ }; -static int usbmast_fun_create(usbmast_dev_t *mdev, unsigned lun); +static errno_t usbmast_fun_create(usbmast_dev_t *mdev, unsigned lun); static void usbmast_bd_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg); -static int usbmast_bd_open(bd_srvs_t *, bd_srv_t *); -static int usbmast_bd_close(bd_srv_t *); -static int usbmast_bd_read_blocks(bd_srv_t *, aoff64_t, size_t, void *, size_t); -static int usbmast_bd_sync_cache(bd_srv_t *, aoff64_t, size_t); -static int usbmast_bd_write_blocks(bd_srv_t *, aoff64_t, size_t, const void *, size_t); -static int usbmast_bd_get_block_size(bd_srv_t *, size_t *); -static int usbmast_bd_get_num_blocks(bd_srv_t *, aoff64_t *); +static errno_t usbmast_bd_open(bd_srvs_t *, bd_srv_t *); +static errno_t usbmast_bd_close(bd_srv_t *); +static errno_t usbmast_bd_read_blocks(bd_srv_t *, aoff64_t, size_t, void *, size_t); +static errno_t usbmast_bd_sync_cache(bd_srv_t *, aoff64_t, size_t); +static errno_t usbmast_bd_write_blocks(bd_srv_t *, aoff64_t, size_t, const void *, size_t); +static errno_t usbmast_bd_get_block_size(bd_srv_t *, size_t *); +static errno_t usbmast_bd_get_num_blocks(bd_srv_t *, aoff64_t *); static bd_ops_t usbmast_bd_ops = { @@ -109,5 +109,5 @@ * @return Error code. */ -static int usbmast_device_gone(usb_device_t *dev) +static errno_t usbmast_device_gone(usb_device_t *dev) { usbmast_dev_t *mdev = usb_device_data_get(dev); @@ -115,5 +115,5 @@ for (size_t i = 0; i < mdev->lun_count; ++i) { - const int rc = ddf_fun_unbind(mdev->luns[i]); + const errno_t rc = ddf_fun_unbind(mdev->luns[i]); if (rc != EOK) { usb_log_error("Failed to unbind LUN function %zu: " @@ -133,5 +133,5 @@ * @return Error code. */ -static int usbmast_device_remove(usb_device_t *dev) +static errno_t usbmast_device_remove(usb_device_t *dev) { //TODO: flush buffers, or whatever. @@ -145,7 +145,7 @@ * @return Error code. */ -static int usbmast_device_add(usb_device_t *dev) -{ - int rc; +static errno_t usbmast_device_add(usb_device_t *dev) +{ + errno_t rc; usbmast_dev_t *mdev = NULL; unsigned i; @@ -198,5 +198,5 @@ if (mdev->luns[i] == NULL) continue; - const int rc = ddf_fun_unbind(mdev->luns[i]); + const errno_t rc = ddf_fun_unbind(mdev->luns[i]); if (rc != EOK) { usb_log_warning("Failed to unbind LUN function %zu: " @@ -217,7 +217,7 @@ * @return EOK on success or an error code. */ -static int usbmast_fun_create(usbmast_dev_t *mdev, unsigned lun) -{ - int rc; +static errno_t usbmast_fun_create(usbmast_dev_t *mdev, unsigned lun) +{ + errno_t rc; char *fun_name = NULL; ddf_fun_t *fun = NULL; @@ -326,5 +326,5 @@ /** Open device. */ -static int usbmast_bd_open(bd_srvs_t *bds, bd_srv_t *bd) +static errno_t usbmast_bd_open(bd_srvs_t *bds, bd_srv_t *bd) { return EOK; @@ -332,5 +332,5 @@ /** Close device. */ -static int usbmast_bd_close(bd_srv_t *bd) +static errno_t usbmast_bd_close(bd_srv_t *bd) { return EOK; @@ -338,5 +338,5 @@ /** Read blocks from the device. */ -static int usbmast_bd_read_blocks(bd_srv_t *bd, uint64_t ba, size_t cnt, void *buf, +static errno_t usbmast_bd_read_blocks(bd_srv_t *bd, uint64_t ba, size_t cnt, void *buf, size_t size) { @@ -350,5 +350,5 @@ /** Synchronize blocks to nonvolatile storage. */ -static int usbmast_bd_sync_cache(bd_srv_t *bd, uint64_t ba, size_t cnt) +static errno_t usbmast_bd_sync_cache(bd_srv_t *bd, uint64_t ba, size_t cnt) { usbmast_fun_t *mfun = bd_srv_usbmast(bd); @@ -358,5 +358,5 @@ /** Write blocks to the device. */ -static int usbmast_bd_write_blocks(bd_srv_t *bd, uint64_t ba, size_t cnt, +static errno_t usbmast_bd_write_blocks(bd_srv_t *bd, uint64_t ba, size_t cnt, const void *buf, size_t size) { @@ -370,5 +370,5 @@ /** Get device block size. */ -static int usbmast_bd_get_block_size(bd_srv_t *bd, size_t *rsize) +static errno_t usbmast_bd_get_block_size(bd_srv_t *bd, size_t *rsize) { usbmast_fun_t *mfun = bd_srv_usbmast(bd); @@ -378,5 +378,5 @@ /** Get number of blocks on device. */ -static int usbmast_bd_get_num_blocks(bd_srv_t *bd, aoff64_t *rnb) +static errno_t usbmast_bd_get_num_blocks(bd_srv_t *bd, aoff64_t *rnb) { usbmast_fun_t *mfun = bd_srv_usbmast(bd); Index: uspace/drv/block/usbmast/scsi_ms.c =================================================================== --- uspace/drv/block/usbmast/scsi_ms.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/block/usbmast/scsi_ms.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -72,9 +72,9 @@ } -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,9 +107,9 @@ * 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,10 +162,10 @@ * @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,9 +231,9 @@ * @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,5 +272,5 @@ * @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,5 +278,5 @@ 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,9 +323,9 @@ * @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,10 +378,10 @@ * @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,5 +428,5 @@ * @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,5 +447,5 @@ }; - const int rc = usbmast_run_cmd(mfun, &cmd); + const errno_t rc = usbmast_run_cmd(mfun, &cmd); if (rc != EOK) { Index: uspace/drv/block/usbmast/scsi_ms.h =================================================================== --- uspace/drv/block/usbmast/scsi_ms.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/block/usbmast/scsi_ms.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -60,10 +60,10 @@ } usbmast_inquiry_data_t; -extern int usbmast_inquiry(usbmast_fun_t *, usbmast_inquiry_data_t *); -extern int usbmast_request_sense(usbmast_fun_t *, void *, size_t); -extern int usbmast_read_capacity(usbmast_fun_t *, uint32_t *, uint32_t *); -extern int usbmast_read(usbmast_fun_t *, uint64_t, size_t, void *); -extern int usbmast_write(usbmast_fun_t *, uint64_t, size_t, const void *); -extern int usbmast_sync_cache(usbmast_fun_t *, uint64_t, size_t); +extern errno_t usbmast_inquiry(usbmast_fun_t *, usbmast_inquiry_data_t *); +extern errno_t usbmast_request_sense(usbmast_fun_t *, void *, size_t); +extern errno_t usbmast_read_capacity(usbmast_fun_t *, uint32_t *, uint32_t *); +extern errno_t usbmast_read(usbmast_fun_t *, uint64_t, size_t, void *); +extern errno_t usbmast_write(usbmast_fun_t *, uint64_t, size_t, const void *); +extern errno_t usbmast_sync_cache(usbmast_fun_t *, uint64_t, size_t); extern const char *usbmast_scsi_dev_type_str(unsigned); Index: uspace/drv/bus/adb/cuda_adb/cuda_adb.c =================================================================== --- uspace/drv/bus/adb/cuda_adb/cuda_adb.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/bus/adb/cuda_adb/cuda_adb.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -56,5 +56,5 @@ static void cuda_dev_connection(ipc_callid_t, ipc_call_t *, void *); -static int cuda_init(cuda_t *); +static errno_t cuda_init(cuda_t *); static void cuda_irq_handler(ipc_call_t *, void *); @@ -108,10 +108,10 @@ }; -static int cuda_dev_create(cuda_t *cuda, const char *name, const char *id, +static errno_t cuda_dev_create(cuda_t *cuda, const char *name, const char *id, adb_dev_t **rdev) { adb_dev_t *dev = NULL; ddf_fun_t *fun; - int rc; + errno_t rc; fun = ddf_fun_create(cuda->dev, fun_inner, name); @@ -155,9 +155,9 @@ } -int cuda_add(cuda_t *cuda, cuda_res_t *res) +errno_t cuda_add(cuda_t *cuda, cuda_res_t *res) { adb_dev_t *kbd = NULL; adb_dev_t *mouse = NULL; - int rc; + errno_t rc; cuda->phys_base = res->base; @@ -187,10 +187,10 @@ } -int cuda_remove(cuda_t *cuda) +errno_t cuda_remove(cuda_t *cuda) { return ENOTSUP; } -int cuda_gone(cuda_t *cuda) +errno_t cuda_gone(cuda_t *cuda) { return ENOTSUP; @@ -229,7 +229,7 @@ } -static int cuda_init(cuda_t *cuda) -{ - int rc; +static errno_t cuda_init(cuda_t *cuda) +{ + errno_t rc; void *vaddr; Index: uspace/drv/bus/adb/cuda_adb/cuda_adb.h =================================================================== --- uspace/drv/bus/adb/cuda_adb/cuda_adb.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/bus/adb/cuda_adb/cuda_adb.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -87,7 +87,7 @@ } cuda_t; -extern int cuda_add(cuda_t *, cuda_res_t *); -extern int cuda_remove(cuda_t *); -extern int cuda_gone(cuda_t *); +extern errno_t cuda_add(cuda_t *, cuda_res_t *); +extern errno_t cuda_remove(cuda_t *); +extern errno_t cuda_gone(cuda_t *); #endif Index: uspace/drv/bus/adb/cuda_adb/main.c =================================================================== --- uspace/drv/bus/adb/cuda_adb/main.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/bus/adb/cuda_adb/main.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -43,9 +43,9 @@ #define NAME "cuda_adb" -static int cuda_dev_add(ddf_dev_t *dev); -static int cuda_dev_remove(ddf_dev_t *dev); -static int cuda_dev_gone(ddf_dev_t *dev); -static int cuda_fun_online(ddf_fun_t *fun); -static int cuda_fun_offline(ddf_fun_t *fun); +static errno_t cuda_dev_add(ddf_dev_t *dev); +static errno_t cuda_dev_remove(ddf_dev_t *dev); +static errno_t cuda_dev_gone(ddf_dev_t *dev); +static errno_t cuda_fun_online(ddf_fun_t *fun); +static errno_t cuda_fun_offline(ddf_fun_t *fun); static driver_ops_t driver_ops = { @@ -62,9 +62,9 @@ }; -static int cuda_get_res(ddf_dev_t *dev, cuda_res_t *res) +static errno_t cuda_get_res(ddf_dev_t *dev, cuda_res_t *res) { async_sess_t *parent_sess; hw_res_list_parsed_t hw_res; - int rc; + errno_t rc; parent_sess = ddf_dev_parent_sess_get(dev); @@ -97,9 +97,9 @@ } -static int cuda_dev_add(ddf_dev_t *dev) +static errno_t cuda_dev_add(ddf_dev_t *dev) { cuda_t *cuda; cuda_res_t cuda_res; - int rc; + errno_t rc; ddf_msg(LVL_DEBUG, "cuda_dev_add(%p)", dev); @@ -122,5 +122,5 @@ } -static int cuda_dev_remove(ddf_dev_t *dev) +static errno_t cuda_dev_remove(ddf_dev_t *dev) { cuda_t *cuda = (cuda_t *)ddf_dev_data_get(dev); @@ -131,5 +131,5 @@ } -static int cuda_dev_gone(ddf_dev_t *dev) +static errno_t cuda_dev_gone(ddf_dev_t *dev) { cuda_t *cuda = (cuda_t *)ddf_dev_data_get(dev); @@ -140,5 +140,5 @@ } -static int cuda_fun_online(ddf_fun_t *fun) +static errno_t cuda_fun_online(ddf_fun_t *fun) { ddf_msg(LVL_DEBUG, "cuda_fun_online()"); @@ -146,5 +146,5 @@ } -static int cuda_fun_offline(ddf_fun_t *fun) +static errno_t cuda_fun_offline(ddf_fun_t *fun) { ddf_msg(LVL_DEBUG, "cuda_fun_offline()"); Index: uspace/drv/bus/isa/i8237.c =================================================================== --- uspace/drv/bus/isa/i8237.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/bus/isa/i8237.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -279,8 +279,8 @@ * */ -static inline int dma_controller_init(dma_controller_t *controller) +static inline errno_t dma_controller_init(dma_controller_t *controller) { assert(controller); - int ret = pio_enable(DMA_CONTROLLER_PAGE_BASE, sizeof(dma_page_regs_t), + errno_t ret = pio_enable(DMA_CONTROLLER_PAGE_BASE, sizeof(dma_page_regs_t), (void **) &controller->page_table); if (ret != EOK) @@ -339,5 +339,5 @@ * @return Error code. */ -int dma_channel_setup(unsigned int channel, uint32_t pa, uint32_t size, +errno_t dma_channel_setup(unsigned int channel, uint32_t pa, uint32_t size, uint8_t mode) { @@ -454,5 +454,5 @@ * @return Error code. */ -int dma_channel_remain(unsigned channel, size_t *size) +errno_t dma_channel_remain(unsigned channel, size_t *size) { assert(size); Index: uspace/drv/bus/isa/i8237.h =================================================================== --- uspace/drv/bus/isa/i8237.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/bus/isa/i8237.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -38,6 +38,6 @@ #define DRV_BUS_ISA_I8237_H -extern int dma_channel_setup(unsigned, uint32_t, uint32_t, uint8_t); -extern int dma_channel_remain(unsigned, size_t *); +extern errno_t dma_channel_setup(unsigned, uint32_t, uint32_t, uint8_t); +extern errno_t dma_channel_remain(unsigned, size_t *); #endif Index: uspace/drv/bus/isa/isa.c =================================================================== --- uspace/drv/bus/isa/isa.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/bus/isa/isa.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -130,5 +130,5 @@ } -static int isa_fun_enable_interrupt(ddf_fun_t *fnode, int irq) +static errno_t isa_fun_enable_interrupt(ddf_fun_t *fnode, int irq) { isa_fun_t *fun = isa_fun(fnode); @@ -140,5 +140,5 @@ } -static int isa_fun_disable_interrupt(ddf_fun_t *fnode, int irq) +static errno_t isa_fun_disable_interrupt(ddf_fun_t *fnode, int irq) { isa_fun_t *fun = isa_fun(fnode); @@ -150,5 +150,5 @@ } -static int isa_fun_clear_interrupt(ddf_fun_t *fnode, int irq) +static errno_t isa_fun_clear_interrupt(ddf_fun_t *fnode, int irq) { isa_fun_t *fun = isa_fun(fnode); @@ -160,5 +160,5 @@ } -static int isa_fun_setup_dma(ddf_fun_t *fnode, +static errno_t isa_fun_setup_dma(ddf_fun_t *fnode, unsigned int channel, uint32_t pa, uint32_t size, uint8_t mode) { @@ -182,5 +182,5 @@ } -static int isa_fun_remain_dma(ddf_fun_t *fnode, +static errno_t isa_fun_remain_dma(ddf_fun_t *fnode, unsigned channel, size_t *size) { @@ -232,8 +232,8 @@ }; -static int isa_dev_add(ddf_dev_t *dev); -static int isa_dev_remove(ddf_dev_t *dev); -static int isa_fun_online(ddf_fun_t *fun); -static int isa_fun_offline(ddf_fun_t *fun); +static errno_t isa_dev_add(ddf_dev_t *dev); +static errno_t isa_dev_remove(ddf_dev_t *dev); +static errno_t isa_fun_online(ddf_fun_t *fun); +static errno_t isa_fun_offline(ddf_fun_t *fun); /** The isa device driver's standard operations */ @@ -277,5 +277,5 @@ int fd; size_t len; - int rc; + errno_t rc; size_t nread; struct stat st; @@ -578,5 +578,5 @@ "function %s", id, score, ddf_fun_get_name(fun->fnode)); - int rc = ddf_fun_add_match_id(fun->fnode, id, score); + errno_t rc = ddf_fun_add_match_id(fun->fnode, id, score); if (rc != EOK) { ddf_msg(LVL_ERROR, "Failed adding match ID: %s", @@ -698,8 +698,8 @@ } -static int isa_dev_add(ddf_dev_t *dev) +static errno_t isa_dev_add(ddf_dev_t *dev) { async_sess_t *sess; - int rc; + errno_t rc; ddf_msg(LVL_DEBUG, "isa_dev_add, device handle = %d", @@ -767,5 +767,5 @@ } -static int isa_dev_remove(ddf_dev_t *dev) +static errno_t isa_dev_remove(ddf_dev_t *dev) { isa_bus_t *isa = isa_bus(dev); @@ -777,5 +777,5 @@ isa_fun_t, bus_link); - int rc = ddf_fun_offline(fun->fnode); + errno_t rc = ddf_fun_offline(fun->fnode); if (rc != EOK) { fibril_mutex_unlock(&isa->mutex); @@ -807,5 +807,5 @@ } -static int isa_fun_online(ddf_fun_t *fun) +static errno_t isa_fun_online(ddf_fun_t *fun) { ddf_msg(LVL_DEBUG, "isa_fun_online()"); @@ -813,5 +813,5 @@ } -static int isa_fun_offline(ddf_fun_t *fun) +static errno_t isa_fun_offline(ddf_fun_t *fun) { ddf_msg(LVL_DEBUG, "isa_fun_offline()"); Index: uspace/drv/bus/pci/pciintel/pci.c =================================================================== --- uspace/drv/bus/pci/pciintel/pci.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/bus/pci/pciintel/pci.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -114,5 +114,5 @@ } -static int pciintel_enable_interrupt(ddf_fun_t *fnode, int irq) +static errno_t pciintel_enable_interrupt(ddf_fun_t *fnode, int irq) { pci_fun_t *fun = pci_fun(fnode); @@ -124,5 +124,5 @@ } -static int pciintel_disable_interrupt(ddf_fun_t *fnode, int irq) +static errno_t pciintel_disable_interrupt(ddf_fun_t *fnode, int irq) { pci_fun_t *fun = pci_fun(fnode); @@ -134,5 +134,5 @@ } -static int pciintel_clear_interrupt(ddf_fun_t *fnode, int irq) +static errno_t pciintel_clear_interrupt(ddf_fun_t *fnode, int irq) { pci_fun_t *fun = pci_fun(fnode); @@ -154,5 +154,5 @@ -static int config_space_write_32(ddf_fun_t *fun, uint32_t address, +static errno_t config_space_write_32(ddf_fun_t *fun, uint32_t address, uint32_t data) { @@ -163,5 +163,5 @@ } -static int config_space_write_16( +static errno_t config_space_write_16( ddf_fun_t *fun, uint32_t address, uint16_t data) { @@ -172,5 +172,5 @@ } -static int config_space_write_8( +static errno_t config_space_write_8( ddf_fun_t *fun, uint32_t address, uint8_t data) { @@ -181,5 +181,5 @@ } -static int config_space_read_32( +static errno_t config_space_read_32( ddf_fun_t *fun, uint32_t address, uint32_t *data) { @@ -190,5 +190,5 @@ } -static int config_space_read_16( +static errno_t config_space_read_16( ddf_fun_t *fun, uint32_t address, uint16_t *data) { @@ -199,5 +199,5 @@ } -static int config_space_read_8( +static errno_t config_space_read_8( ddf_fun_t *fun, uint32_t address, uint8_t *data) { @@ -234,7 +234,7 @@ }; -static int pci_dev_add(ddf_dev_t *); -static int pci_fun_online(ddf_fun_t *); -static int pci_fun_offline(ddf_fun_t *); +static errno_t pci_dev_add(ddf_dev_t *); +static errno_t pci_fun_online(ddf_fun_t *); +static errno_t pci_fun_offline(ddf_fun_t *); /** PCI bus driver standard operations */ @@ -382,5 +382,5 @@ void pci_fun_create_match_ids(pci_fun_t *fun) { - int rc; + errno_t rc; int ret; char match_id_str[ID_MAX_STR_LEN]; @@ -602,5 +602,5 @@ { pci_fun_t *fun; - int rc; + errno_t rc; int child_bus = 0; @@ -684,5 +684,5 @@ } -static int pci_dev_add(ddf_dev_t *dnode) +static errno_t pci_dev_add(ddf_dev_t *dnode) { hw_resource_list_t hw_resources; @@ -691,5 +691,5 @@ bool got_res = false; async_sess_t *sess; - int rc; + errno_t rc; ddf_msg(LVL_DEBUG, "pci_dev_add"); @@ -810,5 +810,5 @@ } -static int pci_fun_online(ddf_fun_t *fun) +static errno_t pci_fun_online(ddf_fun_t *fun) { ddf_msg(LVL_DEBUG, "pci_fun_online()"); @@ -816,5 +816,5 @@ } -static int pci_fun_offline(ddf_fun_t *fun) +static errno_t pci_fun_offline(ddf_fun_t *fun) { ddf_msg(LVL_DEBUG, "pci_fun_offline()"); Index: uspace/drv/bus/usb/ehci/ehci_bus.h =================================================================== --- uspace/drv/bus/usb/ehci/ehci_bus.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/bus/usb/ehci/ehci_bus.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -72,5 +72,5 @@ void ehci_bus_prepare_ops(void); -int ehci_bus_init(ehci_bus_t *, hc_t *); +errno_t ehci_bus_init(ehci_bus_t *, hc_t *); /** Get and convert assigned ehci_endpoint_t structure Index: uspace/drv/bus/usb/ehci/ehci_rh.c =================================================================== --- uspace/drv/bus/usb/ehci/ehci_rh.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/bus/usb/ehci/ehci_rh.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -99,5 +99,5 @@ * initializes internal virtual hub. */ -int ehci_rh_init(ehci_rh_t *instance, ehci_caps_regs_t *caps, ehci_regs_t *regs, +errno_t ehci_rh_init(ehci_rh_t *instance, ehci_caps_regs_t *caps, ehci_regs_t *regs, fibril_mutex_t *guard, const char *name) { @@ -141,5 +141,5 @@ * status change requests might be postponed until there is something to report. */ -int ehci_rh_schedule(ehci_rh_t *instance, usb_transfer_batch_t *batch) +errno_t ehci_rh_schedule(ehci_rh_t *instance, usb_transfer_batch_t *batch) { assert(instance); @@ -184,5 +184,5 @@ * processing of a postponed request. */ -int ehci_rh_interrupt(ehci_rh_t *instance) +errno_t ehci_rh_interrupt(ehci_rh_t *instance) { fibril_mutex_lock(instance->guard); @@ -231,5 +231,5 @@ * @return Error code. */ -static int req_get_status(usbvirt_device_t *device, +static errno_t req_get_status(usbvirt_device_t *device, const usb_device_request_setup_packet_t *setup_packet, uint8_t *data, size_t *act_size) @@ -254,5 +254,5 @@ * @return Error code. */ -static int req_clear_hub_feature(usbvirt_device_t *device, +static errno_t req_clear_hub_feature(usbvirt_device_t *device, const usb_device_request_setup_packet_t *setup_packet, uint8_t *data, size_t *act_size) @@ -282,5 +282,5 @@ * @return Error code. */ -static int req_get_port_status(usbvirt_device_t *device, +static errno_t req_get_port_status(usbvirt_device_t *device, const usb_device_request_setup_packet_t *setup_packet, uint8_t *data, size_t *act_size) @@ -325,5 +325,5 @@ } ehci_rh_job_t; -static int stop_reset(void *arg) +static errno_t stop_reset(void *arg) { ehci_rh_job_t *job = arg; @@ -354,5 +354,5 @@ } -static int stop_resume(void *arg) +static errno_t stop_resume(void *arg) { ehci_rh_job_t *job = arg; @@ -367,5 +367,5 @@ } -static int delayed_job(int (*func)(void*), ehci_rh_t *rh, unsigned port) +static errno_t delayed_job(errno_t (*func)(void*), ehci_rh_t *rh, unsigned port) { ehci_rh_job_t *job = malloc(sizeof(*job)); @@ -393,5 +393,5 @@ * @return Error code. */ -static int req_clear_port_feature(usbvirt_device_t *device, +static errno_t req_clear_port_feature(usbvirt_device_t *device, const usb_device_request_setup_packet_t *setup_packet, uint8_t *data, size_t *act_size) @@ -472,5 +472,5 @@ * @return Error code. */ -static int req_set_port_feature(usbvirt_device_t *device, +static errno_t req_set_port_feature(usbvirt_device_t *device, const usb_device_request_setup_packet_t *setup_packet, uint8_t *data, size_t *act_size) @@ -521,5 +521,5 @@ * only need 1 byte. */ -static int req_status_change_handler(usbvirt_device_t *device, +static errno_t req_status_change_handler(usbvirt_device_t *device, usb_endpoint_t endpoint, usb_transfer_type_t tr_type, void *buffer, size_t buffer_size, size_t *actual_size) Index: uspace/drv/bus/usb/ehci/ehci_rh.h =================================================================== --- uspace/drv/bus/usb/ehci/ehci_rh.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/bus/usb/ehci/ehci_rh.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -79,8 +79,8 @@ } ehci_rh_t; -int ehci_rh_init(ehci_rh_t *instance, ehci_caps_regs_t *caps, ehci_regs_t *regs, +errno_t ehci_rh_init(ehci_rh_t *instance, ehci_caps_regs_t *caps, ehci_regs_t *regs, fibril_mutex_t *guard, const char *name); -int ehci_rh_schedule(ehci_rh_t *instance, usb_transfer_batch_t *batch); -int ehci_rh_interrupt(ehci_rh_t *instance); +errno_t ehci_rh_schedule(ehci_rh_t *instance, usb_transfer_batch_t *batch); +errno_t ehci_rh_interrupt(ehci_rh_t *instance); /** Get EHCI rh address. Index: uspace/drv/bus/usb/ehci/endpoint_list.c =================================================================== --- uspace/drv/bus/usb/ehci/endpoint_list.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/bus/usb/ehci/endpoint_list.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -50,5 +50,5 @@ * Allocates memory for internal ed_t structure. */ -int endpoint_list_init(endpoint_list_t *instance, const char *name) +errno_t endpoint_list_init(endpoint_list_t *instance, const char *name) { assert(instance); Index: uspace/drv/bus/usb/ehci/endpoint_list.h =================================================================== --- uspace/drv/bus/usb/ehci/endpoint_list.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/bus/usb/ehci/endpoint_list.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -68,5 +68,5 @@ } -int endpoint_list_init(endpoint_list_t *instance, const char *name); +errno_t endpoint_list_init(endpoint_list_t *instance, const char *name); void endpoint_list_chain(endpoint_list_t *instance, const endpoint_list_t *next); void endpoint_list_append_ep(endpoint_list_t *instance, ehci_endpoint_t *ep); Index: uspace/drv/bus/usb/ehci/hc.c =================================================================== --- uspace/drv/bus/usb/ehci/hc.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/bus/usb/ehci/hc.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -89,5 +89,5 @@ }; -static int hc_init_memory(hc_t *instance); +static errno_t hc_init_memory(hc_t *instance); /** Generate IRQ code. @@ -99,5 +99,5 @@ * @return Error code. */ -int hc_gen_irq_code(irq_code_t *code, hc_device_t *hcd, const hw_res_list_parsed_t *hw_res, int *irq) +errno_t hc_gen_irq_code(irq_code_t *code, hc_device_t *hcd, const hw_res_list_parsed_t *hw_res, int *irq) { assert(code); @@ -151,5 +151,5 @@ * @return Error code */ -int hc_add(hc_device_t *hcd, const hw_res_list_parsed_t *hw_res) +errno_t hc_add(hc_device_t *hcd, const hw_res_list_parsed_t *hw_res) { hc_t *instance = hcd_to_hc(hcd); @@ -160,5 +160,5 @@ return EINVAL; - int ret = pio_enable_range(&hw_res->mem_ranges.ranges[0], + errno_t ret = pio_enable_range(&hw_res->mem_ranges.ranges[0], (void **)&instance->caps); if (ret != EOK) { @@ -265,5 +265,5 @@ } -int ehci_hc_status(bus_t *bus_base, uint32_t *status) +errno_t ehci_hc_status(bus_t *bus_base, uint32_t *status) { assert(bus_base); @@ -289,5 +289,5 @@ * @return Error code. */ -int ehci_hc_schedule(usb_transfer_batch_t *batch) +errno_t ehci_hc_schedule(usb_transfer_batch_t *batch) { assert(batch); @@ -477,10 +477,10 @@ * @return Error code. */ -int hc_init_memory(hc_t *instance) +errno_t hc_init_memory(hc_t *instance) { assert(instance); usb_log_debug2("HC(%p): Initializing Async list(%p).", instance, &instance->async_list); - int ret = endpoint_list_init(&instance->async_list, "ASYNC"); + errno_t ret = endpoint_list_init(&instance->async_list, "ASYNC"); if (ret != EOK) { usb_log_error("HC(%p): Failed to setup ASYNC list: %s", Index: uspace/drv/bus/usb/ehci/hc.h =================================================================== --- uspace/drv/bus/usb/ehci/hc.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/bus/usb/ehci/hc.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -100,14 +100,14 @@ /* Boottime operations */ -extern int hc_add(hc_device_t *, const hw_res_list_parsed_t *); -extern int hc_start(hc_device_t *); -extern int hc_setup_roothub(hc_device_t *); -extern int hc_gen_irq_code(irq_code_t *, hc_device_t *, const hw_res_list_parsed_t *, int *); -extern int hc_gone(hc_device_t *); +extern errno_t hc_add(hc_device_t *, const hw_res_list_parsed_t *); +extern errno_t hc_start(hc_device_t *); +extern errno_t hc_setup_roothub(hc_device_t *); +extern errno_t hc_gen_irq_code(irq_code_t *, hc_device_t *, const hw_res_list_parsed_t *, int *); +extern errno_t hc_gone(hc_device_t *); /** Runtime operations */ extern void ehci_hc_interrupt(bus_t *, uint32_t); -extern int ehci_hc_status(bus_t *, uint32_t *); -extern int ehci_hc_schedule(usb_transfer_batch_t *); +extern errno_t ehci_hc_status(bus_t *, uint32_t *); +extern errno_t ehci_hc_schedule(usb_transfer_batch_t *); #endif Index: uspace/drv/bus/usb/ehci/hw_struct/transfer_descriptor.c =================================================================== --- uspace/drv/bus/usb/ehci/hw_struct/transfer_descriptor.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/bus/usb/ehci/hw_struct/transfer_descriptor.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -44,5 +44,5 @@ -int td_error(const td_t *td) +errno_t td_error(const td_t *td) { assert(td); Index: uspace/drv/bus/usb/ehci/hw_struct/transfer_descriptor.h =================================================================== --- uspace/drv/bus/usb/ehci/hw_struct/transfer_descriptor.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/bus/usb/ehci/hw_struct/transfer_descriptor.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -97,5 +97,5 @@ } -int td_error(const td_t *td); +errno_t td_error(const td_t *td); void td_init(td_t *td, uintptr_t next_phys, uintptr_t buf, usb_direction_t dir, Index: uspace/drv/bus/usb/ehci/res.c =================================================================== --- uspace/drv/bus/usb/ehci/res.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/bus/usb/ehci/res.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -63,5 +63,5 @@ * @return Error code. */ -static int disable_extended_caps(async_sess_t *parent_sess, unsigned eecp) +static errno_t disable_extended_caps(async_sess_t *parent_sess, unsigned eecp) { /* nothing to do */ @@ -71,5 +71,5 @@ /* Read the first EEC. i.e. Legacy Support register */ uint32_t usblegsup; - int ret = pci_config_space_read_32(parent_sess, + errno_t ret = pci_config_space_read_32(parent_sess, eecp + USBLEGSUP_OFFSET, &usblegsup); if (ret != EOK) { @@ -173,5 +173,5 @@ } -int disable_legacy(hc_device_t *hcd) +errno_t disable_legacy(hc_device_t *hcd) { hc_t *hc = hcd_to_hc(hcd); @@ -182,5 +182,4 @@ usb_log_debug("Disabling EHCI legacy support."); - const uint32_t hcc_params = EHCI_RD(hc->caps->hccparams); Index: uspace/drv/bus/usb/ehci/res.h =================================================================== --- uspace/drv/bus/usb/ehci/res.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/bus/usb/ehci/res.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -38,5 +38,5 @@ typedef struct hc_device hc_device_t; -extern int disable_legacy(hc_device_t *); +extern errno_t disable_legacy(hc_device_t *); #endif Index: uspace/drv/bus/usb/ohci/endpoint_list.c =================================================================== --- uspace/drv/bus/usb/ohci/endpoint_list.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/bus/usb/ohci/endpoint_list.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -51,5 +51,5 @@ * Allocates memory for internal ed_t structure. */ -int endpoint_list_init(endpoint_list_t *instance, const char *name) +errno_t endpoint_list_init(endpoint_list_t *instance, const char *name) { assert(instance); Index: uspace/drv/bus/usb/ohci/endpoint_list.h =================================================================== --- uspace/drv/bus/usb/ohci/endpoint_list.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/bus/usb/ohci/endpoint_list.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -71,5 +71,5 @@ } -int endpoint_list_init(endpoint_list_t *instance, const char *name); +errno_t endpoint_list_init(endpoint_list_t *instance, const char *name); void endpoint_list_set_next( const endpoint_list_t *instance, const endpoint_list_t *next); Index: uspace/drv/bus/usb/ohci/hc.c =================================================================== --- uspace/drv/bus/usb/ohci/hc.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/bus/usb/ohci/hc.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -90,6 +90,6 @@ }; -static int hc_init_transfer_lists(hc_t *instance); -static int hc_init_memory(hc_t *instance); +static errno_t hc_init_transfer_lists(hc_t *instance); +static errno_t hc_init_memory(hc_t *instance); /** Generate IRQ code. @@ -102,5 +102,5 @@ * @return Error code. */ -int hc_gen_irq_code(irq_code_t *code, hc_device_t *hcd, const hw_res_list_parsed_t *hw_res, int *irq) +errno_t hc_gen_irq_code(irq_code_t *code, hc_device_t *hcd, const hw_res_list_parsed_t *hw_res, int *irq) { assert(code); @@ -151,5 +151,5 @@ * @return Error code */ -int hc_add(hc_device_t *hcd, const hw_res_list_parsed_t *hw_res) +errno_t hc_add(hc_device_t *hcd, const hw_res_list_parsed_t *hw_res) { hc_t *instance = hcd_to_hc(hcd); @@ -159,5 +159,5 @@ return EINVAL; - int ret = pio_enable_range(&hw_res->mem_ranges.ranges[0], + errno_t ret = pio_enable_range(&hw_res->mem_ranges.ranges[0], (void **) &instance->registers); if (ret != EOK) { @@ -263,5 +263,5 @@ } -int ohci_hc_status(bus_t *bus_base, uint32_t *status) +errno_t ohci_hc_status(bus_t *bus_base, uint32_t *status) { assert(bus_base); @@ -285,5 +285,5 @@ * @return Error code. */ -int ohci_hc_schedule(usb_transfer_batch_t *batch) +errno_t ohci_hc_schedule(usb_transfer_batch_t *batch) { assert(batch); @@ -547,5 +547,5 @@ * @return Error code */ -int hc_init_transfer_lists(hc_t *instance) +errno_t hc_init_transfer_lists(hc_t *instance) { assert(instance); @@ -553,5 +553,5 @@ do { \ const char *name = usb_str_transfer_type(type); \ - const int ret = endpoint_list_init(&instance->lists[type], name); \ + const errno_t ret = endpoint_list_init(&instance->lists[type], name); \ if (ret != EOK) { \ usb_log_error("Failed to setup %s endpoint list: %s.", \ @@ -581,5 +581,5 @@ * @return Error code. */ -int hc_init_memory(hc_t *instance) +errno_t hc_init_memory(hc_t *instance) { assert(instance); @@ -587,5 +587,5 @@ memset(&instance->rh, 0, sizeof(instance->rh)); /* Init queues */ - int ret = hc_init_transfer_lists(instance); + errno_t ret = hc_init_transfer_lists(instance); if (ret != EOK) { return ret; Index: uspace/drv/bus/usb/ohci/hc.h =================================================================== --- uspace/drv/bus/usb/ohci/hc.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/bus/usb/ohci/hc.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -89,16 +89,16 @@ } -extern int hc_add(hc_device_t *, const hw_res_list_parsed_t *); -extern int hc_gen_irq_code(irq_code_t *, hc_device_t *, const hw_res_list_parsed_t *, int *); -extern int hc_gain_control(hc_device_t *); -extern int hc_start(hc_device_t *); -extern int hc_setup_roothub(hc_device_t *); -extern int hc_gone(hc_device_t *); +extern errno_t hc_add(hc_device_t *, const hw_res_list_parsed_t *); +extern errno_t hc_gen_irq_code(irq_code_t *, hc_device_t *, const hw_res_list_parsed_t *, int *); +extern errno_t hc_gain_control(hc_device_t *); +extern errno_t hc_start(hc_device_t *); +extern errno_t hc_setup_roothub(hc_device_t *); +extern errno_t hc_gone(hc_device_t *); extern void hc_enqueue_endpoint(hc_t *, const endpoint_t *); extern void hc_dequeue_endpoint(hc_t *, const endpoint_t *); -extern int ohci_hc_schedule(usb_transfer_batch_t *); -extern int ohci_hc_status(bus_t *, uint32_t *); +extern errno_t ohci_hc_schedule(usb_transfer_batch_t *); +extern errno_t ohci_hc_status(bus_t *, uint32_t *); extern void ohci_hc_interrupt(bus_t *, uint32_t); Index: uspace/drv/bus/usb/ohci/hw_struct/completion_codes.h =================================================================== --- uspace/drv/bus/usb/ohci/hw_struct/completion_codes.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/bus/usb/ohci/hw_struct/completion_codes.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -54,5 +54,5 @@ }; -inline static int cc_to_rc(unsigned int cc) +inline static errno_t cc_to_rc(unsigned int cc) { switch (cc) { Index: uspace/drv/bus/usb/ohci/hw_struct/transfer_descriptor.h =================================================================== --- uspace/drv/bus/usb/ohci/hw_struct/transfer_descriptor.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/bus/usb/ohci/hw_struct/transfer_descriptor.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -119,5 +119,5 @@ * @return Error code. */ -static inline int td_error(const td_t *instance) +static inline errno_t td_error(const td_t *instance) { assert(instance); Index: uspace/drv/bus/usb/ohci/ohci_bus.h =================================================================== --- uspace/drv/bus/usb/ohci/ohci_bus.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/bus/usb/ohci/ohci_bus.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -65,5 +65,5 @@ } ohci_bus_t; -int ohci_bus_init(ohci_bus_t *, hc_t *); +errno_t ohci_bus_init(ohci_bus_t *, hc_t *); void ohci_ep_toggle_reset(endpoint_t *); Index: uspace/drv/bus/usb/ohci/ohci_rh.c =================================================================== --- uspace/drv/bus/usb/ohci/ohci_rh.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/bus/usb/ohci/ohci_rh.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -109,5 +109,5 @@ * initializes internal virtual hub. */ -int ohci_rh_init(ohci_rh_t *instance, ohci_regs_t *regs, +errno_t ohci_rh_init(ohci_rh_t *instance, ohci_regs_t *regs, fibril_mutex_t *guard, const char *name) { @@ -176,5 +176,5 @@ * status change requests might be postponed until there is something to report. */ -int ohci_rh_schedule(ohci_rh_t *instance, usb_transfer_batch_t *batch) +errno_t ohci_rh_schedule(ohci_rh_t *instance, usb_transfer_batch_t *batch) { assert(instance); @@ -214,5 +214,5 @@ * processing of a postponed request. */ -int ohci_rh_interrupt(ohci_rh_t *instance) +errno_t ohci_rh_interrupt(ohci_rh_t *instance) { fibril_mutex_lock(instance->guard); @@ -259,5 +259,5 @@ * @return Error code. */ -static int req_get_status(usbvirt_device_t *device, +static errno_t req_get_status(usbvirt_device_t *device, const usb_device_request_setup_packet_t *setup_packet, uint8_t *data, size_t *act_size) @@ -282,5 +282,5 @@ * @return Error code. */ -static int req_clear_hub_feature(usbvirt_device_t *device, +static errno_t req_clear_hub_feature(usbvirt_device_t *device, const usb_device_request_setup_packet_t *setup_packet, uint8_t *data, size_t *act_size) @@ -312,5 +312,5 @@ * @return Error code. */ -static int req_get_port_status(usbvirt_device_t *device, +static errno_t req_get_port_status(usbvirt_device_t *device, const usb_device_request_setup_packet_t *setup_packet, uint8_t *data, size_t *act_size) @@ -336,5 +336,5 @@ * @return Error code. */ -static int req_clear_port_feature(usbvirt_device_t *device, +static errno_t req_clear_port_feature(usbvirt_device_t *device, const usb_device_request_setup_packet_t *setup_packet, uint8_t *data, size_t *act_size) @@ -400,5 +400,5 @@ * @return Error code. */ -static int req_set_port_feature(usbvirt_device_t *device, +static errno_t req_set_port_feature(usbvirt_device_t *device, const usb_device_request_setup_packet_t *setup_packet, uint8_t *data, size_t *act_size) @@ -451,5 +451,5 @@ * only need 1 byte. */ -static int req_status_change_handler(usbvirt_device_t *device, +static errno_t req_status_change_handler(usbvirt_device_t *device, usb_endpoint_t endpoint, usb_transfer_type_t tr_type, void *buffer, size_t buffer_size, size_t *actual_size) Index: uspace/drv/bus/usb/ohci/ohci_rh.h =================================================================== --- uspace/drv/bus/usb/ohci/ohci_rh.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/bus/usb/ohci/ohci_rh.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -66,7 +66,7 @@ } ohci_rh_t; -int ohci_rh_init(ohci_rh_t *, ohci_regs_t *, fibril_mutex_t *, const char *); -int ohci_rh_schedule(ohci_rh_t *instance, usb_transfer_batch_t *batch); -int ohci_rh_interrupt(ohci_rh_t *instance); +errno_t ohci_rh_init(ohci_rh_t *, ohci_regs_t *, fibril_mutex_t *, const char *); +errno_t ohci_rh_schedule(ohci_rh_t *instance, usb_transfer_batch_t *batch); +errno_t ohci_rh_interrupt(ohci_rh_t *instance); /** Get OHCI rh address. Index: uspace/drv/bus/usb/uhci/hc.c =================================================================== --- uspace/drv/bus/usb/uhci/hc.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/bus/usb/uhci/hc.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -97,8 +97,8 @@ static void hc_init_hw(const hc_t *instance); -static int hc_init_mem_structures(hc_t *instance); -static int hc_init_transfer_lists(hc_t *instance); - -static int hc_debug_checker(void *arg); +static errno_t hc_init_mem_structures(hc_t *instance); +static errno_t hc_init_transfer_lists(hc_t *instance); + +static errno_t hc_debug_checker(void *arg); @@ -110,5 +110,5 @@ * @return Error code. */ -int hc_gen_irq_code(irq_code_t *code, hc_device_t *hcd, const hw_res_list_parsed_t *hw_res, int *irq) +errno_t hc_gen_irq_code(irq_code_t *code, hc_device_t *hcd, const hw_res_list_parsed_t *hw_res, int *irq) { assert(code); @@ -207,5 +207,5 @@ * interrupt fibrils. */ -int hc_add(hc_device_t *hcd, const hw_res_list_parsed_t *hw_res) +errno_t hc_add(hc_device_t *hcd, const hw_res_list_parsed_t *hw_res) { hc_t *instance = hcd_to_hc(hcd); @@ -218,5 +218,5 @@ /* allow access to hc control registers */ - int ret = pio_enable_range(&hw_res->io_ranges.ranges[0], + errno_t ret = pio_enable_range(&hw_res->io_ranges.ranges[0], (void **) &instance->registers); if (ret != EOK) { @@ -327,9 +327,9 @@ } -static int endpoint_register(endpoint_t *ep) +static errno_t endpoint_register(endpoint_t *ep) { hc_t * const hc = bus_to_hc(endpoint_get_bus(ep)); - const int err = usb2_bus_endpoint_register(&hc->bus_helper, ep); + const errno_t err = usb2_bus_endpoint_register(&hc->bus_helper, ep); if (err) return err; @@ -449,5 +449,5 @@ * - frame list page (needs to be one UHCI hw accessible 4K page) */ -int hc_init_mem_structures(hc_t *instance) +errno_t hc_init_mem_structures(hc_t *instance) { assert(instance); @@ -468,5 +468,5 @@ /* Init transfer lists */ - int ret = hc_init_transfer_lists(instance); + errno_t ret = hc_init_transfer_lists(instance); if (ret != EOK) { usb_log_error("Failed to initialize transfer lists."); @@ -498,10 +498,10 @@ * USB scheduling. Sets pointer table for quick access. */ -int hc_init_transfer_lists(hc_t *instance) +errno_t hc_init_transfer_lists(hc_t *instance) { assert(instance); #define SETUP_TRANSFER_LIST(type, name) \ do { \ - int ret = transfer_list_init(&instance->transfers_##type, name); \ + errno_t ret = transfer_list_init(&instance->transfers_##type, name); \ if (ret != EOK) { \ usb_log_error("Failed to setup %s transfer list: %s.", \ @@ -550,5 +550,5 @@ } -static int hc_status(bus_t *bus, uint32_t *status) +static errno_t hc_status(bus_t *bus, uint32_t *status) { hc_t *instance = bus_to_hc(bus); @@ -571,5 +571,5 @@ * @return Error code */ -static int hc_schedule(usb_transfer_batch_t *batch) +static errno_t hc_schedule(usb_transfer_batch_t *batch) { uhci_transfer_batch_t *uhci_batch = uhci_transfer_batch_get(batch); @@ -586,5 +586,5 @@ return ENOTSUP; - int err; + errno_t err; if ((err = uhci_transfer_batch_prepare(uhci_batch))) return err; @@ -598,5 +598,5 @@ * @return EOK (should never return) */ -int hc_debug_checker(void *arg) +errno_t hc_debug_checker(void *arg) { hc_t *instance = arg; Index: uspace/drv/bus/usb/uhci/hc.h =================================================================== --- uspace/drv/bus/usb/uhci/hc.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/bus/usb/uhci/hc.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -157,9 +157,9 @@ int hc_unschedule_batch(usb_transfer_batch_t *); -extern int hc_add(hc_device_t *, const hw_res_list_parsed_t *); -extern int hc_gen_irq_code(irq_code_t *, hc_device_t *, const hw_res_list_parsed_t *, int *); -extern int hc_start(hc_device_t *); -extern int hc_setup_roothub(hc_device_t *); -extern int hc_gone(hc_device_t *); +extern errno_t hc_add(hc_device_t *, const hw_res_list_parsed_t *); +extern errno_t hc_gen_irq_code(irq_code_t *, hc_device_t *, const hw_res_list_parsed_t *, int *); +extern errno_t hc_start(hc_device_t *); +extern errno_t hc_setup_roothub(hc_device_t *); +extern errno_t hc_gone(hc_device_t *); #endif Index: uspace/drv/bus/usb/uhci/hw_struct/transfer_descriptor.c =================================================================== --- uspace/drv/bus/usb/uhci/hw_struct/transfer_descriptor.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/bus/usb/uhci/hw_struct/transfer_descriptor.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -119,5 +119,5 @@ * @return Error code. */ -int td_status(const td_t *instance) +errno_t td_status(const td_t *instance) { assert(instance); Index: uspace/drv/bus/usb/uhci/hw_struct/transfer_descriptor.h =================================================================== --- uspace/drv/bus/usb/uhci/hw_struct/transfer_descriptor.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/bus/usb/uhci/hw_struct/transfer_descriptor.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -102,5 +102,5 @@ const void *buffer, const td_t *next); -int td_status(const td_t *instance); +errno_t td_status(const td_t *instance); void td_print_status(const td_t *instance); Index: uspace/drv/bus/usb/uhci/main.c =================================================================== --- uspace/drv/bus/usb/uhci/main.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/bus/usb/uhci/main.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -49,5 +49,5 @@ #define NAME "uhci" -static int disable_legacy(hc_device_t *); +static errno_t disable_legacy(hc_device_t *); static const hc_driver_t uhci_driver = { @@ -67,5 +67,5 @@ * @return Error code. */ -static int disable_legacy(hc_device_t *hcd) +static errno_t disable_legacy(hc_device_t *hcd) { assert(hcd); Index: uspace/drv/bus/usb/uhci/transfer_list.c =================================================================== --- uspace/drv/bus/usb/uhci/transfer_list.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/bus/usb/uhci/transfer_list.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -55,5 +55,5 @@ * Allocates memory for internal qh_t structure. */ -int transfer_list_init(transfer_list_t *instance, const char *name) +errno_t transfer_list_init(transfer_list_t *instance, const char *name) { assert(instance); Index: uspace/drv/bus/usb/uhci/transfer_list.h =================================================================== --- uspace/drv/bus/usb/uhci/transfer_list.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/bus/usb/uhci/transfer_list.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -57,7 +57,7 @@ void transfer_list_fini(transfer_list_t *); -int transfer_list_init(transfer_list_t *, const char *); +errno_t transfer_list_init(transfer_list_t *, const char *); void transfer_list_set_next(transfer_list_t *, transfer_list_t *); -int transfer_list_add_batch(transfer_list_t *, uhci_transfer_batch_t *); +errno_t transfer_list_add_batch(transfer_list_t *, uhci_transfer_batch_t *); void transfer_list_remove_batch(transfer_list_t *, uhci_transfer_batch_t *); void transfer_list_check_finished(transfer_list_t *); Index: uspace/drv/bus/usb/uhci/uhci_rh.c =================================================================== --- uspace/drv/bus/usb/uhci/uhci_rh.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/bus/usb/uhci/uhci_rh.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -79,5 +79,5 @@ * @return Error code, EOK on success. */ -int uhci_rh_init(uhci_rh_t *instance, ioport16_t *ports, const char *name) +errno_t uhci_rh_init(uhci_rh_t *instance, ioport16_t *ports, const char *name) { assert(instance); @@ -99,5 +99,5 @@ * not have to be. */ -int uhci_rh_schedule(uhci_rh_t *instance, usb_transfer_batch_t *batch) +errno_t uhci_rh_schedule(uhci_rh_t *instance, usb_transfer_batch_t *batch) { assert(instance); @@ -189,5 +189,5 @@ * it is usefull for debuging purposes only. */ -static int req_get_port_state(usbvirt_device_t *device, +static errno_t req_get_port_state(usbvirt_device_t *device, const usb_device_request_setup_packet_t *setup_packet, uint8_t *data, size_t *act_size) @@ -224,5 +224,5 @@ * @note: reset change status needs to be handled in sw. */ -static int req_get_port_status(usbvirt_device_t *device, +static errno_t req_get_port_status(usbvirt_device_t *device, const usb_device_request_setup_packet_t *setup_packet, uint8_t *data, size_t *act_size) @@ -263,5 +263,5 @@ * @return Error code. */ -static int req_clear_port_feature(usbvirt_device_t *device, +static errno_t req_clear_port_feature(usbvirt_device_t *device, const usb_device_request_setup_packet_t *setup_packet, uint8_t *data, size_t *act_size) @@ -336,5 +336,5 @@ * @return Error code. */ -static int req_set_port_feature(usbvirt_device_t *device, +static errno_t req_set_port_feature(usbvirt_device_t *device, const usb_device_request_setup_packet_t *setup_packet, uint8_t *data, size_t *act_size) @@ -398,5 +398,5 @@ * only need 1 byte. */ -static int req_status_change_handler(usbvirt_device_t *device, +static errno_t req_status_change_handler(usbvirt_device_t *device, usb_endpoint_t endpoint, usb_transfer_type_t tr_type, void *buffer, size_t buffer_size, size_t *actual_size) Index: uspace/drv/bus/usb/uhci/uhci_rh.h =================================================================== --- uspace/drv/bus/usb/uhci/uhci_rh.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/bus/usb/uhci/uhci_rh.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -56,6 +56,6 @@ } uhci_rh_t; -int uhci_rh_init(uhci_rh_t *instance, ioport16_t *ports, const char *name); -int uhci_rh_schedule(uhci_rh_t *instance, usb_transfer_batch_t *batch); +errno_t uhci_rh_init(uhci_rh_t *instance, ioport16_t *ports, const char *name); +errno_t uhci_rh_schedule(uhci_rh_t *instance, usb_transfer_batch_t *batch); /** Get UHCI rh address. Index: uspace/drv/bus/usb/usbflbk/main.c =================================================================== --- uspace/drv/bus/usb/usbflbk/main.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/bus/usb/usbflbk/main.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -46,5 +46,5 @@ * @return Error code. */ -static int usbfallback_device_add(usb_device_t *dev) +static errno_t usbfallback_device_add(usb_device_t *dev) { usb_log_info("Pretending to control %s `%s'.", @@ -59,5 +59,5 @@ * @return Error code. */ -static int usbfallback_device_gone(usb_device_t *dev) +static errno_t usbfallback_device_gone(usb_device_t *dev) { assert(dev); Index: uspace/drv/bus/usb/usbhub/port.c =================================================================== --- uspace/drv/bus/usb/usbhub/port.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/bus/usb/usbhub/port.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -101,7 +101,7 @@ * Routine for adding a new device in USB2. */ -static int enumerate_device_usb2(usb_hub_port_t *port, async_exch_t *exch) -{ - int err; +static errno_t enumerate_device_usb2(usb_hub_port_t *port, async_exch_t *exch) +{ + errno_t err; port_log(debug, port, "Requesting default address."); @@ -145,7 +145,7 @@ * Routine for adding a new device in USB 3. */ -static int enumerate_device_usb3(usb_hub_port_t *port, async_exch_t *exch) -{ - int err; +static errno_t enumerate_device_usb3(usb_hub_port_t *port, async_exch_t *exch) +{ + errno_t err; port_log(debug, port, "Issuing a warm reset."); @@ -170,5 +170,5 @@ } -static int enumerate_device(usb_port_t *port_base) +static errno_t enumerate_device(usb_port_t *port_base) { usb_hub_port_t *port = get_hub_port(port_base); @@ -181,5 +181,5 @@ } - const int err = port->hub->speed == USB_SPEED_SUPER + const errno_t err = port->hub->speed == USB_SPEED_SUPER ? enumerate_device_usb3(port, exch) : enumerate_device_usb2(port, exch); Index: uspace/drv/bus/usb/usbhub/usbhub.c =================================================================== --- uspace/drv/bus/usb/usbhub/usbhub.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/bus/usb/usbhub/usbhub.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -99,12 +99,12 @@ }; -static int usb_set_first_configuration(usb_device_t *); -static int usb_hub_process_hub_specific_info(usb_hub_dev_t *); +static errno_t usb_set_first_configuration(usb_device_t *); +static errno_t usb_hub_process_hub_specific_info(usb_hub_dev_t *); static void usb_hub_over_current(const usb_hub_dev_t *, usb_hub_status_t); -static int usb_hub_polling_init(usb_hub_dev_t *, usb_endpoint_mapping_t *); +static errno_t usb_hub_polling_init(usb_hub_dev_t *, usb_endpoint_mapping_t *); static void usb_hub_global_interrupt(const usb_hub_dev_t *); static bool usb_hub_polling_error_callback(usb_device_t *dev, - int err_code, void *arg) + errno_t err_code, void *arg) { assert(dev); @@ -125,5 +125,5 @@ * @return error code */ -int usb_hub_device_add(usb_device_t *usb_dev) +errno_t usb_hub_device_add(usb_device_t *usb_dev) { int err; @@ -198,5 +198,5 @@ } -static int usb_hub_cleanup(usb_hub_dev_t *hub) +static errno_t usb_hub_cleanup(usb_hub_dev_t *hub) { free(hub->polling.buffer); @@ -228,5 +228,5 @@ * @return error code */ -int usb_hub_device_remove(usb_device_t *usb_dev) +errno_t usb_hub_device_remove(usb_device_t *usb_dev) { assert(usb_dev); @@ -249,5 +249,5 @@ * @return error code */ -int usb_hub_device_gone(usb_device_t *usb_dev) +errno_t usb_hub_device_gone(usb_device_t *usb_dev) { assert(usb_dev); @@ -270,8 +270,8 @@ * @param mapping The mapping of Status Change Endpoint */ -static int usb_hub_polling_init(usb_hub_dev_t *hub_dev, +static errno_t usb_hub_polling_init(usb_hub_dev_t *hub_dev, usb_endpoint_mapping_t *mapping) { - int err; + errno_t err; usb_polling_t *polling = &hub_dev->polling; @@ -369,5 +369,5 @@ * @return error code */ -static int usb_hub_process_hub_specific_info(usb_hub_dev_t *hub_dev) +static errno_t usb_hub_process_hub_specific_info(usb_hub_dev_t *hub_dev) { assert(hub_dev); @@ -382,5 +382,5 @@ usb_hub_descriptor_header_t descriptor; size_t received_size; - int opResult = usb_request_get_descriptor(control_pipe, + errno_t opResult = usb_request_get_descriptor(control_pipe, USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_DEVICE, desc_type, 0, 0, &descriptor, @@ -436,5 +436,5 @@ * @return error code */ -static int usb_set_first_configuration(usb_device_t *usb_device) +static errno_t usb_set_first_configuration(usb_device_t *usb_device) { assert(usb_device); @@ -462,5 +462,5 @@ /* Set configuration. Use the configuration that was in * usb_device->descriptors.configuration i.e. The first one. */ - int opResult = usb_request_set_configuration( + errno_t opResult = usb_request_set_configuration( usb_device_get_default_pipe(usb_device), config_descriptor->configuration_number); @@ -500,5 +500,5 @@ /* Over-current condition is gone, it is safe to turn the ports on. */ for (size_t port = 0; port < hub_dev->port_count; ++port) { - const int ret = usb_hub_set_port_feature(hub_dev, port, + const errno_t ret = usb_hub_set_port_feature(hub_dev, port, USB_HUB_FEATURE_PORT_POWER); if (ret != EOK) { @@ -637,5 +637,5 @@ /* NOTE: We can't use standard USB GET_STATUS request, because * hubs reply is 4byte instead of 2 */ - const int opResult = usb_pipe_control_read(control_pipe, + const errno_t opResult = usb_pipe_control_read(control_pipe, &get_hub_status_request, sizeof(get_hub_status_request), &status, sizeof(usb_hub_status_t), &rcvd_size); @@ -655,5 +655,5 @@ usb_hub_over_current(hub_dev, status); /* Ack change in hub OC flag */ - const int ret = usb_request_clear_feature( + const errno_t ret = usb_request_clear_feature( control_pipe, USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_DEVICE, @@ -679,5 +679,5 @@ * Just ACK the change. */ - const int ret = usb_request_clear_feature( + const errno_t ret = usb_request_clear_feature( control_pipe, USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_DEVICE, Index: uspace/drv/bus/usb/usbhub/usbhub.h =================================================================== --- uspace/drv/bus/usb/usbhub/usbhub.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/bus/usb/usbhub/usbhub.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -78,17 +78,17 @@ extern const usb_endpoint_description_t *usb_hub_endpoints []; -int usb_hub_device_add(usb_device_t *); -int usb_hub_device_remove(usb_device_t *); -int usb_hub_device_gone(usb_device_t *); +errno_t usb_hub_device_add(usb_device_t *); +errno_t usb_hub_device_remove(usb_device_t *); +errno_t usb_hub_device_gone(usb_device_t *); -int usb_hub_set_depth(const usb_hub_dev_t *); -int usb_hub_get_port_status(const usb_hub_dev_t *, size_t, usb_port_status_t *); -int usb_hub_set_port_feature(const usb_hub_dev_t *, size_t, usb_hub_class_feature_t); -int usb_hub_clear_port_feature(const usb_hub_dev_t *, size_t, usb_hub_class_feature_t); +errno_t usb_hub_set_depth(const usb_hub_dev_t *); +errno_t usb_hub_get_port_status(const usb_hub_dev_t *, size_t, usb_port_status_t *); +errno_t usb_hub_set_port_feature(const usb_hub_dev_t *, size_t, usb_hub_class_feature_t); +errno_t usb_hub_clear_port_feature(const usb_hub_dev_t *, size_t, usb_hub_class_feature_t); bool hub_port_changes_callback(usb_device_t *, uint8_t *, size_t, void *); -int usb_hub_reserve_default_address(usb_hub_dev_t *, async_exch_t *, usb_port_t *); -int usb_hub_release_default_address(usb_hub_dev_t *, async_exch_t *); +errno_t usb_hub_reserve_default_address(usb_hub_dev_t *, async_exch_t *, usb_port_t *); +errno_t usb_hub_release_default_address(usb_hub_dev_t *, async_exch_t *); #endif Index: uspace/drv/bus/usb/usbmid/explore.c =================================================================== --- uspace/drv/bus/usb/usbmid/explore.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/bus/usb/usbmid/explore.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -66,5 +66,5 @@ * @param list List where to add the interfaces. */ -static int create_interfaces(const uint8_t *config_descriptor, +static errno_t create_interfaces(const uint8_t *config_descriptor, size_t config_descriptor_size, list_t *list, usb_device_t *usb_dev) { @@ -111,5 +111,5 @@ usbmid_interface_t *iface = NULL; - const int rc = usbmid_spawn_interface_child(usb_dev, &iface, + const errno_t rc = usbmid_spawn_interface_child(usb_dev, &iface, &usb_device_descriptors(usb_dev)->device, interface); if (rc != EOK) { @@ -134,5 +134,5 @@ * @return Whether to accept this device. */ -int usbmid_explore_device(usb_device_t *dev) +errno_t usbmid_explore_device(usb_device_t *dev) { assert(dev); @@ -157,5 +157,5 @@ /* Select the first configuration */ - int rc = usb_request_set_configuration(usb_device_get_default_pipe(dev), + errno_t rc = usb_request_set_configuration(usb_device_get_default_pipe(dev), config_descriptor->configuration_number); if (rc != EOK) { Index: uspace/drv/bus/usb/usbmid/main.c =================================================================== --- uspace/drv/bus/usb/usbmid/main.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/bus/usb/usbmid/main.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -49,5 +49,5 @@ * @return Error code. */ -static int usbmid_device_add(usb_device_t *dev) +static errno_t usbmid_device_add(usb_device_t *dev) { usb_log_info("Taking care of new MID `%s'.", usb_device_get_name(dev)); @@ -82,5 +82,5 @@ * @return Error code. */ -static int usbmid_device_remove(usb_device_t *dev) +static errno_t usbmid_device_remove(usb_device_t *dev) { assert(dev); @@ -89,5 +89,5 @@ /* Remove ctl function */ - int ret = ddf_fun_unbind(usb_mid->ctl_fun); + errno_t ret = ddf_fun_unbind(usb_mid->ctl_fun); if (ret != EOK) { usb_log_error("Failed to unbind USB MID ctl function: %s.", @@ -103,5 +103,5 @@ /* Tell the child to go offline. */ - int pret = ddf_fun_offline(iface->fun); + errno_t pret = ddf_fun_offline(iface->fun); if (pret != EOK) { usb_log_warning("Failed to turn off child `%s': %s", @@ -118,5 +118,5 @@ * @return Error code. */ -static int usbmid_device_gone(usb_device_t *dev) +static errno_t usbmid_device_gone(usb_device_t *dev) { assert(dev); @@ -127,5 +127,5 @@ /* Remove ctl function */ - int ret = ddf_fun_unbind(usb_mid->ctl_fun); + errno_t ret = ddf_fun_unbind(usb_mid->ctl_fun); if (ret != EOK) { usb_log_error("Failed to unbind USB MID ctl function: %s.", @@ -149,5 +149,5 @@ } -static int usbmid_function_offline(ddf_fun_t *fun) +static errno_t usbmid_function_offline(ddf_fun_t *fun) { usb_device_t *usb_dev = ddf_dev_data_get(ddf_fun_get_dev(fun)); Index: uspace/drv/bus/usb/usbmid/usbmid.c =================================================================== --- uspace/drv/bus/usb/usbmid/usbmid.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/bus/usb/usbmid/usbmid.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -52,5 +52,5 @@ * @return Error code. */ -static int usb_iface_description(ddf_fun_t *fun, usb_device_desc_t *desc) +static errno_t usb_iface_description(ddf_fun_t *fun, usb_device_desc_t *desc) { usbmid_interface_t *iface = ddf_fun_data_get(fun); @@ -64,5 +64,5 @@ usb_device_desc_t tmp_desc; - const int ret = usb_get_my_description(exch, &tmp_desc); + const errno_t ret = usb_get_my_description(exch, &tmp_desc); if (ret == EOK && desc) { @@ -86,9 +86,9 @@ }; -int usbmid_interface_destroy(usbmid_interface_t *mid_iface) +errno_t usbmid_interface_destroy(usbmid_interface_t *mid_iface) { assert(mid_iface); assert_link_not_used(&mid_iface->link); - const int ret = ddf_fun_unbind(mid_iface->fun); + const errno_t ret = ddf_fun_unbind(mid_iface->fun); if (ret != EOK) { return ret; @@ -106,5 +106,5 @@ * @return Error code. */ -int usbmid_spawn_interface_child(usb_device_t *parent, +errno_t usbmid_spawn_interface_child(usb_device_t *parent, usbmid_interface_t **iface_ret, const usb_standard_device_descriptor_t *device_descriptor, @@ -113,5 +113,5 @@ ddf_fun_t *child = NULL; char *child_name = NULL; - int rc; + errno_t rc; /* Index: uspace/drv/bus/usb/usbmid/usbmid.h =================================================================== --- uspace/drv/bus/usb/usbmid/usbmid.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/bus/usb/usbmid/usbmid.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -62,10 +62,10 @@ } usb_mid_t; -extern int usbmid_explore_device(usb_device_t *); -extern int usbmid_spawn_interface_child(usb_device_t *, usbmid_interface_t **, +extern errno_t usbmid_explore_device(usb_device_t *); +extern errno_t usbmid_spawn_interface_child(usb_device_t *, usbmid_interface_t **, const usb_standard_device_descriptor_t *, const usb_standard_interface_descriptor_t *); extern void usbmid_dump_descriptors(uint8_t *, size_t); -extern int usbmid_interface_destroy(usbmid_interface_t *mid_iface); +extern errno_t usbmid_interface_destroy(usbmid_interface_t *mid_iface); static inline usbmid_interface_t * usbmid_interface_from_link(link_t *item) Index: uspace/drv/bus/usb/vhc/conndev.c =================================================================== --- uspace/drv/bus/usb/vhc/conndev.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/bus/usb/vhc/conndev.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -75,6 +75,6 @@ } - int data_request_rc; - int opening_request_rc; + errno_t data_request_rc; + errno_t opening_request_rc; async_wait_for(data_request, &data_request_rc); async_wait_for(opening_request, &opening_request_rc); @@ -102,5 +102,5 @@ if (callback) { - int rc = vhc_virtdev_plug(vhc, callback, &plugged_device_handle); + errno_t rc = vhc_virtdev_plug(vhc, callback, &plugged_device_handle); if (rc != EOK) { async_answer_0(icallid, rc); Index: uspace/drv/bus/usb/vhc/devconn.c =================================================================== --- uspace/drv/bus/usb/vhc/devconn.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/bus/usb/vhc/devconn.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -49,5 +49,5 @@ } -static int vhc_virtdev_plug_generic(vhc_data_t *vhc, +static errno_t vhc_virtdev_plug_generic(vhc_data_t *vhc, async_sess_t *sess, usbvirt_device_t *virtdev, uintptr_t *handle, bool connect, usb_address_t address) @@ -85,15 +85,15 @@ } -int vhc_virtdev_plug(vhc_data_t *vhc, async_sess_t *sess, uintptr_t *handle) +errno_t vhc_virtdev_plug(vhc_data_t *vhc, async_sess_t *sess, uintptr_t *handle) { return vhc_virtdev_plug_generic(vhc, sess, NULL, handle, true, 0); } -int vhc_virtdev_plug_local(vhc_data_t *vhc, usbvirt_device_t *dev, uintptr_t *handle) +errno_t vhc_virtdev_plug_local(vhc_data_t *vhc, usbvirt_device_t *dev, uintptr_t *handle) { return vhc_virtdev_plug_generic(vhc, NULL, dev, handle, true, 0); } -int vhc_virtdev_plug_hub(vhc_data_t *vhc, usbvirt_device_t *dev, +errno_t vhc_virtdev_plug_hub(vhc_data_t *vhc, usbvirt_device_t *dev, uintptr_t *handle, usb_address_t address) { Index: uspace/drv/bus/usb/vhc/hub/hub.c =================================================================== --- uspace/drv/bus/usb/vhc/hub/hub.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/bus/usb/vhc/hub/hub.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -63,5 +63,5 @@ static void set_port_status_change(hub_port_t *, hub_status_change_t); static void clear_port_status_change(hub_port_t *, uint16_t); -static int set_port_state_delayed_fibril(void *); +static errno_t set_port_state_delayed_fibril(void *); static void set_port_state_delayed(hub_t *, size_t, suseconds_t, hub_port_state_t, hub_port_state_t); @@ -163,5 +163,5 @@ * @return Error code. */ -int hub_disconnect_device(hub_t *hub, void *device) +errno_t hub_disconnect_device(hub_t *hub, void *device) { size_t index = hub_find_device(hub, device); @@ -461,5 +461,5 @@ * @return Always EOK. */ -static int set_port_state_delayed_fibril(void *arg) +static errno_t set_port_state_delayed_fibril(void *arg) { struct delay_port_state_change *change Index: uspace/drv/bus/usb/vhc/hub/hub.h =================================================================== --- uspace/drv/bus/usb/vhc/hub/hub.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/bus/usb/vhc/hub/hub.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -102,5 +102,5 @@ void hub_init(hub_t *); size_t hub_connect_device(hub_t *, void *); -int hub_disconnect_device(hub_t *, void *); +errno_t hub_disconnect_device(hub_t *, void *); size_t hub_find_device(hub_t *, void *); void hub_acquire(hub_t *); Index: uspace/drv/bus/usb/vhc/hub/virthub.c =================================================================== --- uspace/drv/bus/usb/vhc/hub/virthub.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/bus/usb/vhc/hub/virthub.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -147,5 +147,5 @@ * @return Error code. */ -int virthub_init(usbvirt_device_t *dev, const char* name) +errno_t virthub_init(usbvirt_device_t *dev, const char* name) { if (dev == NULL) { @@ -197,5 +197,5 @@ * @return Error code. */ -int virthub_disconnect_device(usbvirt_device_t *dev, vhc_virtdev_t *conn) +errno_t virthub_disconnect_device(usbvirt_device_t *dev, vhc_virtdev_t *conn) { assert(dev != NULL); Index: uspace/drv/bus/usb/vhc/hub/virthub.h =================================================================== --- uspace/drv/bus/usb/vhc/hub/virthub.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/bus/usb/vhc/hub/virthub.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -80,7 +80,7 @@ extern hub_descriptor_t hub_descriptor; -int virthub_init(usbvirt_device_t *, const char *name); +errno_t virthub_init(usbvirt_device_t *, const char *name); int virthub_connect_device(usbvirt_device_t *, vhc_virtdev_t *); -int virthub_disconnect_device(usbvirt_device_t *, vhc_virtdev_t *); +errno_t virthub_disconnect_device(usbvirt_device_t *, vhc_virtdev_t *); bool virthub_is_device_enabled(usbvirt_device_t *, vhc_virtdev_t *); void virthub_get_status(usbvirt_device_t *, char *, size_t); Index: uspace/drv/bus/usb/vhc/hub/virthubops.c =================================================================== --- uspace/drv/bus/usb/vhc/hub/virthubops.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/bus/usb/vhc/hub/virthubops.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -63,5 +63,5 @@ /** Callback for data request. */ -static int req_on_status_change_pipe(usbvirt_device_t *dev, +static errno_t req_on_status_change_pipe(usbvirt_device_t *dev, usb_endpoint_t endpoint, usb_transfer_type_t tr_type, void *buffer, size_t buffer_size, size_t *actual_size) @@ -109,5 +109,5 @@ * @return Error code. */ -static int req_clear_hub_feature(usbvirt_device_t *dev, +static errno_t req_clear_hub_feature(usbvirt_device_t *dev, const usb_device_request_setup_packet_t *request, uint8_t *data, size_t *act_size) @@ -123,9 +123,9 @@ * @return Error code. */ -static int req_clear_port_feature(usbvirt_device_t *dev, - const usb_device_request_setup_packet_t *request, uint8_t *data, - size_t *act_size) -{ - int rc; +static errno_t req_clear_port_feature(usbvirt_device_t *dev, + const usb_device_request_setup_packet_t *request, uint8_t *data, + size_t *act_size) +{ + errno_t rc; size_t port = request->index - 1; usb_hub_class_feature_t feature = request->value; @@ -203,5 +203,5 @@ * @return Error code. */ -static int req_get_bus_state(usbvirt_device_t *dev, +static errno_t req_get_bus_state(usbvirt_device_t *dev, const usb_device_request_setup_packet_t *request, uint8_t *data, size_t *act_size) @@ -217,5 +217,5 @@ * @return Error code. */ -static int req_get_descriptor(usbvirt_device_t *dev, +static errno_t req_get_descriptor(usbvirt_device_t *dev, const usb_device_request_setup_packet_t *request, uint8_t *data, size_t *act_size) @@ -238,5 +238,5 @@ * @return Error code. */ -static int req_get_hub_status(usbvirt_device_t *dev, +static errno_t req_get_hub_status(usbvirt_device_t *dev, const usb_device_request_setup_packet_t *request, uint8_t *data, size_t *act_size) @@ -257,5 +257,5 @@ * @return Error code. */ -static int req_get_port_status(usbvirt_device_t *dev, +static errno_t req_get_port_status(usbvirt_device_t *dev, const usb_device_request_setup_packet_t *request, uint8_t *data, size_t *act_size) @@ -282,5 +282,5 @@ * @return Error code. */ -static int req_set_hub_feature(usbvirt_device_t *dev, +static errno_t req_set_hub_feature(usbvirt_device_t *dev, const usb_device_request_setup_packet_t *request, uint8_t *data, size_t *act_size) @@ -296,9 +296,9 @@ * @return Error code. */ -static int req_set_port_feature(usbvirt_device_t *dev, - const usb_device_request_setup_packet_t *request, uint8_t *data, - size_t *act_size) -{ - int rc = ENOTSUP; +static errno_t req_set_port_feature(usbvirt_device_t *dev, + const usb_device_request_setup_packet_t *request, uint8_t *data, + size_t *act_size) +{ + errno_t rc = ENOTSUP; size_t port = request->index - 1; usb_hub_class_feature_t feature = request->value; Index: uspace/drv/bus/usb/vhc/main.c =================================================================== --- uspace/drv/bus/usb/vhc/main.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/bus/usb/vhc/main.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -50,5 +50,5 @@ }; -static int vhc_control_node(ddf_dev_t *dev, ddf_fun_t **fun) +static errno_t vhc_control_node(ddf_dev_t *dev, ddf_fun_t **fun) { assert(dev); @@ -64,5 +64,5 @@ } ddf_fun_set_ops(*fun, &vhc_ops); - const int ret = ddf_fun_bind(*fun); + const errno_t ret = ddf_fun_bind(*fun); if (ret != EOK) { ddf_fun_destroy(*fun); @@ -73,8 +73,8 @@ } -static int vhc_dev_add(ddf_dev_t *dev) +static errno_t vhc_dev_add(ddf_dev_t *dev) { /* Initialize generic structures */ - int ret = hcd_ddf_setup_hc(dev, sizeof(vhc_data_t)); + errno_t ret = hcd_ddf_setup_hc(dev, sizeof(vhc_data_t)); if (ret != EOK) { usb_log_error("Failed to init HCD structures: %s.", Index: uspace/drv/bus/usb/vhc/transfer.c =================================================================== --- uspace/drv/bus/usb/vhc/transfer.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/bus/usb/vhc/transfer.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -61,8 +61,8 @@ } -static int process_transfer_local(usb_transfer_batch_t *batch, +static errno_t process_transfer_local(usb_transfer_batch_t *batch, usbvirt_device_t *dev, size_t *actual_data_size) { - int rc; + errno_t rc; const usb_direction_t dir = batch->dir; @@ -97,8 +97,8 @@ } -static int process_transfer_remote(usb_transfer_batch_t *batch, +static errno_t process_transfer_remote(usb_transfer_batch_t *batch, async_sess_t *sess, size_t *actual_data_size) { - int rc; + errno_t rc; const usb_direction_t dir = batch->dir; @@ -146,5 +146,5 @@ static void execute_transfer_callback_and_free(vhc_transfer_t *transfer, - size_t data_transfer_size, int outcome) + size_t data_transfer_size, errno_t outcome) { assert(outcome != ENAK); @@ -192,5 +192,5 @@ }; -int vhc_init(vhc_data_t *instance) +errno_t vhc_init(vhc_data_t *instance) { assert(instance); @@ -203,5 +203,5 @@ } -int vhc_schedule(usb_transfer_batch_t *batch) +errno_t vhc_schedule(usb_transfer_batch_t *batch) { assert(batch); @@ -233,5 +233,5 @@ } -int vhc_transfer_queue_processor(void *arg) +errno_t vhc_transfer_queue_processor(void *arg) { vhc_virtdev_t *dev = arg; @@ -248,5 +248,5 @@ fibril_mutex_unlock(&dev->guard); - int rc = EOK; + errno_t rc = EOK; size_t data_transfer_size = 0; if (dev->dev_sess) { Index: uspace/drv/bus/usb/vhc/vhcd.h =================================================================== --- uspace/drv/bus/usb/vhc/vhcd.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/bus/usb/vhc/vhcd.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -90,12 +90,12 @@ ipc_call_t *icall); -int vhc_virtdev_plug(vhc_data_t *, async_sess_t *, uintptr_t *); -int vhc_virtdev_plug_local(vhc_data_t *, usbvirt_device_t *, uintptr_t *); -int vhc_virtdev_plug_hub(vhc_data_t *, usbvirt_device_t *, uintptr_t *, usb_address_t address); +errno_t vhc_virtdev_plug(vhc_data_t *, async_sess_t *, uintptr_t *); +errno_t vhc_virtdev_plug_local(vhc_data_t *, usbvirt_device_t *, uintptr_t *); +errno_t vhc_virtdev_plug_hub(vhc_data_t *, usbvirt_device_t *, uintptr_t *, usb_address_t address); void vhc_virtdev_unplug(vhc_data_t *, uintptr_t); -int vhc_init(vhc_data_t *); -int vhc_schedule(usb_transfer_batch_t *); -int vhc_transfer_queue_processor(void *arg); +errno_t vhc_init(vhc_data_t *); +errno_t vhc_schedule(usb_transfer_batch_t *); +errno_t vhc_transfer_queue_processor(void *arg); #endif Index: uspace/drv/char/i8042/i8042.c =================================================================== --- uspace/drv/char/i8042/i8042.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/char/i8042/i8042.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -68,6 +68,6 @@ static void i8042_char_conn(ipc_callid_t, ipc_call_t *, void *); -static int i8042_read(chardev_srv_t *, void *, size_t, size_t *); -static int i8042_write(chardev_srv_t *, const void *, size_t, size_t *); +static errno_t i8042_read(chardev_srv_t *, void *, size_t, size_t *); +static errno_t i8042_write(chardev_srv_t *, const void *, size_t, size_t *); static chardev_ops_t i8042_chardev_ops = { @@ -129,5 +129,5 @@ { i8042_t *controller = ddf_dev_data_get(dev); - int rc; + errno_t rc; const uint8_t status = IPC_GET_ARG1(*call); @@ -158,5 +158,5 @@ * */ -int i8042_init(i8042_t *dev, addr_range_t *regs, int irq_kbd, +errno_t i8042_init(i8042_t *dev, addr_range_t *regs, int irq_kbd, int irq_mouse, ddf_dev_t *ddf_dev) { @@ -170,5 +170,5 @@ i8042_regs_t *ar; - int rc; + errno_t rc; bool kbd_bound = false; bool aux_bound = false; @@ -350,5 +350,5 @@ * */ -static int i8042_write(chardev_srv_t *srv, const void *data, size_t size, +static errno_t i8042_write(chardev_srv_t *srv, const void *data, size_t size, size_t *nwr) { @@ -385,5 +385,5 @@ * */ -static int i8042_read(chardev_srv_t *srv, void *dest, size_t size, +static errno_t i8042_read(chardev_srv_t *srv, void *dest, size_t size, size_t *nread) { @@ -391,5 +391,5 @@ size_t p; uint8_t *destp = (uint8_t *)dest; - int rc; + errno_t rc; fibril_mutex_lock(&port->buf_lock); Index: uspace/drv/char/i8042/i8042.h =================================================================== --- uspace/drv/char/i8042/i8042.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/char/i8042/i8042.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -88,5 +88,5 @@ } i8042_t; -extern int i8042_init(i8042_t *, addr_range_t *, int, int, ddf_dev_t *); +extern errno_t i8042_init(i8042_t *, addr_range_t *, int, int, ddf_dev_t *); #endif Index: uspace/drv/char/i8042/main.c =================================================================== --- uspace/drv/char/i8042/main.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/char/i8042/main.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -55,5 +55,5 @@ * */ -static int get_my_registers(ddf_dev_t *dev, addr_range_t *p_io_reg, +static errno_t get_my_registers(ddf_dev_t *dev, addr_range_t *p_io_reg, int *kbd_irq, int *mouse_irq) { @@ -66,5 +66,5 @@ hw_res_list_parsed_t hw_resources; hw_res_list_parsed_init(&hw_resources); - const int ret = hw_res_get_list_parsed(parent_sess, &hw_resources, 0); + const errno_t ret = hw_res_get_list_parsed(parent_sess, &hw_resources, 0); if (ret != EOK) return ret; @@ -96,10 +96,10 @@ * */ -static int i8042_dev_add(ddf_dev_t *device) +static errno_t i8042_dev_add(ddf_dev_t *device) { addr_range_t io_regs; int kbd = 0; int mouse = 0; - int rc; + errno_t rc; if (!device) Index: uspace/drv/char/msim-con/main.c =================================================================== --- uspace/drv/char/msim-con/main.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/char/msim-con/main.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -43,9 +43,9 @@ #define NAME "msim-con" -static int msim_con_dev_add(ddf_dev_t *dev); -static int msim_con_dev_remove(ddf_dev_t *dev); -static int msim_con_dev_gone(ddf_dev_t *dev); -static int msim_con_fun_online(ddf_fun_t *fun); -static int msim_con_fun_offline(ddf_fun_t *fun); +static errno_t msim_con_dev_add(ddf_dev_t *dev); +static errno_t msim_con_dev_remove(ddf_dev_t *dev); +static errno_t msim_con_dev_gone(ddf_dev_t *dev); +static errno_t msim_con_fun_online(ddf_fun_t *fun); +static errno_t msim_con_fun_offline(ddf_fun_t *fun); static driver_ops_t driver_ops = { @@ -62,9 +62,9 @@ }; -static int msim_con_get_res(ddf_dev_t *dev, msim_con_res_t *res) +static errno_t msim_con_get_res(ddf_dev_t *dev, msim_con_res_t *res) { async_sess_t *parent_sess; hw_res_list_parsed_t hw_res; - int rc; + errno_t rc; parent_sess = ddf_dev_parent_sess_get(dev); @@ -97,9 +97,9 @@ } -static int msim_con_dev_add(ddf_dev_t *dev) +static errno_t msim_con_dev_add(ddf_dev_t *dev) { msim_con_t *msim_con; msim_con_res_t res; - int rc; + errno_t rc; ddf_msg(LVL_DEBUG, "msim_con_dev_add(%p)", dev); @@ -122,5 +122,5 @@ } -static int msim_con_dev_remove(ddf_dev_t *dev) +static errno_t msim_con_dev_remove(ddf_dev_t *dev) { msim_con_t *msim_con = (msim_con_t *)ddf_dev_data_get(dev); @@ -131,5 +131,5 @@ } -static int msim_con_dev_gone(ddf_dev_t *dev) +static errno_t msim_con_dev_gone(ddf_dev_t *dev) { msim_con_t *msim_con = (msim_con_t *)ddf_dev_data_get(dev); @@ -140,5 +140,5 @@ } -static int msim_con_fun_online(ddf_fun_t *fun) +static errno_t msim_con_fun_online(ddf_fun_t *fun) { ddf_msg(LVL_DEBUG, "msim_con_fun_online()"); @@ -146,5 +146,5 @@ } -static int msim_con_fun_offline(ddf_fun_t *fun) +static errno_t msim_con_fun_offline(ddf_fun_t *fun) { ddf_msg(LVL_DEBUG, "msim_con_fun_offline()"); Index: uspace/drv/char/msim-con/msim-con.c =================================================================== --- uspace/drv/char/msim-con/msim-con.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/char/msim-con/msim-con.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -43,6 +43,6 @@ static void msim_con_connection(ipc_callid_t, ipc_call_t *, void *); -static int msim_con_read(chardev_srv_t *, void *, size_t, size_t *); -static int msim_con_write(chardev_srv_t *, const void *, size_t, size_t *); +static errno_t msim_con_read(chardev_srv_t *, void *, size_t, size_t *); +static errno_t msim_con_write(chardev_srv_t *, const void *, size_t, size_t *); static chardev_ops_t msim_con_chardev_ops = { @@ -66,5 +66,5 @@ msim_con_t *con = (msim_con_t *) arg; uint8_t c; - int rc; + errno_t rc; fibril_mutex_lock(&con->buf_lock); @@ -80,10 +80,10 @@ /** Add msim console device. */ -int msim_con_add(msim_con_t *con, msim_con_res_t *res) +errno_t msim_con_add(msim_con_t *con, msim_con_res_t *res) { ddf_fun_t *fun = NULL; bool subscribed = false; irq_cmd_t *msim_cmds = NULL; - int rc; + errno_t rc; circ_buf_init(&con->cbuf, con->buf, msim_con_buf_size, 1); @@ -152,5 +152,5 @@ /** Remove msim console device */ -int msim_con_remove(msim_con_t *con) +errno_t msim_con_remove(msim_con_t *con) { return ENOTSUP; @@ -158,5 +158,5 @@ /** Msim console device gone */ -int msim_con_gone(msim_con_t *con) +errno_t msim_con_gone(msim_con_t *con) { return ENOTSUP; @@ -169,5 +169,5 @@ /** Read from msim console device */ -static int msim_con_read(chardev_srv_t *srv, void *buf, size_t size, +static errno_t msim_con_read(chardev_srv_t *srv, void *buf, size_t size, size_t *nread) { @@ -175,5 +175,5 @@ size_t p; uint8_t *bp = (uint8_t *) buf; - int rc; + errno_t rc; fibril_mutex_lock(&con->buf_lock); @@ -197,5 +197,5 @@ /** Write to msim console device */ -static int msim_con_write(chardev_srv_t *srv, const void *data, size_t size, +static errno_t msim_con_write(chardev_srv_t *srv, const void *data, size_t size, size_t *nwr) { Index: uspace/drv/char/msim-con/msim-con.h =================================================================== --- uspace/drv/char/msim-con/msim-con.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/char/msim-con/msim-con.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -70,7 +70,7 @@ } msim_con_t; -extern int msim_con_add(msim_con_t *, msim_con_res_t *); -extern int msim_con_remove(msim_con_t *); -extern int msim_con_gone(msim_con_t *); +extern errno_t msim_con_add(msim_con_t *, msim_con_res_t *); +extern errno_t msim_con_remove(msim_con_t *); +extern errno_t msim_con_gone(msim_con_t *); #endif Index: uspace/drv/char/ns8250/ns8250.c =================================================================== --- uspace/drv/char/ns8250/ns8250.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/char/ns8250/ns8250.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -251,5 +251,5 @@ * @return EOK on success or non-zero error code */ -static int ns8250_read(chardev_srv_t *srv, void *buf, size_t count, size_t *nread) +static errno_t ns8250_read(chardev_srv_t *srv, void *buf, size_t count, size_t *nread) { ns8250_t *ns = srv_ns8250(srv); @@ -295,5 +295,5 @@ * @return EOK on success or non-zero error code */ -static int ns8250_write(chardev_srv_t *srv, const void *buf, size_t count, +static errno_t ns8250_write(chardev_srv_t *srv, const void *buf, size_t count, size_t *nwritten) { @@ -309,6 +309,6 @@ } -static int ns8250_open(chardev_srvs_t *, chardev_srv_t *); -static int ns8250_close(chardev_srv_t *); +static errno_t ns8250_open(chardev_srvs_t *, chardev_srv_t *); +static errno_t ns8250_close(chardev_srv_t *); static void ns8250_default_handler(chardev_srv_t *, ipc_callid_t, ipc_call_t *); @@ -324,6 +324,6 @@ static void ns8250_char_conn(ipc_callid_t, ipc_call_t *, void *); -static int ns8250_dev_add(ddf_dev_t *dev); -static int ns8250_dev_remove(ddf_dev_t *dev); +static errno_t ns8250_dev_add(ddf_dev_t *dev); +static errno_t ns8250_dev_remove(ddf_dev_t *dev); /** The serial port device driver's standard operations. */ @@ -407,7 +407,7 @@ * @return Zero on success, error number otherwise */ -static int ns8250_dev_initialize(ns8250_t *ns) -{ - int ret = EOK; +static errno_t ns8250_dev_initialize(ns8250_t *ns) +{ + errno_t ret = EOK; ddf_msg(LVL_DEBUG, "ns8250_dev_initialize %s", ddf_dev_get_name(ns->dev)); @@ -501,8 +501,8 @@ * @return Zero on success, error number otherwise */ -static int ns8250_interrupt_enable(ns8250_t *ns) +static errno_t ns8250_interrupt_enable(ns8250_t *ns) { /* Enable interrupt using IRC service. */ - int rc = hw_res_enable_interrupt(ns->parent_sess, ns->irq); + errno_t rc = hw_res_enable_interrupt(ns->parent_sess, ns->irq); if (rc != EOK) return EIO; @@ -547,5 +547,5 @@ * if the specified baud_rate is not valid). */ -static int ns8250_port_set_baud_rate(ns8250_regs_t *regs, unsigned int baud_rate) +static errno_t ns8250_port_set_baud_rate(ns8250_regs_t *regs, unsigned int baud_rate) { uint16_t divisor; @@ -646,5 +646,5 @@ * is invalid. */ -static int ns8250_port_set_com_props(ns8250_regs_t *regs, unsigned int parity, +static errno_t ns8250_port_set_com_props(ns8250_regs_t *regs, unsigned int parity, unsigned int word_length, unsigned int stop_bits) { @@ -803,5 +803,5 @@ * @param ns Serial port device */ -static inline int ns8250_register_interrupt_handler(ns8250_t *ns, +static inline errno_t ns8250_register_interrupt_handler(ns8250_t *ns, cap_handle_t *handle) { @@ -814,5 +814,5 @@ * @param ns Serial port device */ -static inline int ns8250_unregister_interrupt_handler(ns8250_t *ns) +static inline errno_t ns8250_unregister_interrupt_handler(ns8250_t *ns) { return unregister_interrupt_handler(ns->dev, ns->irq_cap); @@ -825,5 +825,5 @@ * @param dev The serial port device. */ -static int ns8250_dev_add(ddf_dev_t *dev) +static errno_t ns8250_dev_add(ddf_dev_t *dev) { ns8250_t *ns = NULL; @@ -831,5 +831,5 @@ bool need_cleanup = false; bool need_unreg_intr_handler = false; - int rc; + errno_t rc; ddf_msg(LVL_DEBUG, "ns8250_dev_add %s (handle = %d)", @@ -928,8 +928,8 @@ } -static int ns8250_dev_remove(ddf_dev_t *dev) +static errno_t ns8250_dev_remove(ddf_dev_t *dev) { ns8250_t *ns = dev_ns8250(dev); - int rc; + errno_t rc; fibril_mutex_lock(&ns->mutex); @@ -963,8 +963,8 @@ * @param srv Server-side connection structure */ -static int ns8250_open(chardev_srvs_t *srvs, chardev_srv_t *srv) +static errno_t ns8250_open(chardev_srvs_t *srvs, chardev_srv_t *srv) { ns8250_t *ns = srv_ns8250(srv); - int res; + errno_t res; fibril_mutex_lock(&ns->mutex); @@ -987,5 +987,5 @@ * @param srv Server-side connection structure */ -static int ns8250_close(chardev_srv_t *srv) +static errno_t ns8250_close(chardev_srv_t *srv) { ns8250_t *data = srv_ns8250(srv); @@ -1040,5 +1040,5 @@ * @param stop_bits The number of stop bits to be used. */ -static int ns8250_set_props(ddf_dev_t *dev, unsigned int baud_rate, +static errno_t ns8250_set_props(ddf_dev_t *dev, unsigned int baud_rate, unsigned int parity, unsigned int word_length, unsigned int stop_bits) { @@ -1049,5 +1049,5 @@ ns8250_t *data = dev_ns8250(dev); ns8250_regs_t *regs = data->regs; - int ret; + errno_t ret; fibril_mutex_lock(&data->mutex); @@ -1072,5 +1072,5 @@ ns8250_t *ns8250 = srv_ns8250(srv); sysarg_t method = IPC_GET_IMETHOD(*call); - int ret; + errno_t ret; unsigned int baud_rate, parity, word_length, stop_bits; Index: uspace/drv/char/pl050/pl050.c =================================================================== --- uspace/drv/char/pl050/pl050.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/char/pl050/pl050.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -51,10 +51,10 @@ }; -static int pl050_dev_add(ddf_dev_t *); -static int pl050_fun_online(ddf_fun_t *); -static int pl050_fun_offline(ddf_fun_t *); +static errno_t pl050_dev_add(ddf_dev_t *); +static errno_t pl050_fun_online(ddf_fun_t *); +static errno_t pl050_fun_offline(ddf_fun_t *); static void pl050_char_conn(ipc_callid_t, ipc_call_t *, void *); -static int pl050_read(chardev_srv_t *, void *, size_t, size_t *); -static int pl050_write(chardev_srv_t *, const void *, size_t, size_t *); +static errno_t pl050_read(chardev_srv_t *, void *, size_t, size_t *); +static errno_t pl050_write(chardev_srv_t *, const void *, size_t, size_t *); static driver_ops_t driver_ops = { @@ -158,9 +158,9 @@ } -static int pl050_init(pl050_t *pl050) +static errno_t pl050_init(pl050_t *pl050) { hw_res_list_parsed_t res; void *regs; - int rc; + errno_t rc; fibril_mutex_initialize(&pl050->buf_lock); @@ -237,5 +237,5 @@ } -static int pl050_read(chardev_srv_t *srv, void *buffer, size_t size, +static errno_t pl050_read(chardev_srv_t *srv, void *buffer, size_t size, size_t *nread) { @@ -263,5 +263,5 @@ } -static int pl050_write(chardev_srv_t *srv, const void *data, size_t size, +static errno_t pl050_write(chardev_srv_t *srv, const void *data, size_t size, size_t *nwritten) { @@ -294,10 +294,10 @@ /** Add device. */ -static int pl050_dev_add(ddf_dev_t *dev) +static errno_t pl050_dev_add(ddf_dev_t *dev) { ddf_fun_t *fun_a; pl050_t *pl050 = NULL; const char *mname; - int rc; + errno_t rc; ddf_msg(LVL_DEBUG, "pl050_dev_add()"); @@ -363,5 +363,5 @@ } -static int pl050_fun_online(ddf_fun_t *fun) +static errno_t pl050_fun_online(ddf_fun_t *fun) { ddf_msg(LVL_DEBUG, "pl050_fun_online()"); @@ -369,5 +369,5 @@ } -static int pl050_fun_offline(ddf_fun_t *fun) +static errno_t pl050_fun_offline(ddf_fun_t *fun) { ddf_msg(LVL_DEBUG, "pl050_fun_offline()"); @@ -377,5 +377,5 @@ int main(int argc, char *argv[]) { - int rc; + errno_t rc; printf(NAME ": HelenOS pl050 serial device driver\n"); Index: uspace/drv/char/ski-con/main.c =================================================================== --- uspace/drv/char/ski-con/main.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/char/ski-con/main.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -42,9 +42,9 @@ #define NAME "ski-con" -static int ski_con_dev_add(ddf_dev_t *dev); -static int ski_con_dev_remove(ddf_dev_t *dev); -static int ski_con_dev_gone(ddf_dev_t *dev); -static int ski_con_fun_online(ddf_fun_t *fun); -static int ski_con_fun_offline(ddf_fun_t *fun); +static errno_t ski_con_dev_add(ddf_dev_t *dev); +static errno_t ski_con_dev_remove(ddf_dev_t *dev); +static errno_t ski_con_dev_gone(ddf_dev_t *dev); +static errno_t ski_con_fun_online(ddf_fun_t *fun); +static errno_t ski_con_fun_offline(ddf_fun_t *fun); static driver_ops_t driver_ops = { @@ -61,5 +61,5 @@ }; -static int ski_con_dev_add(ddf_dev_t *dev) +static errno_t ski_con_dev_add(ddf_dev_t *dev) { ski_con_t *ski_con; @@ -77,5 +77,5 @@ } -static int ski_con_dev_remove(ddf_dev_t *dev) +static errno_t ski_con_dev_remove(ddf_dev_t *dev) { ski_con_t *ski_con = (ski_con_t *)ddf_dev_data_get(dev); @@ -86,5 +86,5 @@ } -static int ski_con_dev_gone(ddf_dev_t *dev) +static errno_t ski_con_dev_gone(ddf_dev_t *dev) { ski_con_t *ski_con = (ski_con_t *)ddf_dev_data_get(dev); @@ -95,5 +95,5 @@ } -static int ski_con_fun_online(ddf_fun_t *fun) +static errno_t ski_con_fun_online(ddf_fun_t *fun) { ddf_msg(LVL_DEBUG, "ski_con_fun_online()"); @@ -101,5 +101,5 @@ } -static int ski_con_fun_offline(ddf_fun_t *fun) +static errno_t ski_con_fun_offline(ddf_fun_t *fun) { ddf_msg(LVL_DEBUG, "ski_con_fun_offline()"); Index: uspace/drv/char/ski-con/ski-con.c =================================================================== --- uspace/drv/char/ski-con/ski-con.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/char/ski-con/ski-con.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -48,10 +48,10 @@ #define POLL_INTERVAL 10000 -static int ski_con_fibril(void *arg); +static errno_t ski_con_fibril(void *arg); static int32_t ski_con_getchar(void); static void ski_con_connection(ipc_callid_t, ipc_call_t *, void *); -static int ski_con_read(chardev_srv_t *, void *, size_t, size_t *); -static int ski_con_write(chardev_srv_t *, const void *, size_t, size_t *); +static errno_t ski_con_read(chardev_srv_t *, void *, size_t, size_t *); +static errno_t ski_con_write(chardev_srv_t *, const void *, size_t, size_t *); static chardev_ops_t ski_con_chardev_ops = { @@ -63,10 +63,10 @@ /** Add ski console device. */ -int ski_con_add(ski_con_t *con) +errno_t ski_con_add(ski_con_t *con) { fid_t fid; ddf_fun_t *fun = NULL; bool bound = false; - int rc; + errno_t rc; circ_buf_init(&con->cbuf, con->buf, ski_con_buf_size, 1); @@ -116,5 +116,5 @@ /** Remove ski console device */ -int ski_con_remove(ski_con_t *con) +errno_t ski_con_remove(ski_con_t *con) { return ENOTSUP; @@ -122,5 +122,5 @@ /** Ski console device gone */ -int ski_con_gone(ski_con_t *con) +errno_t ski_con_gone(ski_con_t *con) { return ENOTSUP; @@ -128,9 +128,9 @@ /** Poll Ski for keypresses. */ -static int ski_con_fibril(void *arg) +static errno_t ski_con_fibril(void *arg) { int32_t c; ski_con_t *con = (ski_con_t *) arg; - int rc; + errno_t rc; while (1) { @@ -212,5 +212,5 @@ /** Read from Ski console device */ -static int ski_con_read(chardev_srv_t *srv, void *buf, size_t size, +static errno_t ski_con_read(chardev_srv_t *srv, void *buf, size_t size, size_t *nread) { @@ -218,5 +218,5 @@ size_t p; uint8_t *bp = (uint8_t *) buf; - int rc; + errno_t rc; fibril_mutex_lock(&con->buf_lock); @@ -240,5 +240,5 @@ /** Write to Ski console device */ -static int ski_con_write(chardev_srv_t *srv, const void *data, size_t size, +static errno_t ski_con_write(chardev_srv_t *srv, const void *data, size_t size, size_t *nwr) { Index: uspace/drv/char/ski-con/ski-con.h =================================================================== --- uspace/drv/char/ski-con/ski-con.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/char/ski-con/ski-con.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -58,7 +58,7 @@ } ski_con_t; -extern int ski_con_add(ski_con_t *); -extern int ski_con_remove(ski_con_t *); -extern int ski_con_gone(ski_con_t *); +extern errno_t ski_con_add(ski_con_t *); +extern errno_t ski_con_remove(ski_con_t *); +extern errno_t ski_con_gone(ski_con_t *); #endif Index: uspace/drv/char/sun4v-con/main.c =================================================================== --- uspace/drv/char/sun4v-con/main.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/char/sun4v-con/main.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -40,9 +40,9 @@ #define NAME "sun4v-con" -static int sun4v_con_dev_add(ddf_dev_t *dev); -static int sun4v_con_dev_remove(ddf_dev_t *dev); -static int sun4v_con_dev_gone(ddf_dev_t *dev); -static int sun4v_con_fun_online(ddf_fun_t *fun); -static int sun4v_con_fun_offline(ddf_fun_t *fun); +static errno_t sun4v_con_dev_add(ddf_dev_t *dev); +static errno_t sun4v_con_dev_remove(ddf_dev_t *dev); +static errno_t sun4v_con_dev_gone(ddf_dev_t *dev); +static errno_t sun4v_con_fun_online(ddf_fun_t *fun); +static errno_t sun4v_con_fun_offline(ddf_fun_t *fun); static driver_ops_t driver_ops = { @@ -59,9 +59,9 @@ }; -static int sun4v_con_get_res(ddf_dev_t *dev, sun4v_con_res_t *res) +static errno_t sun4v_con_get_res(ddf_dev_t *dev, sun4v_con_res_t *res) { async_sess_t *parent_sess; hw_res_list_parsed_t hw_res; - int rc; + errno_t rc; parent_sess = ddf_dev_parent_sess_get(dev); @@ -88,9 +88,9 @@ -static int sun4v_con_dev_add(ddf_dev_t *dev) +static errno_t sun4v_con_dev_add(ddf_dev_t *dev) { sun4v_con_t *sun4v_con; sun4v_con_res_t res; - int rc; + errno_t rc; ddf_msg(LVL_DEBUG, "sun4v_con_dev_add(%p)", dev); @@ -112,5 +112,5 @@ } -static int sun4v_con_dev_remove(ddf_dev_t *dev) +static errno_t sun4v_con_dev_remove(ddf_dev_t *dev) { sun4v_con_t *sun4v_con = (sun4v_con_t *)ddf_dev_data_get(dev); @@ -121,5 +121,5 @@ } -static int sun4v_con_dev_gone(ddf_dev_t *dev) +static errno_t sun4v_con_dev_gone(ddf_dev_t *dev) { sun4v_con_t *sun4v_con = (sun4v_con_t *)ddf_dev_data_get(dev); @@ -130,5 +130,5 @@ } -static int sun4v_con_fun_online(ddf_fun_t *fun) +static errno_t sun4v_con_fun_online(ddf_fun_t *fun) { ddf_msg(LVL_DEBUG, "sun4v_con_fun_online()"); @@ -136,5 +136,5 @@ } -static int sun4v_con_fun_offline(ddf_fun_t *fun) +static errno_t sun4v_con_fun_offline(ddf_fun_t *fun) { ddf_msg(LVL_DEBUG, "sun4v_con_fun_offline()"); Index: uspace/drv/char/sun4v-con/sun4v-con.c =================================================================== --- uspace/drv/char/sun4v-con/sun4v-con.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/char/sun4v-con/sun4v-con.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -46,6 +46,6 @@ #define POLL_INTERVAL 10000 -static int sun4v_con_read(chardev_srv_t *, void *, size_t, size_t *); -static int sun4v_con_write(chardev_srv_t *, const void *, size_t, size_t *); +static errno_t sun4v_con_read(chardev_srv_t *, void *, size_t, size_t *); +static errno_t sun4v_con_write(chardev_srv_t *, const void *, size_t, size_t *); static chardev_ops_t sun4v_con_chardev_ops = { @@ -69,8 +69,8 @@ /** Add sun4v console device. */ -int sun4v_con_add(sun4v_con_t *con, sun4v_con_res_t *res) +errno_t sun4v_con_add(sun4v_con_t *con, sun4v_con_res_t *res) { ddf_fun_t *fun = NULL; - int rc; + errno_t rc; con->res = *res; @@ -129,5 +129,5 @@ /** Remove sun4v console device */ -int sun4v_con_remove(sun4v_con_t *con) +errno_t sun4v_con_remove(sun4v_con_t *con) { return ENOTSUP; @@ -135,5 +135,5 @@ /** Msim console device gone */ -int sun4v_con_gone(sun4v_con_t *con) +errno_t sun4v_con_gone(sun4v_con_t *con) { return ENOTSUP; @@ -141,5 +141,5 @@ /** Read from Sun4v console device */ -static int sun4v_con_read(chardev_srv_t *srv, void *buf, size_t size, +static errno_t sun4v_con_read(chardev_srv_t *srv, void *buf, size_t size, size_t *nread) { @@ -165,5 +165,5 @@ /** Write to Sun4v console device */ -static int sun4v_con_write(chardev_srv_t *srv, const void *data, size_t size, +static errno_t sun4v_con_write(chardev_srv_t *srv, const void *data, size_t size, size_t *nwr) { Index: uspace/drv/char/sun4v-con/sun4v-con.h =================================================================== --- uspace/drv/char/sun4v-con/sun4v-con.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/char/sun4v-con/sun4v-con.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -62,7 +62,7 @@ } sun4v_con_t; -extern int sun4v_con_add(sun4v_con_t *, sun4v_con_res_t *); -extern int sun4v_con_remove(sun4v_con_t *); -extern int sun4v_con_gone(sun4v_con_t *); +extern errno_t sun4v_con_add(sun4v_con_t *, sun4v_con_res_t *); +extern errno_t sun4v_con_remove(sun4v_con_t *); +extern errno_t sun4v_con_gone(sun4v_con_t *); #endif Index: uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.c =================================================================== --- uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -56,9 +56,9 @@ -static int change_mode(visualizer_t *vis, vslmode_t mode); -static int handle_damage(visualizer_t *vs, +static errno_t change_mode(visualizer_t *vis, vslmode_t mode); +static errno_t handle_damage(visualizer_t *vs, sysarg_t x0, sysarg_t y0, sysarg_t width, sysarg_t height, sysarg_t x_offset, sysarg_t y_offset); -static int dummy(visualizer_t *vs) +static errno_t dummy(visualizer_t *vs) { return EOK; @@ -115,5 +115,5 @@ } -int amdm37x_dispc_init(amdm37x_dispc_t *instance, visualizer_t *vis) +errno_t amdm37x_dispc_init(amdm37x_dispc_t *instance, visualizer_t *vis) { assert(instance); @@ -134,5 +134,5 @@ } - int ret = pio_enable((void*)AMDM37x_DISPC_BASE_ADDRESS, + errno_t ret = pio_enable((void*)AMDM37x_DISPC_BASE_ADDRESS, AMDM37x_DISPC_SIZE, (void**)&instance->regs); if (ret != EOK) { @@ -152,10 +152,10 @@ }; -int amdm37x_dispc_fini(amdm37x_dispc_t *instance) +errno_t amdm37x_dispc_fini(amdm37x_dispc_t *instance) { return EOK; }; -static int amdm37x_dispc_setup_fb(amdm37x_dispc_regs_t *regs, +static errno_t amdm37x_dispc_setup_fb(amdm37x_dispc_regs_t *regs, unsigned x, unsigned y, unsigned bpp, uint32_t pa) { @@ -260,5 +260,5 @@ } -static int change_mode(visualizer_t *vis, vslmode_t mode) +static errno_t change_mode(visualizer_t *vis, vslmode_t mode) { assert(vis); @@ -276,5 +276,5 @@ uintptr_t pa; void *buffer = AS_AREA_ANY; - int ret = dmamem_map_anonymous(size, DMAMEM_4GiB, + errno_t ret = dmamem_map_anonymous(size, DMAMEM_4GiB, AS_AREA_READ | AS_AREA_WRITE, 0, &pa, &buffer); if (ret != EOK) { @@ -299,5 +299,5 @@ } -static int handle_damage(visualizer_t *vs, +static errno_t handle_damage(visualizer_t *vs, sysarg_t x0, sysarg_t y0, sysarg_t width, sysarg_t height, sysarg_t x_offset, sysarg_t y_offset) Index: uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.h =================================================================== --- uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -62,6 +62,6 @@ } amdm37x_dispc_t; -int amdm37x_dispc_init(amdm37x_dispc_t *instance, visualizer_t *vis); -int amdm37x_dispc_fini(amdm37x_dispc_t *instance); +errno_t amdm37x_dispc_init(amdm37x_dispc_t *instance, visualizer_t *vis); +errno_t amdm37x_dispc_fini(amdm37x_dispc_t *instance); #endif Index: uspace/drv/fb/amdm37x_dispc/main.c =================================================================== --- uspace/drv/fb/amdm37x_dispc/main.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/fb/amdm37x_dispc/main.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -54,5 +54,5 @@ } -static int amdm37x_dispc_dev_add(ddf_dev_t *dev) +static errno_t amdm37x_dispc_dev_add(ddf_dev_t *dev) { assert(dev); @@ -84,5 +84,5 @@ } - int ret = amdm37x_dispc_init(dispc, vis); + errno_t ret = amdm37x_dispc_init(dispc, vis); if (ret != EOK) { ddf_log_error("Failed to init dispc: %s\n", str_error(ret)); Index: uspace/drv/fb/kfb/kfb.c =================================================================== --- uspace/drv/fb/kfb/kfb.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/fb/kfb/kfb.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -40,5 +40,5 @@ #include "kfb.h" -static int kgraph_dev_add(ddf_dev_t *dev) +static errno_t kgraph_dev_add(ddf_dev_t *dev) { port_init(dev); Index: uspace/drv/fb/kfb/port.c =================================================================== --- uspace/drv/fb/kfb/port.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/fb/kfb/port.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -86,5 +86,5 @@ static vslmode_list_element_t pixel_mode; -static int kfb_claim(visualizer_t *vs) +static errno_t kfb_claim(visualizer_t *vs) { return physmem_map(kfb.paddr + kfb.offset, @@ -93,7 +93,7 @@ } -static int kfb_yield(visualizer_t *vs) -{ - int rc; +static errno_t kfb_yield(visualizer_t *vs) +{ + errno_t rc; if (vs->mode_set) { @@ -109,5 +109,5 @@ } -static int kfb_handle_damage_pixels(visualizer_t *vs, +static errno_t kfb_handle_damage_pixels(visualizer_t *vs, sysarg_t x0, sysarg_t y0, sysarg_t width, sysarg_t height, sysarg_t x_offset, sysarg_t y_offset) @@ -137,5 +137,5 @@ } -static int kfb_change_mode(visualizer_t *vs, vslmode_t new_mode) +static errno_t kfb_change_mode(visualizer_t *vs, vslmode_t new_mode) { vs->ops.handle_damage = kfb_handle_damage_pixels; @@ -143,10 +143,10 @@ } -static int kfb_suspend(visualizer_t *vs) -{ - return EOK; -} - -static int kfb_wakeup(visualizer_t *vs) +static errno_t kfb_suspend(visualizer_t *vs) +{ + return EOK; +} + +static errno_t kfb_wakeup(visualizer_t *vs) { return EOK; @@ -165,5 +165,5 @@ { visualizer_t *vsl; - int rc; + errno_t rc; vsl = (visualizer_t *) ddf_fun_data_get((ddf_fun_t *)arg); @@ -177,8 +177,8 @@ } -int port_init(ddf_dev_t *dev) +errno_t port_init(ddf_dev_t *dev) { sysarg_t present; - int rc = sysinfo_get_value("fb", &present); + errno_t rc = sysinfo_get_value("fb", &present); if (rc != EOK) present = false; Index: uspace/drv/fb/kfb/port.h =================================================================== --- uspace/drv/fb/kfb/port.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/fb/kfb/port.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -39,5 +39,5 @@ #include -extern int port_init(ddf_dev_t *); +extern errno_t port_init(ddf_dev_t *); #endif Index: uspace/drv/hid/adb-kbd/adb-kbd.c =================================================================== --- uspace/drv/hid/adb-kbd/adb-kbd.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/hid/adb-kbd/adb-kbd.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -48,7 +48,7 @@ /** Add ADB keyboard device */ -int adb_kbd_add(adb_kbd_t *kbd) -{ - int rc; +errno_t adb_kbd_add(adb_kbd_t *kbd) +{ + errno_t rc; bool bound = false; @@ -119,5 +119,5 @@ /** Remove ADB keyboard device */ -int adb_kbd_remove(adb_kbd_t *con) +errno_t adb_kbd_remove(adb_kbd_t *con) { return ENOTSUP; @@ -125,5 +125,5 @@ /** ADB keyboard device gone */ -int adb_kbd_gone(adb_kbd_t *con) +errno_t adb_kbd_gone(adb_kbd_t *con) { return ENOTSUP; @@ -140,5 +140,5 @@ ipc_callid_t callid = async_get_call(&call); - int retval = EOK; + errno_t retval = EOK; if (!IPC_GET_IMETHOD(call)) { @@ -162,5 +162,5 @@ kbd_event_type_t etype; unsigned int key; - int rc; + errno_t rc; rc = adb_kbd_key_translate(b, &etype, &key); Index: uspace/drv/hid/adb-kbd/adb-kbd.h =================================================================== --- uspace/drv/hid/adb-kbd/adb-kbd.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/hid/adb-kbd/adb-kbd.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -44,7 +44,7 @@ } adb_kbd_t; -extern int adb_kbd_add(adb_kbd_t *); -extern int adb_kbd_remove(adb_kbd_t *); -extern int adb_kbd_gone(adb_kbd_t *); +extern errno_t adb_kbd_add(adb_kbd_t *); +extern errno_t adb_kbd_remove(adb_kbd_t *); +extern errno_t adb_kbd_gone(adb_kbd_t *); #endif Index: uspace/drv/hid/adb-kbd/ctl.c =================================================================== --- uspace/drv/hid/adb-kbd/ctl.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/hid/adb-kbd/ctl.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -179,5 +179,5 @@ * @return EOK on success, ENOENT if no translation exists */ -int adb_kbd_key_translate(sysarg_t scancode, kbd_event_type_t *rtype, +errno_t adb_kbd_key_translate(sysarg_t scancode, kbd_event_type_t *rtype, unsigned int *rkey) { Index: uspace/drv/hid/adb-kbd/ctl.h =================================================================== --- uspace/drv/hid/adb-kbd/ctl.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/hid/adb-kbd/ctl.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -35,5 +35,5 @@ #define CTL_H -extern int adb_kbd_key_translate(sysarg_t, kbd_event_type_t *, unsigned int *); +extern errno_t adb_kbd_key_translate(sysarg_t, kbd_event_type_t *, unsigned int *); #endif Index: uspace/drv/hid/adb-kbd/main.c =================================================================== --- uspace/drv/hid/adb-kbd/main.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/hid/adb-kbd/main.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -42,9 +42,9 @@ #define NAME "adb-kbd" -static int adb_kbd_dev_add(ddf_dev_t *dev); -static int adb_kbd_dev_remove(ddf_dev_t *dev); -static int adb_kbd_dev_gone(ddf_dev_t *dev); -static int adb_kbd_fun_online(ddf_fun_t *fun); -static int adb_kbd_fun_offline(ddf_fun_t *fun); +static errno_t adb_kbd_dev_add(ddf_dev_t *dev); +static errno_t adb_kbd_dev_remove(ddf_dev_t *dev); +static errno_t adb_kbd_dev_gone(ddf_dev_t *dev); +static errno_t adb_kbd_fun_online(ddf_fun_t *fun); +static errno_t adb_kbd_fun_offline(ddf_fun_t *fun); static driver_ops_t driver_ops = { @@ -61,5 +61,5 @@ }; -static int adb_kbd_dev_add(ddf_dev_t *dev) +static errno_t adb_kbd_dev_add(ddf_dev_t *dev) { adb_kbd_t *adb_kbd; @@ -77,5 +77,5 @@ } -static int adb_kbd_dev_remove(ddf_dev_t *dev) +static errno_t adb_kbd_dev_remove(ddf_dev_t *dev) { adb_kbd_t *adb_kbd = (adb_kbd_t *)ddf_dev_data_get(dev); @@ -86,5 +86,5 @@ } -static int adb_kbd_dev_gone(ddf_dev_t *dev) +static errno_t adb_kbd_dev_gone(ddf_dev_t *dev) { adb_kbd_t *adb_kbd = (adb_kbd_t *)ddf_dev_data_get(dev); @@ -95,5 +95,5 @@ } -static int adb_kbd_fun_online(ddf_fun_t *fun) +static errno_t adb_kbd_fun_online(ddf_fun_t *fun) { ddf_msg(LVL_DEBUG, "adb_kbd_fun_online()"); @@ -101,5 +101,5 @@ } -static int adb_kbd_fun_offline(ddf_fun_t *fun) +static errno_t adb_kbd_fun_offline(ddf_fun_t *fun) { ddf_msg(LVL_DEBUG, "adb_kbd_fun_offline()"); Index: uspace/drv/hid/adb-mouse/adb-mouse.c =================================================================== --- uspace/drv/hid/adb-mouse/adb-mouse.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/hid/adb-mouse/adb-mouse.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -97,5 +97,5 @@ ipc_callid_t callid = async_get_call(&call); - int retval = EOK; + errno_t retval = EOK; if (!IPC_GET_IMETHOD(call)) { @@ -117,7 +117,7 @@ /** Add ADB mouse device */ -int adb_mouse_add(adb_mouse_t *mouse) -{ - int rc; +errno_t adb_mouse_add(adb_mouse_t *mouse) +{ + errno_t rc; bool bound = false; @@ -188,5 +188,5 @@ /** Remove ADB mouse device */ -int adb_mouse_remove(adb_mouse_t *con) +errno_t adb_mouse_remove(adb_mouse_t *con) { return ENOTSUP; @@ -194,5 +194,5 @@ /** ADB mouse device gone */ -int adb_mouse_gone(adb_mouse_t *con) +errno_t adb_mouse_gone(adb_mouse_t *con) { return ENOTSUP; Index: uspace/drv/hid/adb-mouse/adb-mouse.h =================================================================== --- uspace/drv/hid/adb-mouse/adb-mouse.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/hid/adb-mouse/adb-mouse.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -47,7 +47,7 @@ } adb_mouse_t; -extern int adb_mouse_add(adb_mouse_t *); -extern int adb_mouse_remove(adb_mouse_t *); -extern int adb_mouse_gone(adb_mouse_t *); +extern errno_t adb_mouse_add(adb_mouse_t *); +extern errno_t adb_mouse_remove(adb_mouse_t *); +extern errno_t adb_mouse_gone(adb_mouse_t *); #endif Index: uspace/drv/hid/adb-mouse/main.c =================================================================== --- uspace/drv/hid/adb-mouse/main.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/hid/adb-mouse/main.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -42,9 +42,9 @@ #define NAME "adb-mouse" -static int adb_mouse_dev_add(ddf_dev_t *dev); -static int adb_mouse_dev_remove(ddf_dev_t *dev); -static int adb_mouse_dev_gone(ddf_dev_t *dev); -static int adb_mouse_fun_online(ddf_fun_t *fun); -static int adb_mouse_fun_offline(ddf_fun_t *fun); +static errno_t adb_mouse_dev_add(ddf_dev_t *dev); +static errno_t adb_mouse_dev_remove(ddf_dev_t *dev); +static errno_t adb_mouse_dev_gone(ddf_dev_t *dev); +static errno_t adb_mouse_fun_online(ddf_fun_t *fun); +static errno_t adb_mouse_fun_offline(ddf_fun_t *fun); static driver_ops_t driver_ops = { @@ -61,5 +61,5 @@ }; -static int adb_mouse_dev_add(ddf_dev_t *dev) +static errno_t adb_mouse_dev_add(ddf_dev_t *dev) { adb_mouse_t *adb_mouse; @@ -77,5 +77,5 @@ } -static int adb_mouse_dev_remove(ddf_dev_t *dev) +static errno_t adb_mouse_dev_remove(ddf_dev_t *dev) { adb_mouse_t *adb_mouse = (adb_mouse_t *)ddf_dev_data_get(dev); @@ -86,5 +86,5 @@ } -static int adb_mouse_dev_gone(ddf_dev_t *dev) +static errno_t adb_mouse_dev_gone(ddf_dev_t *dev) { adb_mouse_t *adb_mouse = (adb_mouse_t *)ddf_dev_data_get(dev); @@ -95,5 +95,5 @@ } -static int adb_mouse_fun_online(ddf_fun_t *fun) +static errno_t adb_mouse_fun_online(ddf_fun_t *fun) { ddf_msg(LVL_DEBUG, "adb_mouse_fun_online()"); @@ -101,5 +101,5 @@ } -static int adb_mouse_fun_offline(ddf_fun_t *fun) +static errno_t adb_mouse_fun_offline(ddf_fun_t *fun) { ddf_msg(LVL_DEBUG, "adb_mouse_fun_offline()"); Index: uspace/drv/hid/atkbd/atkbd.c =================================================================== --- uspace/drv/hid/atkbd/atkbd.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/hid/atkbd/atkbd.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -200,9 +200,9 @@ * */ -static int polling(void *arg) +static errno_t polling(void *arg) { at_kbd_t *kbd = arg; size_t nwr; - int rc; + errno_t rc; while (true) { @@ -355,8 +355,8 @@ * */ -int at_kbd_init(at_kbd_t *kbd, ddf_dev_t *dev) +errno_t at_kbd_init(at_kbd_t *kbd, ddf_dev_t *dev) { async_sess_t *parent_sess; - int rc; + errno_t rc; assert(kbd); @@ -385,5 +385,5 @@ ddf_fun_set_ops(kbd->kbd_fun, &kbd_ops); - int ret = ddf_fun_bind(kbd->kbd_fun); + errno_t ret = ddf_fun_bind(kbd->kbd_fun); if (ret != EOK) { ddf_msg(LVL_ERROR, "Failed binding function 'kbd'."); Index: uspace/drv/hid/atkbd/atkbd.h =================================================================== --- uspace/drv/hid/atkbd/atkbd.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/hid/atkbd/atkbd.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -54,5 +54,5 @@ } at_kbd_t; -extern int at_kbd_init(at_kbd_t *, ddf_dev_t *); +extern errno_t at_kbd_init(at_kbd_t *, ddf_dev_t *); #endif Index: uspace/drv/hid/atkbd/main.c =================================================================== --- uspace/drv/hid/atkbd/main.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/hid/atkbd/main.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -46,5 +46,5 @@ #define NAME "atkbd" -static int at_kbd_add(ddf_dev_t *device); +static errno_t at_kbd_add(ddf_dev_t *device); /** DDF driver ops. */ @@ -83,7 +83,7 @@ * */ -static int at_kbd_add(ddf_dev_t *device) +static errno_t at_kbd_add(ddf_dev_t *device) { - int rc; + errno_t rc; if (!device) Index: uspace/drv/hid/ps2mouse/main.c =================================================================== --- uspace/drv/hid/ps2mouse/main.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/hid/ps2mouse/main.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -45,5 +45,5 @@ #define NAME "ps2mouse" -static int mouse_add(ddf_dev_t *device); +static errno_t mouse_add(ddf_dev_t *device); /** DDF driver ops. */ @@ -78,7 +78,7 @@ * @return Error code. */ -static int mouse_add(ddf_dev_t *device) +static errno_t mouse_add(ddf_dev_t *device) { - int rc; + errno_t rc; if (!device) Index: uspace/drv/hid/ps2mouse/ps2mouse.c =================================================================== --- uspace/drv/hid/ps2mouse/ps2mouse.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/hid/ps2mouse/ps2mouse.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -77,5 +77,5 @@ uint8_t data = 0; \ size_t nread; \ - const int rc = chardev_read((mouse)->chardev, &data, 1, &nread); \ + const errno_t rc = chardev_read((mouse)->chardev, &data, 1, &nread); \ if (rc != EOK) { \ ddf_msg(LVL_ERROR, "Failed reading byte: %s", str_error_name(rc));\ @@ -94,5 +94,5 @@ uint8_t data = (value); \ size_t nwr; \ - const int rc = chardev_write((mouse)->chardev, &data, 1, &nwr); \ + const errno_t rc = chardev_write((mouse)->chardev, &data, 1, &nwr); \ if (rc != EOK) { \ ddf_msg(LVL_ERROR, "Failed writing byte: %s", str_error_name(rc)); \ @@ -101,7 +101,7 @@ } while (0) -static int polling_ps2(void *); -static int polling_intellimouse(void *); -static int probe_intellimouse(ps2_mouse_t *, bool); +static errno_t polling_ps2(void *); +static errno_t polling_intellimouse(void *); +static errno_t probe_intellimouse(ps2_mouse_t *, bool); static void default_connection_handler(ddf_fun_t *, ipc_callid_t, ipc_call_t *); @@ -120,9 +120,9 @@ * @return EOK on success or non-zero error code */ -int ps2_mouse_init(ps2_mouse_t *mouse, ddf_dev_t *dev) +errno_t ps2_mouse_init(ps2_mouse_t *mouse, ddf_dev_t *dev) { async_sess_t *parent_sess; bool bound = false; - int rc; + errno_t rc; mouse->client_sess = NULL; @@ -165,5 +165,5 @@ /* Probe IntelliMouse extensions. */ - int (*polling_f)(void*) = polling_ps2; + errno_t (*polling_f)(void*) = polling_ps2; if (probe_intellimouse(mouse, false) == EOK) { ddf_msg(LVL_NOTE, "Enabled IntelliMouse extensions"); @@ -223,7 +223,7 @@ * @return EOK on success or non-zero error code */ -static int ps2_mouse_read_packet(ps2_mouse_t *mouse, void *pbuf, size_t psize) -{ - int rc; +static errno_t ps2_mouse_read_packet(ps2_mouse_t *mouse, void *pbuf, size_t psize) +{ + errno_t rc; size_t pos; size_t nread; @@ -248,8 +248,8 @@ * @return Never. */ -int polling_ps2(void *arg) +errno_t polling_ps2(void *arg) { ps2_mouse_t *mouse = (ps2_mouse_t *) arg; - int rc; + errno_t rc; bool buttons[PS2_BUTTON_COUNT] = {}; @@ -300,8 +300,8 @@ * @return Never. */ -static int polling_intellimouse(void *arg) +static errno_t polling_intellimouse(void *arg) { ps2_mouse_t *mouse = (ps2_mouse_t *) arg; - int rc; + errno_t rc; bool buttons[INTELLIMOUSE_BUTTON_COUNT] = {}; @@ -373,5 +373,5 @@ * See http://www.computer-engineering.org/ps2mouse/ for details. */ -static int probe_intellimouse(ps2_mouse_t *mouse, bool buttons) +static errno_t probe_intellimouse(ps2_mouse_t *mouse, bool buttons) { MOUSE_WRITE_BYTE(mouse, PS2_MOUSE_SET_SAMPLE_RATE); Index: uspace/drv/hid/ps2mouse/ps2mouse.h =================================================================== --- uspace/drv/hid/ps2mouse/ps2mouse.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/hid/ps2mouse/ps2mouse.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -53,5 +53,5 @@ } ps2_mouse_t; -extern int ps2_mouse_init(ps2_mouse_t *, ddf_dev_t *); +extern errno_t ps2_mouse_init(ps2_mouse_t *, ddf_dev_t *); #endif Index: uspace/drv/hid/usbhid/blink1/blink1.c =================================================================== --- uspace/drv/hid/usbhid/blink1/blink1.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/hid/usbhid/blink1/blink1.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -60,5 +60,5 @@ } blink1_report_t; -static int usb_blink1_color_set(ddf_fun_t *fun, pixel_t pixel) +static errno_t usb_blink1_color_set(ddf_fun_t *fun, pixel_t pixel) { usb_blink1_t *blink1_dev = (usb_blink1_t *) ddf_fun_data_get(fun); @@ -93,5 +93,5 @@ }; -int usb_blink1_init(usb_hid_dev_t *hid_dev, void **data) +errno_t usb_blink1_init(usb_hid_dev_t *hid_dev, void **data) { if (hid_dev == NULL) { @@ -121,5 +121,5 @@ ddf_fun_set_ops(fun, &blink1_ops); - int rc = ddf_fun_bind(fun); + errno_t rc = ddf_fun_bind(fun); if (rc != EOK) { usb_log_error("Could not bind DDF function `%s': %s.", @@ -159,5 +159,5 @@ usb_blink1_t *blink1_dev = (usb_blink1_t *) data; - int rc = ddf_fun_unbind(blink1_dev->fun); + errno_t rc = ddf_fun_unbind(blink1_dev->fun); if (rc != EOK) { usb_log_error("Could not unbind function `%s', it " Index: uspace/drv/hid/usbhid/blink1/blink1.h =================================================================== --- uspace/drv/hid/usbhid/blink1/blink1.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/hid/usbhid/blink1/blink1.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -52,5 +52,5 @@ extern const char *HID_BLINK1_CATEGORY; -extern int usb_blink1_init(usb_hid_dev_t *, void **); +extern errno_t usb_blink1_init(usb_hid_dev_t *, void **); extern void usb_blink1_deinit(usb_hid_dev_t *, void *); Index: uspace/drv/hid/usbhid/generic/hiddev.c =================================================================== --- uspace/drv/hid/usbhid/generic/hiddev.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/hid/usbhid/generic/hiddev.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -60,9 +60,9 @@ static size_t usb_generic_hid_get_event_length(ddf_fun_t *fun); -static int usb_generic_hid_get_event(ddf_fun_t *fun, uint8_t *buffer, +static errno_t usb_generic_hid_get_event(ddf_fun_t *fun, uint8_t *buffer, size_t size, size_t *act_size, int *event_nr, unsigned int flags); -static int usb_generic_hid_client_connected(ddf_fun_t *fun); +static errno_t usb_generic_hid_client_connected(ddf_fun_t *fun); static size_t usb_generic_get_report_descriptor_length(ddf_fun_t *fun); -static int usb_generic_get_report_descriptor(ddf_fun_t *fun, uint8_t *desc, +static errno_t usb_generic_get_report_descriptor(ddf_fun_t *fun, uint8_t *desc, size_t size, size_t *actual_size); @@ -102,5 +102,5 @@ } -static int usb_generic_hid_get_event(ddf_fun_t *fun, uint8_t *buffer, +static errno_t usb_generic_hid_get_event(ddf_fun_t *fun, uint8_t *buffer, size_t size, size_t *act_size, int *event_nr, unsigned int flags) { @@ -143,5 +143,5 @@ } -static int usb_generic_get_report_descriptor(ddf_fun_t *fun, uint8_t *desc, +static errno_t usb_generic_get_report_descriptor(ddf_fun_t *fun, uint8_t *desc, size_t size, size_t *actual_size) { @@ -160,5 +160,5 @@ } -static int usb_generic_hid_client_connected(ddf_fun_t *fun) +static errno_t usb_generic_hid_client_connected(ddf_fun_t *fun) { usb_log_debug("Generic HID: Client connected."); @@ -180,5 +180,5 @@ } -int usb_generic_hid_init(usb_hid_dev_t *hid_dev, void **data) +errno_t usb_generic_hid_init(usb_hid_dev_t *hid_dev, void **data) { usb_hid_gen_fun_t *hid_fun; @@ -202,5 +202,5 @@ ddf_fun_set_ops(fun, &usb_generic_hid_ops); - int rc = ddf_fun_bind(fun); + errno_t rc = ddf_fun_bind(fun); if (rc != EOK) { usb_log_error("Could not bind DDF function: %s.", Index: uspace/drv/hid/usbhid/generic/hiddev.h =================================================================== --- uspace/drv/hid/usbhid/generic/hiddev.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/hid/usbhid/generic/hiddev.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -51,5 +51,5 @@ } usb_hid_gen_fun_t; -extern int usb_generic_hid_init(usb_hid_dev_t *, void **); +extern errno_t usb_generic_hid_init(usb_hid_dev_t *, void **); extern void usb_generic_hid_deinit(usb_hid_dev_t *, void *); extern bool usb_generic_hid_polling_callback(usb_hid_dev_t *, void *); Index: uspace/drv/hid/usbhid/kbd/kbddev.c =================================================================== --- uspace/drv/hid/usbhid/kbd/kbddev.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/hid/usbhid/kbd/kbddev.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -257,5 +257,5 @@ // TODO: what about the Report ID? - int rc = usb_hid_report_output_translate(&hid_dev->report, 0, + errno_t rc = usb_hid_report_output_translate(&hid_dev->report, 0, kbd_dev->output_buffer, kbd_dev->output_size); @@ -435,5 +435,5 @@ } - int ret = + errno_t ret = usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_KEYBOARD, 0); if (ret != EOK) { @@ -480,5 +480,5 @@ /* HID/KBD structure manipulation */ -static int kbd_dev_init(usb_kbd_t *kbd_dev, usb_hid_dev_t *hid_dev) +static errno_t kbd_dev_init(usb_kbd_t *kbd_dev, usb_hid_dev_t *hid_dev) { assert(kbd_dev); @@ -507,5 +507,5 @@ } - int ret = + errno_t ret = usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_KEYBOARD, 0); if (ret != EOK) { @@ -616,5 +616,5 @@ * @return Other value inherited from function usbhid_dev_init(). */ -int usb_kbd_init(usb_hid_dev_t *hid_dev, void **data) +errno_t usb_kbd_init(usb_hid_dev_t *hid_dev, void **data) { usb_log_debug("Initializing HID/KBD structure..."); @@ -642,5 +642,5 @@ } - int ret = kbd_dev_init(kbd_dev, hid_dev); + errno_t ret = kbd_dev_init(kbd_dev, hid_dev); if (ret != EOK) { usb_log_error("Failed to initialize KBD device structure."); @@ -776,8 +776,8 @@ } -int usb_kbd_set_boot_protocol(usb_hid_dev_t *hid_dev) +errno_t usb_kbd_set_boot_protocol(usb_hid_dev_t *hid_dev) { assert(hid_dev); - int rc = usb_hid_parse_report_descriptor( + errno_t rc = usb_hid_parse_report_descriptor( &hid_dev->report, USB_KBD_BOOT_REPORT_DESCRIPTOR, sizeof(USB_KBD_BOOT_REPORT_DESCRIPTOR)); Index: uspace/drv/hid/usbhid/kbd/kbddev.h =================================================================== --- uspace/drv/hid/usbhid/kbd/kbddev.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/hid/usbhid/kbd/kbddev.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -115,5 +115,5 @@ extern const char *HID_KBD_CATEGORY; -extern int usb_kbd_init(usb_hid_dev_t *, void **); +extern errno_t usb_kbd_init(usb_hid_dev_t *, void **); extern bool usb_kbd_polling_callback(usb_hid_dev_t *, void *); extern int usb_kbd_is_initialized(const usb_kbd_t *); @@ -122,5 +122,5 @@ extern void usb_kbd_push_ev(usb_kbd_t *, int, unsigned int); extern void usb_kbd_deinit(usb_hid_dev_t *, void *); -extern int usb_kbd_set_boot_protocol(usb_hid_dev_t *); +extern errno_t usb_kbd_set_boot_protocol(usb_hid_dev_t *); #endif /* USB_HID_KBDDEV_H_ */ Index: uspace/drv/hid/usbhid/kbd/kbdrepeat.c =================================================================== --- uspace/drv/hid/usbhid/kbd/kbdrepeat.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/hid/usbhid/kbd/kbdrepeat.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -117,5 +117,5 @@ * @retval EINVAL if no argument is supplied. */ -int usb_kbd_repeat_fibril(void *arg) +errno_t usb_kbd_repeat_fibril(void *arg) { usb_log_debug("Autorepeat fibril spawned."); Index: uspace/drv/hid/usbhid/kbd/kbdrepeat.h =================================================================== --- uspace/drv/hid/usbhid/kbd/kbdrepeat.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/hid/usbhid/kbd/kbdrepeat.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -59,5 +59,5 @@ -int usb_kbd_repeat_fibril(void *arg); +errno_t usb_kbd_repeat_fibril(void *arg); void usb_kbd_repeat_start(struct usb_kbd_t *kbd, unsigned int key); Index: uspace/drv/hid/usbhid/main.c =================================================================== --- uspace/drv/hid/usbhid/main.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/hid/usbhid/main.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -56,5 +56,5 @@ * @return Error code. */ -static int usb_hid_device_add(usb_device_t *dev) +static errno_t usb_hid_device_add(usb_device_t *dev) { usb_log_debug("%s", __FUNCTION__); @@ -77,5 +77,5 @@ } - int rc = usb_hid_init(hid_dev, dev); + errno_t rc = usb_hid_init(hid_dev, dev); if (rc != EOK) { usb_log_error("Failed to initialize USB/HID device."); @@ -126,5 +126,5 @@ * @return Error code. */ -static int usb_hid_device_remove(usb_device_t *dev) +static errno_t usb_hid_device_remove(usb_device_t *dev) { assert(dev); @@ -142,5 +142,5 @@ * @return Error code. */ -static int usb_hid_device_gone(usb_device_t *dev) +static errno_t usb_hid_device_gone(usb_device_t *dev) { assert(dev); Index: uspace/drv/hid/usbhid/mouse/mousedev.c =================================================================== --- uspace/drv/hid/usbhid/mouse/mousedev.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/hid/usbhid/mouse/mousedev.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -228,5 +228,5 @@ return; } - int ret = + errno_t ret = usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_BUTTON, 0); if (ret != EOK) { @@ -318,5 +318,5 @@ } -static int mouse_dev_init(usb_mouse_t *mouse_dev, usb_hid_dev_t *hid_dev) +static errno_t mouse_dev_init(usb_mouse_t *mouse_dev, usb_hid_dev_t *hid_dev) { // FIXME: This may not be optimal since stupid hardware vendor may @@ -342,5 +342,5 @@ } -int usb_mouse_init(usb_hid_dev_t *hid_dev, void **data) +errno_t usb_mouse_init(usb_hid_dev_t *hid_dev, void **data) { usb_log_debug("Initializing HID/Mouse structure..."); @@ -369,5 +369,5 @@ } - int ret = mouse_dev_init(mouse_dev, hid_dev); + errno_t ret = mouse_dev_init(mouse_dev, hid_dev); if (ret != EOK) { usb_log_error("Failed to init HID mouse device structure."); @@ -427,5 +427,5 @@ /* Hangup session to the console */ if (mouse_dev->mouse_sess != NULL) { - const int ret = async_hangup(mouse_dev->mouse_sess); + const errno_t ret = async_hangup(mouse_dev->mouse_sess); if (ret != EOK) usb_log_warning("Failed to hang up mouse session: " @@ -437,7 +437,7 @@ } -int usb_mouse_set_boot_protocol(usb_hid_dev_t *hid_dev) -{ - int rc = usb_hid_parse_report_descriptor( +errno_t usb_mouse_set_boot_protocol(usb_hid_dev_t *hid_dev) +{ + errno_t rc = usb_hid_parse_report_descriptor( &hid_dev->report, USB_MOUSE_BOOT_REPORT_DESCRIPTOR, sizeof(USB_MOUSE_BOOT_REPORT_DESCRIPTOR)); Index: uspace/drv/hid/usbhid/mouse/mousedev.h =================================================================== --- uspace/drv/hid/usbhid/mouse/mousedev.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/hid/usbhid/mouse/mousedev.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -59,8 +59,8 @@ extern const char *HID_MOUSE_CATEGORY; -extern int usb_mouse_init(usb_hid_dev_t *, void **); +extern errno_t usb_mouse_init(usb_hid_dev_t *, void **); extern bool usb_mouse_polling_callback(usb_hid_dev_t *, void *); extern void usb_mouse_deinit(usb_hid_dev_t *, void *); -extern int usb_mouse_set_boot_protocol(usb_hid_dev_t *); +extern errno_t usb_mouse_set_boot_protocol(usb_hid_dev_t *); #endif // USB_HID_MOUSEDEV_H_ Index: uspace/drv/hid/usbhid/multimedia/multimedia.c =================================================================== --- uspace/drv/hid/usbhid/multimedia/multimedia.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/hid/usbhid/multimedia/multimedia.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -153,5 +153,5 @@ } -int usb_multimedia_init(struct usb_hid_dev *hid_dev, void **data) +errno_t usb_multimedia_init(struct usb_hid_dev *hid_dev, void **data) { if (hid_dev == NULL || hid_dev->usb_dev == NULL) { @@ -182,5 +182,5 @@ //todo Autorepeat? - int rc = ddf_fun_bind(fun); + errno_t rc = ddf_fun_bind(fun); if (rc != EOK) { usb_log_error("Could not bind DDF function: %s.", @@ -248,5 +248,5 @@ return true; /* This might be a temporary failure. */ - int ret = + errno_t ret = usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_CONSUMER, 0); if (ret != EOK) { Index: uspace/drv/hid/usbhid/multimedia/multimedia.h =================================================================== --- uspace/drv/hid/usbhid/multimedia/multimedia.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/hid/usbhid/multimedia/multimedia.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -40,5 +40,5 @@ #include "../usbhid.h" -extern int usb_multimedia_init(usb_hid_dev_t *, void **); +extern errno_t usb_multimedia_init(usb_hid_dev_t *, void **); extern void usb_multimedia_deinit(usb_hid_dev_t *, void *); extern bool usb_multimedia_polling_callback(usb_hid_dev_t *, void *); Index: uspace/drv/hid/usbhid/usbhid.c =================================================================== --- uspace/drv/hid/usbhid/usbhid.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/hid/usbhid/usbhid.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -61,5 +61,5 @@ }; -static int usb_hid_set_boot_kbd_subdriver(usb_hid_dev_t *hid_dev) +static errno_t usb_hid_set_boot_kbd_subdriver(usb_hid_dev_t *hid_dev) { assert(hid_dev != NULL); @@ -77,5 +77,5 @@ } -static int usb_hid_set_boot_mouse_subdriver(usb_hid_dev_t *hid_dev) +static errno_t usb_hid_set_boot_mouse_subdriver(usb_hid_dev_t *hid_dev) { assert(hid_dev != NULL); @@ -93,5 +93,5 @@ } -static int usb_hid_set_generic_hid_subdriver(usb_hid_dev_t *hid_dev) +static errno_t usb_hid_set_generic_hid_subdriver(usb_hid_dev_t *hid_dev) { assert(hid_dev != NULL); @@ -182,5 +182,5 @@ } -static int usb_hid_save_subdrivers(usb_hid_dev_t *hid_dev, +static errno_t usb_hid_save_subdrivers(usb_hid_dev_t *hid_dev, const usb_hid_subdriver_t **subdrivers, unsigned count) { @@ -215,5 +215,5 @@ } -static int usb_hid_find_subdrivers(usb_hid_dev_t *hid_dev) +static errno_t usb_hid_find_subdrivers(usb_hid_dev_t *hid_dev) { assert(hid_dev != NULL); @@ -267,5 +267,5 @@ } -static int usb_hid_check_pipes(usb_hid_dev_t *hid_dev, usb_device_t *dev) +static errno_t usb_hid_check_pipes(usb_hid_dev_t *hid_dev, usb_device_t *dev) { assert(hid_dev); @@ -293,5 +293,5 @@ } -static int usb_hid_init_report(usb_hid_dev_t *hid_dev) +static errno_t usb_hid_init_report(usb_hid_dev_t *hid_dev) { assert(hid_dev != NULL); @@ -414,5 +414,5 @@ * @return Error code. */ -int usb_hid_init(usb_hid_dev_t *hid_dev, usb_device_t *dev) +errno_t usb_hid_init(usb_hid_dev_t *hid_dev, usb_device_t *dev) { assert(hid_dev); @@ -427,5 +427,5 @@ hid_dev->poll_pipe_mapping = NULL; - int rc = usb_hid_check_pipes(hid_dev, dev); + errno_t rc = usb_hid_check_pipes(hid_dev, dev); if (rc != EOK) { return rc; @@ -492,5 +492,5 @@ if (hid_dev->subdrivers[i].init != NULL) { usb_log_debug("Initializing subdriver %d.",i); - const int pret = hid_dev->subdrivers[i].init(hid_dev, + const errno_t pret = hid_dev->subdrivers[i].init(hid_dev, &hid_dev->subdrivers[i].data); if (pret != EOK) { Index: uspace/drv/hid/usbhid/usbhid.h =================================================================== --- uspace/drv/hid/usbhid/usbhid.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/hid/usbhid/usbhid.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -56,5 +56,5 @@ * @return Error code. */ -typedef int (*usb_hid_driver_init_t)(usb_hid_dev_t *dev, void **data); +typedef errno_t (*usb_hid_driver_init_t)(usb_hid_dev_t *dev, void **data); /** Subdriver deinitialization callback. @@ -138,5 +138,5 @@ extern const usb_endpoint_description_t *usb_hid_endpoints[]; -int usb_hid_init(usb_hid_dev_t *hid_dev, usb_device_t *dev); +errno_t usb_hid_init(usb_hid_dev_t *hid_dev, usb_device_t *dev); void usb_hid_deinit(usb_hid_dev_t *hid_dev); Index: uspace/drv/hid/xtkbd/main.c =================================================================== --- uspace/drv/hid/xtkbd/main.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/hid/xtkbd/main.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -46,5 +46,5 @@ #define NAME "xtkbd" -static int xt_kbd_add(ddf_dev_t *device); +static errno_t xt_kbd_add(ddf_dev_t *device); /** DDF driver ops. */ @@ -83,7 +83,7 @@ * */ -static int xt_kbd_add(ddf_dev_t *device) +static errno_t xt_kbd_add(ddf_dev_t *device) { - int rc; + errno_t rc; if (!device) Index: uspace/drv/hid/xtkbd/xtkbd.c =================================================================== --- uspace/drv/hid/xtkbd/xtkbd.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/hid/xtkbd/xtkbd.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -205,9 +205,9 @@ * */ -static int polling(void *arg) +static errno_t polling(void *arg) { xt_kbd_t *kbd = arg; size_t nread; - int rc; + errno_t rc; while (true) { @@ -353,5 +353,5 @@ size_t nwr; - int rc = chardev_write(kbd->chardev, &cmds[0], 1, &nwr); + errno_t rc = chardev_write(kbd->chardev, &cmds[0], 1, &nwr); if (rc != EOK) { async_answer_0(icallid, rc); @@ -410,9 +410,9 @@ * */ -int xt_kbd_init(xt_kbd_t *kbd, ddf_dev_t *dev) +errno_t xt_kbd_init(xt_kbd_t *kbd, ddf_dev_t *dev) { async_sess_t *parent_sess; bool bound = false; - int rc; + errno_t rc; kbd->client_sess = NULL; Index: uspace/drv/hid/xtkbd/xtkbd.h =================================================================== --- uspace/drv/hid/xtkbd/xtkbd.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/hid/xtkbd/xtkbd.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -55,5 +55,5 @@ } xt_kbd_t; -extern int xt_kbd_init(xt_kbd_t *, ddf_dev_t *); +extern errno_t xt_kbd_init(xt_kbd_t *, ddf_dev_t *); #endif Index: uspace/drv/intctl/apic/apic.c =================================================================== --- uspace/drv/intctl/apic/apic.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/intctl/apic/apic.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -140,5 +140,5 @@ } -static int apic_enable_irq(apic_t *apic, sysarg_t irq) +static errno_t apic_enable_irq(apic_t *apic, sysarg_t irq) { io_redirection_reg_t reg; @@ -207,10 +207,10 @@ /** Add APIC device. */ -int apic_add(apic_t *apic, apic_res_t *res) +errno_t apic_add(apic_t *apic, apic_res_t *res) { sysarg_t have_apic; ddf_fun_t *fun_a = NULL; void *regs; - int rc; + errno_t rc; if ((sysinfo_get_value("apic", &have_apic) != EOK) || (!have_apic)) { @@ -254,5 +254,5 @@ /** Remove APIC device */ -int apic_remove(apic_t *apic) +errno_t apic_remove(apic_t *apic) { return ENOTSUP; @@ -260,5 +260,5 @@ /** APIC device gone */ -int apic_gone(apic_t *apic) +errno_t apic_gone(apic_t *apic) { return ENOTSUP; Index: uspace/drv/intctl/apic/apic.h =================================================================== --- uspace/drv/intctl/apic/apic.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/intctl/apic/apic.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -52,7 +52,7 @@ } apic_t; -extern int apic_add(apic_t *, apic_res_t *); -extern int apic_remove(apic_t *); -extern int apic_gone(apic_t *); +extern errno_t apic_add(apic_t *, apic_res_t *); +extern errno_t apic_remove(apic_t *); +extern errno_t apic_gone(apic_t *); #endif Index: uspace/drv/intctl/apic/main.c =================================================================== --- uspace/drv/intctl/apic/main.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/intctl/apic/main.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -43,9 +43,9 @@ #define NAME "apic" -static int apic_dev_add(ddf_dev_t *dev); -static int apic_dev_remove(ddf_dev_t *dev); -static int apic_dev_gone(ddf_dev_t *dev); -static int apic_fun_online(ddf_fun_t *fun); -static int apic_fun_offline(ddf_fun_t *fun); +static errno_t apic_dev_add(ddf_dev_t *dev); +static errno_t apic_dev_remove(ddf_dev_t *dev); +static errno_t apic_dev_gone(ddf_dev_t *dev); +static errno_t apic_fun_online(ddf_fun_t *fun); +static errno_t apic_fun_offline(ddf_fun_t *fun); static driver_ops_t driver_ops = { @@ -62,9 +62,9 @@ }; -static int apic_get_res(ddf_dev_t *dev, apic_res_t *res) +static errno_t apic_get_res(ddf_dev_t *dev, apic_res_t *res) { async_sess_t *parent_sess; hw_res_list_parsed_t hw_res; - int rc; + errno_t rc; parent_sess = ddf_dev_parent_sess_get(dev); @@ -90,9 +90,9 @@ } -static int apic_dev_add(ddf_dev_t *dev) +static errno_t apic_dev_add(ddf_dev_t *dev) { apic_t *apic; apic_res_t apic_res; - int rc; + errno_t rc; ddf_msg(LVL_DEBUG, "apic_dev_add(%p)", dev); @@ -114,5 +114,5 @@ } -static int apic_dev_remove(ddf_dev_t *dev) +static errno_t apic_dev_remove(ddf_dev_t *dev) { apic_t *apic = (apic_t *)ddf_dev_data_get(dev); @@ -123,5 +123,5 @@ } -static int apic_dev_gone(ddf_dev_t *dev) +static errno_t apic_dev_gone(ddf_dev_t *dev) { apic_t *apic = (apic_t *)ddf_dev_data_get(dev); @@ -132,5 +132,5 @@ } -static int apic_fun_online(ddf_fun_t *fun) +static errno_t apic_fun_online(ddf_fun_t *fun) { ddf_msg(LVL_DEBUG, "apic_fun_online()"); @@ -138,5 +138,5 @@ } -static int apic_fun_offline(ddf_fun_t *fun) +static errno_t apic_fun_offline(ddf_fun_t *fun) { ddf_msg(LVL_DEBUG, "apic_fun_offline()"); Index: uspace/drv/intctl/i8259/i8259.c =================================================================== --- uspace/drv/intctl/i8259/i8259.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/intctl/i8259/i8259.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -64,5 +64,5 @@ #define PIC_MAX_IRQ 15 -static int pic_enable_irq(i8259_t *i8259, sysarg_t irq) +static errno_t pic_enable_irq(i8259_t *i8259, sysarg_t irq) { if (irq > PIC_MAX_IRQ) @@ -136,5 +136,5 @@ /** Add i8259 device. */ -int i8259_add(i8259_t *i8259, i8259_res_t *res) +errno_t i8259_add(i8259_t *i8259, i8259_res_t *res) { sysarg_t have_i8259; @@ -142,5 +142,5 @@ ioport8_t *regs1; ddf_fun_t *fun_a = NULL; - int rc; + errno_t rc; if ((sysinfo_get_value("i8259", &have_i8259) != EOK) || (!have_i8259)) { @@ -187,5 +187,5 @@ /** Remove i8259 device */ -int i8259_remove(i8259_t *i8259) +errno_t i8259_remove(i8259_t *i8259) { return ENOTSUP; @@ -193,5 +193,5 @@ /** i8259 device gone */ -int i8259_gone(i8259_t *i8259) +errno_t i8259_gone(i8259_t *i8259) { return ENOTSUP; Index: uspace/drv/intctl/i8259/i8259.h =================================================================== --- uspace/drv/intctl/i8259/i8259.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/intctl/i8259/i8259.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -52,7 +52,7 @@ } i8259_t; -extern int i8259_add(i8259_t *, i8259_res_t *); -extern int i8259_remove(i8259_t *); -extern int i8259_gone(i8259_t *); +extern errno_t i8259_add(i8259_t *, i8259_res_t *); +extern errno_t i8259_remove(i8259_t *); +extern errno_t i8259_gone(i8259_t *); #endif Index: uspace/drv/intctl/i8259/main.c =================================================================== --- uspace/drv/intctl/i8259/main.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/intctl/i8259/main.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -43,9 +43,9 @@ #define NAME "i8259" -static int i8259_dev_add(ddf_dev_t *dev); -static int i8259_dev_remove(ddf_dev_t *dev); -static int i8259_dev_gone(ddf_dev_t *dev); -static int i8259_fun_online(ddf_fun_t *fun); -static int i8259_fun_offline(ddf_fun_t *fun); +static errno_t i8259_dev_add(ddf_dev_t *dev); +static errno_t i8259_dev_remove(ddf_dev_t *dev); +static errno_t i8259_dev_gone(ddf_dev_t *dev); +static errno_t i8259_fun_online(ddf_fun_t *fun); +static errno_t i8259_fun_offline(ddf_fun_t *fun); static driver_ops_t driver_ops = { @@ -62,9 +62,9 @@ }; -static int i8259_get_res(ddf_dev_t *dev, i8259_res_t *res) +static errno_t i8259_get_res(ddf_dev_t *dev, i8259_res_t *res) { async_sess_t *parent_sess; hw_res_list_parsed_t hw_res; - int rc; + errno_t rc; parent_sess = ddf_dev_parent_sess_get(dev); @@ -91,9 +91,9 @@ } -static int i8259_dev_add(ddf_dev_t *dev) +static errno_t i8259_dev_add(ddf_dev_t *dev) { i8259_t *i8259; i8259_res_t i8259_res; - int rc; + errno_t rc; ddf_msg(LVL_DEBUG, "i8259_dev_add(%p)", dev); @@ -115,5 +115,5 @@ } -static int i8259_dev_remove(ddf_dev_t *dev) +static errno_t i8259_dev_remove(ddf_dev_t *dev) { i8259_t *i8259 = (i8259_t *)ddf_dev_data_get(dev); @@ -124,5 +124,5 @@ } -static int i8259_dev_gone(ddf_dev_t *dev) +static errno_t i8259_dev_gone(ddf_dev_t *dev) { i8259_t *i8259 = (i8259_t *)ddf_dev_data_get(dev); @@ -133,5 +133,5 @@ } -static int i8259_fun_online(ddf_fun_t *fun) +static errno_t i8259_fun_online(ddf_fun_t *fun) { ddf_msg(LVL_DEBUG, "i8259_fun_online()"); @@ -139,5 +139,5 @@ } -static int i8259_fun_offline(ddf_fun_t *fun) +static errno_t i8259_fun_offline(ddf_fun_t *fun) { ddf_msg(LVL_DEBUG, "i8259_fun_offline()"); Index: uspace/drv/intctl/icp-ic/icp-ic.c =================================================================== --- uspace/drv/intctl/icp-ic/icp-ic.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/intctl/icp-ic/icp-ic.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -52,5 +52,5 @@ }; -static int icpic_enable_irq(icpic_t *icpic, sysarg_t irq) +static errno_t icpic_enable_irq(icpic_t *icpic, sysarg_t irq) { if (irq > icpic_max_irq) @@ -112,9 +112,9 @@ /** Add icp-ic device. */ -int icpic_add(icpic_t *icpic, icpic_res_t *res) +errno_t icpic_add(icpic_t *icpic, icpic_res_t *res) { ddf_fun_t *fun_a = NULL; void *regs; - int rc; + errno_t rc; rc = pio_enable((void *)res->base, sizeof(icpic_regs_t), ®s); @@ -153,5 +153,5 @@ /** Remove icp-ic device */ -int icpic_remove(icpic_t *icpic) +errno_t icpic_remove(icpic_t *icpic) { return ENOTSUP; @@ -159,5 +159,5 @@ /** icp-ic device gone */ -int icpic_gone(icpic_t *icpic) +errno_t icpic_gone(icpic_t *icpic) { return ENOTSUP; Index: uspace/drv/intctl/icp-ic/icp-ic.h =================================================================== --- uspace/drv/intctl/icp-ic/icp-ic.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/intctl/icp-ic/icp-ic.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -53,7 +53,7 @@ } icpic_t; -extern int icpic_add(icpic_t *, icpic_res_t *); -extern int icpic_remove(icpic_t *); -extern int icpic_gone(icpic_t *); +extern errno_t icpic_add(icpic_t *, icpic_res_t *); +extern errno_t icpic_remove(icpic_t *); +extern errno_t icpic_gone(icpic_t *); #endif Index: uspace/drv/intctl/icp-ic/main.c =================================================================== --- uspace/drv/intctl/icp-ic/main.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/intctl/icp-ic/main.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -43,9 +43,9 @@ #define NAME "icp-ic" -static int icpic_dev_add(ddf_dev_t *dev); -static int icpic_dev_remove(ddf_dev_t *dev); -static int icpic_dev_gone(ddf_dev_t *dev); -static int icpic_fun_online(ddf_fun_t *fun); -static int icpic_fun_offline(ddf_fun_t *fun); +static errno_t icpic_dev_add(ddf_dev_t *dev); +static errno_t icpic_dev_remove(ddf_dev_t *dev); +static errno_t icpic_dev_gone(ddf_dev_t *dev); +static errno_t icpic_fun_online(ddf_fun_t *fun); +static errno_t icpic_fun_offline(ddf_fun_t *fun); static driver_ops_t driver_ops = { @@ -62,9 +62,9 @@ }; -static int icpic_get_res(ddf_dev_t *dev, icpic_res_t *res) +static errno_t icpic_get_res(ddf_dev_t *dev, icpic_res_t *res) { async_sess_t *parent_sess; hw_res_list_parsed_t hw_res; - int rc; + errno_t rc; parent_sess = ddf_dev_parent_sess_get(dev); @@ -90,9 +90,9 @@ } -static int icpic_dev_add(ddf_dev_t *dev) +static errno_t icpic_dev_add(ddf_dev_t *dev) { icpic_t *icpic; icpic_res_t icpic_res; - int rc; + errno_t rc; ddf_msg(LVL_DEBUG, "icpic_dev_add(%p)", dev); @@ -114,5 +114,5 @@ } -static int icpic_dev_remove(ddf_dev_t *dev) +static errno_t icpic_dev_remove(ddf_dev_t *dev) { icpic_t *icpic = (icpic_t *)ddf_dev_data_get(dev); @@ -123,5 +123,5 @@ } -static int icpic_dev_gone(ddf_dev_t *dev) +static errno_t icpic_dev_gone(ddf_dev_t *dev) { icpic_t *icpic = (icpic_t *)ddf_dev_data_get(dev); @@ -132,5 +132,5 @@ } -static int icpic_fun_online(ddf_fun_t *fun) +static errno_t icpic_fun_online(ddf_fun_t *fun) { ddf_msg(LVL_DEBUG, "icpic_fun_online()"); @@ -138,5 +138,5 @@ } -static int icpic_fun_offline(ddf_fun_t *fun) +static errno_t icpic_fun_offline(ddf_fun_t *fun) { ddf_msg(LVL_DEBUG, "icpic_fun_offline()"); Index: uspace/drv/intctl/obio/main.c =================================================================== --- uspace/drv/intctl/obio/main.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/intctl/obio/main.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -43,9 +43,9 @@ #define NAME "obio" -static int obio_dev_add(ddf_dev_t *dev); -static int obio_dev_remove(ddf_dev_t *dev); -static int obio_dev_gone(ddf_dev_t *dev); -static int obio_fun_online(ddf_fun_t *fun); -static int obio_fun_offline(ddf_fun_t *fun); +static errno_t obio_dev_add(ddf_dev_t *dev); +static errno_t obio_dev_remove(ddf_dev_t *dev); +static errno_t obio_dev_gone(ddf_dev_t *dev); +static errno_t obio_fun_online(ddf_fun_t *fun); +static errno_t obio_fun_offline(ddf_fun_t *fun); static driver_ops_t driver_ops = { @@ -62,9 +62,9 @@ }; -static int obio_get_res(ddf_dev_t *dev, obio_res_t *res) +static errno_t obio_get_res(ddf_dev_t *dev, obio_res_t *res) { async_sess_t *parent_sess; hw_res_list_parsed_t hw_res; - int rc; + errno_t rc; parent_sess = ddf_dev_parent_sess_get(dev); @@ -90,9 +90,9 @@ } -static int obio_dev_add(ddf_dev_t *dev) +static errno_t obio_dev_add(ddf_dev_t *dev) { obio_t *obio; obio_res_t obio_res; - int rc; + errno_t rc; ddf_msg(LVL_DEBUG, "obio_dev_add(%p)", dev); @@ -114,5 +114,5 @@ } -static int obio_dev_remove(ddf_dev_t *dev) +static errno_t obio_dev_remove(ddf_dev_t *dev) { obio_t *obio = (obio_t *)ddf_dev_data_get(dev); @@ -123,5 +123,5 @@ } -static int obio_dev_gone(ddf_dev_t *dev) +static errno_t obio_dev_gone(ddf_dev_t *dev) { obio_t *obio = (obio_t *)ddf_dev_data_get(dev); @@ -132,5 +132,5 @@ } -static int obio_fun_online(ddf_fun_t *fun) +static errno_t obio_fun_online(ddf_fun_t *fun) { ddf_msg(LVL_DEBUG, "obio_fun_online()"); @@ -138,5 +138,5 @@ } -static int obio_fun_offline(ddf_fun_t *fun) +static errno_t obio_fun_offline(ddf_fun_t *fun) { ddf_msg(LVL_DEBUG, "obio_fun_offline()"); Index: uspace/drv/intctl/obio/obio.c =================================================================== --- uspace/drv/intctl/obio/obio.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/intctl/obio/obio.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -114,8 +114,8 @@ /** Add OBIO device. */ -int obio_add(obio_t *obio, obio_res_t *res) +errno_t obio_add(obio_t *obio, obio_res_t *res) { ddf_fun_t *fun_a = NULL; - int rc; + errno_t rc; rc = pio_enable((void *)res->base, OBIO_SIZE, (void **) &obio->regs); @@ -155,5 +155,5 @@ /** Remove OBIO device */ -int obio_remove(obio_t *obio) +errno_t obio_remove(obio_t *obio) { return ENOTSUP; @@ -161,5 +161,5 @@ /** OBIO device gone */ -int obio_gone(obio_t *obio) +errno_t obio_gone(obio_t *obio) { return ENOTSUP; Index: uspace/drv/intctl/obio/obio.h =================================================================== --- uspace/drv/intctl/obio/obio.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/intctl/obio/obio.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -52,7 +52,7 @@ } obio_t; -extern int obio_add(obio_t *, obio_res_t *); -extern int obio_remove(obio_t *); -extern int obio_gone(obio_t *); +extern errno_t obio_add(obio_t *, obio_res_t *); +extern errno_t obio_remove(obio_t *); +extern errno_t obio_gone(obio_t *); #endif Index: uspace/drv/nic/ar9271/ar9271.c =================================================================== --- uspace/drv/nic/ar9271/ar9271.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/nic/ar9271/ar9271.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -99,12 +99,12 @@ /* Callback when new device is to be controlled by this driver. */ -static int ar9271_add_device(ddf_dev_t *); +static errno_t ar9271_add_device(ddf_dev_t *); /* IEEE 802.11 callbacks */ -static int ar9271_ieee80211_start(ieee80211_dev_t *); -static int ar9271_ieee80211_tx_handler(ieee80211_dev_t *, void *, size_t); -static int ar9271_ieee80211_set_freq(ieee80211_dev_t *, uint16_t); -static int ar9271_ieee80211_bssid_change(ieee80211_dev_t *, bool); -static int ar9271_ieee80211_key_config(ieee80211_dev_t *, ieee80211_key_config_t *, +static errno_t ar9271_ieee80211_start(ieee80211_dev_t *); +static errno_t ar9271_ieee80211_tx_handler(ieee80211_dev_t *, void *, size_t); +static errno_t ar9271_ieee80211_set_freq(ieee80211_dev_t *, uint16_t); +static errno_t ar9271_ieee80211_bssid_change(ieee80211_dev_t *, bool); +static errno_t ar9271_ieee80211_key_config(ieee80211_dev_t *, ieee80211_key_config_t *, bool); @@ -128,7 +128,7 @@ static ieee80211_iface_t ar9271_ieee80211_iface; -static int ar9271_get_device_info(ddf_fun_t *, nic_device_info_t *); -static int ar9271_get_cable_state(ddf_fun_t *, nic_cable_state_t *); -static int ar9271_get_operation_mode(ddf_fun_t *, int *, nic_channel_mode_t *, +static errno_t ar9271_get_device_info(ddf_fun_t *, nic_device_info_t *); +static errno_t ar9271_get_cable_state(ddf_fun_t *, nic_cable_state_t *); +static errno_t ar9271_get_operation_mode(ddf_fun_t *, int *, nic_channel_mode_t *, nic_role_t *); @@ -144,5 +144,5 @@ * */ -static int ar9271_get_device_info(ddf_fun_t *dev, nic_device_info_t *info) +static errno_t ar9271_get_device_info(ddf_fun_t *dev, nic_device_info_t *info) { assert(dev); @@ -164,5 +164,5 @@ * */ -static int ar9271_get_cable_state(ddf_fun_t *fun, nic_cable_state_t *state) +static errno_t ar9271_get_cable_state(ddf_fun_t *fun, nic_cable_state_t *state) { *state = NIC_CS_PLUGGED; @@ -174,5 +174,5 @@ * */ -static int ar9271_get_operation_mode(ddf_fun_t *fun, int *speed, +static errno_t ar9271_get_operation_mode(ddf_fun_t *fun, int *speed, nic_channel_mode_t *duplex, nic_role_t *role) { @@ -187,5 +187,5 @@ * */ -static int ar9271_on_multicast_mode_change(nic_t *nic, +static errno_t ar9271_on_multicast_mode_change(nic_t *nic, nic_multicast_mode_t mode, const nic_address_t *addr, size_t addr_cnt) { @@ -210,5 +210,5 @@ * */ -static int ar9271_on_unicast_mode_change(nic_t *nic, nic_unicast_mode_t mode, +static errno_t ar9271_on_unicast_mode_change(nic_t *nic, nic_unicast_mode_t mode, const nic_address_t *addr, size_t addr_cnt) { @@ -236,5 +236,5 @@ * */ -static int ar9271_on_broadcast_mode_change(nic_t *nic, +static errno_t ar9271_on_broadcast_mode_change(nic_t *nic, nic_broadcast_mode_t mode) { @@ -258,5 +258,5 @@ } -static int ar9271_data_polling(void *arg) +static errno_t ar9271_data_polling(void *arg) { assert(arg); @@ -319,5 +319,5 @@ * */ -static int ar9271_ieee80211_set_freq(ieee80211_dev_t *ieee80211_dev, +static errno_t ar9271_ieee80211_set_freq(ieee80211_dev_t *ieee80211_dev, uint16_t freq) { @@ -330,5 +330,5 @@ wmi_send_command(ar9271->htc_device, WMI_STOP_RECV, NULL, 0, NULL); - int rc = hw_freq_switch(ar9271, freq); + errno_t rc = hw_freq_switch(ar9271, freq); if (rc != EOK) { usb_log_error("Failed to HW switch frequency.\n"); @@ -352,5 +352,5 @@ } -static int ar9271_ieee80211_bssid_change(ieee80211_dev_t *ieee80211_dev, +static errno_t ar9271_ieee80211_bssid_change(ieee80211_dev_t *ieee80211_dev, bool connected) { @@ -401,5 +401,5 @@ } -static int ar9271_ieee80211_key_config(ieee80211_dev_t *ieee80211_dev, +static errno_t ar9271_ieee80211_key_config(ieee80211_dev_t *ieee80211_dev, ieee80211_key_config_t *key_conf, bool insert) { @@ -519,5 +519,5 @@ } -static int ar9271_ieee80211_tx_handler(ieee80211_dev_t *ieee80211_dev, +static errno_t ar9271_ieee80211_tx_handler(ieee80211_dev_t *ieee80211_dev, void *buffer, size_t buffer_size) { @@ -608,5 +608,5 @@ } -static int ar9271_ieee80211_start(ieee80211_dev_t *ieee80211_dev) +static errno_t ar9271_ieee80211_start(ieee80211_dev_t *ieee80211_dev) { assert(ieee80211_dev); @@ -616,5 +616,5 @@ wmi_send_command(ar9271->htc_device, WMI_FLUSH_RECV, NULL, 0, NULL); - int rc = hw_reset(ar9271); + errno_t rc = hw_reset(ar9271); if (rc != EOK) { usb_log_error("Failed to do HW reset.\n"); @@ -666,5 +666,5 @@ } -static int ar9271_init(ar9271_t *ar9271, usb_device_t *usb_device, const usb_endpoint_description_t **endpoints) +static errno_t ar9271_init(ar9271_t *ar9271, usb_device_t *usb_device, const usb_endpoint_description_t **endpoints) { ar9271->starting_up = true; @@ -680,5 +680,5 @@ } - int rc = ath_usb_init(ar9271->ath_device, usb_device, endpoints); + errno_t rc = ath_usb_init(ar9271->ath_device, usb_device, endpoints); if (rc != EOK) { free(ar9271->ath_device); @@ -737,5 +737,5 @@ * */ -static int ar9271_upload_fw(ar9271_t *ar9271) +static errno_t ar9271_upload_fw(ar9271_t *ar9271) { usb_device_t *usb_device = ar9271->usb_device; @@ -775,5 +775,5 @@ memcpy(buffer, current_data, chunk_size); usb_pipe_t *ctrl_pipe = usb_device_get_default_pipe(usb_device); - int rc = usb_control_request_set(ctrl_pipe, + errno_t rc = usb_control_request_set(ctrl_pipe, USB_REQUEST_TYPE_VENDOR, USB_REQUEST_RECIPIENT_DEVICE, @@ -803,5 +803,5 @@ */ usb_pipe_t *ctrl_pipe = usb_device_get_default_pipe(usb_device); - int rc = usb_control_request_set(ctrl_pipe, + errno_t rc = usb_control_request_set(ctrl_pipe, USB_REQUEST_TYPE_VENDOR, USB_REQUEST_RECIPIENT_DEVICE, @@ -834,5 +834,5 @@ /* USB framework initialization. */ const char *err_msg = NULL; - int rc = usb_device_create_ddf(dev, endpoints, &err_msg); + errno_t rc = usb_device_create_ddf(dev, endpoints, &err_msg); if (rc != EOK) { usb_log_error("Failed to create USB device: %s, " @@ -879,5 +879,5 @@ * @return EOK if succeed, error code otherwise */ -static int ar9271_add_device(ddf_dev_t *dev) +static errno_t ar9271_add_device(ddf_dev_t *dev) { assert(dev); @@ -896,5 +896,5 @@ /* Initialize AR9271 HTC services. */ - int rc = htc_init(ar9271->htc_device); + errno_t rc = htc_init(ar9271->htc_device); if (rc != EOK) { ar9271_delete_dev_data(ar9271); Index: uspace/drv/nic/ar9271/ath.h =================================================================== --- uspace/drv/nic/ar9271/ath.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/nic/ar9271/ath.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -40,8 +40,8 @@ /** Atheros wifi operations. */ typedef struct { - int (*send_ctrl_message)(struct ath *, void *, size_t); - int (*read_ctrl_message)(struct ath *, void *, size_t, size_t *); - int (*send_data_message)(struct ath *, void *, size_t); - int (*read_data_message)(struct ath *, void *, size_t, size_t *); + errno_t (*send_ctrl_message)(struct ath *, void *, size_t); + errno_t (*read_ctrl_message)(struct ath *, void *, size_t, size_t *); + errno_t (*send_data_message)(struct ath *, void *, size_t); + errno_t (*read_data_message)(struct ath *, void *, size_t, size_t *); } ath_ops_t; Index: uspace/drv/nic/ar9271/ath_usb.c =================================================================== --- uspace/drv/nic/ar9271/ath_usb.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/nic/ar9271/ath_usb.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -39,8 +39,8 @@ #include "ath_usb.h" -static int ath_usb_send_ctrl_message(ath_t *, void *, size_t); -static int ath_usb_read_ctrl_message(ath_t *, void *, size_t, size_t *); -static int ath_usb_send_data_message(ath_t *, void *, size_t); -static int ath_usb_read_data_message(ath_t *, void *, size_t, size_t *); +static errno_t ath_usb_send_ctrl_message(ath_t *, void *, size_t); +static errno_t ath_usb_read_ctrl_message(ath_t *, void *, size_t, size_t *); +static errno_t ath_usb_send_data_message(ath_t *, void *, size_t); +static errno_t ath_usb_read_data_message(ath_t *, void *, size_t, size_t *); static ath_ops_t ath_usb_ops = { @@ -59,5 +59,5 @@ * */ -int ath_usb_init(ath_t *ath, usb_device_t *usb_device, const usb_endpoint_description_t **endpoints) +errno_t ath_usb_init(ath_t *ath, usb_device_t *usb_device, const usb_endpoint_description_t **endpoints) { ath_usb_t *ath_usb = malloc(sizeof(ath_usb_t)); @@ -110,5 +110,5 @@ * */ -static int ath_usb_send_ctrl_message(ath_t *ath, void *buffer, +static errno_t ath_usb_send_ctrl_message(ath_t *ath, void *buffer, size_t buffer_size) { @@ -127,5 +127,5 @@ * */ -static int ath_usb_read_ctrl_message(ath_t *ath, void *buffer, +static errno_t ath_usb_read_ctrl_message(ath_t *ath, void *buffer, size_t buffer_size, size_t *transferred_size) { @@ -143,5 +143,5 @@ * */ -static int ath_usb_send_data_message(ath_t *ath, void *buffer, +static errno_t ath_usb_send_data_message(ath_t *ath, void *buffer, size_t buffer_size) { @@ -158,6 +158,6 @@ ath_usb_t *ath_usb = (ath_usb_t *) ath->specific_data; - int ret_val = usb_pipe_write(ath_usb->output_data_pipe, complete_buffer, - complete_buffer_size); + const errno_t ret_val = usb_pipe_write(ath_usb->output_data_pipe, + complete_buffer, complete_buffer_size); free(complete_buffer); @@ -176,5 +176,5 @@ * */ -static int ath_usb_read_data_message(ath_t *ath, void *buffer, +static errno_t ath_usb_read_data_message(ath_t *ath, void *buffer, size_t buffer_size, size_t *transferred_size) { Index: uspace/drv/nic/ar9271/ath_usb.h =================================================================== --- uspace/drv/nic/ar9271/ath_usb.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/nic/ar9271/ath_usb.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -59,5 +59,5 @@ } ath_usb_data_header_t; -extern int ath_usb_init(ath_t *, usb_device_t *, const usb_endpoint_description_t **endpoints); +extern errno_t ath_usb_init(ath_t *, usb_device_t *, const usb_endpoint_description_t **endpoints); #endif /* ATHEROS_ATH_USB_H */ Index: uspace/drv/nic/ar9271/htc.c =================================================================== --- uspace/drv/nic/ar9271/htc.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/nic/ar9271/htc.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -66,5 +66,5 @@ } -int htc_init_new_vif(htc_device_t *htc_device) +errno_t htc_init_new_vif(htc_device_t *htc_device) { htc_vif_msg_t vif_msg; @@ -153,5 +153,5 @@ * */ -int htc_send_control_message(htc_device_t *htc_device, void *buffer, +errno_t htc_send_control_message(htc_device_t *htc_device, void *buffer, size_t buffer_size, uint8_t endpoint_id) { @@ -176,5 +176,5 @@ * */ -int htc_send_data_message(htc_device_t *htc_device, void *buffer, +errno_t htc_send_data_message(htc_device_t *htc_device, void *buffer, size_t buffer_size, uint8_t endpoint_id) { @@ -199,5 +199,5 @@ * */ -int htc_read_data_message(htc_device_t *htc_device, void *buffer, +errno_t htc_read_data_message(htc_device_t *htc_device, void *buffer, size_t buffer_size, size_t *transferred_size) { @@ -219,5 +219,5 @@ * */ -int htc_read_control_message(htc_device_t *htc_device, void *buffer, +errno_t htc_read_control_message(htc_device_t *htc_device, void *buffer, size_t buffer_size, size_t *transferred_size) { @@ -239,5 +239,5 @@ * */ -static int htc_connect_service(htc_device_t *htc_device, +static errno_t htc_connect_service(htc_device_t *htc_device, wmi_services_t service_id, int *response_endpoint_no) { @@ -261,5 +261,5 @@ /* Send HTC message. */ - int rc = htc_send_control_message(htc_device, buffer, buffer_size, + errno_t rc = htc_send_control_message(htc_device, buffer, buffer_size, htc_device->endpoints.ctrl_endpoint); if (rc != EOK) { @@ -312,5 +312,5 @@ * */ -static int htc_config_credits(htc_device_t *htc_device) +static errno_t htc_config_credits(htc_device_t *htc_device) { size_t buffer_size = sizeof(htc_frame_header_t) + @@ -327,5 +327,5 @@ /* Send HTC message. */ - int rc = htc_send_control_message(htc_device, buffer, buffer_size, + errno_t rc = htc_send_control_message(htc_device, buffer, buffer_size, htc_device->endpoints.ctrl_endpoint); if (rc != EOK) { @@ -360,5 +360,5 @@ * */ -static int htc_complete_setup(htc_device_t *htc_device) +static errno_t htc_complete_setup(htc_device_t *htc_device) { size_t buffer_size = sizeof(htc_frame_header_t) + @@ -373,5 +373,5 @@ /* Send HTC message. */ - int rc = htc_send_control_message(htc_device, buffer, buffer_size, + errno_t rc = htc_send_control_message(htc_device, buffer, buffer_size, htc_device->endpoints.ctrl_endpoint); if (rc != EOK) @@ -394,5 +394,5 @@ * */ -static int htc_check_ready(htc_device_t *htc_device) +static errno_t htc_check_ready(htc_device_t *htc_device) { size_t buffer_size = htc_device->ath_device->ctrl_response_length; @@ -400,5 +400,5 @@ /* Read response from device. */ - int rc = htc_read_control_message(htc_device, buffer, buffer_size, + errno_t rc = htc_read_control_message(htc_device, buffer, buffer_size, NULL); if (rc != EOK) { @@ -430,5 +430,5 @@ * */ -int htc_device_init(ath_t *ath_device, ieee80211_dev_t *ieee80211_dev, +errno_t htc_device_init(ath_t *ath_device, ieee80211_dev_t *ieee80211_dev, htc_device_t *htc_device) { @@ -451,8 +451,8 @@ * */ -int htc_init(htc_device_t *htc_device) +errno_t htc_init(htc_device_t *htc_device) { /* First check ready message in device. */ - int rc = htc_check_ready(htc_device); + errno_t rc = htc_check_ready(htc_device); if (rc != EOK) { usb_log_error("Device is not in ready state after loading " Index: uspace/drv/nic/ar9271/htc.h =================================================================== --- uspace/drv/nic/ar9271/htc.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/nic/ar9271/htc.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -297,11 +297,11 @@ } __attribute__((packed)) htc_setup_complete_msg_t; -extern int htc_device_init(ath_t *, ieee80211_dev_t *, htc_device_t *); -extern int htc_init(htc_device_t *); -extern int htc_init_new_vif(htc_device_t *); -extern int htc_read_control_message(htc_device_t *, void *, size_t, size_t *); -extern int htc_read_data_message(htc_device_t *, void *, size_t, size_t *); -extern int htc_send_control_message(htc_device_t *, void *, size_t, uint8_t); -extern int htc_send_data_message(htc_device_t *, void *, size_t, uint8_t); +extern errno_t htc_device_init(ath_t *, ieee80211_dev_t *, htc_device_t *); +extern errno_t htc_init(htc_device_t *); +extern errno_t htc_init_new_vif(htc_device_t *); +extern errno_t htc_read_control_message(htc_device_t *, void *, size_t, size_t *); +extern errno_t htc_read_data_message(htc_device_t *, void *, size_t, size_t *); +extern errno_t htc_send_control_message(htc_device_t *, void *, size_t, uint8_t); +extern errno_t htc_send_data_message(htc_device_t *, void *, size_t, uint8_t); #endif /* ATHEROS_HTC_H */ Index: uspace/drv/nic/ar9271/hw.c =================================================================== --- uspace/drv/nic/ar9271/hw.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/nic/ar9271/hw.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -52,5 +52,5 @@ * */ -static int hw_read_wait(ar9271_t *ar9271, uint32_t offset, uint32_t mask, +static errno_t hw_read_wait(ar9271_t *ar9271, uint32_t offset, uint32_t mask, uint32_t value) { @@ -67,5 +67,5 @@ } -static int hw_reset_power_on(ar9271_t *ar9271) +static errno_t hw_reset_power_on(ar9271_t *ar9271) { wmi_reg_t buffer[] = { @@ -93,5 +93,5 @@ wmi_reg_write(ar9271->htc_device, AR9271_RTC_RESET, 1); - int rc = hw_read_wait(ar9271, + errno_t rc = hw_read_wait(ar9271, AR9271_RTC_STATUS, AR9271_RTC_STATUS_MASK, @@ -105,5 +105,5 @@ } -static int hw_set_reset(ar9271_t *ar9271, bool cold) +static errno_t hw_set_reset(ar9271_t *ar9271, bool cold) { uint32_t reset_value = AR9271_RTC_RC_MAC_WARM; @@ -135,5 +135,5 @@ wmi_reg_write(ar9271->htc_device, AR9271_RTC_RC, 0); - int rc = hw_read_wait(ar9271, AR9271_RTC_RC, AR9271_RTC_RC_MASK, 0); + errno_t rc = hw_read_wait(ar9271, AR9271_RTC_RC, AR9271_RTC_RC_MASK, 0); if (rc != EOK) { usb_log_error("Failed to wait for RTC RC register.\n"); @@ -148,5 +148,5 @@ } -static int hw_addr_init(ar9271_t *ar9271) +static errno_t hw_addr_init(ar9271_t *ar9271) { uint32_t value; @@ -164,5 +164,5 @@ nic_t *nic = nic_get_from_ddf_dev(ar9271->ddf_dev); - int rc = nic_report_address(nic, &ar9271_address); + errno_t rc = nic_report_address(nic, &ar9271_address); if (rc != EOK) { usb_log_error("Failed to report NIC HW address.\n"); @@ -173,5 +173,5 @@ } -static int hw_gpio_set_output(ar9271_t *ar9271, uint32_t gpio, uint32_t type) +static errno_t hw_gpio_set_output(ar9271_t *ar9271, uint32_t gpio, uint32_t type) { uint32_t address; @@ -204,5 +204,5 @@ } -static int hw_gpio_set_value(ar9271_t *ar9271, uint32_t gpio, uint32_t value) +static errno_t hw_gpio_set_value(ar9271_t *ar9271, uint32_t gpio, uint32_t value) { wmi_reg_set_clear_bit(ar9271->htc_device, AR9271_GPIO_IN_OUT, @@ -218,7 +218,7 @@ * */ -static int hw_init_proc(ar9271_t *ar9271) -{ - int rc = hw_reset_power_on(ar9271); +static errno_t hw_init_proc(ar9271_t *ar9271) +{ + errno_t rc = hw_reset_power_on(ar9271); if (rc != EOK) { usb_log_error("Failed to HW reset power on.\n"); @@ -241,7 +241,7 @@ } -static int hw_init_led(ar9271_t *ar9271) -{ - int rc = hw_gpio_set_output(ar9271, AR9271_LED_PIN, +static errno_t hw_init_led(ar9271_t *ar9271) +{ + errno_t rc = hw_gpio_set_output(ar9271, AR9271_LED_PIN, AR9271_GPIO_OUT_MUX_AS_OUT); if (rc != EOK) { @@ -259,5 +259,5 @@ } -static int hw_activate_phy(ar9271_t *ar9271) +static errno_t hw_activate_phy(ar9271_t *ar9271) { wmi_reg_write(ar9271->htc_device, AR9271_PHY_ACTIVE, 1); @@ -267,5 +267,5 @@ } -static int hw_set_operating_mode(ar9271_t *ar9271, +static errno_t hw_set_operating_mode(ar9271_t *ar9271, ieee80211_operating_mode_t op_mode) { @@ -295,7 +295,7 @@ } -static int hw_reset_operating_mode(ar9271_t *ar9271) -{ - int rc = hw_set_operating_mode(ar9271, IEEE80211_OPMODE_STATION); +static errno_t hw_reset_operating_mode(ar9271_t *ar9271) +{ + errno_t rc = hw_set_operating_mode(ar9271, IEEE80211_OPMODE_STATION); if (rc != EOK) { usb_log_error("Failed to set opmode to station.\n"); @@ -306,5 +306,5 @@ } -static int hw_noise_floor_calibration(ar9271_t *ar9271) +static errno_t hw_noise_floor_calibration(ar9271_t *ar9271) { uint32_t value; @@ -325,5 +325,5 @@ AR9271_AGC_CONTROL_NF_CALIB); - int rc = hw_read_wait(ar9271, AR9271_AGC_CONTROL, + errno_t rc = hw_read_wait(ar9271, AR9271_AGC_CONTROL, AR9271_AGC_CONTROL_NF_CALIB, 0); if (rc != EOK) { @@ -344,5 +344,5 @@ } -static int hw_set_freq(ar9271_t *ar9271, uint16_t freq) +static errno_t hw_set_freq(ar9271_t *ar9271, uint16_t freq) { /* Not supported channel frequency. */ @@ -373,9 +373,9 @@ } -int hw_freq_switch(ar9271_t *ar9271, uint16_t freq) +errno_t hw_freq_switch(ar9271_t *ar9271, uint16_t freq) { wmi_reg_write(ar9271->htc_device, AR9271_PHY_RFBUS_KILL, 0x1); - int rc = hw_read_wait(ar9271, AR9271_PHY_RFBUS_GRANT, 0x1, 0x1); + errno_t rc = hw_read_wait(ar9271, AR9271_PHY_RFBUS_GRANT, 0x1, 0x1); if (rc != EOK) { usb_log_error("Failed to kill RF bus.\n"); @@ -407,5 +407,5 @@ } -int hw_set_rx_filter(ar9271_t *ar9271, bool assoc) +errno_t hw_set_rx_filter(ar9271_t *ar9271, bool assoc) { uint32_t additional_bits = 0; @@ -425,5 +425,5 @@ } -int hw_set_bssid(ar9271_t *ar9271) +errno_t hw_set_bssid(ar9271_t *ar9271) { ieee80211_dev_t *ieee80211_dev = ar9271->ieee80211_dev; @@ -445,10 +445,10 @@ } -int hw_rx_init(ar9271_t *ar9271) +errno_t hw_rx_init(ar9271_t *ar9271) { wmi_reg_write(ar9271->htc_device, AR9271_COMMAND, AR9271_COMMAND_RX_ENABLE); - int rc = hw_set_rx_filter(ar9271, false); + errno_t rc = hw_set_rx_filter(ar9271, false); if (rc != EOK) { usb_log_error("Failed to set RX filtering.\n"); @@ -465,5 +465,5 @@ } -static int hw_init_pll(ar9271_t *ar9271) +static errno_t hw_init_pll(ar9271_t *ar9271) { /* Some magic here (set for 2GHz channels). But VERY important :-) */ @@ -510,5 +510,5 @@ } -static int hw_calibration(ar9271_t *ar9271) +static errno_t hw_calibration(ar9271_t *ar9271) { wmi_reg_set_bit(ar9271->htc_device, AR9271_CARRIER_LEAK_CONTROL, @@ -523,5 +523,5 @@ AR9271_AGC_CONTROL_CALIB); - int rc = hw_read_wait(ar9271, AR9271_AGC_CONTROL, + errno_t rc = hw_read_wait(ar9271, AR9271_AGC_CONTROL, AR9271_AGC_CONTROL_CALIB, 0); if (rc != EOK) { @@ -540,5 +540,5 @@ } -int hw_reset(ar9271_t *ar9271) +errno_t hw_reset(ar9271_t *ar9271) { /* Set physical layer as deactivated. */ @@ -559,5 +559,5 @@ hw_set_reset(ar9271, true); - int rc = hw_init_pll(ar9271); + errno_t rc = hw_init_pll(ar9271); if (rc != EOK) { usb_log_error("Failed to init PLL.\n"); @@ -638,7 +638,7 @@ * @return EOK if succeed, error code otherwise. */ -int hw_init(ar9271_t *ar9271) -{ - int rc = hw_init_proc(ar9271); +errno_t hw_init(ar9271_t *ar9271) +{ + errno_t rc = hw_init_proc(ar9271); if (rc != EOK) { usb_log_error("Failed to HW reset device.\n"); Index: uspace/drv/nic/ar9271/hw.h =================================================================== --- uspace/drv/nic/ar9271/hw.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/nic/ar9271/hw.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -41,10 +41,10 @@ #define HW_WAIT_TIME_US 10 -extern int hw_init(ar9271_t *); -extern int hw_freq_switch(ar9271_t *, uint16_t); -extern int hw_rx_init(ar9271_t *); -extern int hw_reset(ar9271_t *); -extern int hw_set_bssid(ar9271_t *); -extern int hw_set_rx_filter(ar9271_t *, bool); +extern errno_t hw_init(ar9271_t *); +extern errno_t hw_freq_switch(ar9271_t *, uint16_t); +extern errno_t hw_rx_init(ar9271_t *); +extern errno_t hw_reset(ar9271_t *); +extern errno_t hw_set_bssid(ar9271_t *); +extern errno_t hw_set_rx_filter(ar9271_t *, bool); #endif /* ATHEROS_HW_H */ Index: uspace/drv/nic/ar9271/wmi.c =================================================================== --- uspace/drv/nic/ar9271/wmi.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/nic/ar9271/wmi.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -50,5 +50,5 @@ * */ -int wmi_reg_read(htc_device_t *htc_device, uint32_t reg_offset, uint32_t *res) +errno_t wmi_reg_read(htc_device_t *htc_device, uint32_t reg_offset, uint32_t *res) { uint32_t cmd_value = host2uint32_t_be(reg_offset); @@ -57,5 +57,5 @@ malloc(htc_device->ath_device->ctrl_response_length); - int rc = wmi_send_command(htc_device, WMI_REG_READ, + errno_t rc = wmi_send_command(htc_device, WMI_REG_READ, (uint8_t *) &cmd_value, sizeof(cmd_value), resp_buffer); @@ -82,5 +82,5 @@ * */ -int wmi_reg_write(htc_device_t *htc_device, uint32_t reg_offset, uint32_t val) +errno_t wmi_reg_write(htc_device_t *htc_device, uint32_t reg_offset, uint32_t val) { uint32_t cmd_buffer[] = { @@ -92,5 +92,5 @@ malloc(htc_device->ath_device->ctrl_response_length); - int rc = wmi_send_command(htc_device, WMI_REG_WRITE, + errno_t rc = wmi_send_command(htc_device, WMI_REG_WRITE, (uint8_t *) &cmd_buffer, sizeof(cmd_buffer), resp_buffer); @@ -115,10 +115,10 @@ * */ -int wmi_reg_set_clear_bit(htc_device_t *htc_device, uint32_t reg_offset, +errno_t wmi_reg_set_clear_bit(htc_device_t *htc_device, uint32_t reg_offset, uint32_t set_bit, uint32_t clear_bit) { uint32_t value; - int rc = wmi_reg_read(htc_device, reg_offset, &value); + errno_t rc = wmi_reg_read(htc_device, reg_offset, &value); if (rc != EOK) { usb_log_error("Failed to read registry value in RMW " @@ -149,5 +149,5 @@ * */ -int wmi_reg_set_bit(htc_device_t *htc_device, uint32_t reg_offset, +errno_t wmi_reg_set_bit(htc_device_t *htc_device, uint32_t reg_offset, uint32_t set_bit) { @@ -164,5 +164,5 @@ * */ -int wmi_reg_clear_bit(htc_device_t *htc_device, uint32_t reg_offset, +errno_t wmi_reg_clear_bit(htc_device_t *htc_device, uint32_t reg_offset, uint32_t clear_bit) { @@ -179,5 +179,5 @@ * */ -int wmi_reg_buffer_write(htc_device_t *htc_device, wmi_reg_t *reg_buffer, +errno_t wmi_reg_buffer_write(htc_device_t *htc_device, wmi_reg_t *reg_buffer, size_t elements) { @@ -198,5 +198,5 @@ } - int rc = wmi_send_command(htc_device, WMI_REG_WRITE, + errno_t rc = wmi_send_command(htc_device, WMI_REG_WRITE, (uint8_t *) buffer, buffer_size, resp_buffer); @@ -223,5 +223,5 @@ * */ -int wmi_send_command(htc_device_t *htc_device, wmi_command_t command_id, +errno_t wmi_send_command(htc_device_t *htc_device, wmi_command_t command_id, uint8_t *command_buffer, uint32_t command_length, void *response_buffer) { @@ -242,5 +242,5 @@ /* Send message. */ - int rc = htc_send_control_message(htc_device, buffer, buffer_size, + errno_t rc = htc_send_control_message(htc_device, buffer, buffer_size, htc_device->endpoints.wmi_endpoint); if (rc != EOK) { Index: uspace/drv/nic/ar9271/wmi.h =================================================================== --- uspace/drv/nic/ar9271/wmi.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/nic/ar9271/wmi.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -117,11 +117,11 @@ } wmi_reg_t; -extern int wmi_reg_read(htc_device_t *, uint32_t, uint32_t *); -extern int wmi_reg_write(htc_device_t *, uint32_t, uint32_t); -extern int wmi_reg_set_clear_bit(htc_device_t *, uint32_t, uint32_t, uint32_t); -extern int wmi_reg_set_bit(htc_device_t *, uint32_t, uint32_t); -extern int wmi_reg_clear_bit(htc_device_t *, uint32_t, uint32_t); -extern int wmi_reg_buffer_write(htc_device_t *, wmi_reg_t *, size_t); -extern int wmi_send_command(htc_device_t *, wmi_command_t, uint8_t *, uint32_t, +extern errno_t wmi_reg_read(htc_device_t *, uint32_t, uint32_t *); +extern errno_t wmi_reg_write(htc_device_t *, uint32_t, uint32_t); +extern errno_t wmi_reg_set_clear_bit(htc_device_t *, uint32_t, uint32_t, uint32_t); +extern errno_t wmi_reg_set_bit(htc_device_t *, uint32_t, uint32_t); +extern errno_t wmi_reg_clear_bit(htc_device_t *, uint32_t, uint32_t); +extern errno_t wmi_reg_buffer_write(htc_device_t *, wmi_reg_t *, size_t); +extern errno_t wmi_send_command(htc_device_t *, wmi_command_t, uint8_t *, uint32_t, void *); Index: uspace/drv/nic/e1k/e1k.c =================================================================== --- uspace/drv/nic/e1k/e1k.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/nic/e1k/e1k.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -179,22 +179,22 @@ FIBRIL_MUTEX_INITIALIZE(irq_reg_mutex); -static int e1000_get_address(e1000_t *, nic_address_t *); +static errno_t e1000_get_address(e1000_t *, nic_address_t *); static void e1000_eeprom_get_address(e1000_t *, nic_address_t *); -static int e1000_set_addr(ddf_fun_t *, const nic_address_t *); - -static int e1000_defective_get_mode(ddf_fun_t *, uint32_t *); -static int e1000_defective_set_mode(ddf_fun_t *, uint32_t); - -static int e1000_get_cable_state(ddf_fun_t *, nic_cable_state_t *); -static int e1000_get_device_info(ddf_fun_t *, nic_device_info_t *); -static int e1000_get_operation_mode(ddf_fun_t *, int *, +static errno_t e1000_set_addr(ddf_fun_t *, const nic_address_t *); + +static errno_t e1000_defective_get_mode(ddf_fun_t *, uint32_t *); +static errno_t e1000_defective_set_mode(ddf_fun_t *, uint32_t); + +static errno_t e1000_get_cable_state(ddf_fun_t *, nic_cable_state_t *); +static errno_t e1000_get_device_info(ddf_fun_t *, nic_device_info_t *); +static errno_t e1000_get_operation_mode(ddf_fun_t *, int *, nic_channel_mode_t *, nic_role_t *); -static int e1000_set_operation_mode(ddf_fun_t *, int, +static errno_t e1000_set_operation_mode(ddf_fun_t *, int, nic_channel_mode_t, nic_role_t); -static int e1000_autoneg_enable(ddf_fun_t *, uint32_t); -static int e1000_autoneg_disable(ddf_fun_t *); -static int e1000_autoneg_restart(ddf_fun_t *); - -static int e1000_vlan_set_tag(ddf_fun_t *, uint16_t, bool, bool); +static errno_t e1000_autoneg_enable(ddf_fun_t *, uint32_t); +static errno_t e1000_autoneg_disable(ddf_fun_t *); +static errno_t e1000_autoneg_restart(ddf_fun_t *); + +static errno_t e1000_vlan_set_tag(ddf_fun_t *, uint16_t, bool, bool); /** Network interface options for E1000 card driver */ @@ -219,5 +219,5 @@ static ddf_dev_ops_t e1000_dev_ops; -static int e1000_dev_add(ddf_dev_t *); +static errno_t e1000_dev_add(ddf_dev_t *); /** Basic driver operations for E1000 driver */ @@ -233,6 +233,6 @@ /* The default implementation callbacks */ -static int e1000_on_activating(nic_t *); -static int e1000_on_stopping(nic_t *); +static errno_t e1000_on_activating(nic_t *); +static errno_t e1000_on_stopping(nic_t *); static void e1000_send_frame(nic_t *, void *, size_t); @@ -288,5 +288,5 @@ * */ -static int e1000_get_device_info(ddf_fun_t *dev, nic_device_info_t *info) +static errno_t e1000_get_device_info(ddf_fun_t *dev, nic_device_info_t *info) { assert(dev); @@ -316,5 +316,5 @@ * */ -static int e1000_get_cable_state(ddf_fun_t *fun, nic_cable_state_t *state) +static errno_t e1000_get_cable_state(ddf_fun_t *fun, nic_cable_state_t *state) { e1000_t *e1000 = DRIVER_DATA_FUN(fun); @@ -335,5 +335,5 @@ * */ -static int e1000_get_operation_mode(ddf_fun_t *fun, int *speed, +static errno_t e1000_get_operation_mode(ddf_fun_t *fun, int *speed, nic_channel_mode_t *duplex, nic_role_t *role) { @@ -386,5 +386,5 @@ * */ -static int e1000_set_operation_mode(ddf_fun_t *fun, int speed, +static errno_t e1000_set_operation_mode(ddf_fun_t *fun, int speed, nic_channel_mode_t duplex, nic_role_t role) { @@ -434,5 +434,5 @@ * */ -static int e1000_autoneg_enable(ddf_fun_t *fun, uint32_t advertisement) +static errno_t e1000_autoneg_enable(ddf_fun_t *fun, uint32_t advertisement) { e1000_t *e1000 = DRIVER_DATA_FUN(fun); @@ -462,5 +462,5 @@ * */ -static int e1000_autoneg_disable(ddf_fun_t *fun) +static errno_t e1000_autoneg_disable(ddf_fun_t *fun) { e1000_t *e1000 = DRIVER_DATA_FUN(fun); @@ -490,5 +490,5 @@ * */ -static int e1000_autoneg_restart(ddf_fun_t *dev) +static errno_t e1000_autoneg_restart(ddf_fun_t *dev) { return e1000_autoneg_enable(dev, 0); @@ -501,5 +501,5 @@ * */ -static int e1000_defective_get_mode(ddf_fun_t *fun, uint32_t *mode) +static errno_t e1000_defective_get_mode(ddf_fun_t *fun, uint32_t *mode) { e1000_t *e1000 = DRIVER_DATA_FUN(fun); @@ -522,8 +522,8 @@ * */ -static int e1000_defective_set_mode(ddf_fun_t *fun, uint32_t mode) +static errno_t e1000_defective_set_mode(ddf_fun_t *fun, uint32_t mode) { e1000_t *e1000 = DRIVER_DATA_FUN(fun); - int rc = EOK; + errno_t rc = EOK; fibril_mutex_lock(&e1000->rx_lock); @@ -827,9 +827,9 @@ * */ -static int e1000_on_multicast_mode_change(nic_t *nic, nic_multicast_mode_t mode, +static errno_t e1000_on_multicast_mode_change(nic_t *nic, nic_multicast_mode_t mode, const nic_address_t *addr, size_t addr_cnt) { e1000_t *e1000 = DRIVER_DATA_NIC(nic); - int rc = EOK; + errno_t rc = EOK; fibril_mutex_lock(&e1000->rx_lock); @@ -881,9 +881,9 @@ * */ -static int e1000_on_unicast_mode_change(nic_t *nic, nic_unicast_mode_t mode, +static errno_t e1000_on_unicast_mode_change(nic_t *nic, nic_unicast_mode_t mode, const nic_address_t *addr, size_t addr_cnt) { e1000_t *e1000 = DRIVER_DATA_NIC(nic); - int rc = EOK; + errno_t rc = EOK; fibril_mutex_lock(&e1000->rx_lock); @@ -937,8 +937,8 @@ * */ -static int e1000_on_broadcast_mode_change(nic_t *nic, nic_broadcast_mode_t mode) +static errno_t e1000_on_broadcast_mode_change(nic_t *nic, nic_broadcast_mode_t mode) { e1000_t *e1000 = DRIVER_DATA_NIC(nic); - int rc = EOK; + errno_t rc = EOK; fibril_mutex_lock(&e1000->rx_lock); @@ -1048,5 +1048,5 @@ * */ -static int e1000_vlan_set_tag(ddf_fun_t *fun, uint16_t tag, bool add, +static errno_t e1000_vlan_set_tag(ddf_fun_t *fun, uint16_t tag, bool add, bool strip) { @@ -1264,5 +1264,5 @@ * */ -inline static int e1000_register_int_handler(nic_t *nic, cap_handle_t *handle) +inline static errno_t e1000_register_int_handler(nic_t *nic, cap_handle_t *handle) { e1000_t *e1000 = DRIVER_DATA_NIC(nic); @@ -1275,5 +1275,5 @@ e1000_irq_code.cmds[2].addr = e1000->reg_base_phys + E1000_IMC; - int rc = register_interrupt_handler(nic_get_ddf_dev(nic), e1000->irq, + errno_t rc = register_interrupt_handler(nic_get_ddf_dev(nic), e1000->irq, e1000_interrupt_handler, &e1000_irq_code, handle); @@ -1319,5 +1319,5 @@ * */ -static int e1000_poll_mode_change(nic_t *nic, nic_poll_mode_t mode, +static errno_t e1000_poll_mode_change(nic_t *nic, nic_poll_mode_t mode, const struct timeval *period) { @@ -1373,5 +1373,5 @@ * */ -static int e1000_initialize_rx_structure(nic_t *nic) +static errno_t e1000_initialize_rx_structure(nic_t *nic) { e1000_t *e1000 = DRIVER_DATA_NIC(nic); @@ -1379,5 +1379,5 @@ e1000->rx_ring_virt = AS_AREA_ANY; - int rc = dmamem_map_anonymous( + errno_t rc = dmamem_map_anonymous( E1000_RX_FRAME_COUNT * sizeof(e1000_rx_descriptor_t), DMAMEM_4GiB, AS_AREA_READ | AS_AREA_WRITE, 0, @@ -1567,5 +1567,5 @@ * */ -static int e1000_initialize_tx_structure(e1000_t *e1000) +static errno_t e1000_initialize_tx_structure(e1000_t *e1000) { size_t i; @@ -1579,5 +1579,5 @@ e1000->tx_frame_virt = NULL; - int rc = dmamem_map_anonymous( + errno_t rc = dmamem_map_anonymous( E1000_TX_FRAME_COUNT * sizeof(e1000_tx_descriptor_t), DMAMEM_4GiB, AS_AREA_READ | AS_AREA_WRITE, 0, @@ -1718,5 +1718,5 @@ * */ -static int e1000_reset(nic_t *nic) +static errno_t e1000_reset(nic_t *nic) { e1000_t *e1000 = DRIVER_DATA_NIC(nic); @@ -1749,5 +1749,5 @@ * */ -static int e1000_on_activating(nic_t *nic) +static errno_t e1000_on_activating(nic_t *nic) { assert(nic); @@ -1761,5 +1761,5 @@ e1000_enable_interrupts(e1000); - int rc = hw_res_enable_interrupt(e1000->parent_sess, e1000->irq); + errno_t rc = hw_res_enable_interrupt(e1000->parent_sess, e1000->irq); if (rc != EOK) { e1000_disable_interrupts(e1000); @@ -1795,5 +1795,5 @@ * */ -static int e1000_on_down_unlocked(nic_t *nic) +static errno_t e1000_on_down_unlocked(nic_t *nic) { e1000_t *e1000 = DRIVER_DATA_NIC(nic); @@ -1826,5 +1826,5 @@ * */ -static int e1000_on_down(nic_t *nic) +static errno_t e1000_on_down(nic_t *nic) { e1000_t *e1000 = DRIVER_DATA_NIC(nic); @@ -1834,5 +1834,5 @@ fibril_mutex_lock(&e1000->ctrl_lock); - int rc = e1000_on_down_unlocked(nic); + errno_t rc = e1000_on_down_unlocked(nic); fibril_mutex_unlock(&e1000->ctrl_lock); @@ -1851,5 +1851,5 @@ * */ -static int e1000_on_stopping(nic_t *nic) +static errno_t e1000_on_stopping(nic_t *nic) { e1000_t *e1000 = DRIVER_DATA_NIC(nic); @@ -1859,5 +1859,5 @@ fibril_mutex_lock(&e1000->ctrl_lock); - int rc = e1000_on_down_unlocked(nic); + errno_t rc = e1000_on_down_unlocked(nic); if (rc == EOK) rc = e1000_reset(nic); @@ -1943,5 +1943,5 @@ * */ -static int e1000_fill_resource_info(ddf_dev_t *dev, +static errno_t e1000_fill_resource_info(ddf_dev_t *dev, const hw_res_list_parsed_t *hw_resources) { @@ -1968,5 +1968,5 @@ * */ -static int e1000_get_resource_info(ddf_dev_t *dev) +static errno_t e1000_get_resource_info(ddf_dev_t *dev) { assert(dev != NULL); @@ -1977,5 +1977,5 @@ /* Get hw resources form parent driver */ - int rc = nic_get_resources(NIC_DATA_DEV(dev), &hw_res_parsed); + errno_t rc = nic_get_resources(NIC_DATA_DEV(dev), &hw_res_parsed); if (rc != EOK) return rc; @@ -1996,5 +1996,5 @@ * */ -static int e1000_device_initialize(ddf_dev_t *dev) +static errno_t e1000_device_initialize(ddf_dev_t *dev) { /* Allocate driver data for the device. */ @@ -2012,5 +2012,5 @@ /* Obtain and fill hardware resources info */ - int rc = e1000_get_resource_info(dev); + errno_t rc = e1000_get_resource_info(dev); if (rc != EOK) { ddf_msg(LVL_ERROR, "Cannot obtain hardware resources"); @@ -2110,9 +2110,9 @@ * */ -static int e1000_pio_enable(ddf_dev_t *dev) +static errno_t e1000_pio_enable(ddf_dev_t *dev) { e1000_t *e1000 = DRIVER_DATA_DEV(dev); - int rc = pio_enable(e1000->reg_base_phys, 8 * PAGE_SIZE, + errno_t rc = pio_enable(e1000->reg_base_phys, 8 * PAGE_SIZE, &e1000->reg_base_virt); if (rc != EOK) @@ -2127,10 +2127,10 @@ * */ -int e1000_dev_add(ddf_dev_t *dev) +errno_t e1000_dev_add(ddf_dev_t *dev) { ddf_fun_t *fun; /* Initialize device structure for E1000 */ - int rc = e1000_device_initialize(dev); + errno_t rc = e1000_device_initialize(dev); if (rc != EOK) return rc; @@ -2258,5 +2258,5 @@ * */ -static int e1000_get_address(e1000_t *e1000, nic_address_t *address) +static errno_t e1000_get_address(e1000_t *e1000, nic_address_t *address) { fibril_mutex_lock(&e1000->rx_lock); @@ -2291,5 +2291,5 @@ * @return An error code otherwise */ -static int e1000_set_addr(ddf_fun_t *fun, const nic_address_t *addr) +static errno_t e1000_set_addr(ddf_fun_t *fun, const nic_address_t *addr) { nic_t *nic = NIC_DATA_FUN(fun); @@ -2299,5 +2299,5 @@ fibril_mutex_lock(&e1000->tx_lock); - int rc = nic_report_address(nic, addr); + errno_t rc = nic_report_address(nic, addr); if (rc == EOK) e1000_write_receive_address(e1000, 0, addr, false); Index: uspace/drv/nic/ne2k/dp8390.c =================================================================== --- uspace/drv/nic/ne2k/dp8390.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/nic/ne2k/dp8390.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -194,5 +194,5 @@ * */ -int ne2k_probe(ne2k_t *ne2k) +errno_t ne2k_probe(ne2k_t *ne2k) { unsigned int i; @@ -250,5 +250,5 @@ * */ -int ne2k_up(ne2k_t *ne2k) +errno_t ne2k_up(ne2k_t *ne2k) { if (!ne2k->probed) Index: uspace/drv/nic/ne2k/dp8390.h =================================================================== --- uspace/drv/nic/ne2k/dp8390.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/nic/ne2k/dp8390.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -265,6 +265,6 @@ } ne2k_t; -extern int ne2k_probe(ne2k_t *); -extern int ne2k_up(ne2k_t *); +extern errno_t ne2k_probe(ne2k_t *); +extern errno_t ne2k_up(ne2k_t *); extern void ne2k_down(ne2k_t *); extern void ne2k_send(nic_t *, void *, size_t); Index: uspace/drv/nic/ne2k/ne2k.c =================================================================== --- uspace/drv/nic/ne2k/ne2k.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/nic/ne2k/ne2k.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -124,5 +124,5 @@ static void ne2k_interrupt_handler(ipc_call_t *, ddf_dev_t *); -static int ne2k_register_interrupt(nic_t *nic_data, cap_handle_t *handle) +static errno_t ne2k_register_interrupt(nic_t *nic_data, cap_handle_t *handle) { ne2k_t *ne2k = (ne2k_t *) nic_get_specific(nic_data); @@ -178,5 +178,5 @@ } -static int ne2k_dev_init(nic_t *nic_data) +static errno_t ne2k_dev_init(nic_t *nic_data) { /* Get HW resources */ @@ -184,5 +184,5 @@ hw_res_list_parsed_init(&hw_res_parsed); - int rc = nic_get_resources(nic_data, &hw_res_parsed); + errno_t rc = nic_get_resources(nic_data, &hw_res_parsed); if (rc != EOK) @@ -243,10 +243,10 @@ } -static int ne2k_on_activating(nic_t *nic_data) +static errno_t ne2k_on_activating(nic_t *nic_data) { ne2k_t *ne2k = (ne2k_t *) nic_get_specific(nic_data); if (!ne2k->up) { - int rc = ne2k_up(ne2k); + errno_t rc = ne2k_up(ne2k); if (rc != EOK) return rc; @@ -261,5 +261,5 @@ } -static int ne2k_on_stopping(nic_t *nic_data) +static errno_t ne2k_on_stopping(nic_t *nic_data) { ne2k_t *ne2k = (ne2k_t *) nic_get_specific(nic_data); @@ -271,8 +271,8 @@ } -static int ne2k_set_address(ddf_fun_t *fun, const nic_address_t *address) +static errno_t ne2k_set_address(ddf_fun_t *fun, const nic_address_t *address) { nic_t *nic_data = DRIVER_DATA(ddf_fun_get_dev(fun)); - int rc = nic_report_address(nic_data, address); + errno_t rc = nic_report_address(nic_data, address); if (rc != EOK) { return EINVAL; @@ -286,5 +286,5 @@ } -static int ne2k_on_unicast_mode_change(nic_t *nic_data, +static errno_t ne2k_on_unicast_mode_change(nic_t *nic_data, nic_unicast_mode_t new_mode, const nic_address_t *address_list, size_t address_count) @@ -313,5 +313,5 @@ } -static int ne2k_on_multicast_mode_change(nic_t *nic_data, +static errno_t ne2k_on_multicast_mode_change(nic_t *nic_data, nic_multicast_mode_t new_mode, const nic_address_t *address_list, size_t address_count) @@ -339,5 +339,5 @@ } -static int ne2k_on_broadcast_mode_change(nic_t *nic_data, +static errno_t ne2k_on_broadcast_mode_change(nic_t *nic_data, nic_broadcast_mode_t new_mode) { @@ -355,5 +355,5 @@ } -static int ne2k_dev_add(ddf_dev_t *dev) +static errno_t ne2k_dev_add(ddf_dev_t *dev) { ddf_fun_t *fun; @@ -387,5 +387,5 @@ } - int rc = ne2k_dev_init(nic_data); + errno_t rc = ne2k_dev_init(nic_data); if (rc != EOK) { ne2k_dev_cleanup(dev); Index: uspace/drv/nic/rtl8139/driver.c =================================================================== --- uspace/drv/nic/rtl8139/driver.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/nic/rtl8139/driver.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -280,32 +280,32 @@ } -static int rtl8139_set_addr(ddf_fun_t *fun, const nic_address_t *); -static int rtl8139_get_device_info(ddf_fun_t *fun, nic_device_info_t *info); -static int rtl8139_get_cable_state(ddf_fun_t *fun, nic_cable_state_t *state); -static int rtl8139_get_operation_mode(ddf_fun_t *fun, int *speed, +static errno_t rtl8139_set_addr(ddf_fun_t *fun, const nic_address_t *); +static errno_t rtl8139_get_device_info(ddf_fun_t *fun, nic_device_info_t *info); +static errno_t rtl8139_get_cable_state(ddf_fun_t *fun, nic_cable_state_t *state); +static errno_t rtl8139_get_operation_mode(ddf_fun_t *fun, int *speed, nic_channel_mode_t *duplex, nic_role_t *role); -static int rtl8139_set_operation_mode(ddf_fun_t *fun, int speed, +static errno_t rtl8139_set_operation_mode(ddf_fun_t *fun, int speed, nic_channel_mode_t duplex, nic_role_t); -static int rtl8139_pause_get(ddf_fun_t*, nic_result_t*, nic_result_t*, +static errno_t rtl8139_pause_get(ddf_fun_t*, nic_result_t*, nic_result_t*, uint16_t *); -static int rtl8139_pause_set(ddf_fun_t*, int, int, uint16_t); - -static int rtl8139_autoneg_enable(ddf_fun_t *fun, uint32_t advertisement); -static int rtl8139_autoneg_disable(ddf_fun_t *fun); -static int rtl8139_autoneg_probe(ddf_fun_t *fun, uint32_t *our_advertisement, +static errno_t rtl8139_pause_set(ddf_fun_t*, int, int, uint16_t); + +static errno_t rtl8139_autoneg_enable(ddf_fun_t *fun, uint32_t advertisement); +static errno_t rtl8139_autoneg_disable(ddf_fun_t *fun); +static errno_t rtl8139_autoneg_probe(ddf_fun_t *fun, uint32_t *our_advertisement, uint32_t *their_advertisement, nic_result_t *result, nic_result_t *their_result); -static int rtl8139_autoneg_restart(ddf_fun_t *fun); - -static int rtl8139_defective_get_mode(ddf_fun_t *fun, uint32_t *mode); -static int rtl8139_defective_set_mode(ddf_fun_t *fun, uint32_t mode); - -static int rtl8139_wol_virtue_add(nic_t *nic_data, +static errno_t rtl8139_autoneg_restart(ddf_fun_t *fun); + +static errno_t rtl8139_defective_get_mode(ddf_fun_t *fun, uint32_t *mode); +static errno_t rtl8139_defective_set_mode(ddf_fun_t *fun, uint32_t mode); + +static errno_t rtl8139_wol_virtue_add(nic_t *nic_data, const nic_wol_virtue_t *virtue); static void rtl8139_wol_virtue_rem(nic_t *nic_data, const nic_wol_virtue_t *virtue); -static int rtl8139_poll_mode_change(nic_t *nic_data, nic_poll_mode_t mode, +static errno_t rtl8139_poll_mode_change(nic_t *nic_data, nic_poll_mode_t mode, const struct timeval *period); static void rtl8139_poll(nic_t *nic_data); @@ -334,5 +334,5 @@ static ddf_dev_ops_t rtl8139_dev_ops; -static int rtl8139_dev_add(ddf_dev_t *dev); +static errno_t rtl8139_dev_add(ddf_dev_t *dev); /** Basic driver operations for RTL8139 driver */ @@ -348,6 +348,6 @@ /* The default implementation callbacks */ -static int rtl8139_on_activated(nic_t *nic_data); -static int rtl8139_on_stopped(nic_t *nic_data); +static errno_t rtl8139_on_activated(nic_t *nic_data); +static errno_t rtl8139_on_stopped(nic_t *nic_data); static void rtl8139_send_frame(nic_t *nic_data, void *data, size_t size); @@ -846,5 +846,5 @@ * @return An error code otherwise. */ -inline static int rtl8139_register_int_handler(nic_t *nic_data, cap_handle_t *handle) +inline static errno_t rtl8139_register_int_handler(nic_t *nic_data, cap_handle_t *handle) { rtl8139_t *rtl8139 = nic_get_specific(nic_data); @@ -857,5 +857,5 @@ rtl8139_irq_code.cmds[2].addr = rtl8139->io_addr + ISR; rtl8139_irq_code.cmds[3].addr = rtl8139->io_addr + IMR; - int rc = register_interrupt_handler(nic_get_ddf_dev(nic_data), + errno_t rc = register_interrupt_handler(nic_get_ddf_dev(nic_data), rtl8139->irq, rtl8139_interrupt_handler, &rtl8139_irq_code, handle); @@ -904,5 +904,5 @@ * @return EOK if activated successfully, error code otherwise */ -static int rtl8139_on_activated(nic_t *nic_data) +static errno_t rtl8139_on_activated(nic_t *nic_data) { assert(nic_data); @@ -919,5 +919,5 @@ rtl8139_hw_int_set(rtl8139); - int rc = hw_res_enable_interrupt(rtl8139->parent_sess, rtl8139->irq); + errno_t rc = hw_res_enable_interrupt(rtl8139->parent_sess, rtl8139->irq); if (rc != EOK) { rtl8139_on_stopped(nic_data); @@ -935,5 +935,5 @@ * @return EOK if succeed, error code otherwise */ -static int rtl8139_on_stopped(nic_t *nic_data) +static errno_t rtl8139_on_stopped(nic_t *nic_data) { assert(nic_data); @@ -955,9 +955,9 @@ -static int rtl8139_unicast_set(nic_t *nic_data, nic_unicast_mode_t mode, +static errno_t rtl8139_unicast_set(nic_t *nic_data, nic_unicast_mode_t mode, const nic_address_t *, size_t); -static int rtl8139_multicast_set(nic_t *nic_data, nic_multicast_mode_t mode, +static errno_t rtl8139_multicast_set(nic_t *nic_data, nic_multicast_mode_t mode, const nic_address_t *addr, size_t addr_count); -static int rtl8139_broadcast_set(nic_t *nic_data, nic_broadcast_mode_t mode); +static errno_t rtl8139_broadcast_set(nic_t *nic_data, nic_broadcast_mode_t mode); @@ -1027,5 +1027,5 @@ * @return EOK if succeed, error code otherwise */ -static int rtl8139_fill_resource_info(ddf_dev_t *dev, const hw_res_list_parsed_t +static errno_t rtl8139_fill_resource_info(ddf_dev_t *dev, const hw_res_list_parsed_t *hw_resources) { @@ -1067,5 +1067,5 @@ * @return EOK if succeed, error code otherwise */ -static int rtl8139_get_resource_info(ddf_dev_t *dev) +static errno_t rtl8139_get_resource_info(ddf_dev_t *dev) { assert(dev); @@ -1078,10 +1078,10 @@ /* Get hw resources form parent driver */ - int rc = nic_get_resources(nic_data, &hw_res_parsed); + errno_t rc = nic_get_resources(nic_data, &hw_res_parsed); if (rc != EOK) return rc; /* Fill resources information to the device */ - int ret = rtl8139_fill_resource_info(dev, &hw_res_parsed); + errno_t ret = rtl8139_fill_resource_info(dev, &hw_res_parsed); hw_res_list_parsed_clean(&hw_res_parsed); @@ -1098,8 +1098,8 @@ * @return EOK in the case of success, error code otherwise */ -static int rtl8139_buffers_create(rtl8139_t *rtl8139) +static errno_t rtl8139_buffers_create(rtl8139_t *rtl8139) { size_t i = 0; - int rc; + errno_t rc; ddf_msg(LVL_DEBUG, "Creating buffers"); @@ -1149,9 +1149,9 @@ * @return EOK if succeed, error code otherwise */ -static int rtl8139_device_initialize(ddf_dev_t *dev) +static errno_t rtl8139_device_initialize(ddf_dev_t *dev) { ddf_msg(LVL_DEBUG, "rtl8139_dev_initialize %s", ddf_dev_get_name(dev)); - int ret = EOK; + errno_t ret = EOK; ddf_msg(LVL_DEBUG, "rtl8139: creating device data"); @@ -1208,5 +1208,5 @@ * @return EOK if successed, error code otherwise */ -static int rtl8139_pio_enable(ddf_dev_t *dev) +static errno_t rtl8139_pio_enable(ddf_dev_t *dev) { ddf_msg(LVL_DEBUG, NAME ": rtl8139_pio_enable %s", ddf_dev_get_name(dev)); @@ -1258,5 +1258,5 @@ * @return EOK if added successfully, error code otherwise */ -int rtl8139_dev_add(ddf_dev_t *dev) +errno_t rtl8139_dev_add(ddf_dev_t *dev) { ddf_fun_t *fun; @@ -1266,5 +1266,5 @@ /* Init device structure for rtl8139 */ - int rc = rtl8139_device_initialize(dev); + errno_t rc = rtl8139_device_initialize(dev); if (rc != EOK) return rc; @@ -1341,5 +1341,5 @@ * @return EOK if succeed, error code otherwise */ -static int rtl8139_set_addr(ddf_fun_t *fun, const nic_address_t *addr) +static errno_t rtl8139_set_addr(ddf_fun_t *fun, const nic_address_t *addr) { assert(fun); @@ -1352,5 +1352,5 @@ rtl8139_lock_all(rtl8139); - int rc = nic_report_address(nic_data, addr); + errno_t rc = nic_report_address(nic_data, addr); if ( rc != EOK) { rtl8139_unlock_all(rtl8139); @@ -1371,5 +1371,5 @@ * @return EOK */ -static int rtl8139_get_device_info(ddf_fun_t *fun, nic_device_info_t *info) +static errno_t rtl8139_get_device_info(ddf_fun_t *fun, nic_device_info_t *info) { assert(fun); @@ -1406,5 +1406,5 @@ * @return EOK */ -static int rtl8139_get_cable_state(ddf_fun_t *fun, nic_cable_state_t *state) +static errno_t rtl8139_get_cable_state(ddf_fun_t *fun, nic_cable_state_t *state) { assert(fun); @@ -1425,5 +1425,5 @@ /** Get operation mode of the device */ -static int rtl8139_get_operation_mode(ddf_fun_t *fun, int *speed, +static errno_t rtl8139_get_operation_mode(ddf_fun_t *fun, int *speed, nic_channel_mode_t *duplex, nic_role_t *role) { @@ -1502,5 +1502,5 @@ * @return EOK if succeed */ -static int rtl8139_pause_get(ddf_fun_t *fun, nic_result_t *we_send, +static errno_t rtl8139_pause_get(ddf_fun_t *fun, nic_result_t *we_send, nic_result_t *we_receive, uint16_t *time) { @@ -1537,5 +1537,5 @@ * @return EOK if succeed, INVAL if the pause frame has no sence */ -static int rtl8139_pause_set(ddf_fun_t *fun, int allow_send, int allow_receive, +static errno_t rtl8139_pause_set(ddf_fun_t *fun, int allow_send, int allow_receive, uint16_t time) { @@ -1567,5 +1567,5 @@ * */ -static int rtl8139_set_operation_mode(ddf_fun_t *fun, int speed, +static errno_t rtl8139_set_operation_mode(ddf_fun_t *fun, int speed, nic_channel_mode_t duplex, nic_role_t role) { @@ -1611,5 +1611,5 @@ * @returns EOK if advertisement mode set successfully */ -static int rtl8139_autoneg_enable(ddf_fun_t *fun, uint32_t advertisement) +static errno_t rtl8139_autoneg_enable(ddf_fun_t *fun, uint32_t advertisement) { assert(fun); @@ -1657,5 +1657,5 @@ * @returns EOK */ -static int rtl8139_autoneg_disable(ddf_fun_t *fun) +static errno_t rtl8139_autoneg_disable(ddf_fun_t *fun) { assert(fun); @@ -1708,5 +1708,5 @@ * @returns EOK */ -static int rtl8139_autoneg_probe(ddf_fun_t *fun, uint32_t *advertisement, +static errno_t rtl8139_autoneg_probe(ddf_fun_t *fun, uint32_t *advertisement, uint32_t *their_adv, nic_result_t *result, nic_result_t *their_result) { @@ -1745,5 +1745,5 @@ * @returns EOK */ -static int rtl8139_autoneg_restart(ddf_fun_t *fun) +static errno_t rtl8139_autoneg_restart(ddf_fun_t *fun) { assert(fun); @@ -1793,5 +1793,5 @@ * @returns EOK */ -static int rtl8139_unicast_set(nic_t *nic_data, nic_unicast_mode_t mode, +static errno_t rtl8139_unicast_set(nic_t *nic_data, nic_unicast_mode_t mode, const nic_address_t *addr, size_t addr_cnt) { @@ -1851,5 +1851,5 @@ * @returns EOK */ -static int rtl8139_multicast_set(nic_t *nic_data, nic_multicast_mode_t mode, +static errno_t rtl8139_multicast_set(nic_t *nic_data, nic_multicast_mode_t mode, const nic_address_t *addr, size_t addr_count) { @@ -1894,5 +1894,5 @@ * @returns EOK */ -static int rtl8139_broadcast_set(nic_t *nic_data, nic_broadcast_mode_t mode) +static errno_t rtl8139_broadcast_set(nic_t *nic_data, nic_broadcast_mode_t mode) { assert(nic_data); @@ -1922,5 +1922,5 @@ * @param[out] mode The current mode */ -static int rtl8139_defective_get_mode(ddf_fun_t *fun, uint32_t *mode) +static errno_t rtl8139_defective_get_mode(ddf_fun_t *fun, uint32_t *mode) { assert(fun); @@ -1947,5 +1947,5 @@ * @returns EOK of mode was set */ -static int rtl8139_defective_set_mode(ddf_fun_t *fun, uint32_t mode) +static errno_t rtl8139_defective_set_mode(ddf_fun_t *fun, uint32_t mode) { assert(fun); @@ -1979,5 +1979,5 @@ * @returns ELIMIT if no more methods of this kind can be enabled */ -static int rtl8139_wol_virtue_add(nic_t *nic_data, +static errno_t rtl8139_wol_virtue_add(nic_t *nic_data, const nic_wol_virtue_t *virtue) { @@ -2058,9 +2058,9 @@ * @returns ENOTSUP if the mode is not supported */ -static int rtl8139_poll_mode_change(nic_t *nic_data, nic_poll_mode_t mode, +static errno_t rtl8139_poll_mode_change(nic_t *nic_data, nic_poll_mode_t mode, const struct timeval *period) { assert(nic_data); - int rc = EOK; + errno_t rc = EOK; rtl8139_t *rtl8139 = nic_get_specific(nic_data); @@ -2143,5 +2143,5 @@ printf("%s: HelenOS RTL8139 network adapter driver\n", NAME); - int rc = nic_driver_init(NAME); + errno_t rc = nic_driver_init(NAME); if (rc != EOK) return rc; Index: uspace/drv/nic/rtl8139/general.c =================================================================== --- uspace/drv/nic/rtl8139/general.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/nic/rtl8139/general.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -83,5 +83,5 @@ * @return EOK if succeed, error code otherwise */ -int rtl8139_timer_act_init(rtl8139_timer_act_t * ta, uint32_t timer_freq, +errno_t rtl8139_timer_act_init(rtl8139_timer_act_t * ta, uint32_t timer_freq, const struct timeval *time) { Index: uspace/drv/nic/rtl8139/general.h =================================================================== --- uspace/drv/nic/rtl8139/general.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/nic/rtl8139/general.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -61,5 +61,5 @@ extern void *rtl8139_memcpy_wrapped(void *, const void *, size_t, size_t, size_t); -extern int rtl8139_timer_act_init(rtl8139_timer_act_t *, uint32_t, +extern errno_t rtl8139_timer_act_init(rtl8139_timer_act_t *, uint32_t, const struct timeval *); extern int rtl8139_timer_act_step(rtl8139_timer_act_t *, uint32_t *); Index: uspace/drv/nic/rtl8169/driver.c =================================================================== --- uspace/drv/nic/rtl8169/driver.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/nic/rtl8169/driver.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -52,40 +52,40 @@ FIBRIL_MUTEX_INITIALIZE(irq_reg_lock); -static int rtl8169_set_addr(ddf_fun_t *fun, const nic_address_t *addr); -static int rtl8169_get_device_info(ddf_fun_t *fun, nic_device_info_t *info); -static int rtl8169_get_cable_state(ddf_fun_t *fun, nic_cable_state_t *state); -static int rtl8169_get_operation_mode(ddf_fun_t *fun, int *speed, +static errno_t rtl8169_set_addr(ddf_fun_t *fun, const nic_address_t *addr); +static errno_t rtl8169_get_device_info(ddf_fun_t *fun, nic_device_info_t *info); +static errno_t rtl8169_get_cable_state(ddf_fun_t *fun, nic_cable_state_t *state); +static errno_t rtl8169_get_operation_mode(ddf_fun_t *fun, int *speed, nic_channel_mode_t *duplex, nic_role_t *role); -static int rtl8169_set_operation_mode(ddf_fun_t *fun, int speed, +static errno_t rtl8169_set_operation_mode(ddf_fun_t *fun, int speed, nic_channel_mode_t duplex, nic_role_t role); -static int rtl8169_pause_get(ddf_fun_t *fun, nic_result_t *we_send, +static errno_t rtl8169_pause_get(ddf_fun_t *fun, nic_result_t *we_send, nic_result_t *we_receive, uint16_t *time); -static int rtl8169_pause_set(ddf_fun_t *fun, int allow_send, int allow_receive, +static errno_t rtl8169_pause_set(ddf_fun_t *fun, int allow_send, int allow_receive, uint16_t time); -static int rtl8169_autoneg_enable(ddf_fun_t *fun, uint32_t advertisement); -static int rtl8169_autoneg_disable(ddf_fun_t *fun); -static int rtl8169_autoneg_probe(ddf_fun_t *fun, uint32_t *advertisement, +static errno_t rtl8169_autoneg_enable(ddf_fun_t *fun, uint32_t advertisement); +static errno_t rtl8169_autoneg_disable(ddf_fun_t *fun); +static errno_t rtl8169_autoneg_probe(ddf_fun_t *fun, uint32_t *advertisement, uint32_t *their_adv, nic_result_t *result, nic_result_t *their_result); -static int rtl8169_autoneg_restart(ddf_fun_t *fun); -static int rtl8169_defective_get_mode(ddf_fun_t *fun, uint32_t *mode); -static int rtl8169_defective_set_mode(ddf_fun_t *fun, uint32_t mode); -static int rtl8169_on_activated(nic_t *nic_data); -static int rtl8169_on_stopped(nic_t *nic_data); +static errno_t rtl8169_autoneg_restart(ddf_fun_t *fun); +static errno_t rtl8169_defective_get_mode(ddf_fun_t *fun, uint32_t *mode); +static errno_t rtl8169_defective_set_mode(ddf_fun_t *fun, uint32_t mode); +static errno_t rtl8169_on_activated(nic_t *nic_data); +static errno_t rtl8169_on_stopped(nic_t *nic_data); static void rtl8169_send_frame(nic_t *nic_data, void *data, size_t size); static void rtl8169_irq_handler(ipc_call_t *icall, ddf_dev_t *dev); -static inline int rtl8169_register_int_handler(nic_t *nic_data, cap_handle_t *handle); +static inline errno_t rtl8169_register_int_handler(nic_t *nic_data, cap_handle_t *handle); static inline void rtl8169_get_hwaddr(rtl8169_t *rtl8169, nic_address_t *addr); static inline void rtl8169_set_hwaddr(rtl8169_t *rtl8169, const nic_address_t *addr); static void rtl8169_reset(rtl8169_t *rtl8169); -static int rtl8169_get_resource_info(ddf_dev_t *dev); -static int rtl8169_fill_resource_info(ddf_dev_t *dev, const hw_res_list_parsed_t *hw_resources); +static errno_t rtl8169_get_resource_info(ddf_dev_t *dev); +static errno_t rtl8169_fill_resource_info(ddf_dev_t *dev, const hw_res_list_parsed_t *hw_resources); static rtl8169_t *rtl8169_create_dev_data(ddf_dev_t *dev); -static int rtl8169_unicast_set(nic_t *nic_data, nic_unicast_mode_t mode, +static errno_t rtl8169_unicast_set(nic_t *nic_data, nic_unicast_mode_t mode, const nic_address_t *, size_t); -static int rtl8169_multicast_set(nic_t *nic_data, nic_multicast_mode_t mode, +static errno_t rtl8169_multicast_set(nic_t *nic_data, nic_multicast_mode_t mode, const nic_address_t *addr, size_t addr_count); -static int rtl8169_broadcast_set(nic_t *nic_data, nic_broadcast_mode_t mode); +static errno_t rtl8169_broadcast_set(nic_t *nic_data, nic_broadcast_mode_t mode); static uint16_t rtl8169_mii_read(rtl8169_t *rtl8169, uint8_t addr); @@ -161,5 +161,5 @@ static ddf_dev_ops_t rtl8169_dev_ops; -static int rtl8169_dev_add(ddf_dev_t *dev); +static errno_t rtl8169_dev_add(ddf_dev_t *dev); /** Basic driver operations for RTL8169 driver */ @@ -174,5 +174,5 @@ }; -static int rtl8169_get_resource_info(ddf_dev_t *dev) +static errno_t rtl8169_get_resource_info(ddf_dev_t *dev) { assert(dev); @@ -185,10 +185,10 @@ /* Get hw resources form parent driver */ - int rc = nic_get_resources(nic_data, &hw_res_parsed); + errno_t rc = nic_get_resources(nic_data, &hw_res_parsed); if (rc != EOK) return rc; /* Fill resources information to the device */ - int ret = rtl8169_fill_resource_info(dev, &hw_res_parsed); + errno_t ret = rtl8169_fill_resource_info(dev, &hw_res_parsed); hw_res_list_parsed_clean(&hw_res_parsed); @@ -196,5 +196,5 @@ } -static int rtl8169_fill_resource_info(ddf_dev_t *dev, const hw_res_list_parsed_t +static errno_t rtl8169_fill_resource_info(ddf_dev_t *dev, const hw_res_list_parsed_t *hw_resources) { @@ -229,7 +229,7 @@ } -static int rtl8169_allocate_buffers(rtl8169_t *rtl8169) -{ - int rc; +static errno_t rtl8169_allocate_buffers(rtl8169_t *rtl8169) +{ + errno_t rc; ddf_msg(LVL_DEBUG, "Allocating DMA buffer rings"); @@ -334,7 +334,7 @@ } -static int rtl8169_dev_initialize(ddf_dev_t *dev) -{ - int ret; +static errno_t rtl8169_dev_initialize(ddf_dev_t *dev) +{ + errno_t ret; rtl8169_t *rtl8169 = rtl8169_create_dev_data(dev); @@ -360,5 +360,5 @@ } -inline static int rtl8169_register_int_handler(nic_t *nic_data, cap_handle_t *handle) +inline static errno_t rtl8169_register_int_handler(nic_t *nic_data, cap_handle_t *handle) { rtl8169_t *rtl8169 = nic_get_specific(nic_data); @@ -368,5 +368,5 @@ rtl8169_irq_code.cmds[2].addr = rtl8169->regs + ISR; rtl8169_irq_code.cmds[3].addr = rtl8169->regs + IMR; - int rc = register_interrupt_handler(nic_get_ddf_dev(nic_data), + errno_t rc = register_interrupt_handler(nic_get_ddf_dev(nic_data), rtl8169->irq, rtl8169_irq_handler, &rtl8169_irq_code, handle); @@ -374,9 +374,9 @@ } -static int rtl8169_dev_add(ddf_dev_t *dev) +static errno_t rtl8169_dev_add(ddf_dev_t *dev) { ddf_fun_t *fun; nic_address_t nic_addr; - int rc; + errno_t rc; assert(dev); @@ -481,9 +481,9 @@ } -static int rtl8169_set_addr(ddf_fun_t *fun, const nic_address_t *addr) +static errno_t rtl8169_set_addr(ddf_fun_t *fun, const nic_address_t *addr) { nic_t *nic_data = nic_get_from_ddf_fun(fun); rtl8169_t *rtl8169 = nic_get_specific(nic_data); - int rc; + errno_t rc; fibril_mutex_lock(&rtl8169->rx_lock); @@ -502,5 +502,5 @@ } -static int rtl8169_get_device_info(ddf_fun_t *fun, nic_device_info_t *info) +static errno_t rtl8169_get_device_info(ddf_fun_t *fun, nic_device_info_t *info) { nic_t *nic_data = nic_get_from_ddf_fun(fun); @@ -528,5 +528,5 @@ } -static int rtl8169_get_cable_state(ddf_fun_t *fun, nic_cable_state_t *state) +static errno_t rtl8169_get_cable_state(ddf_fun_t *fun, nic_cable_state_t *state) { rtl8169_t *rtl8169 = nic_get_specific(nic_get_from_ddf_fun(fun)); @@ -541,5 +541,5 @@ } -static int rtl8169_get_operation_mode(ddf_fun_t *fun, int *speed, +static errno_t rtl8169_get_operation_mode(ddf_fun_t *fun, int *speed, nic_channel_mode_t *duplex, nic_role_t *role) { @@ -563,5 +563,5 @@ } -static int rtl8169_set_operation_mode(ddf_fun_t *fun, int speed, +static errno_t rtl8169_set_operation_mode(ddf_fun_t *fun, int speed, nic_channel_mode_t duplex, nic_role_t role) { @@ -594,5 +594,5 @@ } -static int rtl8169_pause_get(ddf_fun_t *fun, nic_result_t *we_send, +static errno_t rtl8169_pause_get(ddf_fun_t *fun, nic_result_t *we_send, nic_result_t *we_receive, uint16_t *time) { @@ -600,5 +600,5 @@ } -static int rtl8169_pause_set(ddf_fun_t *fun, int allow_send, int allow_receive, +static errno_t rtl8169_pause_set(ddf_fun_t *fun, int allow_send, int allow_receive, uint16_t time) { @@ -606,5 +606,5 @@ } -static int rtl8169_autoneg_enable(ddf_fun_t *fun, uint32_t advertisement) +static errno_t rtl8169_autoneg_enable(ddf_fun_t *fun, uint32_t advertisement) { rtl8169_t *rtl8169 = nic_get_specific(nic_get_from_ddf_fun(fun)); @@ -630,5 +630,5 @@ } -static int rtl8169_autoneg_disable(ddf_fun_t *fun) +static errno_t rtl8169_autoneg_disable(ddf_fun_t *fun) { rtl8169_t *rtl8169 = nic_get_specific(nic_get_from_ddf_fun(fun)); @@ -641,5 +641,5 @@ } -static int rtl8169_autoneg_probe(ddf_fun_t *fun, uint32_t *advertisement, +static errno_t rtl8169_autoneg_probe(ddf_fun_t *fun, uint32_t *advertisement, uint32_t *their_adv, nic_result_t *result, nic_result_t *their_result) { @@ -647,5 +647,5 @@ } -static int rtl8169_autoneg_restart(ddf_fun_t *fun) +static errno_t rtl8169_autoneg_restart(ddf_fun_t *fun) { rtl8169_t *rtl8169 = nic_get_specific(nic_get_from_ddf_fun(fun)); @@ -657,10 +657,10 @@ } -static int rtl8169_defective_get_mode(ddf_fun_t *fun, uint32_t *mode) -{ - return EOK; -} - -static int rtl8169_defective_set_mode(ddf_fun_t *fun, uint32_t mode) +static errno_t rtl8169_defective_get_mode(ddf_fun_t *fun, uint32_t *mode) +{ + return EOK; +} + +static errno_t rtl8169_defective_set_mode(ddf_fun_t *fun, uint32_t mode) { return EOK; @@ -691,7 +691,7 @@ } -static int rtl8169_on_activated(nic_t *nic_data) -{ - int rc; +static errno_t rtl8169_on_activated(nic_t *nic_data) +{ + errno_t rc; uint64_t tmp; @@ -753,5 +753,5 @@ } -static int rtl8169_on_stopped(nic_t *nic_data) +static errno_t rtl8169_on_stopped(nic_t *nic_data) { ddf_msg(LVL_NOTE, "Stopping device"); @@ -819,5 +819,5 @@ } -static int rtl8169_unicast_set(nic_t *nic_data, nic_unicast_mode_t mode, +static errno_t rtl8169_unicast_set(nic_t *nic_data, nic_unicast_mode_t mode, const nic_address_t *addr, size_t addr_count) { @@ -871,5 +871,5 @@ } -static int rtl8169_multicast_set(nic_t *nic_data, nic_multicast_mode_t mode, +static errno_t rtl8169_multicast_set(nic_t *nic_data, nic_multicast_mode_t mode, const nic_address_t *addr, size_t addr_count) { @@ -915,5 +915,5 @@ } -static int rtl8169_broadcast_set(nic_t *nic_data, nic_broadcast_mode_t mode) +static errno_t rtl8169_broadcast_set(nic_t *nic_data, nic_broadcast_mode_t mode) { rtl8169_t *rtl8169 = nic_get_specific(nic_data); @@ -1208,5 +1208,5 @@ int main(void) { - int rc = nic_driver_init(NAME); + errno_t rc = nic_driver_init(NAME); if (rc != EOK) return rc; Index: uspace/drv/platform/amdm37x/amdm37x.c =================================================================== --- uspace/drv/platform/amdm37x/amdm37x.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/platform/amdm37x/amdm37x.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -53,8 +53,8 @@ -int amdm37x_init(amdm37x_t *device, bool trace) +errno_t amdm37x_init(amdm37x_t *device, bool trace) { assert(device); - int ret = EOK; + errno_t ret = EOK; ret = pio_enable((void*)USBHOST_CM_BASE_ADDRESS, USBHOST_CM_SIZE, @@ -358,5 +358,5 @@ * Select mode than can operate in FS/LS. */ -int amdm37x_usb_tll_init(amdm37x_t *device) +errno_t amdm37x_usb_tll_init(amdm37x_t *device) { /* Check access */ Index: uspace/drv/platform/amdm37x/amdm37x.h =================================================================== --- uspace/drv/platform/amdm37x/amdm37x.h (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/platform/amdm37x/amdm37x.h (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -66,6 +66,6 @@ } amdm37x_t; -int amdm37x_init(amdm37x_t *device, bool trace_io); -int amdm37x_usb_tll_init(amdm37x_t *device); +errno_t amdm37x_init(amdm37x_t *device, bool trace_io); +errno_t amdm37x_usb_tll_init(amdm37x_t *device); void amdm37x_setup_dpll_on_autoidle(amdm37x_t *device); void amdm37x_usb_clocks_set(amdm37x_t *device, bool enabled); Index: uspace/drv/platform/amdm37x/main.c =================================================================== --- uspace/drv/platform/amdm37x/main.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/platform/amdm37x/main.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -150,5 +150,5 @@ static hw_resource_list_t *amdm37x_get_resources(ddf_fun_t *fnode); -static int amdm37x_enable_interrupt(ddf_fun_t *fun, int); +static errno_t amdm37x_enable_interrupt(ddf_fun_t *fun, int); static hw_res_ops_t fun_hw_res_ops = { @@ -161,5 +161,5 @@ }; -static int amdm37x_add_fun(ddf_dev_t *dev, const amdm37x_fun_t *fun) +static errno_t amdm37x_add_fun(ddf_dev_t *dev, const amdm37x_fun_t *fun) { assert(dev); @@ -174,5 +174,5 @@ /* Add match id */ - int ret = ddf_fun_add_match_id(fnode, + errno_t ret = ddf_fun_add_match_id(fnode, fun->match_id.id, fun->match_id.score); if (ret != EOK) { @@ -212,5 +212,5 @@ * */ -static int amdm37x_dev_add(ddf_dev_t *dev) +static errno_t amdm37x_dev_add(ddf_dev_t *dev) { assert(dev); @@ -218,5 +218,5 @@ if (!device) return ENOMEM; - int ret = amdm37x_init(device, DEBUG_CM); + errno_t ret = amdm37x_init(device, DEBUG_CM); if (ret != EOK) { ddf_msg(LVL_FATAL, "Failed to setup hw access!.\n"); @@ -265,5 +265,5 @@ } -static int amdm37x_enable_interrupt(ddf_fun_t *fun, int irq) +static errno_t amdm37x_enable_interrupt(ddf_fun_t *fun, int irq) { //TODO: Implement Index: uspace/drv/platform/icp/icp.c =================================================================== --- uspace/drv/platform/icp/icp.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/platform/icp/icp.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -62,5 +62,5 @@ } icp_fun_t; -static int icp_dev_add(ddf_dev_t *dev); +static errno_t icp_dev_add(ddf_dev_t *dev); static driver_ops_t icp_ops = { @@ -178,5 +178,5 @@ } -static int icp_fun_enable_interrupt(ddf_fun_t *fnode, int irq) +static errno_t icp_fun_enable_interrupt(ddf_fun_t *fnode, int irq) { icp_fun_t *fun = icp_fun(fnode); @@ -188,5 +188,5 @@ } -static int icp_fun_disable_interrupt(ddf_fun_t *fnode, int irq) +static errno_t icp_fun_disable_interrupt(ddf_fun_t *fnode, int irq) { icp_fun_t *fun = icp_fun(fnode); @@ -198,5 +198,5 @@ } -static int icp_fun_clear_interrupt(ddf_fun_t *fnode, int irq) +static errno_t icp_fun_clear_interrupt(ddf_fun_t *fnode, int irq) { icp_fun_t *fun = icp_fun(fnode); @@ -231,5 +231,5 @@ }; -static int icp_add_fun(ddf_dev_t *dev, const char *name, const char *str_match_id, +static errno_t icp_add_fun(ddf_dev_t *dev, const char *name, const char *str_match_id, icp_fun_t *fun_proto) { @@ -237,5 +237,5 @@ ddf_fun_t *fnode = NULL; - int rc; + errno_t rc; /* Create new device. */ @@ -275,7 +275,7 @@ } -static int icp_add_functions(ddf_dev_t *dev) -{ - int rc; +static errno_t icp_add_functions(ddf_dev_t *dev) +{ + errno_t rc; rc = icp_add_fun(dev, "intctl", "integratorcp/intctl", @@ -296,5 +296,5 @@ /** Add device. */ -static int icp_dev_add(ddf_dev_t *dev) +static errno_t icp_dev_add(ddf_dev_t *dev) { ddf_msg(LVL_NOTE, "icp_dev_add, device handle = %d", @@ -311,5 +311,5 @@ int main(int argc, char *argv[]) { - int rc; + errno_t rc; printf(NAME ": HelenOS IntegratorCP platform driver\n"); Index: uspace/drv/platform/mac/mac.c =================================================================== --- uspace/drv/platform/mac/mac.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/platform/mac/mac.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -132,5 +132,5 @@ ddf_fun_t *fnode = NULL; - int rc; + errno_t rc; /* Create new device. */ @@ -176,7 +176,7 @@ * */ -static int mac_dev_add(ddf_dev_t *dev) -{ - int rc; +static errno_t mac_dev_add(ddf_dev_t *dev) +{ + errno_t rc; uintptr_t cuda_physical; sysarg_t cuda_inr; @@ -227,5 +227,5 @@ } -static int mac_enable_interrupt(ddf_fun_t *fun, int irq) +static errno_t mac_enable_interrupt(ddf_fun_t *fun, int irq) { /* TODO */ Index: uspace/drv/platform/malta/malta.c =================================================================== --- uspace/drv/platform/malta/malta.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/platform/malta/malta.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -77,5 +77,5 @@ } malta_fun_t; -static int malta_dev_add(ddf_dev_t *dev); +static errno_t malta_dev_add(ddf_dev_t *dev); static void malta_init(void); @@ -143,5 +143,5 @@ } -static int malta_enable_interrupt(ddf_fun_t *fun, int irq) +static errno_t malta_enable_interrupt(ddf_fun_t *fun, int irq) { /* TODO */ @@ -177,5 +177,5 @@ ddf_fun_t *fnode = NULL; - int rc; + errno_t rc; /* Create new device. */ @@ -223,9 +223,9 @@ * @return Zero on success, error number otherwise. */ -static int malta_dev_add(ddf_dev_t *dev) +static errno_t malta_dev_add(ddf_dev_t *dev) { ioport32_t *gt; uint32_t val; - int ret; + errno_t ret; ddf_msg(LVL_DEBUG, "malta_dev_add, device handle = %d", Index: uspace/drv/platform/msim/msim.c =================================================================== --- uspace/drv/platform/msim/msim.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/platform/msim/msim.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -62,5 +62,5 @@ } msim_fun_t; -static int msim_dev_add(ddf_dev_t *dev); +static errno_t msim_dev_add(ddf_dev_t *dev); static void msim_init(void); @@ -152,5 +152,5 @@ } -static int msim_enable_interrupt(ddf_fun_t *fun, int irq) +static errno_t msim_enable_interrupt(ddf_fun_t *fun, int irq) { /* Nothing to do. */ @@ -186,5 +186,5 @@ ddf_fun_t *fnode = NULL; - int rc; + errno_t rc; /* Create new device. */ @@ -238,5 +238,5 @@ * @return Zero on success or non-zero error code. */ -static int msim_dev_add(ddf_dev_t *dev) +static errno_t msim_dev_add(ddf_dev_t *dev) { ddf_msg(LVL_DEBUG, "msim_dev_add, device handle = %d", Index: uspace/drv/platform/pc/pc.c =================================================================== --- uspace/drv/platform/pc/pc.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/platform/pc/pc.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -59,5 +59,5 @@ } pc_fun_t; -static int pc_dev_add(ddf_dev_t *dev); +static errno_t pc_dev_add(ddf_dev_t *dev); static void pc_init(void); @@ -125,5 +125,5 @@ } -static int pc_enable_interrupt(ddf_fun_t *fun, int irq) +static errno_t pc_enable_interrupt(ddf_fun_t *fun, int irq) { /* TODO */ @@ -159,5 +159,5 @@ ddf_fun_t *fnode = NULL; - int rc; + errno_t rc; /* Create new device. */ @@ -205,5 +205,5 @@ * @return Zero on success, error number otherwise. */ -static int pc_dev_add(ddf_dev_t *dev) +static errno_t pc_dev_add(ddf_dev_t *dev) { ddf_msg(LVL_DEBUG, "pc_dev_add, device handle = %d", Index: uspace/drv/platform/ski/ski.c =================================================================== --- uspace/drv/platform/ski/ski.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/platform/ski/ski.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -46,5 +46,5 @@ #define NAME "ski" -static int ski_dev_add(ddf_dev_t *dev); +static errno_t ski_dev_add(ddf_dev_t *dev); static driver_ops_t ski_ops = { @@ -57,10 +57,10 @@ }; -static int ski_add_fun(ddf_dev_t *dev, const char *name, const char *str_match_id) +static errno_t ski_add_fun(ddf_dev_t *dev, const char *name, const char *str_match_id) { ddf_msg(LVL_NOTE, "Adding function '%s'.", name); ddf_fun_t *fnode = NULL; - int rc; + errno_t rc; /* Create new device. */ @@ -94,7 +94,7 @@ } -static int ski_add_functions(ddf_dev_t *dev) +static errno_t ski_add_functions(ddf_dev_t *dev) { - int rc; + errno_t rc; rc = ski_add_fun(dev, "console", "ski/console"); @@ -106,5 +106,5 @@ /** Add device. */ -static int ski_dev_add(ddf_dev_t *dev) +static errno_t ski_dev_add(ddf_dev_t *dev) { ddf_msg(LVL_NOTE, "ski_dev_add, device handle = %d", @@ -121,5 +121,5 @@ int main(int argc, char *argv[]) { - int rc; + errno_t rc; printf(NAME ": Ski platform driver\n"); Index: uspace/drv/platform/sun4u/sun4u.c =================================================================== --- uspace/drv/platform/sun4u/sun4u.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/platform/sun4u/sun4u.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -77,5 +77,5 @@ } sun4u_fun_t; -static int sun4u_dev_add(ddf_dev_t *dev); +static errno_t sun4u_dev_add(ddf_dev_t *dev); static void sun4u_init(void); @@ -159,5 +159,5 @@ } -static int sun4u_enable_interrupt(ddf_fun_t *fun, int irq) +static errno_t sun4u_enable_interrupt(ddf_fun_t *fun, int irq) { /* TODO */ @@ -193,5 +193,5 @@ ddf_fun_t *fnode = NULL; - int rc; + errno_t rc; /* Create new device. */ @@ -242,5 +242,5 @@ * @return Zero on success, error number otherwise. */ -static int sun4u_dev_add(ddf_dev_t *dev) +static errno_t sun4u_dev_add(ddf_dev_t *dev) { ddf_msg(LVL_DEBUG, "sun4u_dev_add, device handle = %d", Index: uspace/drv/platform/sun4v/sun4v.c =================================================================== --- uspace/drv/platform/sun4v/sun4v.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/platform/sun4v/sun4v.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -55,5 +55,5 @@ } sun4v_fun_t; -static int sun4v_dev_add(ddf_dev_t *dev); +static errno_t sun4v_dev_add(ddf_dev_t *dev); static driver_ops_t sun4v_ops = { @@ -114,5 +114,5 @@ } -static int sun4v_enable_interrupt(ddf_fun_t *fun, int irq) +static errno_t sun4v_enable_interrupt(ddf_fun_t *fun, int irq) { return EOK; @@ -138,5 +138,5 @@ static ddf_dev_ops_t sun4v_fun_ops; -static int sun4v_add_fun(ddf_dev_t *dev, const char *name, +static errno_t sun4v_add_fun(ddf_dev_t *dev, const char *name, const char *str_match_id, sun4v_fun_t *fun_proto) { @@ -144,5 +144,5 @@ ddf_fun_t *fnode = NULL; - int rc; + errno_t rc; /* Create new device. */ @@ -188,7 +188,7 @@ } -static int sun4v_add_functions(ddf_dev_t *dev) -{ - int rc; +static errno_t sun4v_add_functions(ddf_dev_t *dev) +{ + errno_t rc; rc = sun4v_add_fun(dev, "console", "sun4v/console", &console_data); @@ -200,5 +200,5 @@ /** Add device. */ -static int sun4v_dev_add(ddf_dev_t *dev) +static errno_t sun4v_dev_add(ddf_dev_t *dev) { ddf_msg(LVL_DEBUG, "sun4v_dev_add, device handle = %d", @@ -213,7 +213,7 @@ } -static int sun4v_init(void) -{ - int rc; +static errno_t sun4v_init(void) +{ + errno_t rc; sysarg_t paddr; @@ -247,5 +247,5 @@ int main(int argc, char *argv[]) { - int rc; + errno_t rc; printf(NAME ": Sun4v platform driver\n"); Index: uspace/drv/root/root/root.c =================================================================== --- uspace/drv/root/root/root.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/root/root/root.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -64,7 +64,7 @@ #define VIRTUAL_FUN_MATCH_SCORE 100 -static int root_dev_add(ddf_dev_t *dev); -static int root_fun_online(ddf_fun_t *fun); -static int root_fun_offline(ddf_fun_t *fun); +static errno_t root_dev_add(ddf_dev_t *dev); +static errno_t root_fun_online(ddf_fun_t *fun); +static errno_t root_fun_offline(ddf_fun_t *fun); /** The root device driver's standard operations. */ @@ -86,9 +86,9 @@ * @return EOK on success or an error code */ -static int add_virtual_root_fun(ddf_dev_t *dev) +static errno_t add_virtual_root_fun(ddf_dev_t *dev) { const char *name = VIRTUAL_FUN_NAME; ddf_fun_t *fun; - int rc; + errno_t rc; ddf_msg(LVL_DEBUG, "Adding new function for virtual devices. " @@ -127,5 +127,5 @@ * @return EOK on success or an error code */ -static int add_platform_fun(ddf_dev_t *dev) +static errno_t add_platform_fun(ddf_dev_t *dev) { char *match_id; @@ -135,5 +135,5 @@ const char *name = PLATFORM_FUN_NAME; ddf_fun_t *fun; - int rc; + errno_t rc; /* Get platform name from sysinfo. */ @@ -201,5 +201,5 @@ * of HW and pseudo devices). */ -static int root_dev_add(ddf_dev_t *dev) +static errno_t root_dev_add(ddf_dev_t *dev) { ddf_msg(LVL_DEBUG, "root_dev_add, device handle=%" PRIun, @@ -211,5 +211,5 @@ * vital for the system. */ - int res = add_virtual_root_fun(dev); + errno_t res = add_virtual_root_fun(dev); if (res != EOK) ddf_msg(LVL_WARN, "Failed to add virtual child."); @@ -223,5 +223,5 @@ } -static int root_fun_online(ddf_fun_t *fun) +static errno_t root_fun_online(ddf_fun_t *fun) { ddf_msg(LVL_DEBUG, "root_fun_online()"); @@ -229,5 +229,5 @@ } -static int root_fun_offline(ddf_fun_t *fun) +static errno_t root_fun_offline(ddf_fun_t *fun) { ddf_msg(LVL_DEBUG, "root_fun_offline()"); Index: uspace/drv/root/virt/virt.c =================================================================== --- uspace/drv/root/virt/virt.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/root/virt/virt.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -62,8 +62,8 @@ }; -static int virt_dev_add(ddf_dev_t *dev); -static int virt_dev_remove(ddf_dev_t *dev); -static int virt_fun_online(ddf_fun_t *fun); -static int virt_fun_offline(ddf_fun_t *fun); +static errno_t virt_dev_add(ddf_dev_t *dev); +static errno_t virt_dev_remove(ddf_dev_t *dev); +static errno_t virt_fun_online(ddf_fun_t *fun); +static errno_t virt_fun_offline(ddf_fun_t *fun); static driver_ops_t virt_ops = { @@ -100,10 +100,10 @@ * @return EOK on success or an error code. */ -static int virt_add_fun(virt_t *virt, virtual_function_t *vfun) +static errno_t virt_add_fun(virt_t *virt, virtual_function_t *vfun) { ddf_dev_t *vdev = virt->dev; ddf_fun_t *fun; virt_fun_t *rvfun; - int rc; + errno_t rc; ddf_msg(LVL_DEBUG, "Registering function `%s' (match \"%s\")", @@ -148,7 +148,7 @@ } -static int virt_fun_remove(virt_fun_t *rvfun) -{ - int rc; +static errno_t virt_fun_remove(virt_fun_t *rvfun) +{ + errno_t rc; const char *name = ddf_fun_get_name(rvfun->fun); @@ -172,5 +172,5 @@ -static int virt_dev_add(ddf_dev_t *dev) +static errno_t virt_dev_add(ddf_dev_t *dev) { virt_t *virt; @@ -205,8 +205,8 @@ } -static int virt_dev_remove(ddf_dev_t *dev) +static errno_t virt_dev_remove(ddf_dev_t *dev) { virt_t *virt = (virt_t *)ddf_dev_data_get(dev); - int rc; + errno_t rc; while (!list_empty(&virt->functions)) { @@ -224,5 +224,5 @@ } -static int virt_fun_online(ddf_fun_t *fun) +static errno_t virt_fun_online(ddf_fun_t *fun) { ddf_msg(LVL_DEBUG, "virt_fun_online()"); @@ -230,5 +230,5 @@ } -static int virt_fun_offline(ddf_fun_t *fun) +static errno_t virt_fun_offline(ddf_fun_t *fun) { ddf_msg(LVL_DEBUG, "virt_fun_offline()"); Index: uspace/drv/test/test1/test1.c =================================================================== --- uspace/drv/test/test1/test1.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/test/test1/test1.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -40,9 +40,9 @@ #include "test1.h" -static int test1_dev_add(ddf_dev_t *dev); -static int test1_dev_remove(ddf_dev_t *dev); -static int test1_dev_gone(ddf_dev_t *dev); -static int test1_fun_online(ddf_fun_t *fun); -static int test1_fun_offline(ddf_fun_t *fun); +static errno_t test1_dev_add(ddf_dev_t *dev); +static errno_t test1_dev_remove(ddf_dev_t *dev); +static errno_t test1_dev_gone(ddf_dev_t *dev); +static errno_t test1_fun_online(ddf_fun_t *fun); +static errno_t test1_fun_offline(ddf_fun_t *fun); static driver_ops_t driver_ops = { @@ -73,10 +73,10 @@ * @param score Device match score. */ -static int register_fun_verbose(ddf_dev_t *parent, const char *message, +static errno_t register_fun_verbose(ddf_dev_t *parent, const char *message, const char *name, const char *match_id, int match_score, - int expected_rc, ddf_fun_t **pfun) + errno_t expected_rc, ddf_fun_t **pfun) { ddf_fun_t *fun = NULL; - int rc; + errno_t rc; ddf_msg(LVL_DEBUG, "Registering function `%s': %s.", name, message); @@ -141,10 +141,10 @@ * @return Error code reporting success of the operation. */ -static int test1_dev_add(ddf_dev_t *dev) +static errno_t test1_dev_add(ddf_dev_t *dev) { ddf_fun_t *fun_a; test1_t *test1; const char *dev_name; - int rc; + errno_t rc; dev_name = ddf_dev_get_name(dev); @@ -196,7 +196,7 @@ } -static int fun_remove(ddf_fun_t *fun, const char *name) -{ - int rc; +static errno_t fun_remove(ddf_fun_t *fun, const char *name) +{ + errno_t rc; ddf_msg(LVL_DEBUG, "fun_remove(%p, '%s')", fun, name); @@ -217,7 +217,7 @@ } -static int fun_unbind(ddf_fun_t *fun, const char *name) -{ - int rc; +static errno_t fun_unbind(ddf_fun_t *fun, const char *name) +{ + errno_t rc; ddf_msg(LVL_DEBUG, "fun_unbind(%p, '%s')", fun, name); @@ -232,8 +232,8 @@ } -static int test1_dev_remove(ddf_dev_t *dev) +static errno_t test1_dev_remove(ddf_dev_t *dev) { test1_t *test1 = (test1_t *)ddf_dev_data_get(dev); - int rc; + errno_t rc; ddf_msg(LVL_DEBUG, "test1_dev_remove(%p)", dev); @@ -260,8 +260,8 @@ } -static int test1_dev_gone(ddf_dev_t *dev) +static errno_t test1_dev_gone(ddf_dev_t *dev) { test1_t *test1 = (test1_t *)ddf_dev_data_get(dev); - int rc; + errno_t rc; ddf_msg(LVL_DEBUG, "test1_dev_remove(%p)", dev); @@ -288,5 +288,5 @@ } -static int test1_fun_online(ddf_fun_t *fun) +static errno_t test1_fun_online(ddf_fun_t *fun) { ddf_msg(LVL_DEBUG, "test1_fun_online()"); @@ -294,5 +294,5 @@ } -static int test1_fun_offline(ddf_fun_t *fun) +static errno_t test1_fun_offline(ddf_fun_t *fun) { ddf_msg(LVL_DEBUG, "test1_fun_offline()"); Index: uspace/drv/test/test2/test2.c =================================================================== --- uspace/drv/test/test2/test2.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/test/test2/test2.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -40,9 +40,9 @@ #define NAME "test2" -static int test2_dev_add(ddf_dev_t *dev); -static int test2_dev_remove(ddf_dev_t *dev); -static int test2_dev_gone(ddf_dev_t *dev); -static int test2_fun_online(ddf_fun_t *fun); -static int test2_fun_offline(ddf_fun_t *fun); +static errno_t test2_dev_add(ddf_dev_t *dev); +static errno_t test2_dev_remove(ddf_dev_t *dev); +static errno_t test2_dev_gone(ddf_dev_t *dev); +static errno_t test2_fun_online(ddf_fun_t *fun); +static errno_t test2_fun_offline(ddf_fun_t *fun); static driver_ops_t driver_ops = { @@ -77,9 +77,9 @@ * @param score Device match score. */ -static int register_fun_verbose(ddf_dev_t *parent, const char *message, +static errno_t register_fun_verbose(ddf_dev_t *parent, const char *message, const char *name, const char *match_id, int match_score, ddf_fun_t **pfun) { ddf_fun_t *fun; - int rc; + errno_t rc; ddf_msg(LVL_DEBUG, "Registering function `%s': %s.", name, message); @@ -118,9 +118,9 @@ * @return Always EOK. */ -static int plug_unplug(void *arg) +static errno_t plug_unplug(void *arg) { test2_t *test2 = (test2_t *) arg; ddf_fun_t *fun_a; - int rc; + errno_t rc; async_usleep(1000); @@ -157,7 +157,7 @@ } -static int fun_remove(ddf_fun_t *fun, const char *name) -{ - int rc; +static errno_t fun_remove(ddf_fun_t *fun, const char *name) +{ + errno_t rc; ddf_msg(LVL_DEBUG, "fun_remove(%p, '%s')", fun, name); @@ -178,7 +178,7 @@ } -static int fun_unbind(ddf_fun_t *fun, const char *name) -{ - int rc; +static errno_t fun_unbind(ddf_fun_t *fun, const char *name) +{ + errno_t rc; ddf_msg(LVL_DEBUG, "fun_unbind(%p, '%s')", fun, name); @@ -193,5 +193,5 @@ } -static int test2_dev_add(ddf_dev_t *dev) +static errno_t test2_dev_add(ddf_dev_t *dev) { test2_t *test2; @@ -224,8 +224,8 @@ } -static int test2_dev_remove(ddf_dev_t *dev) +static errno_t test2_dev_remove(ddf_dev_t *dev) { test2_t *test2 = (test2_t *)ddf_dev_data_get(dev); - int rc; + errno_t rc; ddf_msg(LVL_DEBUG, "test2_dev_remove(%p)", dev); @@ -258,8 +258,8 @@ } -static int test2_dev_gone(ddf_dev_t *dev) +static errno_t test2_dev_gone(ddf_dev_t *dev) { test2_t *test2 = (test2_t *)ddf_dev_data_get(dev); - int rc; + errno_t rc; ddf_msg(LVL_DEBUG, "test2_dev_gone(%p)", dev); @@ -293,5 +293,5 @@ -static int test2_fun_online(ddf_fun_t *fun) +static errno_t test2_fun_online(ddf_fun_t *fun) { ddf_msg(LVL_DEBUG, "test2_fun_online()"); @@ -299,5 +299,5 @@ } -static int test2_fun_offline(ddf_fun_t *fun) +static errno_t test2_fun_offline(ddf_fun_t *fun) { ddf_msg(LVL_DEBUG, "test2_fun_offline()"); Index: uspace/drv/test/test3/test3.c =================================================================== --- uspace/drv/test/test3/test3.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/test/test3/test3.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -41,8 +41,8 @@ #define NUM_FUNCS 20 -static int test3_dev_add(ddf_dev_t *dev); -static int test3_dev_remove(ddf_dev_t *dev); -static int test3_fun_online(ddf_fun_t *fun); -static int test3_fun_offline(ddf_fun_t *fun); +static errno_t test3_dev_add(ddf_dev_t *dev); +static errno_t test3_dev_remove(ddf_dev_t *dev); +static errno_t test3_fun_online(ddf_fun_t *fun); +static errno_t test3_fun_offline(ddf_fun_t *fun); static driver_ops_t driver_ops = { @@ -63,10 +63,10 @@ } test3_t; -static int register_fun_and_add_to_category(ddf_dev_t *parent, +static errno_t register_fun_and_add_to_category(ddf_dev_t *parent, const char *base_name, size_t index, const char *class_name, ddf_fun_t **pfun) { ddf_fun_t *fun = NULL; - int rc; + errno_t rc; char *fun_name = NULL; @@ -106,7 +106,7 @@ } -static int fun_remove(ddf_fun_t *fun, const char *name) +static errno_t fun_remove(ddf_fun_t *fun, const char *name) { - int rc; + errno_t rc; ddf_msg(LVL_DEBUG, "fun_remove(%p, '%s')", fun, name); @@ -127,7 +127,7 @@ } -static int test3_dev_add(ddf_dev_t *dev) +static errno_t test3_dev_add(ddf_dev_t *dev) { - int rc = EOK; + errno_t rc = EOK; test3_t *test3; @@ -153,9 +153,9 @@ } -static int test3_dev_remove(ddf_dev_t *dev) +static errno_t test3_dev_remove(ddf_dev_t *dev) { test3_t *test3 = (test3_t *)ddf_dev_data_get(dev); char *fun_name; - int rc; + errno_t rc; size_t i; @@ -176,5 +176,5 @@ } -static int test3_fun_online(ddf_fun_t *fun) +static errno_t test3_fun_online(ddf_fun_t *fun) { ddf_msg(LVL_DEBUG, "test3_fun_online()"); @@ -182,5 +182,5 @@ } -static int test3_fun_offline(ddf_fun_t *fun) +static errno_t test3_fun_offline(ddf_fun_t *fun) { ddf_msg(LVL_DEBUG, "test3_fun_offline()"); Index: uspace/drv/time/cmos-rtc/cmos-rtc.c =================================================================== --- uspace/drv/time/cmos-rtc/cmos-rtc.c (revision 132ab5d1e75253f9bae910b2748a4c13efe7e71f) +++ uspace/drv/time/cmos-rtc/cmos-rtc.c (revision a0a9cc249adce31c755defdb6b74a991ebbf55ea) @@ -80,13 +80,13 @@ static rtc_t *dev_rtc(ddf_dev_t *dev); static rtc_t *fun_rtc(ddf_fun_t *fun); -static int +static errno_t rtc_battery_status_get(ddf_fun_t *fun, battery_status_t *status); -static int rtc_time_get(ddf_fun_t *fun, struct tm *t); -static int rtc_time_set(ddf_fun_t *fun, struct tm *t); -static int rtc_dev_add(ddf_dev_t *dev); -static int rtc_dev_initialize(rtc_t *rtc); +static errno_t rtc_time_get(ddf_fun_t *fun, struct tm *t); +static errno_t rtc_time_set(ddf_fun_t *fun, struct tm *t); +static errno_t rtc_dev_add(ddf_dev_t *dev); +static errno_t rtc_dev_initialize(rtc_t *rtc); static bool rtc_pio_enable(rtc_t *rtc); static void rtc_dev_cleanup(rtc_t *rtc); -static int rtc_open(ddf_fun_t *fun); +static errno_t rtc_open(ddf_fun_t *fun); static void rtc_close(ddf_fun_t *fun); static bool rtc_update_in_progress(rtc_t *rtc); @@ -94,9 +94,9 @@ static unsigned bcd2bin(unsigned bcd); static unsigned bin2bcd(unsigned binary); -static int rtc_dev_remove(ddf_dev_t *dev); +static errno_t rtc_dev_remove(ddf_dev_t *dev); static void rtc_register_write(rtc_t *rtc, int reg, int data); static bool is_battery_ok(rtc_t *rtc); -static int rtc_fun_online(ddf_fun_t *fun); -static int rtc_fun_offline(ddf_fun_t *fun); +static errno_t rtc_fun_online(ddf_fun_t *fun); +static errno_t rtc_fun_offline(ddf_fun_t *fun); static ddf_dev_ops_t rtc_dev_ops; @@ -192,8 +192,8 @@ * @return EOK on success or an error code */ -static int +static errno_t rtc_dev_initialize(rtc_t *rtc) { - int rc; + errno_t rc; size_t i; hw_resource_t *res; @@ -316,5 +316,5 @@ * @return EOK on success or an error code */ -static int +static errno_t rtc_time_get(ddf_fun_t *fun, struct tm *t) { @@ -412,5 +412,5 @@ /* Try to normalize the content of the tm structure */ time_t r = mktime(t); - int result; + errno_t result; if (r < 0) @@ -438,5 +438,5 @@ * @return EOK or an error code */ -static int +static errno_t rtc_time_set(ddf_fun_t *fun, struct tm *t) { @@ -546,5 +546,5 @@ * @return EOK on success or an error code */ -static int +static errno_t rtc_battery_status_get(ddf_fun_t *fun, battery_status_t *status) { @@ -579,10 +579,10 @@ * @return EOK on success or an error code */ -static int +static errno_t rtc_dev_add(ddf_dev_t *dev) { rtc_t *rtc; ddf_fun_t *fun = NULL; - int rc; + errno_t rc; bool need_cleanup = false; @@ -645,9 +645,9 @@ * @return EOK on success or an error code */ -static int +static errno_t rtc_dev_remove(ddf_dev_t *dev) { rtc_t *rtc = dev_rtc(dev); - int rc; + errno_t rc; fibril_mutex_lock(&rtc->mutex); @@ -684,8 +684,8 @@ * @return EOK on success or an error code */ -static int +static errno_t rtc_open(ddf_fun_t *fun) { - int rc; + errno_t rc; rtc_t *rtc = fun_rtc(fun); @@ -744,8 +744,8 @@ } -static int +static errno_t rtc_fun_online(ddf_fun_t *fun) { - int rc; + errno_t rc; ddf_msg(LVL_DEBUG, "rtc_fun_online()"); @@ -758,5 +758,5 @@ } -static int +static errno_t rtc_fun_offline(ddf_fun_t *fun) {