Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
cmp_tool
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Dominik Loidolt
cmp_tool
Commits
5ff9b623
Commit
5ff9b623
authored
Jul 26, 2023
by
Dominik Loidolt
Browse files
Options
Downloads
Patches
Plain Diff
change mtu type from size_t to uint32_t
parent
a764e0a7
No related branches found
No related tags found
1 merge request
!26
Adapt cmp_tool to the chunk decompression
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
include/rdcu_rmap.h
+2
-2
2 additions, 2 deletions
include/rdcu_rmap.h
lib/rdcu_pkt_to_file.c
+6
-6
6 additions, 6 deletions
lib/rdcu_pkt_to_file.c
lib/rdcu_rmap.c
+3
-3
3 additions, 3 deletions
lib/rdcu_rmap.c
with
11 additions
and
11 deletions
include/rdcu_rmap.h
+
2
−
2
View file @
5ff9b623
...
@@ -49,13 +49,13 @@ int rdcu_set_destination_path(uint8_t *path, uint8_t len);
...
@@ -49,13 +49,13 @@ int rdcu_set_destination_path(uint8_t *path, uint8_t len);
int
rdcu_set_return_path
(
uint8_t
*
path
,
uint8_t
len
);
int
rdcu_set_return_path
(
uint8_t
*
path
,
uint8_t
len
);
void
rdcu_set_source_logical_address
(
uint8_t
addr
);
void
rdcu_set_source_logical_address
(
uint8_t
addr
);
void
rdcu_set_destination_key
(
uint8_t
key
);
void
rdcu_set_destination_key
(
uint8_t
key
);
size
_t
rdcu_get_data_mtu
(
void
);
uint32
_t
rdcu_get_data_mtu
(
void
);
int
rdcu_rmap_sync_status
(
void
);
int
rdcu_rmap_sync_status
(
void
);
void
rdcu_rmap_reset_log
(
void
);
void
rdcu_rmap_reset_log
(
void
);
int
rdcu_rmap_init
(
size
_t
mtu
,
int
rdcu_rmap_init
(
uint32
_t
mtu
,
int32_t
(
*
tx
)(
const
void
*
hdr
,
uint32_t
hdr_size
,
int32_t
(
*
tx
)(
const
void
*
hdr
,
uint32_t
hdr_size
,
const
uint8_t
non_crc_bytes
,
const
uint8_t
non_crc_bytes
,
const
void
*
data
,
uint32_t
data_size
),
const
void
*
data
,
uint32_t
data_size
),
...
...
This diff is collapsed.
Click to expand it.
lib/rdcu_pkt_to_file.c
+
6
−
6
View file @
5ff9b623
...
@@ -211,7 +211,7 @@ static uint32_t rmap_rx_dummy(uint8_t *pkt)
...
@@ -211,7 +211,7 @@ static uint32_t rmap_rx_dummy(uint8_t *pkt)
*/
*/
static
int
read_rdcu_pkt_mode_cfg
(
uint8_t
*
icu_addr
,
uint8_t
*
rdcu_addr
,
static
int
read_rdcu_pkt_mode_cfg
(
uint8_t
*
icu_addr
,
uint8_t
*
rdcu_addr
,
u
nsigned
long
*
mtu
)
u
int32_t
*
mtu
)
{
{
/* TODO: Build string" %s/.rdcu_pkt_mode_cfg", RDCU_PKT_MODE_DIR */
/* TODO: Build string" %s/.rdcu_pkt_mode_cfg", RDCU_PKT_MODE_DIR */
char
line
[
256
];
char
line
[
256
];
...
@@ -224,7 +224,7 @@ static int read_rdcu_pkt_mode_cfg(uint8_t *icu_addr, uint8_t *rdcu_addr,
...
@@ -224,7 +224,7 @@ static int read_rdcu_pkt_mode_cfg(uint8_t *icu_addr, uint8_t *rdcu_addr,
if
(
fp
==
NULL
)
{
if
(
fp
==
NULL
)
{
/* use default values */
/* use default values */
printf
(
"Use ICU_ADDR = %#02X, RDCU_ADDR = %#02X and MTU = %
l
u for the RAMP packets.
\n
"
,
*
icu_addr
,
*
rdcu_addr
,
*
mtu
);
printf
(
"Use ICU_ADDR = %#02X, RDCU_ADDR = %#02X and MTU = %u for the RAMP packets.
\n
"
,
*
icu_addr
,
*
rdcu_addr
,
*
mtu
);
return
0
;
return
0
;
}
}
...
@@ -274,19 +274,19 @@ static int read_rdcu_pkt_mode_cfg(uint8_t *icu_addr, uint8_t *rdcu_addr,
...
@@ -274,19 +274,19 @@ static int read_rdcu_pkt_mode_cfg(uint8_t *icu_addr, uint8_t *rdcu_addr,
end
=
NULL
;
end
=
NULL
;
errno
=
0
;
errno
=
0
;
i
=
strtoul
(
line
+
l
,
&
end
,
0
);
i
=
strtoul
(
line
+
l
,
&
end
,
0
);
if
(
end
==
line
+
l
||
errno
==
ERANGE
||
i
>
INT_MAX
)
{
if
(
end
==
line
+
l
||
errno
==
ERANGE
||
i
>
INT
32
_MAX
)
{
fprintf
(
stderr
,
"Error reading MTU.
\n
"
);
fprintf
(
stderr
,
"Error reading MTU.
\n
"
);
errno
=
0
;
errno
=
0
;
fclose
(
fp
);
fclose
(
fp
);
return
-
1
;
return
-
1
;
}
}
*
mtu
=
i
;
*
mtu
=
(
uint32_t
)
i
;
continue
;
continue
;
}
}
}
}
fclose
(
fp
);
fclose
(
fp
);
printf
(
"Use ICU_ADDR = %#02X, RDCU_ADDR = %#02X and MTU = %
l
u for the RAMP packets.
\n
"
,
*
icu_addr
,
*
rdcu_addr
,
*
mtu
);
printf
(
"Use ICU_ADDR = %#02X, RDCU_ADDR = %#02X and MTU = %u for the RAMP packets.
\n
"
,
*
icu_addr
,
*
rdcu_addr
,
*
mtu
);
return
0
;
return
0
;
}
}
...
@@ -304,7 +304,7 @@ static int read_rdcu_pkt_mode_cfg(uint8_t *icu_addr, uint8_t *rdcu_addr,
...
@@ -304,7 +304,7 @@ static int read_rdcu_pkt_mode_cfg(uint8_t *icu_addr, uint8_t *rdcu_addr,
int
init_rmap_pkt_to_file
(
void
)
int
init_rmap_pkt_to_file
(
void
)
{
{
uint8_t
icu_addr
,
rdcu_addr
;
uint8_t
icu_addr
,
rdcu_addr
;
u
nsigned
long
mtu
;
u
int32_t
mtu
;
if
(
read_rdcu_pkt_mode_cfg
(
&
icu_addr
,
&
rdcu_addr
,
&
mtu
))
if
(
read_rdcu_pkt_mode_cfg
(
&
icu_addr
,
&
rdcu_addr
,
&
mtu
))
return
-
1
;
return
-
1
;
...
...
This diff is collapsed.
Click to expand it.
lib/rdcu_rmap.c
+
3
−
3
View file @
5ff9b623
...
@@ -91,7 +91,7 @@ static int32_t (*rmap_tx)(const void *hdr, uint32_t hdr_size,
...
@@ -91,7 +91,7 @@ static int32_t (*rmap_tx)(const void *hdr, uint32_t hdr_size,
const
void
*
data
,
uint32_t
data_size
);
const
void
*
data
,
uint32_t
data_size
);
static
uint32_t
(
*
rmap_rx
)(
uint8_t
*
pkt
);
static
uint32_t
(
*
rmap_rx
)(
uint8_t
*
pkt
);
static
size
_t
data_mtu
;
/* maximum data transfer size per unit */
static
uint32
_t
data_mtu
;
/* maximum data transfer size per unit */
...
@@ -745,7 +745,7 @@ void rdcu_set_destination_key(uint8_t key)
...
@@ -745,7 +745,7 @@ void rdcu_set_destination_key(uint8_t key)
* @returns the mtu
* @returns the mtu
*/
*/
size
_t
rdcu_get_data_mtu
(
void
)
uint32
_t
rdcu_get_data_mtu
(
void
)
{
{
return
data_mtu
;
return
data_mtu
;
}
}
...
@@ -791,7 +791,7 @@ void rdcu_rmap_reset_log(void)
...
@@ -791,7 +791,7 @@ void rdcu_rmap_reset_log(void)
* @returns 0 on success, otherwise error
* @returns 0 on success, otherwise error
*/
*/
int
rdcu_rmap_init
(
size
_t
mtu
,
int
rdcu_rmap_init
(
uint32
_t
mtu
,
int32_t
(
*
tx
)(
const
void
*
hdr
,
uint32_t
hdr_size
,
int32_t
(
*
tx
)(
const
void
*
hdr
,
uint32_t
hdr_size
,
const
uint8_t
non_crc_bytes
,
const
uint8_t
non_crc_bytes
,
const
void
*
data
,
uint32_t
data_size
),
const
void
*
data
,
uint32_t
data_size
),
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment