diff options
author | nwhitehorn <nwhitehorn@FreeBSD.org> | 2014-01-05 18:46:58 +0000 |
---|---|---|
committer | nwhitehorn <nwhitehorn@FreeBSD.org> | 2014-01-05 18:46:58 +0000 |
commit | f06ffda24307372cdf9724883f8b78e76ba141cc (patch) | |
tree | 0809eb8a8b9681c317f608796af896a38368fe13 /sys/x86 | |
parent | 80568041a3ca34da996e70860437a6aa3c45f50b (diff) | |
download | FreeBSD-src-f06ffda24307372cdf9724883f8b78e76ba141cc.zip FreeBSD-src-f06ffda24307372cdf9724883f8b78e76ba141cc.tar.gz |
Retire machine/fdt.h as a header used by MI code, as its function is now
obsolete. This involves the following pieces:
- Remove it entirely on PowerPC, where it is not used by MD code either
- Remove all references to machine/fdt.h in non-architecture-specific code
(aside from uart_cpu_fdt.c, shared by ARM and MIPS, and so is somewhat
non-arch-specific).
- Fix code relying on header pollution from machine/fdt.h includes
- Legacy fdtbus.c (still used on x86 FDT systems) now passes resource
requests to its parent (nexus). This allows x86 FDT devices to allocate
both memory and IO requests and removes the last notionally MI use of
fdtbus_bs_tag.
- On those architectures that retain a machine/fdt.h, unused bits like
FDT_MAP_IRQ and FDT_INTR_MAX have been removed.
Diffstat (limited to 'sys/x86')
-rw-r--r-- | sys/x86/include/fdt.h | 18 | ||||
-rw-r--r-- | sys/x86/include/ofw_machdep.h | 6 |
2 files changed, 6 insertions, 18 deletions
diff --git a/sys/x86/include/fdt.h b/sys/x86/include/fdt.h index 77a0a2f..b25cacb 100644 --- a/sys/x86/include/fdt.h +++ b/sys/x86/include/fdt.h @@ -29,24 +29,6 @@ #ifndef _MACHINE_FDT_H_ #define _MACHINE_FDT_H_ -#include <machine/intr_machdep.h> -#include <x86/bus.h> - -/* Max interrupt number. */ -#define FDT_INTR_MAX NUM_IO_INTS - -/* Map phandle/intpin pair to global IRQ number */ -#define FDT_MAP_IRQ(node, pin) \ - (panic("%s: FDT_MAP_IRQ(%#x, %#x)", __func__, node, pin), -1) - -/* Bus space tag. XXX we only support I/O port space this way. */ -#define fdtbus_bs_tag X86_BUS_SPACE_IO - -struct mem_region { - vm_offset_t mr_start; - vm_size_t mr_size; -}; - __BEGIN_DECLS int x86_init_fdt(void); __END_DECLS diff --git a/sys/x86/include/ofw_machdep.h b/sys/x86/include/ofw_machdep.h index 13e756e..8344f56 100644 --- a/sys/x86/include/ofw_machdep.h +++ b/sys/x86/include/ofw_machdep.h @@ -30,7 +30,13 @@ #define _MACHINE_OFW_MACHDEP_H_ #include <x86/bus.h> +#include <vm/vm.h> typedef uint32_t cell_t; +struct mem_region { + vm_offset_t mr_start; + vm_size_t mr_size; +}; + #endif /* _MACHINE_OFW_MACHDEP_H_ */ |