Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 520acaf in mainline for uspace/lib/nic/include/nic.h


Ignore:
Timestamp:
2012-06-06T21:13:29Z (10 years ago)
Author:
Sean Bartell <wingedtachikoma@…>
Branches:
lfn, master
Children:
5f679702
Parents:
11b9ad7 (diff), 3123d2a (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/lib/nic/include/nic.h

    r11b9ad7 r520acaf  
    8383 */
    8484typedef void (*send_frame_handler)(nic_t *, void *, size_t);
     85
    8586/**
    8687 * The handler for transitions between driver states.
     
    9495 */
    9596typedef int (*state_change_handler)(nic_t *);
     97
    9698/**
    9799 * Handler for unicast filtering mode change.
     
    106108 */
    107109typedef int (*unicast_mode_change_handler)(nic_t *,
    108         nic_unicast_mode_t, const nic_address_t *, size_t);
     110    nic_unicast_mode_t, const nic_address_t *, size_t);
     111
    109112/**
    110113 * Handler for multicast filtering mode change.
     
    119122 */
    120123typedef int (*multicast_mode_change_handler)(nic_t *,
    121         nic_multicast_mode_t, const nic_address_t *, size_t);
     124    nic_multicast_mode_t, const nic_address_t *, size_t);
     125
    122126/**
    123127 * Handler for broadcast filtering mode change.
     
    130134 */
    131135typedef int (*broadcast_mode_change_handler)(nic_t *, nic_broadcast_mode_t);
     136
    132137/**
    133138 * Handler for blocked sources list change.
     
    138143 */
    139144typedef void (*blocked_sources_change_handler)(nic_t *,
    140         const nic_address_t *, size_t);
     145    const nic_address_t *, size_t);
     146
    141147/**
    142148 * Handler for VLAN filtering mask change.
     
    145151 */
    146152typedef void (*vlan_mask_change_handler)(nic_t *, const nic_vlan_mask_t *);
     153
    147154/**
    148155 * Handler called when a WOL virtue is added.
     
    165172 */
    166173typedef int (*wol_virtue_add_handler)(nic_t *, const nic_wol_virtue_t *);
     174
    167175/**
    168176 * Handler called when a WOL virtue is removed.
     
    174182 */
    175183typedef void (*wol_virtue_remove_handler)(nic_t *, const nic_wol_virtue_t *);
     184
    176185/**
    177186 * Handler for poll mode change.
     
    186195 */
    187196typedef int (*poll_mode_change_handler)(nic_t *,
    188         nic_poll_mode_t, const struct timeval *);
     197    nic_poll_mode_t, const struct timeval *);
     198
    189199/**
    190200 * Event handler called when the NIC should poll its buffers for a new frame
     
    202212extern int nic_driver_init(const char *);
    203213extern void nic_driver_implement(driver_ops_t *, ddf_dev_ops_t *,
    204         nic_iface_t *);
     214    nic_iface_t *);
    205215
    206216/* Functions called in add_device */
     
    210220extern void nic_set_send_frame_handler(nic_t *, send_frame_handler);
    211221extern void nic_set_state_change_handlers(nic_t *,
    212         state_change_handler, state_change_handler, state_change_handler);
     222    state_change_handler, state_change_handler, state_change_handler);
    213223extern void nic_set_filtering_change_handlers(nic_t *,
    214         unicast_mode_change_handler, multicast_mode_change_handler,
    215         broadcast_mode_change_handler, blocked_sources_change_handler,
    216         vlan_mask_change_handler);
     224    unicast_mode_change_handler, multicast_mode_change_handler,
     225    broadcast_mode_change_handler, blocked_sources_change_handler,
     226    vlan_mask_change_handler);
    217227extern void nic_set_wol_virtue_change_handlers(nic_t *,
    218         wol_virtue_add_handler, wol_virtue_remove_handler);
     228    wol_virtue_add_handler, wol_virtue_remove_handler);
    219229extern void nic_set_poll_handlers(nic_t *,
    220         poll_mode_change_handler, poll_request_handler);
     230    poll_mode_change_handler, poll_request_handler);
    221231
    222232/* General driver functions */
     
    254264extern void nic_report_hw_filtering(nic_t *, int, int, int);
    255265extern void nic_query_unicast(const nic_t *,
    256         nic_unicast_mode_t *, size_t, nic_address_t *, size_t *);
     266    nic_unicast_mode_t *, size_t, nic_address_t *, size_t *);
    257267extern void nic_query_multicast(const nic_t *,
    258         nic_multicast_mode_t *, size_t, nic_address_t *, size_t *);
     268    nic_multicast_mode_t *, size_t, nic_address_t *, size_t *);
    259269extern void nic_query_broadcast(const nic_t *, nic_broadcast_mode_t *);
    260270extern void nic_query_blocked_sources(const nic_t *,
    261         size_t, nic_address_t *, size_t *);
     271    size_t, nic_address_t *, size_t *);
    262272extern int nic_query_vlan_mask(const nic_t *, nic_vlan_mask_t *);
    263273extern int nic_query_wol_max_caps(const nic_t *, nic_wv_type_t);
Note: See TracChangeset for help on using the changeset viewer.