Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/net/nil/eth/eth.h

    r6067284 r24ab58b3  
    3232
    3333/** @file
    34  * Ethernet module.
     34 *  Ethernet module.
    3535 */
    3636
    37 #ifndef NET_ETH_H_
    38 #define NET_ETH_H_
     37#ifndef __NET_ETH_H__
     38#define __NET_ETH_H__
    3939
    4040#include <fibril_synch.h>
    4141#include <ipc/services.h>
    4242
    43 #include <net/device.h>
     43#include <net_device.h>
    4444#include <adt/measured_strings.h>
    4545
    4646/** Type definition of the Ethernet global data.
    47  * @see eth_globals
     47 *  @see eth_globals
    4848 */
    49 typedef struct eth_globals eth_globals_t;
     49typedef struct eth_globals      eth_globals_t;
    5050
    5151/** Type definition of the Ethernet device specific data.
    52  * @see eth_device
     52 *  @see eth_device
    5353 */
    54 typedef struct eth_device eth_device_t;
     54typedef struct eth_device       eth_device_t;
    5555
    5656/** Type definition of the Ethernet device specific data pointer.
    57  * @see eth_device
     57 *  @see eth_device
    5858 */
    59 typedef eth_device_t *eth_device_ref;
     59typedef eth_device_t *          eth_device_ref;
    6060
    6161/** Type definition of the Ethernet protocol specific data.
    62  * @see eth_proto
     62 *  @see eth_proto
    6363 */
    64 typedef struct eth_proto eth_proto_t;
     64typedef struct eth_proto        eth_proto_t;
    6565
    6666/** Type definition of the Ethernet protocol specific data pointer.
    67  * @see eth_proto
     67 *  @see eth_proto
    6868 */
    69 typedef eth_proto_t *eth_proto_ref;
     69typedef eth_proto_t *           eth_proto_ref;
    7070
    7171/** Ethernet device map.
    72  * Maps devices to the Ethernet device specific data.
    73  * @see device.h
     72 *  Maps devices to the Ethernet device specific data.
     73 *  @see device.h
    7474 */
    75 DEVICE_MAP_DECLARE(eth_devices, eth_device_t);
     75DEVICE_MAP_DECLARE(eth_devices, eth_device_t)
    7676
    7777/** Ethernet protocol map.
    78  * Maps protocol identifiers to the Ethernet protocol specific data.
    79  * @see int_map.h
     78 *  Maps protocol identifiers to the Ethernet protocol specific data.
     79 *  @see int_map.h
    8080 */
    81 INT_MAP_DECLARE(eth_protos, eth_proto_t);
     81INT_MAP_DECLARE(eth_protos, eth_proto_t)
    8282
    83 /** Ethernet device specific data. */
    84 struct eth_device {
    85         /** Device identifier. */
     83/** Ethernet device specific data.
     84 */
     85struct  eth_device{
     86        /** Device identifier.
     87         */
    8688        device_id_t device_id;
    87         /** Device driver service. */
     89        /** Device driver service.
     90         */
    8891        services_t service;
    89         /** Driver phone. */
     92        /** Driver phone.
     93         */
    9094        int phone;
    91         /** Maximal transmission unit. */
     95        /** Maximal transmission unit.
     96         */
    9297        size_t mtu;
    93        
    94         /**
    95          * Various device flags.
    96          * @see ETH_DUMMY
    97          * @see ETH_MODE_MASK
     98        /** Various device flags.
     99         *  @see ETH_DUMMY
     100         *  @see ETH_MODE_MASK
    98101         */
    99102        int flags;
    100        
    101         /** Actual device hardware address. */
     103        /** Actual device hardware address.
     104        */
    102105        measured_string_ref addr;
    103         /** Actual device hardware address data. */
    104         char *addr_data;
     106        /** Actual device hardware address data.
     107         */
     108        char * addr_data;
    105109};
    106110
    107 /** Ethernet protocol specific data. */
    108 struct eth_proto {
    109         /** Protocol service. */
     111/** Ethernet protocol specific data.
     112 */
     113struct eth_proto{
     114        /** Protocol service.
     115         */
    110116        services_t service;
    111         /** Protocol identifier. */
     117        /** Protocol identifier.
     118         */
    112119        int protocol;
    113         /** Protocol module phone. */
     120        /** Protocol module phone.
     121         */
    114122        int phone;
    115123};
    116124
    117 /** Ethernet global data. */
    118 struct eth_globals {
    119         /** Networking module phone. */
     125/** Ethernet global data.
     126 */
     127struct  eth_globals{
     128        /** Networking module phone.
     129         */
    120130        int net_phone;
    121         /** Safety lock for devices. */
     131        /** Safety lock for devices.
     132         */
    122133        fibril_rwlock_t devices_lock;
    123         /** All known Ethernet devices. */
     134        /** All known Ethernet devices.
     135         */
    124136        eth_devices_t devices;
    125         /** Safety lock for protocols. */
     137        /** Safety lock for protocols.
     138         */
    126139        fibril_rwlock_t protos_lock;
    127        
    128         /**
    129          * Protocol map.
    130          * Service phone map for each protocol.
     140        /** Protocol map.
     141         *  Service phone map for each protocol.
    131142         */
    132143        eth_protos_t protos;
    133        
    134         /** Broadcast device hardware address. */
     144        /** Broadcast device hardware address.
     145        */
    135146        measured_string_ref broadcast_addr;
    136147};
Note: See TracChangeset for help on using the changeset viewer.