Changeset fc22069 in mainline


Ignore:
Timestamp:
2015-08-22T05:12:30Z (9 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
78bb04b
Parents:
d9e68d0
Message:

block devices use the same interface, therefore the API of libblock should not expose the implementation details

Location:
uspace
Files:
19 edited

Legend:

Unmodified
Added
Removed

  • uspace/app/blkdump/blkdump.c

    rd9e68d0 rfc22069  
    142142        }
    143143
    144         rc = block_init(EXCHANGE_SERIALIZE, service_id, 2048);
     144        rc = block_init(service_id, 2048);
    145145        if (rc != EOK)  {
    146146                printf(NAME ": Error initializing libblock.\n");

  • uspace/app/hdisk/hdisk.c

    rd9e68d0 rfc22069  
    8282        label.device = dev_handle;
    8383       
    84         rc = block_init(EXCHANGE_ATOMIC, dev_handle, 512);
     84        rc = block_init(dev_handle, 512);
    8585        if (rc != EOK) {
    8686                printf("Error during libblock init: %d - %s.\n", rc, str_error(rc));

  • uspace/app/mkexfat/mkexfat.c

    rd9e68d0 rfc22069  
    803803        }
    804804
    805         rc = block_init(EXCHANGE_SERIALIZE, service_id, 2048);
     805        rc = block_init(service_id, 2048);
    806806        if (rc != EOK) {
    807807                printf(NAME ": Error initializing libblock.\n");

  • uspace/app/mkfat/mkfat.c

    rd9e68d0 rfc22069  
    162162        }
    163163
    164         rc = block_init(EXCHANGE_SERIALIZE, service_id, 2048);
     164        rc = block_init(service_id, 2048);
    165165        if (rc != EOK)  {
    166166                printf(NAME ": Error initializing libblock.\n");

  • uspace/app/mkmfs/mkmfs.c

    rd9e68d0 rfc22069  
    209209        }
    210210
    211         rc = block_init(EXCHANGE_SERIALIZE, service_id, 2048);
     211        rc = block_init(service_id, 2048);
    212212        if (rc != EOK)  {
    213213                printf(NAME ": Error initializing libblock.\n");

  • uspace/lib/bithenge/src/helenos/block.c

    rd9e68d0 rfc22069  
    102102        // Initialize libblock
    103103        int rc;
    104         rc = block_init(EXCHANGE_SERIALIZE, service_id, 2048);
     104        rc = block_init(service_id, 2048);
    105105        if (rc != EOK)
    106106                return rc;

  • uspace/lib/block/block.c

    rd9e68d0 rfc22069  
    144144}
    145145
    146 int block_init(exch_mgmt_t mgmt, service_id_t service_id,
    147     size_t comm_size)
     146int block_init(service_id_t service_id, size_t comm_size)
    148147{
    149148        bd_t *bd;
    150149
    151         async_sess_t *sess = loc_service_connect(mgmt, service_id,
     150        async_sess_t *sess = loc_service_connect(EXCHANGE_SERIALIZE, service_id,
    152151            IPC_FLAG_BLOCKING);
    153152        if (!sess) {

  • uspace/lib/block/block.h

    rd9e68d0 rfc22069  
    9999};
    100100
    101 extern int block_init(exch_mgmt_t, service_id_t, size_t);
     101extern int block_init(service_id_t, size_t);
    102102extern void block_fini(service_id_t);
    103103

  • uspace/lib/ext4/libext4_filesystem.c

    rd9e68d0 rfc22069  
    6161
    6262        /* Initialize block library (4096 is size of communication channel) */
    63         rc = block_init(EXCHANGE_SERIALIZE, fs->device, 4096);
     63        rc = block_init(fs->device, 4096);
    6464        if (rc != EOK)
    6565                goto err;

  • uspace/lib/gpt/libgpt.c

    rd9e68d0 rfc22069  
    137137int gpt_read_header(gpt_label_t *label, service_id_t dev_handle)
    138138{
    139         int rc = block_init(EXCHANGE_ATOMIC, dev_handle, 512);
     139        int rc = block_init(dev_handle, 512);
    140140        if (rc != EOK)
    141141                return rc;
    … …  
    191191{
    192192        /* The comm_size argument (the last one) is ignored */
    193         int rc = block_init(EXCHANGE_ATOMIC, dev_handle, 4096);
     193        int rc = block_init(dev_handle, 4096);
    194194        if ((rc != EOK) && (rc != EEXIST))
    195195                return rc;
    … …  
    288288        }
    289289       
    290         int rc = block_init(EXCHANGE_SERIALIZE, label->device,
    291             sizeof(gpt_entry_t));
     290        int rc = block_init(label->device, sizeof(gpt_entry_t));
    292291        if (rc != EOK) {
    293292                gpt_free_partitions(label->parts);
    … …  
    348347{
    349348        /* comm_size of 4096 is ignored */
    350         int rc = block_init(EXCHANGE_ATOMIC, dev_handle, 4096);
     349        int rc = block_init(dev_handle, 4096);
    351350        if ((rc != EOK) && (rc != EEXIST))
    352351                return rc;

  • uspace/lib/mbr/libmbr.c

    rd9e68d0 rfc22069  
    109109        }
    110110       
    111         int rc = block_init(EXCHANGE_ATOMIC, dev_handle, 512);
     111        int rc = block_init(dev_handle, 512);
    112112        if (rc != EOK)
    113113                return rc;
    … …  
    133133int mbr_write_mbr(mbr_label_t *label, service_id_t dev_handle)
    134134{
    135         int rc = block_init(EXCHANGE_ATOMIC, dev_handle, 512);
     135        int rc = block_init(dev_handle, 512);
    136136        if (rc != EOK)
    137137                return rc;
    … …  
    227227                label->mbr = mbr_alloc_mbr();
    228228       
    229         int rc = block_init(EXCHANGE_ATOMIC, dev_handle, 512);
     229        int rc = block_init(dev_handle, 512);
    230230        if (rc != EOK)
    231231                return rc;
    … …  
    413413mbr_err_val mbr_add_partition(mbr_label_t *label, mbr_part_t *part)
    414414{
    415         int rc = block_init(EXCHANGE_ATOMIC, label->device, 512);
     415        int rc = block_init(label->device, 512);
    416416        if ((rc != EOK) && (rc != EEXIST))
    417417                return ERR_LIBBLOCK;
    … …  
    622622        uint32_t addr = base;
    623623       
    624         int rc = block_init(EXCHANGE_ATOMIC, label->device, 512);
     624        int rc = block_init(label->device, 512);
    625625        if (rc != EOK)
    626626                goto end;

  • uspace/srv/bd/part/guid_part/guid_part.c

    rd9e68d0 rfc22069  
    160160        }
    161161
    162         rc = block_init(EXCHANGE_SERIALIZE, indev_sid, 2048);
     162        rc = block_init(indev_sid, 2048);
    163163        if (rc != EOK)  {
    164164                printf(NAME ": could not init libblock.\n");

  • uspace/srv/bd/part/mbr_part/mbr_part.c

    rd9e68d0 rfc22069  
    210210        }
    211211
    212         rc = block_init(EXCHANGE_SERIALIZE, indev_sid, 2048);
     212        rc = block_init(indev_sid, 2048);
    213213        if (rc != EOK)  {
    214214                printf(NAME ": could not init libblock.\n");

  • uspace/srv/fs/cdfs/cdfs_ops.c

    rd9e68d0 rfc22069  
    10251025{
    10261026        /* Initialize the block layer */
    1027         int rc = block_init(EXCHANGE_SERIALIZE, service_id, BLOCK_SIZE);
     1027        int rc = block_init(service_id, BLOCK_SIZE);
    10281028        if (rc != EOK)
    10291029                return rc;

  • uspace/srv/fs/exfat/exfat_ops.c

    rd9e68d0 rfc22069  
    10671067
    10681068        /* initialize libblock */
    1069         rc = block_init(EXCHANGE_SERIALIZE, service_id, BS_SIZE);
     1069        rc = block_init(service_id, BS_SIZE);
    10701070        if (rc != EOK)
    10711071                return rc;

  • uspace/srv/fs/fat/fat_ops.c

    rd9e68d0 rfc22069  
    939939
    940940        /* initialize libblock */
    941         rc = block_init(EXCHANGE_SERIALIZE, service_id, BS_SIZE);
     941        rc = block_init(service_id, BS_SIZE);
    942942        if (rc != EOK) {
    943943                free(instance);

  • uspace/srv/fs/mfs/mfs_ops.c

    rd9e68d0 rfc22069  
    161161
    162162        /* initialize libblock */
    163         rc = block_init(EXCHANGE_SERIALIZE, service_id, 4096);
     163        rc = block_init(service_id, 4096);
    164164        if (rc != EOK)
    165165                return rc;

  • uspace/srv/fs/tmpfs/tmpfs_dump.c

    rd9e68d0 rfc22069  
    169169        int rc;
    170170
    171         rc = block_init(EXCHANGE_SERIALIZE, dsid, TMPFS_COMM_SIZE);
     171        rc = block_init(dsid, TMPFS_COMM_SIZE);
    172172        if (rc != EOK)
    173173                return false;

  • uspace/srv/fs/udf/udf_ops.c

    rd9e68d0 rfc22069  
    325325       
    326326        /* initialize block cache */
    327         int rc = block_init(EXCHANGE_SERIALIZE, service_id, MAX_SIZE);
     327        int rc = block_init(service_id, MAX_SIZE);
    328328        if (rc != EOK)
    329329                return rc;
Note: See TracChangeset for help on using the changeset viewer.