Changeset 5a6cc679 in mainline for uspace/drv/bus/usb/vhc


Ignore:
Timestamp:
2018-01-31T02:21:24Z (8 years ago)
Author:
Jenda <jenda.jzqk73@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
a0a9cc2
Parents:
132ab5d1
Message:

Merge commit '50f19b7ee8e94570b5c63896736c4eb49cfa18db' into forwardport

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

Location:
uspace/drv/bus/usb/vhc
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • uspace/drv/bus/usb/vhc/conndev.c

    r132ab5d1 r5a6cc679  
    7575        }
    7676       
    77         int data_request_rc;
    78         int opening_request_rc;
     77        errno_t data_request_rc;
     78        errno_t opening_request_rc;
    7979        async_wait_for(data_request, &data_request_rc);
    8080        async_wait_for(opening_request, &opening_request_rc);
    … …  
    102102       
    103103        if (callback) {
    104                 int rc = vhc_virtdev_plug(vhc, callback, &plugged_device_handle);
     104                errno_t rc = vhc_virtdev_plug(vhc, callback, &plugged_device_handle);
    105105                if (rc != EOK) {
    106106                        async_answer_0(icallid, rc);

  • uspace/drv/bus/usb/vhc/devconn.c

    r132ab5d1 r5a6cc679  
    4949}
    5050
    51 static int vhc_virtdev_plug_generic(vhc_data_t *vhc,
     51static errno_t vhc_virtdev_plug_generic(vhc_data_t *vhc,
    5252    async_sess_t *sess, usbvirt_device_t *virtdev,
    5353    uintptr_t *handle, bool connect, usb_address_t address)
    … …  
    8585}
    8686
    87 int vhc_virtdev_plug(vhc_data_t *vhc, async_sess_t *sess, uintptr_t *handle)
     87errno_t vhc_virtdev_plug(vhc_data_t *vhc, async_sess_t *sess, uintptr_t *handle)
    8888{
    8989        return vhc_virtdev_plug_generic(vhc, sess, NULL, handle, true, 0);
    9090}
    9191
    92 int vhc_virtdev_plug_local(vhc_data_t *vhc, usbvirt_device_t *dev, uintptr_t *handle)
     92errno_t vhc_virtdev_plug_local(vhc_data_t *vhc, usbvirt_device_t *dev, uintptr_t *handle)
    9393{
    9494        return vhc_virtdev_plug_generic(vhc, NULL, dev, handle, true, 0);
    9595}
    9696
    97 int vhc_virtdev_plug_hub(vhc_data_t *vhc, usbvirt_device_t *dev,
     97errno_t vhc_virtdev_plug_hub(vhc_data_t *vhc, usbvirt_device_t *dev,
    9898    uintptr_t *handle, usb_address_t address)
    9999{

  • uspace/drv/bus/usb/vhc/hub/hub.c

    r132ab5d1 r5a6cc679  
    6363static void set_port_status_change(hub_port_t *, hub_status_change_t);
    6464static void clear_port_status_change(hub_port_t *, uint16_t);
    65 static int set_port_state_delayed_fibril(void *);
     65static errno_t set_port_state_delayed_fibril(void *);
    6666static void set_port_state_delayed(hub_t *, size_t, suseconds_t,
    6767    hub_port_state_t, hub_port_state_t);
    … …  
    163163 * @return Error code.
    164164 */
    165 int hub_disconnect_device(hub_t *hub, void *device)
     165errno_t hub_disconnect_device(hub_t *hub, void *device)
    166166{
    167167        size_t index = hub_find_device(hub, device);
    … …  
    461461 * @return Always EOK.
    462462 */
    463 static int set_port_state_delayed_fibril(void *arg)
     463static errno_t set_port_state_delayed_fibril(void *arg)
    464464{
    465465        struct delay_port_state_change *change

  • uspace/drv/bus/usb/vhc/hub/hub.h

    r132ab5d1 r5a6cc679  
    102102void hub_init(hub_t *);
    103103size_t hub_connect_device(hub_t *, void *);
    104 int hub_disconnect_device(hub_t *, void *);
     104errno_t hub_disconnect_device(hub_t *, void *);
    105105size_t hub_find_device(hub_t *, void *);
    106106void hub_acquire(hub_t *);

  • uspace/drv/bus/usb/vhc/hub/virthub.c

    r132ab5d1 r5a6cc679  
    147147 * @return Error code.
    148148 */
    149 int virthub_init(usbvirt_device_t *dev, const char* name)
     149errno_t virthub_init(usbvirt_device_t *dev, const char* name)
    150150{
    151151        if (dev == NULL) {
    … …  
    197197 * @return Error code.
    198198 */
    199 int virthub_disconnect_device(usbvirt_device_t *dev, vhc_virtdev_t *conn)
     199errno_t virthub_disconnect_device(usbvirt_device_t *dev, vhc_virtdev_t *conn)
    200200{
    201201        assert(dev != NULL);

  • uspace/drv/bus/usb/vhc/hub/virthub.h

    r132ab5d1 r5a6cc679  
    8080extern hub_descriptor_t hub_descriptor;
    8181
    82 int virthub_init(usbvirt_device_t *, const char *name);
     82errno_t virthub_init(usbvirt_device_t *, const char *name);
    8383int virthub_connect_device(usbvirt_device_t *, vhc_virtdev_t *);
    84 int virthub_disconnect_device(usbvirt_device_t *, vhc_virtdev_t *);
     84errno_t virthub_disconnect_device(usbvirt_device_t *, vhc_virtdev_t *);
    8585bool virthub_is_device_enabled(usbvirt_device_t *, vhc_virtdev_t *);
    8686void virthub_get_status(usbvirt_device_t *, char *, size_t);

  • uspace/drv/bus/usb/vhc/hub/virthubops.c

    r132ab5d1 r5a6cc679  
    6363
    6464/** Callback for data request. */
    65 static int req_on_status_change_pipe(usbvirt_device_t *dev,
     65static errno_t req_on_status_change_pipe(usbvirt_device_t *dev,
    6666    usb_endpoint_t endpoint, usb_transfer_type_t tr_type,
    6767    void *buffer, size_t buffer_size, size_t *actual_size)
    … …  
    109109 * @return Error code.
    110110 */
    111 static int req_clear_hub_feature(usbvirt_device_t *dev,
     111static errno_t req_clear_hub_feature(usbvirt_device_t *dev,
    112112    const usb_device_request_setup_packet_t *request, uint8_t *data,
    113113    size_t *act_size)
    … …  
    123123 * @return Error code.
    124124 */
    125 static int req_clear_port_feature(usbvirt_device_t *dev,
    126     const usb_device_request_setup_packet_t *request, uint8_t *data,
    127     size_t *act_size)
    128 {
    129         int rc;
     125static errno_t req_clear_port_feature(usbvirt_device_t *dev,
     126    const usb_device_request_setup_packet_t *request, uint8_t *data,
     127    size_t *act_size)
     128{
     129        errno_t rc;
    130130        size_t port = request->index - 1;
    131131        usb_hub_class_feature_t feature = request->value;
    … …  
    203203 * @return Error code.
    204204 */
    205 static int req_get_bus_state(usbvirt_device_t *dev,
     205static errno_t req_get_bus_state(usbvirt_device_t *dev,
    206206    const usb_device_request_setup_packet_t *request, uint8_t *data,
    207207    size_t *act_size)
    … …  
    217217 * @return Error code.
    218218 */
    219 static int req_get_descriptor(usbvirt_device_t *dev,
     219static errno_t req_get_descriptor(usbvirt_device_t *dev,
    220220    const usb_device_request_setup_packet_t *request, uint8_t *data,
    221221    size_t *act_size)
    … …  
    238238 * @return Error code.
    239239 */
    240 static int req_get_hub_status(usbvirt_device_t *dev,
     240static errno_t req_get_hub_status(usbvirt_device_t *dev,
    241241    const usb_device_request_setup_packet_t *request, uint8_t *data,
    242242    size_t *act_size)
    … …  
    257257 * @return Error code.
    258258 */
    259 static int req_get_port_status(usbvirt_device_t *dev,
     259static errno_t req_get_port_status(usbvirt_device_t *dev,
    260260    const usb_device_request_setup_packet_t *request, uint8_t *data,
    261261    size_t *act_size)
    … …  
    282282 * @return Error code.
    283283 */
    284 static int req_set_hub_feature(usbvirt_device_t *dev,
     284static errno_t req_set_hub_feature(usbvirt_device_t *dev,
    285285    const usb_device_request_setup_packet_t *request, uint8_t *data,
    286286    size_t *act_size)
    … …  
    296296 * @return Error code.
    297297 */
    298 static int req_set_port_feature(usbvirt_device_t *dev,
    299     const usb_device_request_setup_packet_t *request, uint8_t *data,
    300     size_t *act_size)
    301 {
    302         int rc = ENOTSUP;
     298static errno_t req_set_port_feature(usbvirt_device_t *dev,
     299    const usb_device_request_setup_packet_t *request, uint8_t *data,
     300    size_t *act_size)
     301{
     302        errno_t rc = ENOTSUP;
    303303        size_t port = request->index - 1;
    304304        usb_hub_class_feature_t feature = request->value;

  • uspace/drv/bus/usb/vhc/main.c

    r132ab5d1 r5a6cc679  
    5050};
    5151
    52 static int vhc_control_node(ddf_dev_t *dev, ddf_fun_t **fun)
     52static errno_t vhc_control_node(ddf_dev_t *dev, ddf_fun_t **fun)
    5353{
    5454        assert(dev);
    … …  
    6464        }
    6565        ddf_fun_set_ops(*fun, &vhc_ops);
    66         const int ret = ddf_fun_bind(*fun);
     66        const errno_t ret = ddf_fun_bind(*fun);
    6767        if (ret != EOK) {
    6868                ddf_fun_destroy(*fun);
    … …  
    7373}
    7474
    75 static int vhc_dev_add(ddf_dev_t *dev)
     75static errno_t vhc_dev_add(ddf_dev_t *dev)
    7676{
    7777        /* Initialize generic structures */
    78         int ret = hcd_ddf_setup_hc(dev, sizeof(vhc_data_t));
     78        errno_t ret = hcd_ddf_setup_hc(dev, sizeof(vhc_data_t));
    7979        if (ret != EOK) {
    8080                usb_log_error("Failed to init HCD structures: %s.",

  • uspace/drv/bus/usb/vhc/transfer.c

    r132ab5d1 r5a6cc679  
    6161}
    6262
    63 static int process_transfer_local(usb_transfer_batch_t *batch,
     63static errno_t process_transfer_local(usb_transfer_batch_t *batch,
    6464    usbvirt_device_t *dev, size_t *actual_data_size)
    6565{
    66         int rc;
     66        errno_t rc;
    6767
    6868        const usb_direction_t dir = batch->dir;
    … …  
    9797}
    9898
    99 static int process_transfer_remote(usb_transfer_batch_t *batch,
     99static errno_t process_transfer_remote(usb_transfer_batch_t *batch,
    100100    async_sess_t *sess, size_t *actual_data_size)
    101101{
    102         int rc;
     102        errno_t rc;
    103103
    104104        const usb_direction_t dir = batch->dir;
    … …  
    146146
    147147static void execute_transfer_callback_and_free(vhc_transfer_t *transfer,
    148     size_t data_transfer_size, int outcome)
     148    size_t data_transfer_size, errno_t outcome)
    149149{
    150150        assert(outcome != ENAK);
    … …  
    192192};
    193193
    194 int vhc_init(vhc_data_t *instance)
     194errno_t vhc_init(vhc_data_t *instance)
    195195{
    196196        assert(instance);
    … …  
    203203}
    204204
    205 int vhc_schedule(usb_transfer_batch_t *batch)
     205errno_t vhc_schedule(usb_transfer_batch_t *batch)
    206206{
    207207        assert(batch);
    … …  
    233233}
    234234
    235 int vhc_transfer_queue_processor(void *arg)
     235errno_t vhc_transfer_queue_processor(void *arg)
    236236{
    237237        vhc_virtdev_t *dev = arg;
    … …  
    248248                fibril_mutex_unlock(&dev->guard);
    249249
    250                 int rc = EOK;
     250                errno_t rc = EOK;
    251251                size_t data_transfer_size = 0;
    252252                if (dev->dev_sess) {

  • uspace/drv/bus/usb/vhc/vhcd.h

    r132ab5d1 r5a6cc679  
    9090    ipc_call_t *icall);
    9191
    92 int vhc_virtdev_plug(vhc_data_t *, async_sess_t *, uintptr_t *);
    93 int vhc_virtdev_plug_local(vhc_data_t *, usbvirt_device_t *, uintptr_t *);
    94 int vhc_virtdev_plug_hub(vhc_data_t *, usbvirt_device_t *, uintptr_t *, usb_address_t address);
     92errno_t vhc_virtdev_plug(vhc_data_t *, async_sess_t *, uintptr_t *);
     93errno_t vhc_virtdev_plug_local(vhc_data_t *, usbvirt_device_t *, uintptr_t *);
     94errno_t vhc_virtdev_plug_hub(vhc_data_t *, usbvirt_device_t *, uintptr_t *, usb_address_t address);
    9595void vhc_virtdev_unplug(vhc_data_t *, uintptr_t);
    9696
    97 int vhc_init(vhc_data_t *);
    98 int vhc_schedule(usb_transfer_batch_t *);
    99 int vhc_transfer_queue_processor(void *arg);
     97errno_t vhc_init(vhc_data_t *);
     98errno_t vhc_schedule(usb_transfer_batch_t *);
     99errno_t vhc_transfer_queue_processor(void *arg);
    100100
    101101#endif
Note: See TracChangeset for help on using the changeset viewer.