Module Name: xsrc
Committed By: mrg
Date: Fri Jan 4 00:09:11 UTC 2019
Modified Files:
xsrc/external/mit/xf86-video-ati/dist/src/AtomBios: CD_Operations.c
Log Message:
redo previous slightly: restore packed attribute.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xf86-video-ati/dist/src/AtomBios/CD_Operations.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-ati/dist/src/AtomBios/CD_Operations.c
diff -u xsrc/external/mit/xf86-video-ati/dist/src/AtomBios/CD_Operations.c:1.7 xsrc/external/mit/xf86-video-ati/dist/src/AtomBios/CD_Operations.c:1.8
--- xsrc/external/mit/xf86-video-ati/dist/src/AtomBios/CD_Operations.c:1.7 Wed Jan 2 18:51:58 2019
+++ xsrc/external/mit/xf86-video-ati/dist/src/AtomBios/CD_Operations.c Fri Jan 4 00:09:11 2019
@@ -215,8 +215,10 @@ VOID IndirectIOCommand_CLEAR(PARSER_TEMP
pParserTempData->IndirectData &= ~((0xFFFFFFFF >> (32-pParserTempData->IndirectIOTablePointer[1])) << pParserTempData->IndirectIOTablePointer[2]);
}
-/* Avoid conflicts with older versions of compiler.h */
+/* from xorg-server 1.18 compiler.h */
+struct local__una_u32 { uint32_t x __attribute__((packed)); };
+/* Avoid conflicts with older versions of compiler.h */
#define ldw_u xldw_u
#define ldl_u xldl_u
#define stl_u xstl_u
@@ -224,20 +226,21 @@ VOID IndirectIOCommand_CLEAR(PARSER_TEMP
static __inline__ uint16_t ldw_u(uint16_t *p)
{
uint16_t ret;
- memmove(&ret, p, sizeof(ret));
+ memmove(&ret, p, sizeof(*p));
return ret;
}
static __inline__ uint32_t ldl_u(uint32_t *p)
{
uint32_t ret;
- memmove(&ret, p, sizeof(ret));
+ memmove(&ret, p, sizeof(*p));
return ret;
}
static __inline__ void stl_u(uint32_t val, uint32_t *p)
{
- memmove(p, &val, sizeof(*p));
+ struct local__una_u32 *ptr = (struct local__una_u32 *) p;
+ ptr->x = val;
}
UINT32 IndirectInputOutput(PARSER_TEMP_DATA STACK_BASED * pParserTempData)
