michaelh/zephyr
1
0
Fork 0
Code Releases Activity

init: remove pure_init macro

Browse source 
This macro is legacy from an early implementation of the init system
before the pure level was split into early and late phases remove it
now to avoid confusion going forward.

Change-Id: I6720874c840c9e14888fd6f411a8182e7420ca29
Signed-off-by: Dirk Brandewie <dirk.j.brandewie@intel.com>
This commit is contained in:
Dirk Brandewie 2015-09-25 13:02:12 -07:00 • committed by Anas Nashif
commit c48418f2bd
12 changed files with 23 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

10
arch/arm/platforms/fsl_frdm_k64f/platform_config.c
View file

@ -188,7 +188,7 @@ DECLARE_DEVICE_INIT_CONFIG(k20_uart0,
&uart_platform_init, &uart_platform_init,
&k20_uart_dev_cfg[0]); &k20_uart_dev_cfg[0]);
pure_init(k20_uart0, &k20_uart_dev_data[0]); pure_late_init(k20_uart0, &k20_uart_dev_data[0]);
/* UART 1 */ /* UART 1 */
@ -197,7 +197,7 @@ DECLARE_DEVICE_INIT_CONFIG(k20_uart1,
&uart_platform_init, &uart_platform_init,
&k20_uart_dev_cfg[1]); &k20_uart_dev_cfg[1]);
pure_init(k20_uart1, &k20_uart_dev_data[1]); pure_late_init(k20_uart1, &k20_uart_dev_data[1]);
/* UART 2 */ /* UART 2 */
@ -206,7 +206,7 @@ DECLARE_DEVICE_INIT_CONFIG(k20_uart2,
&uart_platform_init, &uart_platform_init,
&k20_uart_dev_cfg[2]); &k20_uart_dev_cfg[2]);
pure_init(k20_uart2, &k20_uart_dev_data[2]); pure_late_init(k20_uart2, &k20_uart_dev_data[2]);
/* UART 3 */ /* UART 3 */
@ -215,7 +215,7 @@ DECLARE_DEVICE_INIT_CONFIG(k20_uart3,
&uart_platform_init, &uart_platform_init,
&k20_uart_dev_cfg[3]); &k20_uart_dev_cfg[3]);
pure_init(k20_uart3, &k20_uart_dev_data[3]); pure_late_init(k20_uart3, &k20_uart_dev_data[3]);
/* UART 4 */ /* UART 4 */
@ -224,7 +224,7 @@ DECLARE_DEVICE_INIT_CONFIG(k20_uart4,
&uart_platform_init, &uart_platform_init,
&k20_uart_dev_cfg[4]); &k20_uart_dev_cfg[4]);
pure_init(k20_uart4, &k20_uart_dev_data[4]); pure_late_init(k20_uart4, &k20_uart_dev_data[4]);
/**< UART Devices */ /**< UART Devices */

6
arch/arm/platforms/ti_lm3s6965/platform_config.c
View file

@ -194,7 +194,7 @@ DECLARE_DEVICE_INIT_CONFIG(stellaris_uart0,
&uart_platform_init, &uart_platform_init,
&stellaris_uart_dev_cfg[0]); &stellaris_uart_dev_cfg[0]);
pure_init(stellaris_uart0, NULL); pure_late_init(stellaris_uart0, NULL);
/* UART 1 */ /* UART 1 */
@ -203,7 +203,7 @@ DECLARE_DEVICE_INIT_CONFIG(stellaris_uart1,
&uart_platform_init, &uart_platform_init,
&stellaris_uart_dev_cfg[1]); &stellaris_uart_dev_cfg[1]);
pure_init(stellaris_uart1, NULL); pure_late_init(stellaris_uart1, NULL);
/* UART 2 */ /* UART 2 */
@ -212,7 +212,7 @@ DECLARE_DEVICE_INIT_CONFIG(stellaris_uart2,
&uart_platform_init, &uart_platform_init,
&stellaris_uart_dev_cfg[2]); &stellaris_uart_dev_cfg[2]);
pure_init(stellaris_uart2, NULL); pure_late_init(stellaris_uart2, NULL);
/**< UART Devices */ /**< UART Devices */

4
arch/x86/platforms/galileo/galileo_config.c
View file

@ -137,7 +137,7 @@ DECLARE_DEVICE_INIT_CONFIG(ns16550_uart0,
(CONFIG_UART_CONSOLE_INDEX == 0)) (CONFIG_UART_CONSOLE_INDEX == 0))
pure_early_init(ns16550_uart0, &ns16550_uart_dev_data[0]); pure_early_init(ns16550_uart0, &ns16550_uart_dev_data[0]);
#else #else
pure_init(ns16550_uart0, &ns16550_uart_dev_data[0]); pure_late_init(ns16550_uart0, &ns16550_uart_dev_data[0]);
#endif /* CONFIG_EARLY_CONSOLE */ #endif /* CONFIG_EARLY_CONSOLE */
@ -152,7 +152,7 @@ DECLARE_DEVICE_INIT_CONFIG(ns16550_uart1,
(CONFIG_UART_CONSOLE_INDEX == 1)) (CONFIG_UART_CONSOLE_INDEX == 1))
pure_early_init(ns16550_uart1, &ns16550_uart_dev_data[1]); pure_early_init(ns16550_uart1, &ns16550_uart_dev_data[1]);
#else #else
pure_init(ns16550_uart1, &ns16550_uart_dev_data[1]); pure_late_init(ns16550_uart1, &ns16550_uart_dev_data[1]);
#endif /* CONFIG_EARLY_CONSOLE */ #endif /* CONFIG_EARLY_CONSOLE */

4
arch/x86/platforms/ia32/ia32_config.c
View file

@ -124,7 +124,7 @@ DECLARE_DEVICE_INIT_CONFIG(ns16550_uart0,
(CONFIG_UART_CONSOLE_INDEX == 0)) (CONFIG_UART_CONSOLE_INDEX == 0))
pure_early_init(ns16550_uart0, &ns16550_uart_dev_data[0]); pure_early_init(ns16550_uart0, &ns16550_uart_dev_data[0]);
#else #else
pure_init(ns16550_uart0, &ns16550_uart_dev_data[0]); pure_late_init(ns16550_uart0, &ns16550_uart_dev_data[0]);
#endif /* CONFIG_EARLY_CONSOLE */ #endif /* CONFIG_EARLY_CONSOLE */
@ -139,7 +139,7 @@ DECLARE_DEVICE_INIT_CONFIG(ns16550_uart1,
(CONFIG_UART_CONSOLE_INDEX == 1)) (CONFIG_UART_CONSOLE_INDEX == 1))
pure_early_init(ns16550_uart1, &ns16550_uart_dev_data[1]); pure_early_init(ns16550_uart1, &ns16550_uart_dev_data[1]);
#else #else
pure_init(ns16550_uart1, &ns16550_uart_dev_data[1]); pure_late_init(ns16550_uart1, &ns16550_uart_dev_data[1]);
#endif /* CONFIG_EARLY_CONSOLE */ #endif /* CONFIG_EARLY_CONSOLE */

4
arch/x86/platforms/ia32_pci/ia32_pci_config.c
View file

@ -137,7 +137,7 @@ DECLARE_DEVICE_INIT_CONFIG(ns16550_uart0,
(CONFIG_UART_CONSOLE_INDEX == 0)) (CONFIG_UART_CONSOLE_INDEX == 0))
pure_early_init(ns16550_uart0, &ns16550_uart_dev_data[0]); pure_early_init(ns16550_uart0, &ns16550_uart_dev_data[0]);
#else #else
pure_init(ns16550_uart0, &ns16550_uart_dev_data[0]); pure_late_init(ns16550_uart0, &ns16550_uart_dev_data[0]);
#endif /* CONFIG_EARLY_CONSOLE */ #endif /* CONFIG_EARLY_CONSOLE */
@ -152,7 +152,7 @@ DECLARE_DEVICE_INIT_CONFIG(ns16550_uart1,
(CONFIG_UART_CONSOLE_INDEX == 1)) (CONFIG_UART_CONSOLE_INDEX == 1))
pure_early_init(ns16550_uart1, &ns16550_uart_dev_data[1]); pure_early_init(ns16550_uart1, &ns16550_uart_dev_data[1]);
#else #else
pure_init(ns16550_uart1, &ns16550_uart_dev_data[1]); pure_late_init(ns16550_uart1, &ns16550_uart_dev_data[1]);
#endif /* CONFIG_EARLY_CONSOLE */ #endif /* CONFIG_EARLY_CONSOLE */

2
drivers/console/uart_console.c
View file

@ -245,4 +245,4 @@ static int uart_console_init(struct device *arg)
return DEV_OK; return DEV_OK;
} }
DECLARE_DEVICE_INIT_CONFIG(uart_console, "", uart_console_init, NULL); DECLARE_DEVICE_INIT_CONFIG(uart_console, "", uart_console_init, NULL);
pure_init(uart_console, NULL); pure_late_init(uart_console, NULL);

4
drivers/gpio/gpio-dw.c
View file

@ -357,7 +357,7 @@ struct gpio_runtime_dw gpio_0_runtime;
DECLARE_DEVICE_INIT_CONFIG(gpio_0, CONFIG_GPIO_DW_0_NAME, DECLARE_DEVICE_INIT_CONFIG(gpio_0, CONFIG_GPIO_DW_0_NAME,
gpio_initialize_dw, &gpio_config_dw_0); gpio_initialize_dw, &gpio_config_dw_0);
pure_init(gpio_0, &gpio_0_runtime); pure_late_init(gpio_0, &gpio_0_runtime);
IRQ_CONNECT_STATIC(gpio_dw_0, CONFIG_GPIO_DW_0_IRQ, IRQ_CONNECT_STATIC(gpio_dw_0, CONFIG_GPIO_DW_0_IRQ,
CONFIG_GPIO_DW_0_PRI, gpio_dw_isr_0, 0); CONFIG_GPIO_DW_0_PRI, gpio_dw_isr_0, 0);
@ -399,7 +399,7 @@ struct gpio_runtime_dw gpio_1_runtime;
DECLARE_DEVICE_INIT_CONFIG(gpio_1, CONFIG_GPIO_DW_1_NAME, DECLARE_DEVICE_INIT_CONFIG(gpio_1, CONFIG_GPIO_DW_1_NAME,
gpio_initialize_dw, &gpio_config_dw_1); gpio_initialize_dw, &gpio_config_dw_1);
pure_init(gpio_1, &gpio_1_runtime); pure_late_init(gpio_1, &gpio_1_runtime);
IRQ_CONNECT_STATIC(gpio_dw_1, CONFIG_GPIO_DW_1_IRQ, IRQ_CONNECT_STATIC(gpio_dw_1, CONFIG_GPIO_DW_1_IRQ,
CONFIG_GPIO_DW_1_PRI, gpio_dw_isr_1, 0); CONFIG_GPIO_DW_1_PRI, gpio_dw_isr_1, 0);

4
drivers/gpio/gpio-mmio.c
View file

@ -290,7 +290,7 @@ DECLARE_DEVICE_INIT_CONFIG(gpio_mmio_0,
CONFIG_GPIO_MMIO_0_DEV_NAME, CONFIG_GPIO_MMIO_0_DEV_NAME,
gpio_mmio_init, gpio_mmio_init,
&gpio_mmio_0_cfg); &gpio_mmio_0_cfg);
pure_init(gpio_mmio_0, (void *)0); pure_late_init(gpio_mmio_0, (void *)0);
#endif /* CONFIG_GPIO_MMIO_0 */ #endif /* CONFIG_GPIO_MMIO_0 */
@ -312,6 +312,6 @@ DECLARE_DEVICE_INIT_CONFIG(gpio_mmio_1,
CONFIG_GPIO_MMIO_1_DEV_NAME, CONFIG_GPIO_MMIO_1_DEV_NAME,
gpio_mmio_init, gpio_mmio_init,
&gpio_mmio_1_cfg); &gpio_mmio_1_cfg);
pure_init(gpio_mmio_1, (void *)0); pure_late_init(gpio_mmio_1, (void *)0);
#endif /* CONFIG_GPIO_MMIO_1 */ #endif /* CONFIG_GPIO_MMIO_1 */

2
drivers/i2c/i2c-dw.c
View file

@ -636,7 +636,7 @@ DECLARE_DEVICE_INIT_CONFIG(i2c_0,
&i2c_dw_initialize, &i2c_dw_initialize,
&i2c_config_dw_0); &i2c_config_dw_0);
pure_init(i2c_0, &i2c_0_runtime); pure_late_init(i2c_0, &i2c_0_runtime);
IRQ_CONNECT_STATIC(i2c_dw_0, IRQ_CONNECT_STATIC(i2c_dw_0,
CONFIG_I2C_DW_0_IRQ, CONFIG_I2C_DW_0_IRQ,

4
drivers/spi/intel_spi.c
View file

@ -406,7 +406,7 @@ struct spi_intel_config spi_intel_config_0 = {
DECLARE_DEVICE_INIT_CONFIG(spi_intel_port_0, CONFIG_SPI_INTEL_PORT_0_DRV_NAME, DECLARE_DEVICE_INIT_CONFIG(spi_intel_port_0, CONFIG_SPI_INTEL_PORT_0_DRV_NAME,
spi_intel_init, &spi_intel_config_0); spi_intel_init, &spi_intel_config_0);
pure_init(spi_intel_port_0, &spi_intel_data_port_0); pure_late_init(spi_intel_port_0, &spi_intel_data_port_0);
void spi_intel_isr_0(void *unused) void spi_intel_isr_0(void *unused)
{ {
@ -446,7 +446,7 @@ struct spi_intel_config spi_intel_config_1 = {
DECLARE_DEVICE_INIT_CONFIG(spi_intel_port_1, CONFIG_SPI_INTEL_PORT_1_DRV_NAME, DECLARE_DEVICE_INIT_CONFIG(spi_intel_port_1, CONFIG_SPI_INTEL_PORT_1_DRV_NAME,
spi_intel_init, &spi_intel_config_1); spi_intel_init, &spi_intel_config_1);
pure_init(spi_intel_port_1, &spi_intel_data_port_1); pure_late_init(spi_intel_port_1, &spi_intel_data_port_1);
void spi_intel_isr_1(void *unused) void spi_intel_isr_1(void *unused)
{ {

1
include/init.h
View file

@ -70,7 +70,6 @@
/* Run on interrupt stack; no {micro,nano} kernel objects available */ /* Run on interrupt stack; no {micro,nano} kernel objects available */
#define pure_early_init(cfg, data) __define_initconfig(cfg, 0, data) #define pure_early_init(cfg, data) __define_initconfig(cfg, 0, data)
#define pure_init(cfg, data) __define_initconfig(cfg, 1, data)
#define pure_late_init(cfg, data) __define_initconfig(cfg, 1, data) #define pure_late_init(cfg, data) __define_initconfig(cfg, 1, data)
/* Run from nano kernel idle task; no micro kernel objects available */ /* Run from nano kernel idle task; no micro kernel objects available */

2
samples/nanokernel/test/test_ipi/src/test_ipi.c
View file

@ -57,7 +57,7 @@ struct ipi_dummy_config_info ipi_dummy0_config_info = {
struct ipi_dummy_driver_data ipi_dummy0_driver_data; struct ipi_dummy_driver_data ipi_dummy0_driver_data;
DECLARE_DEVICE_INIT_CONFIG(ipi_dummy0, "ipi_dummy0", ipi_dummy_init, DECLARE_DEVICE_INIT_CONFIG(ipi_dummy0, "ipi_dummy0", ipi_dummy_init,
&ipi_dummy0_config_info); &ipi_dummy0_config_info);
pure_init(ipi_dummy0, &ipi_dummy0_driver_data); pure_late_init(ipi_dummy0, &ipi_dummy0_driver_data);
/* Sending side of the console IPI driver, will forward anything sent /* Sending side of the console IPI driver, will forward anything sent
* to printf() since we selected IPI_CONSOLE_STDOUT */ * to printf() since we selected IPI_CONSOLE_STDOUT */