Changes in uspace/lib/nic/include/nic.h [062d900:77a69ea] in mainline

File:

• uspace/lib/nic/include/nic.h (modified) (16 diffs)

uspace/lib/nic/include/nic.h

@@ -40 +40 @@
 
 #include <adt/list.h>
-#include <adt/hash_table.h>
 #include <ddf/driver.h>
 #include <device/hw_res_parsed.h>
@@ -54 +53 @@
  */
 typedef struct nic_wol_virtue {
-        ht_link_t item;
+        link_t item;
         nic_wv_id_t id;
         nic_wv_type_t type;
@@ -84 +83 @@
  */
 typedef void (*send_frame_handler)(nic_t *, void *, size_t);
-
 /**
  * The handler for transitions between driver states.
@@ -96 +94 @@
  */
 typedef int (*state_change_handler)(nic_t *);
-
 /**
  * Handler for unicast filtering mode change.
@@ -109 +106 @@
  */
 typedef int (*unicast_mode_change_handler)(nic_t *,
-    nic_unicast_mode_t, const nic_address_t *, size_t);
-
+        nic_unicast_mode_t, const nic_address_t *, size_t);
 /**
  * Handler for multicast filtering mode change.
@@ -123 +119 @@
  */
 typedef int (*multicast_mode_change_handler)(nic_t *,
-    nic_multicast_mode_t, const nic_address_t *, size_t);
-
+        nic_multicast_mode_t, const nic_address_t *, size_t);
 /**
  * Handler for broadcast filtering mode change.
@@ -135 +130 @@
  */
 typedef int (*broadcast_mode_change_handler)(nic_t *, nic_broadcast_mode_t);
-
 /**
  * Handler for blocked sources list change.
@@ -144 +138 @@
  */
 typedef void (*blocked_sources_change_handler)(nic_t *,
-    const nic_address_t *, size_t);
-
+        const nic_address_t *, size_t);
 /**
  * Handler for VLAN filtering mask change.
@@ -152 +145 @@
  */
 typedef void (*vlan_mask_change_handler)(nic_t *, const nic_vlan_mask_t *);
-
 /**
  * Handler called when a WOL virtue is added.
@@ -173 +165 @@
  */
 typedef int (*wol_virtue_add_handler)(nic_t *, const nic_wol_virtue_t *);
-
 /**
  * Handler called when a WOL virtue is removed.
@@ -183 +174 @@
  */
 typedef void (*wol_virtue_remove_handler)(nic_t *, const nic_wol_virtue_t *);
-
 /**
  * Handler for poll mode change.
@@ -196 +186 @@
  */
 typedef int (*poll_mode_change_handler)(nic_t *,
-    nic_poll_mode_t, const struct timeval *);
-
+        nic_poll_mode_t, const struct timeval *);
 /**
  * Event handler called when the NIC should poll its buffers for a new frame
@@ -213 +202 @@
 extern int nic_driver_init(const char *);
 extern void nic_driver_implement(driver_ops_t *, ddf_dev_ops_t *,
-    nic_iface_t *);
+        nic_iface_t *);
 
 /* Functions called in add_device */
@@ -221 +210 @@
 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);
+        state_change_handler, state_change_handler, state_change_handler);
 extern void nic_set_filtering_change_handlers(nic_t *,
-    unicast_mode_change_handler, multicast_mode_change_handler,
-    broadcast_mode_change_handler, blocked_sources_change_handler,
-    vlan_mask_change_handler);
+        unicast_mode_change_handler, multicast_mode_change_handler,
+        broadcast_mode_change_handler, blocked_sources_change_handler,
+        vlan_mask_change_handler);
 extern void nic_set_wol_virtue_change_handlers(nic_t *,
-    wol_virtue_add_handler, wol_virtue_remove_handler);
+        wol_virtue_add_handler, wol_virtue_remove_handler);
 extern void nic_set_poll_handlers(nic_t *,
-    poll_mode_change_handler, poll_request_handler);
+        poll_mode_change_handler, poll_request_handler);
 
 /* General driver functions */
@@ -243 +232 @@
 extern int nic_report_poll_mode(nic_t *, nic_poll_mode_t, struct timeval *);
 extern void nic_query_address(nic_t *, nic_address_t *);
+extern void nic_received_noneth_frame(nic_t *, void *, size_t);
 extern void nic_received_frame(nic_t *, nic_frame_t *);
 extern void nic_received_frame_list(nic_t *, nic_frame_list_t *);
@@ -265 +255 @@
 extern void nic_report_hw_filtering(nic_t *, int, int, int);
 extern void nic_query_unicast(const nic_t *,
-    nic_unicast_mode_t *, size_t, nic_address_t *, size_t *);
+        nic_unicast_mode_t *, size_t, nic_address_t *, size_t *);
 extern void nic_query_multicast(const nic_t *,
-    nic_multicast_mode_t *, size_t, nic_address_t *, size_t *);
+        nic_multicast_mode_t *, size_t, nic_address_t *, size_t *);
 extern void nic_query_broadcast(const nic_t *, nic_broadcast_mode_t *);
 extern void nic_query_blocked_sources(const nic_t *,
-    size_t, nic_address_t *, size_t *);
+        size_t, nic_address_t *, size_t *);
 extern int nic_query_vlan_mask(const nic_t *, nic_vlan_mask_t *);
 extern int nic_query_wol_max_caps(const nic_t *, nic_wv_type_t);