From f5883253906566e7d9e5eaa9a5845e3581e1c817 Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Tue, 28 Jun 2016 13:30:44 +1000 Subject: Change the Nexus bus to defines and have the BSP declare them. --- rtemsbsd/include/bsp/nexus-devices.h | 63 ++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 36 deletions(-) (limited to 'rtemsbsd/include/bsp/nexus-devices.h') diff --git a/rtemsbsd/include/bsp/nexus-devices.h b/rtemsbsd/include/bsp/nexus-devices.h index e7176906..45beb309 100644 --- a/rtemsbsd/include/bsp/nexus-devices.h +++ b/rtemsbsd/include/bsp/nexus-devices.h @@ -34,56 +34,53 @@ #if !defined(BSP_NEXUS_DEVICES_h) #define BSP_NEXUS_DEVICES_h +#include + #include +#include -#include #if defined(LIBBSP_ARM_REALVIEW_PBX_A9_BSP_H) #include -#define RTEMS_BSD_DRIVER_SMC0 -#define RTEMS_BSD_DRIVER_SMC0_BASE_ADDR 0x4e000000 -#define RTEMS_BSD_DRIVER_SMC0_IRQ RVPBXA9_IRQ_ETHERNET +RTEMS_BSD_DRIVER_SMC0(0x4e000000, RVPBXA9_IRQ_ETHERNET); #elif defined(LIBBSP_M68K_GENMCF548X_BSP_H) -#define RTEMS_BSD_DRIVER_FEC +RTEMS_BSD_DRIVER_FEC; #elif defined(LIBBSP_ARM_XILINX_ZYNQ_BSP_H) #include -#define RTEMS_BSD_DRIVER_XILINX_ZYNQ_SLCR0 -#define RTEMS_BSD_DRIVER_XILINX_ZYNQ_CGEM0 -#define RTEMS_BSD_DRIVER_CGEM0_IRQ ZYNQ_IRQ_ETHERNET_0 -#define RTEMS_BSD_DRIVER_E1000PHY +RTEMS_BSD_DRIVER_XILINX_ZYNQ_SLCR0; +RTEMS_BSD_DRIVER_XILINX_ZYNQ_CGEM0(ZYNQ_IRQ_ETHERNET_0); +RTEMS_BSD_DRIVER_E1000PHY; #elif defined(LIBBSP_ARM_ALTERA_CYCLONE_V_BSP_H) #include #include -#define RTEMS_BSD_DRIVER_DWC0 -#define RTEMS_BSD_DRIVER_DWC0_BASE_ADDR (unsigned long) ALT_EMAC1_ADDR -#define RTEMS_BSD_DRIVER_DWC0_IRQ ALT_INT_INTERRUPT_EMAC1_IRQ -#define RTEMS_BSD_DRIVER_MIPHY -#define RTEMS_BSD_DRIVER_DWCOTG0 -#define RTEMS_BSD_DRIVER_DWCOTG0_BASE_ADDR (unsigned long) ALT_USB1_ADDR -#define RTEMS_BSD_DRIVER_DWCOTG0_IRQ ALT_INT_INTERRUPT_USB1_IRQ -#define RTEMS_BSD_DRIVER_DWC_MMC -#define RTEMS_BSD_DRIVER_MMC -#define RTEMS_BSD_DRIVER_USB -#define RTEMS_BSD_DRIVER_USB_MASS +RTEMS_BSD_DRIVER_DWC0((unsigned long) ALT_EMAC1_ADDR, + ALT_INT_INTERRUPT_EMAC1_IRQ); +RTEMS_BSD_DRIVER_MIPHY; +RTEMS_BSD_DRIVER_DWCOTG0((unsigned long) ALT_USB1_ADDR, + ALT_INT_INTERRUPT_USB1_IRQ); +RTEMS_BSD_DRIVER_DWC_MMC; +RTEMS_BSD_DRIVER_MMC; +RTEMS_BSD_DRIVER_USB; +RTEMS_BSD_DRIVER_USB_MASS; #elif defined(LIBBSP_I386_PC386_BSP_H) -#define RTEMS_BSD_DRIVER_PC_LEGACY -#define RTEMS_BSD_DRIVER_PCI_LEM -#define RTEMS_BSD_DRIVER_PCI_IGB -#define RTEMS_BSD_DRIVER_PCI_EM -#define RTEMS_BSD_DRIVER_PCI_RE -#define RTEMS_BSD_DRIVER_REPHY +RTEMS_BSD_DRIVER_PC_LEGACY; +RTEMS_BSD_DRIVER_PCI_LEM; +RTEMS_BSD_DRIVER_PCI_IGB; +RTEMS_BSD_DRIVER_PCI_EM; +RTEMS_BSD_DRIVER_PCI_RE; +RTEMS_BSD_DRIVER_REPHY; #elif defined(LIBBSP_POWERPC_QORIQ_BSP_H) @@ -91,19 +88,13 @@ #include -#define RTEMS_BSD_DRIVER_TSEC -#define RTEMS_BSD_DRIVER_TSEC_BASE_ADDR 0xffeb0000 -#define RTEMS_BSD_DRIVER_TSEC_TX_IRQ QORIQ_IRQ_ETSEC_TX_1 -#define RTEMS_BSD_DRIVER_TSEC_RX_IRQ QORIQ_IRQ_ETSEC_RX_1 -#define RTEMS_BSD_DRIVER_TSEC_ER_IRQ QORIQ_IRQ_ETSEC_ER_1 +RTEMS_BSD_DRIVER_TSEC(0xffeb0000, + QORIQ_IRQ_ETSEC_TX_1, + QORIQ_IRQ_ETSEC_RX_1, + QORIQ_IRQ_ETSEC_ER_1); #endif /* !QORIQ_CHIP_IS_T_VARIANT(QORIQ_CHIP_VARIANT) */ #endif -/* - * Include the supported Nexus bus devices. - */ -#include - #endif -- cgit v1.2.3