Changeset 7943c43 in mainline for uspace/lib/nic/src/nic_driver.c

Timestamp:

2012-01-16T22:45:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

32817cc, 3fe58d3c

Parents:

9117ef9b (diff), 3ea725e (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:

Merge mainline changes.

File:

• uspace/lib/nic/src/nic_driver.c (modified) (4 diffs)

uspace/lib/nic/src/nic_driver.c

@@ -114 +114 @@
                 if (!iface->set_state)
                         iface->set_state = nic_set_state_impl;
-                if (!iface->send_message)
-                        iface->send_message = nic_send_message_impl;
+                if (!iface->send_frame)
+                        iface->send_frame = nic_send_frame_impl;
                 if (!iface->connect_to_nil)
                         iface->connect_to_nil = nic_connect_to_nil_impl;
@@ -168 +168 @@
  *
  * @param nic_data
- * @param wpfunc                Function handling the write_packet request
- */
-void nic_set_write_packet_handler(nic_t *nic_data, write_packet_handler wpfunc)
-{
-        nic_data->write_packet = wpfunc;
+ * @param sffunc        Function handling the send_frame request
+ */
+void nic_set_send_frame_handler(nic_t *nic_data, send_frame_handler sffunc)
+{
+        nic_data->send_frame = sffunc;
 }
 
@@ -765 +765 @@
         nic_data->poll_mode = NIC_POLL_IMMEDIATE;
         nic_data->default_poll_mode = NIC_POLL_IMMEDIATE;
-        nic_data->write_packet = NULL;
+        nic_data->send_frame = NULL;
         nic_data->on_activating = NULL;
         nic_data->on_going_down = NULL;
@@ -1345 +1345 @@
 int nic_dma_unlock_packet(packet_t *packet, size_t size)
 {
-        return dmamem_unmap(packet, size, 0);
+        return dmamem_unmap(packet, size);
 }