Changeset 948911d in mainline for uspace/lib


Ignore:
Timestamp:
2012-01-24T02:27:43Z (15 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, topic/msim-upgrade, topic/simplify-dev-export
Children:
230385c
Parents:
8afeb04 (diff), 2df6f6fe (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:

Mainline changes.

Location:
uspace/lib
Files:
2 added
32 edited
2 moved

Legend:

Unmodified
Added
Removed

  • uspace/lib/c/generic/async.c

    r8afeb04 r948911d  
    257257void async_set_client_data_constructor(async_client_data_ctor_t ctor)
    258258{
     259        assert(async_client_data_create == default_client_data_constructor);
    259260        async_client_data_create = ctor;
    260261}
    … …  
    262263void async_set_client_data_destructor(async_client_data_dtor_t dtor)
    263264{
     265        assert(async_client_data_destroy == default_client_data_destructor);
    264266        async_client_data_destroy = dtor;
    265267}
    … …  
    303305void async_set_client_connection(async_client_conn_t conn)
    304306{
     307        assert(client_connection == default_client_connection);
    305308        client_connection = conn;
    306309}

  • uspace/lib/c/generic/device/nic.c

    r8afeb04 r948911d  
    4444#include <ipc/services.h>
    4545
    46 /** Send a packet through the device
    47  *
    48  * @param[in] dev_sess
    49  * @param[in] packet_id Id of the sent packet
    50  *
    51  * @return EOK If the operation was successfully completed
    52  *
    53  */
    54 int nic_send_message(async_sess_t *dev_sess, packet_id_t packet_id)
    55 {
    56         async_exch_t *exch = async_exchange_begin(dev_sess);
    57         int rc = async_req_2_0(exch, DEV_IFACE_ID(NIC_DEV_IFACE),
    58             NIC_SEND_MESSAGE, packet_id);
    59         async_exchange_end(exch);
    60        
    61         return rc;
    62 }
    63 
    64 /** Connect the driver to the NET and NIL services
    65  *
    66  * @param[in] dev_sess
    67  * @param[in] nil_service Service identifier for the NIL service
     46/** Send frame from NIC
     47 *
     48 * @param[in] dev_sess
     49 * @param[in] data     Frame data
     50 * @param[in] size     Frame size in bytes
     51 *
     52 * @return EOK If the operation was successfully completed
     53 *
     54 */
     55int nic_send_frame(async_sess_t *dev_sess, void *data, size_t size)
     56{
     57        async_exch_t *exch = async_exchange_begin(dev_sess);
     58       
     59        ipc_call_t answer;
     60        aid_t req = async_send_1(exch, DEV_IFACE_ID(NIC_DEV_IFACE),
     61            NIC_SEND_MESSAGE, &answer);
     62        sysarg_t retval = async_data_write_start(exch, data, size);
     63       
     64        async_exchange_end(exch);
     65       
     66        if (retval != EOK) {
     67                async_wait_for(req, NULL);
     68                return retval;
     69        }
     70
     71        async_wait_for(req, &retval);
     72        return retval;
     73}
     74
     75/** Create callback connection from NIC service
     76 *
     77 * @param[in] dev_sess
    6878 * @param[in] device_id
    6979 *
    … …  
    7181 *
    7282 */
    73 int nic_connect_to_nil(async_sess_t *dev_sess, services_t nil_service,
    74     nic_device_id_t device_id)
    75 {
    76         async_exch_t *exch = async_exchange_begin(dev_sess);
    77         int rc = async_req_3_0(exch, DEV_IFACE_ID(NIC_DEV_IFACE),
    78             NIC_CONNECT_TO_NIL, nil_service, device_id);
    79         async_exchange_end(exch);
    80        
    81         return rc;
     83int nic_callback_create(async_sess_t *dev_sess, nic_device_id_t device_id,
     84    async_client_conn_t cfun, void *carg)
     85{
     86        ipc_call_t answer;
     87        int rc;
     88        sysarg_t retval;
     89       
     90        async_exch_t *exch = async_exchange_begin(dev_sess);
     91        aid_t req = async_send_2(exch, DEV_IFACE_ID(NIC_DEV_IFACE),
     92            NIC_CALLBACK_CREATE, device_id, &answer);
     93       
     94        rc = async_connect_to_me(exch, 0, 0, 0, cfun, carg);
     95        if (rc != EOK) {
     96                async_wait_for(req, NULL);
     97                return rc;
     98        }
     99        async_exchange_end(exch);
     100       
     101        async_wait_for(req, &retval);
     102        return (int) retval;
    82103}
    83104
    … …  
    324345 * it can never force the NIC to advertise unsupported modes.
    325346 *
    326  * The allowed modes are defined in "net/eth_phys.h" in the C library.
     347 * The allowed modes are defined in "nic/eth_phys.h" in the C library.
    327348 *
    328349 * @param[in] dev_sess
    … …  
    361382/** Probe current state of auto-negotiation.
    362383 *
    363  * Modes are defined in the "net/eth_phys.h" in the C library.
     384 * Modes are defined in the "nic/eth_phys.h" in the C library.
    364385 *
    365386 * @param[in]  dev_sess

  • uspace/lib/c/generic/devman.c

    r8afeb04 r948911d  
    177177
    178178/** Register running driver with device manager. */
    179 int devman_driver_register(const char *name, async_client_conn_t conn)
     179int devman_driver_register(const char *name)
    180180{
    181181        async_exch_t *exch = devman_exchange_begin_blocking(DEVMAN_DRIVER);
    … …  
    192192        }
    193193       
    194         async_set_client_connection(conn);
    195        
    196194        exch = devman_exchange_begin(DEVMAN_DRIVER);
    197         async_connect_to_me(exch, 0, 0, 0, conn, NULL);
     195        async_connect_to_me(exch, 0, 0, 0, NULL, NULL);
    198196        devman_exchange_end(exch);
    199197       

  • uspace/lib/c/generic/loc.c

    r8afeb04 r948911d  
    4747static FIBRIL_MUTEX_INITIALIZE(loc_callback_mutex);
    4848static bool loc_callback_created = false;
     49static loc_cat_change_cb_t cat_change_cb = NULL;
    4950
    5051static async_sess_t *loc_supp_block_sess = NULL;
    … …  
    5455static async_sess_t *loc_consumer_sess = NULL;
    5556
    56 static loc_cat_change_cb_t cat_change_cb = NULL;
    57 
    5857static void loc_cb_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
    5958{
    60         loc_cat_change_cb_t cb_fun;
    61        
    6259        while (true) {
    6360                ipc_call_t call;
    … …  
    6966                }
    7067               
    71                 int retval;
    72                
    7368                switch (IPC_GET_IMETHOD(call)) {
    7469                case LOC_EVENT_CAT_CHANGE:
    7570                        fibril_mutex_lock(&loc_callback_mutex);
    76                         cb_fun = cat_change_cb;
    77                         if (cb_fun != NULL) {
     71                        loc_cat_change_cb_t cb_fun = cat_change_cb;
     72                        fibril_mutex_unlock(&loc_callback_mutex);
     73                       
     74                        async_answer_0(callid, EOK);
     75                       
     76                        if (cb_fun != NULL)
    7877                                (*cb_fun)();
    79                         }
    80                         fibril_mutex_unlock(&loc_callback_mutex);
    81                         retval = 0;
     78                       
    8279                        break;
    8380                default:
    84                         retval = ENOTSUP;
     81                        async_answer_0(callid, ENOTSUP);
    8582                }
    86                
    87                 async_answer_0(callid, retval);
    8883        }
    8984}
    … …  
    10196}
    10297
     98/** Create callback
     99 *
     100 * Must be called with loc_callback_mutex locked.
     101 *
     102 * @return EOK on success.
     103 *
     104 */
    103105static int loc_callback_create(void)
    104106{
    105         async_exch_t *exch;
    106         sysarg_t retval;
    107         int rc = EOK;
    108 
    109         fibril_mutex_lock(&loc_callback_mutex);
    110        
    111107        if (!loc_callback_created) {
    112                 exch = loc_exchange_begin_blocking(LOC_PORT_CONSUMER);
     108                async_exch_t *exch =
     109                    loc_exchange_begin_blocking(LOC_PORT_CONSUMER);
    113110               
    114111                ipc_call_t answer;
    115112                aid_t req = async_send_0(exch, LOC_CALLBACK_CREATE, &answer);
    116                 async_connect_to_me(exch, 0, 0, 0, loc_cb_conn, NULL);
     113                int rc = async_connect_to_me(exch, 0, 0, 0, loc_cb_conn, NULL);
    117114                loc_exchange_end(exch);
    118115               
     116                if (rc != EOK)
     117                        return rc;
     118               
     119                sysarg_t retval;
    119120                async_wait_for(req, &retval);
    120                 if (rc != EOK)
    121                         goto done;
    122                
    123                 if (retval != EOK) {
    124                         rc = retval;
    125                         goto done;
    126                 }
     121                if (retval != EOK)
     122                        return retval;
    127123               
    128124                loc_callback_created = true;
    129125        }
    130126       
    131         rc = EOK;
    132 done:
    133         fibril_mutex_unlock(&loc_callback_mutex);
    134         return rc;
     127        return EOK;
    135128}
    136129
    … …  
    242235
    243236/** Register new driver with loc. */
    244 int loc_server_register(const char *name, async_client_conn_t conn)
     237int loc_server_register(const char *name)
    245238{
    246239        async_exch_t *exch = loc_exchange_begin_blocking(LOC_PORT_SUPPLIER);
    … …  
    256249                return retval;
    257250        }
    258        
    259         async_set_client_connection(conn);
    260251       
    261252        exch = loc_exchange_begin(LOC_PORT_SUPPLIER);
    … …  
    797788    sysarg_t **data, size_t *count)
    798789{
    799         service_id_t *ids;
    800         size_t act_size;
    801         size_t alloc_size;
    802         int rc;
    803 
    804790        *data = NULL;
    805         act_size = 0;   /* silence warning */
    806 
    807         rc = loc_category_get_ids_once(method, arg1, NULL, 0,
     791        *count = 0;
     792       
     793        size_t act_size = 0;
     794        int rc = loc_category_get_ids_once(method, arg1, NULL, 0,
    808795            &act_size);
    809796        if (rc != EOK)
    810797                return rc;
    811 
    812         alloc_size = act_size;
    813         ids = malloc(alloc_size);
     798       
     799        size_t alloc_size = act_size;
     800        service_id_t *ids = malloc(alloc_size);
    814801        if (ids == NULL)
    815802                return ENOMEM;
    816 
     803       
    817804        while (true) {
    818805                rc = loc_category_get_ids_once(method, arg1, ids, alloc_size,
    … …  
    820807                if (rc != EOK)
    821808                        return rc;
    822 
     809               
    823810                if (act_size <= alloc_size)
    824811                        break;
    825 
    826                 alloc_size *= 2;
    827                 free(ids);
    828 
    829                 ids = malloc(alloc_size);
     812               
     813                alloc_size = act_size;
     814                ids = realloc(ids, alloc_size);
    830815                if (ids == NULL)
    831816                        return ENOMEM;
    832817        }
    833 
     818       
    834819        *count = act_size / sizeof(category_id_t);
    835820        *data = ids;
    … …  
    869854int loc_register_cat_change_cb(loc_cat_change_cb_t cb_fun)
    870855{
    871         if (loc_callback_create() != EOK)
     856        fibril_mutex_lock(&loc_callback_mutex);
     857        if (loc_callback_create() != EOK) {
     858                fibril_mutex_unlock(&loc_callback_mutex);
    872859                return EIO;
    873 
     860        }
     861       
    874862        cat_change_cb = cb_fun;
     863        fibril_mutex_unlock(&loc_callback_mutex);
     864       
    875865        return EOK;
    876866}

  • uspace/lib/c/include/device/nic.h

    r8afeb04 r948911d  
    3737
    3838#include <async.h>
    39 #include <net/device.h>
    40 #include <net/packet.h>
    41 #include <ipc/services.h>
     39#include <nic/nic.h>
     40#include <ipc/common.h>
    4241
    4342typedef enum {
    4443        NIC_SEND_MESSAGE = 0,
    45         NIC_CONNECT_TO_NIL,
     44        NIC_CALLBACK_CREATE,
    4645        NIC_GET_STATE,
    4746        NIC_SET_STATE,
    … …  
    8584} nic_funcs_t;
    8685
    87 extern int nic_send_message(async_sess_t *, packet_id_t);
    88 extern int nic_connect_to_nil(async_sess_t *, services_t, nic_device_id_t);
     86typedef enum {
     87        NIC_EV_ADDR_CHANGED = IPC_FIRST_USER_METHOD,
     88        NIC_EV_RECEIVED,
     89        NIC_EV_DEVICE_STATE
     90} nic_event_t;
     91
     92extern int nic_send_frame(async_sess_t *, void *, size_t);
     93extern int nic_callback_create(async_sess_t *, nic_device_id_t,
     94    async_client_conn_t, void *);
    8995extern int nic_get_state(async_sess_t *, nic_device_state_t *);
    9096extern int nic_set_state(async_sess_t *, nic_device_state_t);

  • uspace/lib/c/include/devman.h

    r8afeb04 r948911d  
    4646extern void devman_exchange_end(async_exch_t *);
    4747
    48 extern int devman_driver_register(const char *, async_client_conn_t);
     48extern int devman_driver_register(const char *);
    4949extern int devman_add_function(const char *, fun_type_t, match_id_list_t *,
    5050    devman_handle_t, devman_handle_t *);

  • uspace/lib/c/include/ipc/devman.h

    r8afeb04 r948911d  
    146146typedef enum {
    147147        DRIVER_DEV_ADD = IPC_FIRST_USER_METHOD,
    148         DRIVER_DEV_ADDED,
    149148        DRIVER_DEV_REMOVE,
    150149        DRIVER_DEV_GONE,

  • uspace/lib/c/include/ipc/net.h

    r8afeb04 r948911d  
    305305 *
    306306 */
    307 #define IPC_GET_DEVICE_HANDLE(call)  ((devman_handle_t) IPC_GET_ARG2(call))
     307#define IPC_GET_DEVICE_HANDLE(call)  ((service_id_t) IPC_GET_ARG2(call))
    308308
    309309/** Return the device driver service message argument.

  • uspace/lib/c/include/ipc/net_net.h

    r8afeb04 r948911d  
    5454        NET_NET_GET_DEVICES_COUNT,
    5555        /** Return names and device IDs of all devices */
    56         NET_NET_GET_DEVICES,
    57         /** Notify the networking service about a ready device */
    58         NET_NET_DRIVER_READY
     56        NET_NET_GET_DEVICES
    5957} net_messages;
    6058

  • uspace/lib/c/include/ipc/nil.h

    r8afeb04 r948911d  
    4646         */
    4747        NET_NIL_DEVICE = NET_NIL_FIRST,
    48         /** New device state message.
    49          * @see nil_device_state_msg()
    50          */
    51         NET_NIL_DEVICE_STATE,
    52         /** Received packet queue message.
    53          * @see nil_received_msg()
    54          */
    55         NET_NIL_RECEIVED,
    5648        /** Send packet queue message.
    5749         * @see nil_send_msg()
    … …  
    6961         * @see nil_get_broadcast_addr()
    7062         */
    71         NET_NIL_BROADCAST_ADDR,
    72         /** Device has changed address
    73          * @see nil_addr_changed_msg()
    74          */
    75         NET_NIL_ADDR_CHANGED
     63        NET_NIL_BROADCAST_ADDR
    7664} nil_messages;
    7765

  • uspace/lib/c/include/loc.h

    r8afeb04 r948911d  
    4646extern void loc_exchange_end(async_exch_t *);
    4747
    48 extern int loc_server_register(const char *, async_client_conn_t);
     48extern int loc_server_register(const char *);
    4949extern int loc_service_register(const char *, service_id_t *);
    5050extern int loc_service_register_with_iface(const char *, service_id_t *,

  • uspace/lib/c/include/net/device.h

    r8afeb04 r948911d  
    11/*
    22 * Copyright (c) 2009 Lukas Mejdrech
    3  * Copyright (c) 2011 Radim Vansa
    43 * All rights reserved.
    54 *
    … …  
    3332
    3433/** @file
    35  * Device identifier, state and usage statistics.
     34 * Network device.
    3635 */
    3736
    38 #ifndef LIBC_DEVICE_ID_TYPE_H_
    39 #define LIBC_DEVICE_ID_TYPE_H_
     37#ifndef LIBC_NET_DEVICE_H_
     38#define LIBC_NET_DEVICE_H_
    4039
    4140#include <adt/int_map.h>
    42 #include <net/eth_phys.h>
    43 #include <bool.h>
    44 
    45 /** Ethernet address length. */
    46 #define ETH_ADDR  6
    47 
    48 /** MAC printing format */
    49 #define PRIMAC  "%02x:%02x:%02x:%02x:%02x:%02x"
    50 
    51 /** MAC arguments */
    52 #define ARGSMAC(__a) \
    53         (__a)[0], (__a)[1], (__a)[2], (__a)[3], (__a)[4], (__a)[5]
    54 
    55 /* Compare MAC address with specific value */
    56 #define MAC_EQUALS_VALUE(__a, __a0, __a1, __a2, __a3, __a4, __a5) \
    57         ((__a)[0] == (__a0) && (__a)[1] == (__a1) && (__a)[2] == (__a2) \
    58         && (__a)[3] == (__a3) && (__a)[4] == (__a4) && (__a)[5] == (__a5))
    59 
    60 #define MAC_IS_ZERO(__x) \
    61         MAC_EQUALS_VALUE(__x, 0, 0, 0, 0, 0, 0)
     41#include <nic/nic.h>
    6242
    6343/** Device identifier to generic type map declaration. */
    … …  
    6747#define DEVICE_MAP_IMPLEMENT  INT_MAP_IMPLEMENT
    6848
    69 /** Max length of any hw nic address (currently only eth) */
    70 #define NIC_MAX_ADDRESS_LENGTH  16
    71 
    72 /** Invalid device identifier. */
    73 #define NIC_DEVICE_INVALID_ID  (-1)
    74 
    75 #define NIC_VENDOR_MAX_LENGTH         64
    76 #define NIC_MODEL_MAX_LENGTH          64
    77 #define NIC_PART_NUMBER_MAX_LENGTH    64
    78 #define NIC_SERIAL_NUMBER_MAX_LENGTH  64
    79 
    80 #define NIC_DEFECTIVE_LONG               0x0001
    81 #define NIC_DEFECTIVE_SHORT              0x0002
    82 #define NIC_DEFECTIVE_BAD_CRC            0x0010
    83 #define NIC_DEFECTIVE_BAD_IPV4_CHECKSUM  0x0020
    84 #define NIC_DEFECTIVE_BAD_IPV6_CHECKSUM  0x0040
    85 #define NIC_DEFECTIVE_BAD_TCP_CHECKSUM   0x0080
    86 #define NIC_DEFECTIVE_BAD_UDP_CHECKSUM   0x0100
    87 
    88 /**
    89  * The bitmap uses single bit for each of the 2^12 = 4096 possible VLAN tags.
    90  * This means its size is 4096/8 = 512 bytes.
    91  */
    92 #define NIC_VLAN_BITMAP_SIZE  512
    93 
    94 #define NIC_DEVICE_PRINT_FMT  "%x"
    95 
    96 /** Device identifier type. */
    97 typedef int nic_device_id_t;
    98 
    99 /**
    100  * Structure covering the MAC address.
    101  */
    102 typedef struct nic_address {
    103         uint8_t address[ETH_ADDR];
    104 } nic_address_t;
    105 
    106 /** Device state. */
    107 typedef enum nic_device_state {
    108         /**
    109          * Device present and stopped. Moving device to this state means to discard
    110          * all settings and WOL virtues, rebooting the NIC to state as if the
    111          * computer just booted (or the NIC was just inserted in case of removable
    112          * NIC).
    113          */
    114         NIC_STATE_STOPPED,
    115         /**
    116          * If the NIC is in this state no packets (frames) are transmitted nor
    117          * received. However, the settings are not restarted. You can use this state
    118          * to temporarily disable transmition/reception or atomically (with respect
    119          * to incoming/outcoming packets) change frames acceptance etc.
    120          */
    121         NIC_STATE_DOWN,
    122         /** Device is normally operating. */
    123         NIC_STATE_ACTIVE,
    124         /** Just a constant to limit the state numbers */
    125         NIC_STATE_MAX,
    126 } nic_device_state_t;
    127 
    128 /**
    129  * Channel operating mode used on the medium.
    130  */
    131 typedef enum {
    132         NIC_CM_UNKNOWN,
    133         NIC_CM_FULL_DUPLEX,
    134         NIC_CM_HALF_DUPLEX,
    135         NIC_CM_SIMPLEX
    136 } nic_channel_mode_t;
    137 
    138 /**
    139  * Role for the device (used e.g. for 1000Gb ethernet)
    140  */
    141 typedef enum {
    142         NIC_ROLE_UNKNOWN,
    143         NIC_ROLE_AUTO,
    144         NIC_ROLE_MASTER,
    145         NIC_ROLE_SLAVE
    146 } nic_role_t;
    147 
    148 /**
    149  * Current state of the cable in the device
    150  */
    151 typedef enum {
    152         NIC_CS_UNKNOWN,
    153         NIC_CS_PLUGGED,
    154         NIC_CS_UNPLUGGED
    155 } nic_cable_state_t;
    156 
    157 /**
    158  * Result of the requested operation
    159  */
    160 typedef enum {
    161         /** Successfully disabled */
    162         NIC_RESULT_DISABLED,
    163         /** Successfully enabled */
    164         NIC_RESULT_ENABLED,
    165         /** Not supported at all */
    166         NIC_RESULT_NOT_SUPPORTED,
    167         /** Temporarily not available */
    168         NIC_RESULT_NOT_AVAILABLE,
    169         /** Result extensions */
    170         NIC_RESULT_FIRST_EXTENSION
    171 } nic_result_t;
    172 
    173 /** Device usage statistics. */
    174 typedef struct nic_device_stats {
    175         /** Total packets received (accepted). */
    176         unsigned long receive_packets;
    177         /** Total packets transmitted. */
    178         unsigned long send_packets;
    179         /** Total bytes received (accepted). */
    180         unsigned long receive_bytes;
    181         /** Total bytes transmitted. */
    182         unsigned long send_bytes;
    183         /** Bad packets received counter. */
    184         unsigned long receive_errors;
    185         /** Packet transmition problems counter. */
    186         unsigned long send_errors;
    187         /** Number of frames dropped due to insufficient space in RX buffers */
    188         unsigned long receive_dropped;
    189         /** Number of frames dropped due to insufficient space in TX buffers */
    190         unsigned long send_dropped;
    191         /** Total multicast packets received (accepted). */
    192         unsigned long receive_multicast;
    193         /** Total broadcast packets received (accepted). */
    194         unsigned long receive_broadcast;
    195         /** The number of collisions due to congestion on the medium. */
    196         unsigned long collisions;
    197         /** Unicast packets received but not accepted (filtered) */
    198         unsigned long receive_filtered_unicast;
    199         /** Multicast packets received but not accepted (filtered) */
    200         unsigned long receive_filtered_multicast;
    201         /** Broadcast packets received but not accepted (filtered) */
    202         unsigned long receive_filtered_broadcast;
    203 
    204         /* detailed receive_errors */
    205 
    206         /** Received packet length error counter. */
    207         unsigned long receive_length_errors;
    208         /** Receiver buffer overflow counter. */
    209         unsigned long receive_over_errors;
    210         /** Received packet with crc error counter. */
    211         unsigned long receive_crc_errors;
    212         /** Received frame alignment error counter. */
    213         unsigned long receive_frame_errors;
    214         /** Receiver fifo overrun counter. */
    215         unsigned long receive_fifo_errors;
    216         /** Receiver missed packet counter. */
    217         unsigned long receive_missed_errors;
    218 
    219         /* detailed send_errors */
    220 
    221         /** Transmitter aborted counter. */
    222         unsigned long send_aborted_errors;
    223         /** Transmitter carrier errors counter. */
    224         unsigned long send_carrier_errors;
    225         /** Transmitter fifo overrun counter. */
    226         unsigned long send_fifo_errors;
    227         /** Transmitter carrier errors counter. */
    228         unsigned long send_heartbeat_errors;
    229         /** Transmitter window errors counter. */
    230         unsigned long send_window_errors;
    231 
    232         /* for cslip etc */
    233        
    234         /** Total compressed packets received. */
    235         unsigned long receive_compressed;
    236         /** Total compressed packet transmitted. */
    237         unsigned long send_compressed;
    238 } nic_device_stats_t;
    239 
    240 /** Errors corresponding to those in the nic_device_stats_t */
    241 typedef enum {
    242         NIC_SEC_BUFFER_FULL,
    243         NIC_SEC_ABORTED,
    244         NIC_SEC_CARRIER_LOST,
    245         NIC_SEC_FIFO_OVERRUN,
    246         NIC_SEC_HEARTBEAT,
    247         NIC_SEC_WINDOW_ERROR,
    248         /* Error encountered during TX but with other type of error */
    249         NIC_SEC_OTHER
    250 } nic_send_error_cause_t;
    251 
    252 /** Errors corresponding to those in the nic_device_stats_t */
    253 typedef enum {
    254         NIC_REC_BUFFER_FULL,
    255         NIC_REC_LENGTH,
    256         NIC_REC_BUFFER_OVERFLOW,
    257         NIC_REC_CRC,
    258         NIC_REC_FRAME_ALIGNMENT,
    259         NIC_REC_FIFO_OVERRUN,
    260         NIC_REC_MISSED,
    261         /* Error encountered during RX but with other type of error */
    262         NIC_REC_OTHER
    263 } nic_receive_error_cause_t;
    264 
    265 /**
    266  * Information about the NIC that never changes - name, vendor, model,
    267  * capabilites and so on.
    268  */
    269 typedef struct nic_device_info {
    270         /* Device identification */
    271         char vendor_name[NIC_VENDOR_MAX_LENGTH];
    272         char model_name[NIC_MODEL_MAX_LENGTH];
    273         char part_number[NIC_PART_NUMBER_MAX_LENGTH];
    274         char serial_number[NIC_SERIAL_NUMBER_MAX_LENGTH];
    275         uint16_t vendor_id;
    276         uint16_t device_id;
    277         uint16_t subsystem_vendor_id;
    278         uint16_t subsystem_id;
    279         /* Device capabilities */
    280         uint16_t ethernet_support[ETH_PHYS_LAYERS];
    281 
    282         /** The mask of all modes which the device can advertise
    283          *
    284          *  see ETH_AUTONEG_ macros in net/eth_phys.h of libc
    285          */
    286         uint32_t autoneg_support;
    287 } nic_device_info_t;
    288 
    289 /**
    290  * Type of the ethernet frame
    291  */
    292 typedef enum nic_frame_type {
    293         NIC_FRAME_UNICAST,
    294         NIC_FRAME_MULTICAST,
    295         NIC_FRAME_BROADCAST
    296 } nic_frame_type_t;
    297 
    298 /**
    299  * Specifies which unicast frames is the NIC receiving.
    300  */
    301 typedef enum nic_unicast_mode {
    302         NIC_UNICAST_UNKNOWN,
    303         /** No unicast frames are received */
    304         NIC_UNICAST_BLOCKED,
    305         /** Only the frames with this NIC's MAC as destination are received */
    306         NIC_UNICAST_DEFAULT,
    307         /**
    308          * Both frames with this NIC's MAC and those specified in the list are
    309          * received
    310          */
    311         NIC_UNICAST_LIST,
    312         /** All unicast frames are received */
    313         NIC_UNICAST_PROMISC
    314 } nic_unicast_mode_t;
    315 
    316 typedef enum nic_multicast_mode {
    317         NIC_MULTICAST_UNKNOWN,
    318         /** No multicast frames are received */
    319         NIC_MULTICAST_BLOCKED,
    320         /** Frames with multicast addresses specified in this list are received */
    321         NIC_MULTICAST_LIST,
    322         /** All multicast frames are received */
    323         NIC_MULTICAST_PROMISC
    324 } nic_multicast_mode_t;
    325 
    326 typedef enum nic_broadcast_mode {
    327         NIC_BROADCAST_UNKNOWN,
    328         /** Broadcast frames are dropped */
    329         NIC_BROADCAST_BLOCKED,
    330         /** Broadcast frames are received */
    331         NIC_BROADCAST_ACCEPTED
    332 } nic_broadcast_mode_t;
    333 
    334 /**
    335  * Structure covering the bitmap with VLAN tags.
    336  */
    337 typedef struct nic_vlan_mask {
    338         uint8_t bitmap[NIC_VLAN_BITMAP_SIZE];
    339 } nic_vlan_mask_t;
    340 
    341 /* WOL virtue identifier */
    342 typedef unsigned int nic_wv_id_t;
    343 
    344 /**
    345  * Structure passed as argument for virtue NIC_WV_MAGIC_PACKET.
    346  */
    347 typedef struct nic_wv_magic_packet_data {
    348         uint8_t password[6];
    349 } nic_wv_magic_packet_data_t;
    350 
    351 /**
    352  * Structure passed as argument for virtue NIC_WV_DIRECTED_IPV4
    353  */
    354 typedef struct nic_wv_ipv4_data {
    355         uint8_t address[4];
    356 } nic_wv_ipv4_data_t;
    357 
    358 /**
    359  * Structure passed as argument for virtue NIC_WV_DIRECTED_IPV6
    360  */
    361 typedef struct nic_wv_ipv6_data {
    362         uint8_t address[16];
    363 } nic_wv_ipv6_data_t;
    364 
    365 /**
    366  * WOL virtue types defining the interpretation of data passed to the virtue.
    367  * Those tagged with S can have only single virtue active at one moment, those
    368  * tagged with M can have multiple ones.
    369  */
    370 typedef enum nic_wv_type {
    371         /**
    372          * Used for deletion of the virtue - in this case the mask, data and length
    373          * arguments are ignored.
    374          */
    375         NIC_WV_NONE,
    376         /** S
    377          * Enabled <=> wakeup upon link change
    378          */
    379         NIC_WV_LINK_CHANGE,
    380         /** S
    381          * If this virtue is set up, wakeup can be issued by a magic packet frame.
    382          * If the data argument is not NULL, it must contain
    383          * nic_wv_magic_packet_data structure with the SecureOn password.
    384          */
    385         NIC_WV_MAGIC_PACKET,
    386         /** M
    387          * If the virtue is set up, wakeup can be issued by a frame targeted to
    388          * device with MAC address specified in data. The data must contain
    389          * nic_address_t structure.
    390          */
    391         NIC_WV_DESTINATION,
    392         /** S
    393          * Enabled <=> wakeup upon receiving broadcast frame
    394          */
    395         NIC_WV_BROADCAST,
    396         /** S
    397          * Enabled <=> wakeup upon receiving ARP Request
    398          */
    399         NIC_WV_ARP_REQUEST,
    400         /** M
    401          * If enabled, the wakeup is issued upon receiving frame with an IPv4 packet
    402          * with IPv4 address specified in data. The data must contain
    403          * nic_wv_ipv4_data structure.
    404          */
    405         NIC_WV_DIRECTED_IPV4,
    406         /** M
    407          * If enabled, the wakeup is issued upon receiving frame with an IPv4 packet
    408          * with IPv6 address specified in data. The data must contain
    409          * nic_wv_ipv6_data structure.
    410          */
    411         NIC_WV_DIRECTED_IPV6,
    412         /** M
    413          * First length/2 bytes in the argument are interpreted as mask, second
    414          * length/2 bytes are interpreted as content.
    415          * If enabled, the wakeup is issued upon receiving frame where the bytes
    416          * with non-zero value in the mask equal to those in the content.
    417          */
    418         NIC_WV_FULL_MATCH,
    419         /**
    420          * Dummy value, do not use.
    421          */
    422         NIC_WV_MAX
    423 } nic_wv_type_t;
    424 
    425 /**
    426  * Specifies the interrupt/polling mode used by the driver and NIC
    427  */
    428 typedef enum nic_poll_mode {
    429         /**
    430          * NIC issues interrupts upon events.
    431          */
    432         NIC_POLL_IMMEDIATE,
    433         /**
    434          * Some uspace app calls nic_poll_now(...) in order to check the NIC state
    435          * - no interrupts are received from the NIC.
    436          */
    437         NIC_POLL_ON_DEMAND,
    438         /**
    439          * The driver itself issues a poll request in a periodic manner. It is
    440          * allowed to use hardware timer if the NIC supports it.
    441          */
    442         NIC_POLL_PERIODIC,
    443         /**
    444          * The driver itself issued a poll request in a periodic manner. The driver
    445          * must create software timer, internal hardware timer of NIC must not be
    446          * used even if the NIC supports it.
    447          */
    448         NIC_POLL_SOFTWARE_PERIODIC
    449 } nic_poll_mode_t;
    450 
    451 /**
    452  * Says if this virtue type is a multi-virtue (there can be multiple virtues of
    453  * this type at once).
    454  *
    455  * @param type
    456  *
    457  * @return true or false
    458  */
    459 static inline int nic_wv_is_multi(nic_wv_type_t type) {
    460         switch (type) {
    461         case NIC_WV_FULL_MATCH:
    462         case NIC_WV_DESTINATION:
    463         case NIC_WV_DIRECTED_IPV4:
    464         case NIC_WV_DIRECTED_IPV6:
    465                 return true;
    466         default:
    467                 return false;
    468         }
    469 }
    470 
    471 static inline const char *nic_device_state_to_string(nic_device_state_t state)
    472 {
    473         switch (state) {
    474         case NIC_STATE_STOPPED:
    475                 return "stopped";
    476         case NIC_STATE_DOWN:
    477                 return "down";
    478         case NIC_STATE_ACTIVE:
    479                 return "active";
    480         default:
    481                 return "undefined";
    482         }
    483 }
    484 
    48549#endif
    48650

  • uspace/lib/c/include/nic/eth_phys.h

    r8afeb04 r948911d  
    2828 */
    2929
    30 #ifndef LIBC_NET_ETH_PHYS_H_
    31 #define LIBC_NET_ETH_PHYS_H_
     30#ifndef LIBC_NIC_ETH_PHYS_H_
     31#define LIBC_NIC_ETH_PHYS_H_
    3232
    3333#include <sys/types.h>

  • uspace/lib/drv/generic/driver.c

    r8afeb04 r948911d  
    303303}
    304304
    305 static void driver_dev_added(ipc_callid_t iid, ipc_call_t *icall)
    306 {
    307         fibril_mutex_lock(&devices_mutex);
    308         ddf_dev_t *dev = driver_get_device(IPC_GET_ARG1(*icall));
    309         fibril_mutex_unlock(&devices_mutex);
    310        
    311         if (dev != NULL && driver->driver_ops->device_added != NULL)
    312                 driver->driver_ops->device_added(dev);
    313 }
    314 
    315305static void driver_dev_remove(ipc_callid_t iid, ipc_call_t *icall)
    316306{
    … …  
    460450                case DRIVER_DEV_ADD:
    461451                        driver_dev_add(callid, &call);
    462                         break;
    463                 case DRIVER_DEV_ADDED:
    464                         async_answer_0(callid, EOK);
    465                         driver_dev_added(callid, &call);
    466452                        break;
    467453                case DRIVER_DEV_REMOVE:
    … …  
    10161002         * incoming connections.
    10171003         */
    1018         rc = devman_driver_register(driver->name, driver_connection);
     1004        async_set_client_connection(driver_connection);
     1005        rc = devman_driver_register(driver->name);
    10191006        if (rc != EOK) {
    10201007                printf("Error: Failed to register driver with device manager "

  • uspace/lib/drv/generic/remote_nic.c

    r8afeb04 r948911d  
    3939#include <errno.h>
    4040#include <ipc/services.h>
    41 #include <adt/measured_strings.h>
    4241#include <sys/time.h>
    4342#include "ops/nic.h"
    4443
    45 static void remote_nic_send_message(ddf_fun_t *dev, void *iface,
    46     ipc_callid_t callid, ipc_call_t *call)
    47 {
    48         nic_iface_t *nic_iface = (nic_iface_t *) iface;
    49         assert(nic_iface->send_message);
    50        
    51         packet_id_t packet_id = (packet_id_t) IPC_GET_ARG2(*call);
    52        
    53         int rc = nic_iface->send_message(dev, packet_id);
    54         async_answer_0(callid, rc);
    55 }
    56 
    57 static void remote_nic_connect_to_nil(ddf_fun_t *dev, void *iface,
    58     ipc_callid_t callid, ipc_call_t *call)
    59 {
    60         nic_iface_t *nic_iface = (nic_iface_t *) iface;
    61         assert(nic_iface->connect_to_nil);
    62        
    63         services_t nil_service = (services_t) IPC_GET_ARG2(*call);
    64         nic_device_id_t device_id = (nic_device_id_t) IPC_GET_ARG3(*call);
    65        
    66         int rc = nic_iface->connect_to_nil(dev, nil_service, device_id);
     44static void remote_nic_send_frame(ddf_fun_t *dev, void *iface,
     45    ipc_callid_t callid, ipc_call_t *call)
     46{
     47        nic_iface_t *nic_iface = (nic_iface_t *) iface;
     48        assert(nic_iface->send_frame);
     49       
     50        void *data;
     51        size_t size;
     52        int rc;
     53       
     54        rc = async_data_write_accept(&data, false, 0, 0, 0, &size);
     55        if (rc != EOK) {
     56                async_answer_0(callid, EINVAL);
     57                return;
     58        }
     59       
     60        rc = nic_iface->send_frame(dev, data, size);
     61        async_answer_0(callid, rc);
     62        free(data);
     63}
     64
     65static void remote_nic_callback_create(ddf_fun_t *dev, void *iface,
     66    ipc_callid_t callid, ipc_call_t *call)
     67{
     68        nic_iface_t *nic_iface = (nic_iface_t *) iface;
     69        assert(nic_iface->callback_create);
     70       
     71        nic_device_id_t device_id = (nic_device_id_t) IPC_GET_ARG2(*call);
     72       
     73        int rc = nic_iface->callback_create(dev, device_id);
    6774        async_answer_0(callid, rc);
    6875}
    … …  
    11941201 */
    11951202static remote_iface_func_ptr_t remote_nic_iface_ops[] = {
    1196         &remote_nic_send_message,
    1197         &remote_nic_connect_to_nil,
     1203        &remote_nic_send_frame,
     1204        &remote_nic_callback_create,
    11981205        &remote_nic_get_state,
    11991206        &remote_nic_set_state,

  • uspace/lib/drv/include/ddf/driver.h

    r8afeb04 r948911d  
    145145        /** Ask driver to offline a specific function */
    146146        int (*fun_offline)(ddf_fun_t *);
    147 
    148         /**
    149          * Notification that the device was succesfully added.
    150          * The driver can do any blocking operation without
    151          * blocking the device manager.
    152          *
    153          * XXX REMOVE THIS
    154          */
    155         void (*device_added)(ddf_dev_t *dev);
    156147} driver_ops_t;
    157148

  • uspace/lib/drv/include/ops/nic.h

    r8afeb04 r948911d  
    3737#define LIBDRV_OPS_NIC_H_
    3838
    39 #include <net/packet.h>
    4039#include <ipc/services.h>
    41 #include <net/device.h>
     40#include <nic/nic.h>
    4241#include <sys/time.h>
    4342
    … …  
    4645typedef struct nic_iface {
    4746        /** Mandatory methods */
    48         int (*send_message)(ddf_fun_t *, packet_id_t);
    49         int (*connect_to_nil)(ddf_fun_t *, services_t, nic_device_id_t);
     47        int (*send_frame)(ddf_fun_t *, void *, size_t);
     48        int (*callback_create)(ddf_fun_t *, nic_device_id_t);
    5049        int (*get_state)(ddf_fun_t *, nic_device_state_t *);
    5150        int (*set_state)(ddf_fun_t *, nic_device_state_t);

  • uspace/lib/net/generic/net_checksum.c

    r8afeb04 r948911d  
    4545#define CRC_DIVIDER_LE  0xedb88320
    4646
    47 /** Polynomial used in multicast address hashing */
    48 #define CRC_MCAST_POLYNOMIAL  0x04c11db6
    49 
    5047/** Compacts the computed checksum to the 16 bit number adding the carries.
    5148 *
    … …  
    224221}
    225222
    226 /** Compute the standard hash from MAC
    227  *
    228  * Hashing MAC into 64 possible values and using the value as index to
    229  * 64bit number.
    230  *
    231  * The code is copied from qemu-0.13's implementation of ne2000 and rt8139
    232  * drivers, but according to documentation there it originates in FreeBSD.
    233  *
    234  * @param[in] addr The 6-byte MAC address to be hashed
    235  *
    236  * @return 64-bit number with only single bit set to 1
    237  *
    238  */
    239 uint64_t multicast_hash(const uint8_t addr[6])
    240 {
    241         uint32_t crc;
    242     int carry, i, j;
    243     uint8_t b;
    244 
    245     crc = 0xffffffff;
    246     for (i = 0; i < 6; i++) {
    247         b = addr[i];
    248         for (j = 0; j < 8; j++) {
    249             carry = ((crc & 0x80000000L) ? 1 : 0) ^ (b & 0x01);
    250             crc <<= 1;
    251             b >>= 1;
    252             if (carry)
    253                 crc = ((crc ^ CRC_MCAST_POLYNOMIAL) | carry);
    254         }
    255     }
    256        
    257     uint64_t one64 = 1;
    258     return one64 << (crc >> 26);
    259 }
    260 
    261223/** @}
    262224 */

  • uspace/lib/net/generic/net_remote.c

    r8afeb04 r948911d  
    167167}
    168168
    169 int net_driver_ready(async_sess_t *sess, devman_handle_t handle)
    170 {
    171         async_exch_t *exch = async_exchange_begin(sess);
    172         int rc = async_req_1_0(exch, NET_NET_DRIVER_READY, handle);
    173         async_exchange_end(exch);
    174        
    175         return rc;
    176 }
    177 
    178169/** @}
    179170 */

  • uspace/lib/net/include/net_checksum.h

    r8afeb04 r948911d  
    6767extern uint16_t flip_checksum(uint16_t);
    6868extern uint16_t ip_checksum(uint8_t *, size_t);
    69 extern uint64_t multicast_hash(const uint8_t addr[6]);
    7069
    7170#endif

  • uspace/lib/net/include/net_interface.h

    r8afeb04 r948911d  
    5252extern int net_get_devices_req(async_sess_t *, measured_string_t **, size_t *,
    5353    uint8_t **);
    54 extern int net_driver_ready(async_sess_t *, devman_handle_t);
    5554extern async_sess_t *net_connect_module(void);
    5655

  • uspace/lib/net/include/nil_remote.h

    r8afeb04 r948911d  
    3434#define __NET_NIL_REMOTE_H__
    3535
     36#include <ipc/loc.h>
    3637#include <net/device.h>
    3738#include <net/packet.h>
    … …  
    3940#include <generic.h>
    4041#include <async.h>
     42#include <sys/types.h>
    4143
    4244#define nil_bind_service(service, device_id, me, receiver) \
    … …  
    6062extern int nil_device_req(async_sess_t *, nic_device_id_t, devman_handle_t,
    6163    size_t);
    62 extern int nil_device_state_msg(async_sess_t *, nic_device_id_t, sysarg_t);
    63 extern int nil_received_msg(async_sess_t *, nic_device_id_t, packet_id_t);
    64 extern int nil_addr_changed_msg(async_sess_t *, nic_device_id_t,
    65     const nic_address_t *);
    6664
    6765#endif

  • uspace/lib/net/nil/nil_remote.c

    r8afeb04 r948911d  
    3636 */
    3737
     38#include <ipc/loc.h>
    3839#include <nil_remote.h>
    3940#include <generic.h>
    … …  
    4344#include <ipc/nil.h>
    4445
    45 /** Notify the network interface layer about the device state change.
    46  *
    47  * @param[in] sess      Network interface layer session.
    48  * @param[in] device_id Device identifier.
    49  * @param[in] state     New device state.
    50  *
    51  * @return EOK on success.
    52  * @return Other error codes as defined for each specific module
    53  *         device state function.
    54  *
    55  */
    56 int nil_device_state_msg(async_sess_t *sess, nic_device_id_t device_id,
    57     sysarg_t state)
    58 {
    59         return generic_device_state_msg_remote(sess, NET_NIL_DEVICE_STATE,
    60             device_id, state, 0);
    61 }
    62 
    63 /** Pass the packet queue to the network interface layer.
    64  *
    65  * Process and redistribute the received packet queue to the registered
    66  * upper layers.
    67  *
    68  * @param[in] sess      Network interface layer session.
    69  * @param[in] device_id Source device identifier.
    70  * @param[in] packet    Received packet or the received packet queue.
    71  * @param[in] target    Target service. Ignored parameter.
    72  *
    73  * @return EOK on success.
    74  * @return Other error codes as defined for each specific module
    75  *         received function.
    76  *
    77  */
    78 int nil_received_msg(async_sess_t *sess, nic_device_id_t device_id,
    79     packet_id_t packet_id)
    80 {
    81         return generic_received_msg_remote(sess, NET_NIL_RECEIVED,
    82             device_id, packet_id, 0, 0);
    83 }
    84 
    85 /** Notify upper layers that device address has changed
    86  *
    87  */
    88 int nil_addr_changed_msg(async_sess_t *sess, nic_device_id_t device_id,
    89     const nic_address_t *address)
    90 {
    91         assert(sess);
    92        
    93         async_exch_t *exch = async_exchange_begin(sess);
    94        
    95         aid_t message_id = async_send_1(exch, NET_NIL_ADDR_CHANGED,
    96             (sysarg_t) device_id, NULL);
    97         int rc = async_data_write_start(exch, address, sizeof (nic_address_t));
    98        
    99         async_exchange_end(exch);
    100        
    101         sysarg_t res;
    102     async_wait_for(message_id, &res);
    103        
    104     if (rc != EOK)
    105                 return rc;
    106        
    107     return (int) res;
    108 }
    109 
    11046int nil_device_req(async_sess_t *sess, nic_device_id_t device_id,
    111     devman_handle_t handle, size_t mtu)
     47    service_id_t sid, size_t mtu)
    11248{
    11349        async_exch_t *exch = async_exchange_begin(sess);
    11450        int rc = async_req_3_0(exch, NET_NIL_DEVICE, (sysarg_t) device_id,
    115             (sysarg_t) handle, (sysarg_t) mtu);
     51            (sysarg_t) sid, (sysarg_t) mtu);
    11652        async_exchange_end(exch);
    11753        return rc;

  • uspace/lib/nic/Makefile

    r8afeb04 r948911d  
    2929USPACE_PREFIX = ../..
    3030LIBRARY = libnic
    31 LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBNET_PREFIX)/libnet.a
    32 EXTRA_CFLAGS += -DLIBNIC_INTERNAL -Iinclude -I$(LIBDRV_PREFIX)/include -I$(LIBNET_PREFIX)/include
     31EXTRA_CFLAGS += -DLIBNIC_INTERNAL -Iinclude -I$(LIBDRV_PREFIX)/include
    3332
    3433SOURCES = \
    3534        src/nic_driver.c \
     35        src/nic_ev.c \
    3636        src/nic_addr_db.c \
    3737        src/nic_rx_control.c \

  • uspace/lib/nic/include/nic.h

    r8afeb04 r948911d  
    4242#include <ddf/driver.h>
    4343#include <device/hw_res_parsed.h>
    44 #include <net/packet.h>
    4544#include <ops/nic.h>
     45
     46#define DEVICE_CATEGORY_NIC "nic"
    4647
    4748struct nic;
    … …  
    6162
    6263/**
    63  * Simple structure for sending the allocated frames (packets) in a list.
     64 * Simple structure for sending lists of frames.
    6465 */
    6566typedef struct {
    6667        link_t link;
    67         packet_t *packet;
     68        void *data;
     69        size_t size;
    6870} nic_frame_t;
    6971
    … …  
    7173
    7274/**
    73  * Handler for writing packet data to the NIC device.
    74  * The function is responsible for releasing the packet.
     75 * Handler for writing frame data to the NIC device.
     76 * The function is responsible for releasing the frame.
    7577 * It does not return anything, if some error is detected the function just
    7678 * silently fails (logging on debug level is suggested).
    7779 *
    7880 * @param nic_data
    79  * @param packet        Pointer to the packet to be sent
    80  */
    81 typedef void (*write_packet_handler)(nic_t *, packet_t *);
     81 * @param data          Pointer to frame data
     82 * @param size          Size of frame data in bytes
     83 */
     84typedef void (*send_frame_handler)(nic_t *, void *, size_t);
    8285/**
    8386 * The handler for transitions between driver states.
    … …  
    157160 * @return ENOTSUP      If this filter cannot work on this NIC (e.g. the NIC
    158161 *                                      cannot run in promiscuous node or the limit of WOL
    159  *                                      packets' specifications was reached).
     162 *                                      frames' specifications was reached).
    160163 * @return ELIMIT       If this filter must implemented in HW but currently the
    161164 *                                      limit of these HW filters was reached.
    … …  
    203206/* Functions called in add_device */
    204207extern int nic_connect_to_services(nic_t *);
    205 extern int nic_register_as_ddf_fun(nic_t *, ddf_dev_ops_t *);
    206208extern int nic_get_resources(nic_t *, hw_res_list_parsed_t *);
    207209extern void nic_set_specific(nic_t *, void *);
    208 extern void nic_set_write_packet_handler(nic_t *, write_packet_handler);
     210extern void nic_set_send_frame_handler(nic_t *, send_frame_handler);
    209211extern void nic_set_state_change_handlers(nic_t *,
    210212        state_change_handler, state_change_handler, state_change_handler);
    … …  
    218220        poll_mode_change_handler, poll_request_handler);
    219221
    220 /* Functions called in device_added */
    221 extern int nic_ready(nic_t *);
    222 
    223222/* General driver functions */
    224223extern ddf_dev_t *nic_get_ddf_dev(nic_t *);
    225224extern ddf_fun_t *nic_get_ddf_fun(nic_t *);
     225extern void nic_set_ddf_fun(nic_t *, ddf_fun_t *);
    226226extern nic_t *nic_get_from_ddf_dev(ddf_dev_t *);
    227227extern nic_t *nic_get_from_ddf_fun(ddf_fun_t *);
    … …  
    232232extern int nic_report_poll_mode(nic_t *, nic_poll_mode_t, struct timeval *);
    233233extern void nic_query_address(nic_t *, nic_address_t *);
    234 extern void nic_received_packet(nic_t *, packet_t *);
    235 extern void nic_received_noneth_packet(nic_t *, packet_t *);
     234extern void nic_received_noneth_frame(nic_t *, void *, size_t);
    236235extern void nic_received_frame(nic_t *, nic_frame_t *);
    237236extern void nic_received_frame_list(nic_t *, nic_frame_list_t *);
    … …  
    247246extern void nic_report_collisions(nic_t *, unsigned);
    248247
    249 /* Packet / frame / frame list allocation and deallocation */
    250 extern packet_t *nic_alloc_packet(nic_t *, size_t);
    251 extern void nic_release_packet(nic_t *, packet_t *);
     248/* Frame / frame list allocation and deallocation */
    252249extern nic_frame_t *nic_alloc_frame(nic_t *, size_t);
    253250extern nic_frame_list_t *nic_alloc_frame_list(void);
    … …  
    274271extern void nic_sw_period_stop(nic_t *);
    275272
    276 /* Packet DMA lock */
    277 extern int nic_dma_lock_packet(packet_t *, size_t, void **);
    278 extern int nic_dma_unlock_packet(packet_t *, size_t);
    279 
    280273#endif // __NIC_H__
    281274

  • uspace/lib/nic/include/nic_driver.h

    r8afeb04 r948911d  
    4444
    4545#include <fibril_synch.h>
    46 #include <net/device.h>
     46#include <nic/nic.h>
    4747#include <async.h>
    4848
    … …  
    5050#include "nic_rx_control.h"
    5151#include "nic_wol_virtues.h"
    52 
    53 #define DEVICE_CATEGORY_NIC "nic"
    5452
    5553struct sw_poll_info {
    … …  
    8280        /** Device's default MAC address (assigned the first time, used in STOP) */
    8381        nic_address_t default_mac;
    84         /** Session to SERVICE_NETWORKING */
    85         async_sess_t *net_session;
    86         /** Session to SERVICE_ETHERNET or SERVICE_NILDUMMY */
    87         async_sess_t *nil_session;
     82        /** Client callback session */
     83        async_sess_t *client_session;
    8884        /** Phone to APIC or i8259 */
    8985        async_sess_t *irc_session;
    … …  
    134130         * Called with the main_lock locked for reading.
    135131         */
    136         write_packet_handler write_packet;
     132        send_frame_handler send_frame;
    137133        /**
    138134         * Event handler called when device goes to the ACTIVE state.

  • uspace/lib/nic/include/nic_ev.h

    r8afeb04 r948911d  
    11/*
    2  * Copyright (c) 2006 Josef Cejka
     2 * Copyright (c) 2011 Jiri Svoboda
    33 * All rights reserved.
    44 *
    … …  
    2727 */
    2828
    29 /** @addtogroup kbd_port
    30  * @ingroup  kbd
     29/**
     30 * @addtogroup libnic
    3131 * @{
    3232 */
    33 
    34 /** @file
    35  * @brief i8042 port driver.
     33/**
     34 * @file
     35 * @brief Prototypes of default DDF NIC interface methods implementations
    3636 */
    3737
    38 #ifndef i8042_H_
    39 #define i8042_H_
     38#ifndef NIC_EV_H__
     39#define NIC_EV_H__
    4040
     41#include <async.h>
     42#include <nic/nic.h>
    4143#include <sys/types.h>
    42 #include <libarch/ddi.h>
    43 #include <async.h>
    4444
    45 /** i8042 HW I/O interface */
    46 struct i8042 {
    47         ioport8_t data;
    48         uint8_t pad[3];
    49         ioport8_t status;
    50 } __attribute__ ((packed));
    51 typedef struct i8042 i8042_t;
    52 
    53 /** Softstate structure, one for each serial port (primary and aux). */
    54 typedef struct {
    55         service_id_t service_id;
    56         async_sess_t *client_sess;
    57 } i8042_port_t;
     45extern int nic_ev_addr_changed(async_sess_t *, nic_device_id_t,
     46    const nic_address_t *);
     47extern int nic_ev_device_state(async_sess_t *, nic_device_id_t, sysarg_t);
     48extern int nic_ev_received(async_sess_t *, nic_device_id_t, void *, size_t);
    5849
    5950#endif
    6051
    61 /**
    62  * @}
     52/** @}
    6353 */

  • uspace/lib/nic/include/nic_impl.h

    r8afeb04 r948911d  
    4040
    4141#include <assert.h>
    42 #include <net/device.h>
     42#include <nic/nic.h>
    4343#include <ddf/driver.h>
    44 #include <nil_remote.h>
    4544
    4645/* Inclusion of this file is not prohibited, because drivers could want to
    … …  
    4847
    4948extern int nic_get_address_impl(ddf_fun_t *dev_fun, nic_address_t *address);
    50 extern int nic_send_message_impl(ddf_fun_t *dev_fun, packet_id_t packet_id);
    51 extern int nic_connect_to_nil_impl(ddf_fun_t *dev_fun, services_t nil_service,
    52         int device_id);
     49extern int nic_send_frame_impl(ddf_fun_t *dev_fun, void *data, size_t size);
     50extern int nic_callback_create_impl(ddf_fun_t *dev_fun, int device_id);
    5351extern int nic_get_state_impl(ddf_fun_t *dev_fun, nic_device_state_t *state);
    5452extern int nic_set_state_impl(ddf_fun_t *dev_fun, nic_device_state_t state);

  • uspace/lib/nic/include/nic_rx_control.h

    r8afeb04 r948911d  
    4545#include <adt/hash_table.h>
    4646#include <fibril_synch.h>
    47 #include <net/device.h>
    48 #include <net/packet_header.h>
     47#include <nic/nic.h>
    4948
    5049#include "nic_addr_db.h"
    … …  
    120119        const nic_address_t *prev_addr, const nic_address_t *curr_addr);
    121120extern int nic_rxc_check(const nic_rxc_t *rxc,
    122         const packet_t *packet, nic_frame_type_t *frame_type);
     121        const void *data, size_t size, nic_frame_type_t *frame_type);
    123122extern void nic_rxc_hw_filtering(nic_rxc_t *rxc,
    124123        int unicast_exact, int multicast_exact, int vlan_exact);

  • uspace/lib/nic/include/nic_wol_virtues.h

    r8afeb04 r948911d  
    4343#endif
    4444
    45 #include <net/device.h>
     45#include <nic/nic.h>
    4646#include <adt/hash_table.h>
    4747#include "nic.h"

  • uspace/lib/nic/src/nic_driver.c

    r8afeb04 r948911d  
    4949#include <devman.h>
    5050#include <ddf/interrupt.h>
    51 #include <net_interface.h>
    5251#include <ops/nic.h>
    53 #include <packet_client.h>
    54 #include <packet_remote.h>
    55 #include <net/packet_header.h>
    5652#include <errno.h>
    5753
    5854#include "nic_driver.h"
     55#include "nic_ev.h"
    5956#include "nic_impl.h"
    6057
    … …  
    6461
    6562/**
    66  * Initializes libraries required for NIC framework - logger, packet manager
     63 * Initializes libraries required for NIC framework - logger
    6764 *
    6865 * @param name  Name of the device/driver (used in logging)
    … …  
    7976        snprintf(buffer, 256, "drv/" DEVICE_CATEGORY_NIC "/%s", name);
    8077       
    81         /* Initialize packet manager */
    82         return pm_init();
     78        return EOK;
    8379}
    8480
    … …  
    9389    nic_iface_t *iface)
    9490{
    95         if (driver_ops) {
    96                 if (!driver_ops->device_added)
    97                         driver_ops->device_added = nic_device_added_impl;
    98         }
    99 
    10091        if (dev_ops) {
    10192                if (!dev_ops->open)
    … …  
    114105                if (!iface->set_state)
    115106                        iface->set_state = nic_set_state_impl;
    116                 if (!iface->send_message)
    117                         iface->send_message = nic_send_message_impl;
    118                 if (!iface->connect_to_nil)
    119                         iface->connect_to_nil = nic_connect_to_nil_impl;
     107                if (!iface->send_frame)
     108                        iface->send_frame = nic_send_frame_impl;
     109                if (!iface->callback_create)
     110                        iface->callback_create = nic_callback_create_impl;
    120111                if (!iface->get_address)
    121112                        iface->get_address = nic_get_address_impl;
    … …  
    162153
    163154/**
    164  * Setup write packet handler. This MUST be called in the add_device handler
     155 * Setup send frame handler. This MUST be called in the add_device handler
    165156 * if the nic_send_message_impl function is used for sending messages (filled
    166157 * as send_message member of the nic_iface_t structure). The function must not
    … …  
    168159 *
    169160 * @param nic_data
    170  * @param wpfunc                Function handling the write_packet request
    171  */
    172 void nic_set_write_packet_handler(nic_t *nic_data, write_packet_handler wpfunc)
    173 {
    174         nic_data->write_packet = wpfunc;
     161 * @param sffunc        Function handling the send_frame request
     162 */
     163void nic_set_send_frame_handler(nic_t *nic_data, send_frame_handler sffunc)
     164{
     165        nic_data->send_frame = sffunc;
    175166}
    176167
    … …  
    270261}
    271262
    272 /**
    273  * Just a wrapper over the packet_get_1_remote function
    274  */
    275 packet_t *nic_alloc_packet(nic_t *nic_data, size_t data_size)
    276 {
    277         return packet_get_1_remote(nic_data->net_session, data_size);
    278 }
    279 
    280 
    281 /**
    282  * Just a wrapper over the pq_release_remote function
    283  */
    284 void nic_release_packet(nic_t *nic_data, packet_t *packet)
    285 {
    286         pq_release_remote(nic_data->net_session, packet_get_id(packet));
    287 }
    288 
    289 /** Allocate frame and packet
     263/** Allocate frame
    290264 *
    291265 *  @param nic_data     The NIC driver data
    292  *  @param packet_size  Size of packet
    293  *  @param offload_size Size of packet offload
     266 *  @param size         Frame size in bytes
    294267 *  @return pointer to allocated frame if success, NULL otherwise
    295268 */
    296 nic_frame_t *nic_alloc_frame(nic_t *nic_data, size_t packet_size)
     269nic_frame_t *nic_alloc_frame(nic_t *nic_data, size_t size)
    297270{
    298271        nic_frame_t *frame;
    … …  
    313286        }
    314287
    315         packet_t *packet = nic_alloc_packet(nic_data, packet_size);
    316         if (!packet) {
     288        frame->data = malloc(size);
     289        if (frame->data == NULL) {
    317290                free(frame);
    318291                return NULL;
    319292        }
    320293
    321         frame->packet = packet;
     294        frame->size = size;
    322295        return frame;
    323296}
    … …  
    332305        if (!frame)
    333306                return;
    334         if (frame->packet != NULL) {
    335                 nic_release_packet(nic_data, frame->packet);
    336         }
     307
     308        if (frame->data != NULL) {
     309                free(frame->data);
     310                frame->data = NULL;
     311                frame->size = 0;
     312        }
     313
    337314        fibril_mutex_lock(&nic_globals.lock);
    338315        if (nic_globals.frame_cache_size >= NIC_GLOBALS_MAX_CACHE_SIZE) {
    … …  
    447424
    448425/**
    449  * Connect to the NET and IRQ services. This function should be called only from
     426 * Connect to IRC service. This function should be called only from
    450427 * the add_device handler, thus no locking is required.
    451428 *
    … …  
    454431 * @return EOK          If connection was successful.
    455432 * @return EINVAL       If the IRC service cannot be determined.
    456  * @return EREFUSED     If NET or IRC service cannot be connected.
     433 * @return EREFUSED     If IRC service cannot be connected.
    457434 */
    458435int nic_connect_to_services(nic_t *nic_data)
    459436{
    460         /* NET service */
    461         nic_data->net_session = service_connect_blocking(EXCHANGE_SERIALIZE,
    462                 SERVICE_NETWORKING, 0, 0);
    463         if (nic_data->net_session == NULL)
    464                 return errno;
    465        
    466437        /* IRC service */
    467438        sysarg_t apic;
    … …  
    480451       
    481452        return EOK;
    482 }
    483 
    484 /** Notify the NET service that the device is ready
    485  *
    486  * @param nic NICF structure
    487  *
    488  * @return EOK on success
    489  *
    490  */
    491 int nic_ready(nic_t *nic)
    492 {
    493         fibril_rwlock_read_lock(&nic->main_lock);
    494        
    495         async_sess_t *session = nic->net_session;
    496         devman_handle_t handle = nic->dev->handle;
    497        
    498         fibril_rwlock_read_unlock(&nic->main_lock);
    499        
    500         if (session == NULL)
    501                 return EINVAL;
    502        
    503         return net_driver_ready(session, handle);
    504453}
    505454
    … …  
    546495       
    547496        /* Notify NIL layer (and uppper) if bound - not in add_device */
    548         if (nic_data->nil_session != NULL) {
    549                 int rc = nil_addr_changed_msg(nic_data->nil_session,
     497        if (nic_data->client_session != NULL) {
     498                int rc = nic_ev_addr_changed(nic_data->client_session,
    550499                    nic_data->device_id, address);
    551500                if (rc != EOK) {
    … …  
    604553
    605554/**
    606  * The busy flag can be set to 1 only in the write_packet handler, to 0 it can
     555 * The busy flag can be set to 1 only in the send_frame handler, to 0 it can
    607556 * be set anywhere.
    608557 *
    … …  
    613562{
    614563        /*
    615          * When the function is called in write_packet handler the main lock is
     564         * When the function is called in send_frame handler the main lock is
    616565         * locked so no race can happen.
    617566         * Otherwise, when it is unexpectedly set to 0 (even with main lock held
    … …  
    622571
    623572/**
    624  * Provided for correct naming conventions.
    625  * The packet is checked by filters and then sent up to the NIL layer or
    626  * discarded, the frame is released.
    627  *
    628  * @param nic_data
    629  * @param frame         The frame containing received packet
     573 * This is the function that the driver should call when it receives a frame.
     574 * The frame is checked by filters and then sent up to the NIL layer or
     575 * discarded. The frame is released.
     576 *
     577 * @param nic_data
     578 * @param frame         The received frame
    630579 */
    631580void nic_received_frame(nic_t *nic_data, nic_frame_t *frame)
    632581{
    633         nic_received_packet(nic_data, frame->packet);
    634         frame->packet = NULL;
    635         nic_release_frame(nic_data, frame);
    636 }
    637 
    638 /**
    639  * This is the function that the driver should call when it receives a packet.
    640  * The packet is checked by filters and then sent up to the NIL layer or
    641  * discarded.
    642  *
    643  * @param nic_data
    644  * @param packet                The received packet
    645  */
    646 void nic_received_packet(nic_t *nic_data, packet_t *packet)
    647 {
    648582        /* Note: this function must not lock main lock, because loopback driver
    649          *               calls it inside write_packet handler (with locked main lock) */
    650         packet_id_t pid = packet_get_id(packet);
    651        
     583         *               calls it inside send_frame handler (with locked main lock) */
    652584        fibril_rwlock_read_lock(&nic_data->rxc_lock);
    653585        nic_frame_type_t frame_type;
    654         int check = nic_rxc_check(&nic_data->rx_control, packet, &frame_type);
     586        int check = nic_rxc_check(&nic_data->rx_control, frame->data,
     587            frame->size, &frame_type);
    655588        fibril_rwlock_read_unlock(&nic_data->rxc_lock);
    656589        /* Update statistics */
    657590        fibril_rwlock_write_lock(&nic_data->stats_lock);
    658         /* Both sending message up and releasing packet are atomic IPC calls */
     591
    659592        if (nic_data->state == NIC_STATE_ACTIVE && check) {
    660593                nic_data->stats.receive_packets++;
    661                 nic_data->stats.receive_bytes += packet_get_data_length(packet);
     594                nic_data->stats.receive_bytes += frame->size;
    662595                switch (frame_type) {
    663596                case NIC_FRAME_MULTICAST:
    … …  
    671604                }
    672605                fibril_rwlock_write_unlock(&nic_data->stats_lock);
    673                 nil_received_msg(nic_data->nil_session, nic_data->device_id, pid);
     606                nic_ev_received(nic_data->client_session, nic_data->device_id,
     607                    frame->data, frame->size);
    674608        } else {
    675609                switch (frame_type) {
    … …  
    685619                }
    686620                fibril_rwlock_write_unlock(&nic_data->stats_lock);
    687                 nic_release_packet(nic_data, packet);
    688         }
     621        }
     622        nic_release_frame(nic_data, frame);
    689623}
    690624
    691625/**
    692626 * This function is to be used only in the loopback driver. It's workaround
    693  * for the situation when the packet does not contain ethernet address.
     627 * for the situation when the frame does not contain ethernet address.
    694628 * The filtering is therefore not applied here.
    695629 *
    696630 * @param nic_data
    697  * @param packet
    698  */
    699 void nic_received_noneth_packet(nic_t *nic_data, packet_t *packet)
     631 * @param data          Frame data
     632 * @param size          Frame size in bytes
     633 */
     634void nic_received_noneth_frame(nic_t *nic_data, void *data, size_t size)
    700635{
    701636        fibril_rwlock_write_lock(&nic_data->stats_lock);
    702637        nic_data->stats.receive_packets++;
    703         nic_data->stats.receive_bytes += packet_get_data_length(packet);
     638        nic_data->stats.receive_bytes += size;
    704639        fibril_rwlock_write_unlock(&nic_data->stats_lock);
    705640       
    706         nil_received_msg(nic_data->nil_session, nic_data->device_id,
    707             packet_get_id(packet));
    708 }
    709 
    710 /**
    711  * Some NICs can receive multiple packets during single interrupt. These can
     641        nic_ev_received(nic_data->client_session, nic_data->device_id,
     642            data, size);
     643}
     644
     645/**
     646 * Some NICs can receive multiple frames during single interrupt. These can
    712647 * send them in whole list of frames (actually nic_frame_t structures), then
    713  * the list is deallocated and each packet is passed to the
     648 * the list is deallocated and each frame is passed to the
    714649 * nic_received_packet function.
    715650 *
    … …  
    726661
    727662                list_remove(&frame->link);
    728                 nic_received_packet(nic_data, frame->packet);
    729                 frame->packet = NULL;
    730                 nic_release_frame(nic_data, frame);
     663                nic_received_frame(nic_data, frame);
    731664        }
    732665        nic_driver_release_frame_list(frames);
    … …  
    760693        nic_data->device_id = NIC_DEVICE_INVALID_ID;
    761694        nic_data->state = NIC_STATE_STOPPED;
    762         nic_data->net_session = NULL;
    763         nic_data->nil_session = NULL;
     695        nic_data->client_session = NULL;
    764696        nic_data->irc_session = NULL;
    765697        nic_data->poll_mode = NIC_POLL_IMMEDIATE;
    766698        nic_data->default_poll_mode = NIC_POLL_IMMEDIATE;
    767         nic_data->write_packet = NULL;
     699        nic_data->send_frame = NULL;
    768700        nic_data->on_activating = NULL;
    769701        nic_data->on_going_down = NULL;
    … …  
    815747 */
    816748static void nic_destroy(nic_t *nic_data) {
    817         if (nic_data->net_session != NULL) {
    818                 async_hangup(nic_data->net_session);
    819         }
    820 
    821         if (nic_data->nil_session != NULL) {
    822                 async_hangup(nic_data->nil_session);
     749        if (nic_data->client_session != NULL) {
     750                async_hangup(nic_data->client_session);
    823751        }
    824752
    … …  
    846774
    847775/**
    848  * Creates an exposed DDF function for the device, named "port0".
    849  * Device options are set as this function's options. The function is bound
    850  * (see ddf_fun_bind) and then registered to the DEVICE_CATEGORY_NIC class.
    851  * Note: this function should be called only from add_device handler, therefore
    852  * we don't need to use locks.
    853  *
    854  * @param nic_data      The NIC structure
    855  * @param ops           Device options for the DDF function.
    856  */
    857 int nic_register_as_ddf_fun(nic_t *nic_data, ddf_dev_ops_t *ops)
    858 {
    859         int rc;
    860         assert(nic_data);
    861 
    862         nic_data->fun = ddf_fun_create(nic_data->dev, fun_exposed, "port0");
    863         if (nic_data->fun == NULL)
    864                 return ENOMEM;
    865        
    866         nic_data->fun->ops = ops;
    867         nic_data->fun->driver_data = nic_data;
    868 
    869         rc = ddf_fun_bind(nic_data->fun);
    870         if (rc != EOK) {
    871                 ddf_fun_destroy(nic_data->fun);
    872                 return rc;
    873         }
    874 
    875         rc = ddf_fun_add_to_category(nic_data->fun, DEVICE_CATEGORY_NIC);
    876         if (rc != EOK) {
    877                 ddf_fun_destroy(nic_data->fun);
    878                 return rc;
    879         }
    880        
    881         return EOK;
    882 }
    883 
    884 /**
    885776 * Set information about current HW filtering.
    886777 *  1 ...       Only those frames we want to receive are passed through HW
    … …  
    1097988{
    1098989        return nic_data->fun;
     990}
     991
     992/**
     993 * @param nic_data
     994 * @param fun
     995 */
     996void nic_set_ddf_fun(nic_t *nic_data, ddf_fun_t *fun)
     997{
     998        nic_data->fun = fun;
    1099999}
    11001000
    … …  
    13291229}
    13301230
    1331 /** Lock packet for DMA usage
    1332  *
    1333  * @param packet
    1334  * @return physical address of packet
    1335  */
    1336 int nic_dma_lock_packet(packet_t *packet, size_t size, void **phys)
    1337 {
    1338         return dmamem_map(packet, SIZE2PAGES(size), 0, 0, phys);
    1339 }
    1340 
    1341 /** Unlock packet after DMA usage
    1342  *
    1343  * @param packet
    1344  */
    1345 int nic_dma_unlock_packet(packet_t *packet, size_t size)
    1346 {
    1347         return dmamem_unmap(packet, size);
    1348 }
    1349 
    13501231/** @}
    13511232 */

  • uspace/lib/nic/src/nic_impl.c

    r8afeb04 r948911d  
    3636 */
    3737
     38#include <errno.h>
    3839#include <str_error.h>
    3940#include <ipc/services.h>
    4041#include <ns.h>
    41 #include <packet_client.h>
    42 #include <packet_remote.h>
    4342#include "nic_driver.h"
     43#include "nic_ev.h"
    4444#include "nic_impl.h"
    4545
    … …  
    8787        }
    8888        if (state == NIC_STATE_ACTIVE) {
    89                 if (nic_data->nil_session == NULL || nic_data->net_session == NULL
    90                     || nic_data->device_id < 0) {
     89                if (nic_data->client_session == NULL || nic_data->device_id < 0) {
    9190                        fibril_rwlock_write_unlock(&nic_data->main_lock);
    9291                        return EINVAL;
    … …  
    118117        if (state == NIC_STATE_STOPPED) {
    119118                /* Notify upper layers that we are reseting the MAC */
    120                 int rc = nil_addr_changed_msg(nic_data->nil_session,
     119                int rc = nic_ev_addr_changed(nic_data->client_session,
    121120                        nic_data->device_id, &nic_data->default_mac);
    122121                nic_data->poll_mode = nic_data->default_poll_mode;
    … …  
    151150        nic_data->state = state;
    152151
    153         nil_device_state_msg(nic_data->nil_session, nic_data->device_id, state);
     152        nic_ev_device_state(nic_data->client_session, nic_data->device_id, state);
    154153
    155154        fibril_rwlock_write_unlock(&nic_data->main_lock);
    … …  
    159158
    160159/**
    161  * Default implementation of the send_message method.
     160 * Default implementation of the send_frame method.
    162161 * Send messages to the network.
    163162 *
    164163 * @param       fun
    165  * @param       packet_id       ID of the first packet in a queue of sent packets
     164 * @param       data    Frame data
     165 * @param       size    Frame size in bytes
    166166 *
    167167 * @return EOK          If the message was sent
    168  * @return EBUSY        If the device is not in state when the packet can be set.
    169  * @return EINVAL       If the packet ID is invalid
    170  */
    171 int nic_send_message_impl(ddf_fun_t *fun, packet_id_t packet_id)
    172 {
    173         nic_t *nic_data = (nic_t *) fun->driver_data;
    174         packet_t *packet, *next;
     168 * @return EBUSY        If the device is not in state when the frame can be sent.
     169 */
     170int nic_send_frame_impl(ddf_fun_t *fun, void *data, size_t size)
     171{
     172        nic_t *nic_data = (nic_t *) fun->driver_data;
    175173
    176174        fibril_rwlock_read_lock(&nic_data->main_lock);
    177175        if (nic_data->state != NIC_STATE_ACTIVE || nic_data->tx_busy) {
    178176                fibril_rwlock_read_unlock(&nic_data->main_lock);
    179                 pq_release_remote(nic_data->net_session, packet_id);
    180177                return EBUSY;
    181178        }
    182179
    183         int rc = packet_translate_remote(nic_data->net_session, &packet, packet_id);
    184 
    185         if (rc != EOK) {
    186                 fibril_rwlock_read_unlock(&nic_data->main_lock);
    187                 return EINVAL;
    188         }
    189 
    190         /*
    191          * Process the packet queue. Each sent packet must be detached from the
    192          * queue and destroyed. This is why the cycle differs from loopback's
    193          * cycle, where the packets are immediately used in upper layers and
    194          * therefore they must not be destroyed (released).
    195          */
    196         assert(nic_data->write_packet != NULL);
    197         do {
    198                 next = pq_detach(packet);
    199                 nic_data->write_packet(nic_data, packet);
    200                 packet = next;
    201         } while (packet);
    202         fibril_rwlock_read_unlock(&nic_data->main_lock);
    203         return EOK;
    204 }
    205 
    206 /**
    207  * Default implementation of the connect_to_nil method.
    208  * Connects the driver to the NIL service.
     180        nic_data->send_frame(nic_data, data, size);
     181        return EOK;
     182}
     183
     184/**
     185 * Default implementation of the connect_client method.
     186 * Creates callback connection to the client.
    209187 *
    210188 * @param       fun
    211  * @param       nil_service     ID of the server implementing the NIL service
    212189 * @param       device_id       ID of the device as used in higher layers
    213190 *
    214  * @return EOK          If the services were bound
    215  * @return                      Negative error code from service_connect_blocking
    216  */
    217 int nic_connect_to_nil_impl(ddf_fun_t *fun, services_t nil_service,
    218     nic_device_id_t device_id)
    219 {
    220         nic_t *nic_data = (nic_t *) fun->driver_data;
    221         fibril_rwlock_write_lock(&nic_data->main_lock);
     191 * @return EOK          On success, or negative error code.
     192 */
     193int nic_callback_create_impl(ddf_fun_t *fun, nic_device_id_t device_id)
     194{
     195        nic_t *nic = (nic_t *) fun->driver_data;
     196        fibril_rwlock_write_lock(&nic->main_lock);
    222197       
    223         nic_data->device_id = device_id;
     198        nic->device_id = device_id;
    224199       
    225         nic_data->nil_session = service_connect_blocking(EXCHANGE_SERIALIZE,
    226             nil_service, 0, 0);
    227         if (nic_data->nil_session != NULL) {
    228                 fibril_rwlock_write_unlock(&nic_data->main_lock);
    229                 return EOK;
     200        nic->client_session = async_callback_receive(EXCHANGE_SERIALIZE);
     201        if (nic->client_session == NULL) {
     202                fibril_rwlock_write_unlock(&nic->main_lock);
     203                return ENOMEM;
    230204        }
    231205       
    232         fibril_rwlock_write_unlock(&nic_data->main_lock);
    233         return EHANGUP;
     206        fibril_rwlock_write_unlock(&nic->main_lock);
     207        return EOK;
    234208}
    235209
    … …  
    828802}
    829803
    830 /** Default implementation of the device_added method
    831  *
    832  * Just calls nic_ready.
    833  *
    834  * @param dev
    835  *
    836  */
    837 void nic_device_added_impl(ddf_dev_t *dev)
    838 {
    839         nic_ready((nic_t *) dev->driver_data);
    840 }
    841 
    842804/**
    843805 * Default handler for unknown methods (outside of the NIC interface).

  • uspace/lib/nic/src/nic_rx_control.c

    r8afeb04 r948911d  
    4040#include <bool.h>
    4141#include <errno.h>
    42 #include <net/device.h>
    43 #include <net_checksum.h>
    44 #include <packet_client.h>
     42#include <mem.h>
     43#include <nic/nic.h>
    4544#include "nic_rx_control.h"
    4645
    … …  
    392391 *
    393392 * @param rxc
    394  * @param packet        The probed frame
     393 * @param frame     The probed frame
    395394 *
    396395 * @return True if the frame passes, false if it does not
    397396 */
    398 int nic_rxc_check(const nic_rxc_t *rxc, const packet_t *packet,
     397int nic_rxc_check(const nic_rxc_t *rxc, const void *data, size_t size,
    399398        nic_frame_type_t *frame_type)
    400399{
    401400        assert(frame_type != NULL);
    402         uint8_t *dest_addr = (uint8_t *) packet + packet->data_start;
     401        uint8_t *dest_addr = (uint8_t *) data;
    403402        uint8_t *src_addr = dest_addr + ETH_ADDR;
     403
     404        if (size < 2 * ETH_ADDR)
     405                return false;
    404406
    405407        if (dest_addr[0] & 1) {
    … …  
    448450        if (!rxc->vlan_exact && rxc->vlan_mask != NULL) {
    449451                vlan_header_t *vlan_header = (vlan_header_t *)
    450                         ((uint8_t *) packet + packet->data_start + 2 * ETH_ADDR);
     452                        ((uint8_t *) data + 2 * ETH_ADDR);
    451453                if (vlan_header->tpid_upper == VLAN_TPID_UPPER &&
    452454                        vlan_header->tpid_lower == VLAN_TPID_LOWER) {
    … …  
    484486                rxc->vlan_exact = vlan_exact;
    485487}
     488
     489/** Polynomial used in multicast address hashing */
     490#define CRC_MCAST_POLYNOMIAL  0x04c11db6
     491
     492/** Compute the standard hash from MAC
     493 *
     494 * Hashing MAC into 64 possible values and using the value as index to
     495 * 64bit number.
     496 *
     497 * The code is copied from qemu-0.13's implementation of ne2000 and rt8139
     498 * drivers, but according to documentation there it originates in FreeBSD.
     499 *
     500 * @param[in] addr The 6-byte MAC address to be hashed
     501 *
     502 * @return 64-bit number with only single bit set to 1
     503 *
     504 */
     505static uint64_t multicast_hash(const uint8_t addr[6])
     506{
     507        uint32_t crc;
     508    int carry, i, j;
     509    uint8_t b;
     510
     511    crc = 0xffffffff;
     512    for (i = 0; i < 6; i++) {
     513        b = addr[i];
     514        for (j = 0; j < 8; j++) {
     515            carry = ((crc & 0x80000000L) ? 1 : 0) ^ (b & 0x01);
     516            crc <<= 1;
     517            b >>= 1;
     518            if (carry)
     519                crc = ((crc ^ CRC_MCAST_POLYNOMIAL) | carry);
     520        }
     521    }
     522       
     523    uint64_t one64 = 1;
     524    return one64 << (crc >> 26);
     525}
     526
    486527
    487528/**

  • uspace/lib/nic/src/nic_wol_virtues.c

    r8afeb04 r948911d  
    3838#include "nic_wol_virtues.h"
    3939#include <assert.h>
     40#include <errno.h>
    4041
    4142#define NIC_WV_HASH_COUNT 32
Note: See TracChangeset for help on using the changeset viewer.