Changeset 97c7682 in mainline for uspace/lib/nic/include/nic.h

Timestamp:

2012-07-14T11:18:40Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

804d9b6

Parents:

0747468 (diff), f0348c8 (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.

Text conflict in boot/arch/arm32/Makefile.inc:

Trivial conflict around ifeq condition.

Text conflict in kernel/arch/arm32/include/mm/page.h:

Added defines and set_pt_levelx_present function.
COnflict looked horrible because of the armv4/v7 split.

File:

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

uspace/lib/nic/include/nic.h

@@ -83 +83 @@
  */
 typedef void (*send_frame_handler)(nic_t *, void *, size_t);
+
 /**
  * The handler for transitions between driver states.
@@ -94 +95 @@
  */
 typedef int (*state_change_handler)(nic_t *);
+
 /**
  * Handler for unicast filtering mode change.
@@ -106 +108 @@
  */
 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.
@@ -119 +122 @@
  */
 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.
@@ -130 +134 @@
  */
 typedef int (*broadcast_mode_change_handler)(nic_t *, nic_broadcast_mode_t);
+
 /**
  * Handler for blocked sources list change.
@@ -138 +143 @@
  */
 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.
@@ -145 +151 @@
  */
 typedef void (*vlan_mask_change_handler)(nic_t *, const nic_vlan_mask_t *);
+
 /**
  * Handler called when a WOL virtue is added.
@@ -165 +172 @@
  */
 typedef int (*wol_virtue_add_handler)(nic_t *, const nic_wol_virtue_t *);
+
 /**
  * Handler called when a WOL virtue is removed.
@@ -174 +182 @@
  */
 typedef void (*wol_virtue_remove_handler)(nic_t *, const nic_wol_virtue_t *);
+
 /**
  * Handler for poll mode change.
@@ -186 +195 @@
  */
 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
@@ -202 +212 @@
 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 */
@@ -210 +220 @@
 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 */
@@ -232 +242 @@
 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 *);
@@ -255 +264 @@
 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);