Changeset 03bc76a in mainline for uspace/app/mkminix/mkminix.c
- Timestamp:
- 2011-09-04T12:33:10Z (13 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- c699b0c
- Parents:
- 8ff0bd2
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/app/mkminix/mkminix.c
r8ff0bd2 r03bc76a 97 97 static inline int write_block(aoff64_t off, size_t size, const void *data); 98 98 99 static devmap_handle_t handle;99 static service_id_t service_id; 100 100 static int shift; 101 101 … … 201 201 } 202 202 203 rc = devmap_device_get_handle(device_name, &handle, 0);203 rc = loc_service_get_id(device_name, &service_id, 0); 204 204 if (rc != EOK) { 205 205 printf(NAME ": Error resolving device `%s'.\n", device_name); … … 207 207 } 208 208 209 rc = block_init(EXCHANGE_SERIALIZE, handle, 2048);209 rc = block_init(EXCHANGE_SERIALIZE, service_id, 2048); 210 210 if (rc != EOK) { 211 211 printf(NAME ": Error initializing libblock.\n"); … … 213 213 } 214 214 215 rc = block_get_bsize( handle, &devblock_size);215 rc = block_get_bsize(service_id, &devblock_size); 216 216 if (rc != EOK) { 217 217 printf(NAME ": Error determining device block size.\n"); … … 219 219 } 220 220 221 rc = block_get_nblocks( handle, &sb.dev_nblocks);221 rc = block_get_nblocks(service_id, &sb.dev_nblocks); 222 222 if (rc != EOK) { 223 223 printf(NAME ": Warning, failed to obtain block device size.\n"); … … 271 271 return 2; 272 272 } 273 274 block_fini(service_id); 273 275 274 276 return 0; … … 600 602 sb->s_disk_version = 3; 601 603 602 rc = block_write_direct( handle, MFS_SUPERBLOCK << 1, 1 << 1, sb);604 rc = block_write_direct(service_id, MFS_SUPERBLOCK << 1, 1 << 1, sb); 603 605 free(sb); 604 606 … … 690 692 uint8_t *data_ptr = (uint8_t *) data; 691 693 692 rc = block_write_direct( handle, tmp_off << 2, size << 2, data_ptr);694 rc = block_write_direct(service_id, tmp_off << 2, size << 2, data_ptr); 693 695 694 696 if (rc != EOK) … … 698 700 tmp_off++; 699 701 700 return block_write_direct( handle, tmp_off << 2, size << 2, data_ptr);701 } 702 return block_write_direct( handle, off << shift, size << shift, data);702 return block_write_direct(service_id, tmp_off << 2, size << 2, data_ptr); 703 } 704 return block_write_direct(service_id, off << shift, size << shift, data); 703 705 } 704 706
Note:
See TracChangeset
for help on using the changeset viewer.