blob: 8a5f29ebd8630304044982d3f404c40efa7becd5 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
|
--- xorg-server-1.12.2.orig/hw/xfree86/common/compiler.h 2012-05-17 19:09:03.000000000 +0200
+++ xorg-server-1.12.2/hw/xfree86/common/compiler.h 2013-04-30 10:52:21.000000000 +0200
@@ -710,26 +710,26 @@ xf86WriteMmio32LeNB(__volatile__ void *b
#define PORT_SIZE short
#endif
-_X_EXPORT unsigned int IOPortBase; /* Memory mapped I/O port area */
+_X_EXPORT volatile unsigned char *ioBase; /* Memory mapped I/O port area */
static __inline__ void
outb(unsigned PORT_SIZE port, unsigned char val)
{
- *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) + IOPortBase) =
+ *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) + ioBase) =
val;
}
static __inline__ void
outw(unsigned PORT_SIZE port, unsigned short val)
{
- *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)) + IOPortBase) =
+ *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)) + ioBase) =
val;
}
static __inline__ void
outl(unsigned PORT_SIZE port, unsigned int val)
{
- *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) + IOPortBase) =
+ *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) + ioBase) =
val;
}
@@ -737,21 +737,21 @@ static __inline__ unsigned int
inb(unsigned PORT_SIZE port)
{
return *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) +
- IOPortBase);
+ ioBase);
}
static __inline__ unsigned int
inw(unsigned PORT_SIZE port)
{
return *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)) +
- IOPortBase);
+ ioBase);
}
static __inline__ unsigned int
inl(unsigned PORT_SIZE port)
{
return *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) +
- IOPortBase);
+ ioBase);
}
#if defined(__mips__)
|
