This is an automated email from Gerrit.
"Tomas Vanek <van...@fbl.cz>" just uploaded a new patch set to Gerrit, which
you can find at https://review.openocd.org/c/openocd/+/7362
-- gerrit
commit a670df1bfeb851d0979cae91f8d905a9ee17c466
Author: Tomas Vanek <van...@fbl.cz>
Date: Sat Nov 19 07:11:34 2022 +0100
jtag/drivers/cmsis_dap: use unsigned types
Not all variables converted.
Signed-off-by: Tomas Vanek <van...@fbl.cz>
Change-Id: Ie9cc890769a2f53cb3a07fd457030e1b98910d44
diff --git a/src/jtag/drivers/cmsis_dap.c b/src/jtag/drivers/cmsis_dap.c
index 4f68da204c..9a12b906e6 100644
--- a/src/jtag/drivers/cmsis_dap.c
+++ b/src/jtag/drivers/cmsis_dap.c
@@ -211,13 +211,13 @@ static const char * const
info_caps_str[INFO_CAPS__NUM_CAPS] = {
struct pending_scan_result {
/** Offset in bytes in the CMD_DAP_JTAG_SEQ response buffer. */
- unsigned first;
+ unsigned int first;
/** Number of bits to read. */
- unsigned length;
+ unsigned int length;
/** Location to store the result */
uint8_t *buffer;
/** Offset in the destination buffer */
- unsigned buffer_offset;
+ unsigned int buffer_offset;
};
/* Pending requests are organized as a FIFO - circular buffer */
@@ -1352,7 +1352,7 @@ static void cmsis_dap_end_state(tap_state_t state)
}
#ifdef SPRINT_BINARY
-static void sprint_binary(char *s, const uint8_t *buf, int offset, int len)
+static void sprint_binary(char *s, const uint8_t *buf, unsigned int offset,
unsigned int len)
{
if (!len)
return;
@@ -1363,7 +1363,7 @@ static void sprint_binary(char *s, const uint8_t *buf,
int offset, int len)
buf = { 0xc0 0x18 } offset=3 len=10 should result in: 11000 11000
i=3 there means i/8 = 0 so c = 0xFF, and
*/
- for (int i = offset; i < offset + len; ++i) {
+ for (unsigned int i = offset; i < offset + len; ++i) {
uint8_t c = buf[i / 8], mask = 1 << (i % 8);
if ((i != offset) && !(i % 8))
putchar(' ');
@@ -1477,10 +1477,11 @@ static void cmsis_dap_flush(void)
* sequence=NULL means clock out zeros on TDI
* tdo_buffer=NULL means don't capture TDO
*/
-static void cmsis_dap_add_jtag_sequence(int s_len, const uint8_t *sequence,
int s_offset,
- bool tms, uint8_t *tdo_buffer, int
tdo_buffer_offset)
+static void cmsis_dap_add_jtag_sequence(unsigned int s_len, const uint8_t
*sequence,
+ unsigned int s_offset, bool tms,
+ uint8_t *tdo_buffer, unsigned int
tdo_buffer_offset)
{
- LOG_DEBUG_IO("[at %d] %d bits, tms %s, seq offset %d, tdo buf %p, tdo
offset %d",
+ LOG_DEBUG_IO("[at %d] %u bits, tms %s, seq offset %u, tdo buf %p, tdo
offset %u",
queued_seq_buf_end,
s_len, tms ? "HIGH" : "LOW", s_offset, tdo_buffer,
tdo_buffer_offset);
@@ -1489,11 +1490,11 @@ static void cmsis_dap_add_jtag_sequence(int s_len,
const uint8_t *sequence, int
if (s_len > 64) {
LOG_DEBUG_IO("START JTAG SEQ SPLIT");
- for (int offset = 0; offset < s_len; offset += 64) {
- int len = s_len - offset;
+ for (unsigned int offset = 0; offset < s_len; offset += 64) {
+ unsigned int len = s_len - offset;
if (len > 64)
len = 64;
- LOG_DEBUG_IO("Splitting long jtag sequence: %d-bit
chunk starting at offset %d", len, offset);
+ LOG_DEBUG_IO("Splitting long jtag sequence: %u-bit
chunk starting at offset %u", len, offset);
cmsis_dap_add_jtag_sequence(
len,
sequence,
@@ -1507,7 +1508,7 @@ static void cmsis_dap_add_jtag_sequence(int s_len, const
uint8_t *sequence, int
return;
}
- int cmd_len = 1 + DIV_ROUND_UP(s_len, 8);
+ unsigned int cmd_len = 1 + DIV_ROUND_UP(s_len, 8);
if (queued_seq_count >= 255 || queued_seq_buf_end + cmd_len >
QUEUED_SEQ_BUF_LEN)
/* empty out the buffer */
cmsis_dap_flush();
diff --git a/src/jtag/drivers/cmsis_dap.h b/src/jtag/drivers/cmsis_dap.h
index a12c1aa3fd..06f66a3128 100644
--- a/src/jtag/drivers/cmsis_dap.h
+++ b/src/jtag/drivers/cmsis_dap.h
@@ -28,9 +28,9 @@ struct pending_request_block {
struct cmsis_dap {
struct cmsis_dap_backend_data *bdata;
const struct cmsis_dap_backend *backend;
- uint16_t packet_size;
+ unsigned int packet_size;
+ unsigned int packet_buffer_size;
uint8_t *packet_buffer;
- uint16_t packet_buffer_size;
uint8_t *command;
uint8_t *response;
--
