Index: uspace/app/bdsh/cmds/modules/mount/mount.c =================================================================== --- uspace/app/bdsh/cmds/modules/mount/mount.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/app/bdsh/cmds/modules/mount/mount.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -74,8 +74,5 @@ get_mtab_list(&mtab_list); - list_foreach(mtab_list, cur) { - mtab_ent_t *mtab_ent = list_get_instance(cur, mtab_ent_t, - link); - + list_foreach(mtab_list, link, mtab_ent_t, mtab_ent) { if (old_ent) free(old_ent); Index: uspace/app/edit/sheet.c =================================================================== --- uspace/app/edit/sheet.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/app/edit/sheet.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -105,5 +105,4 @@ char *ipp; size_t sz; - tag_t *tag; char *newp; @@ -128,7 +127,5 @@ /* Adjust tags. */ - list_foreach(sh->tags, link) { - tag = list_get_instance(link, tag_t, link); - + list_foreach(sh->tags, link, tag_t, tag) { if (tag->b_off > pos->b_off) tag->b_off += sz; @@ -154,5 +151,4 @@ char *spp; size_t sz; - tag_t *tag; char *newp; size_t shrink_size; @@ -165,7 +161,5 @@ /* Adjust tags. */ - list_foreach(sh->tags, link) { - tag = list_get_instance(link, tag_t, link); - + list_foreach(sh->tags, link, tag_t, tag) { if (tag->b_off >= epos->b_off) tag->b_off -= sz; Index: uspace/app/tester/mm/common.c =================================================================== --- uspace/app/tester/mm/common.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/app/tester/mm/common.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -84,8 +84,6 @@ } -static bool overlap_match(link_t *link, void *addr, size_t size) -{ - mem_block_t *block = list_get_instance(link, mem_block_t, link); - +static bool overlap_match(mem_block_t *block, void *addr, size_t size) +{ /* Entry block control structure ids, link) { - match_id_t *match = list_get_instance(link, match_id_t, link); - + list_foreach(matches->ids, link, match_id_t, match) { printf("%s%3d %s\n", line_prefix, match->score, match->id); } Index: uspace/app/usbinfo/hid.c =================================================================== --- uspace/app/usbinfo/hid.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/app/usbinfo/hid.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -100,13 +100,11 @@ printf("%sParsed HID report descriptor for interface %d\n", get_indent(0), iface_no); - list_foreach(report->reports, report_it) { - usb_hid_report_description_t *description = list_get_instance( - report_it, usb_hid_report_description_t, reports_link); + list_foreach(report->reports, reports_link, + usb_hid_report_description_t, description) { printf("%sReport %d (type %d)\n", get_indent(1), (int) description->report_id, (int) description->type); - list_foreach(description->report_items, item_it) { - usb_hid_report_field_t *field = list_get_instance( - item_it, usb_hid_report_field_t, ritems_link); + list_foreach(description->report_items, ritems_link, + usb_hid_report_field_t, field) { printf("%sUsage page = 0x%04x Usage = 0x%04x\n", get_indent(2), Index: uspace/drv/bus/pci/pciintel/pci.c =================================================================== --- uspace/drv/bus/pci/pciintel/pci.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/drv/bus/pci/pciintel/pci.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -454,5 +454,8 @@ { /* Value of the BAR */ - uint32_t val, mask; + uint32_t val; + uint32_t bar; + uint32_t mask; + /* IO space address */ bool io; @@ -492,6 +495,14 @@ /* Get the address mask. */ pci_conf_write_32(fun, addr, 0xffffffff); - mask &= pci_conf_read_32(fun, addr); - + bar = pci_conf_read_32(fun, addr); + + /* + * Unimplemented BARs read back as all 0's. + */ + if (!bar) + return addr + (addrw64 ? 8 : 4); + + mask &= bar; + /* Restore the original value. */ pci_conf_write_32(fun, addr, val); @@ -541,5 +552,7 @@ { uint8_t irq = pci_conf_read_8(fun, PCI_BRIDGE_INT_LINE); - if (irq != 0xff) + uint8_t pin = pci_conf_read_8(fun, PCI_BRIDGE_INT_PIN); + + if (pin != 0 && irq != 0xff) pci_add_interrupt(fun, irq); } Index: uspace/drv/bus/usb/usbmid/explore.c =================================================================== --- uspace/drv/bus/usb/usbmid/explore.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/drv/bus/usb/usbmid/explore.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -56,6 +56,5 @@ static bool interface_in_list(const list_t *list, int interface_no) { - list_foreach(*list, l) { - usbmid_interface_t *iface = usbmid_interface_from_link(l); + list_foreach(*list, link, usbmid_interface_t, iface) { if (iface->interface_no == interface_no) { return true; @@ -190,7 +189,5 @@ /* Start child function for every interface. */ - list_foreach(usb_mid->interface_list, link) { - usbmid_interface_t *iface = usbmid_interface_from_link(link); - + list_foreach(usb_mid->interface_list, link, usbmid_interface_t, iface) { usb_log_info("Creating child for interface %d (%s).\n", iface->interface_no, Index: uspace/drv/bus/usb/usbmid/usbmid.c =================================================================== --- uspace/drv/bus/usb/usbmid/usbmid.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/drv/bus/usb/usbmid/usbmid.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -135,6 +135,5 @@ } - list_foreach(match_ids.ids, link) { - match_id_t *match_id = list_get_instance(link, match_id_t, link); + list_foreach(match_ids.ids, link, match_id_t, match_id) { rc = ddf_fun_add_match_id(child, match_id->id, match_id->score); if (rc != EOK) { Index: uspace/drv/bus/usb/vhc/transfer.c =================================================================== --- uspace/drv/bus/usb/vhc/transfer.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/drv/bus/usb/vhc/transfer.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -92,6 +92,5 @@ bool target_found = false; - list_foreach(vhc->devices, pos) { - vhc_virtdev_t *dev = list_get_instance(pos, vhc_virtdev_t, link); + list_foreach(vhc->devices, link, vhc_virtdev_t, dev) { fibril_mutex_lock(&dev->guard); if (dev->address == transfer->address) { Index: uspace/lib/block/block.c =================================================================== --- uspace/lib/block/block.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/lib/block/block.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -93,6 +93,5 @@ fibril_mutex_lock(&dcl_lock); - list_foreach(dcl, cur) { - devcon_t *devcon = list_get_instance(cur, devcon_t, link); + list_foreach(dcl, link, devcon_t, devcon) { if (devcon->service_id == service_id) { fibril_mutex_unlock(&dcl_lock); @@ -124,6 +123,5 @@ fibril_mutex_lock(&dcl_lock); - list_foreach(dcl, cur) { - devcon_t *d = list_get_instance(cur, devcon_t, link); + list_foreach(dcl, link, devcon_t, d) { if (d->service_id == service_id) { fibril_mutex_unlock(&dcl_lock); Index: uspace/lib/c/generic/adt/hash_table.c =================================================================== --- uspace/lib/c/generic/adt/hash_table.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/lib/c/generic/adt/hash_table.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -227,10 +227,9 @@ /* Check for duplicates. */ - list_foreach(h->bucket[idx], cur) { + list_foreach(h->bucket[idx], link, ht_link_t, cur_link) { /* * We could filter out items using their hashes first, but * calling equal() might very well be just as fast. */ - ht_link_t *cur_link = member_to_inst(cur, ht_link_t, link); if (h->op->equal(cur_link, item)) return false; @@ -258,6 +257,5 @@ size_t idx = h->op->key_hash(key) % h->bucket_cnt; - list_foreach(h->bucket[idx], cur) { - ht_link_t *cur_link = member_to_inst(cur, ht_link_t, link); + list_foreach(h->bucket[idx], link, ht_link_t, cur_link) { /* * Is this is the item we are looking for? We could have first Index: uspace/lib/c/generic/adt/list.c =================================================================== --- uspace/lib/c/generic/adt/list.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/lib/c/generic/adt/list.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -102,6 +102,8 @@ unsigned int count = 0; - list_foreach(*list, link) { + link_t *link = list_first(list); + while (link != NULL) { count++; + link = list_next(link, list); } Index: uspace/lib/c/generic/cfg.c =================================================================== --- uspace/lib/c/generic/cfg.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/lib/c/generic/cfg.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -83,7 +83,5 @@ return true; - list_foreach(data->sections, link) { - const cfg_section_t *section = cfg_section_instance(link); - + cfg_file_foreach(data, section) { if (!list_empty(§ion->entries)) return false; @@ -413,7 +411,5 @@ const cfg_section_t *cfg_find_section(const cfg_file_t *data, const char *title) { - list_foreach(data->sections, link) { - const cfg_section_t *section = cfg_section_instance(link); - + cfg_file_foreach(data, section) { if (str_cmp(section->title, title) == 0) return section; @@ -434,7 +430,5 @@ const char *cfg_find_value(const cfg_section_t *section, const char *key) { - list_foreach(section->entries, link) { - const cfg_entry_t *entry = cfg_entry_instance(link); - + cfg_section_foreach(section, entry) { if (str_cmp(entry->key, key) == 0) return entry->value; Index: uspace/lib/c/generic/devman.c =================================================================== --- uspace/lib/c/generic/devman.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/lib/c/generic/devman.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -230,9 +230,5 @@ } - match_id_t *match_id = NULL; - - list_foreach(match_ids->ids, link) { - match_id = list_get_instance(link, match_id_t, link); - + list_foreach(match_ids->ids, link, match_id_t, match_id) { ipc_call_t answer2; aid_t req2 = async_send_1(exch, DEVMAN_ADD_MATCH_ID, Index: uspace/lib/c/generic/pio_trace.c =================================================================== --- uspace/lib/c/generic/pio_trace.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/lib/c/generic/pio_trace.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -95,8 +95,5 @@ pio_regions_t *regions = get_regions(); fibril_rwlock_read_lock(®ions->guard); - list_foreach(regions->list, it) { - assert(it); - region_t *reg = region_instance(it); - assert(reg); + list_foreach(regions->list, link, region_t, reg) { if ((r >= reg->base) && (r < reg->base + reg->size)) { if (reg->log) @@ -131,10 +128,8 @@ fibril_rwlock_write_lock(®ions->guard); list_foreach_safe(regions->list, it, next) { - assert(it); region_t *reg = region_instance(it); - assert(reg); if (r >= reg->base && (r < reg->base + reg->size)) { - list_remove(®->link); - region_destroy(reg); + list_remove(®->link); + region_destroy(reg); } } Index: uspace/lib/c/include/adt/list.h =================================================================== --- uspace/lib/c/include/adt/list.h (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/lib/c/include/adt/list.h (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -67,10 +67,12 @@ ((type *) (((void *)(link)) - list_link_to_void(&(((type *) NULL)->member)))) -#define list_foreach(list, iterator) \ - for (link_t *iterator = (list).head.next; \ - iterator != &(list).head; iterator = iterator->next) +#define list_foreach(list, member, itype, iterator) \ + for (itype *iterator = NULL; iterator == NULL; iterator = (itype *) 1) \ + for (link_t *_link = (list).head.next; \ + iterator = list_get_instance(_link, itype, member), \ + _link != &(list).head; _link = _link->next) /** Unlike list_foreach(), allows removing items while traversing a list. - * + * * @code * list_t mylist; @@ -238,5 +240,31 @@ static inline link_t *list_last(list_t *list) { - return ((list->head.prev == &list->head) ? NULL : list->head.prev); + return (list->head.prev == &list->head) ? NULL : list->head.prev; +} + +/** Get next item in list. + * + * @param link Current item link + * @param list List containing @a link + * + * @return Next item or NULL if @a link is the last item. + * + */ +static inline link_t *list_next(link_t *link, const list_t *list) +{ + return (link->next == &list->head) ? NULL : link->next; +} + +/** Get previous item in list. + * + * @param link Current item link + * @param list List containing @a link + * + * @return Previous item or NULL if @a link is the first item. + * + */ +static inline link_t *list_prev(link_t *link, const list_t *list) +{ + return (link->prev == &list->head) ? NULL : link->prev; } @@ -308,9 +336,11 @@ unsigned int cnt = 0; - list_foreach(*list, link) { + link_t *link = list_first(list); + while (link != NULL) { if (cnt == n) return link; cnt++; + link = list_next(link, list); } Index: uspace/lib/c/include/cfg.h =================================================================== --- uspace/lib/c/include/cfg.h (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/lib/c/include/cfg.h (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -80,5 +80,5 @@ #define cfg_file_foreach(file, cur) \ - list_foreach((file)->sections, (cur)) + list_foreach((file)->sections, link, const cfg_section_t, (cur)) #define cfg_section_instance(cur) \ @@ -86,5 +86,5 @@ #define cfg_section_foreach(section, cur) \ - list_foreach((section)->entries, (cur)) + list_foreach((section)->entries, link, const cfg_entry_t, (cur)) #define cfg_entry_instance(cur) \ Index: uspace/lib/draw/drawctx.c =================================================================== --- uspace/lib/draw/drawctx.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/lib/draw/drawctx.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -188,6 +188,5 @@ * transferred to the original surface. */ - list_foreach(*((list_t *) path), link) { - path_step_t *step = (path_step_t *) link; + list_foreach(*((list_t *) path), link, path_step_t, step) { switch (step->type) { case PATH_STEP_MOVETO: Index: uspace/lib/drv/generic/driver.c =================================================================== --- uspace/lib/drv/generic/driver.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/lib/drv/generic/driver.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -98,10 +98,7 @@ static ddf_dev_t *driver_get_device(devman_handle_t handle) { - ddf_dev_t *dev = NULL; - assert(fibril_mutex_is_locked(&devices_mutex)); - list_foreach(devices, link) { - dev = list_get_instance(link, ddf_dev_t, link); + list_foreach(devices, link, ddf_dev_t, dev) { if (dev->handle == handle) return dev; @@ -113,10 +110,7 @@ static ddf_fun_t *driver_get_function(devman_handle_t handle) { - ddf_fun_t *fun = NULL; - assert(fibril_mutex_is_locked(&functions_mutex)); - list_foreach(functions, link) { - fun = list_get_instance(link, ddf_fun_t, link); + list_foreach(functions, link, ddf_fun_t, fun) { if (fun->handle == handle) return fun; Index: uspace/lib/drv/generic/interrupt.c =================================================================== --- uspace/lib/drv/generic/interrupt.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/lib/drv/generic/interrupt.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -138,10 +138,7 @@ interrupt_context_list_t *list, int id) { - interrupt_context_t *ctx; - - fibril_mutex_lock(&list->mutex); - - list_foreach(list->contexts, link) { - ctx = list_get_instance(link, interrupt_context_t, link); + fibril_mutex_lock(&list->mutex); + + list_foreach(list->contexts, link, interrupt_context_t, ctx) { if (ctx->id == id) { fibril_mutex_unlock(&list->mutex); @@ -157,10 +154,7 @@ interrupt_context_list_t *list, ddf_dev_t *dev, int irq) { - interrupt_context_t *ctx; - - fibril_mutex_lock(&list->mutex); - - list_foreach(list->contexts, link) { - ctx = list_get_instance(link, interrupt_context_t, link); + fibril_mutex_lock(&list->mutex); + + list_foreach(list->contexts, link, interrupt_context_t, ctx) { if (ctx->irq == irq && ctx->dev == dev) { fibril_mutex_unlock(&list->mutex); Index: uspace/lib/fs/libfs.c =================================================================== --- uspace/lib/fs/libfs.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/lib/fs/libfs.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -882,8 +882,5 @@ fibril_mutex_lock(&instances_mutex); - list_foreach(instances_list, link) { - fs_instance_t *cur = list_get_instance(link, fs_instance_t, - link); - + list_foreach(instances_list, link, fs_instance_t, cur) { if (cur->service_id == service_id) { fibril_mutex_unlock(&instances_mutex); @@ -908,8 +905,5 @@ { fibril_mutex_lock(&instances_mutex); - list_foreach(instances_list, link) { - fs_instance_t *inst = list_get_instance(link, fs_instance_t, - link); - + list_foreach(instances_list, link, fs_instance_t, inst) { if (inst->service_id == service_id) { *idp = inst->data; @@ -925,8 +919,5 @@ { fibril_mutex_lock(&instances_mutex); - list_foreach(instances_list, link) { - fs_instance_t *inst = list_get_instance(link, fs_instance_t, - link); - + list_foreach(instances_list, link, fs_instance_t, inst) { if (inst->service_id == service_id) { list_remove(&inst->link); Index: uspace/lib/graph/graph.c =================================================================== --- uspace/lib/graph/graph.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/lib/graph/graph.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -165,8 +165,7 @@ fibril_mutex_lock(&visualizer_list_mtx); - list_foreach(visualizer_list, link) { - visualizer_t *cur = list_get_instance(link, visualizer_t, link); - if (cur->reg_svc_handle == handle) { - vs = cur; + list_foreach(visualizer_list, link, visualizer_t, vcur) { + if (vcur->reg_svc_handle == handle) { + vs = vcur; break; } @@ -182,8 +181,7 @@ fibril_mutex_lock(&renderer_list_mtx); - list_foreach(renderer_list, link) { - renderer_t *cur = list_get_instance(link, renderer_t, link); - if (cur->reg_svc_handle == handle) { - rnd = cur; + list_foreach(renderer_list, link, renderer_t, rcur) { + if (rcur->reg_svc_handle == handle) { + rnd = rcur; break; } @@ -322,6 +320,5 @@ fibril_mutex_lock(&vs->mode_mtx); vslmode_list_element_t *mode_elem = NULL; - list_foreach(vs->modes, link) { - vslmode_list_element_t *cur = list_get_instance(link, vslmode_list_element_t, link); + list_foreach(vs->modes, link, vslmode_list_element_t, cur) { if (cur->mode.index == vs->def_mode_idx) { mode_elem = cur; @@ -382,6 +379,5 @@ fibril_mutex_lock(&vs->mode_mtx); vslmode_list_element_t *mode_elem = NULL; - list_foreach(vs->modes, link) { - vslmode_list_element_t *cur = list_get_instance(link, vslmode_list_element_t, link); + list_foreach(vs->modes, link, vslmode_list_element_t, cur) { if (cur->mode.index == mode_idx) { mode_elem = cur; @@ -425,6 +421,5 @@ fibril_mutex_lock(&vs->mode_mtx); vslmode_list_element_t *mode_elem = NULL; - list_foreach(vs->modes, link) { - vslmode_list_element_t *cur = list_get_instance(link, vslmode_list_element_t, link); + list_foreach(vs->modes, link, vslmode_list_element_t, cur) { if (cur->mode.index == mode_idx) { mode_elem = cur; Index: uspace/lib/gui/connection.c =================================================================== --- uspace/lib/gui/connection.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/lib/gui/connection.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -65,6 +65,5 @@ signal_node_t *sig_node = NULL; - list_foreach(connection_list, link) { - signal_node_t *cur = list_get_instance(link, signal_node_t, link); + list_foreach(connection_list, link, signal_node_t, cur) { if (cur->signal == signal) { sig_node = cur; @@ -88,6 +87,5 @@ slot_node_t *slt_node = NULL; - list_foreach(sig_node->slots, link) { - slot_node_t *cur = list_get_instance(link, slot_node_t, link); + list_foreach(sig_node->slots, link, slot_node_t, cur) { if (cur->widget == widget && cur->slot == slot) { slt_node = cur; @@ -121,6 +119,5 @@ signal_node_t *sig_node = NULL; - list_foreach(connection_list, link) { - signal_node_t *cur = list_get_instance(link, signal_node_t, link); + list_foreach(connection_list, link, signal_node_t, cur) { if (cur->signal == signal) { sig_node = cur; @@ -135,6 +132,5 @@ slot_node_t *slt_node = NULL; - list_foreach(sig_node->slots, link) { - slot_node_t *cur = list_get_instance(link, slot_node_t, link); + list_foreach(sig_node->slots, link, slot_node_t, cur) { if (cur->widget == widget && cur->slot == slot) { slt_node = cur; @@ -164,6 +160,5 @@ signal_node_t *sig_node = NULL; - list_foreach(connection_list, link) { - signal_node_t *cur = list_get_instance(link, signal_node_t, link); + list_foreach(connection_list, link, signal_node_t, cur) { if (cur->signal == signal) { sig_node = cur; @@ -177,6 +172,5 @@ } - list_foreach(sig_node->slots, link) { - slot_node_t *cur = list_get_instance(link, slot_node_t, link); + list_foreach(sig_node->slots, link, slot_node_t, cur) { cur->slot(cur->widget, data); } @@ -190,6 +184,5 @@ signal_node_t *sig_node = NULL; - list_foreach(connection_list, link) { - signal_node_t *cur = list_get_instance(link, signal_node_t, link); + list_foreach(connection_list, link, signal_node_t, cur) { if (cur->signal == signal) { sig_node = cur; @@ -203,7 +196,5 @@ } - list_foreach(sig_node->slots, link) { - slot_node_t *cur = list_get_instance(link, slot_node_t, link); - + list_foreach(sig_node->slots, link, slot_node_t, cur) { void *data_copy = NULL; if (data != NULL) { Index: uspace/lib/gui/grid.c =================================================================== --- uspace/lib/gui/grid.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/lib/gui/grid.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -298,6 +298,5 @@ paint_internal(widget); - list_foreach(widget->children, link) { - widget_t *child = list_get_instance(link, widget_t, link); + list_foreach(widget->children, link, widget_t, child) { child->repaint(child); } Index: uspace/lib/gui/terminal.c =================================================================== --- uspace/lib/gui/terminal.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/lib/gui/terminal.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -685,7 +685,5 @@ terminal_t *term = NULL; - list_foreach(terms, link) { - terminal_t *cur = list_get_instance(link, terminal_t, link); - + list_foreach(terms, link, terminal_t, cur) { if (cur->dsid == (service_id_t) IPC_GET_ARG1(*icall)) { term = cur; Index: uspace/lib/gui/window.c =================================================================== --- uspace/lib/gui/window.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/lib/gui/window.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -137,6 +137,5 @@ { if (widget->window->is_decorated) { - list_foreach(widget->children, link) { - widget_t *child = list_get_instance(link, widget_t, link); + list_foreach(widget->children, link, widget_t, child) { child->rearrange(child, widget->hpos + border_thickness, @@ -146,6 +145,5 @@ } } else { - list_foreach(widget->children, link) { - widget_t *child = list_get_instance(link, widget_t, link); + list_foreach(widget->children, link, widget_t, child) { child->rearrange(child, widget->hpos, widget->vpos, widget->width, widget->height); @@ -160,6 +158,5 @@ if (widget->window->is_decorated) { paint_internal(widget); - list_foreach(widget->children, link) { - widget_t *child = list_get_instance(link, widget_t, link); + list_foreach(widget->children, link, widget_t, child) { child->rearrange(child, hpos + border_thickness, @@ -169,6 +166,5 @@ } } else { - list_foreach(widget->children, link) { - widget_t *child = list_get_instance(link, widget_t, link); + list_foreach(widget->children, link, widget_t, child) { child->rearrange(child, hpos, vpos, width, height); } @@ -181,6 +177,5 @@ paint_internal(widget); } - list_foreach(widget->children, link) { - widget_t *child = list_get_instance(link, widget_t, link); + list_foreach(widget->children, link, widget_t, child) { child->repaint(child); } @@ -268,12 +263,10 @@ win_grab(widget->window->osess, event.pos_id, flags); } else { - list_foreach(widget->children, link) { - widget_t *child = list_get_instance(link, widget_t, link); + list_foreach(widget->children, link, widget_t, child) { child->handle_position_event(child, event); } } } else { - list_foreach(widget->children, link) { - widget_t *child = list_get_instance(link, widget_t, link); + list_foreach(widget->children, link, widget_t, child) { child->handle_position_event(child, event); } Index: uspace/lib/usbdev/src/recognise.c =================================================================== --- uspace/lib/usbdev/src/recognise.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/lib/usbdev/src/recognise.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -383,6 +383,5 @@ goto failure; - list_foreach(match_ids.ids, id_link) { - match_id_t *match_id = list_get_instance(id_link, match_id_t, link); + list_foreach(match_ids.ids, link, match_id_t, match_id) { rc = ddf_fun_add_match_id(child, match_id->id, match_id->score); if (rc != EOK) { Index: uspace/lib/usbhid/src/hiddescriptor.c =================================================================== --- uspace/lib/usbhid/src/hiddescriptor.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/lib/usbhid/src/hiddescriptor.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -333,10 +333,6 @@ } - usb_hid_report_description_t *report_des = NULL; - - list_foreach(report->reports, report_it) { - report_des = list_get_instance(report_it, - usb_hid_report_description_t, reports_link); - + list_foreach(report->reports, reports_link, + usb_hid_report_description_t, report_des) { // if report id not set, return the first of the type if(((report_des->report_id == report_id) || (report_id == 0)) && @@ -902,6 +898,4 @@ void usb_hid_descriptor_print_list(list_t *list) { - usb_hid_report_field_t *report_item; - if(list == NULL || list_empty(list)) { usb_log_debug("\tempty\n"); @@ -909,8 +903,6 @@ } - list_foreach(*list, item) { - report_item = list_get_instance(item, usb_hid_report_field_t, - ritems_link); - + list_foreach(*list, ritems_link, usb_hid_report_field_t, + report_item) { usb_log_debug("\t\tOFFSET: %X\n", report_item->offset); usb_log_debug("\t\tSIZE: %zu\n", report_item->size); @@ -937,7 +929,5 @@ usb_log_debug("\n"); - - } - + } } @@ -951,13 +941,9 @@ void usb_hid_descriptor_print(usb_hid_report_t *report) { - if(report == NULL) { + if (report == NULL) return; - } - - usb_hid_report_description_t *report_des; - - list_foreach(report->reports, report_it) { - report_des = list_get_instance(report_it, - usb_hid_report_description_t, reports_link); + + list_foreach(report->reports, reports_link, + usb_hid_report_description_t, report_des) { usb_log_debug("Report ID: %d\n", report_des->report_id); usb_log_debug("\tType: %d\n", report_des->type); Index: uspace/lib/usbhid/src/hidparser.c =================================================================== --- uspace/lib/usbhid/src/hidparser.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/lib/usbhid/src/hidparser.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -130,6 +130,4 @@ size_t size, uint8_t *report_id) { - usb_hid_report_field_t *item; - usb_hid_report_description_t *report_des; usb_hid_report_type_t type = USB_HID_REPORT_TYPE_INPUT; @@ -153,7 +151,6 @@ /* read data */ - list_foreach(report_des->report_items, list_item) { - item = list_get_instance(list_item, usb_hid_report_field_t, - ritems_link); + list_foreach(report_des->report_items, ritems_link, + usb_hid_report_field_t, item) { if (USB_HID_ITEM_FLAG_CONSTANT(item->item_flags) == 0) { @@ -163,5 +160,5 @@ item->value = usb_hid_translate_data(item, data); - + item->usage = USB_HID_EXTENDED_USAGE( item->usages[item->value - @@ -184,6 +181,6 @@ /* variable item */ item->value = usb_hid_translate_data(item, - data); - } + data); + } } } @@ -295,8 +292,6 @@ usb_hid_report_description_t *report_des = NULL; - list_foreach(report->reports, report_it) { - report_des = list_get_instance(report_it, - usb_hid_report_description_t, reports_link); - + list_foreach(report->reports, reports_link, + usb_hid_report_description_t, report_des) { if ((report_des->report_id == report_id) && (report_des->type == USB_HID_REPORT_TYPE_OUTPUT)) { @@ -351,5 +346,5 @@ if (report->use_report_ids != 0) { - buffer[0] = report_id; + buffer[0] = report_id; } @@ -362,10 +357,6 @@ } - usb_hid_report_field_t *report_item; - - list_foreach(report_des->report_items, item) { - report_item = list_get_instance(item, usb_hid_report_field_t, - ritems_link); - + list_foreach(report_des->report_items, ritems_link, + usb_hid_report_field_t, report_item) { value = usb_hid_translate_data_reverse(report_item, report_item->value); @@ -382,7 +373,7 @@ } size_t shift = 8 - offset % 8 - length; - value = value << shift; + value = value << shift; value = value & (((1 << length) - 1) << shift); - + uint8_t mask = 0; mask = 0xff - (((1 << length) - 1) << shift); @@ -400,5 +391,5 @@ tmp_value = tmp_value << (offset % 8); - + mask = ~(((1 << (8 - (offset % 8))) - 1) << (offset % 8)); @@ -413,5 +404,5 @@ value = value & ((1 << (length - ((offset + length) % 8))) - 1); - + mask = (1 << (length - ((offset + length) % 8))) - 1; Index: uspace/lib/usbhid/src/hidpath.c =================================================================== --- uspace/lib/usbhid/src/hidpath.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/lib/usbhid/src/hidpath.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -176,9 +176,6 @@ usb_log_debug("\tLENGTH: %d\n", path->depth); - usb_hid_report_usage_path_t *path_item; - - list_foreach(path->items, item) { - path_item = list_get_instance(item, usb_hid_report_usage_path_t, - rpath_items_link); + list_foreach(path->items, rpath_items_link, + usb_hid_report_usage_path_t, path_item) { usb_log_debug("\tUSAGE_PAGE: %X\n", path_item->usage_page); @@ -237,18 +234,14 @@ usb_hid_report_usage_path_t, rpath_items_link); - list_foreach(report_path->items, report_link) { - report_item = list_get_instance(report_link, - usb_hid_report_usage_path_t, rpath_items_link); + list_foreach(report_path->items, rpath_items_link, + usb_hid_report_usage_path_t, report_item) { + + if (USB_HID_SAME_USAGE_PAGE(report_item->usage_page, + path_item->usage_page)) { - if(USB_HID_SAME_USAGE_PAGE(report_item->usage_page, - path_item->usage_page)){ - - if(only_page == 0){ - if(USB_HID_SAME_USAGE( - report_item->usage, - path_item->usage)) { - + if (only_page == 0) { + if (USB_HID_SAME_USAGE(report_item->usage, + path_item->usage)) return EOK; - } } else { @@ -266,44 +259,39 @@ return 1; } - + /* path is prefix of the report_path */ case USB_HID_PATH_COMPARE_BEGIN: - + report_link = report_path->items.head.next; path_link = path->items.head.next; + + while ((report_link != &report_path->items.head) && + (path_link != &path->items.head)) { - while((report_link != &report_path->items.head) && - (path_link != &path->items.head)) { - report_item = list_get_instance(report_link, - usb_hid_report_usage_path_t, rpath_items_link); - + usb_hid_report_usage_path_t, rpath_items_link); + path_item = list_get_instance(path_link, usb_hid_report_usage_path_t, rpath_items_link); - if(!USB_HID_SAME_USAGE_PAGE(report_item->usage_page, - path_item->usage_page) || ((only_page == 0) && + if (!USB_HID_SAME_USAGE_PAGE(report_item->usage_page, + path_item->usage_page) || ((only_page == 0) && !USB_HID_SAME_USAGE(report_item->usage, - path_item->usage))) { - + path_item->usage))) { return 1; - } - else { + } else { report_link = report_link->next; - path_link = path_link->next; + path_link = path_link->next; } - - } - - if((((flags & USB_HID_PATH_COMPARE_BEGIN) != 0) && - (path_link == &path->items.head)) || - ((report_link == &report_path->items.head) && - (path_link == &path->items.head))) { - + } + + if ((((flags & USB_HID_PATH_COMPARE_BEGIN) != 0) && + (path_link == &path->items.head)) || + ((report_link == &report_path->items.head) && + (path_link == &path->items.head))) { return EOK; - } - else { + } else { return 1; - } + } break; @@ -405,5 +393,4 @@ usb_hid_report_path_t *usage_path) { - usb_hid_report_usage_path_t *path_item; usb_hid_report_usage_path_t *new_path_item; usb_hid_report_path_t *new_usage_path = usb_hid_report_path (); @@ -419,7 +406,6 @@ } - list_foreach(usage_path->items, path_link) { - path_item = list_get_instance(path_link, - usb_hid_report_usage_path_t, rpath_items_link); + list_foreach(usage_path->items, rpath_items_link, + usb_hid_report_usage_path_t, path_item) { new_path_item = malloc(sizeof(usb_hid_report_usage_path_t)); Index: uspace/lib/usbhost/src/usb_endpoint_manager.c =================================================================== --- uspace/lib/usbhost/src/usb_endpoint_manager.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/lib/usbhost/src/usb_endpoint_manager.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -90,6 +90,5 @@ if (address < 0) return NULL; - list_foreach(*get_list(instance, address), iterator) { - endpoint_t *ep = endpoint_get_instance(iterator); + list_foreach(*get_list(instance, address), link, endpoint_t, ep) { if (ep_match(ep, address, endpoint, direction)) return ep; @@ -196,6 +195,6 @@ fibril_mutex_lock(&instance->guard); /* endpoint number is < 16, thus first byte is enough */ - list_foreach(*get_list(instance, target.address), it) { - endpoint_t *ep = endpoint_get_instance(it); + list_foreach(*get_list(instance, target.address), + link, endpoint_t, ep) { if ((ep->address == target.address) && (ep->endpoint = data[4])) { @@ -216,6 +215,6 @@ if ((data[0] & 0xf) == 0) { fibril_mutex_lock(&instance->guard); - list_foreach(*get_list(instance, target.address), it) { - endpoint_t *ep = endpoint_get_instance(it); + list_foreach(*get_list(instance, target.address), + link, endpoint_t, ep) { if (ep->address == target.address) { endpoint_toggle_set(ep,0); @@ -408,11 +407,19 @@ usb_address_t address, void (*callback)(endpoint_t *, void *), void *arg) { + list_t *list; + link_t *link; + link_t *next; + assert(address >= 0); assert(instance); fibril_mutex_lock(&instance->guard); - list_foreach(*get_list(instance, address), iterator) { - endpoint_t *ep = endpoint_get_instance(iterator); + + list = get_list(instance, address); + link = list_first(list); + while (link != NULL) { + endpoint_t *ep = list_get_instance(link, endpoint_t, link); + next = list_next(link, list); + if (ep->address == address) { - iterator = iterator->next; list_remove(&ep->link); if (callback) @@ -420,4 +427,5 @@ endpoint_destroy(ep); } + link = next; } fibril_mutex_unlock(&instance->guard); Index: uspace/srv/audio/hound/audio_sink.c =================================================================== --- uspace/srv/audio/hound/audio_sink.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/srv/audio/hound/audio_sink.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -140,6 +140,5 @@ pcm_format_silence(dest, size, &sink->format); - list_foreach(sink->connections, it) { - connection_t * conn = connection_from_sink_list(it); + list_foreach(sink->connections, sink_link, connection_t, conn) { const int ret = connection_add_source_data( conn, dest, size, sink->format); Index: uspace/srv/audio/hound/audio_source.c =================================================================== --- uspace/srv/audio/hound/audio_source.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/srv/audio/hound/audio_source.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -106,6 +106,5 @@ return ENOMEM; - list_foreach(source->connections, it) { - connection_t *conn = connection_from_source_list(it); + list_foreach(source->connections, source_link, connection_t, conn) { const int ret = connection_push_data(conn, adata); if (ret != EOK) { Index: uspace/srv/audio/hound/connection.h =================================================================== --- uspace/srv/audio/hound/connection.h (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/srv/audio/hound/connection.h (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -76,14 +76,4 @@ * @return pointer to a connection structure, NULL on failure. */ -static inline connection_t * connection_from_sink_list(link_t *l) -{ - return l ? list_get_instance(l, connection_t, sink_link) : NULL; -} - -/** - * List instance helper. - * @param l link - * @return pointer to a connection structure, NULL on failure. - */ static inline connection_t * connection_from_hound_list(link_t *l) { Index: uspace/srv/audio/hound/hound.c =================================================================== --- uspace/srv/audio/hound/hound.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/srv/audio/hound/hound.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -47,20 +47,4 @@ #include "str_error.h" -#define FIND_BY_NAME(type) \ -do { \ - assert(list); \ - assert(name); \ - list_foreach(*list, it) { \ - audio_ ## type ## _t *dev = \ - audio_ ## type ## _list_instance(it); \ - if (str_cmp(name, dev->name) == 0) { \ - log_debug("%s with name '%s' is in the list", \ - #type, name); \ - return dev; \ - } \ - } \ - return NULL; \ -} while (0) - /** * Search devices by name. @@ -68,7 +52,18 @@ * @return Pointer to the found device, NULL on failure. */ -static audio_device_t * find_device_by_name(list_t *list, const char *name) -{ - FIND_BY_NAME(device); +static audio_device_t *find_device_by_name(list_t *list, const char *name) +{ + assert(list); + assert(name); + + list_foreach(*list, link, audio_device_t, dev) { + if (str_cmp(name, dev->name) == 0) { + log_debug("device with name '%s' is in the list", + name); + return dev; + } + } + + return NULL; } @@ -78,7 +73,18 @@ * @return Pointer to the found source, NULL on failure. */ -static audio_source_t * find_source_by_name(list_t *list, const char *name) -{ - FIND_BY_NAME(source); +static audio_source_t *find_source_by_name(list_t *list, const char *name) +{ + assert(list); + assert(name); + + list_foreach(*list, link, audio_source_t, dev) { + if (str_cmp(name, dev->name) == 0) { + log_debug("source with name '%s' is in the list", + name); + return dev; + } + } + + return NULL; } @@ -88,7 +94,18 @@ * @return Pointer to the found sink, NULL on failure. */ -static audio_sink_t * find_sink_by_name(list_t *list, const char *name) -{ - FIND_BY_NAME(sink); +static audio_sink_t *find_sink_by_name(list_t *list, const char *name) +{ + assert(list); + assert(name); + + list_foreach(*list, link, audio_sink_t, dev) { + if (str_cmp(name, dev->name) == 0) { + log_debug("sink with name '%s' is in the list", + name); + return dev; + } + } + + return NULL; } @@ -111,6 +128,6 @@ log_warning("Removing sink '%s' while still connected.", sink->name); while (!list_empty(&sink->connections)) { - connection_t *conn = - connection_from_sink_list(list_first(&sink->connections)); + connection_t *conn = list_get_instance( + list_first(&sink->connections), connection_t, sink_link); list_remove(&conn->hound_link); connection_destroy(conn); @@ -128,13 +145,10 @@ static void hound_remove_source_internal(hound_t *hound, audio_source_t *source) { - assert(hound); - assert(source); log_verbose("Removing source '%s'.", source->name); if (!list_empty(&source->connections)) log_warning("Removing source '%s' while still connected.", source->name); while (!list_empty(&source->connections)) { - connection_t *conn = - connection_from_source_list(list_first(&source->connections)); - assert(conn); + connection_t *conn = list_get_instance( + list_first(&source->connections), connection_t, source_link); list_remove(&conn->hound_link); connection_destroy(conn); @@ -223,6 +237,5 @@ fibril_mutex_lock(&hound->list_guard); hound_ctx_t *res = NULL; - list_foreach(hound->contexts, it) { - hound_ctx_t *ctx = hound_ctx_from_link(it); + list_foreach(hound->contexts, link, hound_ctx_t, ctx) { if (hound_ctx_get_id(ctx) == id) { res = ctx; @@ -251,6 +264,5 @@ } - list_foreach(hound->devices, it) { - audio_device_t *dev = audio_device_list_instance(it); + list_foreach(hound->devices, link, audio_device_t, dev) { if (dev->id == id) { log_debug("Device with id %zu is already present", id); Index: uspace/srv/audio/hound/hound_ctx.c =================================================================== --- uspace/srv/audio/hound/hound_ctx.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/srv/audio/hound/hound_ctx.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -176,14 +176,4 @@ /** - * List instance helper. - * @param l link - * @return pointer to a hound context structure, NULL on failure. - */ -static inline hound_ctx_stream_t *hound_ctx_stream_from_link(link_t *l) -{ - return l ? list_get_instance(l, hound_ctx_stream_t, link) : NULL; -} - -/** * New stream append helper. * @param ctx hound context. @@ -417,6 +407,5 @@ pcm_format_silence(buffer, size, &source->format); fibril_mutex_lock(&ctx->guard); - list_foreach(ctx->streams, it) { - hound_ctx_stream_t *stream = hound_ctx_stream_from_link(it); + list_foreach(ctx->streams, link, hound_ctx_stream_t, stream) { ssize_t copied = hound_ctx_stream_add_self( stream, buffer, size, &source->format); @@ -426,6 +415,5 @@ log_verbose("CTX: %p. Pushing audio to %u connections", ctx, list_count(&source->connections)); - list_foreach(source->connections, it) { - connection_t *conn = connection_from_source_list(it); + list_foreach(source->connections, source_link, connection_t, conn) { connection_push_data(conn, adata); } @@ -444,6 +432,5 @@ /* count available data */ size_t available_frames = -1; /* this is ugly.... */ - list_foreach(sink->connections, it) { - connection_t *conn = connection_from_source_list(it); + list_foreach(sink->connections, source_link, connection_t, conn) { available_frames = min(available_frames, audio_pipe_frames(&conn->fifo)); @@ -466,6 +453,5 @@ /* mix data */ pcm_format_silence(buffer, bsize, &sink->format); - list_foreach(sink->connections, it) { - connection_t *conn = connection_from_source_list(it); + list_foreach(sink->connections, source_link, connection_t, conn) { /* This should not trigger data update on the source */ const size_t copied = connection_add_source_data( @@ -476,6 +462,5 @@ } /* push to all streams */ - list_foreach(ctx->streams, it) { - hound_ctx_stream_t *stream = hound_ctx_stream_from_link(it); + list_foreach(ctx->streams, link, hound_ctx_stream_t, stream) { const int ret = stream_push_data(stream, adata); if (ret != EOK) Index: uspace/srv/audio/hound/hound_ctx.h =================================================================== --- uspace/srv/audio/hound/hound_ctx.h (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/srv/audio/hound/hound_ctx.h (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -58,14 +58,4 @@ } hound_ctx_t; -/** - * List instance helper. - * @param l link - * @return pointer to a hound context structure, NULL on failure. - */ -static inline hound_ctx_t *hound_ctx_from_link(link_t *l) -{ - return l ? list_get_instance(l, hound_ctx_t, link) : NULL; -} - typedef struct hound_ctx_stream hound_ctx_stream_t; Index: uspace/srv/devman/dev.c =================================================================== --- uspace/srv/devman/dev.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/srv/devman/dev.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -144,8 +144,5 @@ size_t pos = 0; - list_foreach(dev->functions, item) { - fun_node_t *fun = - list_get_instance(item, fun_node_t, dev_functions); - + list_foreach(dev->functions, dev_functions, fun_node_t, fun) { if (pos < buf_cnt) { hdl_buf[pos] = fun->handle; Index: uspace/srv/devman/driver.c =================================================================== --- uspace/srv/devman/driver.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/srv/devman/driver.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -210,11 +210,10 @@ driver_t *find_best_match_driver(driver_list_t *drivers_list, dev_node_t *node) { - driver_t *best_drv = NULL, *drv = NULL; + driver_t *best_drv = NULL; int best_score = 0, score = 0; fibril_mutex_lock(&drivers_list->drivers_mutex); - list_foreach(drivers_list->drivers, link) { - drv = list_get_instance(link, driver_t, drivers); + list_foreach(drivers_list->drivers, drivers, driver_t, drv) { score = get_match_score(drv, node); if (score > best_score) { @@ -310,10 +309,8 @@ { driver_t *res = NULL; - driver_t *drv = NULL; fibril_mutex_lock(&drv_list->drivers_mutex); - list_foreach(drv_list->drivers, link) { - drv = list_get_instance(link, driver_t, drivers); + list_foreach(drv_list->drivers, drivers, driver_t, drv) { if (str_cmp(drv->name, drv_name) == 0) { res = drv; Index: uspace/srv/devman/fun.c =================================================================== --- uspace/srv/devman/fun.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/srv/devman/fun.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -255,9 +255,5 @@ assert(fibril_rwlock_is_locked(&tree->rwlock)); - fun_node_t *fun; - - list_foreach(dev->functions, link) { - fun = list_get_instance(link, fun_node_t, dev_functions); - + list_foreach(dev->functions, dev_functions, fun_node_t, fun) { if (str_cmp(name, fun->name) == 0) { fun_add_ref(fun); Index: uspace/srv/fs/cdfs/cdfs_ops.c =================================================================== --- uspace/srv/fs/cdfs/cdfs_ops.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/srv/fs/cdfs/cdfs_ops.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -365,8 +365,5 @@ /* Check for duplicate entries */ - list_foreach(parent->cs_list, link) { - cdfs_dentry_t *dentry = - list_get_instance(link, cdfs_dentry_t, link); - + list_foreach(parent->cs_list, link, cdfs_dentry_t, dentry) { if (str_cmp(dentry->name, name) == 0) return EEXIST; @@ -524,8 +521,5 @@ } - list_foreach(parent->cs_list, link) { - cdfs_dentry_t *dentry = - list_get_instance(link, cdfs_dentry_t, link); - + list_foreach(parent->cs_list, link, cdfs_dentry_t, dentry) { if (str_cmp(dentry->name, component) == 0) { *fn = get_cached_node(parent->service_id, dentry->index); Index: uspace/srv/fs/exfat/exfat_idx.c =================================================================== --- uspace/srv/fs/exfat/exfat_idx.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/srv/fs/exfat/exfat_idx.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -88,11 +88,8 @@ static unused_t *unused_find(service_id_t service_id, bool lock) { - unused_t *u; - if (lock) fibril_mutex_lock(&unused_lock); - list_foreach(unused_list, l) { - u = list_get_instance(l, unused_t, link); + list_foreach(unused_list, link, unused_t, u) { if (u->service_id == service_id) return u; Index: uspace/srv/fs/exfat/exfat_ops.c =================================================================== --- uspace/srv/fs/exfat/exfat_ops.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/srv/fs/exfat/exfat_ops.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -155,5 +155,4 @@ static int exfat_node_fini_by_service_id(service_id_t service_id) { - exfat_node_t *nodep; int rc; @@ -166,6 +165,5 @@ restart: fibril_mutex_lock(&ffn_mutex); - list_foreach(ffn_list, lnk) { - nodep = list_get_instance(lnk, exfat_node_t, ffn_link); + list_foreach(ffn_list, ffn_link, exfat_node_t, nodep) { if (!fibril_mutex_trylock(&nodep->lock)) { fibril_mutex_unlock(&ffn_mutex); Index: uspace/srv/fs/ext4fs/ext4fs_ops.c =================================================================== --- uspace/srv/fs/ext4fs/ext4fs_ops.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/srv/fs/ext4fs/ext4fs_ops.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -194,8 +194,5 @@ } - list_foreach(instance_list, link) { - ext4fs_instance_t *tmp = - list_get_instance(link, ext4fs_instance_t, link); - + list_foreach(instance_list, link, ext4fs_instance_t, tmp) { if (tmp->service_id == service_id) { *inst = tmp; Index: uspace/srv/fs/fat/fat_idx.c =================================================================== --- uspace/srv/fs/fat/fat_idx.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/srv/fs/fat/fat_idx.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -88,11 +88,8 @@ static unused_t *unused_find(service_id_t service_id, bool lock) { - unused_t *u; - if (lock) fibril_mutex_lock(&unused_lock); - list_foreach(unused_list, l) { - u = list_get_instance(l, unused_t, link); + list_foreach(unused_list, link, unused_t, u) { if (u->service_id == service_id) return u; Index: uspace/srv/fs/fat/fat_ops.c =================================================================== --- uspace/srv/fs/fat/fat_ops.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/srv/fs/fat/fat_ops.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -149,5 +149,4 @@ static int fat_node_fini_by_service_id(service_id_t service_id) { - fat_node_t *nodep; int rc; @@ -160,6 +159,5 @@ restart: fibril_mutex_lock(&ffn_mutex); - list_foreach(ffn_list, lnk) { - nodep = list_get_instance(lnk, fat_node_t, ffn_link); + list_foreach(ffn_list, ffn_link, fat_node_t, nodep) { if (!fibril_mutex_trylock(&nodep->lock)) { fibril_mutex_unlock(&ffn_mutex); Index: uspace/srv/fs/tmpfs/tmpfs_ops.c =================================================================== --- uspace/srv/fs/tmpfs/tmpfs_ops.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/srv/fs/tmpfs/tmpfs_ops.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -259,7 +259,5 @@ tmpfs_node_t *parentp = TMPFS_NODE(pfn); - list_foreach(parentp->cs_list, lnk) { - tmpfs_dentry_t *dentryp; - dentryp = list_get_instance(lnk, tmpfs_dentry_t, link); + list_foreach(parentp->cs_list, link, tmpfs_dentry_t, dentryp) { if (!str_cmp(dentryp->name, component)) { *rfn = FS_NODE(dentryp->node); @@ -365,7 +363,6 @@ /* Check for duplicit entries. */ - list_foreach(parentp->cs_list, lnk) { - dentryp = list_get_instance(lnk, tmpfs_dentry_t, link); - if (!str_cmp(dentryp->name, nm)) + list_foreach(parentp->cs_list, link, tmpfs_dentry_t, dp) { + if (!str_cmp(dp->name, nm)) return EEXIST; } @@ -400,8 +397,8 @@ if (!parentp) return EBUSY; - - list_foreach(parentp->cs_list, lnk) { - dentryp = list_get_instance(lnk, tmpfs_dentry_t, link); - if (!str_cmp(dentryp->name, nm)) { + + list_foreach(parentp->cs_list, link, tmpfs_dentry_t, dp) { + if (!str_cmp(dp->name, nm)) { + dentryp = dp; childp = dentryp->node; assert(FS_NODE(childp) == cfn); Index: uspace/srv/hid/compositor/compositor.c =================================================================== --- uspace/srv/hid/compositor/compositor.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/srv/hid/compositor/compositor.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -335,6 +335,5 @@ } - list_foreach(viewport_list, link) { - viewport_t *vp = list_get_instance(link, viewport_t, link); + list_foreach(viewport_list, link, viewport_t, vp) { sysarg_t w_vp, h_vp; surface_get_resolution(vp->surface, &w_vp, &h_vp); @@ -354,6 +353,5 @@ fibril_mutex_lock(&pointer_list_mtx); - list_foreach(pointer_list, link) { - pointer_t *ptr = list_get_instance(link, pointer_t, link); + list_foreach(pointer_list, link, pointer_t, ptr) { ptr->pos.x = ptr->pos.x > viewport_bound_rect.x ? ptr->pos.x : viewport_bound_rect.x; ptr->pos.y = ptr->pos.y > viewport_bound_rect.y ? ptr->pos.y : viewport_bound_rect.y; @@ -374,8 +372,6 @@ fibril_mutex_lock(&pointer_list_mtx); - list_foreach(viewport_list, link) { - + list_foreach(viewport_list, link, viewport_t, vp) { /* Determine what part of the viewport must be updated. */ - viewport_t *vp = list_get_instance(link, viewport_t, link); sysarg_t x_dmg_vp, y_dmg_vp, w_dmg_vp, h_dmg_vp; surface_get_resolution(vp->surface, &w_dmg_vp, &h_dmg_vp); @@ -446,7 +442,5 @@ } - list_foreach(pointer_list, link) { - - pointer_t *ptr = list_get_instance(link, pointer_t, link); + list_foreach(pointer_list, link, pointer_t, ptr) { if (ptr->ghost.surface) { @@ -522,9 +516,8 @@ } - list_foreach(pointer_list, link) { + list_foreach(pointer_list, link, pointer_t, ptr) { /* Determine what part of the pointer intersects with the * updated area of the current viewport. */ - pointer_t *ptr = list_get_instance(link, pointer_t, link); sysarg_t x_dmg_ptr, y_dmg_ptr, w_dmg_ptr, h_dmg_ptr; surface_t *sf_ptr = ptr->cursor.states[ptr->state]; @@ -569,6 +562,5 @@ /* Notify visualizers about updated regions. */ - list_foreach(viewport_list, link) { - viewport_t *vp = list_get_instance(link, viewport_t, link); + list_foreach(viewport_list, link, viewport_t, vp) { sysarg_t x_dmg_vp, y_dmg_vp, w_dmg_vp, h_dmg_vp; surface_get_damaged_region(vp->surface, &x_dmg_vp, &y_dmg_vp, &w_dmg_vp, &h_dmg_vp); @@ -631,6 +623,5 @@ fibril_mutex_lock(&pointer_list_mtx); - list_foreach(pointer_list, link) { - pointer_t *pointer = list_get_instance(link, pointer_t, link); + list_foreach(pointer_list, link, pointer_t, pointer) { if (pointer->id == pos_id) { pointer->grab_flags = pointer->pressed ? grab_flags : GF_EMPTY; @@ -710,15 +701,15 @@ { fibril_mutex_lock(&window_list_mtx); - window_t *window = NULL; - list_foreach(window_list, link) { - window = list_get_instance(link, window_t, link); + + list_foreach(window_list, link, window_t, window) { if (window == target) { prodcons_produce(&window->queue, &event->link); - } - } - if (!window) { - free(event); - } + fibril_mutex_unlock(&window_list_mtx); + return; + } + } + fibril_mutex_unlock(&window_list_mtx); + free(event); } @@ -863,6 +854,5 @@ window_t *win = NULL; fibril_mutex_lock(&window_list_mtx); - list_foreach(window_list, link) { - window_t *cur = list_get_instance(link, window_t, link); + list_foreach(window_list, link, window_t, cur) { if (cur->in_dsid == service_id || cur->out_dsid == service_id) { win = cur; @@ -1007,6 +997,5 @@ /* Close all clients and their windows. */ fibril_mutex_lock(&window_list_mtx); - list_foreach(window_list, link) { - window_t *win = list_get_instance(link, window_t, link); + list_foreach(window_list, link, window_t, win) { window_event_t *event = (window_event_t *) malloc(sizeof(window_event_t)); if (event) { @@ -1034,6 +1023,5 @@ viewport_t *vp = NULL; fibril_mutex_lock(&viewport_list_mtx); - list_foreach(viewport_list, link) { - viewport_t *cur = list_get_instance(link, viewport_t, link); + list_foreach(viewport_list, link, viewport_t, cur) { if (cur->dsid == (service_id_t) IPC_GET_ARG1(*icall)) { vp = cur; @@ -1571,6 +1559,6 @@ /* Determine the window which the mouse click belongs to. */ - list_foreach(window_list, link) { - win = list_get_instance(link, window_t, link); + list_foreach(window_list, link, window_t, cw) { + win = cw; if (win->surface) { surface_get_resolution(win->surface, &width, &height); Index: uspace/srv/hid/input/input.c =================================================================== --- uspace/srv/hid/input/input.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/srv/hid/input/input.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -470,8 +470,5 @@ { /* For each keyboard device */ - list_foreach(kbd_devs, kdev_link) { - kbd_dev_t *kdev = list_get_instance(kdev_link, kbd_dev_t, - kbd_devs); - + list_foreach(kbd_devs, kbd_devs, kbd_dev_t, kdev) { /* Yield port */ if (kdev->port_ops != NULL) @@ -483,8 +480,5 @@ { /* For each keyboard device */ - list_foreach(kbd_devs, kdev_link) { - kbd_dev_t *kdev = list_get_instance(kdev_link, kbd_dev_t, - kbd_devs); - + list_foreach(kbd_devs, kbd_devs, kbd_dev_t, kdev) { /* Reclaim port */ if (kdev->port_ops != NULL) @@ -521,7 +515,5 @@ /* Determine whether we already know this device. */ - list_foreach(kbd_devs, kdev_link) { - kbd_dev_t *kdev = list_get_instance(kdev_link, - kbd_dev_t, kbd_devs); + list_foreach(kbd_devs, kbd_devs, kbd_dev_t, kdev) { if (kdev->svc_id == svcs[i]) { already_known = true; @@ -574,7 +566,5 @@ /* Determine whether we already know this device. */ - list_foreach(mouse_devs, mdev_link) { - mouse_dev_t *mdev = list_get_instance(mdev_link, - mouse_dev_t, mouse_devs); + list_foreach(mouse_devs, mouse_devs, mouse_dev_t, mdev) { if (mdev->svc_id == svcs[i]) { already_known = true; Index: uspace/srv/hid/output/output.c =================================================================== --- uspace/srv/hid/output/output.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/srv/hid/output/output.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -82,7 +82,5 @@ int ret = EOK; - list_foreach(outdevs, link) { - outdev_t *dev = list_get_instance(link, outdev_t, link); - + list_foreach(outdevs, link, outdev_t, dev) { assert(dev->ops.yield); @@ -99,7 +97,5 @@ int ret = EOK; - list_foreach(outdevs, link) { - outdev_t *dev = list_get_instance(link, outdev_t, link); - + list_foreach(outdevs, link, outdev_t, dev) { assert(dev->ops.claim); @@ -117,7 +113,5 @@ sysarg_t rows = MAX_ROWS; - list_foreach(outdevs, link) { - outdev_t *dev = list_get_instance(link, outdev_t, link); - + list_foreach(outdevs, link, outdev_t, dev) { cols = min(cols, dev->cols); rows = min(rows, dev->rows); @@ -131,7 +125,5 @@ console_caps_t caps = 0; - list_foreach(outdevs, link) { - outdev_t *dev = list_get_instance(link, outdev_t, link); - + list_foreach(outdevs, link, outdev_t, dev) { assert(dev->ops.get_caps); @@ -145,6 +137,5 @@ { frontbuf_t *frontbuf = NULL; - list_foreach(frontbufs, link) { - frontbuf_t *cur = list_get_instance(link, frontbuf_t, link); + list_foreach(frontbufs, link, frontbuf_t, cur) { if (cur == (frontbuf_t *) handle) { frontbuf = cur; @@ -216,7 +207,5 @@ chargrid_get_cursor(buf, &col, &row); - list_foreach(outdevs, link) { - outdev_t *dev = list_get_instance(link, outdev_t, link); - + list_foreach(outdevs, link, outdev_t, dev) { assert(dev->ops.cursor_update); @@ -237,7 +226,5 @@ static void srv_set_style(ipc_callid_t iid, ipc_call_t *icall) { - list_foreach(outdevs, link) { - outdev_t *dev = list_get_instance(link, outdev_t, link); - + list_foreach(outdevs, link, outdev_t, dev) { dev->attrs.type = CHAR_ATTR_STYLE; dev->attrs.val.style = @@ -250,7 +237,5 @@ static void srv_set_color(ipc_callid_t iid, ipc_call_t *icall) { - list_foreach(outdevs, link) { - outdev_t *dev = list_get_instance(link, outdev_t, link); - + list_foreach(outdevs, link, outdev_t, dev) { dev->attrs.type = CHAR_ATTR_INDEX; dev->attrs.val.index.bgcolor = @@ -267,7 +252,5 @@ static void srv_set_rgb_color(ipc_callid_t iid, ipc_call_t *icall) { - list_foreach(outdevs, link) { - outdev_t *dev = list_get_instance(link, outdev_t, link); - + list_foreach(outdevs, link, outdev_t, dev) { dev->attrs.type = CHAR_ATTR_RGB; dev->attrs.val.rgb.bgcolor = IPC_GET_ARG1(*icall); @@ -325,7 +308,5 @@ chargrid_t *buf = (chargrid_t *) frontbuf->data; - list_foreach(outdevs, link) { - outdev_t *dev = list_get_instance(link, outdev_t, link); - + list_foreach(outdevs, link, outdev_t, dev) { assert(dev->ops.char_update); @@ -374,7 +355,5 @@ chargrid_t *buf = (chargrid_t *) frontbuf->data; - list_foreach(outdevs, link) { - outdev_t *dev = list_get_instance(link, outdev_t, link); - + list_foreach(outdevs, link, outdev_t, dev) { assert(dev->ops.char_update); Index: uspace/srv/hid/remcons/user.c =================================================================== --- uspace/srv/hid/remcons/user.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/srv/hid/remcons/user.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -128,6 +128,5 @@ fibril_mutex_lock(&users_guard); - list_foreach(users, link) { - telnet_user_t *tmp = list_get_instance(link, telnet_user_t, link); + list_foreach(users, link, telnet_user_t, tmp) { if (tmp->service_id == id) { user = tmp; Index: uspace/srv/locsrv/category.c =================================================================== --- uspace/srv/locsrv/category.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/srv/locsrv/category.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -73,8 +73,5 @@ size_t pos = 0; - list_foreach(cdir->categories, item) { - category_t *cat = - list_get_instance(item, category_t, cat_list); - + list_foreach(cdir->categories, cat_list, category_t, cat) { if (pos < buf_cnt) id_buf[pos] = cat->id; @@ -116,7 +113,5 @@ /* Verify that category does not contain this service yet. */ - list_foreach(cat->svc_memb, item) { - svc_categ_t *memb = list_get_instance(item, svc_categ_t, - cat_link); + list_foreach(cat->svc_memb, cat_link, svc_categ_t, memb) { if (memb->svc == svc) { return EEXIST; @@ -154,7 +149,5 @@ assert(fibril_mutex_is_locked(&cdir->mutex)); - list_foreach(cdir->categories, item) { - category_t *cat = list_get_instance(item, category_t, - cat_list); + list_foreach(cdir->categories, cat_list, category_t, cat) { if (cat->id == catid) return cat; @@ -169,7 +162,5 @@ assert(fibril_mutex_is_locked(&cdir->mutex)); - list_foreach(cdir->categories, item) { - category_t *cat = list_get_instance(item, category_t, - cat_list); + list_foreach(cdir->categories, cat_list, category_t, cat) { if (str_cmp(cat->name, name) == 0) return cat; @@ -197,8 +188,5 @@ size_t pos = 0; - list_foreach(cat->svc_memb, item) { - svc_categ_t *memb = - list_get_instance(item, svc_categ_t, cat_link); - + list_foreach(cat->svc_memb, cat_link, svc_categ_t, memb) { if (pos < buf_cnt) id_buf[pos] = memb->svc->id; Index: uspace/srv/locsrv/locsrv.c =================================================================== --- uspace/srv/locsrv/locsrv.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/srv/locsrv/locsrv.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -184,7 +184,5 @@ assert(fibril_mutex_is_locked(&services_list_mutex)); - list_foreach(namespaces_list, item) { - loc_namespace_t *namespace = - list_get_instance(item, loc_namespace_t, namespaces); + list_foreach(namespaces_list, namespaces, loc_namespace_t, namespace) { if (str_cmp(namespace->name, name) == 0) return namespace; @@ -203,7 +201,5 @@ assert(fibril_mutex_is_locked(&services_list_mutex)); - list_foreach(namespaces_list, item) { - loc_namespace_t *namespace = - list_get_instance(item, loc_namespace_t, namespaces); + list_foreach(namespaces_list, namespaces, loc_namespace_t, namespace) { if (namespace->id == id) return namespace; @@ -219,7 +215,5 @@ assert(fibril_mutex_is_locked(&services_list_mutex)); - list_foreach(services_list, item) { - loc_service_t *service = - list_get_instance(item, loc_service_t, services); + list_foreach(services_list, services, loc_service_t, service) { if ((str_cmp(service->namespace->name, ns_name) == 0) && (str_cmp(service->name, name) == 0)) @@ -239,7 +233,5 @@ assert(fibril_mutex_is_locked(&services_list_mutex)); - list_foreach(services_list, item) { - loc_service_t *service = - list_get_instance(item, loc_service_t, services); + list_foreach(services_list, services, loc_service_t, service) { if (service->id == id) return service; @@ -889,9 +881,5 @@ fibril_mutex_lock(&callback_sess_mutex); - list_foreach(callback_sess_list, link) { - cb_sess_t *cb_sess; - - cb_sess = list_get_instance(link, cb_sess_t, cb_sess_list); - + list_foreach(callback_sess_list, cb_sess_list, cb_sess_t, cb_sess) { async_exch_t *exch = async_exchange_begin(cb_sess->sess); async_msg_0(exch, LOC_EVENT_CAT_CHANGE); @@ -1050,8 +1038,5 @@ size_t pos = 0; - list_foreach(namespaces_list, item) { - loc_namespace_t *namespace = - list_get_instance(item, loc_namespace_t, namespaces); - + list_foreach(namespaces_list, namespaces, loc_namespace_t, namespace) { desc[pos].id = namespace->id; str_cpy(desc[pos].name, LOC_NAME_MAXLEN, namespace->name); @@ -1114,8 +1099,5 @@ size_t pos = 0; - list_foreach(services_list, item) { - loc_service_t *service = - list_get_instance(item, loc_service_t, services); - + list_foreach(services_list, services, loc_service_t, service) { if (service->namespace == namespace) { desc[pos].id = service->id; Index: uspace/srv/logger/logs.c =================================================================== --- uspace/srv/logger/logs.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/srv/logger/logs.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -44,6 +44,5 @@ static logger_log_t *find_log_by_name_and_parent_no_list_lock(const char *name, logger_log_t *parent) { - list_foreach(log_list, it) { - logger_log_t *log = list_get_instance(it, logger_log_t, link); + list_foreach(log_list, link, logger_log_t, log) { if ((parent == log->parent) && (str_cmp(log->name, name) == 0)) return log; @@ -148,6 +147,5 @@ fibril_mutex_lock(&log_list_guard); - list_foreach(log_list, it) { - logger_log_t *log = list_get_instance(it, logger_log_t, link); + list_foreach(log_list, link, logger_log_t, log) { if (str_cmp(log->full_name, name) == 0) { fibril_mutex_lock(&log->guard); @@ -166,6 +164,5 @@ fibril_mutex_lock(&log_list_guard); - list_foreach(log_list, it) { - logger_log_t *log = list_get_instance(it, logger_log_t, link); + list_foreach(log_list, link, logger_log_t, log) { if ((sysarg_t) log == id) { fibril_mutex_lock(&log->guard); Index: uspace/srv/net/dnsrsrv/dns_msg.c =================================================================== --- uspace/srv/net/dnsrsrv/dns_msg.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/srv/net/dnsrsrv/dns_msg.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -510,6 +510,5 @@ size = sizeof(dns_header_t); - list_foreach(msg->question, link) { - dns_question_t *q = list_get_instance(link, dns_question_t, msg); + list_foreach(msg->question, msg, dns_question_t, q) { rc = dns_question_encode(q, NULL, 0, &q_size); if (rc != EOK) @@ -526,6 +525,5 @@ di = sizeof(dns_header_t); - list_foreach(msg->question, link) { - dns_question_t *q = list_get_instance(link, dns_question_t, msg); + list_foreach(msg->question, msg, dns_question_t, q) { rc = dns_question_encode(q, data + di, size - di, &q_size); if (rc != EOK) { Index: uspace/srv/net/dnsrsrv/query.c =================================================================== --- uspace/srv/net/dnsrsrv/query.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/srv/net/dnsrsrv/query.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -99,7 +99,5 @@ } - list_foreach(amsg->answer, link) { - dns_rr_t *rr = list_get_instance(link, dns_rr_t, msg); - + list_foreach(amsg->answer, msg, dns_rr_t, rr) { log_msg(LOG_DEFAULT, LVL_DEBUG, " - '%s' %u/%u, dsize %zu", rr->name, rr->rtype, rr->rclass, rr->rdata_size); Index: uspace/srv/net/dnsrsrv/transport.c =================================================================== --- uspace/srv/net/dnsrsrv/transport.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/srv/net/dnsrsrv/transport.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -158,7 +158,5 @@ assert(fibril_mutex_is_locked(&treq_lock)); - list_foreach(treq_list, link) { - trans_req_t *treq = list_get_instance(link, trans_req_t, lreq); - + list_foreach(treq_list, lreq, trans_req_t, treq) { if (treq->req->id == resp->id) { /* Match */ Index: uspace/srv/net/ethip/atrans.c =================================================================== --- uspace/srv/net/ethip/atrans.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/srv/net/ethip/atrans.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -51,8 +51,5 @@ static ethip_atrans_t *atrans_find(addr32_t ip_addr) { - list_foreach(atrans_list, link) { - ethip_atrans_t *atrans = list_get_instance(link, - ethip_atrans_t, atrans_list); - + list_foreach(atrans_list, atrans_list, ethip_atrans_t, atrans) { if (atrans->ip_addr == ip_addr) return atrans; Index: uspace/srv/net/ethip/ethip_nic.c =================================================================== --- uspace/srv/net/ethip/ethip_nic.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/srv/net/ethip/ethip_nic.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -84,7 +84,5 @@ already_known = false; - list_foreach(ethip_nic_list, link) { - ethip_nic_t *nic = list_get_instance(link, - ethip_nic_t, link); + list_foreach(ethip_nic_list, link, ethip_nic_t, nic) { if (nic->svc_id == svcs[i]) { already_known = true; @@ -313,8 +311,6 @@ (unsigned) iplink_sid); - list_foreach(ethip_nic_list, link) { + list_foreach(ethip_nic_list, link, ethip_nic_t, nic) { log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_find_by_iplink_sid - element"); - ethip_nic_t *nic = list_get_instance(link, ethip_nic_t, link); - if (nic->iplink_sid == iplink_sid) { log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_find_by_iplink_sid - found %p", nic); @@ -350,8 +346,5 @@ size_t count = 0; - list_foreach(nic->addr_list, link) { - ethip_link_addr_t *laddr = list_get_instance(link, - ethip_link_addr_t, link); - + list_foreach(nic->addr_list, link, ethip_link_addr_t, laddr) { uint16_t af = inet_addr_get(&laddr->addr, NULL, NULL); if (af == AF_INET6) @@ -371,8 +364,5 @@ size_t i = 0; - list_foreach(nic->addr_list, link) { - ethip_link_addr_t *laddr = list_get_instance(link, - ethip_link_addr_t, link); - + list_foreach(nic->addr_list, link, ethip_link_addr_t, laddr) { addr128_t v6; uint16_t af = inet_addr_get(&laddr->addr, NULL, &v6); @@ -444,8 +434,5 @@ log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_addr_find()"); - list_foreach(nic->addr_list, link) { - ethip_link_addr_t *laddr = list_get_instance(link, - ethip_link_addr_t, link); - + list_foreach(nic->addr_list, link, ethip_link_addr_t, laddr) { if (inet_addr_compare(addr, &laddr->addr)) return laddr; Index: uspace/srv/net/inetsrv/addrobj.c =================================================================== --- uspace/srv/net/inetsrv/addrobj.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/srv/net/inetsrv/addrobj.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -115,8 +115,5 @@ fibril_mutex_lock(&addr_list_lock); - list_foreach(addr_list, link) { - inet_addrobj_t *naddr = list_get_instance(link, - inet_addrobj_t, addr_list); - + list_foreach(addr_list, addr_list, inet_addrobj_t, naddr) { switch (find) { case iaf_net: @@ -158,8 +155,5 @@ name, ilink->svc_name); - list_foreach(addr_list, link) { - inet_addrobj_t *naddr = list_get_instance(link, - inet_addrobj_t, addr_list); - + list_foreach(addr_list, addr_list, inet_addrobj_t, naddr) { if (naddr->ilink == ilink && str_cmp(naddr->name, name) == 0) { log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_addrobj_find_by_name_locked: found %p", @@ -206,8 +200,5 @@ fibril_mutex_lock(&addr_list_lock); - list_foreach(addr_list, link) { - inet_addrobj_t *naddr = list_get_instance(link, - inet_addrobj_t, addr_list); - + list_foreach(addr_list, addr_list, inet_addrobj_t, naddr) { if (naddr->id == id) { fibril_mutex_unlock(&addr_list_lock); @@ -277,8 +268,5 @@ i = 0; - list_foreach(addr_list, link) { - inet_addrobj_t *addr = list_get_instance(link, - inet_addrobj_t, addr_list); - + list_foreach(addr_list, addr_list, inet_addrobj_t, addr) { id_list[i++] = addr->id; } Index: uspace/srv/net/inetsrv/inet_link.c =================================================================== --- uspace/srv/net/inetsrv/inet_link.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/srv/net/inetsrv/inet_link.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -140,7 +140,5 @@ already_known = false; - list_foreach(inet_link_list, ilink_link) { - inet_link_t *ilink = list_get_instance(ilink_link, - inet_link_t, link_list); + list_foreach(inet_link_list, link_list, inet_link_t, ilink) { if (ilink->svc_id == svcs[i]) { already_known = true; @@ -492,8 +490,5 @@ fibril_mutex_lock(&inet_discovery_lock); - list_foreach(inet_link_list, elem) { - inet_link_t *ilink = list_get_instance(elem, inet_link_t, - link_list); - + list_foreach(inet_link_list, link_list, inet_link_t, ilink) { if (ilink->svc_id == link_id) { fibril_mutex_unlock(&inet_discovery_lock); Index: uspace/srv/net/inetsrv/inetping.c =================================================================== --- uspace/srv/net/inetsrv/inetping.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/srv/net/inetsrv/inetping.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -82,8 +82,5 @@ fibril_mutex_lock(&client_list_lock); - list_foreach(client_list, link) { - inetping_client_t *client = list_get_instance(link, - inetping_client_t, client_list); - + list_foreach(client_list, client_list, inetping_client_t, client) { if (client->ident == ident) { fibril_mutex_unlock(&client_list_lock); Index: uspace/srv/net/inetsrv/inetping6.c =================================================================== --- uspace/srv/net/inetsrv/inetping6.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/srv/net/inetsrv/inetping6.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -82,8 +82,5 @@ fibril_mutex_lock(&client_list_lock); - list_foreach(client_list, link) { - inetping6_client_t *client = list_get_instance(link, - inetping6_client_t, client_list); - + list_foreach(client_list, client_list, inetping6_client_t, client) { if (client->ident == ident) { fibril_mutex_unlock(&client_list_lock); Index: uspace/srv/net/inetsrv/inetsrv.c =================================================================== --- uspace/srv/net/inetsrv/inetsrv.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/srv/net/inetsrv/inetsrv.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -446,8 +446,5 @@ fibril_mutex_lock(&client_list_lock); - list_foreach(client_list, link) { - inet_client_t *client = list_get_instance(link, inet_client_t, - client_list); - + list_foreach(client_list, client_list, inet_client_t, client) { if (client->protocol == proto) { fibril_mutex_unlock(&client_list_lock); Index: uspace/srv/net/inetsrv/ntrans.c =================================================================== --- uspace/srv/net/inetsrv/ntrans.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/srv/net/inetsrv/ntrans.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -56,8 +56,5 @@ static inet_ntrans_t *ntrans_find(addr128_t ip_addr) { - list_foreach(ntrans_list, link) { - inet_ntrans_t *ntrans = list_get_instance(link, - inet_ntrans_t, ntrans_list); - + list_foreach(ntrans_list, ntrans_list, inet_ntrans_t, ntrans) { if (addr128_compare(ntrans->ip_addr, ip_addr)) return ntrans; Index: uspace/srv/net/inetsrv/reass.c =================================================================== --- uspace/srv/net/inetsrv/reass.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/srv/net/inetsrv/reass.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -129,8 +129,5 @@ assert(fibril_mutex_is_locked(&reass_dgram_map_lock)); - list_foreach(reass_dgram_map, link) { - reass_dgram_t *rdg = list_get_instance(link, reass_dgram_t, - map_link); - + list_foreach(reass_dgram_map, map_link, reass_dgram_t, rdg) { link_t *f1_link = list_first(&rdg->frags); assert(f1_link != NULL); @@ -289,6 +286,6 @@ size_t fragoff_limit; inet_dgram_t dgram; + uint8_t proto; reass_frag_t *frag; - uint8_t proto; /* @@ -297,9 +294,9 @@ */ frag = NULL; - list_foreach(rdg->frags, link) { - frag = list_get_instance(link, reass_frag_t, dgram_link); - - if (!frag->packet.mf) + list_foreach(rdg->frags, dgram_link, reass_frag_t, cfrag) { + if (!cfrag->packet.mf) { + frag = cfrag; break; + } } @@ -330,20 +327,17 @@ size_t doffs = 0; - frag = NULL; - list_foreach(rdg->frags, link) { - frag = list_get_instance(link, reass_frag_t, dgram_link); - + list_foreach(rdg->frags, dgram_link, reass_frag_t, cfrag) { size_t cb, ce; - cb = max(doffs, frag->packet.offs); - ce = min(dgram_size, frag->packet.offs + frag->packet.size); + cb = max(doffs, cfrag->packet.offs); + ce = min(dgram_size, cfrag->packet.offs + cfrag->packet.size); if (ce > cb) { memcpy(dgram.data + cb, - frag->packet.data + cb - frag->packet.offs, + cfrag->packet.data + cb - cfrag->packet.offs, ce - cb); } - if (!frag->packet.mf) + if (!cfrag->packet.mf) break; } Index: uspace/srv/net/inetsrv/sroute.c =================================================================== --- uspace/srv/net/inetsrv/sroute.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/srv/net/inetsrv/sroute.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -89,5 +89,5 @@ } -/** Find address object matching address @a addr. +/** Find static route object matching address @a addr. * * @param addr Address @@ -102,8 +102,5 @@ fibril_mutex_lock(&sroute_list_lock); - list_foreach(sroute_list, link) { - inet_sroute_t *sroute = list_get_instance(link, - inet_sroute_t, sroute_list); - + list_foreach(sroute_list, sroute_list, inet_sroute_t, sroute) { uint8_t dest_bits; uint16_t dest_af = inet_naddr_get(&sroute->dest, NULL, NULL, @@ -147,8 +144,5 @@ fibril_mutex_lock(&sroute_list_lock); - list_foreach(sroute_list, link) { - inet_sroute_t *sroute = list_get_instance(link, - inet_sroute_t, sroute_list); - + list_foreach(sroute_list, sroute_list, inet_sroute_t, sroute) { if (str_cmp(sroute->name, name) == 0) { fibril_mutex_unlock(&sroute_list_lock); @@ -176,8 +170,5 @@ fibril_mutex_lock(&sroute_list_lock); - list_foreach(sroute_list, link) { - inet_sroute_t *sroute = list_get_instance(link, - inet_sroute_t, sroute_list); - + list_foreach(sroute_list, sroute_list, inet_sroute_t, sroute) { if (sroute->id == id) { fibril_mutex_unlock(&sroute_list_lock); @@ -207,8 +198,5 @@ i = 0; - list_foreach(sroute_list, link) { - inet_sroute_t *sroute = list_get_instance(link, - inet_sroute_t, sroute_list); - + list_foreach(sroute_list, sroute_list, inet_sroute_t, sroute) { id_list[i++] = sroute->id; } Index: uspace/srv/net/tcp/conn.c =================================================================== --- uspace/srv/net/tcp/conn.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/srv/net/tcp/conn.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -360,6 +360,5 @@ fibril_mutex_lock(&conn_list_lock); - list_foreach(conn_list, link) { - tcp_conn_t *conn = list_get_instance(link, tcp_conn_t, link); + list_foreach(conn_list, link, tcp_conn_t, conn) { tcp_sockpair_t *csp = &conn->ident; Index: uspace/srv/net/udp/assoc.c =================================================================== --- uspace/srv/net/udp/assoc.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/srv/net/udp/assoc.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -419,6 +419,5 @@ fibril_mutex_lock(&assoc_list_lock); - list_foreach(assoc_list, link) { - udp_assoc_t *assoc = list_get_instance(link, udp_assoc_t, link); + list_foreach(assoc_list, link, udp_assoc_t, assoc) { udp_sockpair_t *asp = &assoc->ident; Index: uspace/srv/ns/service.c =================================================================== --- uspace/srv/ns/service.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/srv/ns/service.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -106,7 +106,5 @@ { loop: - list_foreach(pending_conn, cur) { - pending_conn_t *pr = list_get_instance(cur, pending_conn_t, link); - + list_foreach(pending_conn, link, pending_conn_t, pr) { ht_link_t *link = hash_table_find(&service_hash_table, &pr->service); if (!link) @@ -117,5 +115,5 @@ pr->arg3, 0, IPC_FF_NONE); - list_remove(cur); + list_remove(&pr->link); free(pr); goto loop; Index: uspace/srv/ns/task.c =================================================================== --- uspace/srv/ns/task.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/srv/ns/task.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -179,7 +179,5 @@ loop: - list_foreach(pending_wait, cur) { - pending_wait_t *pr = list_get_instance(cur, pending_wait_t, link); - + list_foreach(pending_wait, link, pending_wait_t, pr) { ht_link_t *link = hash_table_find(&task_hash_table, &pr->id); if (!link) @@ -198,5 +196,5 @@ hash_table_remove(&task_hash_table, &pr->id); - list_remove(cur); + list_remove(&pr->link); free(pr); goto loop; Index: uspace/srv/vfs/vfs_ops.c =================================================================== --- uspace/srv/vfs/vfs_ops.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/srv/vfs/vfs_ops.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -548,8 +548,5 @@ int found = 0; - list_foreach(mtab_list, cur) { - mtab_ent_t *mtab_ent = list_get_instance(cur, mtab_ent_t, - link); - + list_foreach(mtab_list, link, mtab_ent_t, mtab_ent) { if (str_cmp(mtab_ent->mp, mp) == 0) { list_remove(&mtab_ent->link); @@ -1371,8 +1368,5 @@ async_answer_1(callid, EOK, mtab_size); - list_foreach(mtab_list, cur) { - mtab_ent_t *mtab_ent = list_get_instance(cur, mtab_ent_t, - link); - + list_foreach(mtab_list, link, mtab_ent_t, mtab_ent) { rc = ENOTSUP; Index: uspace/srv/vfs/vfs_register.c =================================================================== --- uspace/srv/vfs/vfs_register.c (revision a60e90b77be0a223cc67fdf941b5d620622260c6) +++ uspace/srv/vfs/vfs_register.c (revision 08bc23d60e18d91f38bdbbfc8ee0bc0a7c796879) @@ -260,7 +260,5 @@ fibril_mutex_lock(&fs_list_lock); - list_foreach(fs_list, cur) { - fs_info_t *fs = list_get_instance(cur, fs_info_t, fs_link); - + list_foreach(fs_list, fs_link, fs_info_t, fs) { if (fs->fs_handle == handle) { fibril_mutex_unlock(&fs_list_lock); @@ -305,6 +303,5 @@ fibril_mutex_lock(&fs_list_lock); - list_foreach(fs_list, cur) { - fs_info_t *fs = list_get_instance(cur, fs_info_t, fs_link); + list_foreach(fs_list, fs_link, fs_info_t, fs) { if (str_cmp(fs->vfs_info.name, name) == 0 && instance == fs->vfs_info.instance) { @@ -332,6 +329,5 @@ fibril_mutex_lock(&fs_list_lock); - list_foreach(fs_list, cur) { - fs_info_t *fs = list_get_instance(cur, fs_info_t, fs_link); + list_foreach(fs_list, fs_link, fs_info_t, fs) { if (fs->fs_handle == handle) { info = &fs->vfs_info;