Menu
▾
▴
[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-773-gbcebc8488
|
From: openocd-gerrit <ope...@us...> - 2024-11-09 21:05:55
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".
The branch, master has been updated
via bcebc84882116c5c08c9243297a925262b1c3f0f (commit)
from 40d58ce5290a51c58615c4f95912b69fa7975aea (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit bcebc84882116c5c08c9243297a925262b1c3f0f
Author: Mark Zhuang <mar...@sp...>
Date: Sat Oct 26 10:30:18 2024 +0800
contrib: convert 'unsigned' to 'unsigned int'
Conversion done with
checkpatch --fix-inplace -types UNSPECIFIED_INT
Change-Id: I0e31f87d437fcf3503736474f10a63f9c6be242b
Signed-off-by: Mark Zhuang <mar...@sp...>
Reviewed-on: https://review.openocd.org/c/openocd/+/8368
Reviewed-by: Antonio Borneo <bor...@gm...>
Tested-by: jenkins
diff --git a/contrib/itmdump.c b/contrib/itmdump.c
index e7523d9bc..7c93a3963 100644
--- a/contrib/itmdump.c
+++ b/contrib/itmdump.c
@@ -43,9 +43,9 @@ unsigned int dump_swit;
* NOTE that this specific encoding could be space-optimized; and that
* trace data streams could also be history-sensitive.
*/
-static void show_task(int port, unsigned data)
+static void show_task(int port, unsigned int data)
{
- unsigned code = data >> 16;
+ unsigned int code = data >> 16;
char buf[16];
if (dump_swit)
@@ -77,7 +77,7 @@ static void show_task(int port, unsigned data)
static void show_reserved(FILE *f, char *label, int c)
{
- unsigned i;
+ unsigned int i;
if (dump_swit)
return;
@@ -96,9 +96,9 @@ static void show_reserved(FILE *f, char *label, int c)
printf("\n");
}
-static bool read_varlen(FILE *f, int c, unsigned *value)
+static bool read_varlen(FILE *f, int c, unsigned int *value)
{
- unsigned size;
+ unsigned int size;
unsigned char buf[4];
*value = 0;
@@ -135,8 +135,8 @@ err:
static void show_hard(FILE *f, int c)
{
- unsigned type = c >> 3;
- unsigned value;
+ unsigned int type = c >> 3;
+ unsigned int value;
char *label;
if (dump_swit)
@@ -230,16 +230,16 @@ static void show_hard(FILE *f, int c)
*/
struct {
int port;
- void (*show)(int port, unsigned data);
+ void (*show)(int port, unsigned int data);
} format[] = {
{ .port = 31, .show = show_task, },
};
static void show_swit(FILE *f, int c)
{
- unsigned port = c >> 3;
- unsigned value = 0;
- unsigned i;
+ unsigned int port = c >> 3;
+ unsigned int value = 0;
+ unsigned int i;
if (port + 1 == dump_swit) {
if (!read_varlen(f, c, &value))
@@ -272,7 +272,7 @@ static void show_swit(FILE *f, int c)
static void show_timestamp(FILE *f, int c)
{
- unsigned counter = 0;
+ unsigned int counter = 0;
char *label = "";
bool delayed = false;
diff --git a/contrib/loaders/flash/fespi/riscv_fespi.c b/contrib/loaders/flash/fespi/riscv_fespi.c
index 17ae2fd22..08fb09477 100644
--- a/contrib/loaders/flash/fespi/riscv_fespi.c
+++ b/contrib/loaders/flash/fespi/riscv_fespi.c
@@ -103,7 +103,7 @@ static void fespi_disable_hw_mode(volatile uint32_t *ctrl_base);
static void fespi_enable_hw_mode(volatile uint32_t *ctrl_base);
static int fespi_wip(volatile uint32_t *ctrl_base);
static int fespi_write_buffer(volatile uint32_t *ctrl_base,
- const uint8_t *buffer, unsigned offset, unsigned len,
+ const uint8_t *buffer, unsigned int offset, unsigned int len,
uint32_t flash_info);
/* Can set bits 3:0 in result. */
@@ -113,7 +113,7 @@ static int fespi_write_buffer(volatile uint32_t *ctrl_base,
* after pprog_cmd
*/
int flash_fespi(volatile uint32_t *ctrl_base, uint32_t page_size,
- const uint8_t *buffer, unsigned offset, uint32_t count,
+ const uint8_t *buffer, unsigned int offset, uint32_t count,
uint32_t flash_info)
{
int result;
@@ -163,12 +163,12 @@ err:
return result;
}
-static uint32_t fespi_read_reg(volatile uint32_t *ctrl_base, unsigned address)
+static uint32_t fespi_read_reg(volatile uint32_t *ctrl_base, unsigned int address)
{
return ctrl_base[address / 4];
}
-static void fespi_write_reg(volatile uint32_t *ctrl_base, unsigned address, uint32_t value)
+static void fespi_write_reg(volatile uint32_t *ctrl_base, unsigned int address, uint32_t value)
{
ctrl_base[address / 4] = value;
}
@@ -188,7 +188,7 @@ static void fespi_enable_hw_mode(volatile uint32_t *ctrl_base)
/* Can set bits 7:4 in result. */
static int fespi_txwm_wait(volatile uint32_t *ctrl_base)
{
- unsigned timeout = TIMEOUT;
+ unsigned int timeout = TIMEOUT;
while (timeout--) {
uint32_t ip = fespi_read_reg(ctrl_base, FESPI_REG_IP);
@@ -209,7 +209,7 @@ static void fespi_set_dir(volatile uint32_t *ctrl_base, bool dir)
/* Can set bits 11:8 in result. */
static int fespi_tx(volatile uint32_t *ctrl_base, uint8_t in)
{
- unsigned timeout = TIMEOUT;
+ unsigned int timeout = TIMEOUT;
while (timeout--) {
uint32_t txfifo = fespi_read_reg(ctrl_base, FESPI_REG_TXFIFO);
@@ -224,7 +224,7 @@ static int fespi_tx(volatile uint32_t *ctrl_base, uint8_t in)
/* Can set bits 15:12 in result. */
static int fespi_rx(volatile uint32_t *ctrl_base, uint8_t *out)
{
- unsigned timeout = TIMEOUT;
+ unsigned int timeout = TIMEOUT;
while (timeout--) {
uint32_t value = fespi_read_reg(ctrl_base, FESPI_REG_RXFIFO);
@@ -252,7 +252,7 @@ static int fespi_wip(volatile uint32_t *ctrl_base)
if (result != ERROR_OK)
return result | ERROR_STACK(0x20000);
- unsigned timeout = TIMEOUT;
+ unsigned int timeout = TIMEOUT;
while (timeout--) {
result = fespi_tx(ctrl_base, 0);
if (result != ERROR_OK)
@@ -273,7 +273,7 @@ static int fespi_wip(volatile uint32_t *ctrl_base)
/* Can set bits 23:20 in result. */
static int fespi_write_buffer(volatile uint32_t *ctrl_base,
- const uint8_t *buffer, unsigned offset, unsigned len,
+ const uint8_t *buffer, unsigned int offset, unsigned int len,
uint32_t flash_info)
{
int result = fespi_tx(ctrl_base, SPIFLASH_WRITE_ENABLE);
@@ -304,7 +304,7 @@ static int fespi_write_buffer(volatile uint32_t *ctrl_base,
if (result != ERROR_OK)
return result | ERROR_STACK(0x600000);
- for (unsigned i = 0; i < len; i++) {
+ for (unsigned int i = 0; i < len; i++) {
result = fespi_tx(ctrl_base, buffer[i]);
if (result != ERROR_OK)
return result | ERROR_STACK(0x700000);
-----------------------------------------------------------------------
Summary of changes:
contrib/itmdump.c | 24 ++++++++++++------------
contrib/loaders/flash/fespi/riscv_fespi.c | 20 ++++++++++----------
2 files changed, 22 insertions(+), 22 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|
