From 392249c9214f7f07f9a332262ed987d2f542a7ba Mon Sep 17 00:00:00 2001
From: "Alessandro Zummo, IZ1PRB" <azummo@users.sourceforge.net>
Date: Tue, 3 Feb 2009 22:13:55 +0000
Subject: [PATCH] ts140,ts2000,ts480,ts570,ts680,ts850,ts870s: remove usage of
 fixed ; and EOM

git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@2611 7ae35d74-ebe9-4afe-98af-79ac388436b8
---
 kenwood/ts140.c  |  4 +--
 kenwood/ts2000.c | 34 ++++++++++++-------------
 kenwood/ts480.c  | 28 ++++++++++-----------
 kenwood/ts570.c  | 64 ++++++++++++++++++++++++------------------------
 kenwood/ts680.c  |  4 +--
 kenwood/ts850.c  | 42 +++++++++++++++----------------
 kenwood/ts870s.c | 48 ++++++++++++++++++------------------
 7 files changed, 112 insertions(+), 112 deletions(-)

diff --git a/kenwood/ts140.c b/kenwood/ts140.c
index ee72dc6e1..27aa2f982 100644
--- a/kenwood/ts140.c
+++ b/kenwood/ts140.c
@@ -2,7 +2,7 @@
  *  Hamlib Kenwood backend - TS140 description
  *  Copyright (c) 2000-2008 by Stephane Fillod
  *
- *	$Id: ts140.c,v 1.11 2009-01-28 23:30:56 azummo Exp $
+ *	$Id: ts140.c,v 1.12 2009-02-03 22:13:54 azummo Exp $
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
@@ -69,7 +69,7 @@ static int ts140_set_vfo(RIG *rig, vfo_t vfo)
                         return -RIG_EINVAL;
                 }
 
-                cmd_len = sprintf(cmdbuf, "FN%c;", vfo_function); /* The 680 and 140 need this to set the VFO on the radio */
+                cmd_len = sprintf(cmdbuf, "FN%c", vfo_function); /* The 680 and 140 need this to set the VFO on the radio */
                 ack_len = 0;
                 retval = kenwood_transaction (rig, cmdbuf, cmd_len, ackbuf, &ack_len);
                 if (retval != RIG_OK)
diff --git a/kenwood/ts2000.c b/kenwood/ts2000.c
index 40e9ccde8..d1b7461ac 100644
--- a/kenwood/ts2000.c
+++ b/kenwood/ts2000.c
@@ -2,7 +2,7 @@
  *  Hamlib Kenwood backend - TS2000 description
  *  Copyright (c) 2000-2008 by Stephane Fillod
  *
- *	$Id: ts2000.c,v 1.25 2009-01-28 23:30:56 azummo Exp $
+ *	$Id: ts2000.c,v 1.26 2009-02-03 22:13:55 azummo Exp $
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
@@ -285,7 +285,7 @@ int ts2000_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 		switch (level) {
 
 		case RIG_LEVEL_PREAMP:
-			retval = kenwood_transaction (rig, "PA;", 3, lvlbuf, &lvl_len);
+			retval = kenwood_transaction (rig, "PA", 2, lvlbuf, &lvl_len);
 			if (retval != RIG_OK)
 				return retval;
 			if ((lvl_len != 5)){ /*TS-2000 returns 5 chars for PA; */
@@ -302,7 +302,7 @@ int ts2000_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 			break;
 
 		case RIG_LEVEL_ATT:
-			retval = kenwood_transaction (rig, "RA;", 3, lvlbuf, &lvl_len);
+			retval = kenwood_transaction (rig, "RA", 2, lvlbuf, &lvl_len);
 			if (retval != RIG_OK)
 				return retval;
 
@@ -321,7 +321,7 @@ int ts2000_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 			break;
 			
 		case RIG_LEVEL_VOX:
-			retval = kenwood_transaction (rig, "VD;", 3, lvlbuf, &lvl_len);
+			retval = kenwood_transaction (rig, "VD", 2, lvlbuf, &lvl_len);
 			if (retval != RIG_OK)
 				return retval;
 			if (lvl_len != 7) {
@@ -334,7 +334,7 @@ int ts2000_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 			break;
 		
 	        case RIG_LEVEL_AF:
-			retval = kenwood_transaction (rig, "AG0;", 4, lvlbuf, &lvl_len); 
+			retval = kenwood_transaction (rig, "AG0", 3, lvlbuf, &lvl_len);
 			if (retval != RIG_OK)
 				return retval;
 			if (lvl_len != 7) {
@@ -347,7 +347,7 @@ int ts2000_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 			break;
 		
 		case RIG_LEVEL_RF:
-			retval = kenwood_transaction (rig, "RG;", 3, lvlbuf, &lvl_len);
+			retval = kenwood_transaction (rig, "RG", 2, lvlbuf, &lvl_len);
 			if (retval != RIG_OK)
 				return retval;
 			if (lvl_len != 6) {
@@ -360,7 +360,7 @@ int ts2000_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 			break;
 		
 		case RIG_LEVEL_SQL:
-			retval = kenwood_transaction (rig, "SQ0;", 4, lvlbuf, &lvl_len);
+			retval = kenwood_transaction (rig, "SQ0", 3, lvlbuf, &lvl_len);
 			if (retval != RIG_OK)
 				return retval;
 			if (lvl_len != 7) {
@@ -373,7 +373,7 @@ int ts2000_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 			break;
 
 		case RIG_LEVEL_CWPITCH:
-			retval = kenwood_transaction (rig, "EX0310000;", 10, lvlbuf, &lvl_len);
+			retval = kenwood_transaction (rig, "EX0310000", 9, lvlbuf, &lvl_len);
 			if (retval != RIG_OK)
 				return retval;
 			if (lvl_len != 12) {
@@ -386,7 +386,7 @@ int ts2000_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 			break;
 	
 		case RIG_LEVEL_RFPOWER:
-			retval = kenwood_transaction (rig, "PC;", 3, lvlbuf, &lvl_len);
+			retval = kenwood_transaction (rig, "PC", 2, lvlbuf, &lvl_len);
 			if (retval != RIG_OK)
 				return retval;
 			if (lvl_len != 6) {
@@ -399,7 +399,7 @@ int ts2000_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
         	  	break;
 	
 		case RIG_LEVEL_MICGAIN:
-			retval = kenwood_transaction (rig, "MG;", 3, lvlbuf, &lvl_len);
+			retval = kenwood_transaction (rig, "MG", 2, lvlbuf, &lvl_len);
 			if (retval != RIG_OK)
 				return retval;
 			if (lvl_len != 6) {
@@ -412,7 +412,7 @@ int ts2000_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 			break;
 		
 		case RIG_LEVEL_KEYSPD:
-			retval = kenwood_transaction (rig, "KS;", 3, lvlbuf, &lvl_len);
+			retval = kenwood_transaction (rig, "KS", 2, lvlbuf, &lvl_len);
 			if (retval != RIG_OK)
 				return retval;
 			if (lvl_len != 6) {
@@ -429,7 +429,7 @@ int ts2000_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 			break;
 
 		case RIG_LEVEL_COMP:
-			retval = kenwood_transaction (rig, "PL;", 3, lvlbuf, &lvl_len);
+			retval = kenwood_transaction (rig, "PL", 2, lvlbuf, &lvl_len);
 			if (retval != RIG_OK)
 				return retval;
 			if (lvl_len != 9) {
@@ -444,7 +444,7 @@ int ts2000_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 		
 			
 		case RIG_LEVEL_AGC: /* FIX ME: ts2000 returns 0 -20 for AGC */
-			ret = get_kenwood_level(rig, "GT;", 3, &val->f);
+			ret = get_kenwood_level(rig, "GT", 2, &val->f);
 			agclevel = 255.0 * val->f;
 			if (agclevel == 0) val->i = 0;
 			else if (agclevel < 85) val->i = 1;
@@ -454,7 +454,7 @@ int ts2000_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 			break;
 
 		case RIG_LEVEL_BKINDL:
-			retval = kenwood_transaction (rig, "SD;", 3, lvlbuf, &lvl_len);
+			retval = kenwood_transaction (rig, "SD", 2, lvlbuf, &lvl_len);
 			if (retval != RIG_OK)
 				return retval;
 			if (lvl_len != 7) {
@@ -471,7 +471,7 @@ int ts2000_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 		    break;
 
 		case RIG_LEVEL_METER:
-			retval = kenwood_transaction (rig, "RM;", 3, lvlbuf, &lvl_len);
+			retval = kenwood_transaction (rig, "RM", 2, lvlbuf, &lvl_len);
 			if (retval != RIG_OK)
 				return retval;
 			if (lvl_len != 8) {
@@ -484,7 +484,7 @@ int ts2000_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 			break;
 		
 		case RIG_LEVEL_VOXGAIN:
-			retval = kenwood_transaction (rig, "VG;", 3, lvlbuf, &lvl_len);
+			retval = kenwood_transaction (rig, "VG", 2, lvlbuf, &lvl_len);
 			if (retval != RIG_OK)
 				return retval;
 			if (lvl_len != 6) {
@@ -502,7 +502,7 @@ int ts2000_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 		
 		case RIG_LEVEL_RAWSTR:
 		case RIG_LEVEL_STRENGTH:
-			retval = kenwood_transaction (rig, "SM0;", 4, lvlbuf, &lvl_len);
+			retval = kenwood_transaction (rig, "SM0", 3, lvlbuf, &lvl_len);
 			if (retval != RIG_OK)
 				return retval;
 
diff --git a/kenwood/ts480.c b/kenwood/ts480.c
index 60aa5a752..13c3ee77d 100644
--- a/kenwood/ts480.c
+++ b/kenwood/ts480.c
@@ -2,7 +2,7 @@
  *  Hamlib Kenwood backend - TS480 description
  *  Copyright (c) 2000-2004 by Stephane Fillod and Juergen Rinas
  *
- *	$Id: ts480.c,v 1.10 2009-01-28 23:30:58 azummo Exp $
+ *	$Id: ts480.c,v 1.11 2009-02-03 22:13:55 azummo Exp $
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
@@ -53,8 +53,8 @@ kenwood_ts480_set_ptt (RIG * rig, vfo_t vfo, ptt_t ptt)
   size_t ack_len = 0;
 
   if (RIG_PTT_ON == ptt)
-    return kenwood_transaction (rig, "TX1;", 4, ackbuf, &ack_len);
-  return kenwood_transaction (rig, "RX;", 3, ackbuf, &ack_len);
+    return kenwood_transaction (rig, "TX1", 3, ackbuf, &ack_len);
+  return kenwood_transaction (rig, "RX", 2, ackbuf, &ack_len);
 }
 
 /*
@@ -69,7 +69,7 @@ kenwood_ts480_get_info (RIG * rig)
   int retval;
 
   firm_len = 50;
-  retval = kenwood_transaction (rig, "TY;", 3, firmbuf, &firm_len);
+  retval = kenwood_transaction (rig, "TY", 2, firmbuf, &firm_len);
   if (retval != RIG_OK)
     return NULL;
   if (firm_len != 6)
@@ -114,22 +114,22 @@ kenwood_ts480_set_level (RIG * rig, vfo_t vfo, setting_t level, value_t val)
     {
     case RIG_LEVEL_RFPOWER:
       kenwood_val = val.f * 100;	/* level for TS480SAT is from 0.. 100W in SSB */
-      level_len = sprintf (levelbuf, "PC%03d;", kenwood_val);
+      level_len = sprintf (levelbuf, "PC%03d", kenwood_val);
       break;
 
     case RIG_LEVEL_AF:
       kenwood_val = val.f * 255;	/* possible values for TS480 are 000.. 255 */
-      level_len = sprintf (levelbuf, "AG0%03d;", kenwood_val);
+      level_len = sprintf (levelbuf, "AG0%03d", kenwood_val);
       break;
 
     case RIG_LEVEL_RF:
       kenwood_val = val.f * 100;	/* possible values for TS480 are 000.. 100 */
-      level_len = sprintf (levelbuf, "RG%03d;", kenwood_val);
+      level_len = sprintf (levelbuf, "RG%03d", kenwood_val);
       break;
 
     case RIG_LEVEL_SQL:
       kenwood_val = val.f * 255;	/* possible values for TS480 are 000.. 255 */
-      level_len = sprintf (levelbuf, "SQ0%03d;", kenwood_val);
+      level_len = sprintf (levelbuf, "SQ0%03d", kenwood_val);
       break;
 
     case RIG_LEVEL_AGC:	/* possible values for TS480 000(=off), 001(=fast), 002(=slow) */
@@ -149,7 +149,7 @@ kenwood_ts480_set_level (RIG * rig, vfo_t vfo, setting_t level, value_t val)
 	  rig_debug (RIG_DEBUG_ERR, "Unsupported agc value");
 	  return -RIG_EINVAL;
 	};
-      level_len = sprintf (levelbuf, "GT%03d;", kenwood_val);
+      level_len = sprintf (levelbuf, "GT%03d", kenwood_val);
       break;
 
     default:
@@ -181,7 +181,7 @@ kenwood_ts480_get_level (RIG * rig, vfo_t vfo, setting_t level, value_t * val)
   switch (level)
     {
     case RIG_LEVEL_RFPOWER:
-      retval = kenwood_transaction (rig, "PC;", 3, ackbuf, &ack_len);
+      retval = kenwood_transaction (rig, "PC", 2, ackbuf, &ack_len);
       if (RIG_OK != retval)
 	return retval;
       if (6 != ack_len)
@@ -192,7 +192,7 @@ kenwood_ts480_get_level (RIG * rig, vfo_t vfo, setting_t level, value_t * val)
       return RIG_OK;
 
     case RIG_LEVEL_AF:
-      retval = kenwood_transaction (rig, "AG0;", 4, ackbuf, &ack_len);
+      retval = kenwood_transaction (rig, "AG0", 3, ackbuf, &ack_len);
       if (RIG_OK != retval)
 	return retval;
       if (7 != ack_len)
@@ -203,7 +203,7 @@ kenwood_ts480_get_level (RIG * rig, vfo_t vfo, setting_t level, value_t * val)
       return RIG_OK;
 
     case RIG_LEVEL_RF:
-      retval = kenwood_transaction (rig, "RG;", 3, ackbuf, &ack_len);
+      retval = kenwood_transaction (rig, "RG", 2, ackbuf, &ack_len);
       if (RIG_OK != retval)
 	return retval;
       if (6 != ack_len)
@@ -214,7 +214,7 @@ kenwood_ts480_get_level (RIG * rig, vfo_t vfo, setting_t level, value_t * val)
       return RIG_OK;
 
     case RIG_LEVEL_SQL:
-      retval = kenwood_transaction (rig, "SQ0;", 4, ackbuf, &ack_len);
+      retval = kenwood_transaction (rig, "SQ0", 3, ackbuf, &ack_len);
       if (RIG_OK != retval)
 	return retval;
       if (7 != ack_len)
@@ -225,7 +225,7 @@ kenwood_ts480_get_level (RIG * rig, vfo_t vfo, setting_t level, value_t * val)
       return RIG_OK;
 
     case RIG_LEVEL_AGC:
-      retval = kenwood_transaction (rig, "GT;", 3, ackbuf, &ack_len);
+      retval = kenwood_transaction (rig, "GT", 2, ackbuf, &ack_len);
       if (RIG_OK != retval)
 	return retval;
       if (6 != ack_len)
diff --git a/kenwood/ts570.c b/kenwood/ts570.c
index f4ead4f08..e17828779 100644
--- a/kenwood/ts570.c
+++ b/kenwood/ts570.c
@@ -2,7 +2,7 @@
  *  Hamlib Kenwood backend - TS570 description
  *  Copyright (c) 2001-2005 by Stephane Fillod
  *
- *	$Id: ts570.c,v 1.39 2009-02-02 07:30:35 azummo Exp $
+ *	$Id: ts570.c,v 1.40 2009-02-03 22:13:55 azummo Exp $
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
@@ -59,7 +59,7 @@ static int ts570_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
 
 
   buf_len = 50;
-  retval = kenwood_transaction (rig, "MD;", 3, buf, &buf_len);
+  retval = kenwood_transaction (rig, "MD", 2, buf, &buf_len);
   if (retval != RIG_OK)
     return retval;
 
@@ -100,7 +100,7 @@ static int ts570_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
     case RIG_MODE_RTTY:
     case RIG_MODE_RTTYR:
       buf_len = 50;
-      retval = kenwood_transaction (rig, "FW;", 3, buf, &buf_len);
+      retval = kenwood_transaction (rig, "FW", 2, buf, &buf_len);
       if (retval != RIG_OK) return retval;
       if (buf_len != 7 || buf[1] != 'W')
       {
@@ -115,7 +115,7 @@ static int ts570_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
     case RIG_MODE_FM:
     case RIG_MODE_AM:
       buf_len = 50;
-      retval = kenwood_transaction (rig, "SL;", 3, buf, &buf_len);
+      retval = kenwood_transaction (rig, "SL", 2, buf, &buf_len);
       if (retval != RIG_OK) return retval;
       if (buf_len != 5 || buf[1] != 'L')
       {
@@ -158,7 +158,7 @@ static int ts570_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
   if ((kmode = mode_to_char(mode)) == RIG_MODE_NONE)
      return -RIG_EINVAL;
 
-  buf_len = sprintf(buf, "MD%c;", kmode);
+  buf_len = sprintf(buf, "MD%c", kmode);
   ack_len = 0;
   retval = kenwood_transaction (rig, buf, buf_len, ackbuf, &ack_len);
   if (retval != RIG_OK) return retval;
@@ -170,7 +170,7 @@ static int ts570_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
     case RIG_MODE_CWR:
     case RIG_MODE_RTTY:
     case RIG_MODE_RTTYR:
-      buf_len = sprintf(buf, "FW%04d;", (int)width);
+      buf_len = sprintf(buf, "FW%04d", (int)width);
       retval = kenwood_transaction (rig, buf, buf_len, ackbuf, &ack_len);
       if (retval != RIG_OK) return retval;
       break;
@@ -178,7 +178,7 @@ static int ts570_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
     case RIG_MODE_LSB:
     case RIG_MODE_FM:
     case RIG_MODE_AM:
-      buf_len = sprintf(buf, "SL%02d;", (int)width/50);
+      buf_len = sprintf(buf, "SL%02d", (int)width/50);
       retval = kenwood_transaction (rig, buf, buf_len, ackbuf, &ack_len);
       if (retval != RIG_OK) return retval;
       break;
@@ -209,10 +209,10 @@ int ts570_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
 		case RIG_FUNC_NR:
 			if ((status < 0) || (status >2))
 				return -RIG_EINVAL;
-			fct_len = sprintf(fctbuf,"NR%01d;", status);
+			fct_len = sprintf(fctbuf,"NR%01d", status);
 			return kenwood_transaction (rig, fctbuf, fct_len, ackbuf, &ack_len);
 		case RIG_FUNC_TUNER:
-			fct_len = sprintf(fctbuf,"AC %c0;", (0==status)?'0':'1');
+			fct_len = sprintf(fctbuf,"AC %c0", (0==status)?'0':'1');
  			return kenwood_transaction (rig, fctbuf, fct_len, ackbuf, &ack_len);
 		
 		default:
@@ -239,7 +239,7 @@ int ts570_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
 		 */
 		switch (func) {
 		case RIG_FUNC_NR:
-			retval = kenwood_transaction (rig, "NR;", 3, fctbuf, &fct_len);
+			retval = kenwood_transaction (rig, "NR", 2, fctbuf, &fct_len);
 			if (retval != RIG_OK)
 				return retval;
 
@@ -253,7 +253,7 @@ int ts570_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
 			break;
 
 		case RIG_FUNC_TUNER:
-			retval = kenwood_transaction (rig, "AC;", 3, fctbuf, &fct_len);
+			retval = kenwood_transaction (rig, "AC", 2, fctbuf, &fct_len);
 			if (retval != RIG_OK)
 				return retval;
 
@@ -296,12 +296,12 @@ ts570_set_level (RIG * rig, vfo_t vfo, setting_t level, value_t val)
         kenwood_val = val.i;
 	/* set the preamplifier if a correct value is entered */
 	if (kenwood_val == 0)
-		level_len = sprintf(levelbuf, "PA0;");
+		level_len = sprintf(levelbuf, "PA0");
 	else
 	for (i=0; i<MAXDBLSTSIZ; i++)
 	    if (kenwood_val == rig->state.preamp[i])
 	    {
-		level_len = sprintf(levelbuf, "PA%01d;", i+1);
+		level_len = sprintf(levelbuf, "PA%01d", i+1);
 		break;  /* found - stop searching */
 	    }
 	    else
@@ -311,13 +311,13 @@ ts570_set_level (RIG * rig, vfo_t vfo, setting_t level, value_t val)
     case RIG_LEVEL_RFPOWER:
       /* level for TS570D is from 0.. 100W in SSB and CW */
       kenwood_val = val.f * 100;	
-      level_len = sprintf (levelbuf, "PC%03d;", kenwood_val);
+      level_len = sprintf (levelbuf, "PC%03d", kenwood_val);
       return kenwood_transaction (rig, levelbuf, level_len, ackbuf, &ack_len);
       
     case RIG_LEVEL_MICGAIN:
       /* level is from 0..100 */
       kenwood_val = val.f * 100;
-      level_len = sprintf (levelbuf, "MG%03d;", kenwood_val);
+      level_len = sprintf (levelbuf, "MG%03d", kenwood_val);
       return kenwood_transaction (rig, levelbuf, level_len, ackbuf, &ack_len);
 
     default:
@@ -345,7 +345,7 @@ ts570_get_level (RIG * rig, vfo_t vfo, setting_t level, value_t * val)
     {
     case RIG_LEVEL_RFPOWER:
       /* ts570d returns 5..100 measured in watt */
-      retval = kenwood_transaction (rig, "PC;", 3, ackbuf, &ack_len);
+      retval = kenwood_transaction (rig, "PC", 2, ackbuf, &ack_len);
       if (RIG_OK != retval)
 	return retval;
       if (6 != ack_len)
@@ -357,7 +357,7 @@ ts570_get_level (RIG * rig, vfo_t vfo, setting_t level, value_t * val)
 
     case RIG_LEVEL_MICGAIN:
       /* reads from 0..100 */
-      retval = kenwood_transaction (rig, "MG;", 3, ackbuf, &ack_len);
+      retval = kenwood_transaction (rig, "MG", 2, ackbuf, &ack_len);
       if (RIG_OK != retval)
         return retval;
       if (6 != ack_len)
@@ -368,7 +368,7 @@ ts570_get_level (RIG * rig, vfo_t vfo, setting_t level, value_t * val)
       return RIG_OK;
 
     case RIG_LEVEL_PREAMP:
-	retval = kenwood_transaction (rig, "PA;", 3, ackbuf, &ack_len);
+	retval = kenwood_transaction (rig, "PA", 2, ackbuf, &ack_len);
 	if (retval != RIG_OK)
 	    return retval;
 
@@ -412,12 +412,12 @@ int ts570_get_split_vfo(RIG * rig, vfo_t vfo, split_t * split, vfo_t * tx_vfo)
 	size_t ack2len = 10;
 	int retval;
 
-	retval = kenwood_transaction(rig, "FR;", 3, ack, &acklen);
+	retval = kenwood_transaction(rig, "FR", 2, ack, &acklen);
 	if (retval != RIG_OK)  
 		return retval;
 
 
-	retval = kenwood_transaction(rig, "FT;", 3, ack2, &ack2len);
+	retval = kenwood_transaction(rig, "FT", 2, ack2, &ack2len);
 	if (retval != RIG_OK)  
 		return retval;
 
@@ -490,7 +490,7 @@ int ts570_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t txvfo)
 	  		/* switch to current RX VFO */
 			/* first ask for it */
 			ack_len = 10;
-			retval = kenwood_transaction(rig, "FR;", 3, ackbuf, &ack_len);
+			retval = kenwood_transaction(rig, "FR", 2, ackbuf, &ack_len);
 			if (retval != RIG_OK)  
 				return retval;
 			/* and then set it to both vfo's */
@@ -548,14 +548,14 @@ int ts570_set_channel (RIG * rig, const channel_t * chan)
 			tone=0;
 		}
 
-                cmd_len = sprintf(cmdbuf, "MW0 %02d%011d%c0%c%02d ;",
+                cmd_len = sprintf(cmdbuf, "MW0 %02d%011d%c0%c%02d ",
 		 num,freq,mode,tones,tone);
                 mem_len = 0;
                 retval = kenwood_transaction (rig, cmdbuf, cmd_len, membuf, &mem_len);
                 if (retval != RIG_OK)
                                 return retval;
 
-                cmd_len = sprintf(cmdbuf, "MW1 %02d%011d%c0%c%02d ;",
+                cmd_len = sprintf(cmdbuf, "MW1 %02d%011d%c0%c%02d ",
 		 num,tx_freq,tx_mode,tones,tone);
                 mem_len = 0;
                 retval = kenwood_transaction (rig, cmdbuf, cmd_len, membuf, &mem_len);
@@ -572,7 +572,7 @@ int ts570_get_xit(RIG *rig, vfo_t vfo, shortfreq_t * rit)
 	size_t info_len;
 
 	info_len = 50;
-	retval = kenwood_transaction (rig, "IF;", 3, infobuf, &info_len);
+	retval = kenwood_transaction (rig, "IF", 2, infobuf, &info_len);
 	if (retval != RIG_OK)
 		return retval;
 
@@ -600,19 +600,19 @@ int ts570_set_rit(RIG * rig, vfo_t vfo, shortfreq_t rit)
 
         info_len = 0;
         if (rit == 0) {
-        	kenwood_transaction(rig, "RT0;", 4, infobuf, &info_len);
+        	kenwood_transaction(rig, "RT0", 3, infobuf, &info_len);
 		return RIG_OK;
 	} else
-        	kenwood_transaction(rig, "RT1;", 4, infobuf, &info_len);
+        	kenwood_transaction(rig, "RT1", 3, infobuf, &info_len);
 
         if (rit > 0)
                 c = 'U';
         else
                 c = 'D';
-        len = sprintf(buf, "R%c;", c);
+        len = sprintf(buf, "R%c", c);
 
         info_len = 0;
-        retval = kenwood_transaction(rig, "RC;", 3, infobuf, &info_len);
+        retval = kenwood_transaction(rig, "RC", 2, infobuf, &info_len);
         for (i = 0; i < abs(rint(rit/10)); i++)
         {
                 info_len = 0;
@@ -631,19 +631,19 @@ int ts570_set_xit(RIG * rig, vfo_t vfo, shortfreq_t rit)
 
         info_len = 0;
         if (rit == 0) {
-        	kenwood_transaction(rig, "XT0;", 4, infobuf, &info_len);
+        	kenwood_transaction(rig, "XT0", 3, infobuf, &info_len);
 		return RIG_OK;
 	} else
-        	kenwood_transaction(rig, "XT1;", 4, infobuf, &info_len);
+        	kenwood_transaction(rig, "XT1", 3, infobuf, &info_len);
 
         if (rit > 0)
                 c = 'U';
         else
                 c = 'D';
-        len = sprintf(buf, "R%c;", c);
+        len = sprintf(buf, "R%c", c);
 
         info_len = 0;
-        retval = kenwood_transaction(rig, "RC;", 3, infobuf, &info_len);
+        retval = kenwood_transaction(rig, "RC", 2, infobuf, &info_len);
         for (i = 0; i < abs(rint(rit/10)); i++)
         {
                 info_len = 0;
diff --git a/kenwood/ts680.c b/kenwood/ts680.c
index 60c5d01c4..9bca95249 100644
--- a/kenwood/ts680.c
+++ b/kenwood/ts680.c
@@ -2,7 +2,7 @@
  *  Hamlib Kenwood backend - TS680 description
  *  Copyright (c) 2000-2008 by Stephane Fillod
  *
- *	$Id: ts680.c,v 1.10 2009-01-28 23:30:58 azummo Exp $
+ *	$Id: ts680.c,v 1.11 2009-02-03 22:13:55 azummo Exp $
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
@@ -68,7 +68,7 @@ static int ts680_set_vfo(RIG *rig, vfo_t vfo)
                         return -RIG_EINVAL;
                 }
 
-                cmd_len = sprintf(cmdbuf, "FN%c;", vfo_function); /* The 680 and 140 need this to set the VFO on the radio */
+                cmd_len = sprintf(cmdbuf, "FN%c", vfo_function); /* The 680 and 140 need this to set the VFO on the radio */
                 ack_len = 0;
                 retval = kenwood_transaction (rig, cmdbuf, cmd_len, ackbuf, &ack_len);
                 if (retval != RIG_OK)
diff --git a/kenwood/ts850.c b/kenwood/ts850.c
index f5f9f034a..8113db107 100644
--- a/kenwood/ts850.c
+++ b/kenwood/ts850.c
@@ -2,7 +2,7 @@
 *  Hamlib Kenwood backend - TS850 description
 *  Copyright (c) 2000-2004 by Stephane Fillod
 *
-*	$Id: ts850.c,v 1.28 2009-02-02 20:30:36 azummo Exp $
+*	$Id: ts850.c,v 1.29 2009-02-03 22:13:55 azummo Exp $
 *
 *   This library is free software; you can redistribute it and/or modify
 *   it under the terms of the GNU Library General Public License as
@@ -237,18 +237,18 @@ int ts850_set_rit(RIG * rig, vfo_t vfo, shortfreq_t rit)
 	
 	info_len = 0;
 	if (rit == 0)
-		kenwood_transaction(rig, "RT0;", 4, infobuf, &info_len);
+		kenwood_transaction(rig, "RT0", 3, infobuf, &info_len);
 	else
-		kenwood_transaction(rig, "RT1;", 4, infobuf, &info_len);
+		kenwood_transaction(rig, "RT1", 3, infobuf, &info_len);
 	
 	if (rit > 0)
 		c = 'U';
 	else
 		c = 'D';
-	len = sprintf(buf, "R%c;", c);
+	len = sprintf(buf, "R%c", c);
 	
 	info_len = 0;
-	retval = kenwood_transaction(rig, "RC;", 3, infobuf, &info_len);
+	retval = kenwood_transaction(rig, "RC", 2, infobuf, &info_len);
 	for (i = 0; i < abs(rint(rit/20)); i++)
 	{
 		info_len = 0;
@@ -267,17 +267,17 @@ int ts850_set_xit(RIG * rig, vfo_t vfo, shortfreq_t xit)
 	
 	info_len = 0;
 	if (xit == 0)
-		kenwood_transaction(rig, "XT0;", 4, infobuf, &info_len);
+		kenwood_transaction(rig, "XT0", 3, infobuf, &info_len);
 	else
-		kenwood_transaction(rig, "XT1;", 4, infobuf, &info_len);
+		kenwood_transaction(rig, "XT1", 3, infobuf, &info_len);
 	
 	info_len = 0;
-	retval = kenwood_transaction(rig, "RC;", 3, infobuf, &info_len);
+	retval = kenwood_transaction(rig, "RC", 2, infobuf, &info_len);
 	if (xit > 0)
 		c = 'U';
 	else
 		c = 'D';
-	len = sprintf(buf, "R%c;", c);
+	len = sprintf(buf, "R%c", c);
 	
 	for (i = 0; i < abs(rint(xit/20)); i++)
 	{
@@ -321,7 +321,7 @@ int ts850_set_ctcss_tone(RIG *rig, vfo_t vfo, tone_t tone)
 	if (caps->ctcss_list[i] != tone)
 		return -RIG_EINVAL;
 	
-	tone_len = sprintf(tonebuf,"TN%03d;", i+1);
+	tone_len = sprintf(tonebuf,"TN%03d", i+1);
 	
 	ack_len = 0;
 	return kenwood_transaction (rig, tonebuf, tone_len, ackbuf, &ack_len);
@@ -339,7 +339,7 @@ int ts850_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 	switch (level) {
 		case RIG_LEVEL_RAWSTR:
 		lvl_len = 50;
-		retval = kenwood_transaction (rig, "SM;", 3, lvlbuf, &lvl_len);
+		retval = kenwood_transaction (rig, "SM", 2, lvlbuf, &lvl_len);
 		if (retval != RIG_OK)
 			return retval;
 		lvlbuf[6]='\0';
@@ -348,7 +348,7 @@ int ts850_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 		
 		case RIG_LEVEL_STRENGTH:
 		lvl_len = 50;
-		retval = kenwood_transaction (rig, "SM;", 3, lvlbuf, &lvl_len);
+		retval = kenwood_transaction (rig, "SM", 2, lvlbuf, &lvl_len);
 		if (retval != RIG_OK)
 			return retval;
 		lvlbuf[6]='\0';
@@ -359,11 +359,11 @@ int ts850_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 		
 		case RIG_LEVEL_SWR:
 			lvl_len = 0;
-		retval = kenwood_transaction (rig, "RM1;", 4, lvlbuf, &lvl_len);
+		retval = kenwood_transaction (rig, "RM1", 3, lvlbuf, &lvl_len);
 		if (retval != RIG_OK)
 			return retval;
 		lvl_len = 50;
-		retval = kenwood_transaction (rig, "RM;", 3, lvlbuf, &lvl_len);
+		retval = kenwood_transaction (rig, "RM", 2, lvlbuf, &lvl_len);
 		if (retval != RIG_OK)
 			return retval;
 		lvlbuf[7]='\0';
@@ -376,11 +376,11 @@ int ts850_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 		
 		case RIG_LEVEL_COMP:
 			lvl_len = 0;
-		retval = kenwood_transaction (rig, "RM2;", 4, lvlbuf, &lvl_len);
+		retval = kenwood_transaction (rig, "RM2", 3, lvlbuf, &lvl_len);
 		if (retval != RIG_OK)
 			return retval;
 		lvl_len = 50;
-		retval = kenwood_transaction (rig, "RM;", 3, lvlbuf, &lvl_len);
+		retval = kenwood_transaction (rig, "RM", 2, lvlbuf, &lvl_len);
 		if (retval != RIG_OK)
 			return retval;
 		lvlbuf[7]='\0';
@@ -389,11 +389,11 @@ int ts850_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 		
 		case RIG_LEVEL_ALC:
 			lvl_len = 0;
-		retval = kenwood_transaction (rig, "RM3;", 4, lvlbuf, &lvl_len);
+		retval = kenwood_transaction (rig, "RM3", 3, lvlbuf, &lvl_len);
 		if (retval != RIG_OK)
 			return retval;
 		lvl_len = 50;
-		retval = kenwood_transaction (rig, "RM;", 3, lvlbuf, &lvl_len);
+		retval = kenwood_transaction (rig, "RM", 2, lvlbuf, &lvl_len);
 		if (retval != RIG_OK)
 			return retval;
 		lvlbuf[7]='\0';
@@ -402,7 +402,7 @@ int ts850_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 		
 		case RIG_LEVEL_CWPITCH:
 			lvl_len = 25;
-		retval = kenwood_transaction (rig, "PT;", 3, lvlbuf, &lvl_len);
+		retval = kenwood_transaction (rig, "PT", 2, lvlbuf, &lvl_len);
 		if (retval != RIG_OK)
 			return retval;
 		lvlbuf[4]='\0';
@@ -449,14 +449,14 @@ int ts850_set_channel (RIG * rig, const channel_t * chan)
 		tone=0;
 	}
 	
-	cmd_len = sprintf(cmdbuf, "MW0 %02d%011d%c0%c%02d ;",
+	cmd_len = sprintf(cmdbuf, "MW0 %02d%011d%c0%c%02d ",
 					  num,freq,mode,tones,tone);
 	mem_len = 0;
 	retval = kenwood_transaction (rig, cmdbuf, cmd_len, membuf, &mem_len);
 	if (retval != RIG_OK)
 		return retval;
 	
-	cmd_len = sprintf(cmdbuf, "MW1 %02d%011d%c0%c%02d ;",
+	cmd_len = sprintf(cmdbuf, "MW1 %02d%011d%c0%c%02d ",
 					  num,tx_freq,tx_mode,tones,tone);
 	mem_len = 0;
 	retval = kenwood_transaction (rig, cmdbuf, cmd_len, membuf, &mem_len);
diff --git a/kenwood/ts870s.c b/kenwood/ts870s.c
index a52cce473..c84efe852 100644
--- a/kenwood/ts870s.c
+++ b/kenwood/ts870s.c
@@ -2,7 +2,7 @@
  *  Hamlib Kenwood backend - TS870S description
  *  Copyright (c) 2000-2008 by Stephane Fillod
  *
- *	$Id: ts870s.c,v 1.51 2009-01-28 23:30:59 azummo Exp $
+ *	$Id: ts870s.c,v 1.52 2009-02-03 22:13:55 azummo Exp $
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
@@ -69,7 +69,7 @@ static int ts870s_get_vfo(RIG *rig, vfo_t *vfo)
 
 		/* query RX VFO */
 		vfo_len = 50;
-		retval = kenwood_transaction (rig, "FR;", 3, vfobuf, &vfo_len);
+		retval = kenwood_transaction (rig, "FR", 2, vfobuf, &vfo_len);
 		if (retval != RIG_OK)
 			return retval;
 
@@ -99,7 +99,7 @@ static int ts870s_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
   int retval;
 
   buf_len = 50;
-  retval = kenwood_transaction (rig, "MD;", 3, buf, &buf_len);
+  retval = kenwood_transaction (rig, "MD", 2, buf, &buf_len);
   if (retval != RIG_OK)
     return retval;
 
@@ -128,7 +128,7 @@ static int ts870s_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
   }
 
   buf_len = 50;
-  retval = kenwood_transaction (rig, "FW;", 3, buf, &buf_len);
+  retval = kenwood_transaction (rig, "FW", 2, buf, &buf_len);
   if (retval != RIG_OK)
     return retval;
 
@@ -166,7 +166,7 @@ static int ts870s_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
       return -RIG_EINVAL;
   }
 
-  buf_len = sprintf(buf, "MD%c;", kmode);
+  buf_len = sprintf(buf, "MD%c", kmode);
   ack_len = 0;
   retval = kenwood_transaction (rig, buf, buf_len, ackbuf, &ack_len);
   if (retval != RIG_OK) return retval;
@@ -175,7 +175,7 @@ static int ts870s_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
  * This rig will simply use an IF bandpass which is closest to width, 
  * so we don't need to check the value...
  */
-  buf_len = sprintf(buf, "FW%04d;", (int)width/10);
+  buf_len = sprintf(buf, "FW%04d", (int)width/10);
   ack_len = 0;
   retval = kenwood_transaction (rig, buf, buf_len, ackbuf, &ack_len);
   if (retval != RIG_OK) return retval;
@@ -194,7 +194,7 @@ int ts870s_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
 	switch (level) {
 	case RIG_LEVEL_RFPOWER:
 		intval = val.f * 100;
-		level_len = sprintf(levelbuf, "PC%03d;", intval);
+		level_len = sprintf(levelbuf, "PC%03d", intval);
 		return kenwood_transaction (rig, levelbuf, level_len, ackbuf, &ack_len);
 		break;
 
@@ -214,7 +214,7 @@ static int ts870s_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 		lvl_len = 50;
 		switch (level) {
 		case RIG_LEVEL_STRENGTH:
-			retval = kenwood_transaction (rig, "SM;", 3, lvlbuf, &lvl_len);
+			retval = kenwood_transaction (rig, "SM", 2, lvlbuf, &lvl_len);
 			if (retval != RIG_OK)
 				return retval;
 
@@ -231,18 +231,18 @@ static int ts870s_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 
 		case RIG_LEVEL_SWR:
 			lvl_len = 50;
-			retval = kenwood_transaction (rig, "RM;", 3, lvlbuf, &lvl_len);
+			retval = kenwood_transaction (rig, "RM", 2, lvlbuf, &lvl_len);
 			if (retval != RIG_OK)
 				return retval;
 			/* set meter to SWR if needed */
 			if (lvlbuf[2] != '1')
 			{
 				lvl_len = 0;
-				retval = kenwood_transaction (rig, "RM1;", 4, lvlbuf, &lvl_len);
+				retval = kenwood_transaction (rig, "RM1", 3, lvlbuf, &lvl_len);
 				if (retval != RIG_OK)
 					return retval;
 				lvl_len = 50;
-				retval = kenwood_transaction (rig, "RM;", 3, lvlbuf, &lvl_len);
+				retval = kenwood_transaction (rig, "RM", 2, lvlbuf, &lvl_len);
 				if (retval != RIG_OK)
 					return retval;
 			}
@@ -257,18 +257,18 @@ static int ts870s_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 
 		case RIG_LEVEL_COMP:
 			lvl_len = 50;
-			retval = kenwood_transaction (rig, "RM;", 3, lvlbuf, &lvl_len);
+			retval = kenwood_transaction (rig, "RM", 2, lvlbuf, &lvl_len);
 			if (retval != RIG_OK)
 				return retval;
 			/* set meter to COMP if needed */
 			if (lvlbuf[2] != '2')
 			{
 				lvl_len = 0;
-				retval = kenwood_transaction (rig, "RM2;", 4, lvlbuf, &lvl_len);
+				retval = kenwood_transaction (rig, "RM2", 3, lvlbuf, &lvl_len);
 				if (retval != RIG_OK)
 					return retval;
 				lvl_len = 50;
-				retval = kenwood_transaction (rig, "RM;", 4, lvlbuf, &lvl_len);
+				retval = kenwood_transaction (rig, "RM", 3, lvlbuf, &lvl_len);
 				if (retval != RIG_OK)
 					return retval;
 			}
@@ -279,18 +279,18 @@ static int ts870s_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 
 		case RIG_LEVEL_ALC:
 			lvl_len = 50;
-			retval = kenwood_transaction (rig, "RM;", 3, lvlbuf, &lvl_len);
+			retval = kenwood_transaction (rig, "RM", 2, lvlbuf, &lvl_len);
 			if (retval != RIG_OK)
 				return retval;
 			/* set meter to ALC if needed */
 			if (lvlbuf[2] != '3')
 			{
 				lvl_len = 0;
-				retval = kenwood_transaction (rig, "RM3;", 4, lvlbuf, &lvl_len);
+				retval = kenwood_transaction (rig, "RM3", 3, lvlbuf, &lvl_len);
 				if (retval != RIG_OK)
 					return retval;
 				lvl_len = 50;
-				retval = kenwood_transaction (rig, "RM;", 4, lvlbuf, &lvl_len);
+				retval = kenwood_transaction (rig, "RM", 2, lvlbuf, &lvl_len);
 				if (retval != RIG_OK)
 					return retval;
 			}
@@ -300,7 +300,7 @@ static int ts870s_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 			break;
 
 		case RIG_LEVEL_ATT:
-			retval = kenwood_transaction (rig, "RA;", 3, lvlbuf, &lvl_len);
+			retval = kenwood_transaction (rig, "RA", 2, lvlbuf, &lvl_len);
 			if (retval != RIG_OK)
 				return retval;
 
@@ -327,7 +327,7 @@ static int ts870s_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 			break;
 		case RIG_LEVEL_RFPOWER:
 			/* RFPOWER is 0..100 and not 0..255 like all the other levels*/
-			retval = kenwood_transaction (rig, "PC;", 3, lvlbuf, &lvl_len);
+			retval = kenwood_transaction (rig, "PC", 2, lvlbuf, &lvl_len);
 			if (retval != RIG_OK)
 				return retval;
 			if (lvl_len != 6 || lvlbuf[1] != 'C')
@@ -342,19 +342,19 @@ static int ts870s_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 			
 
 		case RIG_LEVEL_AF:
-			return get_kenwood_level(rig, "AG;", 3, &val->f);
+			return get_kenwood_level(rig, "AG", 2, &val->f);
 
 		case RIG_LEVEL_RF:
-			return get_kenwood_level(rig, "RG;", 3, &val->f);
+			return get_kenwood_level(rig, "RG", 2, &val->f);
 
 		case RIG_LEVEL_SQL:
-			return get_kenwood_level(rig, "SQ;", 3, &val->f);
+			return get_kenwood_level(rig, "SQ", 2, &val->f);
 
 		case RIG_LEVEL_MICGAIN:
-			return get_kenwood_level(rig, "MG;", 3, &val->f);
+			return get_kenwood_level(rig, "MG", 2, &val->f);
 
 		case RIG_LEVEL_AGC:
-			ret = get_kenwood_level(rig, "GT;", 3, &val->f);
+			ret = get_kenwood_level(rig, "GT", 2, &val->f);
 			agclevel = 255 * val->f;
 			if (agclevel == 0) val->i = 0;
 			else if (agclevel < 85) val->i = 1;