esp8266/esp_mphal: Properly handle dupterm EOF after switching to readinto().

pull/2226/merge
Paul Sokolovsky 2016-07-05 14:18:12 +03:00
rodzic a22b6ebff1
commit 380561836d
1 zmienionych plików z 3 dodań i 3 usunięć

Wyświetl plik

@ -169,13 +169,13 @@ static int call_dupterm_read(void) {
nlr_pop();
return -2;
}
mp_buffer_info_t bufinfo;
mp_get_buffer_raise(MP_STATE_PORT(dupterm_arr_obj), &bufinfo, MP_BUFFER_READ);
if (bufinfo.len == 0) {
if (res == MP_OBJ_NEW_SMALL_INT(0)) {
mp_uos_deactivate("dupterm: EOF received, deactivating\n", MP_OBJ_NULL);
nlr_pop();
return -1;
}
mp_buffer_info_t bufinfo;
mp_get_buffer_raise(MP_STATE_PORT(dupterm_arr_obj), &bufinfo, MP_BUFFER_READ);
nlr_pop();
if (*(byte*)bufinfo.buf == interrupt_char) {
mp_keyboard_interrupt();