Added TI library driver (experimental).

Memory/register read, single-step, run and halt are working.
Breakpoints aren't working, and programming hasn't been tested.
This commit is contained in:
Daniel Beer 2011-10-14 12:49:04 +13:00
parent 90eeb0d23e
commit f18b0c188b
5 changed files with 627 additions and 1 deletions

View File

@ -113,6 +113,7 @@ OBJ=\
drivers/sim.o \ drivers/sim.o \
drivers/uif.o \ drivers/uif.o \
drivers/ti3410.o \ drivers/ti3410.o \
drivers/tilib.o \
formats/binfile.o \ formats/binfile.o \
formats/coff.o \ formats/coff.o \
formats/elf32.o \ formats/elf32.o \

View File

@ -60,6 +60,7 @@ struct device_breakpoint {
#define DEVICE_FLAG_LONG_PW 0x02 #define DEVICE_FLAG_LONG_PW 0x02
#define DEVICE_FLAG_TTY 0x04 /* default is USB */ #define DEVICE_FLAG_TTY 0x04 /* default is USB */
#define DEVICE_FLAG_FORCE_RESET 0x08 #define DEVICE_FLAG_FORCE_RESET 0x08
#define DEVICE_FLAG_DO_FWUPDATE 0x10
struct device_args { struct device_args {
int flags; int flags;

588
drivers/tilib.c Normal file
View File

@ -0,0 +1,588 @@
/* MSPDebug - debugging tool for MSP430 MCUs
* Copyright (C) 2009-2011 Daniel Beer
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include "output.h"
#include "dynload.h"
#include "tilib.h"
#include "tilib_defs.h"
#include "threads.h"
#ifdef WIN32
static const char tilib_filename[] = "MSP430.DLL";
#else
static const char tilib_filename[] = "libmsp430.so";
#endif
struct tilib_device {
struct device base;
dynload_handle_t hnd;
threads_lock_t mb_lock;
uint32_t mailbox;
uint16_t bp_handles[DEVICE_MAX_BREAKPOINTS];
/* MSP430.h */
STATUS_T WINAPI (*MSP430_Initialize)(char *port, long *version);
STATUS_T WINAPI (*MSP430_VCC)(long voltage);
STATUS_T WINAPI (*MSP430_Configure)(long mode, long value);
STATUS_T WINAPI (*MSP430_OpenDevice)(char *Device, char *Password,
long PwLength, long DeviceCode,
long setId);
STATUS_T WINAPI (*MSP430_Close)(long vccOff);
STATUS_T WINAPI (*MSP430_Memory)(long address, char *buffer,
long count, long rw);
STATUS_T WINAPI (*MSP430_Reset)(long method, long execute,
long releaseJTAG);
STATUS_T WINAPI (*MSP430_Erase)(long type, long address, long length);
STATUS_T WINAPI (*MSP430_Error_Number)(void);
const char * WINAPI (*MSP430_Error_String)(long errNumber);
/* MSP430_Debug.h */
STATUS_T WINAPI (*MSP430_Registers)(long *registers, long mask,
long rw);
STATUS_T WINAPI (*MSP430_Run)(long mode, long releaseJTAG);
STATUS_T WINAPI (*MSP430_State)(long* state, long stop,
long* pCPUCycles);
/* MSP430_EEM.h */
STATUS_T WINAPI (*MSP430_EEM_Init)(DLL430_EVENTNOTIFY_FUNC callback,
long clientHandle,
MessageID_t *pMsgIdBuffer);
STATUS_T WINAPI (*MSP430_EEM_SetBreakpoint)(uint16_t *pwBpHandle,
BpParameter_t *pBpBuffer);
/* MSP430_FET.h */
STATUS_T WINAPI (*MSP430_FET_FwUpdate)(char* lpszFileName,
DLL430_FET_NOTIFY_FUNC callback,
long clientHandle);
};
#define MID_SINGLE_STEP 0x01
#define MID_BREAKPOINT 0x02
#define MID_STORAGE 0x04
#define MID_STATE 0x08
#define MID_WARNING 0x10
#define MID_CPU_STOPPED 0x20
#define MID_HALT_ANY (MID_BREAKPOINT | MID_CPU_STOPPED)
const static MessageID_t my_message_ids = {
.uiMsgIdSingleStep = MID_SINGLE_STEP,
.uiMsgIdBreakpoint = MID_BREAKPOINT,
.uiMsgIdStorage = MID_STORAGE,
.uiMsgIdState = MID_STATE,
.uiMsgIdWarning = MID_WARNING,
.uiMsgIdCPUStopped = MID_CPU_STOPPED
};
static void event_notify(unsigned int msg_id, unsigned int w_param,
long l_param, long client_handle)
{
struct tilib_device *dev = (struct tilib_device *)client_handle;
threads_lock_acquire(&dev->mb_lock);
dev->mailbox |= msg_id;
threads_lock_release(&dev->mb_lock);
}
static uint32_t event_fetch(struct tilib_device *dev)
{
uint32_t ret;
threads_lock_acquire(&dev->mb_lock);
ret = dev->mailbox;
dev->mailbox = 0;
threads_lock_release(&dev->mb_lock);
return 0;
}
static void *get_func(dynload_handle_t hnd, const char *name)
{
void *ret = dynload_sym(hnd, name);
if (!ret) {
printc_err("tilib: can't find symbol \"%s\": %s\n",
name, dynload_error());
return NULL;
}
return ret;
}
static int get_all_funcs(struct tilib_device *dev)
{
dev->MSP430_Initialize = get_func(dev->hnd, "MSP430_Initialize");
if (!dev->MSP430_Initialize)
return -1;
dev->MSP430_VCC = get_func(dev->hnd, "MSP430_VCC");
if (!dev->MSP430_VCC)
return -1;
dev->MSP430_Configure = get_func(dev->hnd, "MSP430_Configure");
if (!dev->MSP430_Configure)
return -1;
dev->MSP430_OpenDevice = get_func(dev->hnd, "MSP430_OpenDevice");
if (!dev->MSP430_OpenDevice)
return -1;
dev->MSP430_Close = get_func(dev->hnd, "MSP430_Close");
if (!dev->MSP430_Close)
return -1;
dev->MSP430_Memory = get_func(dev->hnd, "MSP430_Memory");
if (!dev->MSP430_Memory)
return -1;
dev->MSP430_Reset = get_func(dev->hnd, "MSP430_Reset");
if (!dev->MSP430_Reset)
return -1;
dev->MSP430_Erase = get_func(dev->hnd, "MSP430_Erase");
if (!dev->MSP430_Erase)
return -1;
dev->MSP430_Error_Number = get_func(dev->hnd, "MSP430_Error_Number");
if (!dev->MSP430_Error_Number)
return -1;
dev->MSP430_Error_String = get_func(dev->hnd, "MSP430_Error_String");
if (!dev->MSP430_Error_String)
return -1;
dev->MSP430_Registers = get_func(dev->hnd, "MSP430_Registers");
if (!dev->MSP430_Registers)
return -1;
dev->MSP430_Run = get_func(dev->hnd, "MSP430_Run");
if (!dev->MSP430_Run)
return -1;
dev->MSP430_State = get_func(dev->hnd, "MSP430_State");
if (!dev->MSP430_State)
return -1;
dev->MSP430_EEM_Init = get_func(dev->hnd, "MSP430_EEM_Init");
if (!dev->MSP430_EEM_Init)
return -1;
dev->MSP430_EEM_SetBreakpoint = get_func(dev->hnd,
"MSP430_EEM_SetBreakpoint");
if (!dev->MSP430_EEM_SetBreakpoint)
return -1;
dev->MSP430_FET_FwUpdate = get_func(dev->hnd, "MSP430_FET_FwUpdate");
if (!dev->MSP430_FET_FwUpdate)
return -1;
return 0;
}
static void report_error(struct tilib_device *dev, const char *what)
{
long err = dev->MSP430_Error_Number();
const char *desc = dev->MSP430_Error_String(err);
printc_err("tilib: %s: %s (error = %d)\n", what, desc, err);
}
static int tilib_readmem(device_t dev_base, address_t addr,
uint8_t *mem, address_t len)
{
struct tilib_device *dev = (struct tilib_device *)dev_base;
if (dev->MSP430_Memory(addr, (char *)mem, len, READ) < 0) {
report_error(dev, "MSP430_Memory");
return -1;
}
return 0;
}
static int tilib_writemem(device_t dev_base, address_t addr,
const uint8_t *mem, address_t len)
{
struct tilib_device *dev = (struct tilib_device *)dev_base;
if (dev->MSP430_Memory(addr, (char *)mem, len, WRITE) < 0) {
report_error(dev, "MSP430_Memory");
return -1;
}
return 0;
}
static long ti_erase_type(device_erase_type_t e)
{
switch (e) {
case DEVICE_ERASE_ALL: return ERASE_ALL;
case DEVICE_ERASE_MAIN: return ERASE_MAIN;
case DEVICE_ERASE_SEGMENT: return ERASE_SEGMENT;
}
return 0;
}
static int tilib_erase(device_t dev_base, device_erase_type_t type,
address_t address)
{
struct tilib_device *dev = (struct tilib_device *)dev_base;
if (dev->MSP430_Erase(ti_erase_type(type), address, 0) < 0) {
report_error(dev, "MSP430_Erase");
return -1;
}
return 0;
}
static int tilib_getregs(device_t dev_base, address_t *regs)
{
struct tilib_device *dev = (struct tilib_device *)dev_base;
long regbuf[DEVICE_NUM_REGS];
int i;
if (dev->MSP430_Registers(regbuf, 0xffff, READ) < 0) {
report_error(dev, "MSP430_Registers");
return -1;
}
for (i = 0; i < DEVICE_NUM_REGS; i++)
regs[i] = regbuf[i];
return 0;
}
static int tilib_setregs(device_t dev_base, const address_t *regs)
{
struct tilib_device *dev = (struct tilib_device *)dev_base;
long regbuf[DEVICE_NUM_REGS];
int i;
for (i = 0; i < DEVICE_NUM_REGS; i++)
regbuf[i] = regs[i];
if (dev->MSP430_Registers(regbuf, 0xffff, WRITE) < 0) {
report_error(dev, "MSP430_Registers");
return -1;
}
return 0;
}
static int refresh_bps(struct tilib_device *dev)
{
int i;
for (i = 0; i < dev->base.max_breakpoints; i++) {
struct device_breakpoint *bp = &dev->base.breakpoints[i];
BpParameter_t param = {0};
if (!(bp->flags & DEVICE_BP_DIRTY))
continue;
if (bp->flags & DEVICE_BP_ENABLED) {
param.bpMode = BP_CODE;
param.lAddrVal = bp->addr;
} else {
param.bpMode = BP_CLEAR;
}
if (dev->MSP430_EEM_SetBreakpoint(&dev->bp_handles[i],
&param) < 0) {
report_error(dev, "MSP430_EEM_SetBreakpoint");
return -1;
}
}
return 0;
}
static int do_halt(struct tilib_device *dev)
{
long state;
long cycles;
if (dev->MSP430_State(&state, 1, &cycles) < 0) {
report_error(dev, "MSP430_State");
return -1;
}
/* Is this a blocking call? */
return 0;
}
static int do_step(struct tilib_device *dev)
{
if (dev->MSP430_Run(SINGLE_STEP, 0) < 0) {
report_error(dev, "MSP430_Run");
return -1;
}
return 0;
}
static int tilib_ctl(device_t dev_base, device_ctl_t op)
{
struct tilib_device *dev = (struct tilib_device *)dev_base;
switch (op) {
case DEVICE_CTL_RESET:
if (dev->MSP430_Reset(RST_RESET, 0, 0) < 0) {
report_error(dev, "MSP430_Reset");
return -1;
}
return 0;
case DEVICE_CTL_RUN:
if (refresh_bps(dev) < 0)
return -1;
if (dev->MSP430_Run(RUN_TO_BREAKPOINT, 0) < 0) {
report_error(dev, "MSP430_Run");
return -1;
}
break;
case DEVICE_CTL_HALT:
return do_halt(dev);
case DEVICE_CTL_STEP:
return do_step(dev);
}
return 0;
}
static device_status_t tilib_poll(device_t dev_base)
{
struct tilib_device *dev = (struct tilib_device *)dev_base;
ctrlc_reset();
if ((usleep(50000) < 0) || ctrlc_check())
return DEVICE_STATUS_INTR;
if (event_fetch(dev) & MID_HALT_ANY)
return DEVICE_STATUS_HALTED;
return DEVICE_STATUS_RUNNING;
}
static void tilib_destroy(device_t dev_base)
{
struct tilib_device *dev = (struct tilib_device *)dev_base;
printc_dbg("MSP430_Run\n");
if (dev->MSP430_Run(RUN_TO_BREAKPOINT, 1) < 0)
report_error(dev, "MSP430_Run");
printc_dbg("MSP430_Close\n");
dev->MSP430_Close(0);
dynload_close(dev->hnd);
threads_lock_destroy(&dev->mb_lock);
free(dev);
}
static void fw_progress(unsigned int msg_id, unsigned long w_param,
unsigned long l_param, long client_handle)
{
struct tilib_device *dev = (struct tilib_device *)client_handle;
switch (msg_id) {
case BL_DATA_BLOCK_PROGRAMMED:
if (w_param > 100)
w_param = 100;
printc(" %3d percent done\n", w_param);
break;
case BL_UPDATE_ERROR:
report_error(dev, "BL_UPDATE_ERROR");
break;
case BL_WAIT_FOR_TIMEOUT:
printc("Waiting for bootloader to timeout...\n");
break;
case BL_INIT:
printc("Initializing bootloader...\n");
break;
case BL_ERASE_INT_VECTORS:
printc("Erasing interrupt vectors...\n");
break;
case BL_ERASE_FIRMWARE:
printc("Erasing firmware...\n");
break;
case BL_PROGRAM_FIRMWARE:
printc("Programming new firmware...\n");
break;
case BL_EXIT:
printc("Done, finishing...\n");
break;
case BL_UPDATE_DONE:
printc("Update complete\n");
break;
}
}
static int do_fw_update(struct tilib_device *dev)
{
printc("Starting firmware update (this may take some time)...\n");
if (dev->MSP430_FET_FwUpdate(NULL, fw_progress, (long)dev) < 0) {
report_error(dev, "MSP430_FET_FwUpdate");
return -1;
}
return 0;
}
static int do_init(struct tilib_device *dev, const struct device_args *args)
{
long version;
char buf[1024];
/* Not sure if the path is actually modified by MSP430_Initialize,
* but the argument isn't const, so probably safest to copy it.
*/
strncpy(buf, args->path, sizeof(buf));
buf[sizeof(buf) - 1] = 0;
printc_dbg("MSP430_Initialize: %s\n", buf);
if (dev->MSP430_Initialize(buf, &version) < 0) {
report_error(dev, "MSP430_Initialize");
return -1;
}
if (version < 0) {
printc("FET firmware update is required.\n");
if (args->flags & DEVICE_FLAG_DO_FWUPDATE) {
if (do_fw_update(dev) < 0) {
dev->MSP430_Close(0);
return -1;
}
} else {
printc("Re-run with --allow-fw-update to perform "
"a firmware update.\n");
dev->MSP430_Close(0);
return -1;
}
} else {
printc_dbg("Firmware version is %d\n", version);
}
printc_dbg("MSP430_VCC: %d mV\n", args->vcc_mv);
if (dev->MSP430_VCC(args->vcc_mv) < 0) {
report_error(dev, "MSP430_VCC");
dev->MSP430_Close(0);
return -1;
}
printc_dbg("MSP430_OpenDevice\n");
if (dev->MSP430_OpenDevice("DEVICE_UNKNOWN", "", 0, 0, 0) < 0) {
report_error(dev, "MSP430_OpenDevice");
dev->MSP430_Close(0);
return -1;
}
printc_dbg("MSP430_EEM_Init\n");
threads_lock_init(&dev->mb_lock);
if (dev->MSP430_EEM_Init(event_notify, (long)dev,
(MessageID_t *)&my_message_ids) < 0) {
report_error(dev, "MSP430_EEM_Init");
dev->MSP430_Close(0);
threads_lock_destroy(&dev->mb_lock);
return -1;
}
/* Should find this out from EEM API, if possible */
dev->base.max_breakpoints = DEVICE_MAX_BREAKPOINTS;
return 0;
}
static device_t tilib_open(const struct device_args *args)
{
struct tilib_device *dev;
if (!(args->flags & DEVICE_FLAG_TTY)) {
printc_err("This driver does not support raw USB access.\n");
return NULL;
}
dev = malloc(sizeof(*dev));
if (!dev) {
printc_err("tilib: can't allocate memory: %s\n",
last_error());
return NULL;
}
memset(dev, 0, sizeof(*dev));
dev->base.type = &device_tilib;
dev->hnd = dynload_open(tilib_filename);
if (!dev->hnd) {
printc_err("tilib: can't find %s: %s\n",
tilib_filename, dynload_error());
free(dev);
return NULL;
}
if (get_all_funcs(dev) < 0) {
dynload_close(dev->hnd);
free(dev);
return NULL;
}
if (do_init(dev, args) < 0) {
printc_err("tilib: device initialization failed\n");
dynload_close(dev->hnd);
free(dev);
return NULL;
}
return (device_t)dev;
}
const struct device_class device_tilib = {
.name = "tilib",
.help = "TI MSP430 library",
.open = tilib_open,
.destroy = tilib_destroy,
.readmem = tilib_readmem,
.writemem = tilib_writemem,
.erase = tilib_erase,
.getregs = tilib_getregs,
.setregs = tilib_setregs,
.ctl = tilib_ctl,
.poll = tilib_poll
};

27
drivers/tilib.h Normal file
View File

@ -0,0 +1,27 @@
/* MSPDebug - debugging tool for MSP430 MCUs
* Copyright (C) 2009-2011 Daniel Beer
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef TILIB_H_
#define TILIB_H_
#include "device.h"
/* TI MSP430.DLL/libmsp430.so implementation */
extern const struct device_class device_tilib;
#endif

View File

@ -50,6 +50,7 @@
#include "uif.h" #include "uif.h"
#include "olimex.h" #include "olimex.h"
#include "rf2500.h" #include "rf2500.h"
#include "tilib.h"
struct cmdline_args { struct cmdline_args {
const char *driver_name; const char *driver_name;
@ -65,7 +66,8 @@ static const struct device_class *const driver_table[] = {
&device_uif, &device_uif,
&device_bsl, &device_bsl,
&device_flash_bsl, &device_flash_bsl,
&device_gdbc &device_gdbc,
&device_tilib
}; };
static const char *version_text = static const char *version_text =
@ -107,6 +109,8 @@ static void usage(const char *progname)
" Show a list of available USB devices.\n" " Show a list of available USB devices.\n"
" --force-reset\n" " --force-reset\n"
" Force target reset in initialization sequence.\n" " Force target reset in initialization sequence.\n"
" --allow-fw-update\n"
" Update FET firmware (tilib only) if necessary.\n"
" --version\n" " --version\n"
" Show copyright and version information.\n" " Show copyright and version information.\n"
"\n" "\n"
@ -175,6 +179,7 @@ static int parse_cmdline_args(int argc, char **argv,
{"version", 0, 0, 'V'}, {"version", 0, 0, 'V'},
{"long-password", 0, 0, 'P'}, {"long-password", 0, 0, 'P'},
{"force-reset", 0, 0, 'R'}, {"force-reset", 0, 0, 'R'},
{"allow-fw-update", 0, 0, 'A'},
{NULL, 0, 0, 0} {NULL, 0, 0, 0}
}; };
int want_usb = 0; int want_usb = 0;
@ -192,6 +197,10 @@ static int parse_cmdline_args(int argc, char **argv,
} }
break; break;
case 'A':
args->devarg.flags |= DEVICE_FLAG_DO_FWUPDATE;
break;
case 'I': case 'I':
usb_init(); usb_init();
usb_find_busses(); usb_find_busses();