Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r77ad86c r00d7e1b  
    4242#include <ddf/driver.h>
    4343#include <device/hw_res_parsed.h>
     44#include <net/packet.h>
    4445#include <ops/nic.h>
    45 
    46 #define DEVICE_CATEGORY_NIC "nic"
    4746
    4847struct nic;
    … …  
    6261
    6362/**
    64  * Simple structure for sending lists of frames.
     63 * Simple structure for sending the allocated frames (packets) in a list.
    6564 */
    6665typedef struct {
    6766        link_t link;
    68         void *data;
    69         size_t size;
     67        packet_t *packet;
    7068} nic_frame_t;
    7169
    … …  
    7371
    7472/**
    75  * Handler for writing frame data to the NIC device.
    76  * The function is responsible for releasing the frame.
     73 * Handler for writing packet data to the NIC device.
     74 * The function is responsible for releasing the packet.
    7775 * It does not return anything, if some error is detected the function just
    7876 * silently fails (logging on debug level is suggested).
    7977 *
    8078 * @param nic_data
    81  * @param data          Pointer to frame data
    82  * @param size          Size of frame data in bytes
    83  */
    84 typedef void (*send_frame_handler)(nic_t *, void *, size_t);
    85 
     79 * @param packet        Pointer to the packet to be sent
     80 */
     81typedef void (*write_packet_handler)(nic_t *, packet_t *);
    8682/**
    8783 * The handler for transitions between driver states.
    … …  
    9591 */
    9692typedef int (*state_change_handler)(nic_t *);
    97 
    9893/**
    9994 * Handler for unicast filtering mode change.
    … …  
    108103 */
    109104typedef int (*unicast_mode_change_handler)(nic_t *,
    110     nic_unicast_mode_t, const nic_address_t *, size_t);
    111 
     105        nic_unicast_mode_t, const nic_address_t *, size_t);
    112106/**
    113107 * Handler for multicast filtering mode change.
    … …  
    122116 */
    123117typedef int (*multicast_mode_change_handler)(nic_t *,
    124     nic_multicast_mode_t, const nic_address_t *, size_t);
    125 
     118        nic_multicast_mode_t, const nic_address_t *, size_t);
    126119/**
    127120 * Handler for broadcast filtering mode change.
    … …  
    134127 */
    135128typedef int (*broadcast_mode_change_handler)(nic_t *, nic_broadcast_mode_t);
    136 
    137129/**
    138130 * Handler for blocked sources list change.
    … …  
    143135 */
    144136typedef void (*blocked_sources_change_handler)(nic_t *,
    145     const nic_address_t *, size_t);
    146 
     137        const nic_address_t *, size_t);
    147138/**
    148139 * Handler for VLAN filtering mask change.
    … …  
    151142 */
    152143typedef void (*vlan_mask_change_handler)(nic_t *, const nic_vlan_mask_t *);
    153 
    154144/**
    155145 * Handler called when a WOL virtue is added.
    … …  
    167157 * @return ENOTSUP      If this filter cannot work on this NIC (e.g. the NIC
    168158 *                                      cannot run in promiscuous node or the limit of WOL
    169  *                                      frames' specifications was reached).
     159 *                                      packets' specifications was reached).
    170160 * @return ELIMIT       If this filter must implemented in HW but currently the
    171161 *                                      limit of these HW filters was reached.
    172162 */
    173163typedef int (*wol_virtue_add_handler)(nic_t *, const nic_wol_virtue_t *);
    174 
    175164/**
    176165 * Handler called when a WOL virtue is removed.
    … …  
    182171 */
    183172typedef void (*wol_virtue_remove_handler)(nic_t *, const nic_wol_virtue_t *);
    184 
    185173/**
    186174 * Handler for poll mode change.
    … …  
    195183 */
    196184typedef int (*poll_mode_change_handler)(nic_t *,
    197     nic_poll_mode_t, const struct timeval *);
    198 
     185        nic_poll_mode_t, const struct timeval *);
    199186/**
    200187 * Event handler called when the NIC should poll its buffers for a new frame
    … …  
    212199extern int nic_driver_init(const char *);
    213200extern void nic_driver_implement(driver_ops_t *, ddf_dev_ops_t *,
    214     nic_iface_t *);
     201        nic_iface_t *);
    215202
    216203/* Functions called in add_device */
    217204extern int nic_connect_to_services(nic_t *);
     205extern int nic_register_as_ddf_fun(nic_t *, ddf_dev_ops_t *);
    218206extern int nic_get_resources(nic_t *, hw_res_list_parsed_t *);
    219207extern void nic_set_specific(nic_t *, void *);
    220 extern void nic_set_send_frame_handler(nic_t *, send_frame_handler);
     208extern void nic_set_write_packet_handler(nic_t *, write_packet_handler);
    221209extern void nic_set_state_change_handlers(nic_t *,
    222     state_change_handler, state_change_handler, state_change_handler);
     210        state_change_handler, state_change_handler, state_change_handler);
    223211extern void nic_set_filtering_change_handlers(nic_t *,
    224     unicast_mode_change_handler, multicast_mode_change_handler,
    225     broadcast_mode_change_handler, blocked_sources_change_handler,
    226     vlan_mask_change_handler);
     212        unicast_mode_change_handler, multicast_mode_change_handler,
     213        broadcast_mode_change_handler, blocked_sources_change_handler,
     214        vlan_mask_change_handler);
    227215extern void nic_set_wol_virtue_change_handlers(nic_t *,
    228     wol_virtue_add_handler, wol_virtue_remove_handler);
     216        wol_virtue_add_handler, wol_virtue_remove_handler);
    229217extern void nic_set_poll_handlers(nic_t *,
    230     poll_mode_change_handler, poll_request_handler);
     218        poll_mode_change_handler, poll_request_handler);
     219
     220/* Functions called in device_added */
     221extern int nic_ready(nic_t *);
    231222
    232223/* General driver functions */
    233224extern ddf_dev_t *nic_get_ddf_dev(nic_t *);
    234225extern ddf_fun_t *nic_get_ddf_fun(nic_t *);
    235 extern void nic_set_ddf_fun(nic_t *, ddf_fun_t *);
    236226extern nic_t *nic_get_from_ddf_dev(ddf_dev_t *);
    237227extern nic_t *nic_get_from_ddf_fun(ddf_fun_t *);
    … …  
    242232extern int nic_report_poll_mode(nic_t *, nic_poll_mode_t, struct timeval *);
    243233extern void nic_query_address(nic_t *, nic_address_t *);
     234extern void nic_received_packet(nic_t *, packet_t *);
     235extern void nic_received_noneth_packet(nic_t *, packet_t *);
    244236extern void nic_received_frame(nic_t *, nic_frame_t *);
    245237extern void nic_received_frame_list(nic_t *, nic_frame_list_t *);
    … …  
    255247extern void nic_report_collisions(nic_t *, unsigned);
    256248
    257 /* Frame / frame list allocation and deallocation */
     249/* Packet / frame / frame list allocation and deallocation */
     250extern packet_t *nic_alloc_packet(nic_t *, size_t);
     251extern void nic_release_packet(nic_t *, packet_t *);
    258252extern nic_frame_t *nic_alloc_frame(nic_t *, size_t);
    259253extern nic_frame_list_t *nic_alloc_frame_list(void);
    … …  
    264258extern void nic_report_hw_filtering(nic_t *, int, int, int);
    265259extern void nic_query_unicast(const nic_t *,
    266     nic_unicast_mode_t *, size_t, nic_address_t *, size_t *);
     260        nic_unicast_mode_t *, size_t, nic_address_t *, size_t *);
    267261extern void nic_query_multicast(const nic_t *,
    268     nic_multicast_mode_t *, size_t, nic_address_t *, size_t *);
     262        nic_multicast_mode_t *, size_t, nic_address_t *, size_t *);
    269263extern void nic_query_broadcast(const nic_t *, nic_broadcast_mode_t *);
    270264extern void nic_query_blocked_sources(const nic_t *,
    271     size_t, nic_address_t *, size_t *);
     265        size_t, nic_address_t *, size_t *);
    272266extern int nic_query_vlan_mask(const nic_t *, nic_vlan_mask_t *);
    273267extern int nic_query_wol_max_caps(const nic_t *, nic_wv_type_t);
    … …  
    280274extern void nic_sw_period_stop(nic_t *);
    281275
     276/* Packet DMA lock */
     277extern void * nic_dma_lock_packet(packet_t * packet);
     278extern void nic_dma_unlock_packet(packet_t * packet);
     279
    282280#endif // __NIC_H__
    283281
Note: See TracChangeset for help on using the changeset viewer.