andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'alanc/master'

Browse Source
This commit is contained in:
Keith Packard 2012-06-14 13:04:29 -07:00
commit 8dc70acbf3
3 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/dmx/dmx.c
View File

@ -74,8 +74,9 @@ _DMXXineramaActive(void)
{
#ifdef PANORAMIX
return !noPanoramiXExtension;
#endif
#else
return 0;
#endif
}
static void

17
hw/xfree86/common/compiler.h
View File

@ -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__ */

2
hw/xfree86/fbdevhw/fbdevhwstub.c
View File

@ -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)
{
}