]>
Commit | Line | Data |
---|---|---|
af232f23 JB |
1 | --- SVGATextMode-1.10/XFREE/Makefile.orig Sun Sep 3 00:50:02 2000 |
2 | +++ SVGATextMode-1.10/XFREE/Makefile Fri Aug 16 10:28:42 2002 | |
c880297f | 3 | @@ -22,11 +22,11 @@ |
af232f23 JB |
4 | mach64/mach64_mem_access.o mach64/mach64.o \ |
5 | riva128_clock.o \ | |
c880297f | 6 | voodoo_clock.o \ |
af232f23 JB |
7 | - xfree_compat.o |
8 | + xfree_compat.o \ | |
9 | + common_hw/IODelay.o | |
10 | ||
11 | # mach64/mach64clockchips.o \ | |
12 | ||
13 | -ASMOBJS = common_hw/IODelay.o | |
14 | ||
15 | ||
16 | all: $(XFREELIBS) $(OBJECTS) $(ASMOBJS) | |
17 | --- SVGATextMode-1.10/asm/io.h.orig Tue Apr 15 21:10:46 1997 | |
18 | +++ SVGATextMode-1.10/asm/io.h Fri Aug 16 10:52:22 2002 | |
19 | @@ -1,6 +1,30 @@ | |
20 | #ifndef _ASM_IO_H | |
21 | #define _ASM_IO_H | |
22 | ||
23 | +#ifdef __alpha__ | |
24 | + | |
25 | +#include <sys/io.h> | |
26 | +#ifndef inb_p | |
27 | +# define inb_p inb | |
28 | +#endif | |
29 | +#ifndef inw_p | |
30 | +# define inw_p inw | |
31 | +#endif | |
32 | +#ifndef inl_p | |
33 | +# define inl_p inl | |
34 | +#endif | |
35 | +#ifndef outb_p | |
36 | +# define outb_p outb | |
37 | +#endif | |
38 | +#ifndef outw_p | |
39 | +# define outw_p outw | |
40 | +#endif | |
41 | +#ifndef outl_p | |
42 | +# define outl_p outl | |
43 | +#endif | |
44 | + | |
45 | +#else /* __alpha__ */ | |
46 | + | |
47 | /* | |
48 | * This file contains the definitions for the x86 IO instructions | |
49 | * inb/inw/inl/outb/outw/outl. | |
50 | @@ -72,4 +96,6 @@ | |
51 | #define outb_p(v,p) outb(p,v);inb(0x80) | |
52 | #define inb_p(p) inb(p),inb(0x80) | |
53 | ||
54 | +#endif /* __alpha__ */ | |
55 | + | |
56 | #endif |