diff options
author | marha <marha@users.sourceforge.net> | 2014-01-15 21:37:10 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2014-01-15 21:37:10 +0100 |
commit | b7f01cb1f6cfd1ec301f650a073436c91ec614aa (patch) | |
tree | 1dbf32344313ad7e5884e6686251cad398a231fa /xorg-server/hw/xfree86/os-support/linux/lnx_ev56.c | |
parent | 7b4b94b4449aec056c4c92f5cacc2f89a292a80e (diff) | |
parent | 1b0fcca503ae9cf2d462b60770f96c794dfbb27a (diff) | |
download | vcxsrv-b7f01cb1f6cfd1ec301f650a073436c91ec614aa.tar.gz vcxsrv-b7f01cb1f6cfd1ec301f650a073436c91ec614aa.tar.bz2 vcxsrv-b7f01cb1f6cfd1ec301f650a073436c91ec614aa.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa xkeyboard-config xserver git update 15 jan 2014
randrproto libfontenc mesa xserver git update 10 Jan 2014
randsrproto fontconfig libX11 git update 6 Jan 2014
Conflicts:
mesalib/src/glsl/builtin_functions.cpp
mesalib/src/glsl/ir_builder.h
xorg-server/Xext/xres.c
xorg-server/dix/dispatch.c
xorg-server/dix/dixfonts.c
xorg-server/hw/xwin/wingc.c
xorg-server/hw/xwin/winwindowswm.c
xorg-server/include/gc.h
xorg-server/os/access.c
Diffstat (limited to 'xorg-server/hw/xfree86/os-support/linux/lnx_ev56.c')
-rw-r--r-- | xorg-server/hw/xfree86/os-support/linux/lnx_ev56.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/xorg-server/hw/xfree86/os-support/linux/lnx_ev56.c b/xorg-server/hw/xfree86/os-support/linux/lnx_ev56.c index 49950705a..b6950009c 100644 --- a/xorg-server/hw/xfree86/os-support/linux/lnx_ev56.c +++ b/xorg-server/hw/xfree86/os-support/linux/lnx_ev56.c @@ -6,77 +6,77 @@ #include "xf86.h" #include "compiler.h" -int readDense8(pointer Base, register unsigned long Offset); -int readDense16(pointer Base, register unsigned long Offset); -int readDense32(pointer Base, register unsigned long Offset); +int readDense8(void *Base, register unsigned long Offset); +int readDense16(void *Base, register unsigned long Offset); +int readDense32(void *Base, register unsigned long Offset); void - writeDenseNB8(int Value, pointer Base, register unsigned long Offset); + writeDenseNB8(int Value, void *Base, register unsigned long Offset); void - writeDenseNB16(int Value, pointer Base, register unsigned long Offset); + writeDenseNB16(int Value, void *Base, register unsigned long Offset); void - writeDenseNB32(int Value, pointer Base, register unsigned long Offset); + writeDenseNB32(int Value, void *Base, register unsigned long Offset); void - writeDense8(int Value, pointer Base, register unsigned long Offset); + writeDense8(int Value, void *Base, register unsigned long Offset); void - writeDense16(int Value, pointer Base, register unsigned long Offset); + writeDense16(int Value, void *Base, register unsigned long Offset); void - writeDense32(int Value, pointer Base, register unsigned long Offset); + writeDense32(int Value, void *Base, register unsigned long Offset); int -readDense8(pointer Base, register unsigned long Offset) +readDense8(void *Base, register unsigned long Offset) { mem_barrier(); return *(volatile CARD8 *) ((unsigned long) Base + (Offset)); } int -readDense16(pointer Base, register unsigned long Offset) +readDense16(void *Base, register unsigned long Offset) { mem_barrier(); return *(volatile CARD16 *) ((unsigned long) Base + (Offset)); } int -readDense32(pointer Base, register unsigned long Offset) +readDense32(void *Base, register unsigned long Offset) { mem_barrier(); return *(volatile CARD32 *) ((unsigned long) Base + (Offset)); } void -writeDenseNB8(int Value, pointer Base, register unsigned long Offset) +writeDenseNB8(int Value, void *Base, register unsigned long Offset) { *(volatile CARD8 *) ((unsigned long) Base + (Offset)) = Value; } void -writeDenseNB16(int Value, pointer Base, register unsigned long Offset) +writeDenseNB16(int Value, void *Base, register unsigned long Offset) { *(volatile CARD16 *) ((unsigned long) Base + (Offset)) = Value; } void -writeDenseNB32(int Value, pointer Base, register unsigned long Offset) +writeDenseNB32(int Value, void *Base, register unsigned long Offset) { *(volatile CARD32 *) ((unsigned long) Base + (Offset)) = Value; } void -writeDense8(int Value, pointer Base, register unsigned long Offset) +writeDense8(int Value, void *Base, register unsigned long Offset) { write_mem_barrier(); *(volatile CARD8 *) ((unsigned long) Base + (Offset)) = Value; } void -writeDense16(int Value, pointer Base, register unsigned long Offset) +writeDense16(int Value, void *Base, register unsigned long Offset) { write_mem_barrier(); *(volatile CARD16 *) ((unsigned long) Base + (Offset)) = Value; } void -writeDense32(int Value, pointer Base, register unsigned long Offset) +writeDense32(int Value, void *Base, register unsigned long Offset) { write_mem_barrier(); *(volatile CARD32 *) ((unsigned long) Base + (Offset)) = Value; |