From f6f891034fd00a06237aa2c5a0bd3635a9a33b85 Mon Sep 17 00:00:00 2001
From: Dominik Loidolt <dominik.loidolt@univie.ac.at>
Date: Mon, 15 Jan 2024 17:08:20 +0100
Subject: [PATCH] Small bug fixing
---
lib/decompress/cmp_max_used_bits_list.h | 4 ++--
lib/rdcu_compress/cmp_rdcu.c | 6 +++---
lib/rdcu_compress/rdcu_rmap.c | 2 +-
programs/rdcu_pkt_to_file.c | 4 ++--
test/cmp_max_used_bits/test_cmp_max_used_bits_list.c | 2 +-
test/decmp/test_decmp.c | 2 +-
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/lib/decompress/cmp_max_used_bits_list.h b/lib/decompress/cmp_max_used_bits_list.h
index 35506c2..317c716 100644
--- a/lib/decompress/cmp_max_used_bits_list.h
+++ b/lib/decompress/cmp_max_used_bits_list.h
@@ -28,11 +28,11 @@
#include "../common/cmp_data_types.h"
-struct cmp_max_used_bits *cmp_max_used_bits_list_get(uint8_t version);
+const struct cmp_max_used_bits *cmp_max_used_bits_list_get(uint8_t version);
int cmp_max_used_bits_list_add(struct cmp_max_used_bits const *item);
-int cmp_max_used_bits_list_delet(uint8_t version);
+void cmp_max_used_bits_list_delet(uint8_t version);
void cmp_max_used_bits_list_empty(void);
diff --git a/lib/rdcu_compress/cmp_rdcu.c b/lib/rdcu_compress/cmp_rdcu.c
index 6354ee5..e804995 100644
--- a/lib/rdcu_compress/cmp_rdcu.c
+++ b/lib/rdcu_compress/cmp_rdcu.c
@@ -513,7 +513,7 @@ int rdcu_inject_edac_error(const struct cmp_cfg *cfg, uint32_t addr)
return -1;
/* disable edac */
- for (sub_chip_die_addr = 1; sub_chip_die_addr <= 4; sub_chip_die_addr ++) {
+ for (sub_chip_die_addr = 1; sub_chip_die_addr <= 4; sub_chip_die_addr++) {
rdcu_edac_set_sub_chip_die_addr(sub_chip_die_addr);
rdcu_edac_set_ctrl_reg_write_op();
rdcu_edac_set_bypass();
@@ -542,7 +542,7 @@ int rdcu_inject_edac_error(const struct cmp_cfg *cfg, uint32_t addr)
/* It looks like there is a bug when displaying the bypass status of the 2. and 4. SRAM chip. */
if (2 != sub_chip_die_addr && 4 != sub_chip_die_addr)
#endif
- if (0 == rdcu_edac_get_bypass_status()) {
+ if (rdcu_edac_get_bypass_status() == 0) {
printf("Error: bypass status unexpected !\n");
return -1;
}
@@ -570,7 +570,7 @@ int rdcu_inject_edac_error(const struct cmp_cfg *cfg, uint32_t addr)
/* enable edac again */
- for (sub_chip_die_addr = 1; sub_chip_die_addr <= 4; sub_chip_die_addr ++) {
+ for (sub_chip_die_addr = 1; sub_chip_die_addr <= 4; sub_chip_die_addr++) {
if (rdcu_edac_set_sub_chip_die_addr(sub_chip_die_addr))
return -1;
rdcu_edac_set_ctrl_reg_write_op();
diff --git a/lib/rdcu_compress/rdcu_rmap.c b/lib/rdcu_compress/rdcu_rmap.c
index 3972147..5eee776 100644
--- a/lib/rdcu_compress/rdcu_rmap.c
+++ b/lib/rdcu_compress/rdcu_rmap.c
@@ -296,7 +296,7 @@ static int rdcu_process_rx(void)
{
uint32_t i, tmp;
- for (i = 0; i < rp->data_len; i+=sizeof(tmp)) {
+ for (i = 0; i < rp->data_len; i += sizeof(tmp)) {
memcpy(&tmp, &rp->data[i], sizeof(tmp));
be32_to_cpus(&tmp);
memcpy(&rp->data[i], &tmp, sizeof(tmp));
diff --git a/programs/rdcu_pkt_to_file.c b/programs/rdcu_pkt_to_file.c
index 8858d46..28df657 100644
--- a/programs/rdcu_pkt_to_file.c
+++ b/programs/rdcu_pkt_to_file.c
@@ -71,7 +71,7 @@ void set_tc_folder_dir(const char *dir_name)
* @see https://developers.redhat.com/blog/2018/05/24/detecting-string-truncation-with-gcc-8/
*/
-static FILE *open_file(const char *dir_name, int n_tc)
+static FILE *open_file_tc(const char *dir_name, int n_tc)
{
char *pathname;
FILE *fp;
@@ -162,7 +162,7 @@ static int32_t rmap_tx_to_file(const void *hdr, uint32_t hdr_size,
return -1;
}
- fp = open_file(tc_folder_dir, n_pkt);
+ fp = open_file_tc(tc_folder_dir, n_pkt);
if (fp == NULL) {
perror("fopen()");
diff --git a/test/cmp_max_used_bits/test_cmp_max_used_bits_list.c b/test/cmp_max_used_bits/test_cmp_max_used_bits_list.c
index 1ffd4e4..2557d82 100644
--- a/test/cmp_max_used_bits/test_cmp_max_used_bits_list.c
+++ b/test/cmp_max_used_bits/test_cmp_max_used_bits_list.c
@@ -63,7 +63,7 @@ void* malloc(size_t size)
void test_cmp_max_used_bits_list(void)
{
struct cmp_max_used_bits i_32, i_34, i_35, i_36, i_255, i_0;
- struct cmp_max_used_bits *p;
+ const struct cmp_max_used_bits *p;
int return_val;
/* set up max_used_bits item */
diff --git a/test/decmp/test_decmp.c b/test/decmp/test_decmp.c
index cc5f071..d7fccaa 100644
--- a/test/decmp/test_decmp.c
+++ b/test/decmp/test_decmp.c
@@ -1043,7 +1043,7 @@ void test_decompress_imagette_model(void)
uint16_t data[5] = {0};
uint16_t model[5] = {0, 1, 2, 3, 4};
uint16_t up_model[5] = {0};
- uint32_t cmp_data[] = {0};
+ uint32_t cmp_data[2] = {0};
struct cmp_cfg cfg = {0};
struct bit_decoder dec;
int err;
--
GitLab