Index: sys/amd64/include/resource.h =================================================================== --- sys/amd64/include/resource.h +++ sys/amd64/include/resource.h @@ -28,20 +28,4 @@ * SUCH DAMAGE. */ -#ifndef _MACHINE_RESOURCE_H_ -#define _MACHINE_RESOURCE_H_ 1 - -/* - * Definitions of resource types for Intel Architecture machines - * with support for legacy ISA devices and drivers. - */ - -#define SYS_RES_IRQ 1 /* interrupt lines */ -#define SYS_RES_DRQ 2 /* isa dma lines */ -#define SYS_RES_MEMORY 3 /* i/o memory */ -#define SYS_RES_IOPORT 4 /* i/o ports */ -#ifdef NEW_PCIB -#define PCI_RES_BUS 5 /* PCI bus numbers */ -#endif - -#endif /* !_MACHINE_RESOURCE_H_ */ +#include Index: sys/arm/include/resource.h =================================================================== --- sys/arm/include/resource.h +++ sys/arm/include/resource.h @@ -29,21 +29,5 @@ * $FreeBSD$ */ -#ifndef _MACHINE_RESOURCE_H_ -#define _MACHINE_RESOURCE_H_ 1 +#include -/* - * Definitions of resource types for Intel Architecture machines - * with support for legacy ISA devices and drivers. - */ - -#define SYS_RES_IRQ 1 /* interrupt lines */ -#define SYS_RES_DRQ 2 /* isa dma lines */ -#define SYS_RES_MEMORY 3 /* i/o memory */ -#define SYS_RES_IOPORT 4 /* i/o ports */ -#define SYS_RES_GPIO 5 /* general purpose i/o */ -#ifdef NEW_PCIB -#define PCI_RES_BUS 6 /* PCI bus numbers */ -#endif - -#endif /* !_MACHINE_RESOURCE_H_ */ Index: sys/arm64/include/resource.h =================================================================== --- sys/arm64/include/resource.h +++ sys/arm64/include/resource.h @@ -29,21 +29,5 @@ * $FreeBSD$ */ -#ifndef _MACHINE_RESOURCE_H_ -#define _MACHINE_RESOURCE_H_ 1 +#include -/* - * Definitions of resource types for Intel Architecture machines - * with support for legacy ISA devices and drivers. - */ - -#define SYS_RES_IRQ 1 /* interrupt lines */ -#define SYS_RES_DRQ 2 /* isa dma lines */ -#define SYS_RES_MEMORY 3 /* i/o memory */ -#define SYS_RES_IOPORT 4 /* i/o ports */ -#define SYS_RES_GPIO 5 /* general purpose i/o */ -#ifdef NEW_PCIB -#define PCI_RES_BUS 6 /* PCI bus numbers */ -#endif - -#endif /* !_MACHINE_RESOURCE_H_ */ Index: sys/i386/include/resource.h =================================================================== --- sys/i386/include/resource.h +++ sys/i386/include/resource.h @@ -28,20 +28,5 @@ * SUCH DAMAGE. */ -#ifndef _MACHINE_RESOURCE_H_ -#define _MACHINE_RESOURCE_H_ 1 +#include -/* - * Definitions of resource types for Intel Architecture machines - * with support for legacy ISA devices and drivers. - */ - -#define SYS_RES_IRQ 1 /* interrupt lines */ -#define SYS_RES_DRQ 2 /* isa dma lines */ -#define SYS_RES_MEMORY 3 /* i/o memory */ -#define SYS_RES_IOPORT 4 /* i/o ports */ -#ifdef NEW_PCIB -#define PCI_RES_BUS 5 /* PCI bus numbers */ -#endif - -#endif /* !_MACHINE_RESOURCE_H_ */ Index: sys/mips/include/resource.h =================================================================== --- sys/mips/include/resource.h +++ sys/mips/include/resource.h @@ -30,20 +30,5 @@ * $FreeBSD$ */ -#ifndef _MACHINE_RESOURCE_H_ -#define _MACHINE_RESOURCE_H_ 1 +#include -/* - * Definitions of resource types for Intel Architecture machines - * with support for legacy ISA devices and drivers. - */ - -#define SYS_RES_IRQ 1 /* interrupt lines */ -#define SYS_RES_DRQ 2 /* isa dma lines */ -#define SYS_RES_MEMORY 3 /* i/o memory */ -#define SYS_RES_IOPORT 4 /* i/o ports */ -#ifdef NEW_PCIB -#define PCI_RES_BUS 5 -#endif - -#endif /* !_MACHINE_RESOURCE_H_ */ Index: sys/powerpc/include/resource.h =================================================================== --- sys/powerpc/include/resource.h +++ sys/powerpc/include/resource.h @@ -28,17 +28,5 @@ * SUCH DAMAGE. */ -#ifndef _MACHINE_RESOURCE_H_ -#define _MACHINE_RESOURCE_H_ 1 +#include -/* - * Definitions of resource types for Intel Architecture machines - * with support for legacy ISA devices and drivers. - */ - -#define SYS_RES_IRQ 1 /* interrupt lines */ -#define SYS_RES_DRQ 2 /* isa dma lines */ -#define SYS_RES_MEMORY 3 /* i/o memory */ -#define SYS_RES_IOPORT 4 /* i/o ports */ - -#endif /* !_MACHINE_RESOURCE_H_ */ Index: sys/riscv/include/resource.h =================================================================== --- sys/riscv/include/resource.h +++ sys/riscv/include/resource.h @@ -29,18 +29,5 @@ * $FreeBSD$ */ -#ifndef _MACHINE_RESOURCE_H_ -#define _MACHINE_RESOURCE_H_ 1 +#include -/* - * Definitions of resource types for Intel Architecture machines - * with support for legacy ISA devices and drivers. - */ - -#define SYS_RES_IRQ 1 /* interrupt lines */ -#define SYS_RES_DRQ 2 /* isa dma lines */ -#define SYS_RES_MEMORY 3 /* i/o memory */ -#define SYS_RES_IOPORT 4 /* i/o ports */ -#define SYS_RES_GPIO 5 /* general purpose i/o */ - -#endif /* !_MACHINE_RESOURCE_H_ */ Index: sys/sparc64/include/resource.h =================================================================== --- sys/sparc64/include/resource.h +++ sys/sparc64/include/resource.h @@ -29,17 +29,5 @@ * $FreeBSD$ */ -#ifndef _MACHINE_RESOURCE_H_ -#define _MACHINE_RESOURCE_H_ 1 +#include -/* - * Definitions of resource types for Intel Architecture machines - * with support for legacy ISA devices and drivers. - */ - -#define SYS_RES_IRQ 1 /* interrupt lines */ -#define SYS_RES_DRQ 2 /* isa dma lines */ -#define SYS_RES_MEMORY 3 /* i/o memory */ -#define SYS_RES_IOPORT 4 /* i/o ports */ - -#endif /* !_MACHINE_RESOURCE_H_ */ Index: sys/sys/resource_types.h =================================================================== --- sys/sys/resource_types.h +++ sys/sys/resource_types.h @@ -26,15 +26,14 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/arm/include/resource.h 291650 2015-12-02 14:24:14Z mmel $ + * $FreeBSD: head/sys/sys/resource_types.h 291650 2015-12-02 14:24:14Z mmel $ */ -#ifndef _MACHINE_RESOURCE_H_ -#define _MACHINE_RESOURCE_H_ 1 +#ifndef _SYS_RESOURCE_TYPES_H_ +#define _SYS_RESOURCE_TYPES_H_ 1 /* - * Definitions of resource types for Intel Architecture machines - * with support for legacy ISA devices and drivers. + * Definitions of resource types for devices and drivers. */ #define SYS_RES_IRQ 1 /* interrupt lines */ @@ -42,8 +41,9 @@ #define SYS_RES_MEMORY 3 /* i/o memory */ #define SYS_RES_IOPORT 4 /* i/o ports */ #define SYS_RES_GPIO 5 /* general purpose i/o */ -#ifdef NEW_PCIB #define PCI_RES_BUS 6 /* PCI bus numbers */ -#endif +#define SYS_RES_CLK 7 /* clock source/gate */ +#define SYS_RES_IOMMU 8 /* iommu consumer */ +#define SYS_RES_PWR 9 /* power line */ -#endif /* !_MACHINE_RESOURCE_H_ */ +#endif /* !_SYS_RESOURCE_TYPES_H_ */