Changeset 398c4d7 in mainline for uspace/srv/devman/devman.c
- Timestamp:
- 2010-12-01T23:51:29Z (14 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- c245f16e
- Parents:
- 2edcb63
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/devman/devman.c
r2edcb63 r398c4d7 520 520 fibril_mutex_lock(&driver->driver_mutex); 521 521 522 phone = ipc_connect_me_to(driver->phone, DRIVER_DEVMAN, 0, 0);522 phone = async_connect_me_to(driver->phone, DRIVER_DEVMAN, 0, 0); 523 523 524 524 if (phone < 0) { … … 583 583 * immediately and possibly started here as well. 584 584 */ 585 printf(NAME ": driver %s goes into running state.\n", driver->name); 585 586 driver->state = DRIVER_RUNNING; 586 587 … … 712 713 /* TODO handle error */ 713 714 } 714 715 715 716 /* Wait for answer from the driver. */ 716 717 async_wait_for(req, &rc); … … 755 756 attach_driver(node, drv); 756 757 758 fibril_mutex_lock(&drv->driver_mutex); 757 759 if (drv->state == DRIVER_NOT_STARTED) { 758 760 /* Start the driver. */ 759 761 start_driver(drv); 760 762 } 761 762 if (drv->state == DRIVER_RUNNING) { 763 fibril_mutex_unlock(&drv->driver_mutex); 764 765 fibril_mutex_lock(&drv->driver_mutex); 766 bool is_running = drv->state == DRIVER_RUNNING; 767 fibril_mutex_unlock(&drv->driver_mutex); 768 769 if (is_running) { 763 770 /* Notify the driver about the new device. */ 764 int phone = ipc_connect_me_to(drv->phone, DRIVER_DEVMAN, 0, 0);771 int phone = async_connect_me_to(drv->phone, DRIVER_DEVMAN, 0, 0); 765 772 if (phone > 0) { 766 773 add_device(phone, drv, node, tree); … … 924 931 node->name = dev_name; 925 932 if (!set_dev_path(node, parent)) { 926 fibril_rwlock_write_unlock(&tree->rwlock);927 933 return false; 928 934 }
Note:
See TracChangeset
for help on using the changeset viewer.