|
@@ -7,15 +7,14 @@
|
|
|
#include "auxmods.h"
|
|
|
#include "lrotable.h"
|
|
|
|
|
|
-// Lua: = spi.setup( id, mode, cpol, cpha, databits, clock_div )
|
|
|
+// Lua: = spi.setup( id, mode, cpol, cpha, clock_div )
|
|
|
static int spi_setup( lua_State *L )
|
|
|
{
|
|
|
- unsigned id = luaL_checkinteger( L, 1 );
|
|
|
- unsigned mode = luaL_checkinteger( L, 2 );
|
|
|
- unsigned cpol = luaL_checkinteger( L, 3 );
|
|
|
- unsigned cpha = luaL_checkinteger( L, 4 );
|
|
|
- unsigned databits = luaL_checkinteger( L, 5 );
|
|
|
- uint32_t clock_div = luaL_checkinteger( L, 6 );
|
|
|
+ int id = luaL_checkinteger( L, 1 );
|
|
|
+ int mode = luaL_checkinteger( L, 2 );
|
|
|
+ int cpol = luaL_checkinteger( L, 3 );
|
|
|
+ int cpha = luaL_checkinteger( L, 4 );
|
|
|
+ u32 clock_div = luaL_checkinteger( L, 5 );
|
|
|
|
|
|
MOD_CHECK_ID( spi, id );
|
|
|
|
|
@@ -31,114 +30,82 @@ static int spi_setup( lua_State *L )
|
|
|
return luaL_error( L, "wrong arg type" );
|
|
|
}
|
|
|
|
|
|
- if (databits != PLATFORM_SPI_DATABITS_8 && databits != PLATFORM_SPI_DATABITS_16) {
|
|
|
- return luaL_error( L, "wrong arg type" );
|
|
|
- }
|
|
|
-
|
|
|
if (clock_div < 4) {
|
|
|
return luaL_error( L, "invalid clock divider" );
|
|
|
}
|
|
|
|
|
|
- u32 res = platform_spi_setup(id, mode, cpol, cpha, databits, clock_div);
|
|
|
+ u32 res = platform_spi_setup(id, mode, cpol, cpha, clock_div);
|
|
|
lua_pushinteger( L, res );
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
-// Lua: wrote = spi.send( id, data1, [data2], ..., [datan] )
|
|
|
+// Lua: wrote = spi.send( id, bitlen, data1, [data2], ..., [datan] )
|
|
|
// data can be either a string, a table or an 8-bit number
|
|
|
static int spi_send( lua_State *L )
|
|
|
{
|
|
|
- unsigned id = luaL_checkinteger( L, 1 );
|
|
|
- const char *pdata;
|
|
|
- size_t datalen, i;
|
|
|
- int numdata;
|
|
|
+ int id = luaL_checkinteger( L, 1 );
|
|
|
+ int bitlen = luaL_checkinteger( L, 2 );
|
|
|
+ size_t i;
|
|
|
+ u32 numdata;
|
|
|
u32 wrote = 0;
|
|
|
- unsigned argn;
|
|
|
+ int argn;
|
|
|
|
|
|
MOD_CHECK_ID( spi, id );
|
|
|
- if( lua_gettop( L ) < 2 )
|
|
|
+ if( lua_gettop( L ) < 3 ) {
|
|
|
return luaL_error( L, "too few args" );
|
|
|
+ }
|
|
|
|
|
|
- for( argn = 2; argn <= lua_gettop( L ); argn ++ )
|
|
|
+ for( argn = 3; argn <= lua_gettop( L ); argn ++ )
|
|
|
{
|
|
|
- // lua_isnumber() would silently convert a string of digits to an integer
|
|
|
- // whereas here strings are handled separately.
|
|
|
- if( lua_type( L, argn ) == LUA_TNUMBER )
|
|
|
- {
|
|
|
- numdata = ( int )luaL_checkinteger( L, argn );
|
|
|
- if( numdata < 0 || numdata > 255 )
|
|
|
- return luaL_error( L, "wrong arg range" );
|
|
|
- platform_spi_transaction( id, 8, numdata, 0, 0, 0, 0, 0 );
|
|
|
- wrote ++;
|
|
|
- }
|
|
|
- else if( lua_istable( L, argn ) )
|
|
|
- {
|
|
|
- datalen = lua_objlen( L, argn );
|
|
|
- for( i = 0; i < datalen; i ++ )
|
|
|
- {
|
|
|
- lua_rawgeti( L, argn, i + 1 );
|
|
|
- numdata = ( int )luaL_checkinteger( L, -1 );
|
|
|
- lua_pop( L, 1 );
|
|
|
- if( numdata < 0 || numdata > 255 )
|
|
|
- return luaL_error( L, "wrong arg range" );
|
|
|
- platform_spi_transaction( id, 8, numdata, 0, 0, 0, 0, 0 );
|
|
|
- }
|
|
|
- wrote += i;
|
|
|
- if( i < datalen )
|
|
|
- break;
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- pdata = luaL_checklstring( L, argn, &datalen );
|
|
|
- for( i = 0; i < datalen; i ++ )
|
|
|
- platform_spi_transaction( id, 8, pdata[ i ], 0, 0, 0, 0, 0 );
|
|
|
- wrote += i;
|
|
|
- if( i < datalen )
|
|
|
- break;
|
|
|
+ numdata = ( u32 )luaL_checkinteger( L, argn );
|
|
|
+ if (PLATFORM_OK != platform_spi_transaction( id, 0, 0, bitlen, numdata, 0, 0, 0 )) {
|
|
|
+ return luaL_error( L, "failed" );
|
|
|
}
|
|
|
+ wrote ++;
|
|
|
}
|
|
|
|
|
|
lua_pushinteger( L, wrote );
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
-// Lua: read = spi.recv( id, size )
|
|
|
+// Lua: read = spi.recv( id, bitlen, num )
|
|
|
static int spi_recv( lua_State *L )
|
|
|
{
|
|
|
- unsigned id = luaL_checkinteger( L, 1 );
|
|
|
- u32 size = ( u32 )luaL_checkinteger( L, 2 ), i;
|
|
|
-
|
|
|
- luaL_Buffer b;
|
|
|
- spi_data_type data;
|
|
|
+ int id = luaL_checkinteger( L, 1 );
|
|
|
+ int bitlen = luaL_checkinteger( L, 2 );
|
|
|
+ int num = luaL_checkinteger( L, 3 ), i;
|
|
|
|
|
|
MOD_CHECK_ID( spi, id );
|
|
|
- if (size == 0) {
|
|
|
- return 0;
|
|
|
+ if (bitlen < 1 || bitlen > 32) {
|
|
|
+ return luaL_error( L, "bitlen out of range" );
|
|
|
}
|
|
|
+ if (num < 0) num = 0;
|
|
|
|
|
|
- luaL_buffinit( L, &b );
|
|
|
- for (i=0; i<size; i++) {
|
|
|
- data = platform_spi_send_recv(id, 0xFF);
|
|
|
- luaL_addchar( &b, ( char )data);
|
|
|
+ for (i=0; i<num; i++)
|
|
|
+ {
|
|
|
+ if (PLATFORM_OK != platform_spi_transaction( id, 0, 0, 0, 0, 0, 0, bitlen )) {
|
|
|
+ return luaL_error( L, "failed" );
|
|
|
+ }
|
|
|
+ lua_pushinteger( L, platform_spi_get_miso( id, 0, bitlen ) );
|
|
|
}
|
|
|
|
|
|
- luaL_pushresult( &b );
|
|
|
- return 1;
|
|
|
+ return num;
|
|
|
}
|
|
|
|
|
|
// Lua: spi.set_mosi( id, offset, bitlen, data1, [data2], ..., [datan] )
|
|
|
static int spi_set_mosi( lua_State *L )
|
|
|
{
|
|
|
- unsigned id = luaL_checkinteger( L, 1 );
|
|
|
- unsigned offset = luaL_checkinteger( L, 2 );
|
|
|
- unsigned bitlen = luaL_checkinteger( L, 3 );
|
|
|
- unsigned argn;
|
|
|
+ int id = luaL_checkinteger( L, 1 );
|
|
|
+ int offset = luaL_checkinteger( L, 2 );
|
|
|
+ int bitlen = luaL_checkinteger( L, 3 );
|
|
|
+ int argn;
|
|
|
|
|
|
MOD_CHECK_ID( spi, id );
|
|
|
|
|
|
if (offset < 0 || offset > 511) {
|
|
|
return luaL_error( L, "offset out of range" );
|
|
|
}
|
|
|
+
|
|
|
if (bitlen < 1 || bitlen > 32) {
|
|
|
return luaL_error( L, "bitlen out of range" );
|
|
|
}
|
|
@@ -149,51 +116,87 @@ static int spi_set_mosi( lua_State *L )
|
|
|
|
|
|
for (argn = 4; argn <= lua_gettop( L ); argn++, offset += bitlen )
|
|
|
{
|
|
|
- u32 data = luaL_checkinteger(L, argn );
|
|
|
+ u32 data = ( u32 )luaL_checkinteger(L, argn );
|
|
|
|
|
|
- if (offset + bitlen > 512)
|
|
|
+ if (offset + bitlen > 512) {
|
|
|
return luaL_error( L, "data range exceeded > 512 bits" );
|
|
|
+ }
|
|
|
|
|
|
- if (platform_spi_set_mosi( id, offset, bitlen, data ) != PLATFORM_OK)
|
|
|
+ if (PLATFORM_OK != platform_spi_set_mosi( id, offset, bitlen, data )) {
|
|
|
return luaL_error( L, "failed" );
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
+// Lua: data = spi.get_miso( id, offset, bitlen, num )
|
|
|
+static int spi_get_miso( lua_State *L )
|
|
|
+{
|
|
|
+ int id = luaL_checkinteger( L, 1 );
|
|
|
+ int offset = luaL_checkinteger( L, 2 );
|
|
|
+ int bitlen = luaL_checkinteger( L, 3 );
|
|
|
+ int num = luaL_checkinteger( L, 4 ), i;
|
|
|
+
|
|
|
+ MOD_CHECK_ID( spi, id );
|
|
|
+
|
|
|
+ if (offset < 0 || offset > 511) {
|
|
|
+ return luaL_error( L, "out of range" );
|
|
|
+ }
|
|
|
+
|
|
|
+ if (bitlen < 1 || bitlen > 32) {
|
|
|
+ return luaL_error( L, "bitlen out of range" );
|
|
|
+ }
|
|
|
+
|
|
|
+ if (offset + bitlen * num > 512) {
|
|
|
+ return luaL_error( L, "out of range" );
|
|
|
+ }
|
|
|
+
|
|
|
+ for (i = 0; i < num; i++)
|
|
|
+ {
|
|
|
+ lua_pushinteger( L, platform_spi_get_miso( id, offset + (bitlen * i), bitlen ) );
|
|
|
+ }
|
|
|
+ return num;
|
|
|
+}
|
|
|
+
|
|
|
// Lua: spi.transaction( id, cmd_bitlen, cmd_data, addr_bitlen, addr_data, mosi_bitlen, dummy_bitlen, miso_bitlen )
|
|
|
static int spi_transaction( lua_State *L )
|
|
|
{
|
|
|
- unsigned id = luaL_checkinteger( L, 1 );
|
|
|
- unsigned cmd_bitlen = luaL_checkinteger( L, 2 );
|
|
|
- u32 cmd_data = luaL_checkinteger( L, 3 );
|
|
|
- unsigned addr_bitlen = luaL_checkinteger( L, 4 );
|
|
|
- u32 addr_data = luaL_checkinteger( L, 5 );
|
|
|
- unsigned mosi_bitlen = luaL_checkinteger( L, 6 );
|
|
|
- unsigned dummy_bitlen = luaL_checkinteger( L, 7 );
|
|
|
- unsigned miso_bitlen = luaL_checkinteger( L, 8 );
|
|
|
+ int id = luaL_checkinteger( L, 1 );
|
|
|
+ int cmd_bitlen = luaL_checkinteger( L, 2 );
|
|
|
+ u16 cmd_data = ( u16 )luaL_checkinteger( L, 3 );
|
|
|
+ int addr_bitlen = luaL_checkinteger( L, 4 );
|
|
|
+ u32 addr_data = ( u32 )luaL_checkinteger( L, 5 );
|
|
|
+ int mosi_bitlen = luaL_checkinteger( L, 6 );
|
|
|
+ int dummy_bitlen = luaL_checkinteger( L, 7 );
|
|
|
+ int miso_bitlen = luaL_checkinteger( L, 8 );
|
|
|
|
|
|
MOD_CHECK_ID( spi, id );
|
|
|
|
|
|
if (cmd_bitlen < 0 || cmd_bitlen > 16) {
|
|
|
return luaL_error( L, "cmd_bitlen out of range" );
|
|
|
}
|
|
|
+
|
|
|
if (addr_bitlen < 0 || addr_bitlen > 32) {
|
|
|
return luaL_error( L, "addr_bitlen out of range" );
|
|
|
}
|
|
|
+
|
|
|
if (mosi_bitlen < 0 || mosi_bitlen > 512) {
|
|
|
return luaL_error( L, "mosi_bitlen out of range" );
|
|
|
}
|
|
|
+
|
|
|
if (dummy_bitlen < 0 || dummy_bitlen > 256) {
|
|
|
return luaL_error( L, "dummy_bitlen out of range" );
|
|
|
}
|
|
|
+
|
|
|
if (miso_bitlen < 0 || miso_bitlen > 511) {
|
|
|
return luaL_error( L, "miso_bitlen out of range" );
|
|
|
}
|
|
|
|
|
|
- if (platform_spi_transaction( id, cmd_bitlen, cmd_data, addr_bitlen, addr_data,
|
|
|
- mosi_bitlen, dummy_bitlen, miso_bitlen) != PLATFORM_OK)
|
|
|
+ if (PLATFORM_OK != platform_spi_transaction( id, cmd_bitlen, cmd_data, addr_bitlen, addr_data,
|
|
|
+ mosi_bitlen, dummy_bitlen, miso_bitlen) ) {
|
|
|
return luaL_error( L, "failed" );
|
|
|
+ }
|
|
|
|
|
|
return 0;
|
|
|
}
|
|
@@ -208,6 +211,7 @@ const LUA_REG_TYPE spi_map[] =
|
|
|
{ LSTRKEY( "send" ), LFUNCVAL( spi_send ) },
|
|
|
{ LSTRKEY( "recv" ), LFUNCVAL( spi_recv ) },
|
|
|
{ LSTRKEY( "set_mosi" ), LFUNCVAL( spi_set_mosi ) },
|
|
|
+ { LSTRKEY( "get_miso" ), LFUNCVAL( spi_get_miso ) },
|
|
|
{ LSTRKEY( "transaction" ), LFUNCVAL( spi_transaction ) },
|
|
|
#if LUA_OPTIMIZE_MEMORY > 0
|
|
|
{ LSTRKEY( "MASTER" ), LNUMVAL( PLATFORM_SPI_MASTER ) },
|