X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Ftarget%2Favrt.c;h=a4ce46b78a2c911070491f2af011096e97b59ebf;hb=1255b18fc650193094666ba8afd2018089cc9794;hp=3861199e5144c6fbc7393cb458e16d648e984ae0;hpb=decd417064b63c8eda69ad523a63fefd22036d16;p=openocd.git

diff --git a/src/target/avrt.c b/src/target/avrt.c
index 3861199e51..a4ce46b78a 100644
--- a/src/target/avrt.c
+++ b/src/target/avrt.c
@@ -15,8 +15,9 @@
  *   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.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -25,7 +26,6 @@
 #include "target.h"
 #include "target_type.h"
 
-
 #define AVR_JTAG_INS_LEN	4
 
 /* forward declarations */
@@ -35,39 +35,32 @@ static int avr_init_target(struct command_context *cmd_ctx, struct target *targe
 static int avr_arch_state(struct target *target);
 static int avr_poll(struct target *target);
 static int avr_halt(struct target *target);
-static int avr_resume(struct target *target, int current, uint32_t address, int handle_breakpoints, int debug_execution);
-static int avr_step(struct target *target, int current, uint32_t address, int handle_breakpoints);
+static int avr_resume(struct target *target, int current, uint32_t address,
+		int handle_breakpoints, int debug_execution);
+static int avr_step(struct target *target, int current, uint32_t address,
+		int handle_breakpoints);
 
 static int avr_assert_reset(struct target *target);
 static int avr_deassert_reset(struct target *target);
-static int avr_soft_reset_halt(struct target *target);
 
 /* IR and DR functions */
 static int mcu_write_ir(struct jtag_tap *tap, uint8_t *ir_in, uint8_t *ir_out, int ir_len, int rti);
 static int mcu_write_dr(struct jtag_tap *tap, uint8_t *dr_in, uint8_t *dr_out, int dr_len, int rti);
 static int mcu_write_ir_u8(struct jtag_tap *tap, uint8_t *ir_in, uint8_t ir_out, int ir_len, int rti);
-int mcu_write_dr_u8(struct jtag_tap *tap, uint8_t *ir_in, uint8_t ir_out, int dr_len, int rti);
-int mcu_write_ir_u16(struct jtag_tap *tap, uint16_t *ir_in, uint16_t ir_out, int ir_len, int rti);
-int mcu_write_dr_u16(struct jtag_tap *tap, uint16_t *ir_in, uint16_t ir_out, int dr_len, int rti);
-int mcu_write_ir_u32(struct jtag_tap *tap, uint32_t *ir_in, uint32_t ir_out, int ir_len, int rti);
 static int mcu_write_dr_u32(struct jtag_tap *tap, uint32_t *ir_in, uint32_t ir_out, int dr_len, int rti);
 
-struct target_type avr_target =
-{
+struct target_type avr_target = {
 	.name = "avr",
 
 	.poll = avr_poll,
 	.arch_state = avr_arch_state,
 
-	.target_request_data = NULL,
-
 	.halt = avr_halt,
 	.resume = avr_resume,
 	.step = avr_step,
 
 	.assert_reset = avr_assert_reset,
 	.deassert_reset = avr_deassert_reset,
-	.soft_reset_halt = avr_soft_reset_halt,
 /*
 	.get_gdb_reg_list = avr_get_gdb_reg_list,
 
@@ -100,43 +93,41 @@ static int avr_target_create(struct target *target, Jim_Interp *interp)
 
 static int avr_init_target(struct command_context *cmd_ctx, struct target *target)
 {
-	LOG_DEBUG("%s", __FUNCTION__);
+	LOG_DEBUG("%s", __func__);
 	return ERROR_OK;
 }
 
 static int avr_arch_state(struct target *target)
 {
-	LOG_DEBUG("%s", __FUNCTION__);
+	LOG_DEBUG("%s", __func__);
 	return ERROR_OK;
 }
 
 static int avr_poll(struct target *target)
 {
 	if ((target->state == TARGET_RUNNING) || (target->state == TARGET_DEBUG_RUNNING))
-	{
 		target->state = TARGET_HALTED;
-	}
 
-	LOG_DEBUG("%s", __FUNCTION__);
+	LOG_DEBUG("%s", __func__);
 	return ERROR_OK;
 }
 
 static int avr_halt(struct target *target)
 {
-	LOG_DEBUG("%s", __FUNCTION__);
+	LOG_DEBUG("%s", __func__);
 	return ERROR_OK;
 }
 
 static int avr_resume(struct target *target, int current, uint32_t address,
 		int handle_breakpoints, int debug_execution)
 {
-	LOG_DEBUG("%s", __FUNCTION__);
+	LOG_DEBUG("%s", __func__);
 	return ERROR_OK;
 }
 
 static int avr_step(struct target *target, int current, uint32_t address, int handle_breakpoints)
 {
-	LOG_DEBUG("%s", __FUNCTION__);
+	LOG_DEBUG("%s", __func__);
 	return ERROR_OK;
 }
 
@@ -144,7 +135,7 @@ static int avr_assert_reset(struct target *target)
 {
 	target->state = TARGET_RESET;
 
-	LOG_DEBUG("%s", __FUNCTION__);
+	LOG_DEBUG("%s", __func__);
 	return ERROR_OK;
 }
 
@@ -152,13 +143,7 @@ static int avr_deassert_reset(struct target *target)
 {
 	target->state = TARGET_RUNNING;
 
-	LOG_DEBUG("%s", __FUNCTION__);
-	return ERROR_OK;
-}
-
-static int avr_soft_reset_halt(struct target *target)
-{
-	LOG_DEBUG("%s", __FUNCTION__);
+	LOG_DEBUG("%s", __func__);
 	return ERROR_OK;
 }
 
@@ -177,13 +162,11 @@ int avr_jtag_sendinstr(struct jtag_tap *tap, uint8_t *ir_in, uint8_t ir_out)
 static int mcu_write_ir(struct jtag_tap *tap, uint8_t *ir_in, uint8_t *ir_out,
 		int ir_len, int rti)
 {
-	if (NULL == tap)
-	{
+	if (NULL == tap) {
 		LOG_ERROR("invalid tap");
 		return ERROR_FAIL;
 	}
-	if (ir_len != tap->ir_length)
-	{
+	if (ir_len != tap->ir_length) {
 		LOG_ERROR("invalid ir_len");
 		return ERROR_FAIL;
 	}
@@ -198,8 +181,7 @@ static int mcu_write_ir(struct jtag_tap *tap, uint8_t *ir_in, uint8_t *ir_out,
 static int mcu_write_dr(struct jtag_tap *tap, uint8_t *dr_in, uint8_t *dr_out,
 		int dr_len, int rti)
 {
-	if (NULL == tap)
-	{
+	if (NULL == tap) {
 		LOG_ERROR("invalid tap");
 		return ERROR_FAIL;
 	}
@@ -214,8 +196,7 @@ static int mcu_write_dr(struct jtag_tap *tap, uint8_t *dr_in, uint8_t *dr_out,
 static int mcu_write_ir_u8(struct jtag_tap *tap, uint8_t *ir_in,
 		uint8_t ir_out, int ir_len, int rti)
 {
-	if (ir_len > 8)
-	{
+	if (ir_len > 8) {
 		LOG_ERROR("ir_len overflow, maxium is 8");
 		return ERROR_FAIL;
 	}
@@ -225,68 +206,15 @@ static int mcu_write_ir_u8(struct jtag_tap *tap, uint8_t *ir_in,
 	return ERROR_OK;
 }
 
-int mcu_write_dr_u8(struct jtag_tap *tap, uint8_t *dr_in, uint8_t dr_out, int dr_len, int rti)
-{
-	if (dr_len > 8)
-	{
-		LOG_ERROR("dr_len overflow, maxium is 8");
-		return ERROR_FAIL;
-	}
-
-	mcu_write_dr(tap, dr_in, &dr_out, dr_len, rti);
-
-	return ERROR_OK;
-}
-
-int mcu_write_ir_u16(struct jtag_tap *tap, uint16_t *ir_in, uint16_t ir_out, int ir_len, int rti)
-{
-	if (ir_len > 16)
-	{
-		LOG_ERROR("ir_len overflow, maxium is 16");
-		return ERROR_FAIL;
-	}
-
-	mcu_write_ir(tap, (uint8_t*)ir_in, (uint8_t*)&ir_out, ir_len, rti);
-
-	return ERROR_OK;
-}
-
-int mcu_write_dr_u16(struct jtag_tap *tap, uint16_t *dr_in, uint16_t dr_out, int dr_len, int rti)
-{
-	if (dr_len > 16)
-	{
-		LOG_ERROR("dr_len overflow, maxium is 16");
-		return ERROR_FAIL;
-	}
-
-	mcu_write_dr(tap, (uint8_t*)dr_in, (uint8_t*)&dr_out, dr_len, rti);
-
-	return ERROR_OK;
-}
-
-int mcu_write_ir_u32(struct jtag_tap *tap, uint32_t *ir_in, uint32_t ir_out, int ir_len, int rti)
-{
-	if (ir_len > 32)
-	{
-		LOG_ERROR("ir_len overflow, maxium is 32");
-		return ERROR_FAIL;
-	}
-
-	mcu_write_ir(tap, (uint8_t*)ir_in, (uint8_t*)&ir_out, ir_len, rti);
-
-	return ERROR_OK;
-}
-
 static int mcu_write_dr_u32(struct jtag_tap *tap, uint32_t *dr_in,
 		uint32_t dr_out, int dr_len, int rti)
 {
-	if (dr_len > 32)
-	{
+	if (dr_len > 32) {
 		LOG_ERROR("dr_len overflow, maxium is 32");
 		return ERROR_FAIL;
 	}
 
-	mcu_write_dr(tap, (uint8_t*)dr_in, (uint8_t*)&dr_out, dr_len, rti);
+	mcu_write_dr(tap, (uint8_t *)dr_in, (uint8_t *)&dr_out, dr_len, rti);
 
 	return ERROR_OK;
 }