diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2006-07-01 16:50:34 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2006-07-01 16:50:34 +0000 |
| commit | b545b1cfa11001abb9631403bb55140b333a62e9 (patch) | |
| tree | 62374e5b8097be1d763970a98ab9a508b60343da /sys/arch/arm/include/disklabel.h | |
| parent | 7937c561d78b712d86ccecc567ac3775851bb59d (diff) | |
Eliminate redundant get_le() in favour of letoh32(). Add letoh32()
calls in alpha, hppa, hppa64 and mips63 when accessing the two DOS MBR
u_int32_t fields dp_size and dp_start.
No functional change.
Diffstat (limited to 'sys/arch/arm/include/disklabel.h')
| -rw-r--r-- | sys/arch/arm/include/disklabel.h | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/sys/arch/arm/include/disklabel.h b/sys/arch/arm/include/disklabel.h index d21c578ba61..d58b9d71461 100644 --- a/sys/arch/arm/include/disklabel.h +++ b/sys/arch/arm/include/disklabel.h @@ -1,5 +1,5 @@ -/* $OpenBSD: disklabel.h,v 1.6 2006/06/26 23:11:31 krw Exp $ */ -/* $OpenBSD: disklabel.h,v 1.6 2006/06/26 23:11:31 krw Exp $ */ +/* $OpenBSD: disklabel.h,v 1.7 2006/07/01 16:50:32 krw Exp $ */ +/* $OpenBSD: disklabel.h,v 1.7 2006/07/01 16:50:32 krw Exp $ */ /* $NetBSD: disklabel.h,v 1.2 2001/11/25 19:02:03 thorpej Exp $ */ /* @@ -105,24 +105,6 @@ struct dos_partition { #define DPCYL(c, s) ((c) + (((s) & 0xc0) << 2)) -#ifdef __ARMEL__ -#define get_le(x) (*((u_int32_t *)x)) -#else -static __inline u_int32_t get_le(void *); -static __inline u_int32_t -get_le(void *p) -{ - u_int8_t *_p = (u_int8_t *)p; - u_int32_t x; - x = _p[0]; - x |= _p[1] << 8; - x |= _p[2] << 16; - x |= _p[3] << 24; - return x; -} -#endif - - struct cpu_disklabel { struct dos_partition dosparts[NDOSPART]; struct dkbad bad; |