Changeset 1f1fa64 in mainline for uspace/lib

Timestamp:

2014-07-28T21:53:11Z (11 years ago)

Author:

Agnieszka Tabaka <nufcia@…>

Branches:

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

Children:

c3b25985, f2f4c00

Parents:

cbfece7 (diff), 7eb6c96 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Make MAC address change possible on ethip side. Merge mainline changes.

Location:

uspace/lib

Files:

• drv/generic/driver.c (modified) (2 diffs)
• drv/include/ddf/driver.h (modified) (1 diff)
• nic/src/nic_driver.c (modified) (2 diffs)
• nic/src/nic_impl.c (modified) (1 diff)
• usbdev/include/usb/dev/hub.h (modified) (1 diff)
• usbdev/include/usb/dev/recognise.h (modified) (1 diff)
• usbdev/src/hub.c (modified) (5 diffs)
• usbdev/src/recognise.c (modified) (8 diffs)

uspace/lib/drv/generic/driver.c

@@ -36 +36 @@
 /** @file
  */
-
-#define _DDF_DATA_IMPLANT
 
 #include <assert.h>
@@ -596 +594 @@
 }
 
-/** Implant foreign driver-specific device data.
- *
- * XXX This is used to transition USB to new interface. Do not use
- * in new code. Use of this function must be removed.
- */
-void ddf_fun_data_implant(ddf_fun_t *fun, void *data)
-{
-        assert(fun->driver_data == NULL);
-        fun->driver_data = data;
-}
-
 /** Return driver-specific device data. */
 void *ddf_dev_data_get(ddf_dev_t *dev)

uspace/lib/drv/include/ddf/driver.h

@@ -111 +111 @@
 } driver_t;
 
-/** XXX Only to transition USB */
-#ifdef _DDF_DATA_IMPLANT
-extern void ddf_fun_data_implant(ddf_fun_t *, void *);
-#endif
-
 extern int ddf_driver_main(const driver_t *);
 

uspace/lib/nic/src/nic_driver.c

@@ -47 +47 @@
 #include <ops/nic.h>
 #include <errno.h>
+
+#include <io/log.h>
 
 #include "nic_driver.h"
@@ -436 +438 @@
                 int rc = nic_ev_addr_changed(nic_data->client_session,
                     address);
+                log_msg(LOG_DEFAULT, LVL_WARN, "rc=%d", rc);
+
                 if (rc != EOK) {
                         fibril_rwlock_write_unlock(&nic_data->main_lock);

uspace/lib/nic/src/nic_impl.c

@@ -179 +179 @@
 
         nic_data->send_frame(nic_data, data, size);
+        fibril_rwlock_read_unlock(&nic_data->main_lock);
         return EOK;
 }

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

@@ -44 +44 @@
 #include <usb/hc.h>
 
-extern int usb_hc_new_device_wrapper(ddf_dev_t *, usb_hc_connection_t *, usb_speed_t,
-    int (*)(void *), void *, usb_address_t *, ddf_dev_ops_t *, void *,
-    ddf_fun_t **);
+extern int usb_hc_new_device_wrapper(ddf_dev_t *, ddf_fun_t *,
+    usb_hc_connection_t *, usb_speed_t, int (*)(void *), void *,
+    usb_address_t *, ddf_dev_ops_t *);
 
 /** Info about device attached to host controller.

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

@@ -52 +52 @@
 
 extern int usb_device_register_child_in_devman(usb_pipe_t *ctrl_pipe,
-    ddf_dev_t *, ddf_dev_ops_t *, void *, ddf_fun_t **);
+    ddf_dev_t *, ddf_fun_t *, ddf_dev_ops_t *);
 
 #endif

uspace/lib/usbdev/src/hub.c

@@ -155 +155 @@
  *      request or requests for descriptors when creating match ids).
  */
-int usb_hc_new_device_wrapper(ddf_dev_t *parent,
+int usb_hc_new_device_wrapper(ddf_dev_t *parent, ddf_fun_t *fun,
     usb_hc_connection_t *hc_conn, usb_speed_t dev_speed,
     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)
+    ddf_dev_ops_t *dev_ops)
 {
-        if ((new_fun == NULL) || (hc_conn == NULL))
+        if (hc_conn == NULL)
                 return EINVAL;
 
@@ -271 +271 @@
         /* Register the device with devman. */
         /* FIXME: create device_register that will get opened ctrl pipe. */
-        ddf_fun_t *child_fun;
         rc = usb_device_register_child_in_devman(&ctrl_pipe,
-            parent, dev_ops, new_dev_data, &child_fun);
+            parent, fun, dev_ops);
         if (rc != EOK) {
                 goto leave_release_free_address;
@@ -280 +279 @@
         const usb_hub_attached_device_t new_device = {
                 .address = dev_addr,
-                .fun = child_fun,
+                .fun = fun,
         };
 
@@ -288 +287 @@
         if (rc != EOK) {
                 /* The child function is already created. */
-                ddf_fun_destroy(child_fun);
                 rc = EDESTADDRREQ;
                 goto leave_release_free_address;
@@ -296 +294 @@
                 *assigned_address = dev_addr;
         }
-
-        *new_fun = child_fun;
 
         rc = EOK;

uspace/lib/usbdev/src/recognise.c

@@ -33 +33 @@
  * Functions for recognition of attached devices.
  */
-
-/** XXX Fix this */
-#define _DDF_DATA_IMPLANT
 
 #include <sys/types.h>
@@ -318 +315 @@
  */
 int usb_device_register_child_in_devman(usb_pipe_t *ctrl_pipe,
-    ddf_dev_t *parent, ddf_dev_ops_t *dev_ops, void *dev_data,
-    ddf_fun_t **child_fun)
-{
-        if (child_fun == NULL || ctrl_pipe == NULL)
+    ddf_dev_t *parent, ddf_fun_t *fun, ddf_dev_ops_t *dev_ops)
+{
+        if (ctrl_pipe == NULL)
                 return EINVAL;
         
-        if (!dev_ops && dev_data) {
+        if (!dev_ops && ddf_fun_data_get(fun) != NULL) {
                 usb_log_warning("Using standard fun ops with arbitrary "
                     "driver data. This does not have to work.\n");
@@ -334 +330 @@
             (size_t) atomic_preinc(&device_name_index);
         
-        ddf_fun_t *child = NULL;
         int rc;
         
@@ -348 +343 @@
         }
         
-        child = ddf_fun_create(parent, fun_inner, child_name);
-        if (child == NULL) {
-                rc = ENOMEM;
+        rc = ddf_fun_set_name(fun, child_name);
+        if (rc != EOK)
                 goto failure;
-        }
         
         if (dev_ops != NULL)
-                ddf_fun_set_ops(child, dev_ops);
+                ddf_fun_set_ops(fun, dev_ops);
         else
-                ddf_fun_set_ops(child, &child_ops);
-        
-        ddf_fun_data_implant(child, dev_data);
+                ddf_fun_set_ops(fun, &child_ops);
         
         /*
@@ -365 +356 @@
          * driver data if there is no other data
          */
-        if (!dev_data) {
+        if (ddf_fun_data_get(fun) == NULL) {
                 usb_hub_attached_device_t *new_device = ddf_fun_data_alloc(
-                    child, sizeof(usb_hub_attached_device_t));
+                    fun, sizeof(usb_hub_attached_device_t));
                 if (!new_device) {
                         rc = ENOMEM;
@@ -374 +365 @@
                 
                 new_device->address = ctrl_pipe->wire->address;
-                new_device->fun = child;
+                new_device->fun = fun;
         }
         
@@ -384 +375 @@
         
         list_foreach(match_ids.ids, link, match_id_t, match_id) {
-                rc = ddf_fun_add_match_id(child, match_id->id, match_id->score);
+                rc = ddf_fun_add_match_id(fun, match_id->id, match_id->score);
                 if (rc != EOK) {
                         clean_match_ids(&match_ids);
@@ -393 +384 @@
         clean_match_ids(&match_ids);
         
-        rc = ddf_fun_bind(child);
+        rc = ddf_fun_bind(fun);
         if (rc != EOK)
                 goto failure;
         
-        *child_fun = child;
         return EOK;
         
 failure:
-        if (child != NULL) {
-                /* This takes care of match_id deallocation as well. */
-                ddf_fun_destroy(child);
-        }
-        
         return rc;
 }