michaelh/zephyr
1
0
Fork 0
Code Releases Activity

sensors: ccs811: update to new API

Browse source 
Update devicetree sources and bindings, switch to new GPIO API.  Use
devicetree property name to identify interrupt signal.

Signed-off-by: Peter Bigot <peter.bigot@nordicsemi.no>
This commit is contained in:
Peter Bigot 2020-01-21 14:14:22 -06:00 • committed by Carles Cufí
commit acb43b66da
6 changed files with 99 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

108
drivers/sensor/ccs811/ccs811_trigger.c
View file

@ -11,6 +11,8 @@
#include <logging/log.h>
LOG_MODULE_DECLARE(CCS811);
#define IRQ_PIN DT_INST_0_AMS_CCS811_IRQ_GPIOS_PIN
int ccs811_attr_set(struct device *dev,
enum sensor_channel chan,
enum sensor_attribute attr,
@ -41,40 +43,57 @@ int ccs811_attr_set(struct device *dev,
return rc;
}
static inline void setup_irq(struct device *dev,
bool enable)
{
struct ccs811_data *data = dev->driver_data;
unsigned int flags = enable
? GPIO_INT_LEVEL_ACTIVE
: GPIO_INT_DISABLE;
gpio_pin_interrupt_configure(data->irq_gpio, IRQ_PIN, flags);
}
static inline void handle_irq(struct device *dev)
{
struct ccs811_data *data = dev->driver_data;
setup_irq(dev, false);
#if defined(CONFIG_CCS811_TRIGGER_OWN_THREAD)
k_sem_give(&data->gpio_sem);
#elif defined(CONFIG_CCS811_TRIGGER_GLOBAL_THREAD)
k_work_submit(&data->work);
#endif
}
static void process_irq(struct device *dev)
{
struct ccs811_data *data = dev->driver_data;
if (data->handler != NULL) {
data->handler(dev, &data->trigger);
}
if (data->handler != NULL) {
setup_irq(dev, true);
}
}
static void gpio_callback(struct device *dev,
struct gpio_callback *cb,
u32_t pins)
{
struct ccs811_data *drv_data =
struct ccs811_data *data =
CONTAINER_OF(cb, struct ccs811_data, gpio_cb);
ARG_UNUSED(pins);
gpio_pin_disable_callback(dev, DT_INST_0_AMS_CCS811_IRQ_GPIOS_PIN);
#if defined(CONFIG_CCS811_TRIGGER_OWN_THREAD)
k_sem_give(&drv_data->gpio_sem);
#elif defined(CONFIG_CCS811_TRIGGER_GLOBAL_THREAD)
k_work_submit(&drv_data->work);
#else
#error Unhandled trigger configuration
#endif
}
static void thread_cb(void *arg)
{
struct device *dev = arg;
struct ccs811_data *drv_data = dev->driver_data;
if (drv_data->handler != NULL) {
drv_data->handler(dev, &drv_data->trigger);
}
gpio_pin_enable_callback(drv_data->int_gpio, DT_INST_0_AMS_CCS811_IRQ_GPIOS_PIN);
handle_irq(data->dev);
}
#ifdef CONFIG_CCS811_TRIGGER_OWN_THREAD
static void datardy_thread(int dev_ptr, int unused)
static void irq_thread(int dev_ptr, int unused)
{
struct device *dev = INT_TO_POINTER(dev_ptr);
struct ccs811_data *drv_data = dev->driver_data;
@ -83,16 +102,15 @@ static void datardy_thread(int dev_ptr, int unused)
while (1) {
k_sem_take(&drv_data->gpio_sem, K_FOREVER);
thread_cb(dev);
process_irq(dev);
}
}
#elif defined(CONFIG_CCS811_TRIGGER_GLOBAL_THREAD)
static void work_cb(struct k_work *work)
{
struct ccs811_data *drv_data =
CONTAINER_OF(work, struct ccs811_data, work);
struct ccs811_data *data = CONTAINER_OF(work, struct ccs811_data, work);
thread_cb(drv_data->dev);
process_irq(data->dev);
}
#else
#error Unhandled trigger configuration
@ -107,7 +125,13 @@ int ccs811_trigger_set(struct device *dev,
int rc;
LOG_DBG("CCS811 trigger set");
gpio_pin_disable_callback(drv_data->int_gpio, DT_INST_0_AMS_CCS811_IRQ_GPIOS_PIN);
setup_irq(dev, false);
drv_data->handler = handler;
if (handler == NULL) {
return 0;
}
if (trig->type == SENSOR_TRIG_DATA_READY) {
rc = ccs811_mutate_meas_mode(dev, CCS811_MODE_DATARDY,
CCS811_MODE_THRESH);
@ -128,11 +152,14 @@ int ccs811_trigger_set(struct device *dev,
}
if (rc == 0) {
drv_data->handler = handler;
drv_data->trigger = *trig;
gpio_pin_enable_callback(drv_data->int_gpio,
DT_INST_0_AMS_CCS811_IRQ_GPIOS_PIN);
setup_irq(dev, true);
if (gpio_pin_get(drv_data->irq_gpio, IRQ_PIN) > 0) {
handle_irq(dev);
}
} else {
drv_data->handler = NULL;
(void)ccs811_mutate_meas_mode(dev, 0, drdy_thresh);
}
@ -143,18 +170,14 @@ int ccs811_init_interrupt(struct device *dev)
{
struct ccs811_data *drv_data = dev->driver_data;
#ifndef DT_INST_0_AMS_CCS811_IRQ_GPIOS_PIN
return -EINVAL;
#endif
gpio_pin_configure(drv_data->int_gpio, DT_INST_0_AMS_CCS811_IRQ_GPIOS_PIN,
GPIO_DIR_IN | GPIO_INT | GPIO_INT_LEVEL |
GPIO_INT_ACTIVE_LOW | GPIO_PUD_PULL_UP |
GPIO_INT_DEBOUNCE);
drv_data->dev = dev;
gpio_init_callback(&drv_data->gpio_cb, gpio_callback,
BIT(DT_INST_0_AMS_CCS811_IRQ_GPIOS_PIN));
gpio_pin_configure(drv_data->irq_gpio, IRQ_PIN,
GPIO_INPUT | DT_INST_0_AMS_CCS811_IRQ_GPIOS_FLAGS);
if (gpio_add_callback(drv_data->int_gpio, &drv_data->gpio_cb) < 0) {
gpio_init_callback(&drv_data->gpio_cb, gpio_callback, BIT(IRQ_PIN));
if (gpio_add_callback(drv_data->irq_gpio, &drv_data->gpio_cb) < 0) {
LOG_DBG("Failed to set gpio callback!");
return -EIO;
}
@ -164,12 +187,11 @@ int ccs811_init_interrupt(struct device *dev)
k_thread_create(&drv_data->thread, drv_data->thread_stack,
CONFIG_CCS811_THREAD_STACK_SIZE,
(k_thread_entry_t)datardy_thread, dev,
(k_thread_entry_t)irq_thread, dev,
0, NULL, K_PRIO_COOP(CONFIG_CCS811_THREAD_PRIORITY),
0, 0);
#elif defined(CONFIG_CCS811_TRIGGER_GLOBAL_THREAD)
drv_data->work.handler = work_cb;
drv_data->dev = dev;
#else
#error Unhandled trigger configuration
#endif