From 3afdd550898e8152ff5088509fc2d5fbc1a2520c Mon Sep 17 00:00:00 2001 From: Jan Egil Ruud Date: Tue, 22 Nov 2022 13:23:57 +0100 Subject: [PATCH] Get rid of TPI magic numbers. --- src/jtag3.c | 4 ++-- src/jtag3_private.h | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/jtag3.c b/src/jtag3.c index b2809983..71eeea76 100644 --- a/src/jtag3.c +++ b/src/jtag3.c @@ -2542,7 +2542,7 @@ static int jtag3_initialize_tpi(const PROGRAMMER *pgm, const AVRPART *p) { cmdbuf[0] = XPRG_CMD_SET_PARAM; cmdbuf[1] = XPRG_PARAM_NVMCMD_ADDR; - cmdbuf[2] = 0x33; // NVMCMD address + cmdbuf[2] = TPI_NVMCMD_ADDRESS; if (jtag3_send_tpi(pgm, cmdbuf, 3) < 0) { pmsg_error("Set NVMCMD address failed\n"); @@ -2553,7 +2553,7 @@ static int jtag3_initialize_tpi(const PROGRAMMER *pgm, const AVRPART *p) { cmdbuf[0] = XPRG_CMD_SET_PARAM; cmdbuf[1] = XPRG_PARAM_NVMCSR_ADDR; - cmdbuf[2] = 0x32; // NVMCSR address + cmdbuf[2] = TPI_NVMCSR_ADDRESS; if (jtag3_send_tpi(pgm, cmdbuf, 3) < 0) { pmsg_error("Set NVMCSR address failed\n"); diff --git a/src/jtag3_private.h b/src/jtag3_private.h index a1555117..2e971729 100644 --- a/src/jtag3_private.h +++ b/src/jtag3_private.h @@ -365,6 +365,9 @@ #define XPRG_PARAM_NVMCMD_ADDR 0x03 #define XPRG_PARAM_NVMCSR_ADDR 0x04 +#define TPI_NVMCMD_ADDRESS 0x33 +#define TPI_NVMCSR_ADDRESS 0x32 + #if !defined(JTAG3_PRIVATE_EXPORTED)