From c24fdb3adade8abf136cd1ece4362ccbf5f4e0d1 Mon Sep 17 00:00:00 2001
From: Xiang Xiao <xiaoxiang@xiaomi.com>
Date: Tue, 11 Sep 2018 07:24:29 -0600
Subject: [PATCH] configs: Fix build error caused by commit
 459d9f2851536e48e37ffee527944ca

---
 configs/nucleo-l476rg/src/stm32_gpio.c     |  2 +-
 configs/sim/src/sim_gpio.c                 | 12 ++++++++----
 configs/stm32f103-minimum/src/stm32_gpio.c |  2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/configs/nucleo-l476rg/src/stm32_gpio.c b/configs/nucleo-l476rg/src/stm32_gpio.c
index b5678fa304c..c9e8d7a4c0d 100644
--- a/configs/nucleo-l476rg/src/stm32_gpio.c
+++ b/configs/nucleo-l476rg/src/stm32_gpio.c
@@ -162,7 +162,7 @@ static int stm32gpio_interrupt(int irq, void *context, void *arg)
   DEBUGASSERT(stm32gpint != NULL && stm32gpint->callback != NULL);
   gpioinfo("Interrupt! callback=%p\n", stm32gpint->callback);
 
-  stm32gpint->callback(&stm32gpint->stm32gpio.gpio);
+  stm32gpint->callback(&stm32gpint->stm32gpio.gpio, tm32gpint->stm32gpio.id);
   return OK;
 }
 
diff --git a/configs/sim/src/sim_gpio.c b/configs/sim/src/sim_gpio.c
index 42052574fad..5001b5cb6d2 100644
--- a/configs/sim/src/sim_gpio.c
+++ b/configs/sim/src/sim_gpio.c
@@ -58,6 +58,7 @@
 struct simgpio_dev_s
 {
   struct gpio_dev_s gpio;
+  uint8_t id;
   bool value;
 };
 
@@ -113,6 +114,7 @@ static struct simgpio_dev_s g_gpin =
     .gp_pintype = GPIO_INPUT_PIN,
     .gp_ops     = &gpin_ops,
   },
+  .id = 0,
 };
 
 static struct simgpio_dev_s g_gpout =
@@ -122,6 +124,7 @@ static struct simgpio_dev_s g_gpout =
     .gp_pintype = GPIO_OUTPUT_PIN,
     .gp_ops     = &gpout_ops,
   },
+  .id = 1,
 };
 
 static struct simgpint_dev_s g_gpint =
@@ -133,6 +136,7 @@ static struct simgpint_dev_s g_gpint =
       .gp_pintype = GPIO_INTERRUPT_PIN,
       .gp_ops     = &gpint_ops,
     },
+    .id = 2,
   },
 };
 
@@ -147,7 +151,7 @@ static int sim_interrupt(int argc, wdparm_t arg1, ...)
   DEBUGASSERT(simgpint != NULL && simgpint->callback != NULL);
   gpioinfo("Interrupt! callback=%p\n", simgpint->callback);
 
-  simgpint->callback(&simgpint->simgpio.gpio);
+  simgpint->callback(&simgpint->simgpio.gpio, simgpint->simgpio.id);
   return OK;
 }
 
@@ -226,9 +230,9 @@ int sim_gpio_initialize(void)
   g_gpint.wdog = wd_create();
   DEBUGASSERT(g_gpint.wdog != NULL);
 
-  (void)gpio_pin_register(&g_gpin.gpio, 0);
-  (void)gpio_pin_register(&g_gpout.gpio, 1);
-  (void)gpio_pin_register(&g_gpint.simgpio.gpio, 2);
+  (void)gpio_pin_register(&g_gpin.gpio, g_gpin.id);
+  (void)gpio_pin_register(&g_gpout.gpio, g_gpout.id);
+  (void)gpio_pin_register(&g_gpint.simgpio.gpio, g_gpint.simgpio.id);
   return 0;
 }
 #endif /* CONFIG_EXAMPLES_GPIO && !CONFIG_GPIO_LOWER_HALF */
diff --git a/configs/stm32f103-minimum/src/stm32_gpio.c b/configs/stm32f103-minimum/src/stm32_gpio.c
index 84f23dccd93..3317972cab4 100644
--- a/configs/stm32f103-minimum/src/stm32_gpio.c
+++ b/configs/stm32f103-minimum/src/stm32_gpio.c
@@ -159,7 +159,7 @@ static int stm32gpio_interrupt(int irq, void *context, void *arg)
   DEBUGASSERT(stm32gpint != NULL && stm32gpint->callback != NULL);
   gpioinfo("Interrupt! callback=%p\n", stm32gpint->callback);
 
-  stm32gpint->callback(&stm32gpint->stm32gpio.gpio);
+  stm32gpint->callback(&stm32gpint->stm32gpio.gpio, stm32gpint->stm32gpio.id);
   return OK;
 }