Ignore:
Timestamp:
2011-04-13T14:45:41Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
88634420
Parents:
cefb126 (diff), 17279ead (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 mainline changes.

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    rcefb126 r89c57b6  
    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 *
     48 * @see nildummy_globals
     49 *
    4850 */
    49 typedef struct nildummy_globals nildummy_globals_t;
     51typedef struct nildummy_globals nildummy_globals_t;
    5052
    5153/** Type definition of the dummy nil device specific data.
    52  *  @see nildummy_device
     54 *
     55 * @see nildummy_device
     56 *
    5357 */
    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;
     58typedef struct nildummy_device nildummy_device_t;
    6059
    6160/** Type definition of the dummy nil protocol specific data.
    62  *  @see nildummy_proto
     61 *
     62 * @see nildummy_proto
     63 *
    6364 */
    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;
     65typedef struct nildummy_proto nildummy_proto_t;
    7066
    7167/** Dummy nil device map.
    72  *  Maps devices to the dummy nil device specific data.
    73  *  @see device.h
     68 *
     69 * Map devices to the dummy nil device specific data.
     70 * @see device.h
     71 *
    7472 */
    75 DEVICE_MAP_DECLARE(nildummy_devices, nildummy_device_t)
     73DEVICE_MAP_DECLARE(nildummy_devices, nildummy_device_t);
    7674
    77 /** Dummy nil device specific data.
    78  */
    79 struct  nildummy_device{
    80         /** Device identifier.
    81          */
     75/** Dummy nil device specific data. */
     76struct nildummy_device {
     77        /** Device identifier. */
    8278        device_id_t device_id;
    83         /** Device driver service.
    84         */
     79       
     80        /** Device driver service. */
    8581        services_t service;
    86         /** Driver phone.
    87         */
     82       
     83        /** Driver phone. */
    8884        int phone;
    89         /** Maximal transmission unit.
    90         */
     85       
     86        /** Maximal transmission unit. */
    9187        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;
     88       
     89        /** Actual device hardware address. */
     90        measured_string_t *addr;
     91       
     92        /** Actual device hardware address data. */
     93        uint8_t *addr_data;
    9894};
    9995
    100 /** Dummy nil protocol specific data.
    101  */
    102 struct nildummy_proto{
    103         /** Protocol service.
    104          */
     96/** Dummy nil protocol specific data. */
     97struct nildummy_proto {
     98        /** Protocol service. */
    10599        services_t service;
    106         /** Protocol module phone.
    107         */
     100       
     101        /** Protocol module phone. */
    108102        int phone;
    109103};
    110104
    111 /** Dummy nil global data.
    112  */
    113 struct  nildummy_globals{
    114         /** Networking module phone.
    115          */
     105/** Dummy nil global data. */
     106struct nildummy_globals {
     107        /** Networking module phone. */
    116108        int net_phone;
    117         /** Safety lock for devices.
    118         */
     109       
     110        /** Lock for devices. */
    119111        fibril_rwlock_t devices_lock;
    120         /** All known Ethernet devices.
    121         */
     112       
     113        /** All known Ethernet devices. */
    122114        nildummy_devices_t devices;
    123         /** Safety lock for protocols.
    124         */
     115       
     116        /** Safety lock for protocols. */
    125117        fibril_rwlock_t protos_lock;
    126         /** Default protocol.
    127         */
     118       
     119        /** Default protocol. */
    128120        nildummy_proto_t proto;
    129121};
Note: See TracChangeset for help on using the changeset viewer.