Changeset d5ba17f in mainline for uspace/drv/bus/pci/pciintel/pci.c


Ignore:
Timestamp:
2011-11-18T15:32:24Z (13 years ago)
Author:
Frantisek Princ <frantisek.princ@…>
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.
Message:

Merge with mainline

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/bus/pci/pciintel/pci.c

    rb12ca16 rd5ba17f  
    205205};
    206206
    207 static int pci_add_device(ddf_dev_t *);
     207static int pci_dev_add(ddf_dev_t *);
    208208static int pci_fun_online(ddf_fun_t *);
    209209static int pci_fun_offline(ddf_fun_t *);
     
    211211/** PCI bus driver standard operations */
    212212static driver_ops_t pci_ops = {
    213         .add_device = &pci_add_device,
     213        .dev_add = &pci_dev_add,
    214214        .fun_online = &pci_fun_online,
    215215        .fun_offline = &pci_fun_offline,
     
    610610}
    611611
    612 static int pci_add_device(ddf_dev_t *dnode)
     612static int pci_dev_add(ddf_dev_t *dnode)
    613613{
    614614        pci_bus_t *bus = NULL;
     
    617617        int rc;
    618618       
    619         ddf_msg(LVL_DEBUG, "pci_add_device");
     619        ddf_msg(LVL_DEBUG, "pci_dev_add");
    620620        dnode->parent_sess = NULL;
    621621       
    622622        bus = ddf_dev_data_alloc(dnode, sizeof(pci_bus_t));
    623623        if (bus == NULL) {
    624                 ddf_msg(LVL_ERROR, "pci_add_device allocation failed.");
     624                ddf_msg(LVL_ERROR, "pci_dev_add allocation failed.");
    625625                rc = ENOMEM;
    626626                goto fail;
     
    634634            dnode->handle, IPC_FLAG_BLOCKING);
    635635        if (!dnode->parent_sess) {
    636                 ddf_msg(LVL_ERROR, "pci_add_device failed to connect to the "
     636                ddf_msg(LVL_ERROR, "pci_dev_add failed to connect to the "
    637637                    "parent driver.");
    638638                rc = ENOENT;
     
    644644        rc = hw_res_get_resource_list(dnode->parent_sess, &hw_resources);
    645645        if (rc != EOK) {
    646                 ddf_msg(LVL_ERROR, "pci_add_device failed to get hw resources "
     646                ddf_msg(LVL_ERROR, "pci_dev_add failed to get hw resources "
    647647                    "for the device.");
    648648                goto fail;
Note: See TracChangeset for help on using the changeset viewer.