Changeset a1347a7 in mainline for uspace/lib/nic/include

Timestamp:

2012-01-15T13:51:09Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

bd79281

Parents:

03e0a244 (diff), f302586 (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

Location:

uspace/lib/nic/include

Files:

• nic.h (modified) (2 diffs)
• nic_driver.h (modified) (1 diff)
• nic_impl.h (modified) (1 diff)

uspace/lib/nic/include/nic.h

@@ -77 +77 @@
  *
  * @param nic_data
- * @param packet        Pointer to the packet to be sent
- */
-typedef void (*write_packet_handler)(nic_t *, packet_t *);
+ * @param data          Pointer to frame data
+ * @param size          Size of frame data in bytes
+ */
+typedef void (*send_frame_handler)(nic_t *, void *, size_t);
 /**
  * The handler for transitions between driver states.
@@ -206 +207 @@
 extern int nic_get_resources(nic_t *, hw_res_list_parsed_t *);
 extern void nic_set_specific(nic_t *, void *);
-extern void nic_set_write_packet_handler(nic_t *, write_packet_handler);
+extern void nic_set_send_frame_handler(nic_t *, send_frame_handler);
 extern void nic_set_state_change_handlers(nic_t *,
         state_change_handler, state_change_handler, state_change_handler);

uspace/lib/nic/include/nic_driver.h

@@ -134 +134 @@
          * Called with the main_lock locked for reading.
          */
-        write_packet_handler write_packet;
+        send_frame_handler send_frame;
         /**
          * Event handler called when device goes to the ACTIVE state.

uspace/lib/nic/include/nic_impl.h

@@ -48 +48 @@
 
 extern int nic_get_address_impl(ddf_fun_t *dev_fun, nic_address_t *address);
-extern int nic_send_message_impl(ddf_fun_t *dev_fun, packet_id_t packet_id);
+extern int nic_send_frame_impl(ddf_fun_t *dev_fun, void *data, size_t size);
 extern int nic_connect_to_nil_impl(ddf_fun_t *dev_fun, services_t nil_service,
         int device_id);