Skip to content

Commit

Permalink
APP: Major changes in an interface driver code.
Browse files Browse the repository at this point in the history 
Interface driver (structure) now contains all necessary functions to operate.
This is important for drivers other than using libftdi, they are now possible.
Existing functions based on libftdi were renamed to contain "ftdi" string.
This change makes it possible to experiment with new async libusb1 interface,
that would talk to FTDI chip directly and hopefully will increase performance.
LibSWD driver bridge now use function pointers from interface structure,
these are "bitbang", "transfer_bits" and "transfer_bytes".
libswd_driver_t was extended with (void*)interface field to hold the routines.
  • Loading branch information
@cederom
cederom committed Oct 24, 2013
1 parent eabda46 commit e1308df
Show file tree
Hide file tree
Showing 3 changed files with 59 additions and 34 deletions.
1 change: 1 addition & 0 deletions src/libswd.h
View file
Expand Up @@ -668,6 +668,7 @@ typedef struct {
typedef struct {
void *device;
void *ctx;
void *interface;
} libswd_driver_t;

/** Boolean values definition */
Expand Down
51 changes: 33 additions & 18 deletions src/libswd_app.c
View file
Expand Up @@ -178,8 +178,6 @@ int main(int argc, char **argv){
retval=LIBSWD_ERROR_NULLCONTEXT;
goto quit;
}
// Store program Context for use with interface drivers.
libswdappctx->libswdctx->driver->ctx=libswdappctx;
// Set default LogLevel.
if (LIBSWD_OK!=libswd_log_level_set(libswdappctx->libswdctx,libswdappctx->loglevel))
{
Expand All @@ -193,8 +191,12 @@ int main(int argc, char **argv){
libswdappctx->libswdctx->config.autofixerrors=0;

// Initialize the Interface
retval=libswdapp_handle_command_interface(libswdappctx, NULL);
retval=libswdapp_handle_command_interface_init(libswdappctx, NULL);
if (retval!=LIBSWD_OK) return retval;
// Store program Context for use with interface drivers.
libswdappctx->libswdctx->driver->ctx=libswdappctx;
// Store interface structure in libswd driver.
libswdappctx->libswdctx->driver->interface=libswdappctx->interface;

// Setup the Readline
rl_bind_key('\t',rl_abort); //disable auto-complete
Expand Down Expand Up @@ -723,7 +725,7 @@ int libswdapp_handle_command_signal(libswdapp_context_t *libswdappctx, char *cmd
}
if (signamep && sigvalp)
{
retval=libswdapp_interface_bitbang(libswdappctx, sig->mask, 0, &sigval);
retval=libswdappctx->interface->bitbang(libswdappctx, sig->mask, 0, &sigval);
if (retval==LIBSWD_OK)
{
sig->value=sigval;
Expand All @@ -735,7 +737,7 @@ int libswdapp_handle_command_signal(libswdapp_context_t *libswdappctx, char *cmd
}
else if (signamep)
{
retval=libswdapp_interface_bitbang(libswdappctx, sig->mask, 1, &sigval);
retval=libswdappctx->interface->bitbang(libswdappctx, sig->mask, 1, &sigval);
if (retval==LIBSWD_OK)
{
sig->value=sigval;
Expand Down Expand Up @@ -763,7 +765,7 @@ int libswdapp_handle_command_signal(libswdapp_context_t *libswdappctx, char *cmd
* cmd==NULL means that we need to load default interface (defined in header file)
* or we need to (re)initialize an interface that is already set in interface->name.
*/
int libswdapp_handle_command_interface(libswdapp_context_t *libswdappctx, char *cmd){
int libswdapp_handle_command_interface_init(libswdapp_context_t *libswdappctx, char *cmd){
int retval, i, interface_number;
char *param, buf[8];

Expand All @@ -778,6 +780,7 @@ int libswdapp_handle_command_interface(libswdapp_context_t *libswdappctx, char *
return LIBSWD_ERROR_NULLCONTEXT;
}

// Verify selected interface name or try the dedault.
if (!libswdappctx->interface->name[0])
{
libswd_log(libswdctx, LIBSWD_LOGLEVEL_NORMAL,
Expand Down Expand Up @@ -822,6 +825,9 @@ int libswdapp_handle_command_interface(libswdapp_context_t *libswdappctx, char *
libswdappctx->interface->init=NULL;
libswdappctx->interface->deinit=NULL;
libswdappctx->interface->set_freq=NULL;
libswdappctx->interface->bitbang=NULL;
libswdappctx->interface->transfer_bits=NULL;
libswdappctx->interface->transfer_bytes=NULL;
libswdappctx->interface->maxfrequency=0;
libswdappctx->interface->frequency=-1;
libswdappctx->interface->chunksize=0;
Expand All @@ -832,6 +838,9 @@ int libswdapp_handle_command_interface(libswdapp_context_t *libswdappctx, char *
libswdappctx->interface->init = libswdapp_interface_configs[interface_number].init;
libswdappctx->interface->deinit = libswdapp_interface_configs[interface_number].deinit;
libswdappctx->interface->set_freq = libswdapp_interface_configs[interface_number].set_freq;
libswdappctx->interface->bitbang = libswdapp_interface_configs[interface_number].bitbang;
libswdappctx->interface->transfer_bits = libswdapp_interface_configs[interface_number].transfer_bits;
libswdappctx->interface->transfer_bytes = libswdapp_interface_configs[interface_number].transfer_bytes;
libswdappctx->interface->vid = libswdapp_interface_configs[interface_number].vid;
libswdappctx->interface->pid = libswdapp_interface_configs[interface_number].pid;
libswdappctx->interface->latency= libswdapp_interface_configs[interface_number].latency;
Expand Down Expand Up @@ -1160,7 +1169,7 @@ int libswdapp_interface_signal_del(libswdapp_context_t *libswdappctx, char *name
* \return ERROR_OK on success, or ERROR_FAIL on failure.
* TODO: Bitbang Read must also update other bits status, otherwise cached values are invalid and abiguous!!!
*/
int libswdapp_interface_bitbang(libswdapp_context_t *libswdappctx, unsigned int bitmask, int GETnSET, unsigned int *value)
int libswdapp_interface_ftdi_bitbang(libswdapp_context_t *libswdappctx, unsigned int bitmask, int GETnSET, unsigned int *value)
{
unsigned char buf[3];
int retval, retry;
Expand Down Expand Up @@ -1284,7 +1293,7 @@ int libswdapp_interface_bitbang(libswdapp_context_t *libswdappctx, unsigned int
* \param nLSBfirst if zero shift data LSB-first, otherwise MSB-first.
* \return number of bits sent on success, or ERROR_FAIL on failure.
*/
int libswdapp_interface_transfer_bits(libswdapp_context_t *libswdappctx, int bits, char *mosidata, char *misodata, int nLSBfirst)
int libswdapp_interface_ftdi_transfer_bits(libswdapp_context_t *libswdappctx, int bits, char *mosidata, char *misodata, int nLSBfirst)
{
static unsigned char buf[65539], databuf;
int i, retval, bit=0, byte=0, bytes=0, retry;
Expand Down Expand Up @@ -1391,7 +1400,7 @@ int libswdapp_interface_transfer_bits(libswdapp_context_t *libswdappctx, int bit
* \param nLSBfirst if zero shift data LSB-first, otherwise MSB-first.
* \return number of bits sent on success, or ERROR_FAIL on failure.
*/
int libswdapp_interface_transfer_bytes(libswdapp_context_t *libswdappctx, int bytes, char *mosidata, char *misodata, int nLSBfirst)
int libswdapp_interface_ftdi_transfer_bytes(libswdapp_context_t *libswdappctx, int bytes, char *mosidata, char *misodata, int nLSBfirst)
{
static unsigned char buf[65539], databuf;
int i, retval, byte=0, retry;
Expand Down Expand Up @@ -1574,7 +1583,7 @@ int libswdapp_interface_ftdi_init_ktlink(libswdapp_context_t *libswdappctx)
int libswdapp_interface_ftdi_deinit(libswdapp_context_t *libswdappctx)
{
unsigned int dir=0,val;
return libswdapp_interface_bitbang(libswdappctx, dir, 1, &val);
return libswdappctx->interface->bitbang(libswdappctx, dir, 1, &val);
}


Expand Down Expand Up @@ -1608,12 +1617,13 @@ int libswd_drv_mosi_8(libswd_ctx_t *libswdctx, libswd_cmd_t *cmd, char *data, in
static unsigned int i;
static signed int res;
static char misodata[8], mosidata[8];
libswdapp_interface_t *interface=(libswdapp_interface_t*)libswdctx->driver->interface;

// Split output data into char array.
for (i=0;i<8;i++)
mosidata[(nLSBfirst==LIBSWD_DIR_LSBFIRST)?i:(bits-1-i)]=((1<<i)&(*data))?1:0;
// Then send that array into interface hardware.
res=libswdapp_interface_transfer_bits(libswdctx->driver->ctx,bits,mosidata,misodata,0);
res=interface->transfer_bits(libswdctx->driver->ctx,bits,mosidata,misodata,0);
if (res<0) return LIBSWD_ERROR_DRIVER;

return res;
Expand Down Expand Up @@ -1644,11 +1654,12 @@ int libswd_drv_mosi_32(libswd_ctx_t *libswdctx, libswd_cmd_t *cmd, int *data, in
static unsigned int i;
static signed int res;
static char misodata[32], mosidata[32];
libswdapp_interface_t *interface=(libswdapp_interface_t*)libswdctx->driver->interface;

// UrJTAG drivers shift data LSB-First.
for (i=0;i<32;i++)
mosidata[(nLSBfirst==LIBSWD_DIR_LSBFIRST)?i:(bits-1-i)]=((1<<i)&(*data))?1:0;
res=libswdapp_interface_transfer_bits(libswdctx->driver->ctx,bits,mosidata,misodata,0);
res=interface->transfer_bits(libswdctx->driver->ctx,bits,mosidata,misodata,0);
if (res<0) return LIBSWD_ERROR_DRIVER;

return res;
Expand All @@ -1673,8 +1684,9 @@ int libswd_drv_miso_8(libswd_ctx_t *libswdctx, libswd_cmd_t *cmd, char *data, in
static int i;
static signed int res;
static char misodata[8], mosidata[8];
libswdapp_interface_t *interface=(libswdapp_interface_t*)libswdctx->driver->interface;

res=libswdapp_interface_transfer_bits(libswdctx->driver->ctx,bits,mosidata,misodata,LIBSWD_DIR_LSBFIRST);
res=interface->transfer_bits(libswdctx->driver->ctx,bits,mosidata,misodata,LIBSWD_DIR_LSBFIRST);
if (res<0) return LIBSWD_ERROR_DRIVER;
// Now we need to reconstruct the received LSb data byte into byte array.
*data = 0;
Expand Down Expand Up @@ -1708,8 +1720,9 @@ int libswd_drv_miso_32(libswd_ctx_t *libswdctx, libswd_cmd_t *cmd, int *data, in
static int i;
static signed int res;
static char misodata[32], mosidata[32];
libswdapp_interface_t *interface=(libswdapp_interface_t*)libswdctx->driver->interface;

res = libswdapp_interface_transfer_bits(libswdctx->driver->ctx, bits, mosidata, misodata, LIBSWD_DIR_LSBFIRST);
res = interface->transfer_bits(libswdctx->driver->ctx, bits, mosidata, misodata, LIBSWD_DIR_LSBFIRST);
if (res<0) return LIBSWD_ERROR_DRIVER;
// Now we need to reconstruct the data byte from shifted in LSBfirst byte array.
*data = 0;
Expand Down Expand Up @@ -1737,6 +1750,7 @@ int libswd_drv_mosi_trn(libswd_ctx_t *libswdctx, int bits)
"LIBSWD_D: libswd_drv_mosi_trn(libswdctx=@%p, bits=%d)\n",
(void *)libswdctx, bits
);
libswdapp_interface_t *interface=(libswdapp_interface_t*)libswdctx->driver->interface;

if (bits<LIBSWD_TURNROUND_MIN_VAL || bits>LIBSWD_TURNROUND_MAX_VAL)
return LIBSWD_ERROR_TURNAROUND;
Expand All @@ -1754,11 +1768,11 @@ int libswd_drv_mosi_trn(libswd_ctx_t *libswdctx, int bits)
int res, val = 0;
static char buf[LIBSWD_TURNROUND_MAX_VAL];
// Use driver method to set low (write) signal named RnW.
res = libswdapp_interface_bitbang(libswdctx->driver->ctx, sig->mask, 0, &val);
res = interface->bitbang(libswdctx->driver->ctx, sig->mask, 0, &val);
if (res < 0) return LIBSWD_ERROR_DRIVER;

// Clock specified number of bits for proper TRN transaction.
res = libswdapp_interface_transfer_bits(libswdctx->driver->ctx, bits, buf, buf, 0);
res = interface->transfer_bits(libswdctx->driver->ctx, bits, buf, buf, 0);
if (res < 0) return LIBSWD_ERROR_DRIVER;

return bits;
Expand All @@ -1780,6 +1794,7 @@ int libswd_drv_miso_trn(libswd_ctx_t *libswdctx, int bits)
"LIBSWD_D: libswd_drv_miso_trn(libswdctx=@%p, bits=%d)\n",
(void *)libswdctx, bits
);
libswdapp_interface_t *interface=(libswdapp_interface_t*)libswdctx->driver->interface;

if (bits<LIBSWD_TURNROUND_MIN_VAL || bits>LIBSWD_TURNROUND_MAX_VAL)
return LIBSWD_ERROR_TURNAROUND;
Expand All @@ -1798,11 +1813,11 @@ int libswd_drv_miso_trn(libswd_ctx_t *libswdctx, int bits)
static char buf[LIBSWD_TURNROUND_MAX_VAL];

// Use driver method to set high (read) signal named RnW.
res = libswdapp_interface_bitbang(libswdctx->driver->ctx, sig->mask, 1, &val);
res = interface->bitbang(libswdctx->driver->ctx, sig->mask, 1, &val);
if (res < 0) return LIBSWD_ERROR_DRIVER;

// Clock specified number of bits for proper TRN transaction.
res = libswdapp_interface_transfer_bits(libswdctx->driver->ctx, bits, buf, buf, 0);
res = interface->transfer_bits(libswdctx->driver->ctx, bits, buf, buf, 0);
if (res < 0) return LIBSWD_ERROR_DRIVER;

return bits;
Expand Down
41 changes: 25 additions & 16 deletions src/libswd_app.h
View file
Expand Up @@ -73,6 +73,9 @@ typedef struct libswdapp_interface {
int (*init)(libswdapp_context_t *libswdappctx);
int (*deinit)(libswdapp_context_t *libswdappctx);
int (*set_freq)(libswdapp_context_t *libswdappctx, int freq);
int (*bitbang)(libswdapp_context_t *libswdappctx, unsigned int bitmask, int GETnSET, unsigned int *value);
int (*transfer_bits)(libswdapp_context_t *libswdappctx, int bits, char *mosidata, char *misodata, int nLSBfirst);
int (*transfer_bytes)(libswdapp_context_t *libswdappctx, int bytes, char *mosidata, char *misodata, int nLSBfirst);
char *sigsetupstr;
// Below are CACHED values changed only by the interface functions.

Expand All @@ -92,6 +95,9 @@ typedef struct libswdapp_interface_config {
int (*init)(libswdapp_context_t *libswdappctx);
int (*deinit)(libswdapp_context_t *libswdappctx);
int (*set_freq)(libswdapp_context_t *libswdappctx, int freq);
int (*bitbang)(libswdapp_context_t *libswdappctx, unsigned int bitmask, int GETnSET, unsigned int *value);
int (*transfer_bits)(libswdapp_context_t *libswdappctx, int bits, char *mosidata, char *misodata, int nLSBfirst);
int (*transfer_bytes)(libswdapp_context_t *libswdappctx, int bytes, char *mosidata, char *misodata, int nLSBfirst);
int vid, pid;
unsigned char latency;
int frequency, maxfrequency;
Expand All @@ -116,12 +122,12 @@ libswdapp_interface_signal_t *libswdapp_interface_signal_find(libswdapp_context_
int libswdapp_print_banner(void);
int libswdapp_print_usage(void);
int libswdapp_handle_command_signal(libswdapp_context_t *libswdappctx, char *cmd);
int libswdapp_handle_command_interface(libswdapp_context_t *libswdappctx, char *cmd);
int libswdapp_handle_command_interface_init(libswdapp_context_t *libswdappctx, char *cmd);
int libswdapp_interface_ftdi_set_freq(libswdapp_context_t *libswdappctx, int freq);

int libswdapp_interface_bitbang(libswdapp_context_t *libswdappctx, unsigned int bitmask, int GETnSET, unsigned int *value);
int libswdapp_interface_transfer_bits(libswdapp_context_t *libswdappctx, int bits, char *mosidata, char *misodata, int nLSBfirst);
int libswdapp_interface_transfer_bytes(libswdapp_context_t *libswdappctx, int bytes, char *mosidata, char *misodata, int nLSBfirst);
int libswdapp_interface_ftdi_bitbang(libswdapp_context_t *libswdappctx, unsigned int bitmask, int GETnSET, unsigned int *value);
int libswdapp_interface_ftdi_transfer_bits(libswdapp_context_t *libswdappctx, int bits, char *mosidata, char *misodata, int nLSBfirst);
int libswdapp_interface_ftdi_transfer_bytes(libswdapp_context_t *libswdappctx, int bytes, char *mosidata, char *misodata, int nLSBfirst);
int libswd_drv_mosi_8(libswd_ctx_t *libswdctx, libswd_cmd_t *cmd, char *data, int bits, int nLSBfirst);
int libswd_drv_mosi_32(libswd_ctx_t *libswdctx, libswd_cmd_t *cmd, int *data, int bits, int nLSBfirst);
int libswd_drv_miso_8(libswd_ctx_t *libswdctx, libswd_cmd_t *cmd, char *data, int bits, int nLSBfirst);
Expand All @@ -136,18 +142,21 @@ static int libswdapp_interface_ftdi_init_ktlink(libswdapp_context_t *libswdappct

static const libswdapp_interface_config_t libswdapp_interface_configs[] = {
{
.name = "ktlink",
.description = "KT-LINK FT2232H based device",
.init = libswdapp_interface_ftdi_init_ktlink,
.deinit = libswdapp_interface_ftdi_deinit,
.set_freq = libswdapp_interface_ftdi_set_freq,
.vid = 0x0403,
.pid = 0xbbe2,
.latency = 1,
.maxfrequency= 6000000,
.frequency = 10000,
.chunksize = 32768,
.sigsetupstr = "signal add:CLK=0x0001 add:MOSI=0x0002 add:MISO=0x0004 add:TMS=0x0008 add:nSWDsel=0x0020 add:SRSTin=0x0040 add:RTCK=0x0080 add:TRST=0x0100 add:SRST=0x0200 add:nTRSTen=0x0400 add:nSRSTen=0x0800 add:RnW=0x1000 add:nMOSIen=0x2000 add:nCLKen=0x4000 add:LED=0x8000 CLK=lo MOSI=lo SRST=hi nCLKen=lo nSWDsel=lo RnW=lo nSRSTen=lo LED=lo MISO SRSTin RTCK",
.name = "ktlink",
.description = "KT-LINK FT2232H based device (using LibFTDI)",
.init = libswdapp_interface_ftdi_init_ktlink,
.deinit = libswdapp_interface_ftdi_deinit,
.set_freq = libswdapp_interface_ftdi_set_freq,
.bitbang = libswdapp_interface_ftdi_bitbang,
.transfer_bits = libswdapp_interface_ftdi_transfer_bits,
.transfer_bytes = libswdapp_interface_ftdi_transfer_bytes,
.vid = 0x0403,
.pid = 0xbbe2,
.latency = 1,
.maxfrequency = 30000000,
.frequency = 1000000,
.chunksize = 32768,
.sigsetupstr = "signal add:CLK=0x0001 add:MOSI=0x0002 add:MISO=0x0004 add:TMS=0x0008 add:nSWDsel=0x0020 add:SRSTin=0x0040 add:RTCK=0x0080 add:TRST=0x0100 add:SRST=0x0200 add:nTRSTen=0x0400 add:nSRSTen=0x0800 add:RnW=0x1000 add:nMOSIen=0x2000 add:nCLKen=0x4000 add:LED=0x8000 CLK=lo MOSI=lo SRST=hi nCLKen=lo nSWDsel=lo RnW=lo nSRSTen=lo LED=lo MISO SRSTin RTCK",
},
{
.name = '\0',
Expand Down

0 comments on commit e1308df

Please sign in to comment.