Changeset b278b4e in mainline for uspace/lib/net/include

Timestamp:

2010-10-10T19:52:27Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

10056483

Parents:

ae972834 (diff), eb51e31 (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 from lp:~jakub/helenos/net.

This is mostly removal of the bundle build support for the networking stack as
we don't want to manually maintain both bundled and modular configurations.

Location:

uspace/lib/net/include

Files:

• arp_interface.h (modified) (1 diff)
• ip_interface.h (modified) (3 diffs)
• net_interface.h (modified) (1 diff)
• netif_interface.h (modified) (2 diffs)
• netif_local.h (modified) (1 diff)
• netif_nil_bundle.h (deleted)
• nil_interface.h (modified) (2 diffs)

uspace/lib/net/include/arp_interface.h

@@ -104 +104 @@
  *  @param service The ARP module service. Ignored parameter.
  *  @returns The ARP module phone on success.
- *  @returns 0 if called by the bundle module.
  */
 extern int arp_connect_module(services_t service);
 
 /** Returns the ARP task identifier.
- *  @returns The current task identifier if called by the bundle module.
  *  @returns 0 if called by the remote module.
  */

uspace/lib/net/include/ip_interface.h

@@ -44 +44 @@
 #include <ip_codes.h>
 
-#ifdef CONFIG_IL_TL_BUNDLE
-
-#include <ip_local.h>
-
-#define ip_received_error_msg  ip_received_error_msg_local
-#define ip_set_gateway_req     ip_set_gateway_req_local
-#define ip_packet_size_req     ip_packet_size_req_local
-#define ip_device_req          ip_device_req_local
-#define ip_add_route_req       ip_add_route_req_local
-#define ip_send_msg            ip_send_msg_local
-#define ip_get_route_req       ip_get_route_req_local
-
-#else
-
 #include <ip_remote.h>
 
@@ -67 +53 @@
 #define ip_send_msg            ip_send_msg_remote
 #define ip_get_route_req       ip_get_route_req_remote
-
-#endif
 
 /** @name IP module interface
@@ -100 +84 @@
  *  @param service The IP module service. Ignored parameter.
  *  @returns The IP module phone on success.
- *  @returns 0 if called by the bundle module.
  */
 extern int ip_connect_module(services_t service);

uspace/lib/net/include/net_interface.h

@@ -85 +85 @@
  *  @param service The networking module service. Ignored parameter.
  *  @returns The networking module phone on success.
- *  @returns 0 if called by the bundle module.
  */
 extern int net_connect_module(services_t service);

uspace/lib/net/include/netif_interface.h

@@ -34 +34 @@
 #define __NET_NETIF_INTERFACE_H__
 
-#ifdef CONFIG_NETIF_NIL_BUNDLE
-
-#include <netif_local.h>
-#include <netif_nil_bundle.h>
-#include <packet/packet_server.h>
-
-#define netif_module_message    netif_nil_module_message
-#define netif_module_start      netif_nil_module_start
-#define netif_get_addr_req      netif_get_addr_req_local
-#define netif_probe_req         netif_probe_req_local
-#define netif_send_msg          netif_send_msg_local
-#define netif_start_req         netif_start_req_local
-#define netif_stop_req          netif_stop_req_local
-#define netif_stats_req         netif_stats_req_local
-#define netif_bind_service      netif_bind_service_local
-
-#else /* CONFIG_NETIF_NIL_BUNDLE */
-
 #include <netif_remote.h>
 #include <packet_client.h>
@@ -65 +47 @@
 #define netif_bind_service      netif_bind_service_remote
 
-#endif /* CONFIG_NETIF_NIL_BUNDLE */
-
 #endif
 

uspace/lib/net/include/netif_local.h

@@ -34 +34 @@
  * Network interface module skeleton.
  * The skeleton has to be part of each network interface module.
- * The skeleton can be also part of the module bundled with the network interface layer.
  */
 

uspace/lib/net/include/nil_interface.h

@@ -68 +68 @@
 
 
-#ifdef CONFIG_NETIF_NIL_BUNDLE
-
-#include <nil_local.h>
-#include <packet/packet_server.h>
-
-#define nil_device_state_msg  nil_device_state_msg_local
-#define nil_received_msg      nil_received_msg_local
-
-#else /* CONFIG_NETIF_NIL_BUNDLE */
-
 #include <nil_remote.h>
 #include <packet/packet_server.h>
@@ -84 +74 @@
 #define nil_received_msg      nil_received_msg_remote
 
-#endif /* CONFIG_NETIF_NIL_BUNDLE */
-
 #endif