Merge remote-tracking branch 'upstream/dev' into dev
This commit is contained in:
commit
4fd11fdfa9
app
|
@ -652,8 +652,7 @@ LUALIB_API int luaL_loadfile (lua_State *L, const char *filename) {
|
|||
typedef struct LoadFSF {
|
||||
int extraline;
|
||||
int f;
|
||||
char *buff;
|
||||
int len;
|
||||
char buff[LUAL_BUFFERSIZE];
|
||||
} LoadFSF;
|
||||
|
||||
|
||||
|
@ -666,7 +665,7 @@ static const char *getFSF (lua_State *L, void *ud, size_t *size) {
|
|||
return "\n";
|
||||
}
|
||||
if (fs_eof(lf->f)) return NULL;
|
||||
*size = fs_read(lf->f, lf->buff, (lf->len));
|
||||
*size = fs_read(lf->f, lf->buff, sizeof(lf->buff));
|
||||
return (*size > 0) ? lf->buff : NULL;
|
||||
}
|
||||
|
||||
|
@ -685,9 +684,6 @@ LUALIB_API int luaL_loadfsfile (lua_State *L, const char *filename) {
|
|||
int c;
|
||||
int fnameindex = lua_gettop(L) + 1; /* index of filename on the stack */
|
||||
lf.extraline = 0;
|
||||
// lf.len = LUAL_BUFFERSIZE;
|
||||
lf.len = 0;
|
||||
lf.buff = NULL;
|
||||
if (filename == NULL) {
|
||||
return luaL_error(L, "filename is NULL");
|
||||
}
|
||||
|
@ -696,10 +692,8 @@ LUALIB_API int luaL_loadfsfile (lua_State *L, const char *filename) {
|
|||
lf.f = fs_open(filename, FS_RDONLY);
|
||||
if (lf.f < FS_OPEN_OK) return errfsfile(L, "open", fnameindex);
|
||||
}
|
||||
lf.len = fs_size(lf.f) + 32;
|
||||
lf.buff = c_zalloc(lf.len);
|
||||
if(!lf.buff) return LUA_ERRMEM;
|
||||
|
||||
// if(fs_size(lf.f)>LUAL_BUFFERSIZE)
|
||||
// return luaL_error(L, "file is too big");
|
||||
c = fs_getc(lf.f);
|
||||
if (c == '#') { /* Unix exec. file? */
|
||||
lf.extraline = 1;
|
||||
|
@ -709,13 +703,7 @@ LUALIB_API int luaL_loadfsfile (lua_State *L, const char *filename) {
|
|||
if (c == LUA_SIGNATURE[0] && filename) { /* binary file? */
|
||||
fs_close(lf.f);
|
||||
lf.f = fs_open(filename, FS_RDONLY); /* reopen in binary mode */
|
||||
if (lf.f < FS_OPEN_OK){
|
||||
if(lf.buff)
|
||||
c_free(lf.buff);
|
||||
lf.buff = NULL;
|
||||
lf.len = 0;
|
||||
return errfsfile(L, "reopen", fnameindex);
|
||||
}
|
||||
if (lf.f < FS_OPEN_OK) return errfsfile(L, "reopen", fnameindex);
|
||||
/* skip eventual `#!...' */
|
||||
while ((c = fs_getc(lf.f)) != EOF && c != LUA_SIGNATURE[0]) ;
|
||||
lf.extraline = 0;
|
||||
|
@ -725,9 +713,6 @@ LUALIB_API int luaL_loadfsfile (lua_State *L, const char *filename) {
|
|||
|
||||
if (filename) fs_close(lf.f); /* close file (even in case of errors) */
|
||||
lua_remove(L, fnameindex);
|
||||
if(lf.buff)
|
||||
c_free(lf.buff);
|
||||
lf.buff = NULL;
|
||||
return status;
|
||||
}
|
||||
|
||||
|
|
|
@ -542,7 +542,7 @@ extern int readline4lua(const char *prompt, char *buffer, int length);
|
|||
/*
|
||||
@@ LUAL_BUFFERSIZE is the buffer size used by the lauxlib buffer system.
|
||||
*/
|
||||
#define LUAL_BUFFERSIZE BUFSIZ
|
||||
#define LUAL_BUFFERSIZE ((BUFSIZ)*4)
|
||||
|
||||
/* }================================================================== */
|
||||
|
||||
|
|
|
@ -24,6 +24,7 @@ SPIFlashInfo flash_get_info(void)
|
|||
{
|
||||
volatile SPIFlashInfo spi_flash_info ICACHE_STORE_ATTR;
|
||||
spi_flash_info = *((SPIFlashInfo *)(FLASH_MAP_START_ADDRESS));
|
||||
// spi_flash_read(0, (uint32 *)(& spi_flash_info), sizeof(spi_flash_info));
|
||||
return spi_flash_info;
|
||||
}
|
||||
|
||||
|
@ -56,9 +57,11 @@ uint32_t flash_get_size_byte(void)
|
|||
case SIZE_32MBIT:
|
||||
// 32Mbit, 4MByte
|
||||
flash_size = 4 * 1024 * 1024;
|
||||
break;
|
||||
case SIZE_64MBIT:
|
||||
// 64Mbit, 8MByte
|
||||
flash_size = 8 * 1024 * 1024;
|
||||
break;
|
||||
case SIZE_128MBIT:
|
||||
// 128Mbit, 16MByte
|
||||
flash_size = 16 * 1024 * 1024;
|
||||
|
@ -131,7 +134,15 @@ bool flash_set_size_byte(uint32_t size)
|
|||
|
||||
uint16_t flash_get_sec_num(void)
|
||||
{
|
||||
return flash_get_size_byte() / SPI_FLASH_SEC_SIZE;
|
||||
//static uint16_t sec_num = 0;
|
||||
// return flash_get_size_byte() / (SPI_FLASH_SEC_SIZE);
|
||||
// c_printf("\nflash_get_size_byte()=%d\n", ( flash_get_size_byte() / (SPI_FLASH_SEC_SIZE) ));
|
||||
// if( sec_num == 0 )
|
||||
//{
|
||||
// sec_num = 4 * 1024 * 1024 / (SPI_FLASH_SEC_SIZE);
|
||||
//}
|
||||
//return sec_num;
|
||||
return ( flash_get_size_byte() / (SPI_FLASH_SEC_SIZE) );
|
||||
}
|
||||
|
||||
uint8_t flash_get_mode(void)
|
||||
|
@ -232,13 +243,14 @@ bool flash_self_destruct(void)
|
|||
return true;
|
||||
}
|
||||
|
||||
uint8_t byte_of_aligned_array(const uint8_t* aligned_array, uint32_t index)
|
||||
uint8_t byte_of_aligned_array(const uint8_t *aligned_array, uint32_t index)
|
||||
{
|
||||
if( (((uint32_t)aligned_array)%4) != 0 ){
|
||||
if ( (((uint32_t)aligned_array) % 4) != 0 )
|
||||
{
|
||||
NODE_DBG("aligned_array is not 4-byte aligned.\n");
|
||||
return 0;
|
||||
}
|
||||
uint32_t v = ((uint32_t *)aligned_array)[ index/4 ];
|
||||
uint32_t v = ((uint32_t *)aligned_array)[ index / 4 ];
|
||||
uint8_t *p = (uint8_t *) (&v);
|
||||
return p[ (index%4) ];
|
||||
return p[ (index % 4) ];
|
||||
}
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
#include "ets_sys.h"
|
||||
#include "user_config.h"
|
||||
#include "cpu_esp8266.h"
|
||||
|
||||
#define FLASH_MAP_START_ADDRESS (INTERNAL_FLASH_START_ADDRESS)
|
||||
|
||||
/******************************************************************************
|
||||
|
|
|
@ -466,5 +466,6 @@ int myspiffs_error( int fd );
|
|||
void myspiffs_clearerr( int fd );
|
||||
int myspiffs_check( void );
|
||||
int myspiffs_rename( const char *old, const char *newname );
|
||||
size_t myspiffs_size( int fd );
|
||||
|
||||
#endif /* SPIFFS_H_ */
|
||||
|
|
Loading…
Reference in New Issue