mirror of
https://github.com/X11Libre/xserver.git
synced 2026-09-26 21:12:25 +00:00
Fix breakage on alpha caused by c7680befe5
Pinpointed by by Michael Cree.
Commit c7680befe5 removed Jensen support, but at the same time broke
support for dense memory systems.
Signed-off-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
parent
aa07957373
commit
9625f6d328
1 changed files with 39 additions and 23 deletions
|
|
@ -59,16 +59,24 @@ xf86SlowBcopy(unsigned char *src, unsigned char *dst, int len)
|
|||
|
||||
#ifdef linux
|
||||
|
||||
unsigned long _bus_base(void);
|
||||
|
||||
#define useSparse() (!_bus_base())
|
||||
|
||||
#define SPARSE (7)
|
||||
|
||||
#else
|
||||
|
||||
#define useSparse() 0
|
||||
|
||||
#define SPARSE 0
|
||||
|
||||
#endif
|
||||
|
||||
void
|
||||
xf86SlowBCopyFromBus(unsigned char *src, unsigned char *dst, int count)
|
||||
{
|
||||
if (useSparse())
|
||||
{
|
||||
unsigned long addr;
|
||||
long result;
|
||||
|
|
@ -83,9 +91,14 @@ xf86SlowBCopyFromBus(unsigned char *src, unsigned char *dst, int count)
|
|||
outb(0x80, 0x00);
|
||||
}
|
||||
}
|
||||
else
|
||||
xf86SlowBcopy(src, dst, count);
|
||||
}
|
||||
|
||||
void
|
||||
xf86SlowBCopyToBus(unsigned char *src, unsigned char *dst, int count)
|
||||
{
|
||||
if (useSparse())
|
||||
{
|
||||
unsigned long addr;
|
||||
|
||||
|
|
@ -98,4 +111,7 @@ xf86SlowBCopyToBus(unsigned char *src, unsigned char *dst, int count)
|
|||
outb(0x80, 0x00);
|
||||
}
|
||||
}
|
||||
else
|
||||
xf86SlowBcopy(src, dst, count);
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in a new issue