Ignore:
Timestamp:
2010-11-18T22:34:23Z (13 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/part/mbr_part/mbr_part.c

    rc7137738 r3f0a7971  
    101101        aoff64_t length;
    102102        /** Device representing the partition (outbound device) */
    103         dev_handle_t dev;
     103        devmap_handle_t dev;
    104104        /** Points to next partition structure. */
    105105        struct part *next;
     
    142142
    143143/** Partitioned device (inbound device) */
    144 static dev_handle_t indev_handle;
     144static devmap_handle_t indev_handle;
    145145
    146146/** List of partitions. This structure is an empty head. */
     
    181181        int i;
    182182        char *name;
    183         dev_handle_t dev;
     183        devmap_handle_t dev;
    184184        uint64_t size_mb;
    185185        part_t *part;
     
    394394        ipc_call_t call;
    395395        ipcarg_t method;
    396         dev_handle_t dh;
     396        devmap_handle_t dh;
    397397        int flags;
    398398        int retval;
Note: See TracChangeset for help on using the changeset viewer.