Update hook after updating GPIO bits (#3091)

galjonsfigur · marcelstoer · commit 7140894f2f7f · 2020-06-09T22:26:52.000+02:00
Fixes #3089
diff --git a/app/platform/platform.c b/app/platform/platform.c
@@ -307,6 +307,10 @@ int platform_gpio_register_intr_hook(uint32_t bits, platform_hook_function hook)
       uint32_t old_bits = oh.entry[i].bits;
       *(volatile uint32_t *) &oh.entry[i].bits = bits;
       *(volatile uint32_t *) &oh.all_bits = (oh.all_bits & ~old_bits) | bits;
+      ETS_GPIO_INTR_DISABLE();
+      // This is a structure copy, so interrupts need to be disabled
+      platform_gpio_hook = oh;
+      ETS_GPIO_INTR_ENABLE();
       return 1;
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -307,6 +307,10 @@ int platform_gpio_register_intr_hook(uint32_t bits, platform_hook_function hook)`
`307`	`307`	`uint32_t old_bits = oh.entry[i].bits;`
`308`	`308`	`(volatile uint32_t ) &oh.entry[i].bits = bits;`
`309`	`309`	`(volatile uint32_t ) &oh.all_bits = (oh.all_bits & ~old_bits) \| bits;`
	`310`	`+ ETS_GPIO_INTR_DISABLE();`
	`311`	`+ // This is a structure copy, so interrupts need to be disabled`
	`312`	`+ platform_gpio_hook = oh;`
	`313`	`+ ETS_GPIO_INTR_ENABLE();`
`310`	`314`	`return 1;`
`311`	`315`	`}`
`312`	`316`	`}`