Changeset 3f0a7971 in mainline for uspace/srv/bd/gxe_bd/gxe_bd.c


Ignore:
Timestamp:
2010-11-18T22:34:23Z (14 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
63b4f90
Parents:
c7137738 (diff), 45f04f8 (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 mainline changes

Updated srv/hw/bus/usb/hcd/virtual to use new type names (devmap_handle_t).

File:
1 edited

Legend:

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

    rc7137738 r3f0a7971  
    9393static gxe_bd_t *dev;
    9494
    95 static dev_handle_t dev_handle[MAX_DISKS];
     95static devmap_handle_t devmap_handle[MAX_DISKS];
    9696
    9797static fibril_mutex_t dev_lock[MAX_DISKS];
     
    143143        for (i = 0; i < MAX_DISKS; i++) {
    144144                snprintf(name, 16, "%s/disk%d", NAMESPACE, i);
    145                 rc = devmap_device_register(name, &dev_handle[i]);
     145                rc = devmap_device_register(name, &devmap_handle[i]);
    146146                if (rc != EOK) {
    147147                        devmap_hangup_phone(DEVMAP_DRIVER);
     
    161161        ipc_call_t call;
    162162        ipcarg_t method;
    163         dev_handle_t dh;
     163        devmap_handle_t dh;
    164164        int flags;
    165165        int retval;
     
    174174        disk_id = -1;
    175175        for (i = 0; i < MAX_DISKS; i++)
    176                 if (dev_handle[i] == dh)
     176                if (devmap_handle[i] == dh)
    177177                        disk_id = i;
    178178
Note: See TracChangeset for help on using the changeset viewer.