Changeset 3bacee1 in mainline for uspace/lib/nic/src/nic_impl.c


Ignore:
Timestamp:
2018-04-12T16:27:17Z (6 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
3cf22f9
Parents:
76d0981d
git-author:
Jiri Svoboda <jiri@…> (2018-04-11 19:25:33)
git-committer:
Jiri Svoboda <jiri@…> (2018-04-12 16:27:17)
Message:

Make ccheck-fix again and commit more good files.

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r76d0981d r3bacee1  
    118118                /* Notify upper layers that we are reseting the MAC */
    119119                errno_t rc = nic_ev_addr_changed(nic_data->client_session,
    120                         &nic_data->default_mac);
     120                    &nic_data->default_mac);
    121121                nic_data->poll_mode = nic_data->default_poll_mode;
    122122                memcpy(&nic_data->poll_period, &nic_data->default_poll_period,
    123                         sizeof (struct timeval));
     123                    sizeof(struct timeval));
    124124                if (rc != EOK) {
    125125                        /* We have already ran the on stopped handler, even if we
    … …  
    136136                /* Reinsert device's default MAC */
    137137                nic_rxc_set_addr(&nic_data->rx_control, NULL,
    138                         &nic_data->default_mac);
     138                    &nic_data->default_mac);
    139139                fibril_rwlock_write_unlock(&nic_data->rxc_lock);
    140140                memcpy(&nic_data->mac, &nic_data->default_mac, sizeof (nic_address_t));
    … …  
    258258 */
    259259errno_t nic_unicast_get_mode_impl(ddf_fun_t *fun, nic_unicast_mode_t *mode,
    260         size_t max_count, nic_address_t *addr_list, size_t *addr_count)
     260    size_t max_count, nic_address_t *addr_list, size_t *addr_count)
    261261{
    262262        nic_t *nic_data = nic_get_from_ddf_fun(fun);
    263263        fibril_rwlock_read_lock(&nic_data->rxc_lock);
    264264        nic_rxc_unicast_get_mode(&nic_data->rx_control, mode, max_count,
    265                 addr_list, addr_count);
     265            addr_list, addr_count);
    266266        fibril_rwlock_read_unlock(&nic_data->rxc_lock);
    267267        return EOK;
    … …  
    282282 */
    283283errno_t nic_unicast_set_mode_impl(ddf_fun_t *fun,
    284         nic_unicast_mode_t mode, const nic_address_t *addr_list, size_t addr_count)
    285 {
    286         assert((addr_count == 0 && addr_list == NULL)
    287                 || (addr_count != 0 && addr_list != NULL));
     284    nic_unicast_mode_t mode, const nic_address_t *addr_list, size_t addr_count)
     285{
     286        assert((addr_count == 0 && addr_list == NULL) ||
     287            (addr_count != 0 && addr_list != NULL));
    288288        size_t i;
    289289        for (i = 0; i < addr_count; ++i) {
    … …  
    297297        if (nic_data->on_unicast_mode_change) {
    298298                rc = nic_data->on_unicast_mode_change(nic_data,
    299                         mode, addr_list, addr_count);
     299                    mode, addr_list, addr_count);
    300300        }
    301301        if (rc == EOK) {
    302302                rc = nic_rxc_unicast_set_mode(&nic_data->rx_control, mode,
    303                         addr_list, addr_count);
     303                    addr_list, addr_count);
    304304                /* After changing the mode the addr db gets cleared, therefore we have
    305305                 * to reinsert also the physical address of NIC.
    … …  
    325325 */
    326326errno_t nic_multicast_get_mode_impl(ddf_fun_t *fun, nic_multicast_mode_t *mode,
    327         size_t max_count, nic_address_t *addr_list, size_t *addr_count)
     327    size_t max_count, nic_address_t *addr_list, size_t *addr_count)
    328328{
    329329        nic_t *nic_data = nic_get_from_ddf_fun(fun);
    330330        fibril_rwlock_read_lock(&nic_data->rxc_lock);
    331331        nic_rxc_multicast_get_mode(&nic_data->rx_control, mode, max_count,
    332                 addr_list, addr_count);
     332            addr_list, addr_count);
    333333        fibril_rwlock_read_unlock(&nic_data->rxc_lock);
    334334        return EOK;
    … …  
    349349 */
    350350errno_t nic_multicast_set_mode_impl(ddf_fun_t *fun,     nic_multicast_mode_t mode,
    351         const nic_address_t *addr_list, size_t addr_count)
    352 {
    353         assert((addr_count == 0 && addr_list == NULL)
    354                 || (addr_count != 0 && addr_list != NULL));
     351    const nic_address_t *addr_list, size_t addr_count)
     352{
     353        assert((addr_count == 0 && addr_list == NULL) ||
     354            (addr_count != 0 && addr_list != NULL));
    355355        size_t i;
    356356        for (i = 0; i < addr_count; ++i) {
    … …  
    367367        if (rc == EOK) {
    368368                rc = nic_rxc_multicast_set_mode(&nic_data->rx_control, mode,
    369                         addr_list, addr_count);
     369                    addr_list, addr_count);
    370370        }
    371371        fibril_rwlock_write_unlock(&nic_data->rxc_lock);
    … …  
    428428 */
    429429errno_t nic_blocked_sources_get_impl(ddf_fun_t *fun,
    430         size_t max_count, nic_address_t *addr_list, size_t *addr_count)
     430    size_t max_count, nic_address_t *addr_list, size_t *addr_count)
    431431{
    432432        nic_t *nic_data = nic_get_from_ddf_fun(fun);
    433433        fibril_rwlock_read_lock(&nic_data->rxc_lock);
    434434        nic_rxc_blocked_sources_get(&nic_data->rx_control,
    435                 max_count, addr_list, addr_count);
     435            max_count, addr_list, addr_count);
    436436        fibril_rwlock_read_unlock(&nic_data->rxc_lock);
    437437        return EOK;
    … …  
    451451 */
    452452errno_t nic_blocked_sources_set_impl(ddf_fun_t *fun,
    453         const nic_address_t *addr_list, size_t addr_count)
     453    const nic_address_t *addr_list, size_t addr_count)
    454454{
    455455        nic_t *nic_data = nic_get_from_ddf_fun(fun);
    … …  
    459459        }
    460460        errno_t rc = nic_rxc_blocked_sources_set(&nic_data->rx_control,
    461                 addr_list, addr_count);
     461            addr_list, addr_count);
    462462        fibril_rwlock_write_unlock(&nic_data->rxc_lock);
    463463        return rc;
    … …  
    519519 */
    520520errno_t nic_wol_virtue_add_impl(ddf_fun_t *fun, nic_wv_type_t type,
    521         const void *data, size_t length, nic_wv_id_t *new_id)
    522 {
    523         nic_t *nic_data = nic_get_from_ddf_fun(fun);
    524         if (nic_data->on_wol_virtue_add == NULL
    525                 || nic_data->on_wol_virtue_remove == NULL) {
     521    const void *data, size_t length, nic_wv_id_t *new_id)
     522{
     523        nic_t *nic_data = nic_get_from_ddf_fun(fun);
     524        if (nic_data->on_wol_virtue_add == NULL ||
     525            nic_data->on_wol_virtue_remove == NULL) {
    526526                return ENOTSUP;
    527527        }
    … …  
    555555        }
    556556        if ((int) nic_data->wol_virtues.lists_sizes[type] >=
    557                 nic_data->wol_virtues.caps_max[type]) {
     557            nic_data->wol_virtues.caps_max[type]) {
    558558                fibril_rwlock_write_unlock(&nic_data->wv_lock);
    559559                return ELIMIT;
    … …  
    596596{
    597597        nic_t *nic_data = nic_get_from_ddf_fun(fun);
    598         if (nic_data->on_wol_virtue_add == NULL
    599                 || nic_data->on_wol_virtue_remove == NULL) {
     598        if (nic_data->on_wol_virtue_add == NULL ||
     599            nic_data->on_wol_virtue_remove == NULL) {
    600600                return ENOTSUP;
    601601        }
    602602        fibril_rwlock_write_lock(&nic_data->wv_lock);
    603603        nic_wol_virtue_t *virtue =
    604                 nic_wol_virtues_remove(&nic_data->wol_virtues, id);
     604            nic_wol_virtues_remove(&nic_data->wol_virtues, id);
    605605        if (virtue == NULL) {
    606606                fibril_rwlock_write_unlock(&nic_data->wv_lock);
    … …  
    630630 */
    631631errno_t nic_wol_virtue_probe_impl(ddf_fun_t *fun, nic_wv_id_t id,
    632         nic_wv_type_t *type, size_t max_length, void *data, size_t *length)
     632    nic_wv_type_t *type, size_t max_length, void *data, size_t *length)
    633633{
    634634        nic_t *nic_data = nic_get_from_ddf_fun(fun);
    635635        fibril_rwlock_read_lock(&nic_data->wv_lock);
    636636        const nic_wol_virtue_t *virtue =
    637                         nic_wol_virtues_find(&nic_data->wol_virtues, id);
     637            nic_wol_virtues_find(&nic_data->wol_virtues, id);
    638638        if (virtue == NULL) {
    639639                *type = NIC_WV_NONE;
    … …  
    668668 */
    669669errno_t nic_wol_virtue_list_impl(ddf_fun_t *fun, nic_wv_type_t type,
    670         size_t max_count, nic_wv_id_t *id_list, size_t *id_count)
     670    size_t max_count, nic_wv_id_t *id_list, size_t *id_count)
    671671{
    672672        nic_t *nic_data = nic_get_from_ddf_fun(fun);
    673673        fibril_rwlock_read_lock(&nic_data->wv_lock);
    674674        errno_t rc = nic_wol_virtues_list(&nic_data->wol_virtues, type,
    675                 max_count, id_list, id_count);
     675            max_count, id_list, id_count);
    676676        fibril_rwlock_read_unlock(&nic_data->wv_lock);
    677677        return rc;
    … …  
    692692        nic_t *nic_data = nic_get_from_ddf_fun(fun);
    693693        fibril_rwlock_read_lock(&nic_data->wv_lock);
    694         *count = nic_data->wol_virtues.caps_max[type]
    695             - (int) nic_data->wol_virtues.lists_sizes[type];
     694        *count = nic_data->wol_virtues.caps_max[type] -
     695            (int) nic_data->wol_virtues.lists_sizes[type];
    696696        fibril_rwlock_read_unlock(&nic_data->wv_lock);
    697697        return EOK;
    … …  
    711711 */
    712712errno_t nic_poll_get_mode_impl(ddf_fun_t *fun,
    713         nic_poll_mode_t *mode, struct timeval *period)
     713    nic_poll_mode_t *mode, struct timeval *period)
    714714{
    715715        nic_t *nic_data = nic_get_from_ddf_fun(fun);
    716716        fibril_rwlock_read_lock(&nic_data->main_lock);
    717717        *mode = nic_data->poll_mode;
    718         memcpy(period, &nic_data->poll_period, sizeof (struct timeval));
     718        memcpy(period, &nic_data->poll_period, sizeof(struct timeval));
    719719        fibril_rwlock_read_unlock(&nic_data->main_lock);
    720720        return EOK;
    … …  
    734734 */
    735735errno_t nic_poll_set_mode_impl(ddf_fun_t *fun,
    736         nic_poll_mode_t mode, const struct timeval *period)
     736    nic_poll_mode_t mode, const struct timeval *period)
    737737{
    738738        nic_t *nic_data = nic_get_from_ddf_fun(fun);
    … …  
    757757        assert(rc == EOK || rc == ENOTSUP || rc == EINVAL);
    758758        if (rc == ENOTSUP && (nic_data->on_poll_request != NULL) &&
    759             (mode == NIC_POLL_PERIODIC || mode == NIC_POLL_SOFTWARE_PERIODIC) ) {
     759            (mode == NIC_POLL_PERIODIC || mode == NIC_POLL_SOFTWARE_PERIODIC)) {
    760760
    761761                rc = nic_data->on_poll_mode_change(nic_data, NIC_POLL_ON_DEMAND, NULL);
Note: See TracChangeset for help on using the changeset viewer.