[pkgsrc/trunk]: pkgsrc/x11/xf86-video-ati6 Since some alignment functions wer...

[richard <richard%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/83a7924a2f62
branches:  trunk
changeset: 352051:83a7924a2f62
user:      richard <richard%pkgsrc.org@localhost>
date:      Mon Sep 05 12:08:53 2016 +0000

description:
Since some alignment functions were moved out of compiler.h,
simply copy them locally in Operations.c

diffstat:

 x11/xf86-video-ati6/distinfo                                    |   3 +-
 x11/xf86-video-ati6/patches/patch-src_AtomBios_CD__Operations.c |  56 ++++++++++
 2 files changed, 58 insertions(+), 1 deletions(-)

diffs (76 lines):

diff -r f11954b0101b -r 83a7924a2f62 x11/xf86-video-ati6/distinfo
--- a/x11/xf86-video-ati6/distinfo      Mon Sep 05 11:43:23 2016 +0000
+++ b/x11/xf86-video-ati6/distinfo      Mon Sep 05 12:08:53 2016 +0000
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.8 2015/11/04 03:29:01 agc Exp $
+$NetBSD: distinfo,v 1.9 2016/09/05 12:08:53 richard Exp $
 
 SHA1 (xf86-video-ati-6.14.6.tar.bz2) = b30383c7e5487c1df403a3af19fce8626d617a8d
 RMD160 (xf86-video-ati-6.14.6.tar.bz2) = e285bff97a23f6e6f8553f1c010c840e6df882a8
 SHA512 (xf86-video-ati-6.14.6.tar.bz2) = 7ed64bb3596703f7c575aec37a6918bac251819fe638acc66a29aab7648d8a81dedd8d416f970faa1f757fa8e9e3ccdc43e4499d06271cc2751288040d1d957e
 Size (xf86-video-ati-6.14.6.tar.bz2) = 1139495 bytes
 SHA1 (patch-configure.ac) = a7a99e75acc2f6f962fe7cfed084c7451a89c45c
+SHA1 (patch-src_AtomBios_CD__Operations.c) = bf368936c44dd3f8daf0d79348783268ad9701e0
 SHA1 (patch-src_atombios__crtc.c) = e6ec24fdc63e3744db9442ab5e12ffe6949eef19
 SHA1 (patch-src_atombios__output.c) = ce3720c1d1cfd1f65023cea2745259af30a59add
 SHA1 (patch-src_legacy__crtc.c) = 6be802fa29797265efeceaadec9607de334dbfc8
diff -r f11954b0101b -r 83a7924a2f62 x11/xf86-video-ati6/patches/patch-src_AtomBios_CD__Operations.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xf86-video-ati6/patches/patch-src_AtomBios_CD__Operations.c   Mon Sep 05 12:08:53 2016 +0000
@@ -0,0 +1,56 @@
+$NetBSD: patch-src_AtomBios_CD__Operations.c,v 1.1 2016/09/05 12:08:53 richard Exp $
+
+since some alignment functions were moved out of compiler.h,
+simply copy them here.
+
+--- src/AtomBios/CD_Operations.c.orig  2012-06-25 08:19:41.000000000 +0000
++++ src/AtomBios/CD_Operations.c
+@@ -43,7 +43,7 @@ Revision History:
+ #include <X11/Xos.h>
+ #include "xorg-server.h"
+ #include "compiler.h"
+-
++#include <string.h>   /* needed for memmove */
+ #include "Decoder.h"
+ 
+ VOID PutDataRegister(PARSER_TEMP_DATA STACK_BASED * pParserTempData);
+@@ -73,6 +73,39 @@ UINT32 GetParametersDirect(PARSER_TEMP_D
+ UINT16* GetDataMasterTablePointer(DEVICE_DATA STACK_BASED*  pDeviceData);
+ UINT8 GetTrueIndexInMasterTable(PARSER_TEMP_DATA STACK_BASED * pParserTempData, UINT8 IndexInMasterTable);
+ 
++static __inline__ uint32_t
++ldl_u(uint32_t * p)
++{
++    uint32_t ret;
++
++    memmove(&ret, p, sizeof(*p));
++    return ret;
++}
++
++static __inline__ uint16_t
++ldw_u(uint16_t * p)
++{
++    uint16_t ret;
++
++    memmove(&ret, p, sizeof(*p));
++    return ret;
++}
++
++static __inline__ void
++stl_u(uint32_t val, uint32_t * p)
++{
++    uint32_t tmp = val;
++
++    memmove(p, &tmp, sizeof(*p));
++}
++
++static __inline__ void
++stw_u(uint16_t val, uint16_t * p)
++{
++    uint16_t tmp = val;
++
++    memmove(p, &tmp, sizeof(*p));
++}
+ 
+ WRITE_IO_FUNCTION WritePCIFunctions[8] =   {
+     WritePCIReg32,