Changeset 357b5f5 in mainline for uspace/srv/net/il/arp/arp.h


Ignore:
Timestamp:
2011-01-23T20:09:13Z (13 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
fdb9982c
Parents:
cead2aa (diff), 7e36c8d (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

    rcead2aa r357b5f5  
    6565typedef struct arp_proto arp_proto_t;
    6666
     67/** Type definition of the ARP address translation record.
     68 * @see arp_trans
     69 */
     70typedef struct arp_trans arp_trans_t;
     71
    6772/** ARP address map.
    6873 *
    … …  
    7075 * @see generic_char_map.h
    7176 */
    72 GENERIC_CHAR_MAP_DECLARE(arp_addr, measured_string_t);
     77GENERIC_CHAR_MAP_DECLARE(arp_addr, arp_trans_t);
    7378
    7479/** ARP address cache.
    … …  
    8994struct arp_device {
    9095        /** Actual device hardware address. */
    91         measured_string_t * addr;
     96        measured_string_t *addr;
    9297        /** Actual device hardware address data. */
    93         char *addr_data;
     98        uint8_t *addr_data;
    9499        /** Broadcast device hardware address. */
    95         measured_string_t * broadcast_addr;
     100        measured_string_t *broadcast_addr;
    96101        /** Broadcast device hardware address data. */
    97         char *broadcast_data;
     102        uint8_t *broadcast_data;
    98103        /** Device identifier. */
    99104        device_id_t device_id;
    … …  
    120125        arp_cache_t cache;
    121126       
    122         /**
    123          * The client connection processing function.
    124          * The module skeleton propagates its own one.
    125          */
    126         async_client_conn_t client_connection;
    127        
    128127        /** Networking module phone. */
    129128        int net_phone;
    130129        /** Safety lock. */
    131         fibril_rwlock_t lock;
     130        fibril_mutex_t lock;
    132131};
    133132
    … …  
    137136        measured_string_t *addr;
    138137        /** Actual device protocol address data. */
    139         char *addr_data;
     138        uint8_t *addr_data;
    140139        /** Address map. */
    141140        arp_addr_t addresses;
    … …  
    144143};
    145144
     145/** ARP address translation record. */
     146struct arp_trans {
     147        /**
     148         * Hardware address for the translation. NULL denotes an incomplete
     149         * record with possible waiters.
     150         */
     151        measured_string_t *hw_addr;
     152        /** Condition variable used for waiting for completion of the record. */
     153        fibril_condvar_t cv;
     154};
     155
    146156#endif
    147157
    148158/** @}
    149159 */
     160
Note: See TracChangeset for help on using the changeset viewer.