Changeset 4687a26c in mainline for uspace/srv/net/il/arp/arp.h


Ignore:
Timestamp:
2010-11-02T18:29:01Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
4f35b9ff
Parents:
76e1121f (diff), 28f4adb (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/il/arp/arp.h

    r76e1121f r4687a26c  
    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;
     55typedef struct arp_device arp_device_t;
    5656
    5757/** Type definition of the ARP device specific data pointer.
    58  *  @see arp_device
     58 * @see arp_device
    5959 */
    60 typedef arp_device_t *          arp_device_ref;
     60typedef arp_device_t *arp_device_ref;
    6161
    6262/** Type definition of the ARP global data.
    63  *  @see arp_globals
     63 * @see arp_globals
    6464 */
    65 typedef struct arp_globals      arp_globals_t;
     65typedef struct arp_globals arp_globals_t;
    6666
    6767/** Type definition of the ARP protocol specific data.
    68  *  @see arp_proto
     68 * @see arp_proto
    6969 */
    70 typedef struct arp_proto        arp_proto_t;
     70typedef struct arp_proto arp_proto_t;
    7171
    7272/** Type definition of the ARP protocol specific data pointer.
    73  *  @see arp_proto
     73 * @see arp_proto
    7474 */
    75 typedef arp_proto_t *           arp_proto_ref;
     75typedef arp_proto_t *arp_proto_ref;
    7676
    7777/** ARP address map.
    78  *  Translates addresses.
    79  *  @see generic_char_map.h
     78 *
     79 * Translates addresses.
     80 * @see generic_char_map.h
    8081 */
    81 GENERIC_CHAR_MAP_DECLARE(arp_addr, measured_string_t)
     82GENERIC_CHAR_MAP_DECLARE(arp_addr, measured_string_t);
    8283
    8384/** ARP address cache.
    84  *  Maps devices to the ARP device specific data.
    85  *  @see device.h
     85 *
     86 * Maps devices to the ARP device specific data.
     87 * @see device.h
    8688 */
    87 DEVICE_MAP_DECLARE(arp_cache, arp_device_t)
     89DEVICE_MAP_DECLARE(arp_cache, arp_device_t);
    8890
    8991/** ARP protocol map.
    90  *  Maps protocol identifiers to the ARP protocol specific data.
    91  *  @see int_map.h
     92 *
     93 * Maps protocol identifiers to the ARP protocol specific data.
     94 * @see int_map.h
    9295 */
    93 INT_MAP_DECLARE(arp_protos, arp_proto_t)
     96INT_MAP_DECLARE(arp_protos, arp_proto_t);
    9497
    95 /** ARP device specific data.
    96  */
    97 struct arp_device{
    98         /** Actual device hardware address.
    99          */
     98/** ARP device specific data. */
     99struct arp_device {
     100        /** Actual device hardware address. */
    100101        measured_string_ref addr;
    101         /** Actual device hardware address data.
    102          */
    103         char * addr_data;
    104         /** Broadcast device hardware address.
    105          */
     102        /** Actual device hardware address data. */
     103        char *addr_data;
     104        /** Broadcast device hardware address. */
    106105        measured_string_ref broadcast_addr;
    107         /** Broadcast device hardware address data.
    108          */
    109         char * broadcast_data;
    110         /** Device identifier.
    111          */
     106        /** Broadcast device hardware address data. */
     107        char *broadcast_data;
     108        /** Device identifier. */
    112109        device_id_t device_id;
    113         /** Hardware type.
    114          */
     110        /** Hardware type. */
    115111        hw_type_t hardware;
    116         /** Packet dimension.
    117          */
     112        /** Packet dimension. */
    118113        packet_dimension_t packet_dimension;
    119         /** Device module phone.
    120          */
     114        /** Device module phone. */
    121115        int phone;
    122         /** Protocol map.
    123          *  Address map for each protocol.
     116       
     117        /**
     118         * Protocol map.
     119         * Address map for each protocol.
    124120         */
    125121        arp_protos_t protos;
    126         /** Device module service.
    127         */
     122       
     123        /** Device module service. */
    128124        services_t service;
    129125};
    130126
    131 /** ARP global data.
    132  */
    133 struct  arp_globals{
    134         /** ARP address cache.
    135          */
     127/** ARP global data. */
     128struct arp_globals {
     129        /** ARP address cache. */
    136130        arp_cache_t cache;
    137         /** The client connection processing function.
    138          *  The module skeleton propagates its own one.
     131       
     132        /**
     133         * The client connection processing function.
     134         * The module skeleton propagates its own one.
    139135         */
    140136        async_client_conn_t client_connection;
    141         /** Networking module phone.
    142         */
     137       
     138        /** Networking module phone. */
    143139        int net_phone;
    144         /** Safety lock.
    145          */
     140        /** Safety lock. */
    146141        fibril_rwlock_t lock;
    147142};
    148143
    149 /** ARP protocol specific data.
    150  */
    151 struct arp_proto{
    152         /** Actual device protocol address.
    153          */
     144/** ARP protocol specific data. */
     145struct arp_proto {
     146        /** Actual device protocol address. */
    154147        measured_string_ref addr;
    155         /** Actual device protocol address data.
    156          */
    157         char * addr_data;
    158         /** Address map.
    159          */
     148        /** Actual device protocol address data. */
     149        char *addr_data;
     150        /** Address map. */
    160151        arp_addr_t addresses;
    161         /** Protocol service.
    162          */
     152        /** Protocol service. */
    163153        services_t service;
    164154};
Note: See TracChangeset for help on using the changeset viewer.