library update

genhdr/qstrdefs.generated.h

@@ -421,7 +421,6 @@ QDEF1(MP_QSTR_max, 177, 3, "max")
 QDEF1(MP_QSTR_maximum_space_recursion_space_depth_space_exceeded, 115, 32, "maximum recursion depth exceeded")
 QDEF1(MP_QSTR_min, 175, 3, "min")
 QDEF1(MP_QSTR_module, 191, 6, "module")
-QDEF1(MP_QSTR_name, 162, 4, "name")
 QDEF1(MP_QSTR_oct, 253, 3, "oct")
 QDEF1(MP_QSTR_on_gpio, 106, 7, "on_gpio")
 QDEF1(MP_QSTR_on_input, 141, 8, "on_input")

mp_flipper_fileio.c

@@ -10,7 +10,6 @@ extern const mp_obj_type_t mp_flipper_fileio_type;
 
 typedef struct _mp_flipper_fileio_file_descriptor_t {
     mp_obj_base_t base;
-    void* name;
     void* handle;
     size_t offset;
     mp_flipper_file_access_mode_t access_mode;
@@ -18,14 +17,12 @@ typedef struct _mp_flipper_fileio_file_descriptor_t {
 } mp_flipper_fileio_file_descriptor_t;
 
 void* mp_flipper_file_new_file_descriptor(
-    void* name,
     void* handle,
     size_t offset,
     mp_flipper_file_access_mode_t access_mode,
     mp_flipper_file_open_mode_t open_mode) {
     mp_flipper_fileio_file_descriptor_t* fd = mp_obj_malloc(mp_flipper_fileio_file_descriptor_t, &mp_flipper_fileio_type);
 
-    fd->name = name;
     fd->handle = handle;
     fd->offset = offset;
     fd->access_mode = access_mode;
@@ -49,7 +46,7 @@ static mp_uint_t mp_flipper_fileio_write(mp_obj_t self, const void* buf, mp_uint
 static mp_obj_t mp_flipper_fileio_close(mp_obj_t self) {
     mp_flipper_fileio_file_descriptor_t* fd = (mp_flipper_fileio_file_descriptor_t*)self;
 
-    int errorno = mp_flipper_file_close(fd->handle, fd->name);
+    int errorno = mp_flipper_file_close(fd->handle);
 
     if(errorno != 0) {
         mp_raise_OSError(errorno);
@@ -59,16 +56,6 @@ static mp_obj_t mp_flipper_fileio_close(mp_obj_t self) {
 }
 static MP_DEFINE_CONST_FUN_OBJ_1(mp_flipper_fileio_close_obj, mp_flipper_fileio_close);
 
-static mp_obj_t mp_flipper_fileio_name(mp_obj_t self) {
-    mp_flipper_fileio_file_descriptor_t* fd = (mp_flipper_fileio_file_descriptor_t*)self;
-    size_t size = 0;
-
-    char* name = mp_flipper_file_name(fd->name, &size);
-
-    return mp_obj_new_str(name, size);
-}
-static MP_DEFINE_CONST_FUN_OBJ_1(mp_flipper_fileio_name_obj, mp_flipper_fileio_name);
-
 static mp_obj_t mp_flipper_fileio___exit___(size_t n_args, const mp_obj_t* args) {
     return mp_flipper_fileio_close(args[0]);
 }
@@ -81,7 +68,6 @@ static MP_DEFINE_CONST_FUN_OBJ_1(mp_flipper_fileio_writable_obj, mp_flipper_file
 
 static const mp_map_elem_t mp_flipper_file_locals_dict_table[] = {
     {MP_OBJ_NEW_QSTR(MP_QSTR_close), MP_ROM_PTR(&mp_flipper_fileio_close_obj)},
-    {MP_OBJ_NEW_QSTR(MP_QSTR_name), MP_ROM_PTR(&mp_flipper_fileio_name_obj)},
     {MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&mp_identity_obj)},
     {MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&mp_flipper_fileio___exit___obj)},
     {MP_OBJ_NEW_QSTR(MP_QSTR_writable), MP_ROM_PTR(&mp_flipper_fileio_writable_obj)},

mp_flipper_fileio.h

@@ -22,13 +22,11 @@ void* mp_flipper_file_open(
     mp_flipper_file_open_mode_t open_mode,
     size_t* offset);
 void* mp_flipper_file_new_file_descriptor(
-    void* name,
     void* handle,
     size_t offset,
     mp_flipper_file_access_mode_t access_mode,
     mp_flipper_file_open_mode_t open_mode);
-int mp_flipper_file_close(void* handle, void* name);
-char* mp_flipper_file_name(void* name, size_t* size);
+int mp_flipper_file_close(void* handle);
 bool mp_flipper_file_writable(void* handle);
 size_t mp_flipper_file_read(void* handle, void* buffer, size_t size, int* errcode);
 size_t mp_flipper_file_write(void* handle, const void* buffer, size_t size, int* errcode);

mp_flipper_halport.c

@@ -46,7 +46,7 @@ mp_obj_t mp_builtin_open(size_t n_args, const mp_obj_t* args, mp_map_t* kwargs)
 
     void* handle = mp_flipper_file_open(file_name, access_mode, open_mode, &offset);
 
-    return (mp_obj_t)mp_flipper_file_new_file_descriptor(file_name, handle, offset, access_mode, open_mode);
+    return (mp_obj_t)mp_flipper_file_new_file_descriptor(handle, offset, access_mode, open_mode);
 }
 
 MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_open_obj, 1, mp_builtin_open);