Ignore:
Timestamp:
2011-11-06T22:21:05Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, topic/msim-upgrade, topic/simplify-dev-export
Children:
898e847
Parents:
2bdf8313 (diff), 7b5f4c9 (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

    r2bdf8313 rb0f00a9  
    11/*
    22 * Copyright (c) 2009 Lukas Mejdrech
     3 * Copyright (c) 2011 Radim Vansa
    34 * All rights reserved.
    45 *
    … …  
    3839#define NET_NILDUMMY_H_
    3940
     41#include <async.h>
    4042#include <fibril_synch.h>
    4143#include <ipc/services.h>
    42 
     44#include <ipc/devman.h>
    4345#include <net/device.h>
    4446#include <adt/measured_strings.h>
    … …  
    7678struct nildummy_device {
    7779        /** Device identifier. */
    78         device_id_t device_id;
    79        
    80         /** Device driver service. */
    81         services_t service;
    82        
    83         /** Driver phone. */
    84         int phone;
     80        nic_device_id_t device_id;
     81        /** Device driver handle. */
     82        devman_handle_t handle;
     83        /** Driver session. */
     84        async_sess_t *sess;
    8585       
    8686        /** Maximal transmission unit. */
    … …  
    8888       
    8989        /** Actual device hardware address. */
    90         measured_string_t *addr;
    91        
    92         /** Actual device hardware address data. */
    93         uint8_t *addr_data;
     90        nic_address_t addr;
     91        /** Actual device hardware address length. */
     92        size_t addr_len;
    9493};
    9594
    … …  
    9998        services_t service;
    10099       
    101         /** Protocol module phone. */
    102         int phone;
     100        /** Protocol module session. */
     101        async_sess_t *sess;
    103102};
    104103
    105104/** Dummy nil global data. */
    106105struct nildummy_globals {
    107         /** Networking module phone. */
    108         int net_phone;
     106        /** Networking module session. */
     107        async_sess_t *net_sess;
    109108       
    110109        /** Lock for devices. */
Note: See TracChangeset for help on using the changeset viewer.