From 81bd5041a2a6506d3ef14c58659cf29bc2bdd006 Mon Sep 17 00:00:00 2001 From: Tijl Coosemans Date: Mon, 20 Dec 2010 16:39:43 +0000 Subject: Merge amd64 and i386 bus.h and move the resulting header to x86. Replace the original amd64 and i386 headers with stubs. Rename (AMD64|I386)_BUS_SPACE_* to X86_BUS_SPACE_* everywhere. Reviewed by: imp (previous version), jhb Approved by: kib (mentor) --- sys/dev/uart/uart_cpu_amd64.c | 4 ++-- sys/dev/uart/uart_cpu_i386.c | 4 ++-- sys/dev/uart/uart_cpu_pc98.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'sys/dev/uart') diff --git a/sys/dev/uart/uart_cpu_amd64.c b/sys/dev/uart/uart_cpu_amd64.c index 3624f7973d5c..ce9cf7d61f1c 100644 --- a/sys/dev/uart/uart_cpu_amd64.c +++ b/sys/dev/uart/uart_cpu_amd64.c @@ -36,8 +36,8 @@ __FBSDID("$FreeBSD$"); #include #include -bus_space_tag_t uart_bus_space_io = AMD64_BUS_SPACE_IO; -bus_space_tag_t uart_bus_space_mem = AMD64_BUS_SPACE_MEM; +bus_space_tag_t uart_bus_space_io = X86_BUS_SPACE_IO; +bus_space_tag_t uart_bus_space_mem = X86_BUS_SPACE_MEM; int uart_cpu_eqres(struct uart_bas *b1, struct uart_bas *b2) diff --git a/sys/dev/uart/uart_cpu_i386.c b/sys/dev/uart/uart_cpu_i386.c index 0d0f0f71134f..ce9cf7d61f1c 100644 --- a/sys/dev/uart/uart_cpu_i386.c +++ b/sys/dev/uart/uart_cpu_i386.c @@ -36,8 +36,8 @@ __FBSDID("$FreeBSD$"); #include #include -bus_space_tag_t uart_bus_space_io = I386_BUS_SPACE_IO; -bus_space_tag_t uart_bus_space_mem = I386_BUS_SPACE_MEM; +bus_space_tag_t uart_bus_space_io = X86_BUS_SPACE_IO; +bus_space_tag_t uart_bus_space_mem = X86_BUS_SPACE_MEM; int uart_cpu_eqres(struct uart_bas *b1, struct uart_bas *b2) diff --git a/sys/dev/uart/uart_cpu_pc98.c b/sys/dev/uart/uart_cpu_pc98.c index fc50fa56d501..c211b3dbe95d 100644 --- a/sys/dev/uart/uart_cpu_pc98.c +++ b/sys/dev/uart/uart_cpu_pc98.c @@ -37,8 +37,8 @@ __FBSDID("$FreeBSD$"); #include #include -bus_space_tag_t uart_bus_space_io = I386_BUS_SPACE_IO; -bus_space_tag_t uart_bus_space_mem = I386_BUS_SPACE_MEM; +bus_space_tag_t uart_bus_space_io = X86_BUS_SPACE_IO; +bus_space_tag_t uart_bus_space_mem = X86_BUS_SPACE_MEM; static struct { u_long iobase; -- cgit v1.2.3