Changeset 0b749a3 in mainline for uspace/srv/net/il/arp/arp.h


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/il/arp/arp.h

    r9a1d8ab r0b749a3  
    2828
    2929/** @addtogroup arp
    30  *  @{
     30 * @{
    3131 */
    3232
    3333/** @file
    34  *  ARP module.
     34 * ARP module.
    3535 */
    3636
    37 #ifndef __NET_ARP_H__
    38 #define __NET_ARP_H__
     37#ifndef NET_ARP_H_
     38#define NET_ARP_H_
    3939
    4040#include <fibril_synch.h>
    … …  
    4343#include <ipc/services.h>
    4444
    45 #include <net_device.h>
     45#include <net/device.h>
     46#include <net/packet.h>
    4647#include <net_hardware.h>
    4748#include <adt/generic_char_map.h>
    … …  
    4950#include <adt/measured_strings.h>
    5051
    51 
    5252/** Type definition of the ARP device specific data.
    53  *  @see arp_device
     53 * @see arp_device
    5454 */
    55 typedef struct arp_device       arp_device_t;
    56 
    57 /** Type definition of the ARP device specific data pointer.
    58  *  @see arp_device
    59  */
    60 typedef arp_device_t *          arp_device_ref;
     55typedef struct arp_device arp_device_t;
    6156
    6257/** Type definition of the ARP global data.
    63  *  @see arp_globals
     58 * @see arp_globals
    6459 */
    65 typedef struct arp_globals      arp_globals_t;
     60typedef struct arp_globals arp_globals_t;
    6661
    6762/** Type definition of the ARP protocol specific data.
    68  *  @see arp_proto
     63 * @see arp_proto
    6964 */
    70 typedef struct arp_proto        arp_proto_t;
    71 
    72 /** Type definition of the ARP protocol specific data pointer.
    73  *  @see arp_proto
    74  */
    75 typedef arp_proto_t *           arp_proto_ref;
     65typedef struct arp_proto arp_proto_t;
    7666
    7767/** ARP address map.
    78  *  Translates addresses.
    79  *  @see generic_char_map.h
     68 *
     69 * Translates addresses.
     70 * @see generic_char_map.h
    8071 */
    81 GENERIC_CHAR_MAP_DECLARE(arp_addr, measured_string_t)
     72GENERIC_CHAR_MAP_DECLARE(arp_addr, measured_string_t);
    8273
    8374/** ARP address cache.
    84  *  Maps devices to the ARP device specific data.
    85  *  @see device.h
     75 *
     76 * Maps devices to the ARP device specific data.
     77 * @see device.h
    8678 */
    87 DEVICE_MAP_DECLARE(arp_cache, arp_device_t)
     79DEVICE_MAP_DECLARE(arp_cache, arp_device_t);
    8880
    8981/** ARP protocol map.
    90  *  Maps protocol identifiers to the ARP protocol specific data.
    91  *  @see int_map.h
     82 *
     83 * Maps protocol identifiers to the ARP protocol specific data.
     84 * @see int_map.h
    9285 */
    93 INT_MAP_DECLARE(arp_protos, arp_proto_t)
     86INT_MAP_DECLARE(arp_protos, arp_proto_t);
    9487
    95 /** ARP device specific data.
    96  */
    97 struct arp_device{
    98         /** Actual device hardware address.
    99          */
    100         measured_string_ref addr;
    101         /** Actual device hardware address data.
    102          */
    103         char * addr_data;
    104         /** Broadcast device hardware address.
    105          */
    106         measured_string_ref broadcast_addr;
    107         /** Broadcast device hardware address data.
    108          */
    109         char * broadcast_data;
    110         /** Device identifier.
    111          */
     88/** ARP device specific data. */
     89struct arp_device {
     90        /** Actual device hardware address. */
     91        measured_string_t * addr;
     92        /** Actual device hardware address data. */
     93        char *addr_data;
     94        /** Broadcast device hardware address. */
     95        measured_string_t * broadcast_addr;
     96        /** Broadcast device hardware address data. */
     97        char *broadcast_data;
     98        /** Device identifier. */
    11299        device_id_t device_id;
    113         /** Hardware type.
    114          */
     100        /** Hardware type. */
    115101        hw_type_t hardware;
    116         /** Packet dimension.
    117          */
     102        /** Packet dimension. */
    118103        packet_dimension_t packet_dimension;
    119         /** Device module phone.
    120          */
     104        /** Device module phone. */
    121105        int phone;
    122         /** Protocol map.
    123          *  Address map for each protocol.
     106       
     107        /**
     108         * Protocol map.
     109         * Address map for each protocol.
    124110         */
    125111        arp_protos_t protos;
    126         /** Device module service.
    127         */
     112       
     113        /** Device module service. */
    128114        services_t service;
    129115};
    130116
    131 /** ARP global data.
    132  */
    133 struct  arp_globals{
    134         /** ARP address cache.
    135          */
     117/** ARP global data. */
     118struct arp_globals {
     119        /** ARP address cache. */
    136120        arp_cache_t cache;
    137         /** The client connection processing function.
    138          *  The module skeleton propagates its own one.
     121       
     122        /**
     123         * The client connection processing function.
     124         * The module skeleton propagates its own one.
    139125         */
    140126        async_client_conn_t client_connection;
    141         /** Networking module phone.
    142         */
     127       
     128        /** Networking module phone. */
    143129        int net_phone;
    144         /** Safety lock.
    145          */
     130        /** Safety lock. */
    146131        fibril_rwlock_t lock;
    147132};
    148133
    149 /** ARP protocol specific data.
    150  */
    151 struct arp_proto{
    152         /** Actual device protocol address.
    153          */
    154         measured_string_ref addr;
    155         /** Actual device protocol address data.
    156          */
    157         char * addr_data;
    158         /** Address map.
    159          */
     134/** ARP protocol specific data. */
     135struct arp_proto {
     136        /** Actual device protocol address. */
     137        measured_string_t *addr;
     138        /** Actual device protocol address data. */
     139        char *addr_data;
     140        /** Address map. */
    160141        arp_addr_t addresses;
    161         /** Protocol service.
    162          */
     142        /** Protocol service. */
    163143        services_t service;
    164144};
Note: See TracChangeset for help on using the changeset viewer.