Changeset 0b749a3 in mainline for uspace/srv/net/net/net.h
- Timestamp:
- 2010-11-22T15:39:53Z (13 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 0eddb76, aae339e9
- Parents:
- 9a1d8ab (diff), 8cd1aa5e (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/net/net/net.h
r9a1d8ab r0b749a3 36 36 */ 37 37 38 #ifndef __NET_NET_H__39 #define __NET_NET_H__38 #ifndef NET_NET_H_ 39 #define NET_NET_H_ 40 40 41 41 #include <ipc/ipc.h> 42 42 43 #include <net _device.h>43 #include <net/device.h> 44 44 #include <adt/char_map.h> 45 45 #include <adt/generic_char_map.h> 46 46 #include <adt/measured_strings.h> 47 47 #include <adt/module_map.h> 48 #include < packet/packet.h>48 #include <net/packet.h> 49 49 50 50 /** @name Modules definitions … … 103 103 104 104 /** Serving network interface driver module index. */ 105 module_ refdriver;105 module_t *driver; 106 106 107 device_id_t id; 108 module_ ref il;/**< Serving internet layer module index. */109 char *name; 110 module_ ref nil;/**< Serving link layer module index. */107 device_id_t id; /**< System-unique network interface identifier. */ 108 module_t *il; /**< Serving internet layer module index. */ 109 char *name; /**< System-unique network interface name. */ 110 module_t *nil; /**< Serving link layer module index. */ 111 111 } netif_t; 112 112 … … 133 133 } net_globals_t; 134 134 135 extern int add_configuration(measured_strings_ ref, const char *, const char *);135 extern int add_configuration(measured_strings_t *, const char *, const char *); 136 136 extern int net_module_message(ipc_callid_t, ipc_call_t *, ipc_call_t *, int *); 137 137 extern int net_initialize_build(async_client_conn_t);
Note:
See TracChangeset
for help on using the changeset viewer.