OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

pc-bios/s390-ccw: Move byteswap functions to a separate header 

We'll need them in code that is not related to bootmap.h, so
they should reside in an independent header.

Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
Acked-by: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <1499863793-18627-6-git-send-email-thuth@redhat.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
This commit is contained in:
Thomas Huth 2017-07-12 14:49:47 +02:00 committed by Christian Borntraeger
parent 3639f93f91
commit 824df3b84b
3 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pc-bios/s390-ccw/bootmap.c
View File

@ -12,6 +12,7 @@
#include "s390-ccw.h"
#include "bootmap.h"
#include "virtio.h"
#include "bswap.h"
#ifdef DEBUG
/* #define DEBUG_FALLBACK */

26
pc-bios/s390-ccw/bootmap.h
View File

@ -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;

30
pc-bios/s390-ccw/bswap.h Normal file
View File

@ -0,0 +1,30 @@
/*
* Byte swap functions - taken from include/qemu/bswap.h
*
* This work is licensed under the terms of the GNU GPL, version 2 or (at
* your option) any later version. See the COPYING file in the top-level
* directory.
*/
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);
}