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

Changeset db6e419 in mainline for uspace/lib/block/libblock.h


Ignore:
Timestamp:
2011-08-16T18:53:00Z (10 years ago)
Author:
Petr Koupy <petr.koupy@…>
Branches:
lfn, master
Children:
49160c4
Parents:
e0e922d (diff), 45058baa (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.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/block/libblock.h

    re0e922d rdb6e419  
    11/*
    22 * Copyright (c) 2008 Jakub Jermar
    3  * Copyright (c) 2008 Martin Decky 
    4  * Copyright (c) 2011 Martin Sucha 
     3 * Copyright (c) 2008 Martin Decky
     4 * Copyright (c) 2011 Martin Sucha
    55 * All rights reserved.
    66 *
     
    7373        /** Readers / Writer lock protecting the contents of the block. */
    7474        fibril_rwlock_t contents_lock;
    75         /** Handle of the device where the block resides. */
    76         devmap_handle_t devmap_handle;
     75        /** Service ID of service providing the block device. */
     76        service_id_t service_id;
    7777        /** Logical block address */
    7878        aoff64_t lba;
     
    9797};
    9898
    99 extern int block_init(exch_mgmt_t, devmap_handle_t, size_t);
    100 extern void block_fini(devmap_handle_t);
     99extern int block_init(exch_mgmt_t, service_id_t, size_t);
     100extern void block_fini(service_id_t);
    101101
    102 extern int block_bb_read(devmap_handle_t, aoff64_t);
    103 extern void *block_bb_get(devmap_handle_t);
     102extern int block_bb_read(service_id_t, aoff64_t);
     103extern void *block_bb_get(service_id_t);
    104104
    105 extern int block_cache_init(devmap_handle_t, size_t, unsigned, enum cache_mode);
    106 extern int block_cache_fini(devmap_handle_t);
     105extern int block_cache_init(service_id_t, size_t, unsigned, enum cache_mode);
     106extern int block_cache_fini(service_id_t);
    107107
    108 extern int block_get(block_t **, devmap_handle_t, aoff64_t, int);
     108extern int block_get(block_t **, service_id_t, aoff64_t, int);
    109109extern int block_put(block_t *);
    110110
    111 extern int block_seqread(devmap_handle_t, size_t *, size_t *, aoff64_t *, void *,
     111extern int block_seqread(service_id_t, size_t *, size_t *, aoff64_t *, void *,
    112112    size_t);
    113113
    114 extern int block_get_bsize(devmap_handle_t, size_t *);
    115 extern int block_get_nblocks(devmap_handle_t, aoff64_t *);
    116 extern int block_read_direct(devmap_handle_t, aoff64_t, size_t, void *);
    117 extern int block_read_bytes_direct(devmap_handle_t, aoff64_t, size_t, void *);
    118 extern int block_write_direct(devmap_handle_t, aoff64_t, size_t, const void *);
     114extern int block_get_bsize(service_id_t, size_t *);
     115extern int block_get_nblocks(service_id_t, aoff64_t *);
     116extern int block_read_direct(service_id_t, aoff64_t, size_t, void *);
     117extern int block_read_bytes_direct(service_id_t, aoff64_t, size_t, void *);
     118extern int block_write_direct(service_id_t, aoff64_t, size_t, const void *);
    119119
    120120#endif
Note: See TracChangeset for help on using the changeset viewer.