Changeset b36e5de2 in mainline

Timestamp:

2011-02-18T20:14:26Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

374552ef

Parents:

228f251

Message:

Removal of remote parts of old API

The control transfer callbacks for each part of the transfer
(i.e. for setup, data and status) were completely removed.

Location:

uspace

Files:

• drv/uhci-hcd/iface.c (modified) (2 diffs)
• drv/vhc/connhost.c (modified) (4 diffs)
• lib/drv/generic/remote_usbhc.c (modified) (4 diffs)
• lib/drv/include/usbhc_iface.h (modified) (2 diffs)

uspace/drv/uhci-hcd/iface.c ¶

@@ -164 +164 @@
         return EOK;
 }
-/*----------------------------------------------------------------------------*/
-static int control_write_setup(device_t *dev, usb_target_t target,
-    size_t max_packet_size,
-    void *data, size_t size,
-    usbhc_iface_transfer_out_callback_t callback, void *arg)
-{
-        dev_speed_t speed = FULL_SPEED;
 
-        usb_log_warning("Using deprecated API %s.\n", __FUNCTION__);
-        batch_t *batch = batch_get(dev, target, USB_TRANSFER_CONTROL,
-            max_packet_size, speed, NULL, 0, data, size, NULL, callback, arg);
-        if (!batch)
-                return ENOMEM;
-        batch_control_setup_old(batch);
-        return EOK;
-}
-/*----------------------------------------------------------------------------*/
-static int control_write_data(device_t *dev, usb_target_t target,
-    size_t max_packet_size,
-    void *data, size_t size,
-    usbhc_iface_transfer_out_callback_t callback, void *arg)
-{
-        dev_speed_t speed = FULL_SPEED;
 
-        usb_log_warning("Using deprecated API %s.\n", __FUNCTION__);
-        batch_t *batch = batch_get(dev, target, USB_TRANSFER_CONTROL,
-            max_packet_size, speed, data, size, NULL, 0, NULL, callback, arg);
-        if (!batch)
-                return ENOMEM;
-        batch_control_write_data_old(batch);
-        return EOK;
-}
-/*----------------------------------------------------------------------------*/
-static int control_write_status(device_t *dev, usb_target_t target,
-    usbhc_iface_transfer_in_callback_t callback, void *arg)
-{
-        size_t max_packet_size = 8;
-        dev_speed_t speed = FULL_SPEED;
-
-        usb_log_warning("Using deprecated API %s.\n", __FUNCTION__);
-        batch_t *batch = batch_get(dev, target, USB_TRANSFER_CONTROL,
-            max_packet_size, speed, NULL, 0, NULL, 0, callback, NULL, arg);
-        if (!batch)
-                return ENOMEM;
-        batch_control_write_status_old(batch);
-        return EOK;
-}
-/*----------------------------------------------------------------------------*/
-static int control_read_setup(device_t *dev, usb_target_t target,
-    size_t max_packet_size,
-    void *data, size_t size,
-    usbhc_iface_transfer_out_callback_t callback, void *arg)
-{
-        dev_speed_t speed = FULL_SPEED;
-
-        usb_log_warning("Using deprecated API %s.\n", __FUNCTION__);
-        batch_t *batch = batch_get(dev, target, USB_TRANSFER_CONTROL,
-            max_packet_size, speed, NULL, 0, data, size, NULL, callback, arg);
-        if (!batch)
-                return ENOMEM;
-        batch_control_setup_old(batch);
-        return EOK;
-}
-/*----------------------------------------------------------------------------*/
-static int control_read_data(device_t *dev, usb_target_t target,
-    size_t max_packet_size,
-    void *data, size_t size,
-    usbhc_iface_transfer_in_callback_t callback, void *arg)
-{
-        dev_speed_t speed = FULL_SPEED;
-
-        usb_log_warning("Using deprecated API %s.\n", __FUNCTION__);
-        batch_t *batch = batch_get(dev, target, USB_TRANSFER_CONTROL,
-            max_packet_size, speed, data, size, NULL, 0, callback, NULL, arg);
-        if (!batch)
-                return ENOMEM;
-        batch_control_read_data_old(batch);
-        return EOK;
-}
-/*----------------------------------------------------------------------------*/
-static int control_read_status(device_t *dev, usb_target_t target,
-    usbhc_iface_transfer_out_callback_t callback, void *arg)
-{
-        size_t max_packet_size = 8;
-        dev_speed_t speed = FULL_SPEED;
-
-        usb_log_warning("Using deprecated API %s.\n", __FUNCTION__);
-        batch_t *batch = batch_get(dev, target, USB_TRANSFER_CONTROL,
-            max_packet_size, speed, NULL, 0, NULL, 0, NULL, callback, arg);
-        if (!batch)
-                return ENOMEM;
-        batch_control_read_status_old(batch);
-        return EOK;
-}
 /*----------------------------------------------------------------------------*/
 usbhc_iface_t uhci_iface = {
@@ -273 +181 @@
         .control_read = control_read,
         .control_write = control_write,
-
-        .control_write_setup = control_write_setup,
-        .control_write_data = control_write_data,
-        .control_write_status = control_write_status,
-
-        .control_read_setup = control_read_setup,
-        .control_read_data = control_read_data,
-        .control_read_status = control_read_status
 };
 /**

uspace/drv/vhc/connhost.c ¶

@@ -234 +234 @@
 }
 
-static int enqueue_transfer_setup(device_t *dev,
-    usb_target_t target, usb_transfer_type_t transfer_type,
-    void *buffer, size_t size,
-    usbhc_iface_transfer_out_callback_t callback, void *arg)
-{
-        usb_log_debug2("Transfer SETUP [%d.%d (%s); %zu].\n",
-            target.address, target.endpoint,
-            usb_str_transfer_type(transfer_type),
-            size);
-
-        transfer_info_t *transfer
-            = create_transfer_info(dev, USB_DIRECTION_OUT, arg);
-        transfer->out_callback = callback;
-
-        hc_add_transaction_to_device(true, target, transfer_type, buffer, size,
-            universal_callback, transfer);
-
-        return EOK;
-}
-
 static int enqueue_transfer_in(device_t *dev,
     usb_target_t target, usb_transfer_type_t transfer_type,
@@ -292 +272 @@
         return enqueue_transfer_in(dev, target, USB_TRANSFER_INTERRUPT,
             data, size,
-            callback, arg);
-}
-
-static int control_write_setup(device_t *dev, usb_target_t target,
-    size_t max_packet_size,
-    void *data, size_t size,
-    usbhc_iface_transfer_out_callback_t callback, void *arg)
-{
-        return enqueue_transfer_setup(dev, target, USB_TRANSFER_CONTROL,
-            data, size,
-            callback, arg);
-}
-
-static int control_write_data(device_t *dev, usb_target_t target,
-    size_t max_packet_size,
-    void *data, size_t size,
-    usbhc_iface_transfer_out_callback_t callback, void *arg)
-{
-        return enqueue_transfer_out(dev, target, USB_TRANSFER_CONTROL,
-            data, size,
-            callback, arg);
-}
-
-static int control_write_status(device_t *dev, usb_target_t target,
-    usbhc_iface_transfer_in_callback_t callback, void *arg)
-{
-        return enqueue_transfer_in(dev, target, USB_TRANSFER_CONTROL,
-            NULL, 0,
             callback, arg);
 }
@@ -341 +293 @@
 }
 
-static int control_read_setup(device_t *dev, usb_target_t target,
-    size_t max_packet_size,
-    void *data, size_t size,
-    usbhc_iface_transfer_out_callback_t callback, void *arg)
-{
-        return enqueue_transfer_setup(dev, target, USB_TRANSFER_CONTROL,
-            data, size,
-            callback, arg);
-}
-
-static int control_read_data(device_t *dev, usb_target_t target,
-    size_t max_packet_size,
-    void *data, size_t size,
-    usbhc_iface_transfer_in_callback_t callback, void *arg)
-{
-        return enqueue_transfer_in(dev, target, USB_TRANSFER_CONTROL,
-            data, size,
-            callback, arg);
-}
-
-static int control_read_status(device_t *dev, usb_target_t target,
-    usbhc_iface_transfer_out_callback_t callback, void *arg)
-{
-        return enqueue_transfer_out(dev, target, USB_TRANSFER_CONTROL,
-            NULL, 0,
-            callback, arg);
-}
-
 static int control_read(device_t *dev, usb_target_t target,
     size_t max_packet_size,
@@ -455 +379 @@
         .interrupt_in = interrupt_in,
 
-        .control_write_setup = control_write_setup,
-        .control_write_data = control_write_data,
-        .control_write_status = control_write_status,
-
         .control_write = control_write,
-
-        .control_read_setup = control_read_setup,
-        .control_read_data = control_read_data,
-        .control_read_status = control_read_status,
-
         .control_read = control_read
 };

uspace/lib/drv/generic/remote_usbhc.c ¶

@@ -46 +46 @@
 static void remote_usbhc_interrupt_out(device_t *, void *, ipc_callid_t, ipc_call_t *);
 static void remote_usbhc_interrupt_in(device_t *, void *, ipc_callid_t, ipc_call_t *);
-static void remote_usbhc_control_write_setup(device_t *, void *, ipc_callid_t, ipc_call_t *);
-static void remote_usbhc_control_write_data(device_t *, void *, ipc_callid_t, ipc_call_t *);
-static void remote_usbhc_control_write_status(device_t *, void *, ipc_callid_t, ipc_call_t *);
-static void remote_usbhc_control_read_setup(device_t *, void *, ipc_callid_t, ipc_call_t *);
-static void remote_usbhc_control_read_data(device_t *, void *, ipc_callid_t, ipc_call_t *);
-static void remote_usbhc_control_read_status(device_t *, void *, ipc_callid_t, ipc_call_t *);
 static void remote_usbhc_control_write(device_t *, void *, ipc_callid_t, ipc_call_t *);
 static void remote_usbhc_control_read(device_t *, void *, ipc_callid_t, ipc_call_t *);
@@ -75 +69 @@
         remote_usbhc_interrupt_in,
 
-        remote_usbhc_control_write_setup,
-        remote_usbhc_control_write_data,
-        remote_usbhc_control_write_status,
-
-        remote_usbhc_control_read_setup,
-        remote_usbhc_control_read_data,
-        remote_usbhc_control_read_status,
-
         remote_usbhc_control_write,
         remote_usbhc_control_read
@@ -385 +371 @@
 }
 
-/** Process status part of control transfer.
- *
- * @param device Target device.
- * @param callid Initiating caller.
- * @param call Initiating call.
- * @param direction Transfer direction (read ~ in, write ~ out).
- * @param transfer_in_func Transfer function for control read (might be NULL).
- * @param transfer_out_func Transfer function for control write (might be NULL).
- */
-static void remote_usbhc_status_transfer(device_t *device,
-    ipc_callid_t callid, ipc_call_t *call,
-    usb_direction_t direction,
-    int (*transfer_in_func)(device_t *, usb_target_t,
-        usbhc_iface_transfer_in_callback_t, void *),
-    int (*transfer_out_func)(device_t *, usb_target_t,
-        usbhc_iface_transfer_out_callback_t, void *))
-{
-        switch (direction) {
-                case USB_DIRECTION_IN:
-                        if (!transfer_in_func) {
-                                async_answer_0(callid, ENOTSUP);
-                                return;
-                        }
-                        break;
-                case USB_DIRECTION_OUT:
-                        if (!transfer_out_func) {
-                                async_answer_0(callid, ENOTSUP);
-                                return;
-                        }
-                        break;
-                default:
-                        assert(false && "unreachable code");
-                        break;
-        }
-
-        usb_target_t target = {
-                .address = DEV_IPC_GET_ARG1(*call),
-                .endpoint = DEV_IPC_GET_ARG2(*call)
-        };
-
-        async_transaction_t *trans = async_transaction_create(callid);
-        if (trans == NULL) {
-                async_answer_0(callid, ENOMEM);
-                return;
-        }
-
-        int rc;
-        switch (direction) {
-                case USB_DIRECTION_IN:
-                        rc = transfer_in_func(device, target,
-                            callback_in, trans);
-                        break;
-                case USB_DIRECTION_OUT:
-                        rc = transfer_out_func(device, target,
-                            callback_out, trans);
-                        break;
-                default:
-                        assert(false && "unreachable code");
-                        break;
-        }
-
-        if (rc != EOK) {
-                async_answer_0(callid, rc);
-                async_transaction_destroy(trans);
-        }
-}
-
-
 void remote_usbhc_interrupt_out(device_t *device, void *iface,
     ipc_callid_t callid, ipc_call_t *call)
@@ -471 +389 @@
         return remote_usbhc_in_transfer(device, callid, call,
             usb_iface->interrupt_in);
-}
-
-void remote_usbhc_control_write_setup(device_t *device, void *iface,
-    ipc_callid_t callid, ipc_call_t *call)
-{
-        usbhc_iface_t *usb_iface = (usbhc_iface_t *) iface;
-        assert(usb_iface != NULL);
-
-        return remote_usbhc_out_transfer(device, callid, call,
-            usb_iface->control_write_setup);
-}
-
-void remote_usbhc_control_write_data(device_t *device, void *iface,
-    ipc_callid_t callid, ipc_call_t *call)
-{
-        usbhc_iface_t *usb_iface = (usbhc_iface_t *) iface;
-        assert(usb_iface != NULL);
-
-        return remote_usbhc_out_transfer(device, callid, call,
-            usb_iface->control_write_data);
-}
-
-void remote_usbhc_control_write_status(device_t *device, void *iface,
-    ipc_callid_t callid, ipc_call_t *call)
-{
-        usbhc_iface_t *usb_iface = (usbhc_iface_t *) iface;
-        assert(usb_iface != NULL);
-
-        return remote_usbhc_status_transfer(device, callid, call,
-            USB_DIRECTION_IN, usb_iface->control_write_status, NULL);
-}
-
-void remote_usbhc_control_read_setup(device_t *device, void *iface,
-    ipc_callid_t callid, ipc_call_t *call)
-{
-        usbhc_iface_t *usb_iface = (usbhc_iface_t *) iface;
-        assert(usb_iface != NULL);
-
-        return remote_usbhc_out_transfer(device, callid, call,
-            usb_iface->control_read_setup);
-}
-
-void remote_usbhc_control_read_data(device_t *device, void *iface,
-            ipc_callid_t callid, ipc_call_t *call)
-{
-        usbhc_iface_t *usb_iface = (usbhc_iface_t *) iface;
-        assert(usb_iface != NULL);
-
-        return remote_usbhc_in_transfer(device, callid, call,
-            usb_iface->control_read_data);
-}
-
-void remote_usbhc_control_read_status(device_t *device, void *iface,
-            ipc_callid_t callid, ipc_call_t *call)
-{
-        usbhc_iface_t *usb_iface = (usbhc_iface_t *) iface;
-        assert(usb_iface != NULL);
-
-        return remote_usbhc_status_transfer(device, callid, call,
-            USB_DIRECTION_OUT, NULL, usb_iface->control_read_status);
 }
 

uspace/lib/drv/include/usbhc_iface.h ¶

@@ -153 +153 @@
         IPC_M_USBHC_INTERRUPT_IN,
 
-
-        /** Start WRITE control transfer.
-         * See explanation at usb_iface_funcs_t (OUT transaction).
-         */
-        IPC_M_USBHC_CONTROL_WRITE_SETUP,
-
-        /** Send control-transfer data to device.
-         * See explanation at usb_iface_funcs_t (OUT transaction).
-         */
-        IPC_M_USBHC_CONTROL_WRITE_DATA,
-
-        /** Terminate WRITE control transfer.
-         * See explanation at usb_iface_funcs_t (NO-DATA transaction).
-         */
-        IPC_M_USBHC_CONTROL_WRITE_STATUS,
-
-
-
-        /** Start READ control transfer.
-         * See explanation at usb_iface_funcs_t (OUT transaction).
-         */
-        IPC_M_USBHC_CONTROL_READ_SETUP,
-
-        /** Get control-transfer data from device.
-         * See explanation at usb_iface_funcs_t (IN transaction).
-         */
-        IPC_M_USBHC_CONTROL_READ_DATA,
-
-        /** Terminate READ control transfer.
-         * See explanation at usb_iface_funcs_t (NO-DATA transaction).
-         */
-        IPC_M_USBHC_CONTROL_READ_STATUS,
-
         /** Issue control WRITE transfer.
          * See explanation at usb_iface_funcs_t (OUT transaction) for
@@ -240 +207 @@
         usbhc_iface_transfer_in_t interrupt_in;
 
-        usbhc_iface_transfer_setup_t control_write_setup;
-        usbhc_iface_transfer_out_t control_write_data;
-        int (*control_write_status)(device_t *, usb_target_t,
-            usbhc_iface_transfer_in_callback_t, void *);
-
-        usbhc_iface_transfer_setup_t control_read_setup;
-        usbhc_iface_transfer_in_t control_read_data;
-        int (*control_read_status)(device_t *, usb_target_t,
-            usbhc_iface_transfer_out_callback_t, void *);
-
         int (*control_write)(device_t *, usb_target_t,
             size_t,