renesas-ra/machine_sdcard: Change ValueError to OSError for card errors.

dpgeorge · dpgeorge · commit 79dd12cf834e · 2023-06-25T18:41:18.000+10:00
Signed-off-by: Damien George &lt;damien@micropython.org&gt;
diff --git a/ports/renesas-ra/machine_sdcard.c b/ports/renesas-ra/machine_sdcard.c
@@ -92,11 +92,11 @@ STATIC mp_obj_t machine_sdcard_init(size_t n_args, const mp_obj_t *pos_args, mp_
                     self->block_len = g_sdmmc0_ctrl.device.sector_size_bytes;
                     self->block_count = g_sdmmc0_ctrl.device.sector_count;
                 } else {
-                    mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("can't init SDHI card, %d"), err);
+                    mp_raise_msg_varg(&mp_type_OSError, MP_ERROR_TEXT("can't init SDHI card, %d"), err);
                 }
             }
         } else {
-            mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("can't get SDHI Status, %d"), err);
+            mp_raise_msg_varg(&mp_type_OSError, MP_ERROR_TEXT("can't get SDHI Status, %d"), err);
         }
     } else {
         if ((err = R_SDHI_Open(&g_sdmmc0_ctrl, &g_sdmmc0_cfg)) == FSP_SUCCESS) {
@@ -111,7 +111,7 @@ STATIC mp_obj_t machine_sdcard_init(size_t n_args, const mp_obj_t *pos_args, mp_
 
             goto check;
         } else {
-            mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("can't open SDHI controller, %d"), err);
+            mp_raise_msg_varg(&mp_type_OSError, MP_ERROR_TEXT("can't open SDHI controller, %d"), err);
         }
     }
 
@@ -144,7 +144,7 @@ STATIC mp_obj_t machine_sdcard_present(mp_obj_t self_in) {
     if ((err = R_SDHI_StatusGet(&g_sdmmc0_ctrl, &self->status)) == FSP_SUCCESS) {
         return mp_obj_new_bool(self->status.card_inserted);
     } else {
-        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("can't get SDHI Status, %d"), err);
+        mp_raise_msg_varg(&mp_type_OSError, MP_ERROR_TEXT("can't get SDHI Status, %d"), err);
     }
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_sdcard_present_obj, machine_sdcard_present);

Original file line number	Diff line number	Diff line change
`@@ -92,11 +92,11 @@ STATIC mp_obj_t machine_sdcard_init(size_t n_args, const mp_obj_t *pos_args, mp_`
`92`	`92`	`self->block_len = g_sdmmc0_ctrl.device.sector_size_bytes;`
`93`	`93`	`self->block_count = g_sdmmc0_ctrl.device.sector_count;`
`94`	`94`	`} else {`
`95`		`- mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("can't init SDHI card, %d"), err);`
	`95`	`+ mp_raise_msg_varg(&mp_type_OSError, MP_ERROR_TEXT("can't init SDHI card, %d"), err);`
`96`	`96`	`}`
`97`	`97`	`}`
`98`	`98`	`} else {`
`99`		`- mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("can't get SDHI Status, %d"), err);`
	`99`	`+ mp_raise_msg_varg(&mp_type_OSError, MP_ERROR_TEXT("can't get SDHI Status, %d"), err);`
`100`	`100`	`}`
`101`	`101`	`} else {`
`102`	`102`	`if ((err = R_SDHI_Open(&g_sdmmc0_ctrl, &g_sdmmc0_cfg)) == FSP_SUCCESS) {`
`@@ -111,7 +111,7 @@ STATIC mp_obj_t machine_sdcard_init(size_t n_args, const mp_obj_t *pos_args, mp_`
`111`	`111`
`112`	`112`	`goto check;`
`113`	`113`	`} else {`
`114`		`- mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("can't open SDHI controller, %d"), err);`
	`114`	`+ mp_raise_msg_varg(&mp_type_OSError, MP_ERROR_TEXT("can't open SDHI controller, %d"), err);`
`115`	`115`	`}`
`116`	`116`	`}`
`117`	`117`
`@@ -144,7 +144,7 @@ STATIC mp_obj_t machine_sdcard_present(mp_obj_t self_in) {`
`144`	`144`	`if ((err = R_SDHI_StatusGet(&g_sdmmc0_ctrl, &self->status)) == FSP_SUCCESS) {`
`145`	`145`	`return mp_obj_new_bool(self->status.card_inserted);`
`146`	`146`	`} else {`
`147`		`- mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("can't get SDHI Status, %d"), err);`
	`147`	`+ mp_raise_msg_varg(&mp_type_OSError, MP_ERROR_TEXT("can't get SDHI Status, %d"), err);`
`148`	`148`	`}`
`149`	`149`	`}`
`150`	`150`	`STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_sdcard_present_obj, machine_sdcard_present);`