f099b2fad1
Fix build issues for some older distros. Also includes fixing broken parts of spec file when not building x86 firmware. OBS-URL: https://build.opensuse.org/request/show/493037 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=338
82 lines
2.5 KiB
Diff
82 lines
2.5 KiB
Diff
From d1c07c5e280a5ca62d3019792049038a53476248 Mon Sep 17 00:00:00 2001
|
|
From: Alexander Graf <agraf@suse.de>
|
|
Date: Tue, 14 Apr 2009 16:20:50 +0200
|
|
Subject: [PATCH] qemu-cvs-alsa_bitfield
|
|
|
|
Implements TYPE_INTBITFIELD partially. (required for ALSA support)
|
|
|
|
Signed-off-by: Alexander Graf <agraf@suse.de>
|
|
Signed-off-by: Ulrich Hecht <uli@suse.de>
|
|
---
|
|
include/exec/user/thunk.h | 3 +++
|
|
thunk.c | 21 +++++++++++++++++++++
|
|
2 files changed, 24 insertions(+)
|
|
|
|
diff --git a/include/exec/user/thunk.h b/include/exec/user/thunk.h
|
|
index f19ef4b230..b2659e0def 100644
|
|
--- a/include/exec/user/thunk.h
|
|
+++ b/include/exec/user/thunk.h
|
|
@@ -37,6 +37,7 @@ typedef enum argtype {
|
|
TYPE_ARRAY,
|
|
TYPE_STRUCT,
|
|
TYPE_OLDDEVT,
|
|
+ TYPE_INTBITFIELD,
|
|
} argtype;
|
|
|
|
#define MK_PTR(type) TYPE_PTR, type
|
|
@@ -89,6 +90,7 @@ static inline int thunk_type_size(const argtype *type_ptr, int is_host)
|
|
case TYPE_SHORT:
|
|
return 2;
|
|
case TYPE_INT:
|
|
+ case TYPE_INTBITFIELD:
|
|
return 4;
|
|
case TYPE_LONGLONG:
|
|
case TYPE_ULONGLONG:
|
|
@@ -151,6 +153,7 @@ static inline int thunk_type_align(const argtype *type_ptr, int is_host)
|
|
case TYPE_SHORT:
|
|
return 2;
|
|
case TYPE_INT:
|
|
+ case TYPE_INTBITFIELD:
|
|
return 4;
|
|
case TYPE_LONGLONG:
|
|
case TYPE_ULONGLONG:
|
|
diff --git a/thunk.c b/thunk.c
|
|
index 2dac36666d..0eb72861fe 100644
|
|
--- a/thunk.c
|
|
+++ b/thunk.c
|
|
@@ -37,6 +37,7 @@ static inline const argtype *thunk_type_next(const argtype *type_ptr)
|
|
case TYPE_CHAR:
|
|
case TYPE_SHORT:
|
|
case TYPE_INT:
|
|
+ case TYPE_INTBITFIELD:
|
|
case TYPE_LONGLONG:
|
|
case TYPE_ULONGLONG:
|
|
case TYPE_LONG:
|
|
@@ -139,6 +140,26 @@ const argtype *thunk_convert(void *dst, const void *src,
|
|
case TYPE_INT:
|
|
*(uint32_t *)dst = tswap32(*(uint32_t *)src);
|
|
break;
|
|
+ case TYPE_INTBITFIELD:
|
|
+#if defined(TARGET_I386) && defined(__powerpc__)
|
|
+ /* powerpc uses the MSB, whereas i386 uses the LSB
|
|
+ * to store the first bit in a field */
|
|
+ {
|
|
+ unsigned char byte = *(uint8_t *)src;
|
|
+ *(uint8_t *)dst = ((byte >> 7) & 1)
|
|
+ | ((byte >> 5) & 2)
|
|
+ | ((byte >> 3) & 4)
|
|
+ | ((byte >> 1) & 8)
|
|
+ | ((byte << 1) & 16)
|
|
+ | ((byte << 3) & 32)
|
|
+ | ((byte << 5) & 64)
|
|
+ | ((byte << 7) & 128);
|
|
+ /* FIXME: implement for bitfields > 1 byte and other archs */
|
|
+ }
|
|
+#else
|
|
+ *(uint32_t *)dst = tswap32(*(uint32_t *)src);
|
|
+#endif
|
|
+ break;
|
|
case TYPE_LONGLONG:
|
|
case TYPE_ULONGLONG:
|
|
*(uint64_t *)dst = tswap64(*(uint64_t *)src);
|