From 1be317c4e5d99d11a124ad4e7a90a5dcae591e20 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Wed, 23 May 2012 19:27:23 -0700 Subject: [PATCH 1/3] 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 Signed-off-by: Henry Zhao Reviewed-by: Dave Airlie --- hw/xfree86/common/compiler.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h index 0abdfb6c3..c980beeb9 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__ */ From f20a532ba3c7b7d74530f3906c7bacf016bb8faf Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Sun, 20 May 2012 00:00:59 -0700 Subject: [PATCH 2/3] Fix statement not reached warning in _DMXXineramaActive Signed-off-by: Alan Coopersmith Reviewed-by: Mark Kettenis --- hw/dmx/dmx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/dmx/dmx.c b/hw/dmx/dmx.c index add0e5390..a226c5db1 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 From b59adc9c2427e5efac3513c20992723e23f92691 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Thu, 7 Jun 2012 20:58:01 -0700 Subject: [PATCH 3/3] 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 Reviewed-by: Dave Airlie --- hw/xfree86/fbdevhw/fbdevhwstub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/xfree86/fbdevhw/fbdevhwstub.c b/hw/xfree86/fbdevhw/fbdevhwstub.c index b7b4d2e7d..7d554e60a 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) { }