From 2d4a36fc1ca9fe1d4acb8360c7e6f1648fe74136 Mon Sep 17 00:00:00 2001 From: Andrew Boie Date: Fri, 2 Jun 2017 14:08:45 -0700 Subject: [PATCH] drivers: use K_THREAD_STACK_DEFINE macros Signed-off-by: Andrew Boie --- drivers/bluetooth/hci/h4.c | 2 +- drivers/bluetooth/hci/h5.c | 10 ++++++---- drivers/bluetooth/hci/spi.c | 3 ++- drivers/console/telnet_console.c | 2 +- drivers/ethernet/eth_enc28j60_priv.h | 3 ++- drivers/gpio/gpio_sch.h | 2 +- drivers/ieee802154/ieee802154_cc2520.h | 3 ++- drivers/ieee802154/ieee802154_mcr20a.h | 3 ++- drivers/ieee802154/ieee802154_nrf5.h | 2 +- drivers/sensor/bma280/bma280.h | 2 +- drivers/sensor/bmc150_magn/bmc150_magn.h | 3 ++- drivers/sensor/bmg160/bmg160_trigger.c | 2 +- drivers/sensor/bmi160/bmi160_trigger.c | 2 +- drivers/sensor/fxas21002/fxas21002.h | 2 +- drivers/sensor/fxos8700/fxos8700.h | 2 +- drivers/sensor/hmc5883l/hmc5883l.h | 2 +- drivers/sensor/hts221/hts221.h | 2 +- drivers/sensor/isl29035/isl29035.h | 2 +- drivers/sensor/lis2dh/lis2dh.h | 2 +- drivers/sensor/lis3dh/lis3dh.h | 2 +- drivers/sensor/lis3mdl/lis3mdl.h | 2 +- drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.h | 3 ++- drivers/sensor/mcp9808/mcp9808_trigger.c | 2 +- drivers/sensor/mpu6050/mpu6050.h | 2 +- drivers/sensor/sht3xd/sht3xd.h | 2 +- drivers/sensor/sx9500/sx9500_trigger.c | 2 +- drivers/sensor/tmp007/tmp007.h | 2 +- 27 files changed, 38 insertions(+), 30 deletions(-) diff --git a/drivers/bluetooth/hci/h4.c b/drivers/bluetooth/hci/h4.c index 5cdc62d4dca..d109c55beba 100644 --- a/drivers/bluetooth/hci/h4.c +++ b/drivers/bluetooth/hci/h4.c @@ -440,7 +440,7 @@ static int h4_open(void) uart_irq_callback_set(h4_dev, bt_uart_isr); k_thread_create(&rx_thread_data, rx_thread_stack, - sizeof(rx_thread_stack), rx_thread, + K_THREAD_STACK_SIZEOF(rx_thread_stack), rx_thread, NULL, NULL, NULL, K_PRIO_COOP(7), 0, K_NO_WAIT); return 0; diff --git a/drivers/bluetooth/hci/h5.c b/drivers/bluetooth/hci/h5.c index 6f1b09a109b..0807da059a2 100644 --- a/drivers/bluetooth/hci/h5.c +++ b/drivers/bluetooth/hci/h5.c @@ -364,8 +364,8 @@ static void ack_timeout(struct k_work *work) h5_send(NULL, HCI_3WIRE_ACK_PKT, 0); /* Analyze stacks */ - stack_analyze("tx_stack", tx_stack, sizeof(tx_stack)); - stack_analyze("rx_stack", rx_stack, sizeof(rx_stack)); + STACK_ANALYZE("tx_stack", tx_stack); + STACK_ANALYZE("rx_stack", rx_stack); } static void h5_process_complete_packet(u8_t *hdr) @@ -717,12 +717,14 @@ static void h5_init(void) /* TX thread */ k_fifo_init(&h5.tx_queue); - k_thread_create(&tx_thread_data, tx_stack, sizeof(tx_stack), + k_thread_create(&tx_thread_data, tx_stack, + K_THREAD_STACK_SIZEOF(tx_stack), (k_thread_entry_t)tx_thread, NULL, NULL, NULL, K_PRIO_COOP(7), 0, K_NO_WAIT); k_fifo_init(&h5.rx_queue); - k_thread_create(&rx_thread_data, rx_stack, sizeof(rx_stack), + k_thread_create(&rx_thread_data, rx_stack, + K_THREAD_STACK_SIZEOF(rx_stack), (k_thread_entry_t)rx_thread, NULL, NULL, NULL, K_PRIO_COOP(7), 0, K_NO_WAIT); diff --git a/drivers/bluetooth/hci/spi.c b/drivers/bluetooth/hci/spi.c index b03af4ddbed..cd1ba952ddb 100644 --- a/drivers/bluetooth/hci/spi.c +++ b/drivers/bluetooth/hci/spi.c @@ -325,7 +325,8 @@ static int bt_spi_open(void) } /* Start RX thread */ - k_thread_create(&rx_thread_data, rx_stack, sizeof(rx_stack), + k_thread_create(&rx_thread_data, rx_stack, + K_THREAD_STACK_SIZEOF(rx_stack), (k_thread_entry_t)bt_spi_rx_thread, NULL, NULL, NULL, K_PRIO_COOP(7), 0, K_NO_WAIT); diff --git a/drivers/console/telnet_console.c b/drivers/console/telnet_console.c index a4a54af07b3..3cb988f46b7 100644 --- a/drivers/console/telnet_console.c +++ b/drivers/console/telnet_console.c @@ -66,7 +66,7 @@ struct line_buf_rb { static struct line_buf_rb telnet_rb; -static char __noinit __stack telnet_stack[TELNET_STACK_SIZE]; +static K_THREAD_STACK_DEFINE(telnet_stack, TELNET_STACK_SIZE); static struct k_thread telnet_thread_data; static K_SEM_DEFINE(send_lock, 0, UINT_MAX); diff --git a/drivers/ethernet/eth_enc28j60_priv.h b/drivers/ethernet/eth_enc28j60_priv.h index bb1c1a46b26..6b3bb42d65b 100644 --- a/drivers/ethernet/eth_enc28j60_priv.h +++ b/drivers/ethernet/eth_enc28j60_priv.h @@ -225,7 +225,8 @@ struct eth_enc28j60_config { struct eth_enc28j60_runtime { struct net_if *iface; - char __stack thread_stack[CONFIG_ETH_ENC28J60_RX_THREAD_STACK_SIZE]; + K_THREAD_STACK_MEMBER(thread_stack, + CONFIG_ETH_ENC28J60_RX_THREAD_STACK_SIZE); struct k_thread thread; struct device *gpio; struct device *spi; diff --git a/drivers/gpio/gpio_sch.h b/drivers/gpio/gpio_sch.h index ac17a3a3688..602084050ca 100644 --- a/drivers/gpio/gpio_sch.h +++ b/drivers/gpio/gpio_sch.h @@ -33,7 +33,7 @@ struct gpio_sch_config { #define GPIO_SCH_POLLING_MSEC 200 struct gpio_sch_data { - char __stack polling_stack[GPIO_SCH_POLLING_STACK_SIZE]; + K_THREAD_STACK_MEMBER(polling_stack, GPIO_SCH_POLLING_STACK_SIZE); struct k_thread polling_thread; sys_slist_t callbacks; struct k_timer poll_timer; diff --git a/drivers/ieee802154/ieee802154_cc2520.h b/drivers/ieee802154/ieee802154_cc2520.h index ec4332636c2..d5729a82ce1 100644 --- a/drivers/ieee802154/ieee802154_cc2520.h +++ b/drivers/ieee802154/ieee802154_cc2520.h @@ -40,7 +40,8 @@ struct cc2520_context { struct k_sem tx_sync; atomic_t tx; /************RX************/ - char __stack cc2520_rx_stack[CONFIG_IEEE802154_CC2520_RX_STACK_SIZE]; + K_THREAD_STACK_MEMBER(cc2520_rx_stack, + CONFIG_IEEE802154_CC2520_RX_STACK_SIZE); struct k_thread cc2520_rx_thread; struct k_sem rx_lock; #ifdef CONFIG_IEEE802154_CC2520_CRYPTO diff --git a/drivers/ieee802154/ieee802154_mcr20a.h b/drivers/ieee802154/ieee802154_mcr20a.h index 01c822ccc20..bdd660caaef 100644 --- a/drivers/ieee802154/ieee802154_mcr20a.h +++ b/drivers/ieee802154/ieee802154_mcr20a.h @@ -42,7 +42,8 @@ struct mcr20a_context { struct k_sem seq_sync; atomic_t seq_retval; /************RX************/ - char __stack mcr20a_rx_stack[CONFIG_IEEE802154_MCR20A_RX_STACK_SIZE]; + K_THREAD_STACK_MEMBER(mcr20a_rx_stack, + CONFIG_IEEE802154_MCR20A_RX_STACK_SIZE); struct k_thread mcr20a_rx_thread; u8_t lqi; }; diff --git a/drivers/ieee802154/ieee802154_nrf5.h b/drivers/ieee802154/ieee802154_nrf5.h index 1f0fd9dbeb6..a035316d226 100644 --- a/drivers/ieee802154/ieee802154_nrf5.h +++ b/drivers/ieee802154/ieee802154_nrf5.h @@ -27,7 +27,7 @@ struct nrf5_802154_data { /* 802.15.4 HW address. */ u8_t mac[8]; /* RX thread stack. */ - char __stack rx_stack[CONFIG_IEEE802154_NRF5_RX_STACK_SIZE]; + K_THREAD_STACK_MEMBER(rx_stack, CONFIG_IEEE802154_NRF5_RX_STACK_SIZE); /* RX thread control block */ struct k_thread rx_thread; diff --git a/drivers/sensor/bma280/bma280.h b/drivers/sensor/bma280/bma280.h index 218c4402cd4..c6bccaccf7f 100644 --- a/drivers/sensor/bma280/bma280.h +++ b/drivers/sensor/bma280/bma280.h @@ -131,7 +131,7 @@ struct bma280_data { sensor_trigger_handler_t any_motion_handler; #if defined(CONFIG_BMA280_TRIGGER_OWN_THREAD) - char __stack thread_stack[CONFIG_BMA280_THREAD_STACK_SIZE]; + K_THREAD_STACK_MEMBER(thread_stack, CONFIG_BMA280_THREAD_STACK_SIZE); struct k_thread thread; struct k_sem gpio_sem; #elif defined(CONFIG_BMA280_TRIGGER_GLOBAL_THREAD) diff --git a/drivers/sensor/bmc150_magn/bmc150_magn.h b/drivers/sensor/bmc150_magn/bmc150_magn.h index fc5f27ab4b0..769f99deb30 100644 --- a/drivers/sensor/bmc150_magn/bmc150_magn.h +++ b/drivers/sensor/bmc150_magn/bmc150_magn.h @@ -117,7 +117,8 @@ struct bmc150_magn_data { struct k_sem sem; #if defined(CONFIG_BMC150_MAGN_TRIGGER) - char __stack thread_stack[CONFIG_BMC150_MAGN_TRIGGER_THREAD_STACK]; + K_THREAD_STACK_MEMBER(thread_stack, + CONFIG_BMC150_MAGN_TRIGGER_THREAD_STACK); struct k_thread thread; #endif diff --git a/drivers/sensor/bmg160/bmg160_trigger.c b/drivers/sensor/bmg160/bmg160_trigger.c index 6baf3ec83ef..5e7b85a637a 100644 --- a/drivers/sensor/bmg160/bmg160_trigger.c +++ b/drivers/sensor/bmg160/bmg160_trigger.c @@ -163,7 +163,7 @@ static void bmg160_handle_int(void *arg) } #ifdef CONFIG_BMG160_TRIGGER_OWN_THREAD -static char __stack bmg160_thread_stack[CONFIG_BMG160_THREAD_STACK_SIZE]; +static K_THREAD_STACK_DEFINE(bmg160_thread_stack, CONFIG_BMG160_THREAD_STACK_SIZE); static struct k_thread bmg160_thread; static void bmg160_thread_main(void *arg1, void *arg2, void *arg3) diff --git a/drivers/sensor/bmi160/bmi160_trigger.c b/drivers/sensor/bmi160/bmi160_trigger.c index ab746160eaf..90d39c85e92 100644 --- a/drivers/sensor/bmi160/bmi160_trigger.c +++ b/drivers/sensor/bmi160/bmi160_trigger.c @@ -77,7 +77,7 @@ static void bmi160_handle_interrupts(void *arg) } #ifdef CONFIG_BMI160_TRIGGER_OWN_THREAD -static char __stack bmi160_thread_stack[CONFIG_BMI160_THREAD_STACK_SIZE]; +static K_THREAD_STACK_DEFINE(bmi160_thread_stack, CONFIG_BMI160_THREAD_STACK_SIZE); static struct k_thread bmi160_thread; static void bmi160_thread_main(void *arg1, void *unused1, void *unused2) diff --git a/drivers/sensor/fxas21002/fxas21002.h b/drivers/sensor/fxas21002/fxas21002.h index a392c1a3c92..1fd1dca1aaf 100644 --- a/drivers/sensor/fxas21002/fxas21002.h +++ b/drivers/sensor/fxas21002/fxas21002.h @@ -82,7 +82,7 @@ struct fxas21002_data { sensor_trigger_handler_t drdy_handler; #endif #ifdef CONFIG_FXAS21002_TRIGGER_OWN_THREAD - char __stack thread_stack[CONFIG_FXAS21002_THREAD_STACK_SIZE]; + K_THREAD_STACK_MEMBER(thread_stack, CONFIG_FXAS21002_THREAD_STACK_SIZE); struct k_thread thread; struct k_sem trig_sem; #endif diff --git a/drivers/sensor/fxos8700/fxos8700.h b/drivers/sensor/fxos8700/fxos8700.h index f917be3c617..c8b731b5a0a 100644 --- a/drivers/sensor/fxos8700/fxos8700.h +++ b/drivers/sensor/fxos8700/fxos8700.h @@ -124,7 +124,7 @@ struct fxos8700_data { sensor_trigger_handler_t double_tap_handler; #endif #ifdef CONFIG_FXOS8700_TRIGGER_OWN_THREAD - char __stack thread_stack[CONFIG_FXOS8700_THREAD_STACK_SIZE]; + K_THREAD_STACK_MEMBER(thread_stack, CONFIG_FXOS8700_THREAD_STACK_SIZE); struct k_thread thread; struct k_sem trig_sem; #endif diff --git a/drivers/sensor/hmc5883l/hmc5883l.h b/drivers/sensor/hmc5883l/hmc5883l.h index 59c0ac7ae98..8d36e698ac5 100644 --- a/drivers/sensor/hmc5883l/hmc5883l.h +++ b/drivers/sensor/hmc5883l/hmc5883l.h @@ -61,7 +61,7 @@ struct hmc5883l_data { sensor_trigger_handler_t data_ready_handler; #if defined(CONFIG_HMC5883L_TRIGGER_OWN_THREAD) - char __stack thread_stack[CONFIG_HMC5883L_THREAD_STACK_SIZE]; + K_THREAD_STACK_MEMBER(thread_stack, CONFIG_HMC5883L_THREAD_STACK_SIZE); struct k_thread thread; struct k_sem gpio_sem; #elif defined(CONFIG_HMC5883L_TRIGGER_GLOBAL_THREAD) diff --git a/drivers/sensor/hts221/hts221.h b/drivers/sensor/hts221/hts221.h index 95f86daac5c..84426d8ae85 100644 --- a/drivers/sensor/hts221/hts221.h +++ b/drivers/sensor/hts221/hts221.h @@ -59,7 +59,7 @@ struct hts221_data { sensor_trigger_handler_t data_ready_handler; #if defined(CONFIG_HTS221_TRIGGER_OWN_THREAD) - char __stack thread_stack[CONFIG_HTS221_THREAD_STACK_SIZE]; + K_THREAD_STACK_MEMBER(thread_stack, CONFIG_HTS221_THREAD_STACK_SIZE); struct k_thread thread; struct k_sem gpio_sem; #elif defined(CONFIG_HTS221_TRIGGER_GLOBAL_THREAD) diff --git a/drivers/sensor/isl29035/isl29035.h b/drivers/sensor/isl29035/isl29035.h index 3b6f0b1b6da..662573f9a2a 100644 --- a/drivers/sensor/isl29035/isl29035.h +++ b/drivers/sensor/isl29035/isl29035.h @@ -122,7 +122,7 @@ struct isl29035_driver_data { sensor_trigger_handler_t th_handler; #if defined(CONFIG_ISL29035_TRIGGER_OWN_THREAD) - char __stack thread_stack[CONFIG_ISL29035_THREAD_STACK_SIZE]; + K_THREAD_STACK_MEMBER(thread_stack, CONFIG_ISL29035_THREAD_STACK_SIZE); struct k_thread thread; struct k_sem gpio_sem; #elif defined(CONFIG_ISL29035_TRIGGER_GLOBAL_THREAD) diff --git a/drivers/sensor/lis2dh/lis2dh.h b/drivers/sensor/lis2dh/lis2dh.h index 4df4e5a7e0b..df7e88f8ef3 100644 --- a/drivers/sensor/lis2dh/lis2dh.h +++ b/drivers/sensor/lis2dh/lis2dh.h @@ -201,7 +201,7 @@ struct lis2dh_data { enum sensor_channel chan_drdy; #if defined(CONFIG_LIS2DH_TRIGGER_OWN_THREAD) - char __stack thread_stack[CONFIG_LIS2DH_THREAD_STACK_SIZE]; + K_THREAD_STACK_MEMBER(thread_stack, CONFIG_LIS2DH_THREAD_STACK_SIZE); struct k_thread thread; struct k_sem gpio_sem; #elif defined(CONFIG_LIS2DH_TRIGGER_GLOBAL_THREAD) diff --git a/drivers/sensor/lis3dh/lis3dh.h b/drivers/sensor/lis3dh/lis3dh.h index 40c0673dedb..29c6d77804a 100644 --- a/drivers/sensor/lis3dh/lis3dh.h +++ b/drivers/sensor/lis3dh/lis3dh.h @@ -93,7 +93,7 @@ struct lis3dh_data { sensor_trigger_handler_t data_ready_handler; #if defined(CONFIG_LIS3DH_TRIGGER_OWN_THREAD) - char __stack thread_stack[CONFIG_LIS3DH_THREAD_STACK_SIZE]; + K_THREAD_STACK_MEMBER(thread_stack, CONFIG_LIS3DH_THREAD_STACK_SIZE); struct k_thread thread; struct k_sem gpio_sem; #elif defined(CONFIG_LIS3DH_TRIGGER_GLOBAL_THREAD) diff --git a/drivers/sensor/lis3mdl/lis3mdl.h b/drivers/sensor/lis3mdl/lis3mdl.h index 1608f161556..ed609631be2 100644 --- a/drivers/sensor/lis3mdl/lis3mdl.h +++ b/drivers/sensor/lis3mdl/lis3mdl.h @@ -134,7 +134,7 @@ struct lis3mdl_data { sensor_trigger_handler_t data_ready_handler; #if defined(CONFIG_LIS3MDL_TRIGGER_OWN_THREAD) - char __stack thread_stack[CONFIG_LIS3MDL_THREAD_STACK_SIZE]; + K_THREAD_STACK_MEMBER(thread_stack, CONFIG_LIS3MDL_THREAD_STACK_SIZE); struct k_sem gpio_sem; struct k_thread thread; #elif defined(CONFIG_LIS3MDL_TRIGGER_GLOBAL_THREAD) diff --git a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.h b/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.h index c93cb2f9478..ef84e27de9b 100644 --- a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.h +++ b/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.h @@ -229,7 +229,8 @@ struct lsm9ds0_gyro_data { #endif #if defined(CONFIG_LSM9DS0_GYRO_TRIGGER_DRDY) - char __stack thread_stack[CONFIG_LSM9DS0_GYRO_THREAD_STACK_SIZE]; + K_THREAD_STACK_MEMBER(thread_stack, + CONFIG_LSM9DS0_GYRO_THREAD_STACK_SIZE); struct k_thread thread; struct device *dev; diff --git a/drivers/sensor/mcp9808/mcp9808_trigger.c b/drivers/sensor/mcp9808/mcp9808_trigger.c index c01182f7d0b..ef373803a12 100644 --- a/drivers/sensor/mcp9808/mcp9808_trigger.c +++ b/drivers/sensor/mcp9808/mcp9808_trigger.c @@ -126,7 +126,7 @@ static void mcp9808_thread_main(int arg1, int arg2) } } -static char __stack mcp9808_thread_stack[CONFIG_MCP9808_THREAD_STACK_SIZE]; +static K_THREAD_STACK_DEFINE(mcp9808_thread_stack, CONFIG_MCP9808_THREAD_STACK_SIZE); static struct k_thread mcp9808_thread; #else /* CONFIG_MCP9808_TRIGGER_GLOBAL_THREAD */ diff --git a/drivers/sensor/mpu6050/mpu6050.h b/drivers/sensor/mpu6050/mpu6050.h index 6e6857b810a..36fbd4bd1f8 100644 --- a/drivers/sensor/mpu6050/mpu6050.h +++ b/drivers/sensor/mpu6050/mpu6050.h @@ -61,7 +61,7 @@ struct mpu6050_data { sensor_trigger_handler_t data_ready_handler; #if defined(CONFIG_MPU6050_TRIGGER_OWN_THREAD) - char __stack thread_stack[CONFIG_MPU6050_THREAD_STACK_SIZE]; + K_THREAD_STACK_MEMBER(thread_stack, CONFIG_MPU6050_THREAD_STACK_SIZE); struct k_thread thread; struct k_sem gpio_sem; #elif defined(CONFIG_MPU6050_TRIGGER_GLOBAL_THREAD) diff --git a/drivers/sensor/sht3xd/sht3xd.h b/drivers/sensor/sht3xd/sht3xd.h index 024f9a0c72d..aa7af12ba60 100644 --- a/drivers/sensor/sht3xd/sht3xd.h +++ b/drivers/sensor/sht3xd/sht3xd.h @@ -75,7 +75,7 @@ struct sht3xd_data { struct sensor_trigger trigger; #if defined(CONFIG_SHT3XD_TRIGGER_OWN_THREAD) - char __stack thread_stack[CONFIG_SHT3XD_THREAD_STACK_SIZE]; + K_THREAD_STACK_MEMBER(thread_stack, CONFIG_SHT3XD_THREAD_STACK_SIZE); struct k_sem gpio_sem; struct k_thread thread; #elif defined(CONFIG_SHT3XD_TRIGGER_GLOBAL_THREAD) diff --git a/drivers/sensor/sx9500/sx9500_trigger.c b/drivers/sensor/sx9500/sx9500_trigger.c index 153bbaccb47..b269d07abf5 100644 --- a/drivers/sensor/sx9500/sx9500_trigger.c +++ b/drivers/sensor/sx9500/sx9500_trigger.c @@ -14,7 +14,7 @@ #include "sx9500.h" #ifdef CONFIG_SX9500_TRIGGER_OWN_THREAD -static char __stack sx9500_thread_stack[CONFIG_SX9500_THREAD_STACK_SIZE]; +static K_THREAD_STACK_DEFINE(sx9500_thread_stack, CONFIG_SX9500_THREAD_STACK_SIZE); static struct k_thread sx9500_thread; #endif diff --git a/drivers/sensor/tmp007/tmp007.h b/drivers/sensor/tmp007/tmp007.h index 7a26106f276..d3a80805243 100644 --- a/drivers/sensor/tmp007/tmp007.h +++ b/drivers/sensor/tmp007/tmp007.h @@ -48,7 +48,7 @@ struct tmp007_data { struct sensor_trigger th_trigger; #if defined(CONFIG_TMP007_TRIGGER_OWN_THREAD) - char __stack thread_stack[CONFIG_TMP007_THREAD_STACK_SIZE]; + K_THREAD_STACK_MEMBER(thread_stack, CONFIG_TMP007_THREAD_STACK_SIZE); struct k_sem gpio_sem; struct k_thread thread; #elif defined(CONFIG_TMP007_TRIGGER_GLOBAL_THREAD)