Changeset 948911d in mainline for uspace/lib/c/generic/device/nic.c

Timestamp:

2012-01-24T02:27:43Z (12 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.

File:

• uspace/lib/c/generic/device/nic.c (modified) (4 diffs)

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