Changeset 45f04f8 in mainline for uspace/srv/bd/ata_bd/ata_bd.c


Ignore:
Timestamp:
2010-11-18T18:23:43Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
3f0a7971, a7811f17, cb569e6
Parents:
51a268f (diff), c63e70c (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 changes that aim to do a better job in differentiating between
dev_handle_t and device_handle_t, respectively, by renaming these types to
devmap_handle_t and devman_handle_t, respectively.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/bd/ata_bd/ata_bd.c

    r51a268f r45f04f8  
    139139               
    140140                snprintf(name, 16, "%s/disk%d", NAMESPACE, i);
    141                 rc = devmap_device_register(name, &disk[i].dev_handle);
     141                rc = devmap_device_register(name, &disk[i].devmap_handle);
    142142                if (rc != EOK) {
    143143                        devmap_hangup_phone(DEVMAP_DRIVER);
     
    229229        ipc_call_t call;
    230230        ipcarg_t method;
    231         dev_handle_t dh;
     231        devmap_handle_t dh;
    232232        int flags;
    233233        int retval;
     
    242242        disk_id = -1;
    243243        for (i = 0; i < MAX_DISKS; i++)
    244                 if (disk[i].dev_handle == dh)
     244                if (disk[i].devmap_handle == dh)
    245245                        disk_id = i;
    246246
Note: See TracChangeset for help on using the changeset viewer.