Merge pull request adafruit#781 from dhylands/fix-disc

dpgeorge · dpgeorge · commit 8464be15ed70 · 2014-08-01T16:25:59.000+01:00
Fix modos.c to compile for the STM32F4Discovery board
diff --git a/stmhal/modos.c b/stmhal/modos.c
@@ -92,9 +92,11 @@ STATIC mp_obj_t os_listdir(uint n_args, const mp_obj_t *args) {
     if (path[0] == '/' && path[1] == '\0') {
         mp_obj_t dir_list = mp_obj_new_list(0, NULL);
         mp_obj_list_append(dir_list, MP_OBJ_NEW_QSTR(MP_QSTR_flash));
+#if MICROPY_HW_HAS_SDCARD
         if (sdcard_is_present()) { // TODO this is not the correct logic to check for /sd
             mp_obj_list_append(dir_list, MP_OBJ_NEW_QSTR(MP_QSTR_sd));
         }
+#endif
         return dir_list;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -92,9 +92,11 @@ STATIC mp_obj_t os_listdir(uint n_args, const mp_obj_t *args) {`
`92`	`92`	`if (path[0] == '/' && path[1] == '\0') {`
`93`	`93`	`mp_obj_t dir_list = mp_obj_new_list(0, NULL);`
`94`	`94`	`mp_obj_list_append(dir_list, MP_OBJ_NEW_QSTR(MP_QSTR_flash));`
	`95`	`+#if MICROPY_HW_HAS_SDCARD`
`95`	`96`	`if (sdcard_is_present()) { // TODO this is not the correct logic to check for /sd`
`96`	`97`	`mp_obj_list_append(dir_list, MP_OBJ_NEW_QSTR(MP_QSTR_sd));`
`97`	`98`	`}`
	`99`	`+#endif`
`98`	`100`	`return dir_list;`
`99`	`101`	`}`
`100`	`102`