Ignore:
Timestamp:
2010-11-22T15:39:53Z (13 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
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.
Message:

Merge development/ changes

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r9a1d8ab r0b749a3  
    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;
    55 
    56 /** Type definition of the dummy nil device specific data pointer.
    57  *  @see nildummy_device
    58  */
    59 typedef nildummy_device_t *             nildummy_device_ref;
     54typedef struct nildummy_device nildummy_device_t;
    6055
    6156/** Type definition of the dummy nil protocol specific data.
    62  *  @see nildummy_proto
     57 * @see nildummy_proto
    6358 */
    64 typedef struct nildummy_proto   nildummy_proto_t;
    65 
    66 /** Type definition of the dummy nil protocol specific data pointer.
    67  *  @see nildummy_proto
    68  */
    69 typedef nildummy_proto_t *              nildummy_proto_ref;
     59typedef struct nildummy_proto nildummy_proto_t;
    7060
    7161/** Dummy nil device map.
    72  *  Maps devices to the dummy nil device specific data.
    73  *  @see device.h
     62 * Maps devices to the dummy nil device specific data.
     63 * @see device.h
    7464 */
    75 DEVICE_MAP_DECLARE(nildummy_devices, nildummy_device_t)
     65DEVICE_MAP_DECLARE(nildummy_devices, nildummy_device_t);
    7666
    77 /** Dummy nil device specific data.
    78  */
    79 struct  nildummy_device{
    80         /** Device identifier.
    81          */
     67/** Dummy nil device specific data. */
     68struct nildummy_device {
     69        /** Device identifier. */
    8270        device_id_t device_id;
    83         /** Device driver service.
    84          */
     71        /** Device driver service. */
    8572        services_t service;
    86         /** Driver phone.
    87          */
     73        /** Driver phone. */
    8874        int phone;
    89         /** Maximal transmission unit.
    90          */
     75        /** Maximal transmission unit. */
    9176        size_t mtu;
    92         /** Actual device hardware address.
    93          */
    94         measured_string_ref addr;
    95         /** Actual device hardware address data.
    96          */
    97         char * addr_data;
     77        /** Actual device hardware address. */
     78        measured_string_t *addr;
     79        /** Actual device hardware address data. */
     80        char *addr_data;
    9881};
    9982
    100 /** Dummy nil protocol specific data.
    101  */
    102 struct nildummy_proto{
    103         /** Protocol service.
    104          */
     83/** Dummy nil protocol specific data. */
     84struct nildummy_proto {
     85        /** Protocol service. */
    10586        services_t service;
    106         /** Protocol module phone.
    107          */
     87        /** Protocol module phone. */
    10888        int phone;
    10989};
    11090
    111 /** Dummy nil global data.
    112  */
    113 struct  nildummy_globals{
    114         /** Networking module phone.
    115          */
     91/** Dummy nil global data. */
     92struct nildummy_globals {
     93        /** Networking module phone. */
    11694        int net_phone;
    117         /** Safety lock for devices.
    118          */
     95        /** Safety lock for devices. */
    11996        fibril_rwlock_t devices_lock;
    120         /** All known Ethernet devices.
    121          */
     97        /** All known Ethernet devices. */
    12298        nildummy_devices_t devices;
    123         /** Safety lock for protocols.
    124          */
     99        /** Safety lock for protocols. */
    125100        fibril_rwlock_t protos_lock;
    126         /** Default protocol.
    127          */
     101        /** Default protocol. */
    128102        nildummy_proto_t proto;
    129103};
Note: See TracChangeset for help on using the changeset viewer.