- Introduce an uart_cpu_identify() which is implemented in uart_cpu_<arch>.c

  and that can be used as an identify function for all kinds of busses on a
  certain platform. Expect for sparc64 these are only stubs right now. [1]
- For sparc64, add code to its uart_cpu_identify() for registering the on-
  board ISA UARTs and their resources based on information obtained from
  Open Firmware.
  It would be better if this would be done in the OFW ISA code. However, due
  to the common FreeBSD ISA code and PNP-IDs not always being present in the
  properties of the ISA nodes there seems to be no good way to implement that.
  Therefore special casing UARTs as the sole really relevant ISA devices on
  sparc64 seemed reasonable. [2]

Approved by:	marcel
Discussed with:	marcel [1], tmm [2]
Tested by:	make universe

1 files changed, 7 insertions, 2 deletions

diff --git a/sys/modules/uart/Makefile b/sys/modules/uart/Makefile
index 9214a73..8a418fa 100644
--- a/sys/modules/uart/Makefile
+++ b/sys/modules/uart/Makefile
@@ -5,6 +5,8 @@
 .if ${MACHINE_ARCH} == "sparc64"
 uart_bus_ebus=	uart_bus_ebus.c
 ofw_bus_if=	ofw_bus_if.h
+ofw_pci_if=	ofw_pci_if.h
+opt_isa=	opt_isa.h
 .endif
 
 KMOD=	uart
@@ -12,7 +14,10 @@ SRCS=	uart_bus_acpi.c ${uart_bus_ebus} uart_bus_isa.c uart_bus_pccard.c \
 	uart_bus_pci.c uart_bus_puc.c uart_core.c uart_cpu_${MACHINE}.c \
 	uart_dbg.c uart_dev_i8251.c uart_dev_ns8250.c uart_dev_sab82532.c \
 	uart_dev_z8530.c uart_if.c uart_subr.c uart_tty.c
-SRCS+=	bus_if.h card_if.h device_if.h isa_if.h ${ofw_bus_if} pci_if.h \
-	power_if.h uart_if.h pccarddevs.h
+SRCS+=	bus_if.h card_if.h device_if.h isa_if.h ${ofw_bus_if} ${ofw_pci_if} \
+	${opt_isa} pci_if.h power_if.h uart_if.h pccarddevs.h
+
+opt_isa.h:
+	echo "#define DEV_ISA 1" > ${.TARGET}
 
 .include <bsd.kmod.mk>