mirror of
https://github.com/X11Libre/xserver.git
synced 2026-10-26 01:59:57 +00:00
Revert "alpha: kill xf86SlowBCopyToBus and xf86SlowBCopyFromBus"
The vesa driver still uses slowbcopy_frombus and slowbcopy_tobus.
This reverts commit 5ef53a94ce.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
parent
6676f49e34
commit
aa07957373
4 changed files with 77 additions and 9 deletions
|
|
@ -1211,6 +1211,8 @@ extern _X_EXPORT void (*xf86WriteMmio32)(int, void *, unsigned long);
|
|||
extern _X_EXPORT void (*xf86WriteMmioNB8)(int, void *, unsigned long);
|
||||
extern _X_EXPORT void (*xf86WriteMmioNB16)(int, void *, unsigned long);
|
||||
extern _X_EXPORT void (*xf86WriteMmioNB32)(int, void *, unsigned long);
|
||||
extern _X_EXPORT void xf86SlowBCopyFromBus(unsigned char *, unsigned char *, int);
|
||||
extern _X_EXPORT void xf86SlowBCopyToBus(unsigned char *, unsigned char *, int);
|
||||
|
||||
/* Some macros to hide the system dependencies for MMIO accesses */
|
||||
/* Changed to kill noise generated by gcc's -Wcast-align */
|
||||
|
|
@ -1342,4 +1344,18 @@ extern _X_EXPORT void (*xf86WriteMmioNB32)(int, void *, unsigned long);
|
|||
# define MMIO_MOVE32(base, offset, val) MMIO_OUT32(base, offset, val)
|
||||
|
||||
# endif /* __alpha__ */
|
||||
|
||||
/*
|
||||
* With Intel, the version in os-support/misc/SlowBcopy.s is used.
|
||||
* This avoids port I/O during the copy (which causes problems with
|
||||
* some hardware).
|
||||
*/
|
||||
# ifdef __alpha__
|
||||
# define slowbcopy_tobus(src,dst,count) xf86SlowBCopyToBus(src,dst,count)
|
||||
# define slowbcopy_frombus(src,dst,count) xf86SlowBCopyFromBus(src,dst,count)
|
||||
# else /* __alpha__ */
|
||||
# define slowbcopy_tobus(src,dst,count) xf86SlowBcopy(src,dst,count)
|
||||
# define slowbcopy_frombus(src,dst,count) xf86SlowBcopy(src,dst,count)
|
||||
# endif /* __alpha__ */
|
||||
|
||||
#endif /* _COMPILER_H */
|
||||
|
|
|
|||
Loading…
Reference in a new issue