Changeset d5ba17f in mainline for uspace/drv/bus/pci/pciintel/pci.c
- Timestamp:
- 2011-11-18T15:32:24Z (13 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 528e5b3
- Parents:
- b12ca16 (diff), 0c0f823b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/bus/pci/pciintel/pci.c
rb12ca16 rd5ba17f 205 205 }; 206 206 207 static int pci_ add_device(ddf_dev_t *);207 static int pci_dev_add(ddf_dev_t *); 208 208 static int pci_fun_online(ddf_fun_t *); 209 209 static int pci_fun_offline(ddf_fun_t *); … … 211 211 /** PCI bus driver standard operations */ 212 212 static driver_ops_t pci_ops = { 213 . add_device = &pci_add_device,213 .dev_add = &pci_dev_add, 214 214 .fun_online = &pci_fun_online, 215 215 .fun_offline = &pci_fun_offline, … … 610 610 } 611 611 612 static int pci_ add_device(ddf_dev_t *dnode)612 static int pci_dev_add(ddf_dev_t *dnode) 613 613 { 614 614 pci_bus_t *bus = NULL; … … 617 617 int rc; 618 618 619 ddf_msg(LVL_DEBUG, "pci_ add_device");619 ddf_msg(LVL_DEBUG, "pci_dev_add"); 620 620 dnode->parent_sess = NULL; 621 621 622 622 bus = ddf_dev_data_alloc(dnode, sizeof(pci_bus_t)); 623 623 if (bus == NULL) { 624 ddf_msg(LVL_ERROR, "pci_ add_deviceallocation failed.");624 ddf_msg(LVL_ERROR, "pci_dev_add allocation failed."); 625 625 rc = ENOMEM; 626 626 goto fail; … … 634 634 dnode->handle, IPC_FLAG_BLOCKING); 635 635 if (!dnode->parent_sess) { 636 ddf_msg(LVL_ERROR, "pci_ add_devicefailed to connect to the "636 ddf_msg(LVL_ERROR, "pci_dev_add failed to connect to the " 637 637 "parent driver."); 638 638 rc = ENOENT; … … 644 644 rc = hw_res_get_resource_list(dnode->parent_sess, &hw_resources); 645 645 if (rc != EOK) { 646 ddf_msg(LVL_ERROR, "pci_ add_devicefailed to get hw resources "646 ddf_msg(LVL_ERROR, "pci_dev_add failed to get hw resources " 647 647 "for the device."); 648 648 goto fail;
Note:
See TracChangeset
for help on using the changeset viewer.