On 07/10/2017 05:32 PM, Thomas Huth wrote:
> We'll need them in code that is not related to bootmap.h, so
> they should reside in an independent header.
>
> Signed-off-by: Thomas Huth <th...@redhat.com>
Reviewed-by: Christian Borntraeger <borntrae...@de.ibm.com>
> ---
> pc-bios/s390-ccw/bootmap.c | 1 +
> pc-bios/s390-ccw/bootmap.h | 26 --------------------------
> pc-bios/s390-ccw/bswap.h | 25 +++++++++++++++++++++++++
> 3 files changed, 26 insertions(+), 26 deletions(-)
> create mode 100644 pc-bios/s390-ccw/bswap.h
>
> diff --git a/pc-bios/s390-ccw/bootmap.c b/pc-bios/s390-ccw/bootmap.c
> index 458d3da..67a6123 100644
> --- a/pc-bios/s390-ccw/bootmap.c
> +++ b/pc-bios/s390-ccw/bootmap.c
> @@ -12,6 +12,7 @@
> #include "s390-ccw.h"
> #include "bootmap.h"
> #include "virtio.h"
> +#include "bswap.h"
>
> #ifdef DEBUG
> /* #define DEBUG_FALLBACK */
> diff --git a/pc-bios/s390-ccw/bootmap.h b/pc-bios/s390-ccw/bootmap.h
> index 7f36782..cf99a4c 100644
> --- a/pc-bios/s390-ccw/bootmap.h
> +++ b/pc-bios/s390-ccw/bootmap.h
> @@ -324,32 +324,6 @@ static inline int _memcmp(const void *s1, const void
> *s2, size_t n)
> return 0;
> }
>
> -/* from include/qemu/bswap.h */
> -
> -/* El Torito is always little-endian */
> -static inline uint16_t bswap16(uint16_t x)
> -{
> - return ((x & 0x00ff) << 8) | ((x & 0xff00) >> 8);
> -}
> -
> -static inline uint32_t bswap32(uint32_t x)
> -{
> - return ((x & 0x000000ffU) << 24) | ((x & 0x0000ff00U) << 8) |
> - ((x & 0x00ff0000U) >> 8) | ((x & 0xff000000U) >> 24);
> -}
> -
> -static inline uint64_t bswap64(uint64_t x)
> -{
> - return ((x & 0x00000000000000ffULL) << 56) |
> - ((x & 0x000000000000ff00ULL) << 40) |
> - ((x & 0x0000000000ff0000ULL) << 24) |
> - ((x & 0x00000000ff000000ULL) << 8) |
> - ((x & 0x000000ff00000000ULL) >> 8) |
> - ((x & 0x0000ff0000000000ULL) >> 24) |
> - ((x & 0x00ff000000000000ULL) >> 40) |
> - ((x & 0xff00000000000000ULL) >> 56);
> -}
> -
> static inline uint32_t iso_733_to_u32(uint64_t x)
> {
> return (uint32_t)x;
> diff --git a/pc-bios/s390-ccw/bswap.h b/pc-bios/s390-ccw/bswap.h
> new file mode 100644
> index 0000000..45b5ef4
> --- /dev/null
> +++ b/pc-bios/s390-ccw/bswap.h
> @@ -0,0 +1,25 @@
> +
> +/* from include/qemu/bswap.h */
> +
> +static inline uint16_t bswap16(uint16_t x)
> +{
> + return ((x & 0x00ff) << 8) | ((x & 0xff00) >> 8);
> +}
> +
> +static inline uint32_t bswap32(uint32_t x)
> +{
> + return ((x & 0x000000ffU) << 24) | ((x & 0x0000ff00U) << 8) |
> + ((x & 0x00ff0000U) >> 8) | ((x & 0xff000000U) >> 24);
> +}
> +
> +static inline uint64_t bswap64(uint64_t x)
> +{
> + return ((x & 0x00000000000000ffULL) << 56) |
> + ((x & 0x000000000000ff00ULL) << 40) |
> + ((x & 0x0000000000ff0000ULL) << 24) |
> + ((x & 0x00000000ff000000ULL) << 8) |
> + ((x & 0x000000ff00000000ULL) >> 8) |
> + ((x & 0x0000ff0000000000ULL) >> 24) |
> + ((x & 0x00ff000000000000ULL) >> 40) |
> + ((x & 0xff00000000000000ULL) >> 56);
> +}
>
