From 2c1a95aee6aec42020f395886daa671762c45192 Mon Sep 17 00:00:00 2001 From: Benjamin Walsh Date: Tue, 26 Jan 2016 16:42:29 -0500 Subject: [PATCH] device: rename SYS_GET_DEVICE_NAME/SYS_GET_DEVICE Rename them to DEVICE_NAME_GET and DEVICE_GET to fit in the 'device' namespace. Change-Id: I407a7f284ed4d1c071961b46615eea859c2e825f Signed-off-by: Benjamin Walsh --- doc/kernel/nanokernel/nanokernel_interrupts.rst | 2 +- drivers/adc/adc_dw.c | 4 ++-- drivers/aio/aio_dw_comparator.c | 2 +- drivers/ethernet/eth_dw.c | 2 +- drivers/gpio/gpio_dw.c | 4 ++-- drivers/i2c/i2c_dw.c | 4 ++-- drivers/i2c/i2c_quark_se_ss.c | 16 ++++++++-------- drivers/rtc/rtc_dw.c | 2 +- drivers/rtc/rtc_qmsi.c | 2 +- drivers/shared_irq/shared_irq.c | 4 ++-- drivers/spi/spi_dw.c | 4 ++-- drivers/spi/spi_intel.c | 4 ++-- drivers/watchdog/wdt_dw.c | 2 +- drivers/watchdog/wdt_qmsi.c | 2 +- include/init.h | 10 +++++----- 15 files changed, 32 insertions(+), 32 deletions(-) diff --git a/doc/kernel/nanokernel/nanokernel_interrupts.rst b/doc/kernel/nanokernel/nanokernel_interrupts.rst index 8f6bcccbd00..c04f30a9376 100644 --- a/doc/kernel/nanokernel/nanokernel_interrupts.rst +++ b/doc/kernel/nanokernel/nanokernel_interrupts.rst @@ -96,7 +96,7 @@ Example #define MY_DEV_IRQ 24 /* device uses IRQ 24 */ #define MY_DEV_PRIO 2 /* device uses interrupt priority 2 */ /* argument passed to my_isr(), in this case a pointer to the device */ - #define MY_ISR_ARG SYS_GET_DEVICE(my_device) + #define MY_ISR_ARG DEVICE_GET(my_device) #define MY_IRQ_FLAGS 0 /* IRQ flags. Unused on non-x86 */ void my_isr(void *arg) diff --git a/drivers/adc/adc_dw.c b/drivers/adc/adc_dw.c index c2e46d3a567..9ee5f1e1126 100644 --- a/drivers/adc/adc_dw.c +++ b/drivers/adc/adc_dw.c @@ -540,11 +540,11 @@ DEVICE_DEFINE(adc_dw_0, &adc_info_dev_0, SECONDARY, static void adc_config_0_irq(void) { irq_connect(CONFIG_ADC_DW_0_RX_IRQ, CONFIG_ADC_DW_0_PRI, adc_dw_rx_isr, - SYS_GET_DEVICE(adc_dw_0), 0); + DEVICE_GET(adc_dw_0), 0); irq_enable(CONFIG_ADC_DW_0_RX_IRQ); irq_connect(CONFIG_ADC_DW_0_ERR_IRQ, CONFIG_ADC_DW_0_PRI, - adc_dw_err_isr, SYS_GET_DEVICE(adc_dw_0), 0); + adc_dw_err_isr, DEVICE_GET(adc_dw_0), 0); irq_enable(CONFIG_ADC_DW_0_ERR_IRQ); } #endif diff --git a/drivers/aio/aio_dw_comparator.c b/drivers/aio/aio_dw_comparator.c index 5765b181f17..ebbad9b55c1 100644 --- a/drivers/aio/aio_dw_comparator.c +++ b/drivers/aio/aio_dw_comparator.c @@ -218,6 +218,6 @@ static int dw_aio_cmp_config(struct device *dev) ARG_UNUSED(dev); irq_connect(INT_AIO_CMP_IRQ, 0, dw_aio_cmp_isr, - SYS_GET_DEVICE(dw_aio_cmp), 0); + DEVICE_GET(dw_aio_cmp), 0); return DEV_OK; } diff --git a/drivers/ethernet/eth_dw.c b/drivers/ethernet/eth_dw.c index 6db8f07f1fe..2c66eace8c4 100644 --- a/drivers/ethernet/eth_dw.c +++ b/drivers/ethernet/eth_dw.c @@ -321,7 +321,7 @@ static void eth_config_0_irq(struct device *port) #ifdef CONFIG_ETH_DW_0_IRQ_DIRECT ARG_UNUSED(shared_irq_dev); irq_connect(CONFIG_ETH_DW_0_IRQ, CONFIG_ETH_DW_0_PRI, eth_dw_isr, - SYS_GET_DEVICE(eth_dw_0), 0); + DEVICE_GET(eth_dw_0), 0); irq_enable(CONFIG_ETH_DW_0_IRQ); #elif defined(CONFIG_ETH_DW_0_IRQ_SHARED) shared_irq_dev = device_get_binding(config->shared_irq_dev_name); diff --git a/drivers/gpio/gpio_dw.c b/drivers/gpio/gpio_dw.c index e94a2af9ed7..394abbc7a7e 100644 --- a/drivers/gpio/gpio_dw.c +++ b/drivers/gpio/gpio_dw.c @@ -479,7 +479,7 @@ void gpio_config_0_irq(struct device *port) #ifdef CONFIG_GPIO_DW_0_IRQ_DIRECT ARG_UNUSED(shared_irq_dev); irq_connect(CONFIG_GPIO_DW_0_IRQ, CONFIG_GPIO_DW_0_PRI, gpio_dw_isr, - SYS_GET_DEVICE(gpio_dw_0), GPIO_DW_0_IRQ_FLAGS); + DEVICE_GET(gpio_dw_0), GPIO_DW_0_IRQ_FLAGS); irq_enable(config->irq_num); #elif defined(CONFIG_GPIO_DW_0_IRQ_SHARED) shared_irq_dev = device_get_binding(config->shared_irq_dev_name); @@ -555,7 +555,7 @@ void gpio_config_1_irq(struct device *port) #ifdef CONFIG_GPIO_DW_1_IRQ_DIRECT ARG_UNUSED(shared_irq_dev); irq_connect(CONFIG_GPIO_DW_1_IRQ, CONFIG_GPIO_DW_1_PRI, gpio_dw_isr, - SYS_GET_DEVICE(gpio_dw_1), GPIO_DW_1_IRQ_FLAGS); + DEVICE_GET(gpio_dw_1), GPIO_DW_1_IRQ_FLAGS); irq_enable(config->irq_num); #elif defined(CONFIG_GPIO_DW_1_IRQ_SHARED) shared_irq_dev = device_get_binding(config->shared_irq_dev_name); diff --git a/drivers/i2c/i2c_dw.c b/drivers/i2c/i2c_dw.c index 102e43c581a..d8b012433d1 100644 --- a/drivers/i2c/i2c_dw.c +++ b/drivers/i2c/i2c_dw.c @@ -788,7 +788,7 @@ void i2c_config_0(struct device *port) #if defined(CONFIG_I2C_DW_0_IRQ_DIRECT) ARG_UNUSED(shared_irq_dev); irq_connect(CONFIG_I2C_DW_0_IRQ, CONFIG_I2C_DW_0_INT_PRIORITY, - i2c_dw_isr, SYS_GET_DEVICE(i2c_0), I2C_DW_IRQ_FLAGS); + i2c_dw_isr, DEVICE_GET(i2c_0), I2C_DW_IRQ_FLAGS); irq_enable(config->irq_num); #elif defined(CONFIG_I2C_DW_0_IRQ_SHARED) ARG_UNUSED(config); @@ -841,7 +841,7 @@ void i2c_config_1(struct device *port) ARG_UNUSED(shared_irq_dev); irq_connect(CONFIG_I2C_DW_1_IRQ, CONFIG_I2C_DW_1_INT_PRIORITY, - i2c_dw_isr, SYS_GET_DEVICE(i2c_1), I2C_DW_IRQ_FLAGS); + i2c_dw_isr, DEVICE_GET(i2c_1), I2C_DW_IRQ_FLAGS); irq_enable(config->irq_num); } diff --git a/drivers/i2c/i2c_quark_se_ss.c b/drivers/i2c/i2c_quark_se_ss.c index cbf0fe5f4d6..24a7b303af8 100644 --- a/drivers/i2c/i2c_quark_se_ss.c +++ b/drivers/i2c/i2c_quark_se_ss.c @@ -691,13 +691,13 @@ void _i2c_qse_ss_config_irq_0(struct device *port) /* Connect the IRQs to ISR */ irq_connect(I2C_SS_0_ERR_VECTOR, 1, i2c_qse_ss_isr, - SYS_GET_DEVICE(i2c_ss_0), 0); + DEVICE_GET(i2c_ss_0), 0); irq_connect(I2C_SS_0_RX_VECTOR, 1, i2c_qse_ss_isr, - SYS_GET_DEVICE(i2c_ss_0), 0); + DEVICE_GET(i2c_ss_0), 0); irq_connect(I2C_SS_0_TX_VECTOR, 1, i2c_qse_ss_isr, - SYS_GET_DEVICE(i2c_ss_0), 0); + DEVICE_GET(i2c_ss_0), 0); irq_connect(I2C_SS_0_STOP_VECTOR, 1, i2c_qse_ss_isr, - SYS_GET_DEVICE(i2c_ss_0), 0); + DEVICE_GET(i2c_ss_0), 0); irq_enable(I2C_SS_0_ERR_VECTOR); irq_enable(I2C_SS_0_RX_VECTOR); @@ -757,13 +757,13 @@ void _i2c_qse_ss_config_irq_1(struct device *port) /* Connect the IRQs to ISR */ irq_connect(I2C_SS_1_ERR_VECTOR, 1, i2c_qse_ss_isr, - SYS_GET_DEVICE(i2c_ss_1), 0); + DEVICE_GET(i2c_ss_1), 0); irq_connect(I2C_SS_1_RX_VECTOR, 1, i2c_qse_ss_isr, - SYS_GET_DEVICE(i2c_ss_1), 0); + DEVICE_GET(i2c_ss_1), 0); irq_connect(I2C_SS_1_TX_VECTOR, 1, i2c_qse_ss_isr, - SYS_GET_DEVICE(i2c_ss_1), 0); + DEVICE_GET(i2c_ss_1), 0); irq_connect(I2C_SS_1_STOP_VECTOR, 1, i2c_qse_ss_isr, - SYS_GET_DEVICE(i2c_ss_1), 0); + DEVICE_GET(i2c_ss_1), 0); irq_enable(I2C_SS_1_ERR_VECTOR); irq_enable(I2C_SS_1_RX_VECTOR); diff --git a/drivers/rtc/rtc_dw.c b/drivers/rtc/rtc_dw.c index 1c3f5a4622a..9cdec8450f6 100644 --- a/drivers/rtc/rtc_dw.c +++ b/drivers/rtc/rtc_dw.c @@ -209,7 +209,7 @@ DEVICE_DEFINE(rtc, &rtc_runtime, SECONDARY, int rtc_dw_init(struct device *dev) { irq_connect(CONFIG_RTC_IRQ, CONFIG_RTC_IRQ_PRI, rtc_dw_isr, - SYS_GET_DEVICE(rtc), 0); + DEVICE_GET(rtc), 0); irq_enable(CONFIG_RTC_IRQ); _rtc_dw_int_unmask(); diff --git a/drivers/rtc/rtc_qmsi.c b/drivers/rtc/rtc_qmsi.c index d7e94df2941..53cf768a69f 100644 --- a/drivers/rtc/rtc_qmsi.c +++ b/drivers/rtc/rtc_qmsi.c @@ -98,4 +98,4 @@ DEVICE_INIT_CONFIG_DEFINE(rtc, CONFIG_RTC_DRV_NAME, DEVICE_DEFINE(rtc, NULL, SECONDARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE); -static struct device *rtc_qmsi_dev = SYS_GET_DEVICE(rtc); +static struct device *rtc_qmsi_dev = DEVICE_GET(rtc); diff --git a/drivers/shared_irq/shared_irq.c b/drivers/shared_irq/shared_irq.c index 7dbf4c2620c..195855013a5 100644 --- a/drivers/shared_irq/shared_irq.c +++ b/drivers/shared_irq/shared_irq.c @@ -168,7 +168,7 @@ DEVICE_DEFINE(shared_irq_0, &shared_irq_0_runtime, SECONDARY, void shared_irq_config_0_irq(void) { irq_connect(CONFIG_SHARED_IRQ_0_IRQ, CONFIG_SHARED_IRQ_0_PRI, - shared_irq_isr, SYS_GET_DEVICE(shared_irq_0), + shared_irq_isr, DEVICE_GET(shared_irq_0), SHARED_IRQ_0_FLAGS); } @@ -209,7 +209,7 @@ DEVICE_DEFINE(shared_irq_1, &shared_irq_1_runtime, SECONDARY, void shared_irq_config_1_irq(void) { irq_connect(CONFIG_SHARED_IRQ_1_IRQ, CONFIG_SHARED_IRQ_1_PRI, - shared_irq_isr, SYS_GET_DEVICE(shared_irq_1), + shared_irq_isr, DEVICE_GET(shared_irq_1), SHARED_IRQ_1_FLAGS); } diff --git a/drivers/spi/spi_dw.c b/drivers/spi/spi_dw.c index 01058387cd9..3e8f468f791 100644 --- a/drivers/spi/spi_dw.c +++ b/drivers/spi/spi_dw.c @@ -591,7 +591,7 @@ DEVICE_DEFINE(spi_dw_port_0, &spi_dw_data_port_0, SECONDARY, void spi_config_0_irq(void) { irq_connect(CONFIG_SPI_DW_PORT_0_IRQ, CONFIG_SPI_DW_PORT_0_PRI, - spi_dw_isr, SYS_GET_DEVICE(spi_dw_port_0), + spi_dw_isr, DEVICE_GET(spi_dw_port_0), SPI_DW_IRQ_FLAGS); irq_enable(CONFIG_SPI_DW_PORT_0_IRQ); } @@ -624,7 +624,7 @@ DEVICE_DEFINE(spi_dw_port_1, &spi_dw_data_port_1, SECONDARY, void spi_config_1_irq(void) { irq_connect(CONFIG_SPI_DW_PORT_1_IRQ, CONFIG_SPI_DW_PORT_1_PRI, - spi_dw_isr, SYS_GET_DEVICE(spi_dw_port_1), + spi_dw_isr, DEVICE_GET(spi_dw_port_1), SPI_DW_IRQ_FLAGS); irq_enable(CONFIG_SPI_DW_PORT_1_IRQ); } diff --git a/drivers/spi/spi_intel.c b/drivers/spi/spi_intel.c index 132dd9970f3..ddcb67d09ee 100644 --- a/drivers/spi/spi_intel.c +++ b/drivers/spi/spi_intel.c @@ -477,7 +477,7 @@ DEVICE_DEFINE(spi_intel_port_0, &spi_intel_data_port_0, SECONDARY, void spi_config_0_irq(void) { irq_connect(CONFIG_SPI_INTEL_PORT_0_IRQ, CONFIG_SPI_INTEL_PORT_0_PRI, - spi_intel_isr, SYS_GET_DEVICE(spi_intel_port_0), + spi_intel_isr, DEVICE_GET(spi_intel_port_0), SPI_INTEL_IRQ_FLAGS); } @@ -516,7 +516,7 @@ DEVICE_DEFINE(spi_intel_port_1, &spi_intel_data_port_1, SECONDARY, void spi_config_1_irq(void); { irq_connect(CONFIG_SPI_INTEL_PORT_1_IRQ, CONFIG_SPI_INTEL_PORT_1_PRI, - spi_intel_isr, SYS_GET_DEVICE(spi_intel_port_1), + spi_intel_isr, DEVICE_GET(spi_intel_port_1), SPI_INTEL_IRQ_FLAGS); } diff --git a/drivers/watchdog/wdt_dw.c b/drivers/watchdog/wdt_dw.c index 35d30157a73..cf1c8287d1a 100644 --- a/drivers/watchdog/wdt_dw.c +++ b/drivers/watchdog/wdt_dw.c @@ -171,7 +171,7 @@ int wdt_dw_init(struct device *dev) dev->driver_api = &wdt_dw_funcs; irq_connect(CONFIG_WDT_DW_IRQ, CONFIG_WDT_DW_IRQ_PRI, wdt_dw_isr, - SYS_GET_DEVICE(wdt), 0); + DEVICE_GET(wdt), 0); irq_enable(CONFIG_WDT_DW_IRQ); _wdt_dw_int_unmask(); diff --git a/drivers/watchdog/wdt_qmsi.c b/drivers/watchdog/wdt_qmsi.c index 1c94234dd85..79e4cd26811 100644 --- a/drivers/watchdog/wdt_qmsi.c +++ b/drivers/watchdog/wdt_qmsi.c @@ -106,7 +106,7 @@ DEVICE_DEFINE(wdt, 0, PRIMARY, CONFIG_KERNEL_INIT_PRIORITY_DEVICE); * is not used by the ISR code, we require it in order to be able to pass * the device argument from the user callback (wdt_config->interrupt_fn). */ -struct device *wdt_qmsi_isr_dev = SYS_GET_DEVICE(wdt); +struct device *wdt_qmsi_isr_dev = DEVICE_GET(wdt); static void interrupt_callback(void) { diff --git a/include/init.h b/include/init.h index d5eafb18e28..44785f9a0b1 100644 --- a/include/init.h +++ b/include/init.h @@ -90,7 +90,7 @@ extern "C" { .driver_data = data} /** - * @def SYS_GET_DEVICE_NAME + * @def DEVICE_NAME_GET * * @brief Expands to the full name of a global device object * @@ -98,16 +98,16 @@ extern "C" { * DEVICE_DEFINE(), using the @name provided to DEVICE_DEFINE(). * * It is meant to be used for declaring extern symbols pointing on device - * objects before using the SYS_GET_DEVICE macro to get the device object. + * objects before using the DEVICE_GET macro to get the device object. * * @param name The same name provided to DEVICE_DEFINE() * * @return The exanded name of the device object created by DEVICE_DEFINE() */ -#define SYS_GET_DEVICE_NAME(name) (_CONCAT(__initconfig_, name)) +#define DEVICE_NAME_GET(name) (_CONCAT(__initconfig_, name)) /** - * @def SYS_GET_DEVICE + * @def DEVICE_GET * * @brief Obtain a pointer to a device object by name * @@ -118,7 +118,7 @@ extern "C" { * * @return A pointer to the device object created by DEVICE_DEFINE() */ -#define SYS_GET_DEVICE(name) (&SYS_GET_DEVICE_NAME(name)) +#define DEVICE_GET(name) (&DEVICE_NAME_GET(name)) #ifdef __cplusplus }