Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r849ed54 r30b2d02  
    2828
    2929/** @addtogroup nildummy
    30  *  @{
     30 * @{
    3131 */
    3232
    3333/** @file
    34  *  Dummy network interface layer module.
     34 * Dummy network interface layer module.
    3535 */
    3636
    37 #ifndef __NET_NILDUMMY_H__
    38 #define __NET_NILDUMMY_H__
     37#ifndef NET_NILDUMMY_H_
     38#define NET_NILDUMMY_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 dummy nil global data.
    47  *  @see nildummy_globals
     47 * @see nildummy_globals
    4848 */
    49 typedef struct nildummy_globals nildummy_globals_t;
     49typedef struct nildummy_globals nildummy_globals_t;
    5050
    5151/** Type definition of the dummy nil device specific data.
    52  *  @see nildummy_device
     52 * @see nildummy_device
    5353 */
    54 typedef struct nildummy_device  nildummy_device_t;
     54typedef struct nildummy_device nildummy_device_t;
    5555
    5656/** Type definition of the dummy nil device specific data pointer.
    57  *  @see nildummy_device
     57 * @see nildummy_device
    5858 */
    59 typedef nildummy_device_t *             nildummy_device_ref;
     59typedef nildummy_device_t *nildummy_device_ref;
    6060
    6161/** Type definition of the dummy nil protocol specific data.
    62  *  @see nildummy_proto
     62 * @see nildummy_proto
    6363 */
    6464typedef struct nildummy_proto   nildummy_proto_t;
    6565
    6666/** Type definition of the dummy nil protocol specific data pointer.
    67  *  @see nildummy_proto
     67 * @see nildummy_proto
    6868 */
    69 typedef nildummy_proto_t *              nildummy_proto_ref;
     69typedef nildummy_proto_t *nildummy_proto_ref;
    7070
    7171/** Dummy nil device map.
    72  *  Maps devices to the dummy nil device specific data.
    73  *  @see device.h
     72 * Maps devices to the dummy nil device specific data.
     73 * @see device.h
    7474 */
    75 DEVICE_MAP_DECLARE(nildummy_devices, nildummy_device_t)
     75DEVICE_MAP_DECLARE(nildummy_devices, nildummy_device_t);
    7676
    77 /** Dummy nil device specific data.
    78  */
    79 struct  nildummy_device{
    80         /** Device identifier.
    81          */
     77/** Dummy nil device specific data. */
     78struct nildummy_device {
     79        /** Device identifier. */
    8280        device_id_t device_id;
    83         /** Device driver service.
    84          */
     81        /** Device driver service. */
    8582        services_t service;
    86         /** Driver phone.
    87          */
     83        /** Driver phone. */
    8884        int phone;
    89         /** Maximal transmission unit.
    90          */
     85        /** Maximal transmission unit. */
    9186        size_t mtu;
    92         /** Actual device hardware address.
    93          */
     87        /** Actual device hardware address. */
    9488        measured_string_ref addr;
    95         /** Actual device hardware address data.
    96          */
    97         char * addr_data;
     89        /** Actual device hardware address data. */
     90        char *addr_data;
    9891};
    9992
    100 /** Dummy nil protocol specific data.
    101  */
    102 struct nildummy_proto{
    103         /** Protocol service.
    104          */
     93/** Dummy nil protocol specific data. */
     94struct nildummy_proto {
     95        /** Protocol service. */
    10596        services_t service;
    106         /** Protocol module phone.
    107          */
     97        /** Protocol module phone. */
    10898        int phone;
    10999};
    110100
    111 /** Dummy nil global data.
    112  */
    113 struct  nildummy_globals{
    114         /** Networking module phone.
    115          */
     101/** Dummy nil global data. */
     102struct  nildummy_globals {
     103        /** Networking module phone. */
    116104        int net_phone;
    117         /** Safety lock for devices.
    118          */
     105        /** Safety lock for devices. */
    119106        fibril_rwlock_t devices_lock;
    120         /** All known Ethernet devices.
    121          */
     107        /** All known Ethernet devices. */
    122108        nildummy_devices_t devices;
    123         /** Safety lock for protocols.
    124          */
     109        /** Safety lock for protocols. */
    125110        fibril_rwlock_t protos_lock;
    126         /** Default protocol.
    127          */
     111        /** Default protocol. */
    128112        nildummy_proto_t proto;
    129113};
Note: See TracChangeset for help on using the changeset viewer.