Module Name: xsrc
Committed By: mrg
Date: Fri Jun 21 21:34:48 UTC 2024
Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: compiler.h
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd:
alpha_video.c
Log Message:
fix build on alpha.
some clean up upstream didn't get tested on alpha it seems, with both
missing CARD8 etc identifiers as well as dead/duplicate code.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/alpha_video.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.20 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.21
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.20 Fri Jul 15 04:10:41 2022
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h Fri Jun 21 21:34:48 2024
@@ -952,6 +952,9 @@ inl(unsigned PORT_SIZE port)
#endif
#ifdef __alpha__
+
+#include <X11/Xmd.h>
+
static inline int
xf86ReadMmio8(void *Base, unsigned long Offset)
{
Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/alpha_video.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/alpha_video.c:1.6 xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/alpha_video.c:1.7
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/alpha_video.c:1.6 Sat Aug 5 06:03:26 2017
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/alpha_video.c Fri Jun 21 21:34:48 2024
@@ -212,26 +212,3 @@ xf86DisableIO()
}
#endif /* USE_ALPHA_PIO */
-
-extern int readDense8(void *Base, register unsigned long Offset);
-extern int readDense16(void *Base, register unsigned long Offset);
-extern int readDense32(void *Base, register unsigned long Offset);
-extern void
- writeDense8(int Value, void *Base, register unsigned long Offset);
-extern void
- writeDense16(int Value, void *Base, register unsigned long Offset);
-extern void
- writeDense32(int Value, void *Base, register unsigned long Offset);
-
-void (*xf86WriteMmio8) (int Value, void *Base, unsigned long Offset)
- = writeDense8;
-void (*xf86WriteMmio16) (int Value, void *Base, unsigned long Offset)
- = writeDense16;
-void (*xf86WriteMmio32) (int Value, void *Base, unsigned long Offset)
- = writeDense32;
-int (*xf86ReadMmio8) (void *Base, unsigned long Offset)
- = readDense8;
-int (*xf86ReadMmio16) (void *Base, unsigned long Offset)
- = readDense16;
-int (*xf86ReadMmio32) (void *Base, unsigned long Offset)
- = readDense32;
