revert mphalport

IhorNehrutsa · IhorNehrutsa · commit 7d821bbcee2c · 2023-03-09T15:50:20.000+02:00
diff --git a/ports/esp32/mphalport.c b/ports/esp32/mphalport.c
@@ -46,18 +46,13 @@
 #include "usb_serial_jtag.h"
 #include "uart.h"
 
-#include "py/mpprint.h"
-//#define PWM_DBG(...)
-#define PWM_DBG(...) mp_printf(MP_PYTHON_PRINTER, __VA_ARGS__); mp_printf(&mp_plat_print, "\n");
-
 TaskHandle_t mp_main_task_handle;
 
 STATIC uint8_t stdin_ringbuf_array[260];
 ringbuf_t stdin_ringbuf = {stdin_ringbuf_array, sizeof(stdin_ringbuf_array), 0, 0};
 
 // Check the ESP-IDF error code and raise an OSError if it's not ESP_OK.
-//void check_esp_err(esp_err_t code) {
-void _check_esp_err(esp_err_t code, const char* func, const int line, const char *file) {
+void check_esp_err(esp_err_t code) {
     if (code != ESP_OK) {
         // map esp-idf error code to posix error code
         uint32_t pcode = -code;
@@ -83,11 +78,8 @@ void _check_esp_err(esp_err_t code, const char* func, const int line, const char
         o_str->len = strlen((char *)o_str->data);
         o_str->hash = qstr_compute_hash(o_str->data, o_str->len);
         // raise
-        PWM_DBG("Exception in function '%s' at line %d in file '%s'", func, line, file)
-//      mp_obj_t args[2] = { MP_OBJ_NEW_SMALL_INT(pcode), MP_OBJ_FROM_PTR(o_str) };
-//      nlr_raise(mp_obj_exception_make_new(&mp_type_OSError, 2, 0, args));
-        mp_obj_t args[5] = { MP_OBJ_NEW_SMALL_INT(pcode), MP_OBJ_FROM_PTR(o_str), mp_obj_new_str(func, strlen(func)), mp_obj_new_int(line), mp_obj_new_str(file, strlen(file)) };
-        nlr_raise(mp_obj_exception_make_new(&mp_type_OSError, 5, 0, args));
+        mp_obj_t args[2] = { MP_OBJ_NEW_SMALL_INT(pcode), MP_OBJ_FROM_PTR(o_str)};
+        nlr_raise(mp_obj_exception_make_new(&mp_type_OSError, 2, 0, args));
     }
 }
 
diff --git a/ports/esp32/mphalport.h b/ports/esp32/mphalport.h
@@ -57,9 +57,7 @@ extern TaskHandle_t mp_main_task_handle;
 extern ringbuf_t stdin_ringbuf;
 
 // Check the ESP-IDF error code and raise an OSError if it's not ESP_OK.
-//void check_esp_err(esp_err_t code);
-#define check_esp_err(code) _check_esp_err(code, __FUNCTION__, __LINE__, __FILE__)
-void _check_esp_err(esp_err_t code, const char* func, const int line, const char *file);
+void check_esp_err(esp_err_t code);
 
 uint32_t mp_hal_ticks_us(void);
 __attribute__((always_inline)) static inline uint32_t mp_hal_ticks_cpu(void) {
