Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
TASTE
uPython-mirror
Commits
8beba731
Commit
8beba731
authored
Jan 29, 2017
by
Damien George
Browse files
extmod/vfs_fat: Remove MICROPY_READER_FATFS component.
parent
56506fd6
Changes
4
Hide whitespace changes
Inline
Side-by-side
extmod/vfs_fat_reader.c
deleted
100644 → 0
View file @
56506fd6
/*
* This file is part of the MicroPython project, http://micropython.org/
*
* The MIT License (MIT)
*
* Copyright (c) 2013-2016 Damien P. George
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#include
<stdio.h>
#include
<assert.h>
#include
"py/mperrno.h"
#include
"py/reader.h"
#if MICROPY_READER_FATFS
#if MICROPY_FATFS_OO
#include
"lib/oofatfs/ff.h"
#else
#include
"lib/fatfs/ff.h"
#endif
#include
"extmod/fsusermount.h"
#include
"extmod/vfs_fat.h"
typedef
struct
_mp_reader_fatfs_t
{
FIL
fp
;
uint16_t
len
;
uint16_t
pos
;
byte
buf
[
20
];
}
mp_reader_fatfs_t
;
STATIC
mp_uint_t
mp_reader_fatfs_readbyte
(
void
*
data
)
{
mp_reader_fatfs_t
*
reader
=
(
mp_reader_fatfs_t
*
)
data
;
if
(
reader
->
pos
>=
reader
->
len
)
{
if
(
reader
->
len
<
sizeof
(
reader
->
buf
))
{
return
MP_READER_EOF
;
}
else
{
UINT
n
;
f_read
(
&
reader
->
fp
,
reader
->
buf
,
sizeof
(
reader
->
buf
),
&
n
);
if
(
n
==
0
)
{
return
MP_READER_EOF
;
}
reader
->
len
=
n
;
reader
->
pos
=
0
;
}
}
return
reader
->
buf
[
reader
->
pos
++
];
}
STATIC
void
mp_reader_fatfs_close
(
void
*
data
)
{
mp_reader_fatfs_t
*
reader
=
(
mp_reader_fatfs_t
*
)
data
;
f_close
(
&
reader
->
fp
);
m_del_obj
(
mp_reader_fatfs_t
,
reader
);
}
int
mp_reader_new_file
(
mp_reader_t
*
reader
,
const
char
*
filename
)
{
mp_reader_fatfs_t
*
rf
=
m_new_obj_maybe
(
mp_reader_fatfs_t
);
if
(
rf
==
NULL
)
{
return
MP_ENOMEM
;
}
#if MICROPY_FATFS_OO
fs_user_mount_t
*
vfs
=
ff_get_vfs
(
&
filename
);
if
(
vfs
==
NULL
)
{
return
MP_ENOENT
;
}
FRESULT
res
=
f_open
(
&
vfs
->
fatfs
,
&
rf
->
fp
,
filename
,
FA_READ
);
#else
FRESULT
res
=
f_open
(
&
rf
->
fp
,
filename
,
FA_READ
);
#endif
if
(
res
!=
FR_OK
)
{
return
fresult_to_errno_table
[
res
];
}
UINT
n
;
f_read
(
&
rf
->
fp
,
rf
->
buf
,
sizeof
(
rf
->
buf
),
&
n
);
rf
->
len
=
n
;
rf
->
pos
=
0
;
reader
->
data
=
rf
;
reader
->
readbyte
=
mp_reader_fatfs_readbyte
;
reader
->
close
=
mp_reader_fatfs_close
;
return
0
;
// success
}
#endif
py/lexer.c
View file @
8beba731
...
...
@@ -753,7 +753,7 @@ mp_lexer_t *mp_lexer_new_from_str_len(qstr src_name, const char *str, mp_uint_t
return
mp_lexer_new
(
src_name
,
reader
);
}
#if MICROPY_READER_POSIX || MICROPY_READER_VFS
|| MICROPY_READER_FATFS
#if MICROPY_READER_POSIX || MICROPY_READER_VFS
mp_lexer_t
*
mp_lexer_new_from_file
(
const
char
*
filename
)
{
mp_reader_t
reader
;
...
...
py/mpconfig.h
View file @
8beba731
...
...
@@ -403,11 +403,6 @@
#define MICROPY_READER_VFS (0)
#endif
// Whether to use the FatFS reader for importing files
#ifndef MICROPY_READER_FATFS
#define MICROPY_READER_FATFS (0)
#endif
// Hook for the VM at the start of the opcode loop (can contain variable
// definitions usable by the other hook functions)
#ifndef MICROPY_VM_HOOK_INIT
...
...
py/py.mk
View file @
8beba731
...
...
@@ -240,7 +240,6 @@ PY_O_BASENAME = \
../extmod/vfs_fat_ffconf.o
\
../extmod/vfs_fat_diskio.o
\
../extmod/vfs_fat_file.o
\
../extmod/vfs_fat_reader.o
\
../extmod/vfs_fat_misc.o
\
../extmod/utime_mphal.o
\
../extmod/uos_dupterm.o
\
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment