From de2860a35c280760b2709563b5d09429ef68f86d Mon Sep 17 00:00:00 2001 From: Laurent Vivier Date: Mon, 29 May 2006 19:56:13 +0000 Subject: [PATCH] Manage big endian/little endian --- libemile/emile_map_geometry.c | 5 +++-- libemile/emile_map_get_driver_info.c | 7 ++++--- libemile/emile_map_get_driver_number.c | 3 ++- libemile/emile_map_get_partition_geometry.c | 5 +++-- libemile/emile_map_is_valid.c | 3 ++- 5 files changed, 14 insertions(+), 9 deletions(-) diff --git a/libemile/emile_map_geometry.c b/libemile/emile_map_geometry.c index 22f5910..31772b0 100644 --- a/libemile/emile_map_geometry.c +++ b/libemile/emile_map_geometry.c @@ -7,14 +7,15 @@ static __attribute__((used)) char* rcsid = "$CVSHeader$"; #include "partition.h" #include "libemile.h" +#include "emile.h" int emile_map_geometry(emile_map_t *map, int *block_size, int *block_count) { if (!emile_map_is_valid(map)) return -1; - *block_size = map->drivers.BlkSize; - *block_count = map->drivers.BlkCount; + *block_size = read_short(&map->drivers.BlkSize); + *block_count = read_long(&map->drivers.BlkCount); return 0; } diff --git a/libemile/emile_map_get_driver_info.c b/libemile/emile_map_get_driver_info.c index 26faaf7..fe7e5a0 100644 --- a/libemile/emile_map_get_driver_info.c +++ b/libemile/emile_map_get_driver_info.c @@ -7,6 +7,7 @@ static __attribute__((used)) char* rcsid = "$CVSHeader$"; #include "partition.h" #include "libemile.h" +#include "emile.h" int emile_map_get_driver_info(emile_map_t *map, int number, int *block, int *size, int* type) @@ -17,9 +18,9 @@ int emile_map_get_driver_info(emile_map_t *map, int number, if (number > emile_map_get_driver_number(map)) return -1; - *block = map->drivers.DrvInfo[number].Block; - *size = map->drivers.DrvInfo[number].Size; - *type = map->drivers.DrvInfo[number].Type; + *block = read_long(&map->drivers.DrvInfo[number].Block); + *size = read_short(&map->drivers.DrvInfo[number].Size); + *type = read_short(&map->drivers.DrvInfo[number].Type); return 0; } diff --git a/libemile/emile_map_get_driver_number.c b/libemile/emile_map_get_driver_number.c index 1e20c17..75aa937 100644 --- a/libemile/emile_map_get_driver_number.c +++ b/libemile/emile_map_get_driver_number.c @@ -7,11 +7,12 @@ static __attribute__((used)) char* rcsid = "$CVSHeader$"; #include "partition.h" #include "libemile.h" +#include "emile.h" int emile_map_get_driver_number(emile_map_t *map) { if (!emile_map_is_valid(map)) return -1; - return map->drivers.DrvrCount; + return read_short(&map->drivers.DrvrCount); } diff --git a/libemile/emile_map_get_partition_geometry.c b/libemile/emile_map_get_partition_geometry.c index 9ed16b9..a7e2ced 100644 --- a/libemile/emile_map_get_partition_geometry.c +++ b/libemile/emile_map_get_partition_geometry.c @@ -7,14 +7,15 @@ static __attribute__((used)) char* rcsid = "$CVSHeader$"; #include "partition.h" #include "libemile.h" +#include "emile.h" int emile_map_get_partition_geometry(emile_map_t *map, int *start, int *count) { if (!emile_map_partition_is_valid(map)) return -1; - *start = map->partition.PyPartStart; - *count = map->partition.PartBlkCnt; + *start = read_long(&map->partition.PyPartStart); + *count = read_long(&map->partition.PartBlkCnt); return 0; } diff --git a/libemile/emile_map_is_valid.c b/libemile/emile_map_is_valid.c index b4b7369..1b56a11 100644 --- a/libemile/emile_map_is_valid.c +++ b/libemile/emile_map_is_valid.c @@ -7,8 +7,9 @@ static __attribute__((used)) char* rcsid = "$CVSHeader$"; #include "partition.h" #include "libemile.h" +#include "emile.h" int emile_map_is_valid(emile_map_t *map) { - return map->drivers.Sig == DD_SIGNATURE; + return read_short(&map->drivers.Sig) == DD_SIGNATURE; }