xserver: Branch 'master' - 4 commits

[Keith Packard]

 hw/dmx/dmx.c                     |    3 ++-
 hw/xfree86/common/compiler.h     |   17 +++++++++++++++++
 hw/xfree86/fbdevhw/fbdevhwstub.c |    2 +-
 3 files changed, 20 insertions(+), 2 deletions(-)

New commits:
commit 8dc70acbf3d82611ac9ec1ec2a52edcc01934850
Merge: ffb47a1... b59adc9...
Author: Keith Packard <keithp at keithp.com>
Date:   Thu Jun 14 13:04:29 2012 -0700

    Merge remote-tracking branch 'alanc/master'

commit b59adc9c2427e5efac3513c20992723e23f92691
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Thu Jun 7 20:58:01 2012 -0700

    Make stub version of fbdevHWAdjustFrame match new prototype in fbdevhw.h
    
    Removed flags argument to match api rework in commit 1f0e8bd5eb1a55
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Reviewed-by: Dave Airlie <airlied at redhat.com>

diff --git a/hw/xfree86/fbdevhw/fbdevhwstub.c b/hw/xfree86/fbdevhw/fbdevhwstub.c
index b7b4d2e..7d554e6 100644
--- a/hw/xfree86/fbdevhw/fbdevhwstub.c
+++ b/hw/xfree86/fbdevhw/fbdevhwstub.c
@@ -143,7 +143,7 @@ fbdevHWSwitchMode(ScrnInfoPtr pScrn, DisplayModePtr mode)
 }
 
 void
-fbdevHWAdjustFrame(ScrnInfoPtr pScrn, int x, int y, int flags)
+fbdevHWAdjustFrame(ScrnInfoPtr pScrn, int x, int y)
 {
 }
 
commit f20a532ba3c7b7d74530f3906c7bacf016bb8faf
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sun May 20 00:00:59 2012 -0700

    Fix statement not reached warning in _DMXXineramaActive
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Reviewed-by: Mark Kettenis <kettenis at openbsd.org>

diff --git a/hw/dmx/dmx.c b/hw/dmx/dmx.c
index add0e53..a226c5d 100644
--- a/hw/dmx/dmx.c
+++ b/hw/dmx/dmx.c
@@ -74,8 +74,9 @@ _DMXXineramaActive(void)
 {
 #ifdef PANORAMIX
     return !noPanoramiXExtension;
-#endif
+#else
     return 0;
+#endif
 }
 
 static void
commit 1be317c4e5d99d11a124ad4e7a90a5dcae591e20
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Wed May 23 19:27:23 2012 -0700

    Provide prototypes for Mmio functions for Solaris Studio on SPARC
    
    Actual inline implementations are provided via external *.il files
    generated from *.S files in hw/xfree86/os-support/solaris
    
    Fixes missing prototype warnings that xorg-macros has recently elevated
    to build-breaking errors.
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Signed-off-by: Henry Zhao <henry.zhao at oracle.com>
    Reviewed-by: Dave Airlie <airlied at redhat.com>

diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
index 0abdfb6..c980bee 100644
--- a/hw/xfree86/common/compiler.h
+++ b/hw/xfree86/common/compiler.h
@@ -119,6 +119,23 @@ extern _X_EXPORT unsigned int inb(unsigned long);
 extern _X_EXPORT unsigned int inw(unsigned long);
 extern _X_EXPORT unsigned int inl(unsigned long);
 
+#ifdef __SUNPRO_C
+extern _X_EXPORT unsigned char  xf86ReadMmio8    (void *, unsigned long);
+extern _X_EXPORT unsigned short xf86ReadMmio16Be (void *, unsigned long);
+extern _X_EXPORT unsigned short xf86ReadMmio16Le (void *, unsigned long);
+extern _X_EXPORT unsigned int   xf86ReadMmio32Be (void *, unsigned long);
+extern _X_EXPORT unsigned int   xf86ReadMmio32Le (void *, unsigned long);
+extern _X_EXPORT void xf86WriteMmio8    (void *, unsigned long, unsigned int);
+extern _X_EXPORT void xf86WriteMmio16Be (void *, unsigned long, unsigned int);
+extern _X_EXPORT void xf86WriteMmio16Le (void *, unsigned long, unsigned int);
+extern _X_EXPORT void xf86WriteMmio32Be (void *, unsigned long, unsigned int);
+extern _X_EXPORT void xf86WriteMmio32Le (void *, unsigned long, unsigned int);
+extern _X_EXPORT void xf86WriteMmio8NB    (void *, unsigned long, unsigned int);
+extern _X_EXPORT void xf86WriteMmio16BeNB (void *, unsigned long, unsigned int);
+extern _X_EXPORT void xf86WriteMmio16LeNB (void *, unsigned long, unsigned int);
+extern _X_EXPORT void xf86WriteMmio32BeNB (void *, unsigned long, unsigned int);
+extern _X_EXPORT void xf86WriteMmio32LeNB (void *, unsigned long, unsigned int);
+#endif                          /* _SUNPRO_C */
 #endif                          /* __sparc__,  __arm32__, __alpha__, __nds32__ */
 #endif                          /* __arm__ */