Attachment #532658 for bug #548906

View | Details | Raw Unified | Return to bug 548906
Collapse All | Expand All




		XORG_OS_SUBDIR="linux"
		linux_acpi="no"
		case $host_cpu in
		  alpha*)
		  	linux_alpha=yes
			;;
		  i*86|amd64*|x86_64*|ia64*)
			linux_acpi=$enable_linux_acpi
			;;

AM_CONDITIONAL([XORG_BUS_PCI], [test "x$PCI" = xyes])
AM_CONDITIONAL([XORG_BUS_BSDPCI], [test "x$xorg_bus_bsdpci" = xyes])
AM_CONDITIONAL([XORG_BUS_SPARC], [test "x$xorg_bus_sparc" = xyes])
AM_CONDITIONAL([LINUX_ALPHA], [test "x$linux_alpha" = xyes])
AM_CONDITIONAL([LNXACPI], [test "x$linux_acpi" = xyes])
AM_CONDITIONAL([LNXAPM], [test "x$linux_apm" = xyes])
AM_CONDITIONAL([SOLARIS_VT], [test "x$solaris_vt" = xyes])




#endif

#ifdef __alpha__
static inline int
xf86ReadMmio8(void *Base, unsigned long Offset)
{
    mem_barrier();
    return *(CARD8 *) ((unsigned long) Base + (Offset));
}

static inline int
xf86ReadMmio16(void *Base, unsigned long Offset)
{
    mem_barrier();
    return *(CARD16 *) ((unsigned long) Base + (Offset));
}

static inline int
xf86ReadMmio32(void *Base, unsigned long Offset)
{
    mem_barrier();
    return *(CARD32 *) ((unsigned long) Base + (Offset));
}

static inline void
xf86WriteMmio8(int Value, void *Base, unsigned long Offset)
{
    write_mem_barrier();
    *(CARD8 *) ((unsigned long) Base + (Offset)) = Value;
}

static inline void
xf86WriteMmio16(int Value, void *Base, unsigned long Offset)
{
    write_mem_barrier();
    *(CARD16 *) ((unsigned long) Base + (Offset)) = Value;
}

static inline void
xf86WriteMmio32(int Value, void *Base, unsigned long Offset)
{
    write_mem_barrier();
    *(CARD32 *) ((unsigned long) Base + (Offset)) = Value;
}

extern _X_EXPORT void xf86SlowBCopyFromBus(unsigned char *, unsigned char *,
                                           int);
extern _X_EXPORT void xf86SlowBCopyToBus(unsigned char *, unsigned char *, int);

/* Some macros to hide the system dependencies for MMIO accesses */
/* Changed to kill noise generated by gcc's -Wcast-align */
#define MMIO_IN8(base, offset) xf86ReadMmio8(base, offset)
#define MMIO_IN16(base, offset) xf86ReadMmio16(base, offset)
#define MMIO_IN32(base, offset) xf86ReadMmio32(base, offset)

#define MMIO_OUT32(base, offset, val) \
    do { \
	write_mem_barrier(); \
	*(volatile CARD32 *)(void *)(((CARD8*)(base)) + (offset)) = (val); \
    } while (0)

#define MMIO_OUT8(base, offset, val) \
    xf86WriteMmio8((CARD8)(val), base, offset)
#define MMIO_OUT16(base, offset, val) \
    xf86WriteMmio16((CARD16)(val), base, offset)
#define MMIO_OUT32(base, offset, val) \
    xf86WriteMmio32((CARD32)(val), base, offset)

#elif defined(__powerpc__) || defined(__sparc__)
 /*

Lines 26-33 endif Link Here

(-)a/hw/xfree86/os-support/bsd/Makefile.am (-2 / +1 lines)
26	if ALPHA_VIDEO	26	if ALPHA_VIDEO
27	# Cheat here and piggyback other alpha bits on ALPHA_VIDEO.	27	# Cheat here and piggyback other alpha bits on ALPHA_VIDEO.
28	ARCH_SOURCES = \	28	ARCH_SOURCES = \
29	alpha_video.c \	29	alpha_video.c
30	bsd_ev56.c
31	endif	30	endif
32		31
33	if ARM_VIDEO	32	if ARM_VIDEO




noinst_LTLIBRARIES = liblinux.la

if LINUX_ALPHA
noinst_LTLIBRARIES += liblinuxev56.la

liblinuxev56_la_CFLAGS = $(AM_CFLAGS) -mcpu=ev56

liblinuxev56_la_SOURCES = lnx_ev56.c
endif

if LNXACPI
ACPI_SRCS = lnx_acpi.c
if !LNXAPM

AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES)

AM_CPPFLAGS = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS)

if LINUX_ALPHA
liblinux_la_LIBADD = liblinuxev56.la
endif





    ExtendedEnabled = FALSE;
}

#if defined (__alpha__)

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;

#endif                          /* __alpha__ */

Lines 100-106 elif host_machine.system().endswith('bsd') Link Here

(-)a/hw/xfree86/os-support/meson.build (-2 lines)
100	srcs_xorg_os_support += 'shared/ioperm_noop.c'	100	srcs_xorg_os_support += 'shared/ioperm_noop.c'
101	elif host_machine.cpu_family() == 'alpha'	101	elif host_machine.cpu_family() == 'alpha'
102	srcs_xorg_os_support += 'bsd/alpha_video.c'	102	srcs_xorg_os_support += 'bsd/alpha_video.c'
103	srcs_xorg_os_support += 'bsd/bsd_ev56.c'
104	endif	103	endif
105		104
106	if host_machine.system() == 'freebsd'	105	if host_machine.system() == 'freebsd'
107	-

Return to bug 548906

Lines 1908-1916 if test "x$XORG" = xyes; then Link Here

(-)a/configure.ac (-4 lines)
1908	XORG_OS_SUBDIR="linux"	1908	XORG_OS_SUBDIR="linux"
1909	linux_acpi="no"	1909	linux_acpi="no"
1910	case $host_cpu in	1910	case $host_cpu in
1911	alpha*)
1912	linux_alpha=yes
1913	;;
1914	i86\|amd64\|x86_64\|ia64)	1911	i86\|amd64\|x86_64\|ia64)
1915	linux_acpi=$enable_linux_acpi	1912	linux_acpi=$enable_linux_acpi
1916	;;	1913	;;
Lines 2075-2081 AM_CONDITIONAL([XORG], [test "x$XORG" = xyes]) Link Here
2075	AM_CONDITIONAL([XORG_BUS_PCI], [test "x$PCI" = xyes])	2072	AM_CONDITIONAL([XORG_BUS_PCI], [test "x$PCI" = xyes])
2076	AM_CONDITIONAL([XORG_BUS_BSDPCI], [test "x$xorg_bus_bsdpci" = xyes])	2073	AM_CONDITIONAL([XORG_BUS_BSDPCI], [test "x$xorg_bus_bsdpci" = xyes])
2077	AM_CONDITIONAL([XORG_BUS_SPARC], [test "x$xorg_bus_sparc" = xyes])	2074	AM_CONDITIONAL([XORG_BUS_SPARC], [test "x$xorg_bus_sparc" = xyes])
2078	AM_CONDITIONAL([LINUX_ALPHA], [test "x$linux_alpha" = xyes])
2079	AM_CONDITIONAL([LNXACPI], [test "x$linux_acpi" = xyes])	2075	AM_CONDITIONAL([LNXACPI], [test "x$linux_acpi" = xyes])
2080	AM_CONDITIONAL([LNXAPM], [test "x$linux_apm" = xyes])	2076	AM_CONDITIONAL([LNXAPM], [test "x$linux_apm" = xyes])
2081	AM_CONDITIONAL([SOLARIS_VT], [test "x$solaris_vt" = xyes])	2077	AM_CONDITIONAL([SOLARIS_VT], [test "x$solaris_vt" = xyes])

Lines 986-1018 inl(unsigned PORT_SIZE port) Link Here

(-)a/hw/xfree86/common/compiler.h (-18 / +49 lines)
986	#endif	986	#endif
987		987
988	#ifdef __alpha__	988	#ifdef __alpha__
989	/* entry points for Mmio memory access routines */	989	static inline int
990	extern _X_EXPORT int (xf86ReadMmio8) (void , unsigned long);	990	xf86ReadMmio8(void *Base, unsigned long Offset)
991	extern _X_EXPORT int (xf86ReadMmio16) (void , unsigned long);	991	{
992	extern _X_EXPORT int (xf86ReadMmio32) (void , unsigned long);	992	mem_barrier();
993	extern _X_EXPORT void (xf86WriteMmio8) (int, void , unsigned long);	993	return (CARD8 ) ((unsigned long) Base + (Offset));
994	extern _X_EXPORT void (xf86WriteMmio16) (int, void , unsigned long);	994	}
995	extern _X_EXPORT void (xf86WriteMmio32) (int, void , unsigned long);	995
		996	static inline int
		997	xf86ReadMmio16(void *Base, unsigned long Offset)
		998	{
		999	mem_barrier();
		1000	return (CARD16 ) ((unsigned long) Base + (Offset));
		1001	}
		1002
		1003	static inline int
		1004	xf86ReadMmio32(void *Base, unsigned long Offset)
		1005	{
		1006	mem_barrier();
		1007	return (CARD32 ) ((unsigned long) Base + (Offset));
		1008	}
		1009
		1010	static inline void
		1011	xf86WriteMmio8(int Value, void *Base, unsigned long Offset)
		1012	{
		1013	write_mem_barrier();
		1014	(CARD8 ) ((unsigned long) Base + (Offset)) = Value;
		1015	}
		1016
		1017	static inline void
		1018	xf86WriteMmio16(int Value, void *Base, unsigned long Offset)
		1019	{
		1020	write_mem_barrier();
		1021	(CARD16 ) ((unsigned long) Base + (Offset)) = Value;
		1022	}
		1023
		1024	static inline void
		1025	xf86WriteMmio32(int Value, void *Base, unsigned long Offset)
		1026	{
		1027	write_mem_barrier();
		1028	(CARD32 ) ((unsigned long) Base + (Offset)) = Value;
		1029	}
		1030
996	extern _X_EXPORT void xf86SlowBCopyFromBus(unsigned char , unsigned char ,	1031	extern _X_EXPORT void xf86SlowBCopyFromBus(unsigned char , unsigned char ,
997	int);	1032	int);
998	extern _X_EXPORT void xf86SlowBCopyToBus(unsigned char , unsigned char , int);	1033	extern _X_EXPORT void xf86SlowBCopyToBus(unsigned char , unsigned char , int);
999		1034
1000	/* Some macros to hide the system dependencies for MMIO accesses */	1035	/* Some macros to hide the system dependencies for MMIO accesses */
1001	/* Changed to kill noise generated by gcc's -Wcast-align */	1036	/* Changed to kill noise generated by gcc's -Wcast-align */
1002	#define MMIO_IN8(base, offset) (*xf86ReadMmio8)(base, offset)	1037	#define MMIO_IN8(base, offset) xf86ReadMmio8(base, offset)
1003	#define MMIO_IN16(base, offset) (*xf86ReadMmio16)(base, offset)	1038	#define MMIO_IN16(base, offset) xf86ReadMmio16(base, offset)
1004	#define MMIO_IN32(base, offset) (*xf86ReadMmio32)(base, offset)	1039	#define MMIO_IN32(base, offset) xf86ReadMmio32(base, offset)
1005
1006	#define MMIO_OUT32(base, offset, val) \
1007	do { \
1008	write_mem_barrier(); \
1009	(volatile CARD32 )(void )(((CARD8)(base)) + (offset)) = (val); \
1010	} while (0)
1011		1040
1012	#define MMIO_OUT8(base, offset, val) \	1041	#define MMIO_OUT8(base, offset, val) \
1013	(*xf86WriteMmio8)((CARD8)(val), base, offset)	1042	xf86WriteMmio8((CARD8)(val), base, offset)
1014	#define MMIO_OUT16(base, offset, val) \	1043	#define MMIO_OUT16(base, offset, val) \
1015	(*xf86WriteMmio16)((CARD16)(val), base, offset)	1044	xf86WriteMmio16((CARD16)(val), base, offset)
		1045	#define MMIO_OUT32(base, offset, val) \
		1046	xf86WriteMmio32((CARD32)(val), base, offset)
1016		1047
1017	#elif defined(__powerpc__) \|\| defined(__sparc__)	1048	#elif defined(__powerpc__) \|\| defined(__sparc__)
1018	/*	1049	/*

Lines 166-195 xf86DisableIO(void) Link Here

(-)a/hw/xfree86/os-support/linux/lnx_video.c (-27 lines)
166		166
167	ExtendedEnabled = FALSE;	167	ExtendedEnabled = FALSE;
168	}	168	}
169
170	#if defined (__alpha__)
171
172	extern int readDense8(void *Base, register unsigned long Offset);
173	extern int readDense16(void *Base, register unsigned long Offset);
174	extern int readDense32(void *Base, register unsigned long Offset);
175	extern void
176	writeDense8(int Value, void *Base, register unsigned long Offset);
177	extern void
178	writeDense16(int Value, void *Base, register unsigned long Offset);
179	extern void
180	writeDense32(int Value, void *Base, register unsigned long Offset);
181
182	void (xf86WriteMmio8) (int Value, void Base, unsigned long Offset)
183	= writeDense8;
184	void (xf86WriteMmio16) (int Value, void Base, unsigned long Offset)
185	= writeDense16;
186	void (xf86WriteMmio32) (int Value, void Base, unsigned long Offset)
187	= writeDense32;
188	int (xf86ReadMmio8) (void Base, unsigned long Offset)
189	= readDense8;
190	int (xf86ReadMmio16) (void Base, unsigned long Offset)
191	= readDense16;
192	int (xf86ReadMmio32) (void Base, unsigned long Offset)
193	= readDense32;
194
195	#endif /* __alpha__ */

Lines 1-13 Link Here

(-)a/hw/xfree86/os-support/linux/Makefile.am (-12 lines)
1	noinst_LTLIBRARIES = liblinux.la	1	noinst_LTLIBRARIES = liblinux.la
2		2
3	if LINUX_ALPHA
4	noinst_LTLIBRARIES += liblinuxev56.la
5
6	liblinuxev56_la_CFLAGS = $(AM_CFLAGS) -mcpu=ev56
7
8	liblinuxev56_la_SOURCES = lnx_ev56.c
9	endif
10
11	if LNXACPI	3	if LNXACPI
12	ACPI_SRCS = lnx_acpi.c	4	ACPI_SRCS = lnx_acpi.c
13	if !LNXAPM	5	if !LNXAPM
Lines 39-45 liblinux_la_SOURCES = linux.h lnx_init.c lnx_video.c \ Link Here
39	AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES)	31	AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES)
40		32
41	AM_CPPFLAGS = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS)	33	AM_CPPFLAGS = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS)
42
43	if LINUX_ALPHA
44	liblinux_la_LIBADD = liblinuxev56.la
45	endif