Updated NuttX submodule to upstream 7.20- ==upstream

This commit is contained in:
David Sidrane 2017-03-06 09:01:41 -10:00 committed by Daniel Agar
parent 21caf63e13
commit 1f5e0907d5
2 changed files with 26 additions and 25 deletions

2
NuttX

@ -1 +1 @@
Subproject commit d5435b65060b11f375fc5ed9f5d62f1b260e990e Subproject commit fb3d4801c14c4aaaaa025fff48f12f899f250d35

View File

@ -1,9 +1,9 @@
diff --git NuttX/nuttx/sched/irq/irq.h NuttX/nuttx/sched/irq/irq.h diff --git NuttX/nuttx/sched/irq/irq.h NuttX/nuttx/sched/irq/irq.h
index 59bd5ea..fcf996f 100644 index ffb6e98..f01318b 100644
--- NuttX/nuttx/sched/irq/irq.h --- NuttX/nuttx/sched/irq/irq.h
+++ NuttX/nuttx/sched/irq/irq.h +++ NuttX/nuttx/sched/irq/irq.h
@@ -63,7 +63,9 @@ @@ -72,7 +72,9 @@
struct irq struct irq_info_s
{ {
xcpt_t handler; /* Address of the interrupt handler */ xcpt_t handler; /* Address of the interrupt handler */
+#if !defined(CONFIG_NOIRQARGS) +#if !defined(CONFIG_NOIRQARGS)
@ -13,43 +13,44 @@ index 59bd5ea..fcf996f 100644
/**************************************************************************** /****************************************************************************
diff --git NuttX/nuttx/sched/irq/irq_attach.c NuttX/nuttx/sched/irq/irq_attach.c diff --git NuttX/nuttx/sched/irq/irq_attach.c NuttX/nuttx/sched/irq/irq_attach.c
index ae147e2..50c621b 100644 index 9d45d9c..3707906 100644
--- NuttX/nuttx/sched/irq/irq_attach.c --- NuttX/nuttx/sched/irq/irq_attach.c
+++ NuttX/nuttx/sched/irq/irq_attach.c +++ NuttX/nuttx/sched/irq/irq_attach.c
@@ -97,7 +97,11 @@ int irq_attach(int irq, xcpt_t isr, FAR void * arg) @@ -112,7 +112,11 @@ int irq_attach(int irq, xcpt_t isr, FAR void *arg)
/* Save the new ISR in the table. */ /* Save the new ISR and its argument in the table. */
g_irqvector[irq].handler = isr; g_irqvector[ndx].handler = isr;
+#if defined(CONFIG_NOIRQARGS) +#if defined(CONFIG_NOIRQARGS)
+ ASSERT(arg == NULL); + ASSERT(arg == NULL);
+#else +#else
g_irqvector[irq].arg = arg; g_irqvector[ndx].arg = arg;
+#endif +#endif
leave_critical_section(flags); leave_critical_section(flags);
ret = OK; ret = OK;
}
diff --git NuttX/nuttx/sched/irq/irq_dispatch.c NuttX/nuttx/sched/irq/irq_dispatch.c diff --git NuttX/nuttx/sched/irq/irq_dispatch.c NuttX/nuttx/sched/irq/irq_dispatch.c
index 576e757..941eeb8 100644 index b507c06..66cb1fe 100644
--- NuttX/nuttx/sched/irq/irq_dispatch.c --- NuttX/nuttx/sched/irq/irq_dispatch.c
+++ NuttX/nuttx/sched/irq/irq_dispatch.c +++ NuttX/nuttx/sched/irq/irq_dispatch.c
@@ -75,7 +75,11 @@ void irq_dispatch(int irq, FAR void *context) @@ -88,7 +88,11 @@ void irq_dispatch(int irq, FAR void *context)
else }
{
vector = g_irqvector[irq].handler;
+#if defined(CONFIG_NOIRQARGS)
+ arg = NULL;
+#else
arg = g_irqvector[irq].arg;
+#endif
}
#else #else
vector = irq_unexpected_isr; vector = g_irqvector[irq].handler;
- arg = g_irqvector[irq].arg;
+# if defined(CONFIG_NOIRQARGS)
+ arg = NULL;
+# else
+ arg = g_irqvector[irq].arg;
+# endif
#endif
}
diff --git NuttX/nuttx/sched/irq/irq_initialize.c NuttX/nuttx/sched/irq/irq_initialize.c diff --git NuttX/nuttx/sched/irq/irq_initialize.c NuttX/nuttx/sched/irq/irq_initialize.c
index e03d27a..3350fb0 100644 index 18bbafc..2018788 100644
--- NuttX/nuttx/sched/irq/irq_initialize.c --- NuttX/nuttx/sched/irq/irq_initialize.c
+++ NuttX/nuttx/sched/irq/irq_initialize.c +++ NuttX/nuttx/sched/irq/irq_initialize.c
@@ -70,6 +70,8 @@ void irq_initialize(void) @@ -88,6 +88,8 @@ void irq_initialize(void)
for (i = 0; i < NR_IRQS; i++) for (i = 0; i < TAB_SIZE; i++)
{ {
g_irqvector[i].handler = irq_unexpected_isr; g_irqvector[i].handler = irq_unexpected_isr;
+#if !defined(CONFIG_NOIRQARGS) +#if !defined(CONFIG_NOIRQARGS)