sys64738
/
mspdebug
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removed per-command checks for fet_is_rf2500.

This commit is contained in:
Daniel Beer 2010-04-08 15:01:09 +12:00
parent eff1148348
commit 1f8b65870c
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fet.c
View File

@ -485,6 +485,9 @@ static int xfer(int command_code, const u_int8_t *data, int datalen,
va_end(ap); va_end(ap);
if (data && fet_is_rf2500) { if (data && fet_is_rf2500) {
assert (nparams + 1 <= MAX_PARAMS);
params[nparams++] = datalen;
if (send_rf2500_data(data, datalen) < 0) if (send_rf2500_data(data, datalen) < 0)
return -1; return -1;
if (send_command(command_code, params, nparams, NULL, 0) < 0) if (send_command(command_code, params, nparams, NULL, 0) < 0)
@ -697,12 +700,7 @@ static int fet_setregs(const u_int16_t *regs)
buf[i * 4 + 1] = regs[i] >> 8; buf[i * 4 + 1] = regs[i] >> 8;
} }
if (fet_is_rf2500) ret = xfer(C_WRITEREGISTERS, buf, sizeof(buf), 1, 0xffff);
ret = xfer(C_WRITEREGISTERS, buf, sizeof(buf),
2, 0xffff, sizeof(buf));
else
ret = xfer(C_WRITEREGISTERS, buf, sizeof(buf),
1, 0xffff);
if (ret < 0) { if (ret < 0) {
fprintf(stderr, "fet: context set failed\n"); fprintf(stderr, "fet: context set failed\n");
@ -744,12 +742,7 @@ int fet_writemem(u_int16_t addr, const u_int8_t *buffer, int count)
int plen = count > 128 ? 128 : count; int plen = count > 128 ? 128 : count;
int ret; int ret;
if (fet_is_rf2500) ret = xfer(C_WRITEMEMORY, buffer, plen, 1, addr);
ret = xfer(C_WRITEMEMORY, buffer, plen,
2, addr, plen);
else
ret = xfer(C_WRITEMEMORY, buffer, plen,
1, addr);
if (ret < 0) { if (ret < 0) {
fprintf(stderr, "fet: failed to write to 0x%04x\n", fprintf(stderr, "fet: failed to write to 0x%04x\n",