Changeset 32ec5671 in mainline

Timestamp:

2011-10-12T20:31:29Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

0d103aef

Parents:

013517b

Message:

usb: Remove unused port_no argument.

Location:

uspace

Files:

• drv/bus/usb/uhcirh/port.c (modified) (3 diffs)
• drv/bus/usb/usbhub/port.c (modified) (3 diffs)
• drv/bus/usb/vhc/hub.c (modified) (2 diffs)
• lib/usbdev/include/usb/dev/hub.h (modified) (1 diff)
• lib/usbdev/src/hub.c (modified) (4 diffs)

uspace/drv/bus/usb/uhcirh/port.c

@@ -45 +45 @@
 
 static int uhci_port_check(void *port);
-static int uhci_port_reset_enable(int portno, void *arg);
+static int uhci_port_reset_enable(void *arg);
 static int uhci_port_new_device(uhci_port_t *port, usb_speed_t speed);
 static int uhci_port_remove_device(uhci_port_t *port);
@@ -213 +213 @@
  * Resets and enables the ub port.
  */
-int uhci_port_reset_enable(int portno, void *arg)
+int uhci_port_reset_enable(void *arg)
 {
         uhci_port_t *port = arg;
@@ -260 +260 @@
         do {
                 ret = usb_hc_new_device_wrapper(port->rh, &port->hc_connection,
-                    speed, uhci_port_reset_enable, port->number, port,
+                    speed, uhci_port_reset_enable, port,
                     &port->attached_device.address, NULL, NULL,
                     &port->attached_device.fun);

uspace/drv/bus/usb/usbhub/port.c

@@ -60 +60 @@
     usb_port_status_t status);
 static int get_port_status(usb_hub_port_t *port, usb_port_status_t *status);
-static int enable_port_callback(int port_no, void *arg);
+static int enable_port_callback(void *arg);
 static int add_device_phase1_worker_fibril(void *arg);
 static int create_add_device_fibril(usb_hub_port_t *port, usb_hub_dev_t *hub,
@@ -378 +378 @@
  * @return Error code.
  */
-static int enable_port_callback(int port_no, void *arg)
+static int enable_port_callback(void *arg)
 {
         usb_hub_port_t *port = arg;
@@ -421 +421 @@
 
         const int rc = usb_hc_new_device_wrapper(data->hub->usb_device->ddf_dev,
-            &data->hub->connection, data->speed,
-            enable_port_callback, (int) data->port->port_number,
+            &data->hub->connection, data->speed, enable_port_callback,
             data->port, &new_address, NULL, NULL, &child_fun);
 

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

@@ -81 +81 @@
 }
 
-static int pretend_port_rest(int unused, void *unused2)
+static int pretend_port_rest(void *unused2)
 {
         return EOK;
@@ -115 +115 @@
         ddf_fun_t *hub_dev;
         rc = usb_hc_new_device_wrapper(hc_dev->dev, &hc_conn, USB_SPEED_FULL,
-            pretend_port_rest, 0, NULL, NULL, &rh_ops, hc_dev, &hub_dev);
+            pretend_port_rest, NULL, NULL, &rh_ops, hc_dev, &hub_dev);
         if (rc != EOK) {
                 usb_log_fatal("Failed to create root hub: %s.\n",

uspace/lib/usbdev/include/usb/dev/hub.h

@@ -43 +43 @@
 
 int usb_hc_new_device_wrapper(ddf_dev_t *, usb_hc_connection_t *, usb_speed_t,
-    int (*)(int, void *), int, void *,
-    usb_address_t *, ddf_dev_ops_t *, void *, ddf_fun_t **);
+    int (*)(void *), void *, usb_address_t *, ddf_dev_ops_t *, void *,
+    ddf_fun_t **);
 
 /** Info about device attached to host controller.

uspace/lib/usbdev/src/hub.c

@@ -155 +155 @@
  * The @p enable_port function is expected to enable signaling on given
  * port.
- * The two arguments to it can have arbitrary meaning
- * (the @p port_no is only a suggestion)
- * and are not touched at all by this function
- * (they are passed as is to the @p enable_port function).
+ * The argument can have arbitrary meaning and it is not touched at all
+ * by this function (it is passed as is to the @p enable_port function).
  *
  * If the @p enable_port fails (i.e. does not return EOK), the device
@@ -175 +173 @@
  * @param[in] enable_port Function for enabling signaling through the port the
  *      device is attached to.
- * @param[in] port_no Port number (passed through to @p enable_port).
  * @param[in] arg Any data argument to @p enable_port.
  * @param[out] assigned_address USB address of the device.
@@ -193 +190 @@
 int usb_hc_new_device_wrapper(ddf_dev_t *parent, usb_hc_connection_t *connection,
     usb_speed_t dev_speed,
-    int (*enable_port)(int port_no, void *arg), int port_no, void *arg,
-    usb_address_t *assigned_address,
+    int (*enable_port)(void *arg), void *arg, usb_address_t *assigned_address,
     ddf_dev_ops_t *dev_ops, void *new_dev_data, ddf_fun_t **new_fun)
 {
@@ -278 +274 @@
          * device address.
          */
-        rc = enable_port(port_no, arg);
+        rc = enable_port(arg);
         if (rc != EOK) {
                 goto leave_release_default_address;