From 0b7a85daa7c556d7df0a8fb03fc74419bb0da514 Mon Sep 17 00:00:00 2001 From: bsongis Date: Tue, 24 Mar 2015 18:58:58 +0100 Subject: [PATCH] #1471 - Lua moved to thirdparty directory - io.seek added --- .../firmwares/opentx/simulator/CMakeLists.txt | 1 + .../opentx/simulator/opentxsimulator.cpp | 58 +++++++++--------- radio/src/Makefile | 9 +-- radio/src/{lua => thirdparty/Lua}/Makefile | 0 radio/src/{lua => thirdparty/Lua}/README | 0 .../{lua => thirdparty/Lua}/doc/contents.html | 0 .../src/{lua => thirdparty/Lua}/doc/logo.gif | Bin radio/src/{lua => thirdparty/Lua}/doc/lua.1 | 0 radio/src/{lua => thirdparty/Lua}/doc/lua.css | 0 radio/src/{lua => thirdparty/Lua}/doc/luac.1 | 0 .../{lua => thirdparty/Lua}/doc/manual.css | 0 .../{lua => thirdparty/Lua}/doc/manual.html | 0 .../Lua}/doc/osi-certified-72x60.png | Bin .../{lua => thirdparty/Lua}/doc/readme.html | 0 .../src/{lua => thirdparty/Lua}/src/Makefile | 0 radio/src/{lua => thirdparty/Lua}/src/lapi.c | 0 radio/src/{lua => thirdparty/Lua}/src/lapi.h | 0 .../src/{lua => thirdparty/Lua}/src/lauxlib.c | 0 .../src/{lua => thirdparty/Lua}/src/lauxlib.h | 0 .../{lua => thirdparty/Lua}/src/lbaselib.c | 0 .../src/{lua => thirdparty/Lua}/src/lbitlib.c | 0 radio/src/{lua => thirdparty/Lua}/src/lcode.c | 0 radio/src/{lua => thirdparty/Lua}/src/lcode.h | 0 .../{lua => thirdparty/Lua}/src/lcorolib.c | 0 .../src/{lua => thirdparty/Lua}/src/lctype.c | 0 .../src/{lua => thirdparty/Lua}/src/lctype.h | 0 .../src/{lua => thirdparty/Lua}/src/ldblib.c | 0 .../src/{lua => thirdparty/Lua}/src/ldebug.c | 0 .../src/{lua => thirdparty/Lua}/src/ldebug.h | 0 radio/src/{lua => thirdparty/Lua}/src/ldo.c | 0 radio/src/{lua => thirdparty/Lua}/src/ldo.h | 0 radio/src/{lua => thirdparty/Lua}/src/ldump.c | 0 radio/src/{lua => thirdparty/Lua}/src/lfunc.c | 0 radio/src/{lua => thirdparty/Lua}/src/lfunc.h | 0 radio/src/{lua => thirdparty/Lua}/src/lgc.c | 0 radio/src/{lua => thirdparty/Lua}/src/lgc.h | 0 radio/src/{lua => thirdparty/Lua}/src/linit.c | 0 .../src/{lua => thirdparty/Lua}/src/liolib.c | 12 +++- radio/src/{lua => thirdparty/Lua}/src/llex.c | 0 radio/src/{lua => thirdparty/Lua}/src/llex.h | 0 .../src/{lua => thirdparty/Lua}/src/llimits.h | 0 .../{lua => thirdparty/Lua}/src/lmathlib.c | 0 radio/src/{lua => thirdparty/Lua}/src/lmem.c | 0 radio/src/{lua => thirdparty/Lua}/src/lmem.h | 0 .../src/{lua => thirdparty/Lua}/src/loadlib.c | 0 .../src/{lua => thirdparty/Lua}/src/lobject.c | 0 .../src/{lua => thirdparty/Lua}/src/lobject.h | 0 .../{lua => thirdparty/Lua}/src/lopcodes.c | 0 .../{lua => thirdparty/Lua}/src/lopcodes.h | 0 .../src/{lua => thirdparty/Lua}/src/loslib.c | 0 .../src/{lua => thirdparty/Lua}/src/lparser.c | 0 .../src/{lua => thirdparty/Lua}/src/lparser.h | 0 .../{lua => thirdparty/Lua}/src/lrotable.c | 0 .../{lua => thirdparty/Lua}/src/lrotable.h | 0 .../src/{lua => thirdparty/Lua}/src/lstate.c | 0 .../src/{lua => thirdparty/Lua}/src/lstate.h | 0 .../src/{lua => thirdparty/Lua}/src/lstring.c | 0 .../src/{lua => thirdparty/Lua}/src/lstring.h | 0 .../src/{lua => thirdparty/Lua}/src/lstrlib.c | 0 .../src/{lua => thirdparty/Lua}/src/ltable.c | 0 .../src/{lua => thirdparty/Lua}/src/ltable.h | 0 .../src/{lua => thirdparty/Lua}/src/ltablib.c | 0 radio/src/{lua => thirdparty/Lua}/src/ltm.c | 0 radio/src/{lua => thirdparty/Lua}/src/ltm.h | 0 radio/src/{lua => thirdparty/Lua}/src/lua.c | 0 radio/src/{lua => thirdparty/Lua}/src/lua.h | 0 radio/src/{lua => thirdparty/Lua}/src/lua.hpp | 0 radio/src/{lua => thirdparty/Lua}/src/luac.c | 0 .../src/{lua => thirdparty/Lua}/src/luaconf.h | 0 .../src/{lua => thirdparty/Lua}/src/lualib.h | 0 .../src/{lua => thirdparty/Lua}/src/lundump.c | 0 .../src/{lua => thirdparty/Lua}/src/lundump.h | 0 radio/src/{lua => thirdparty/Lua}/src/lvm.c | 0 radio/src/{lua => thirdparty/Lua}/src/lvm.h | 0 radio/src/{lua => thirdparty/Lua}/src/lzio.c | 0 radio/src/{lua => thirdparty/Lua}/src/lzio.h | 0 76 files changed, 45 insertions(+), 35 deletions(-) rename radio/src/{lua => thirdparty/Lua}/Makefile (100%) rename radio/src/{lua => thirdparty/Lua}/README (100%) rename radio/src/{lua => thirdparty/Lua}/doc/contents.html (100%) rename radio/src/{lua => thirdparty/Lua}/doc/logo.gif (100%) rename radio/src/{lua => thirdparty/Lua}/doc/lua.1 (100%) rename radio/src/{lua => thirdparty/Lua}/doc/lua.css (100%) rename radio/src/{lua => thirdparty/Lua}/doc/luac.1 (100%) rename radio/src/{lua => thirdparty/Lua}/doc/manual.css (100%) rename radio/src/{lua => thirdparty/Lua}/doc/manual.html (100%) rename radio/src/{lua => thirdparty/Lua}/doc/osi-certified-72x60.png (100%) rename radio/src/{lua => thirdparty/Lua}/doc/readme.html (100%) rename radio/src/{lua => thirdparty/Lua}/src/Makefile (100%) rename radio/src/{lua => thirdparty/Lua}/src/lapi.c (100%) rename radio/src/{lua => thirdparty/Lua}/src/lapi.h (100%) rename radio/src/{lua => thirdparty/Lua}/src/lauxlib.c (100%) rename radio/src/{lua => thirdparty/Lua}/src/lauxlib.h (100%) rename radio/src/{lua => thirdparty/Lua}/src/lbaselib.c (100%) rename radio/src/{lua => thirdparty/Lua}/src/lbitlib.c (100%) rename radio/src/{lua => thirdparty/Lua}/src/lcode.c (100%) rename radio/src/{lua => thirdparty/Lua}/src/lcode.h (100%) rename radio/src/{lua => thirdparty/Lua}/src/lcorolib.c (100%) rename radio/src/{lua => thirdparty/Lua}/src/lctype.c (100%) rename radio/src/{lua => thirdparty/Lua}/src/lctype.h (100%) rename radio/src/{lua => thirdparty/Lua}/src/ldblib.c (100%) rename radio/src/{lua => thirdparty/Lua}/src/ldebug.c (100%) rename radio/src/{lua => thirdparty/Lua}/src/ldebug.h (100%) rename radio/src/{lua => thirdparty/Lua}/src/ldo.c (100%) rename radio/src/{lua => thirdparty/Lua}/src/ldo.h (100%) rename radio/src/{lua => thirdparty/Lua}/src/ldump.c (100%) rename radio/src/{lua => thirdparty/Lua}/src/lfunc.c (100%) rename radio/src/{lua => thirdparty/Lua}/src/lfunc.h (100%) rename radio/src/{lua => thirdparty/Lua}/src/lgc.c (100%) rename radio/src/{lua => thirdparty/Lua}/src/lgc.h (100%) rename radio/src/{lua => thirdparty/Lua}/src/linit.c (100%) rename radio/src/{lua => thirdparty/Lua}/src/liolib.c (98%) rename radio/src/{lua => thirdparty/Lua}/src/llex.c (100%) rename radio/src/{lua => thirdparty/Lua}/src/llex.h (100%) rename radio/src/{lua => thirdparty/Lua}/src/llimits.h (100%) rename radio/src/{lua => thirdparty/Lua}/src/lmathlib.c (100%) rename radio/src/{lua => thirdparty/Lua}/src/lmem.c (100%) rename radio/src/{lua => thirdparty/Lua}/src/lmem.h (100%) rename radio/src/{lua => thirdparty/Lua}/src/loadlib.c (100%) rename radio/src/{lua => thirdparty/Lua}/src/lobject.c (100%) rename radio/src/{lua => thirdparty/Lua}/src/lobject.h (100%) rename radio/src/{lua => thirdparty/Lua}/src/lopcodes.c (100%) rename radio/src/{lua => thirdparty/Lua}/src/lopcodes.h (100%) rename radio/src/{lua => thirdparty/Lua}/src/loslib.c (100%) rename radio/src/{lua => thirdparty/Lua}/src/lparser.c (100%) rename radio/src/{lua => thirdparty/Lua}/src/lparser.h (100%) rename radio/src/{lua => thirdparty/Lua}/src/lrotable.c (100%) rename radio/src/{lua => thirdparty/Lua}/src/lrotable.h (100%) rename radio/src/{lua => thirdparty/Lua}/src/lstate.c (100%) rename radio/src/{lua => thirdparty/Lua}/src/lstate.h (100%) rename radio/src/{lua => thirdparty/Lua}/src/lstring.c (100%) rename radio/src/{lua => thirdparty/Lua}/src/lstring.h (100%) rename radio/src/{lua => thirdparty/Lua}/src/lstrlib.c (100%) rename radio/src/{lua => thirdparty/Lua}/src/ltable.c (100%) rename radio/src/{lua => thirdparty/Lua}/src/ltable.h (100%) rename radio/src/{lua => thirdparty/Lua}/src/ltablib.c (100%) rename radio/src/{lua => thirdparty/Lua}/src/ltm.c (100%) rename radio/src/{lua => thirdparty/Lua}/src/ltm.h (100%) rename radio/src/{lua => thirdparty/Lua}/src/lua.c (100%) rename radio/src/{lua => thirdparty/Lua}/src/lua.h (100%) rename radio/src/{lua => thirdparty/Lua}/src/lua.hpp (100%) rename radio/src/{lua => thirdparty/Lua}/src/luac.c (100%) rename radio/src/{lua => thirdparty/Lua}/src/luaconf.h (100%) rename radio/src/{lua => thirdparty/Lua}/src/lualib.h (100%) rename radio/src/{lua => thirdparty/Lua}/src/lundump.c (100%) rename radio/src/{lua => thirdparty/Lua}/src/lundump.h (100%) rename radio/src/{lua => thirdparty/Lua}/src/lvm.c (100%) rename radio/src/{lua => thirdparty/Lua}/src/lvm.h (100%) rename radio/src/{lua => thirdparty/Lua}/src/lzio.c (100%) rename radio/src/{lua => thirdparty/Lua}/src/lzio.h (100%) diff --git a/companion/src/firmwares/opentx/simulator/CMakeLists.txt b/companion/src/firmwares/opentx/simulator/CMakeLists.txt index a6992f5a7..2505f3bef 100644 --- a/companion/src/firmwares/opentx/simulator/CMakeLists.txt +++ b/companion/src/firmwares/opentx/simulator/CMakeLists.txt @@ -38,6 +38,7 @@ include_directories( ${RADIO_SRC_DIRECTORY}/thirdparty/FatFs ${RADIO_SRC_DIRECTORY}/thirdparty/FatFs/option ${RADIO_SRC_DIRECTORY}/thirdparty/CoOS + ${RADIO_SRC_DIRECTORY}/thirdparty/Lua/src ) if(DEFINED TRANSLATIONS) diff --git a/companion/src/firmwares/opentx/simulator/opentxsimulator.cpp b/companion/src/firmwares/opentx/simulator/opentxsimulator.cpp index cbe475ecc..46c977731 100644 --- a/companion/src/firmwares/opentx/simulator/opentxsimulator.cpp +++ b/companion/src/firmwares/opentx/simulator/opentxsimulator.cpp @@ -269,35 +269,35 @@ namespace NAMESPACE { #if defined(LUA) #include "radio/src/lua_api.cpp" -#include "radio/src/lua/src/lapi.c" -#include "radio/src/lua/src/lcode.c" -#include "radio/src/lua/src/lctype.c" -#include "radio/src/lua/src/ldebug.c" -#include "radio/src/lua/src/ldo.c" -#include "radio/src/lua/src/ldump.c" -#include "radio/src/lua/src/lfunc.c" -#include "radio/src/lua/src/lgc.c" -#include "radio/src/lua/src/llex.c" -#include "radio/src/lua/src/lmem.c" -#include "radio/src/lua/src/lobject.c" -#include "radio/src/lua/src/lopcodes.c" -#include "radio/src/lua/src/lparser.c" -#include "radio/src/lua/src/lstate.c" -#include "radio/src/lua/src/lstring.c" -#include "radio/src/lua/src/ltable.c" -#include "radio/src/lua/src/lrotable.c" -#include "radio/src/lua/src/ltm.c" -#include "radio/src/lua/src/lundump.c" -#include "radio/src/lua/src/lvm.c" -#include "radio/src/lua/src/lzio.c" -#include "radio/src/lua/src/lbaselib.c" -#include "radio/src/lua/src/linit.c" -#include "radio/src/lua/src/lmathlib.c" -#include "radio/src/lua/src/lbitlib.c" -#include "radio/src/lua/src/loadlib.c" -#include "radio/src/lua/src/lauxlib.c" -#include "radio/src/lua/src/ltablib.c" -#include "radio/src/lua/src/lcorolib.c" +#include "radio/src/thirdparty/Lua/src/lapi.c" +#include "radio/src/thirdparty/Lua/src/lcode.c" +#include "radio/src/thirdparty/Lua/src/lctype.c" +#include "radio/src/thirdparty/Lua/src/ldebug.c" +#include "radio/src/thirdparty/Lua/src/ldo.c" +#include "radio/src/thirdparty/Lua/src/ldump.c" +#include "radio/src/thirdparty/Lua/src/lfunc.c" +#include "radio/src/thirdparty/Lua/src/lgc.c" +#include "radio/src/thirdparty/Lua/src/llex.c" +#include "radio/src/thirdparty/Lua/src/lmem.c" +#include "radio/src/thirdparty/Lua/src/lobject.c" +#include "radio/src/thirdparty/Lua/src/lopcodes.c" +#include "radio/src/thirdparty/Lua/src/lparser.c" +#include "radio/src/thirdparty/Lua/src/lstate.c" +#include "radio/src/thirdparty/Lua/src/lstring.c" +#include "radio/src/thirdparty/Lua/src/ltable.c" +#include "radio/src/thirdparty/Lua/src/lrotable.c" +#include "radio/src/thirdparty/Lua/src/ltm.c" +#include "radio/src/thirdparty/Lua/src/lundump.c" +#include "radio/src/thirdparty/Lua/src/lvm.c" +#include "radio/src/thirdparty/Lua/src/lzio.c" +#include "radio/src/thirdparty/Lua/src/lbaselib.c" +#include "radio/src/thirdparty/Lua/src/linit.c" +#include "radio/src/thirdparty/Lua/src/lmathlib.c" +#include "radio/src/thirdparty/Lua/src/lbitlib.c" +#include "radio/src/thirdparty/Lua/src/loadlib.c" +#include "radio/src/thirdparty/Lua/src/lauxlib.c" +#include "radio/src/thirdparty/Lua/src/ltablib.c" +#include "radio/src/thirdparty/Lua/src/lcorolib.c" #endif int16_t g_anas[NUM_STICKS+NUM_POTS]; diff --git a/radio/src/Makefile b/radio/src/Makefile index 67372a5a8..57a6085c1 100644 --- a/radio/src/Makefile +++ b/radio/src/Makefile @@ -373,6 +373,7 @@ VERSION = 2.0.99 THIRDPARTY = thirdparty COOSDIR = $(THIRDPARTY)/CoOS FATFSDIR = $(THIRDPARTY)/FatFs +LUADIR = $(THIRDPARTY)/Lua/src SRC = CPPSRC = @@ -933,11 +934,11 @@ ifeq ($(PCB), TARANIS) GUIMODELSRC += gui/$(GUIDIRECTORY)/menu_model_custom_scripts.cpp endif CPPDEFS += -DLUA - INCDIRS += lua/src + INCDIRS += $(LUADIR) CPPSRC += lua_api.cpp - LUASRC = lua/src/lapi.c lua/src/lcode.c lua/src/lctype.c lua/src/ldebug.c lua/src/ldo.c lua/src/ldump.c lua/src/lfunc.c lua/src/lgc.c lua/src/llex.c lua/src/lmem.c \ - lua/src/lobject.c lua/src/lopcodes.c lua/src/lparser.c lua/src/lstate.c lua/src/lstring.c lua/src/ltable.c lua/src/lrotable.c lua/src/ltm.c lua/src/lundump.c lua/src/lvm.c lua/src/lzio.c \ - lua/src/lbaselib.c lua/src/linit.c lua/src/lmathlib.c lua/src/lbitlib.c lua/src/loadlib.c lua/src/lauxlib.c lua/src/ltablib.c lua/src/lcorolib.c lua/src/liolib.c + LUASRC = $(LUADIR)/lapi.c $(LUADIR)/lcode.c $(LUADIR)/lctype.c $(LUADIR)/ldebug.c $(LUADIR)/ldo.c $(LUADIR)/ldump.c $(LUADIR)/lfunc.c $(LUADIR)/lgc.c $(LUADIR)/llex.c $(LUADIR)/lmem.c \ + $(LUADIR)/lobject.c $(LUADIR)/lopcodes.c $(LUADIR)/lparser.c $(LUADIR)/lstate.c $(LUADIR)/lstring.c $(LUADIR)/ltable.c $(LUADIR)/lrotable.c $(LUADIR)/ltm.c $(LUADIR)/lundump.c $(LUADIR)/lvm.c $(LUADIR)/lzio.c \ + $(LUADIR)/lbaselib.c $(LUADIR)/linit.c $(LUADIR)/lmathlib.c $(LUADIR)/lbitlib.c $(LUADIR)/loadlib.c $(LUADIR)/lauxlib.c $(LUADIR)/ltablib.c $(LUADIR)/lcorolib.c $(LUADIR)/liolib.c SRC += $(LUASRC) LUADEP = lua_exports.inc ifeq ($(USE_BIN_ALLOCATOR), YES) diff --git a/radio/src/lua/Makefile b/radio/src/thirdparty/Lua/Makefile similarity index 100% rename from radio/src/lua/Makefile rename to radio/src/thirdparty/Lua/Makefile diff --git a/radio/src/lua/README b/radio/src/thirdparty/Lua/README similarity index 100% rename from radio/src/lua/README rename to radio/src/thirdparty/Lua/README diff --git a/radio/src/lua/doc/contents.html b/radio/src/thirdparty/Lua/doc/contents.html similarity index 100% rename from radio/src/lua/doc/contents.html rename to radio/src/thirdparty/Lua/doc/contents.html diff --git a/radio/src/lua/doc/logo.gif b/radio/src/thirdparty/Lua/doc/logo.gif similarity index 100% rename from radio/src/lua/doc/logo.gif rename to radio/src/thirdparty/Lua/doc/logo.gif diff --git a/radio/src/lua/doc/lua.1 b/radio/src/thirdparty/Lua/doc/lua.1 similarity index 100% rename from radio/src/lua/doc/lua.1 rename to radio/src/thirdparty/Lua/doc/lua.1 diff --git a/radio/src/lua/doc/lua.css b/radio/src/thirdparty/Lua/doc/lua.css similarity index 100% rename from radio/src/lua/doc/lua.css rename to radio/src/thirdparty/Lua/doc/lua.css diff --git a/radio/src/lua/doc/luac.1 b/radio/src/thirdparty/Lua/doc/luac.1 similarity index 100% rename from radio/src/lua/doc/luac.1 rename to radio/src/thirdparty/Lua/doc/luac.1 diff --git a/radio/src/lua/doc/manual.css b/radio/src/thirdparty/Lua/doc/manual.css similarity index 100% rename from radio/src/lua/doc/manual.css rename to radio/src/thirdparty/Lua/doc/manual.css diff --git a/radio/src/lua/doc/manual.html b/radio/src/thirdparty/Lua/doc/manual.html similarity index 100% rename from radio/src/lua/doc/manual.html rename to radio/src/thirdparty/Lua/doc/manual.html diff --git a/radio/src/lua/doc/osi-certified-72x60.png b/radio/src/thirdparty/Lua/doc/osi-certified-72x60.png similarity index 100% rename from radio/src/lua/doc/osi-certified-72x60.png rename to radio/src/thirdparty/Lua/doc/osi-certified-72x60.png diff --git a/radio/src/lua/doc/readme.html b/radio/src/thirdparty/Lua/doc/readme.html similarity index 100% rename from radio/src/lua/doc/readme.html rename to radio/src/thirdparty/Lua/doc/readme.html diff --git a/radio/src/lua/src/Makefile b/radio/src/thirdparty/Lua/src/Makefile similarity index 100% rename from radio/src/lua/src/Makefile rename to radio/src/thirdparty/Lua/src/Makefile diff --git a/radio/src/lua/src/lapi.c b/radio/src/thirdparty/Lua/src/lapi.c similarity index 100% rename from radio/src/lua/src/lapi.c rename to radio/src/thirdparty/Lua/src/lapi.c diff --git a/radio/src/lua/src/lapi.h b/radio/src/thirdparty/Lua/src/lapi.h similarity index 100% rename from radio/src/lua/src/lapi.h rename to radio/src/thirdparty/Lua/src/lapi.h diff --git a/radio/src/lua/src/lauxlib.c b/radio/src/thirdparty/Lua/src/lauxlib.c similarity index 100% rename from radio/src/lua/src/lauxlib.c rename to radio/src/thirdparty/Lua/src/lauxlib.c diff --git a/radio/src/lua/src/lauxlib.h b/radio/src/thirdparty/Lua/src/lauxlib.h similarity index 100% rename from radio/src/lua/src/lauxlib.h rename to radio/src/thirdparty/Lua/src/lauxlib.h diff --git a/radio/src/lua/src/lbaselib.c b/radio/src/thirdparty/Lua/src/lbaselib.c similarity index 100% rename from radio/src/lua/src/lbaselib.c rename to radio/src/thirdparty/Lua/src/lbaselib.c diff --git a/radio/src/lua/src/lbitlib.c b/radio/src/thirdparty/Lua/src/lbitlib.c similarity index 100% rename from radio/src/lua/src/lbitlib.c rename to radio/src/thirdparty/Lua/src/lbitlib.c diff --git a/radio/src/lua/src/lcode.c b/radio/src/thirdparty/Lua/src/lcode.c similarity index 100% rename from radio/src/lua/src/lcode.c rename to radio/src/thirdparty/Lua/src/lcode.c diff --git a/radio/src/lua/src/lcode.h b/radio/src/thirdparty/Lua/src/lcode.h similarity index 100% rename from radio/src/lua/src/lcode.h rename to radio/src/thirdparty/Lua/src/lcode.h diff --git a/radio/src/lua/src/lcorolib.c b/radio/src/thirdparty/Lua/src/lcorolib.c similarity index 100% rename from radio/src/lua/src/lcorolib.c rename to radio/src/thirdparty/Lua/src/lcorolib.c diff --git a/radio/src/lua/src/lctype.c b/radio/src/thirdparty/Lua/src/lctype.c similarity index 100% rename from radio/src/lua/src/lctype.c rename to radio/src/thirdparty/Lua/src/lctype.c diff --git a/radio/src/lua/src/lctype.h b/radio/src/thirdparty/Lua/src/lctype.h similarity index 100% rename from radio/src/lua/src/lctype.h rename to radio/src/thirdparty/Lua/src/lctype.h diff --git a/radio/src/lua/src/ldblib.c b/radio/src/thirdparty/Lua/src/ldblib.c similarity index 100% rename from radio/src/lua/src/ldblib.c rename to radio/src/thirdparty/Lua/src/ldblib.c diff --git a/radio/src/lua/src/ldebug.c b/radio/src/thirdparty/Lua/src/ldebug.c similarity index 100% rename from radio/src/lua/src/ldebug.c rename to radio/src/thirdparty/Lua/src/ldebug.c diff --git a/radio/src/lua/src/ldebug.h b/radio/src/thirdparty/Lua/src/ldebug.h similarity index 100% rename from radio/src/lua/src/ldebug.h rename to radio/src/thirdparty/Lua/src/ldebug.h diff --git a/radio/src/lua/src/ldo.c b/radio/src/thirdparty/Lua/src/ldo.c similarity index 100% rename from radio/src/lua/src/ldo.c rename to radio/src/thirdparty/Lua/src/ldo.c diff --git a/radio/src/lua/src/ldo.h b/radio/src/thirdparty/Lua/src/ldo.h similarity index 100% rename from radio/src/lua/src/ldo.h rename to radio/src/thirdparty/Lua/src/ldo.h diff --git a/radio/src/lua/src/ldump.c b/radio/src/thirdparty/Lua/src/ldump.c similarity index 100% rename from radio/src/lua/src/ldump.c rename to radio/src/thirdparty/Lua/src/ldump.c diff --git a/radio/src/lua/src/lfunc.c b/radio/src/thirdparty/Lua/src/lfunc.c similarity index 100% rename from radio/src/lua/src/lfunc.c rename to radio/src/thirdparty/Lua/src/lfunc.c diff --git a/radio/src/lua/src/lfunc.h b/radio/src/thirdparty/Lua/src/lfunc.h similarity index 100% rename from radio/src/lua/src/lfunc.h rename to radio/src/thirdparty/Lua/src/lfunc.h diff --git a/radio/src/lua/src/lgc.c b/radio/src/thirdparty/Lua/src/lgc.c similarity index 100% rename from radio/src/lua/src/lgc.c rename to radio/src/thirdparty/Lua/src/lgc.c diff --git a/radio/src/lua/src/lgc.h b/radio/src/thirdparty/Lua/src/lgc.h similarity index 100% rename from radio/src/lua/src/lgc.h rename to radio/src/thirdparty/Lua/src/lgc.h diff --git a/radio/src/lua/src/linit.c b/radio/src/thirdparty/Lua/src/linit.c similarity index 100% rename from radio/src/lua/src/linit.c rename to radio/src/thirdparty/Lua/src/linit.c diff --git a/radio/src/lua/src/liolib.c b/radio/src/thirdparty/Lua/src/liolib.c similarity index 98% rename from radio/src/lua/src/liolib.c rename to radio/src/thirdparty/Lua/src/liolib.c index 12c056882..4b57c5230 100644 --- a/radio/src/lua/src/liolib.c +++ b/radio/src/thirdparty/Lua/src/liolib.c @@ -618,7 +618,6 @@ static int f_setvbuf (lua_State *L) { } -#if !defined(USE_FATFS) static int io_flush (lua_State *L) { return luaL_fileresult(L, fflush(getiofile(L, IO_OUTPUT)) == 0, NULL); } @@ -627,7 +626,15 @@ static int io_flush (lua_State *L) { static int f_flush (lua_State *L) { return luaL_fileresult(L, fflush(tofile(L)) == 0, NULL); } -#endif + +#else + +static int io_seek (lua_State *L) { + FILE *f = tofile(L); + lua_Unsigned offset = luaL_checkunsigned(L, 2); + lua_pushinteger(L, f_lseek(f, offset)); + return 1; +} #endif @@ -639,6 +646,7 @@ const luaL_Reg iolib[] = { // {"flush", io_flush}, // {"input", io_input}, // {"lines", io_lines}, + {"seek", io_seek}, {"open", io_open}, // {"output", io_output}, // {"popen", io_popen}, diff --git a/radio/src/lua/src/llex.c b/radio/src/thirdparty/Lua/src/llex.c similarity index 100% rename from radio/src/lua/src/llex.c rename to radio/src/thirdparty/Lua/src/llex.c diff --git a/radio/src/lua/src/llex.h b/radio/src/thirdparty/Lua/src/llex.h similarity index 100% rename from radio/src/lua/src/llex.h rename to radio/src/thirdparty/Lua/src/llex.h diff --git a/radio/src/lua/src/llimits.h b/radio/src/thirdparty/Lua/src/llimits.h similarity index 100% rename from radio/src/lua/src/llimits.h rename to radio/src/thirdparty/Lua/src/llimits.h diff --git a/radio/src/lua/src/lmathlib.c b/radio/src/thirdparty/Lua/src/lmathlib.c similarity index 100% rename from radio/src/lua/src/lmathlib.c rename to radio/src/thirdparty/Lua/src/lmathlib.c diff --git a/radio/src/lua/src/lmem.c b/radio/src/thirdparty/Lua/src/lmem.c similarity index 100% rename from radio/src/lua/src/lmem.c rename to radio/src/thirdparty/Lua/src/lmem.c diff --git a/radio/src/lua/src/lmem.h b/radio/src/thirdparty/Lua/src/lmem.h similarity index 100% rename from radio/src/lua/src/lmem.h rename to radio/src/thirdparty/Lua/src/lmem.h diff --git a/radio/src/lua/src/loadlib.c b/radio/src/thirdparty/Lua/src/loadlib.c similarity index 100% rename from radio/src/lua/src/loadlib.c rename to radio/src/thirdparty/Lua/src/loadlib.c diff --git a/radio/src/lua/src/lobject.c b/radio/src/thirdparty/Lua/src/lobject.c similarity index 100% rename from radio/src/lua/src/lobject.c rename to radio/src/thirdparty/Lua/src/lobject.c diff --git a/radio/src/lua/src/lobject.h b/radio/src/thirdparty/Lua/src/lobject.h similarity index 100% rename from radio/src/lua/src/lobject.h rename to radio/src/thirdparty/Lua/src/lobject.h diff --git a/radio/src/lua/src/lopcodes.c b/radio/src/thirdparty/Lua/src/lopcodes.c similarity index 100% rename from radio/src/lua/src/lopcodes.c rename to radio/src/thirdparty/Lua/src/lopcodes.c diff --git a/radio/src/lua/src/lopcodes.h b/radio/src/thirdparty/Lua/src/lopcodes.h similarity index 100% rename from radio/src/lua/src/lopcodes.h rename to radio/src/thirdparty/Lua/src/lopcodes.h diff --git a/radio/src/lua/src/loslib.c b/radio/src/thirdparty/Lua/src/loslib.c similarity index 100% rename from radio/src/lua/src/loslib.c rename to radio/src/thirdparty/Lua/src/loslib.c diff --git a/radio/src/lua/src/lparser.c b/radio/src/thirdparty/Lua/src/lparser.c similarity index 100% rename from radio/src/lua/src/lparser.c rename to radio/src/thirdparty/Lua/src/lparser.c diff --git a/radio/src/lua/src/lparser.h b/radio/src/thirdparty/Lua/src/lparser.h similarity index 100% rename from radio/src/lua/src/lparser.h rename to radio/src/thirdparty/Lua/src/lparser.h diff --git a/radio/src/lua/src/lrotable.c b/radio/src/thirdparty/Lua/src/lrotable.c similarity index 100% rename from radio/src/lua/src/lrotable.c rename to radio/src/thirdparty/Lua/src/lrotable.c diff --git a/radio/src/lua/src/lrotable.h b/radio/src/thirdparty/Lua/src/lrotable.h similarity index 100% rename from radio/src/lua/src/lrotable.h rename to radio/src/thirdparty/Lua/src/lrotable.h diff --git a/radio/src/lua/src/lstate.c b/radio/src/thirdparty/Lua/src/lstate.c similarity index 100% rename from radio/src/lua/src/lstate.c rename to radio/src/thirdparty/Lua/src/lstate.c diff --git a/radio/src/lua/src/lstate.h b/radio/src/thirdparty/Lua/src/lstate.h similarity index 100% rename from radio/src/lua/src/lstate.h rename to radio/src/thirdparty/Lua/src/lstate.h diff --git a/radio/src/lua/src/lstring.c b/radio/src/thirdparty/Lua/src/lstring.c similarity index 100% rename from radio/src/lua/src/lstring.c rename to radio/src/thirdparty/Lua/src/lstring.c diff --git a/radio/src/lua/src/lstring.h b/radio/src/thirdparty/Lua/src/lstring.h similarity index 100% rename from radio/src/lua/src/lstring.h rename to radio/src/thirdparty/Lua/src/lstring.h diff --git a/radio/src/lua/src/lstrlib.c b/radio/src/thirdparty/Lua/src/lstrlib.c similarity index 100% rename from radio/src/lua/src/lstrlib.c rename to radio/src/thirdparty/Lua/src/lstrlib.c diff --git a/radio/src/lua/src/ltable.c b/radio/src/thirdparty/Lua/src/ltable.c similarity index 100% rename from radio/src/lua/src/ltable.c rename to radio/src/thirdparty/Lua/src/ltable.c diff --git a/radio/src/lua/src/ltable.h b/radio/src/thirdparty/Lua/src/ltable.h similarity index 100% rename from radio/src/lua/src/ltable.h rename to radio/src/thirdparty/Lua/src/ltable.h diff --git a/radio/src/lua/src/ltablib.c b/radio/src/thirdparty/Lua/src/ltablib.c similarity index 100% rename from radio/src/lua/src/ltablib.c rename to radio/src/thirdparty/Lua/src/ltablib.c diff --git a/radio/src/lua/src/ltm.c b/radio/src/thirdparty/Lua/src/ltm.c similarity index 100% rename from radio/src/lua/src/ltm.c rename to radio/src/thirdparty/Lua/src/ltm.c diff --git a/radio/src/lua/src/ltm.h b/radio/src/thirdparty/Lua/src/ltm.h similarity index 100% rename from radio/src/lua/src/ltm.h rename to radio/src/thirdparty/Lua/src/ltm.h diff --git a/radio/src/lua/src/lua.c b/radio/src/thirdparty/Lua/src/lua.c similarity index 100% rename from radio/src/lua/src/lua.c rename to radio/src/thirdparty/Lua/src/lua.c diff --git a/radio/src/lua/src/lua.h b/radio/src/thirdparty/Lua/src/lua.h similarity index 100% rename from radio/src/lua/src/lua.h rename to radio/src/thirdparty/Lua/src/lua.h diff --git a/radio/src/lua/src/lua.hpp b/radio/src/thirdparty/Lua/src/lua.hpp similarity index 100% rename from radio/src/lua/src/lua.hpp rename to radio/src/thirdparty/Lua/src/lua.hpp diff --git a/radio/src/lua/src/luac.c b/radio/src/thirdparty/Lua/src/luac.c similarity index 100% rename from radio/src/lua/src/luac.c rename to radio/src/thirdparty/Lua/src/luac.c diff --git a/radio/src/lua/src/luaconf.h b/radio/src/thirdparty/Lua/src/luaconf.h similarity index 100% rename from radio/src/lua/src/luaconf.h rename to radio/src/thirdparty/Lua/src/luaconf.h diff --git a/radio/src/lua/src/lualib.h b/radio/src/thirdparty/Lua/src/lualib.h similarity index 100% rename from radio/src/lua/src/lualib.h rename to radio/src/thirdparty/Lua/src/lualib.h diff --git a/radio/src/lua/src/lundump.c b/radio/src/thirdparty/Lua/src/lundump.c similarity index 100% rename from radio/src/lua/src/lundump.c rename to radio/src/thirdparty/Lua/src/lundump.c diff --git a/radio/src/lua/src/lundump.h b/radio/src/thirdparty/Lua/src/lundump.h similarity index 100% rename from radio/src/lua/src/lundump.h rename to radio/src/thirdparty/Lua/src/lundump.h diff --git a/radio/src/lua/src/lvm.c b/radio/src/thirdparty/Lua/src/lvm.c similarity index 100% rename from radio/src/lua/src/lvm.c rename to radio/src/thirdparty/Lua/src/lvm.c diff --git a/radio/src/lua/src/lvm.h b/radio/src/thirdparty/Lua/src/lvm.h similarity index 100% rename from radio/src/lua/src/lvm.h rename to radio/src/thirdparty/Lua/src/lvm.h diff --git a/radio/src/lua/src/lzio.c b/radio/src/thirdparty/Lua/src/lzio.c similarity index 100% rename from radio/src/lua/src/lzio.c rename to radio/src/thirdparty/Lua/src/lzio.c diff --git a/radio/src/lua/src/lzio.h b/radio/src/thirdparty/Lua/src/lzio.h similarity index 100% rename from radio/src/lua/src/lzio.h rename to radio/src/thirdparty/Lua/src/lzio.h