Changeset b72efe8 in mainline for uspace/srv/devmap/devmap.c
- Timestamp:
- 2011-06-19T14:38:59Z (13 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 74464e8
- Parents:
- 1d1bb0f
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/devmap/devmap.c
r1d1bb0f rb72efe8 57 57 */ 58 58 typedef struct { 59 /** Pointers to previous and next drivers in linkedlist */59 /** Link to drivers_list */ 60 60 link_t drivers; 61 61 62 /** Pointer to the linked list of devices controlled by this driver */63 li nk_t devices;62 /** List of devices controlled by this driver */ 63 list_t devices; 64 64 65 65 /** Session asociated with this driver */ … … 77 77 */ 78 78 typedef struct { 79 /** Pointer to the previous and next device in the list of all namespaces*/79 /** Link to namespaces_list */ 80 80 link_t namespaces; 81 81 … … 94 94 */ 95 95 typedef struct { 96 /** Pointer to the previous and next device in the list of all devices*/96 /** Link to global list of devices (devices_list) */ 97 97 link_t devices; 98 /** Pointer to the previous and next device in the list of devices 99 owned by one driver */ 98 /** Link to driver list of devices (devmap_driver_t.devices) */ 100 99 link_t driver_devices; 101 100 /** Unique device identifier */ … … 225 224 static devmap_namespace_t *devmap_namespace_find_name(const char *name) 226 225 { 227 link_t *item;228 229 226 assert(fibril_mutex_is_locked(&devices_list_mutex)); 230 227 231 for (item = namespaces_list.next; item != &namespaces_list; item = item->next) {228 list_foreach(namespaces_list, item) { 232 229 devmap_namespace_t *namespace = 233 230 list_get_instance(item, devmap_namespace_t, namespaces); … … 246 243 static devmap_namespace_t *devmap_namespace_find_handle(devmap_handle_t handle) 247 244 { 248 link_t *item;249 250 245 assert(fibril_mutex_is_locked(&devices_list_mutex)); 251 246 252 for (item = namespaces_list.next; item != &namespaces_list; item = item->next) {247 list_foreach(namespaces_list, item) { 253 248 devmap_namespace_t *namespace = 254 249 list_get_instance(item, devmap_namespace_t, namespaces); … … 264 259 const char *name) 265 260 { 266 link_t *item;267 268 261 assert(fibril_mutex_is_locked(&devices_list_mutex)); 269 262 270 for (item = devices_list.next; item != &devices_list; item = item->next) {263 list_foreach(devices_list, item) { 271 264 devmap_device_t *device = 272 265 list_get_instance(item, devmap_device_t, devices); … … 286 279 static devmap_device_t *devmap_device_find_handle(devmap_handle_t handle) 287 280 { 288 link_t *item;289 290 281 assert(fibril_mutex_is_locked(&devices_list_mutex)); 291 282 292 for (item = devices_list.next; item != &devices_list; item = item->next) {283 list_foreach(devices_list, item) { 293 284 devmap_device_t *device = 294 285 list_get_instance(item, devmap_device_t, devices); … … 473 464 fibril_mutex_lock(&driver->devices_mutex); 474 465 475 while (!list_empty(&(driver->devices))) { 476 devmap_device_t *device = list_get_instance(driver->devices.next, 477 devmap_device_t, driver_devices); 466 while (!list_empty(&driver->devices)) { 467 devmap_device_t *device = list_get_instance( 468 list_first(&driver->devices), devmap_device_t, 469 driver_devices); 478 470 devmap_device_unregister_core(device); 479 471 } … … 815 807 } 816 808 817 link_t *item;818 809 size_t pos = 0; 819 for (item = namespaces_list.next; item != &namespaces_list; 820 item = item->next) { 810 list_foreach(namespaces_list, item) { 821 811 devmap_namespace_t *namespace = 822 812 list_get_instance(item, devmap_namespace_t, namespaces); … … 881 871 } 882 872 883 link_t *item;884 873 size_t pos = 0; 885 for (item = devices_list.next; item != &devices_list; item = item->next) {874 list_foreach(devices_list, item) { 886 875 devmap_device_t *device = 887 876 list_get_instance(item, devmap_device_t, devices);
Note:
See TracChangeset
for help on using the changeset viewer.