Changes in uspace/lib/drv/generic/remote_usbhc.c [9753220:f841608] in mainline

File:

• uspace/lib/drv/generic/remote_usbhc.c (modified) (8 diffs)

uspace/lib/drv/generic/remote_usbhc.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2010-2011 Vojtech Horky
+ * Copyright (c) 2010 Vojtech Horky
  * All rights reserved.
  *
@@ -52 +52 @@
 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 *);
 static void remote_usbhc_reserve_default_address(device_t *, void *, ipc_callid_t, ipc_call_t *);
 static void remote_usbhc_release_default_address(device_t *, void *, ipc_callid_t, ipc_call_t *);
@@ -83 +81 @@
         remote_usbhc_control_read_setup,
         remote_usbhc_control_read_data,
-        remote_usbhc_control_read_status,
-
-        remote_usbhc_control_write,
-        remote_usbhc_control_read
+        remote_usbhc_control_read_status
 };
 
@@ -100 +95 @@
         ipc_callid_t caller;
         void *buffer;
-        void *setup_packet;
         size_t size;
 } async_transaction_t;
@@ -303 +297 @@
         trans->caller = callid;
         trans->buffer = buffer;
-        trans->setup_packet = NULL;
         trans->size = len;
 
@@ -343 +336 @@
         trans->caller = callid;
         trans->buffer = malloc(len);
-        trans->setup_packet = NULL;
         trans->size = len;
 
@@ -399 +391 @@
         trans->caller = callid;
         trans->buffer = NULL;
-        trans->setup_packet = NULL;
         trans->size = 0;
 
@@ -505 +496 @@
 }
 
-void remote_usbhc_control_write(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);
-
-        if (!usb_iface->control_write) {
-                ipc_answer_0(callid, ENOTSUP);
-                return;
-        }
-
-        usb_target_t target = {
-                .address = DEV_IPC_GET_ARG1(*call),
-                .endpoint = DEV_IPC_GET_ARG2(*call)
-        };
-
-        int rc;
-
-        void *setup_packet = NULL;
-        void *data_buffer = NULL;
-        size_t setup_packet_len = 0;
-        size_t data_buffer_len = 0;
-
-        rc = async_data_write_accept(&setup_packet, false,
-            1, USB_MAX_PAYLOAD_SIZE, 0, &setup_packet_len);
-        if (rc != EOK) {
-                ipc_answer_0(callid, rc);
-                return;
-        }
-        rc = async_data_write_accept(&data_buffer, false,
-            1, USB_MAX_PAYLOAD_SIZE, 0, &data_buffer_len);
-        if (rc != EOK) {
-                free(setup_packet);
-                ipc_answer_0(callid, rc);
-                return;
-        }
-
-        async_transaction_t *trans = malloc(sizeof(async_transaction_t));
-        trans->caller = callid;
-        trans->setup_packet = setup_packet;
-        trans->buffer = data_buffer;
-        trans->size = data_buffer_len;
-
-        rc = usb_iface->control_write(device, target,
-            setup_packet, setup_packet_len,
-            data_buffer, data_buffer_len,
-            callback_out, trans);
-
-        if (rc != EOK) {
-                ipc_answer_0(callid, rc);
-                free(setup_packet);
-                free(data_buffer);
-                free(trans);
-        }
-}
-
-
-void remote_usbhc_control_read(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);
-
-        if (!usb_iface->control_read) {
-                ipc_answer_0(callid, ENOTSUP);
-                return;
-        }
-
-        size_t data_len = DEV_IPC_GET_ARG3(*call);
-        usb_target_t target = {
-                .address = DEV_IPC_GET_ARG1(*call),
-                .endpoint = DEV_IPC_GET_ARG2(*call)
-        };
-
-        int rc;
-
-        void *setup_packet = NULL;
-        size_t setup_packet_len = 0;
-
-        rc = async_data_write_accept(&setup_packet, false,
-            1, USB_MAX_PAYLOAD_SIZE, 0, &setup_packet_len);
-        if (rc != EOK) {
-                ipc_answer_0(callid, rc);
-                return;
-        }
-
-        async_transaction_t *trans = malloc(sizeof(async_transaction_t));
-        trans->caller = callid;
-        trans->setup_packet = setup_packet;
-        trans->buffer = malloc(data_len);
-        trans->size = data_len;
-
-        rc = usb_iface->control_read(device, target,
-            setup_packet, setup_packet_len,
-            trans->buffer, trans->size,
-            callback_in, trans);
-
-        if (rc != EOK) {
-                ipc_answer_0(callid, rc);
-                free(setup_packet);
-                free(trans->buffer);
-                free(trans);
-        }
-}
-