Changeset 948911d in mainline for uspace/lib/c/generic

Timestamp:

2012-01-24T02:27:43Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

230385c

Parents:

8afeb04 (diff), 2df6f6fe (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:

Mainline changes.

Location:

uspace/lib/c/generic

Files:

• async.c (modified) (3 diffs)
• device/nic.c (modified) (4 diffs)
• devman.c (modified) (2 diffs)
• loc.c (modified) (9 diffs)

uspace/lib/c/generic/async.c

@@ -257 +257 @@
 void async_set_client_data_constructor(async_client_data_ctor_t ctor)
 {
+        assert(async_client_data_create == default_client_data_constructor);
         async_client_data_create = ctor;
 }
@@ -262 +263 @@
 void async_set_client_data_destructor(async_client_data_dtor_t dtor)
 {
+        assert(async_client_data_destroy == default_client_data_destructor);
         async_client_data_destroy = dtor;
 }
@@ -303 +305 @@
 void async_set_client_connection(async_client_conn_t conn)
 {
+        assert(client_connection == default_client_connection);
         client_connection = conn;
 }

uspace/lib/c/generic/device/nic.c

@@ -44 +44 @@
 #include <ipc/services.h>
 
-/** Send a packet through the device
- *
- * @param[in] dev_sess
- * @param[in] packet_id Id of the sent packet
- *
- * @return EOK If the operation was successfully completed
- *
- */
-int nic_send_message(async_sess_t *dev_sess, packet_id_t packet_id)
-{
-        async_exch_t *exch = async_exchange_begin(dev_sess);
-        int rc = async_req_2_0(exch, DEV_IFACE_ID(NIC_DEV_IFACE),
-            NIC_SEND_MESSAGE, packet_id);
-        async_exchange_end(exch);
-        
-        return rc;
-}
-
-/** Connect the driver to the NET and NIL services
- *
- * @param[in] dev_sess
- * @param[in] nil_service Service identifier for the NIL service
+/** Send frame from NIC
+ *
+ * @param[in] dev_sess
+ * @param[in] data     Frame data
+ * @param[in] size     Frame size in bytes
+ *
+ * @return EOK If the operation was successfully completed
+ *
+ */
+int nic_send_frame(async_sess_t *dev_sess, void *data, size_t size)
+{
+        async_exch_t *exch = async_exchange_begin(dev_sess);
+        
+        ipc_call_t answer;
+        aid_t req = async_send_1(exch, DEV_IFACE_ID(NIC_DEV_IFACE),
+            NIC_SEND_MESSAGE, &answer);
+        sysarg_t retval = async_data_write_start(exch, data, size);
+        
+        async_exchange_end(exch);
+        
+        if (retval != EOK) {
+                async_wait_for(req, NULL);
+                return retval;
+        }
+
+        async_wait_for(req, &retval);
+        return retval;
+}
+
+/** Create callback connection from NIC service
+ *
+ * @param[in] dev_sess
  * @param[in] device_id
  *
@@ -71 +81 @@
  *
  */
-int nic_connect_to_nil(async_sess_t *dev_sess, services_t nil_service,
-    nic_device_id_t device_id)
-{
-        async_exch_t *exch = async_exchange_begin(dev_sess);
-        int rc = async_req_3_0(exch, DEV_IFACE_ID(NIC_DEV_IFACE),
-            NIC_CONNECT_TO_NIL, nil_service, device_id);
-        async_exchange_end(exch);
-        
-        return rc;
+int nic_callback_create(async_sess_t *dev_sess, nic_device_id_t device_id,
+    async_client_conn_t cfun, void *carg)
+{
+        ipc_call_t answer;
+        int rc;
+        sysarg_t retval;
+        
+        async_exch_t *exch = async_exchange_begin(dev_sess);
+        aid_t req = async_send_2(exch, DEV_IFACE_ID(NIC_DEV_IFACE),
+            NIC_CALLBACK_CREATE, device_id, &answer);
+        
+        rc = async_connect_to_me(exch, 0, 0, 0, cfun, carg);
+        if (rc != EOK) {
+                async_wait_for(req, NULL);
+                return rc;
+        }
+        async_exchange_end(exch);
+        
+        async_wait_for(req, &retval);
+        return (int) retval;
 }
 
@@ -324 +345 @@
  * it can never force the NIC to advertise unsupported modes.
  *
- * The allowed modes are defined in "net/eth_phys.h" in the C library.
+ * The allowed modes are defined in "nic/eth_phys.h" in the C library.
  *
  * @param[in] dev_sess
@@ -361 +382 @@
 /** Probe current state of auto-negotiation.
  *
- * Modes are defined in the "net/eth_phys.h" in the C library.
+ * Modes are defined in the "nic/eth_phys.h" in the C library.
  *
  * @param[in]  dev_sess

uspace/lib/c/generic/devman.c

@@ -177 +177 @@
 
 /** Register running driver with device manager. */
-int devman_driver_register(const char *name, async_client_conn_t conn)
+int devman_driver_register(const char *name)
 {
         async_exch_t *exch = devman_exchange_begin_blocking(DEVMAN_DRIVER);
@@ -192 +192 @@
         }
         
-        async_set_client_connection(conn);
-        
         exch = devman_exchange_begin(DEVMAN_DRIVER);
-        async_connect_to_me(exch, 0, 0, 0, conn, NULL);
+        async_connect_to_me(exch, 0, 0, 0, NULL, NULL);
         devman_exchange_end(exch);
         

uspace/lib/c/generic/loc.c

@@ -47 +47 @@
 static FIBRIL_MUTEX_INITIALIZE(loc_callback_mutex);
 static bool loc_callback_created = false;
+static loc_cat_change_cb_t cat_change_cb = NULL;
 
 static async_sess_t *loc_supp_block_sess = NULL;
@@ -54 +55 @@
 static async_sess_t *loc_consumer_sess = NULL;
 
-static loc_cat_change_cb_t cat_change_cb = NULL;
-
 static void loc_cb_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
-        loc_cat_change_cb_t cb_fun;
-        
         while (true) {
                 ipc_call_t call;
@@ -69 +66 @@
                 }
                 
-                int retval;
-                
                 switch (IPC_GET_IMETHOD(call)) {
                 case LOC_EVENT_CAT_CHANGE:
                         fibril_mutex_lock(&loc_callback_mutex);
-                        cb_fun = cat_change_cb;
-                        if (cb_fun != NULL) {
+                        loc_cat_change_cb_t cb_fun = cat_change_cb;
+                        fibril_mutex_unlock(&loc_callback_mutex);
+                        
+                        async_answer_0(callid, EOK);
+                        
+                        if (cb_fun != NULL)
                                 (*cb_fun)();
-                        }
-                        fibril_mutex_unlock(&loc_callback_mutex);
-                        retval = 0;
+                        
                         break;
                 default:
-                        retval = ENOTSUP;
+                        async_answer_0(callid, ENOTSUP);
                 }
-                
-                async_answer_0(callid, retval);
         }
 }
@@ -101 +96 @@
 }
 
+/** Create callback
+ *
+ * Must be called with loc_callback_mutex locked.
+ *
+ * @return EOK on success.
+ *
+ */
 static int loc_callback_create(void)
 {
-        async_exch_t *exch;
-        sysarg_t retval;
-        int rc = EOK;
-
-        fibril_mutex_lock(&loc_callback_mutex);
-        
         if (!loc_callback_created) {
-                exch = loc_exchange_begin_blocking(LOC_PORT_CONSUMER);
+                async_exch_t *exch =
+                    loc_exchange_begin_blocking(LOC_PORT_CONSUMER);
                 
                 ipc_call_t answer;
                 aid_t req = async_send_0(exch, LOC_CALLBACK_CREATE, &answer);
-                async_connect_to_me(exch, 0, 0, 0, loc_cb_conn, NULL);
+                int rc = async_connect_to_me(exch, 0, 0, 0, loc_cb_conn, NULL);
                 loc_exchange_end(exch);
                 
+                if (rc != EOK)
+                        return rc;
+                
+                sysarg_t retval;
                 async_wait_for(req, &retval);
-                if (rc != EOK)
-                        goto done;
-                
-                if (retval != EOK) {
-                        rc = retval;
-                        goto done;
-                }
+                if (retval != EOK)
+                        return retval;
                 
                 loc_callback_created = true;
         }
         
-        rc = EOK;
-done:
-        fibril_mutex_unlock(&loc_callback_mutex);
-        return rc;
+        return EOK;
 }
 
@@ -242 +235 @@
 
 /** Register new driver with loc. */
-int loc_server_register(const char *name, async_client_conn_t conn)
+int loc_server_register(const char *name)
 {
         async_exch_t *exch = loc_exchange_begin_blocking(LOC_PORT_SUPPLIER);
@@ -256 +249 @@
                 return retval;
         }
-        
-        async_set_client_connection(conn);
         
         exch = loc_exchange_begin(LOC_PORT_SUPPLIER);
@@ -797 +788 @@
     sysarg_t **data, size_t *count)
 {
-        service_id_t *ids;
-        size_t act_size;
-        size_t alloc_size;
-        int rc;
-
         *data = NULL;
-        act_size = 0;   /* silence warning */
-
-        rc = loc_category_get_ids_once(method, arg1, NULL, 0,
+        *count = 0;
+        
+        size_t act_size = 0;
+        int rc = loc_category_get_ids_once(method, arg1, NULL, 0,
             &act_size);
         if (rc != EOK)
                 return rc;
-
-        alloc_size = act_size;
-        ids = malloc(alloc_size);
+        
+        size_t alloc_size = act_size;
+        service_id_t *ids = malloc(alloc_size);
         if (ids == NULL)
                 return ENOMEM;
-
+        
         while (true) {
                 rc = loc_category_get_ids_once(method, arg1, ids, alloc_size,
@@ -820 +807 @@
                 if (rc != EOK)
                         return rc;
-
+                
                 if (act_size <= alloc_size)
                         break;
-
-                alloc_size *= 2;
-                free(ids);
-
-                ids = malloc(alloc_size);
+                
+                alloc_size = act_size;
+                ids = realloc(ids, alloc_size);
                 if (ids == NULL)
                         return ENOMEM;
         }
-
+        
         *count = act_size / sizeof(category_id_t);
         *data = ids;
@@ -869 +854 @@
 int loc_register_cat_change_cb(loc_cat_change_cb_t cb_fun)
 {
-        if (loc_callback_create() != EOK)
+        fibril_mutex_lock(&loc_callback_mutex);
+        if (loc_callback_create() != EOK) {
+                fibril_mutex_unlock(&loc_callback_mutex);
                 return EIO;
-
+        }
+        
         cat_change_cb = cb_fun;
+        fibril_mutex_unlock(&loc_callback_mutex);
+        
         return EOK;
 }