revise to use mp_raise_msg insead of nlr_raise....

jerryneedell · jerryneedell · commit aa9309704bb1 · 2018-05-13T22:21:05.000-04:00
diff --git a/shared-module/bitbangio/I2C.c b/shared-module/bitbangio/I2C.c
@@ -28,6 +28,7 @@
 #include "py/mperrno.h"
 #include "py/nlr.h"
 #include "py/obj.h"
+#include "py/runtime.h"
 
 #include "common-hal/microcontroller/Pin.h"
 #include "shared-bindings/microcontroller/__init__.h"
@@ -54,8 +55,8 @@ STATIC void scl_release(bitbangio_i2c_obj_t *self) {
         common_hal_mcu_delay_us(1);
     }
     if(count==0) { /// raise exception on timeout
-        nlr_raise(mp_obj_new_exception_msg(&mp_type_TimeoutError,
-            "Clock Stretching Timeout."));
+        mp_raise_msg(&mp_type_TimeoutError,
+           "Clock Stretching Timeout.");
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@`
`28`	`28`	`#include "py/mperrno.h"`
`29`	`29`	`#include "py/nlr.h"`
`30`	`30`	`#include "py/obj.h"`
	`31`	`+#include "py/runtime.h"`
`31`	`32`
`32`	`33`	`#include "common-hal/microcontroller/Pin.h"`
`33`	`34`	`#include "shared-bindings/microcontroller/__init__.h"`
`@@ -54,8 +55,8 @@ STATIC void scl_release(bitbangio_i2c_obj_t *self) {`
`54`	`55`	`common_hal_mcu_delay_us(1);`
`55`	`56`	`}`
`56`	`57`	`if(count==0) { /// raise exception on timeout`
`57`		`- nlr_raise(mp_obj_new_exception_msg(&mp_type_TimeoutError,`
`58`		`- "Clock Stretching Timeout."));`
	`58`	`+ mp_raise_msg(&mp_type_TimeoutError,`
	`59`	`+ "Clock Stretching Timeout.");`
`59`	`60`	`}`
`60`	`61`	`}`
`61`	`62`