From 00c1bbf35a4bbbf988945f72dc0ed323494196c3 Mon Sep 17 00:00:00 2001 From: Laurent Vivier Date: Tue, 9 Oct 2007 20:40:37 +0000 Subject: [PATCH] use bytes instead of block --- libmap/map_bootblock_read.c | 2 +- libmap/map_bootblock_write.c | 2 +- libmap/map_partition_read.c | 9 +++------ libmap/map_partition_write.c | 9 +++------ 4 files changed, 8 insertions(+), 14 deletions(-) diff --git a/libmap/map_bootblock_read.c b/libmap/map_bootblock_read.c index fb1e00d..9cdf11a 100644 --- a/libmap/map_bootblock_read.c +++ b/libmap/map_bootblock_read.c @@ -14,5 +14,5 @@ int map_bootblock_read(map_t* map, char* bootblock) { - return map_partition_read(map, 0, BOOTBLOCK_SIZE / FLOPPY_SECTOR_SIZE, bootblock); + return map_partition_read(map, 0, BOOTBLOCK_SIZE, bootblock); } diff --git a/libmap/map_bootblock_write.c b/libmap/map_bootblock_write.c index 6599660..627dcf6 100644 --- a/libmap/map_bootblock_write.c +++ b/libmap/map_bootblock_write.c @@ -14,5 +14,5 @@ int map_bootblock_write(map_t* map, char* bootblock) { - return map_partition_write(map, 0, BOOTBLOCK_SIZE / FLOPPY_SECTOR_SIZE, bootblock); + return map_partition_write(map, 0, BOOTBLOCK_SIZE, bootblock); } diff --git a/libmap/map_partition_read.c b/libmap/map_partition_read.c index 2f40c6c..656b89c 100644 --- a/libmap/map_partition_read.c +++ b/libmap/map_partition_read.c @@ -12,20 +12,17 @@ #include "libmap.h" -int map_partition_read(map_t* map, off_t block, size_t nb, char* sector) +int map_partition_read(map_t* map, off_t offset, size_t size, char* sector) { - off_t offset; int ret; if (!map_partition_is_valid(map)) return -1; - offset = read_long((u_int32_t*)&map->partition.PyPartStart + block) + offset += read_long((u_int32_t*)&map->partition.PyPartStart) * FLOPPY_SECTOR_SIZE; - ret = map->device->read_sector(map->device, - offset, sector, - nb * FLOPPY_SECTOR_SIZE); + ret = map->device->read_sector(map->device, offset, sector, size); return ret; } diff --git a/libmap/map_partition_write.c b/libmap/map_partition_write.c index c61b2d5..90ce7e4 100644 --- a/libmap/map_partition_write.c +++ b/libmap/map_partition_write.c @@ -12,20 +12,17 @@ #include "libmap.h" -int map_partition_write(map_t* map, off_t block, size_t nb, char* sector) +int map_partition_write(map_t* map, off_t offset, size_t size, char* sector) { - off_t offset; int ret; if (!map_partition_is_valid(map)) return -1; - offset = read_long((u_int32_t*)&map->partition.PyPartStart + block) + offset += read_long((u_int32_t*)&map->partition.PyPartStart) * FLOPPY_SECTOR_SIZE; - ret = map->device->write_sector(map->device, - offset, sector, - nb * FLOPPY_SECTOR_SIZE); + ret = map->device->write_sector(map->device, offset, sector, size); return ret; }