xiaoxiang781216 commented on code in PR #13018: URL: https://github.com/apache/nuttx/pull/13018#discussion_r1730370091
########## sched/irq/irq_attach_thread.c: ########## @@ -0,0 +1,215 @@ +/**************************************************************************** + * sched/irq/irq_attach_thread.c + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. The + * ASF licenses this file to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the + * License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include <nuttx/config.h> + +#include <errno.h> +#include <stdio.h> + +#include <nuttx/irq.h> +#include <nuttx/arch.h> +#include <nuttx/kthread.h> + +#include "irq/irq.h" +#include "sched/sched.h" + +/**************************************************************************** + * Privte Types + ****************************************************************************/ + +/* This is the type of the list of interrupt handlers, one for each IRQ. + * This type provided all of the information necessary to irq_dispatch to + * transfer control to interrupt handlers after the occurrence of an + * interrupt. + */ + +struct irq_thread_info_s +{ + xcpt_t handler; /* Address of the interrupt handler */ + FAR void *arg; /* The argument provided to the interrupt handler. */ + sem_t *sem; /* irq sem used to notify irq thread */ +}; + +/**************************************************************************** + * Private Data + ****************************************************************************/ + +static int g_irq_thread_vector[NR_IRQS]; + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/* Default interrupt handler for threaded interrupts. + * Useful for oneshot interrupts. + */ + +static int irq_default_handler(int irq, FAR void *regs, FAR void *arg) +{ + FAR struct irq_thread_info_s *irq_info = arg; + int ret = IRQ_WAKE_THREAD; + xcpt_t vector; + + vector = irq_info->handler; + + if (vector) + { + ret = vector(irq, regs, irq_info->arg); + } + + if (ret == IRQ_WAKE_THREAD) + { + nxsem_post(irq_info->sem); + ret = OK; + } + + return ret; +} + +static int isr_thread_main(int argc, FAR char *argv[]) +{ + unsigned int irq = atoi(argv[1]); Review Comment: ```suggestion int irq = atoi(argv[1]); ``` ########## sched/irq/irq_attach_thread.c: ########## @@ -0,0 +1,215 @@ +/**************************************************************************** + * sched/irq/irq_attach_thread.c + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. The + * ASF licenses this file to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the + * License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include <nuttx/config.h> + +#include <errno.h> +#include <stdio.h> + +#include <nuttx/irq.h> +#include <nuttx/arch.h> +#include <nuttx/kthread.h> + +#include "irq/irq.h" +#include "sched/sched.h" + +/**************************************************************************** + * Privte Types + ****************************************************************************/ + +/* This is the type of the list of interrupt handlers, one for each IRQ. + * This type provided all of the information necessary to irq_dispatch to + * transfer control to interrupt handlers after the occurrence of an + * interrupt. + */ + +struct irq_thread_info_s +{ + xcpt_t handler; /* Address of the interrupt handler */ + FAR void *arg; /* The argument provided to the interrupt handler. */ + sem_t *sem; /* irq sem used to notify irq thread */ +}; + +/**************************************************************************** + * Private Data + ****************************************************************************/ + +static int g_irq_thread_vector[NR_IRQS]; + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/* Default interrupt handler for threaded interrupts. + * Useful for oneshot interrupts. + */ + +static int irq_default_handler(int irq, FAR void *regs, FAR void *arg) +{ + FAR struct irq_thread_info_s *irq_info = arg; + int ret = IRQ_WAKE_THREAD; + xcpt_t vector; + + vector = irq_info->handler; + + if (vector) + { + ret = vector(irq, regs, irq_info->arg); + } + + if (ret == IRQ_WAKE_THREAD) + { + nxsem_post(irq_info->sem); + ret = OK; + } + + return ret; +} + +static int isr_thread_main(int argc, FAR char *argv[]) +{ + unsigned int irq = atoi(argv[1]); + xcpt_t vector = (xcpt_t)((uintptr_t)strtoul(argv[2], NULL, 16)); Review Comment: ```suggestion xcpt_t isr = (xcpt_t)((uintptr_t)strtoul(argv[2], NULL, 16)); ``` ########## include/nuttx/irq.h: ########## @@ -82,6 +82,14 @@ while (0) #endif +/* interrupt was handled by this device */ Review Comment: ```suggestion /* Interrupt was handled by this device */ ``` ########## sched/irq/irq_attach_thread.c: ########## @@ -0,0 +1,215 @@ +/**************************************************************************** + * sched/irq/irq_attach_thread.c + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. The + * ASF licenses this file to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the + * License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include <nuttx/config.h> + +#include <errno.h> +#include <stdio.h> + +#include <nuttx/irq.h> +#include <nuttx/arch.h> +#include <nuttx/kthread.h> + +#include "irq/irq.h" +#include "sched/sched.h" + +/**************************************************************************** + * Privte Types + ****************************************************************************/ + +/* This is the type of the list of interrupt handlers, one for each IRQ. + * This type provided all of the information necessary to irq_dispatch to + * transfer control to interrupt handlers after the occurrence of an + * interrupt. + */ + +struct irq_thread_info_s +{ + xcpt_t handler; /* Address of the interrupt handler */ + FAR void *arg; /* The argument provided to the interrupt handler. */ + sem_t *sem; /* irq sem used to notify irq thread */ +}; + +/**************************************************************************** + * Private Data + ****************************************************************************/ + +static int g_irq_thread_vector[NR_IRQS]; Review Comment: ```suggestion static pid_t g_irq_thread_vector[NR_IRQS]; ``` ########## sched/irq/irq_attach_thread.c: ########## @@ -0,0 +1,215 @@ +/**************************************************************************** + * sched/irq/irq_attach_thread.c + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. The + * ASF licenses this file to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the + * License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include <nuttx/config.h> + +#include <errno.h> +#include <stdio.h> + +#include <nuttx/irq.h> +#include <nuttx/arch.h> +#include <nuttx/kthread.h> + +#include "irq/irq.h" +#include "sched/sched.h" + +/**************************************************************************** + * Privte Types + ****************************************************************************/ + +/* This is the type of the list of interrupt handlers, one for each IRQ. + * This type provided all of the information necessary to irq_dispatch to + * transfer control to interrupt handlers after the occurrence of an + * interrupt. + */ + +struct irq_thread_info_s +{ + xcpt_t handler; /* Address of the interrupt handler */ + FAR void *arg; /* The argument provided to the interrupt handler. */ + sem_t *sem; /* irq sem used to notify irq thread */ +}; + +/**************************************************************************** + * Private Data + ****************************************************************************/ + +static int g_irq_thread_vector[NR_IRQS]; + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/* Default interrupt handler for threaded interrupts. + * Useful for oneshot interrupts. + */ + +static int irq_default_handler(int irq, FAR void *regs, FAR void *arg) +{ + FAR struct irq_thread_info_s *irq_info = arg; + int ret = IRQ_WAKE_THREAD; + xcpt_t vector; + + vector = irq_info->handler; + + if (vector) + { + ret = vector(irq, regs, irq_info->arg); + } + + if (ret == IRQ_WAKE_THREAD) + { + nxsem_post(irq_info->sem); + ret = OK; + } + + return ret; +} + +static int isr_thread_main(int argc, FAR char *argv[]) +{ + unsigned int irq = atoi(argv[1]); + xcpt_t vector = (xcpt_t)((uintptr_t)strtoul(argv[2], NULL, 16)); + xcpt_t handler = (xcpt_t)((uintptr_t)strtoul(argv[3], NULL, 16)); + FAR void *arg = (FAR void *)((uintptr_t)strtoul(argv[4], NULL, 16)); + struct irq_thread_info_s irq_info; + sem_t sem; + + irq_info.sem = &sem; + irq_info.arg = arg; + irq_info.handler = handler; + + nxsem_init(&sem, 0, 0); + + irq_attach(irq, irq_default_handler, &irq_info); + +#if !defined(CONFIG_ARCH_NOINTC) + up_enable_irq(irq); +#endif + + for (; ; ) + { + int ret; + ret = nxsem_wait_uninterruptible(&sem); + if (ret < 0) + { + continue; + } + + vector(irq, NULL, arg); + } + + return OK; +} + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: irq_attach_thread + * + * Description: + * Configure the IRQ subsystem so that IRQ number 'irq' is dispatched to + * 'isrthread' + * + * Input Parameters: + * irq - Irq num + * isr - Function to be called when the IRQ occurs, called in interrupt + * context. + * If isr is NULL the default handler is installed(irq_default_handler). + * isrthread - called in thread context, If the isrthread is NULL, + * then the ISR is being detached. + * arg - privdate data + * priority - Priority of the new task + * stack_size - size (in bytes) of the stack needed + * + * Returned Value: + * Zero on success; a negated errno value on failure. + * + ****************************************************************************/ + +int irq_attach_thread(int irq, xcpt_t isr, xcpt_t isrthread, FAR void *arg, + int priority, int stack_size) +{ +#if NR_IRQS > 0 + FAR char *argv[5]; + char arg1[32]; /* irq */ + char arg2[32]; /* isrthread */ Review Comment: ```suggestion char arg2[32]; /* isr */ ``` ########## sched/irq/irq_attach_thread.c: ########## @@ -0,0 +1,215 @@ +/**************************************************************************** + * sched/irq/irq_attach_thread.c + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. The + * ASF licenses this file to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the + * License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include <nuttx/config.h> + +#include <errno.h> +#include <stdio.h> + +#include <nuttx/irq.h> +#include <nuttx/arch.h> +#include <nuttx/kthread.h> + +#include "irq/irq.h" +#include "sched/sched.h" + +/**************************************************************************** + * Privte Types + ****************************************************************************/ + +/* This is the type of the list of interrupt handlers, one for each IRQ. + * This type provided all of the information necessary to irq_dispatch to + * transfer control to interrupt handlers after the occurrence of an + * interrupt. + */ + +struct irq_thread_info_s +{ + xcpt_t handler; /* Address of the interrupt handler */ + FAR void *arg; /* The argument provided to the interrupt handler. */ + sem_t *sem; /* irq sem used to notify irq thread */ Review Comment: ```suggestion FAR sem_t *sem; /* irq sem used to notify irq thread */ ``` ########## sched/irq/irq_attach_thread.c: ########## @@ -0,0 +1,215 @@ +/**************************************************************************** + * sched/irq/irq_attach_thread.c + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. The + * ASF licenses this file to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the + * License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include <nuttx/config.h> + +#include <errno.h> +#include <stdio.h> + +#include <nuttx/irq.h> +#include <nuttx/arch.h> +#include <nuttx/kthread.h> + +#include "irq/irq.h" +#include "sched/sched.h" + +/**************************************************************************** + * Privte Types + ****************************************************************************/ + +/* This is the type of the list of interrupt handlers, one for each IRQ. + * This type provided all of the information necessary to irq_dispatch to + * transfer control to interrupt handlers after the occurrence of an + * interrupt. + */ + +struct irq_thread_info_s +{ + xcpt_t handler; /* Address of the interrupt handler */ + FAR void *arg; /* The argument provided to the interrupt handler. */ + sem_t *sem; /* irq sem used to notify irq thread */ +}; + +/**************************************************************************** + * Private Data + ****************************************************************************/ + +static int g_irq_thread_vector[NR_IRQS]; + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/* Default interrupt handler for threaded interrupts. + * Useful for oneshot interrupts. + */ + +static int irq_default_handler(int irq, FAR void *regs, FAR void *arg) +{ + FAR struct irq_thread_info_s *irq_info = arg; + int ret = IRQ_WAKE_THREAD; + xcpt_t vector; + + vector = irq_info->handler; + + if (vector) + { + ret = vector(irq, regs, irq_info->arg); + } + + if (ret == IRQ_WAKE_THREAD) + { + nxsem_post(irq_info->sem); + ret = OK; + } + + return ret; +} + +static int isr_thread_main(int argc, FAR char *argv[]) +{ + unsigned int irq = atoi(argv[1]); + xcpt_t vector = (xcpt_t)((uintptr_t)strtoul(argv[2], NULL, 16)); + xcpt_t handler = (xcpt_t)((uintptr_t)strtoul(argv[3], NULL, 16)); Review Comment: ```suggestion xcpt_t isrthread = (xcpt_t)((uintptr_t)strtoul(argv[3], NULL, 16)); ``` ########## sched/irq/irq_attach_thread.c: ########## @@ -0,0 +1,215 @@ +/**************************************************************************** + * sched/irq/irq_attach_thread.c + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. The + * ASF licenses this file to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the + * License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include <nuttx/config.h> + +#include <errno.h> +#include <stdio.h> + +#include <nuttx/irq.h> +#include <nuttx/arch.h> +#include <nuttx/kthread.h> + +#include "irq/irq.h" +#include "sched/sched.h" + +/**************************************************************************** + * Privte Types + ****************************************************************************/ + +/* This is the type of the list of interrupt handlers, one for each IRQ. + * This type provided all of the information necessary to irq_dispatch to + * transfer control to interrupt handlers after the occurrence of an + * interrupt. + */ + +struct irq_thread_info_s +{ + xcpt_t handler; /* Address of the interrupt handler */ + FAR void *arg; /* The argument provided to the interrupt handler. */ + sem_t *sem; /* irq sem used to notify irq thread */ +}; + +/**************************************************************************** + * Private Data + ****************************************************************************/ + +static int g_irq_thread_vector[NR_IRQS]; + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/* Default interrupt handler for threaded interrupts. + * Useful for oneshot interrupts. + */ + +static int irq_default_handler(int irq, FAR void *regs, FAR void *arg) +{ + FAR struct irq_thread_info_s *irq_info = arg; + int ret = IRQ_WAKE_THREAD; + xcpt_t vector; + + vector = irq_info->handler; + + if (vector) + { + ret = vector(irq, regs, irq_info->arg); + } + + if (ret == IRQ_WAKE_THREAD) + { + nxsem_post(irq_info->sem); + ret = OK; + } + + return ret; +} + +static int isr_thread_main(int argc, FAR char *argv[]) +{ + unsigned int irq = atoi(argv[1]); + xcpt_t vector = (xcpt_t)((uintptr_t)strtoul(argv[2], NULL, 16)); + xcpt_t handler = (xcpt_t)((uintptr_t)strtoul(argv[3], NULL, 16)); + FAR void *arg = (FAR void *)((uintptr_t)strtoul(argv[4], NULL, 16)); + struct irq_thread_info_s irq_info; + sem_t sem; + + irq_info.sem = &sem; + irq_info.arg = arg; + irq_info.handler = handler; + + nxsem_init(&sem, 0, 0); + + irq_attach(irq, irq_default_handler, &irq_info); + +#if !defined(CONFIG_ARCH_NOINTC) + up_enable_irq(irq); +#endif + + for (; ; ) + { + int ret; + ret = nxsem_wait_uninterruptible(&sem); + if (ret < 0) + { + continue; + } + + vector(irq, NULL, arg); + } + + return OK; +} + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: irq_attach_thread + * + * Description: + * Configure the IRQ subsystem so that IRQ number 'irq' is dispatched to + * 'isrthread' + * + * Input Parameters: + * irq - Irq num + * isr - Function to be called when the IRQ occurs, called in interrupt + * context. + * If isr is NULL the default handler is installed(irq_default_handler). + * isrthread - called in thread context, If the isrthread is NULL, + * then the ISR is being detached. + * arg - privdate data + * priority - Priority of the new task + * stack_size - size (in bytes) of the stack needed + * + * Returned Value: + * Zero on success; a negated errno value on failure. + * + ****************************************************************************/ + +int irq_attach_thread(int irq, xcpt_t isr, xcpt_t isrthread, FAR void *arg, + int priority, int stack_size) +{ +#if NR_IRQS > 0 + FAR char *argv[5]; + char arg1[32]; /* irq */ + char arg2[32]; /* isrthread */ + char arg3[32]; /* isr */ + char arg4[32]; /* arg */ + pid_t pid; + int ndx; + + if ((unsigned)irq >= NR_IRQS) + { + return -EINVAL; + } + + ndx = IRQ_TO_NDX(irq); + if (ndx < 0) + { + return ndx; + } + + /* If the isrthread is NULL, then the ISR is being detached. */ + + if (isrthread == NULL) + { + irq_attach(irq, NULL, arg); + DEBUGASSERT(g_irq_thread_vector[ndx] != 0); + kthread_delete(g_irq_thread_vector[ndx]); + g_irq_thread_vector[ndx] = 0; + + return OK; + } + + if (g_irq_thread_vector[ndx] != 0) + { + return -EINVAL; + } + + snprintf(arg1, sizeof(arg1), "%d", irq); + snprintf(arg2, sizeof(arg2), "%p", isrthread); + snprintf(arg3, sizeof(arg3), "%p", isr); Review Comment: ```suggestion snprintf(arg3, sizeof(arg3), "%p", isrthread); ``` ########## sched/irq/irq_attach_thread.c: ########## @@ -0,0 +1,215 @@ +/**************************************************************************** + * sched/irq/irq_attach_thread.c + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. The + * ASF licenses this file to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the + * License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include <nuttx/config.h> + +#include <errno.h> +#include <stdio.h> + +#include <nuttx/irq.h> +#include <nuttx/arch.h> +#include <nuttx/kthread.h> + +#include "irq/irq.h" +#include "sched/sched.h" + +/**************************************************************************** + * Privte Types + ****************************************************************************/ + +/* This is the type of the list of interrupt handlers, one for each IRQ. + * This type provided all of the information necessary to irq_dispatch to + * transfer control to interrupt handlers after the occurrence of an + * interrupt. + */ + +struct irq_thread_info_s +{ + xcpt_t handler; /* Address of the interrupt handler */ + FAR void *arg; /* The argument provided to the interrupt handler. */ + sem_t *sem; /* irq sem used to notify irq thread */ +}; + +/**************************************************************************** + * Private Data + ****************************************************************************/ + +static int g_irq_thread_vector[NR_IRQS]; + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/* Default interrupt handler for threaded interrupts. + * Useful for oneshot interrupts. + */ + +static int irq_default_handler(int irq, FAR void *regs, FAR void *arg) +{ + FAR struct irq_thread_info_s *irq_info = arg; + int ret = IRQ_WAKE_THREAD; + xcpt_t vector; + + vector = irq_info->handler; + + if (vector) + { + ret = vector(irq, regs, irq_info->arg); + } + + if (ret == IRQ_WAKE_THREAD) + { + nxsem_post(irq_info->sem); + ret = OK; + } + + return ret; +} + +static int isr_thread_main(int argc, FAR char *argv[]) +{ + unsigned int irq = atoi(argv[1]); + xcpt_t vector = (xcpt_t)((uintptr_t)strtoul(argv[2], NULL, 16)); + xcpt_t handler = (xcpt_t)((uintptr_t)strtoul(argv[3], NULL, 16)); + FAR void *arg = (FAR void *)((uintptr_t)strtoul(argv[4], NULL, 16)); + struct irq_thread_info_s irq_info; + sem_t sem; + + irq_info.sem = &sem; + irq_info.arg = arg; + irq_info.handler = handler; + + nxsem_init(&sem, 0, 0); + + irq_attach(irq, irq_default_handler, &irq_info); + +#if !defined(CONFIG_ARCH_NOINTC) + up_enable_irq(irq); +#endif + + for (; ; ) + { + int ret; + ret = nxsem_wait_uninterruptible(&sem); + if (ret < 0) + { + continue; + } + + vector(irq, NULL, arg); + } + + return OK; +} + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: irq_attach_thread + * + * Description: + * Configure the IRQ subsystem so that IRQ number 'irq' is dispatched to + * 'isrthread' + * + * Input Parameters: + * irq - Irq num + * isr - Function to be called when the IRQ occurs, called in interrupt + * context. + * If isr is NULL the default handler is installed(irq_default_handler). + * isrthread - called in thread context, If the isrthread is NULL, + * then the ISR is being detached. + * arg - privdate data + * priority - Priority of the new task + * stack_size - size (in bytes) of the stack needed + * + * Returned Value: + * Zero on success; a negated errno value on failure. + * + ****************************************************************************/ + +int irq_attach_thread(int irq, xcpt_t isr, xcpt_t isrthread, FAR void *arg, + int priority, int stack_size) +{ +#if NR_IRQS > 0 + FAR char *argv[5]; + char arg1[32]; /* irq */ + char arg2[32]; /* isrthread */ + char arg3[32]; /* isr */ Review Comment: ```suggestion char arg3[32]; /* isrthread */ ``` ########## include/nuttx/irq.h: ########## @@ -82,6 +82,14 @@ while (0) #endif +/* interrupt was handled by this device */ + +#define IRQ_HANDLED 0 + +/* handler requests to wake the handler thread */ Review Comment: ```suggestion /* Handler requests to wake the handler thread */ ``` ########## sched/irq/irq_attach_thread.c: ########## @@ -0,0 +1,215 @@ +/**************************************************************************** + * sched/irq/irq_attach_thread.c + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. The + * ASF licenses this file to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the + * License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include <nuttx/config.h> + +#include <errno.h> +#include <stdio.h> + +#include <nuttx/irq.h> +#include <nuttx/arch.h> +#include <nuttx/kthread.h> + +#include "irq/irq.h" +#include "sched/sched.h" + +/**************************************************************************** + * Privte Types + ****************************************************************************/ + +/* This is the type of the list of interrupt handlers, one for each IRQ. + * This type provided all of the information necessary to irq_dispatch to + * transfer control to interrupt handlers after the occurrence of an + * interrupt. + */ + +struct irq_thread_info_s +{ + xcpt_t handler; /* Address of the interrupt handler */ + FAR void *arg; /* The argument provided to the interrupt handler. */ + sem_t *sem; /* irq sem used to notify irq thread */ +}; + +/**************************************************************************** + * Private Data + ****************************************************************************/ + +static int g_irq_thread_vector[NR_IRQS]; + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/* Default interrupt handler for threaded interrupts. + * Useful for oneshot interrupts. + */ + +static int irq_default_handler(int irq, FAR void *regs, FAR void *arg) +{ + FAR struct irq_thread_info_s *irq_info = arg; + int ret = IRQ_WAKE_THREAD; + xcpt_t vector; + + vector = irq_info->handler; + + if (vector) + { + ret = vector(irq, regs, irq_info->arg); + } + + if (ret == IRQ_WAKE_THREAD) + { + nxsem_post(irq_info->sem); + ret = OK; + } + + return ret; +} + +static int isr_thread_main(int argc, FAR char *argv[]) +{ + unsigned int irq = atoi(argv[1]); + xcpt_t vector = (xcpt_t)((uintptr_t)strtoul(argv[2], NULL, 16)); + xcpt_t handler = (xcpt_t)((uintptr_t)strtoul(argv[3], NULL, 16)); + FAR void *arg = (FAR void *)((uintptr_t)strtoul(argv[4], NULL, 16)); + struct irq_thread_info_s irq_info; + sem_t sem; + + irq_info.sem = &sem; + irq_info.arg = arg; + irq_info.handler = handler; + + nxsem_init(&sem, 0, 0); + + irq_attach(irq, irq_default_handler, &irq_info); + +#if !defined(CONFIG_ARCH_NOINTC) + up_enable_irq(irq); +#endif + + for (; ; ) + { + int ret; + ret = nxsem_wait_uninterruptible(&sem); + if (ret < 0) + { + continue; + } + + vector(irq, NULL, arg); + } + + return OK; +} + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: irq_attach_thread + * + * Description: + * Configure the IRQ subsystem so that IRQ number 'irq' is dispatched to + * 'isrthread' + * + * Input Parameters: + * irq - Irq num + * isr - Function to be called when the IRQ occurs, called in interrupt + * context. + * If isr is NULL the default handler is installed(irq_default_handler). + * isrthread - called in thread context, If the isrthread is NULL, + * then the ISR is being detached. + * arg - privdate data + * priority - Priority of the new task + * stack_size - size (in bytes) of the stack needed + * + * Returned Value: + * Zero on success; a negated errno value on failure. + * + ****************************************************************************/ + +int irq_attach_thread(int irq, xcpt_t isr, xcpt_t isrthread, FAR void *arg, + int priority, int stack_size) +{ +#if NR_IRQS > 0 + FAR char *argv[5]; + char arg1[32]; /* irq */ + char arg2[32]; /* isrthread */ + char arg3[32]; /* isr */ + char arg4[32]; /* arg */ + pid_t pid; + int ndx; + + if ((unsigned)irq >= NR_IRQS) + { + return -EINVAL; + } + + ndx = IRQ_TO_NDX(irq); + if (ndx < 0) + { + return ndx; + } + + /* If the isrthread is NULL, then the ISR is being detached. */ + + if (isrthread == NULL) + { + irq_attach(irq, NULL, arg); + DEBUGASSERT(g_irq_thread_vector[ndx] != 0); + kthread_delete(g_irq_thread_vector[ndx]); + g_irq_thread_vector[ndx] = 0; + + return OK; + } + + if (g_irq_thread_vector[ndx] != 0) + { + return -EINVAL; + } + + snprintf(arg1, sizeof(arg1), "%d", irq); + snprintf(arg2, sizeof(arg2), "%p", isrthread); Review Comment: ```suggestion snprintf(arg2, sizeof(arg2), "%p", isr); ``` ########## sched/irq/irq_attach_thread.c: ########## @@ -0,0 +1,215 @@ +/**************************************************************************** + * sched/irq/irq_attach_thread.c + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. The + * ASF licenses this file to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the + * License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include <nuttx/config.h> + +#include <errno.h> +#include <stdio.h> + +#include <nuttx/irq.h> +#include <nuttx/arch.h> +#include <nuttx/kthread.h> + +#include "irq/irq.h" +#include "sched/sched.h" + +/**************************************************************************** + * Privte Types + ****************************************************************************/ + +/* This is the type of the list of interrupt handlers, one for each IRQ. + * This type provided all of the information necessary to irq_dispatch to + * transfer control to interrupt handlers after the occurrence of an + * interrupt. + */ + +struct irq_thread_info_s +{ + xcpt_t handler; /* Address of the interrupt handler */ + FAR void *arg; /* The argument provided to the interrupt handler. */ + sem_t *sem; /* irq sem used to notify irq thread */ +}; + +/**************************************************************************** + * Private Data + ****************************************************************************/ + +static int g_irq_thread_vector[NR_IRQS]; + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/* Default interrupt handler for threaded interrupts. + * Useful for oneshot interrupts. + */ + +static int irq_default_handler(int irq, FAR void *regs, FAR void *arg) +{ + FAR struct irq_thread_info_s *irq_info = arg; + int ret = IRQ_WAKE_THREAD; + xcpt_t vector; + + vector = irq_info->handler; + + if (vector) + { + ret = vector(irq, regs, irq_info->arg); + } + + if (ret == IRQ_WAKE_THREAD) + { + nxsem_post(irq_info->sem); + ret = OK; + } + + return ret; +} + +static int isr_thread_main(int argc, FAR char *argv[]) +{ + unsigned int irq = atoi(argv[1]); + xcpt_t vector = (xcpt_t)((uintptr_t)strtoul(argv[2], NULL, 16)); + xcpt_t handler = (xcpt_t)((uintptr_t)strtoul(argv[3], NULL, 16)); + FAR void *arg = (FAR void *)((uintptr_t)strtoul(argv[4], NULL, 16)); + struct irq_thread_info_s irq_info; + sem_t sem; + + irq_info.sem = &sem; + irq_info.arg = arg; + irq_info.handler = handler; + + nxsem_init(&sem, 0, 0); + + irq_attach(irq, irq_default_handler, &irq_info); + +#if !defined(CONFIG_ARCH_NOINTC) + up_enable_irq(irq); Review Comment: why enable irq here? irq_attach_thread should keep the same behavior as irq_attach which doesn't enable irq internally. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
