From 59f9ed28d894b62c686c2507377b26f04121ce25 Mon Sep 17 00:00:00 2001 From: Alex White Date: Thu, 18 May 2023 13:43:18 -0500 Subject: bsps/microblaze: Remove GPIO build system options The number of GPIO devices along with each of their particular configurations is application-specific. Encoding this information as build options also introduced a lot of clutter. --- .../microblaze_fpga/gpio/microblaze-gpio.c | 32 ---------------------- .../microblaze_fpga/include/bsp/microblaze-gpio.h | 10 ------- 2 files changed, 42 deletions(-) (limited to 'bsps') diff --git a/bsps/microblaze/microblaze_fpga/gpio/microblaze-gpio.c b/bsps/microblaze/microblaze_fpga/gpio/microblaze-gpio.c index 9025840e32..a12158f1b7 100644 --- a/bsps/microblaze/microblaze_fpga/gpio/microblaze-gpio.c +++ b/bsps/microblaze/microblaze_fpga/gpio/microblaze-gpio.c @@ -42,38 +42,6 @@ extern "C" { #endif /* __cplusplus */ -Microblaze_GPIO_context gpio1_context = { - .regs = (Microblaze_GPIO_registers *) BSP_MICROBLAZE_FPGA_GPIO1_BASE, -#ifdef BSP_MICROBLAZE_FPGA_GPIO1_DUAL_CHANNEL - .is_dual = true, -#else - .is_dual = false, -#endif - .irq = BSP_MICROBLAZE_FPGA_GPIO1_IRQ, -#ifdef BSP_MICROBLAZE_FPGA_GPIO1_INTERRUPT - .has_interrupts = true -#else - .has_interrupts = false -#endif -}; - -#if BSP_MICROBLAZE_FPGA_GPIO2_ENABLED -Microblaze_GPIO_context gpio2_context = { - .regs = (Microblaze_GPIO_registers *) BSP_MICROBLAZE_FPGA_GPIO2_BASE, -#ifdef BSP_MICROBLAZE_FPGA_GPIO2_DUAL_CHANNEL - .is_dual = true, -#else - .is_dual = false, -#endif - .irq = BSP_MICROBLAZE_FPGA_GPIO2_IRQ, -#ifdef BSP_MICROBLAZE_FPGA_GPIO2_INTERRUPT - .has_interrupts = true -#else - .has_interrupts = false -#endif -}; -#endif - void microblaze_gpio_set_data_direction( Microblaze_GPIO_context *ctx, uint32_t channel, diff --git a/bsps/microblaze/microblaze_fpga/include/bsp/microblaze-gpio.h b/bsps/microblaze/microblaze_fpga/include/bsp/microblaze-gpio.h index 5fe9c44cf8..a3d79ff70f 100644 --- a/bsps/microblaze/microblaze_fpga/include/bsp/microblaze-gpio.h +++ b/bsps/microblaze/microblaze_fpga/include/bsp/microblaze-gpio.h @@ -129,16 +129,6 @@ typedef struct { bool has_interrupts; } Microblaze_GPIO_context; -extern Microblaze_GPIO_context gpio1_context; -#ifdef BSP_MICROBLAZE_FPGA_GPIO2_ENABLED -extern Microblaze_GPIO_context gpio2_context; -#endif - -#define gpio1 ((Microblaze_GPIO_context * const) &gpio1_context) -#ifdef BSP_MICROBLAZE_FPGA_GPIO2_ENABLED -#define gpio2 ((Microblaze_GPIO_context * const) &gpio2_context) -#endif - /** * @brief Set pin configuration for the specified GPIO channel. * -- cgit v1.2.3