--- a/autocal/txchkmain.c	Sat May 27 16:03:40 2017 +0000
+++ b/autocal/txchkmain.c	Sat May 27 19:44:08 2017 +0000
@@ -55,17 +55,6 @@
 	return(0);
 }
 
-prepare_rf_test_system()
-{
-	char cmd[80];
-
-	printf("Preparing RF test system for %s MHz Tx calibration\n",
-		selected_band->name);
-	sprintf(cmd, "txpwr-cal-setup %s %u\n", selected_band->name, arfcn);
-	tsid_command(cmd);
-	return(0);
-}
-
 main(argc, argv)
 	char **argv;
 {
@@ -77,7 +66,9 @@
 	connect_rvinterf_socket();
 	connect_tsid_socket();
 	setlinebuf(stdout);	/* to allow logging with tee */
-	prepare_rf_test_system();
+	printf("Preparing RF test system for %s MHz Tx calibration\n",
+		selected_band->name);
+	do_txpwr_cal_setup(selected_band->name, arfcn);
 
 	printf("Putting the DUT into Test Mode\n");
 	do_tms(1);