Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 45f04f8 in mainline for uspace/lib/block/libblock.h


Ignore:
Timestamp:
2010-11-18T18:23:43Z (11 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master
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/lib/block/libblock.h

    r51a268f r45f04f8  
    7272        fibril_rwlock_t contents_lock;
    7373        /** Handle of the device where the block resides. */
    74         dev_handle_t dev_handle;
     74        devmap_handle_t devmap_handle;
    7575        /** Block offset on the block device. Counted in 'size'-byte blocks. */
    7676        aoff64_t boff;
     
    9393};
    9494
    95 extern int block_init(dev_handle_t, size_t);
    96 extern void block_fini(dev_handle_t);
     95extern int block_init(devmap_handle_t, size_t);
     96extern void block_fini(devmap_handle_t);
    9797
    98 extern int block_bb_read(dev_handle_t, aoff64_t);
    99 extern void *block_bb_get(dev_handle_t);
     98extern int block_bb_read(devmap_handle_t, aoff64_t);
     99extern void *block_bb_get(devmap_handle_t);
    100100
    101 extern int block_cache_init(dev_handle_t, size_t, unsigned, enum cache_mode);
    102 extern int block_cache_fini(dev_handle_t);
     101extern int block_cache_init(devmap_handle_t, size_t, unsigned, enum cache_mode);
     102extern int block_cache_fini(devmap_handle_t);
    103103
    104 extern int block_get(block_t **, dev_handle_t, aoff64_t, int);
     104extern int block_get(block_t **, devmap_handle_t, aoff64_t, int);
    105105extern int block_put(block_t *);
    106106
    107 extern int block_seqread(dev_handle_t, size_t *, size_t *, aoff64_t *, void *,
     107extern int block_seqread(devmap_handle_t, size_t *, size_t *, aoff64_t *, void *,
    108108    size_t);
    109109
    110 extern int block_get_bsize(dev_handle_t, size_t *);
    111 extern int block_get_nblocks(dev_handle_t, aoff64_t *);
    112 extern int block_read_direct(dev_handle_t, aoff64_t, size_t, void *);
    113 extern int block_write_direct(dev_handle_t, aoff64_t, size_t, const void *);
     110extern int block_get_bsize(devmap_handle_t, size_t *);
     111extern int block_get_nblocks(devmap_handle_t, aoff64_t *);
     112extern int block_read_direct(devmap_handle_t, aoff64_t, size_t, void *);
     113extern int block_write_direct(devmap_handle_t, aoff64_t, size_t, const void *);
    114114
    115115#endif
Note: See TracChangeset for help on using the changeset viewer.