From 1f5e0907d5341b98afc1003e5fd7d374bf08cda9 Mon Sep 17 00:00:00 2001
From: David Sidrane <david_s5@nscdg.com>
Date: Mon, 6 Mar 2017 09:01:41 -1000
Subject: [PATCH] Updated NuttX submodule to upstream 7.20- ==upstream

---
 NuttX                           |  2 +-
 nuttx-patches/no_irq_args.patch | 49 +++++++++++++++++----------------
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/NuttX b/NuttX
index d5435b6506..fb3d4801c1 160000
--- a/NuttX
+++ b/NuttX
@@ -1 +1 @@
-Subproject commit d5435b65060b11f375fc5ed9f5d62f1b260e990e
+Subproject commit fb3d4801c14c4aaaaa025fff48f12f899f250d35
diff --git a/nuttx-patches/no_irq_args.patch b/nuttx-patches/no_irq_args.patch
index c7ea4b4bc0..bfbb714c4f 100644
--- a/nuttx-patches/no_irq_args.patch
+++ b/nuttx-patches/no_irq_args.patch
@@ -1,9 +1,9 @@
 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
-@@ -63,7 +63,9 @@
- struct irq
+@@ -72,7 +72,9 @@
+ struct irq_info_s
  {
    xcpt_t handler;  /* Address of the interrupt handler */
 +#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
-index ae147e2..50c621b 100644
+index 9d45d9c..3707906 100644
 --- 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)
-       /* Save the new ISR in the table. */
+@@ -112,7 +112,11 @@ int irq_attach(int irq, xcpt_t isr, FAR void *arg)
+       /* Save the new ISR and its argument in the table. */
  
-       g_irqvector[irq].handler = isr;
+       g_irqvector[ndx].handler = isr;
 +#if defined(CONFIG_NOIRQARGS)
 +      ASSERT(arg == NULL);
 +#else
-       g_irqvector[irq].arg     = arg;
+       g_irqvector[ndx].arg     = arg;
 +#endif
+ 
        leave_critical_section(flags);
        ret = OK;
-     }
 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
-@@ -75,7 +75,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
-     }
+@@ -88,7 +88,11 @@ void irq_dispatch(int irq, FAR void *context)
+         }
  #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
-index e03d27a..3350fb0 100644
+index 18bbafc..2018788 100644
 --- NuttX/nuttx/sched/irq/irq_initialize.c
 +++ NuttX/nuttx/sched/irq/irq_initialize.c
-@@ -70,6 +70,8 @@ void irq_initialize(void)
-   for (i = 0; i < NR_IRQS; i++)
+@@ -88,6 +88,8 @@ void irq_initialize(void)
+   for (i = 0; i < TAB_SIZE; i++)
      {
        g_irqvector[i].handler = irq_unexpected_isr;
 +#if !defined(CONFIG_NOIRQARGS)