diff options
| author | Keith Packard <keithp@keithp.com> | 2012-06-14 13:04:29 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-06-14 13:04:29 -0700 |
| commit | 8dc70acbf3d82611ac9ec1ec2a52edcc01934850 (patch) | |
| tree | d91865d9bac7def9613b9a97b015542a424ac01d /hw | |
| parent | ffb47a123ddd1233fb4229cf23483652065c5e82 (diff) | |
| parent | b59adc9c2427e5efac3513c20992723e23f92691 (diff) | |
Merge remote-tracking branch 'alanc/master'
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/dmx/dmx.c | 3 | ||||
| -rw-r--r-- | hw/xfree86/common/compiler.h | 17 | ||||
| -rw-r--r-- | hw/xfree86/fbdevhw/fbdevhwstub.c | 2 |
3 files changed, 20 insertions, 2 deletions
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 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__ */ 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) { } |