diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-07-02 13:42:37 +0100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-07-02 13:42:37 +0100 |
| commit | 7a37f647a5d953a47a6147cf8302e08f27537771 (patch) | |
| tree | 5f6bdb76cac3f59334431f62a3920f39ceca8b8b /teensy/lexerfatfs.c | |
| parent | 5fc580475f5eba8248de86a4148090e63f777372 (diff) | |
| parent | 4f1b7fec9f103c92de40875e9a06b7decc4923f4 (diff) | |
| download | micropython-7a37f647a5d953a47a6147cf8302e08f27537771.tar.gz micropython-7a37f647a5d953a47a6147cf8302e08f27537771.zip | |
Merge branch 'teensy-new' of github.com:dhylands/micropython into dhylands-teensy-new
Conflicts:
stmhal/pin_named_pins.c
stmhal/readline.c
Renamed HAL_H to MICROPY_HAL_H. Made stmhal/mphal.h which intends to
define the generic Micro Python HAL, which in stmhal sits above the ST
HAL.
Diffstat (limited to 'teensy/lexerfatfs.c')
| -rw-r--r-- | teensy/lexerfatfs.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/teensy/lexerfatfs.c b/teensy/lexerfatfs.c index 95084b6501..84245f8878 100644 --- a/teensy/lexerfatfs.c +++ b/teensy/lexerfatfs.c @@ -6,19 +6,10 @@ #include "qstr.h" #include "lexer.h" typedef int FIL; -#include "../stm/lexerfatfs.h" +#include "../stmhal/lexerfatfs.h" mp_lexer_t *mp_lexer_new_from_file(const char *filename) { printf("import not implemented\n"); return NULL; } -mp_lexer_t *mp_import_open_file(qstr mod_name) { - printf("import not implemented\n"); - return NULL; -} - -mp_import_stat_t mp_import_stat(const char *path) { - // TODO implement me! - return MP_IMPORT_STAT_NO_EXIST; -} |