stmhal: Fix HAL error raising; make test for it.

dpgeorge · dpgeorge · commit 224fee0e1080 · 2014-11-15T20:39:44.000Z
Addresses issue adafruit#968.
diff --git a/stmhal/mphal.c b/stmhal/mphal.c
@@ -16,5 +16,5 @@ const byte mp_hal_status_to_errno_table[4] = {
 };
 
 NORETURN void mp_hal_raise(HAL_StatusTypeDef status) {
-    nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, (mp_obj_t)(mp_uint_t)mp_hal_status_to_errno_table[status]));
+    nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(mp_hal_status_to_errno_table[status])));
 }
diff --git a/tests/pyb/halerror.py b/tests/pyb/halerror.py
@@ -0,0 +1,15 @@
+# test hal errors
+
+import pyb
+
+i2c = pyb.I2C(2, pyb.I2C.MASTER)
+try:
+    i2c.recv(1, 1)
+except OSError as e:
+    print(repr(e))
+
+can = pyb.CAN(1, pyb.CAN.NORMAL)
+try:
+    can.send('1', 1, timeout=50)
+except OSError as e:
+    print(repr(e))
diff --git a/tests/pyb/halerror.py.exp b/tests/pyb/halerror.py.exp
@@ -0,0 +1,2 @@
+OSError(5,)
+OSError(116,)

Original file line number	Diff line number	Diff line change
`@@ -16,5 +16,5 @@ const byte mp_hal_status_to_errno_table[4] = {`
`16`	`16`	`};`
`17`	`17`
`18`	`18`	`NORETURN void mp_hal_raise(HAL_StatusTypeDef status) {`
`19`		`- nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, (mp_obj_t)(mp_uint_t)mp_hal_status_to_errno_table[status]));`
	`19`	`+ nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(mp_hal_status_to_errno_table[status])));`
`20`	`20`	`}`