diff options
| author | Dan Halbert <halbert@adafruit.com> | 2021-01-21 16:54:37 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-21 16:54:37 -0500 |
| commit | 2249a33203339803c8a0b23e80eec15d77b7f23e (patch) | |
| tree | 49fb85346b3ce60a08ad7780b8aec7fd0f72366f /shared-module | |
| parent | eff68b0d9fb101176a808cb68f0158e1615ed8bf (diff) | |
| parent | 9b8246f889bda79b5945c7acbd016de4886419ef (diff) | |
Merge pull request #4031 from tannewt/rp2040
Add initial RP2040 support
Diffstat (limited to 'shared-module')
| -rw-r--r-- | shared-module/os/__init__.c | 2 | ||||
| -rw-r--r-- | shared-module/sdcardio/SDCard.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/shared-module/os/__init__.c b/shared-module/os/__init__.c index 39cf40fda..159b54e31 100644 --- a/shared-module/os/__init__.c +++ b/shared-module/os/__init__.c @@ -42,6 +42,7 @@ // Version of mp_vfs_lookup_path that takes and returns uPy string objects. STATIC mp_vfs_mount_t *lookup_path(const char* path, mp_obj_t *path_out) { const char *p_out; + *path_out = mp_const_none; mp_vfs_mount_t *vfs = mp_vfs_lookup_path(path, &p_out); if (vfs != MP_VFS_NONE && vfs != MP_VFS_ROOT) { *path_out = mp_obj_new_str_of_type(&mp_type_str, @@ -53,6 +54,7 @@ STATIC mp_vfs_mount_t *lookup_path(const char* path, mp_obj_t *path_out) { // Strip off trailing slashes to please underlying libraries STATIC mp_vfs_mount_t *lookup_dir_path(const char* path, mp_obj_t *path_out) { const char *p_out; + *path_out = mp_const_none; mp_vfs_mount_t *vfs = mp_vfs_lookup_path(path, &p_out); if (vfs != MP_VFS_NONE && vfs != MP_VFS_ROOT) { size_t len = strlen(p_out); diff --git a/shared-module/sdcardio/SDCard.c b/shared-module/sdcardio/SDCard.c index 9e861279d..1712f58ee 100644 --- a/shared-module/sdcardio/SDCard.c +++ b/shared-module/sdcardio/SDCard.c @@ -375,7 +375,7 @@ int common_hal_sdcardio_sdcard_readblocks(sdcardio_sdcard_obj_t *self, uint32_t return r; } -int _write(sdcardio_sdcard_obj_t *self, uint8_t token, void *buf, size_t size) { +STATIC int _write(sdcardio_sdcard_obj_t *self, uint8_t token, void *buf, size_t size) { wait_for_ready(self); uint8_t cmd[2]; @@ -420,7 +420,7 @@ int _write(sdcardio_sdcard_obj_t *self, uint8_t token, void *buf, size_t size) { return 0; } -int writeblocks(sdcardio_sdcard_obj_t *self, uint32_t start_block, mp_buffer_info_t *buf) { +STATIC int writeblocks(sdcardio_sdcard_obj_t *self, uint32_t start_block, mp_buffer_info_t *buf) { common_hal_sdcardio_check_for_deinit(self); uint32_t nblocks = buf->len / 512; if (nblocks == 1) { |