Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
W
White Rabbit Trigger Distribution
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
White Rabbit Trigger Distribution
Commits
4712b309
Commit
4712b309
authored
Jun 27, 2019
by
Dimitris Lampridis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
sw: fix reconfiguration bug that does not enable rules
parent
a5459794
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
5 deletions
+7
-5
libwrtd-attributes.c
software/lib/libwrtd-attributes.c
+1
-0
libwrtd-internal.c
software/lib/libwrtd-internal.c
+1
-0
libwrtd-private.h
software/lib/libwrtd-private.h
+1
-0
libwrtd-reconfigure.c
software/lib/libwrtd-reconfigure.c
+4
-5
No files found.
software/lib/libwrtd-attributes.c
View file @
4712b309
...
...
@@ -877,6 +877,7 @@ enum wrtd_status wrtd_attr_set_rule_enable(struct wrtd_dev *wrtd,
if
(
wrtd
->
rules
[
idx
].
rule
.
conf
.
enabled
!=
value
)
{
wrtd
->
rules
[
idx
].
rule
.
conf
.
enabled
=
value
;
wrtd
->
rules
[
idx
].
modified
=
1
;
status
=
wrtd_reconfigure
(
wrtd
,
__func__
);
WRTD_RETURN_IF_ERROR
(
status
);
...
...
software/lib/libwrtd-internal.c
View file @
4712b309
...
...
@@ -424,6 +424,7 @@ enum wrtd_status wrtd_alloc_rules(struct wrtd_dev *wrtd,
for
(
idx
=
0
;
idx
<
nbr_rules
;
idx
++
)
{
rules
[
n
].
cpu
=
cpu
;
rules
[
n
].
local_idx
=
idx
;
rules
[
n
].
modified
=
0
;
n
++
;
}
}
...
...
software/lib/libwrtd-private.h
View file @
4712b309
...
...
@@ -40,6 +40,7 @@ struct wrtd_lib_rule {
unsigned
int
cpu
;
/* Rule index on the local MT cpu. */
unsigned
int
local_idx
;
unsigned
char
modified
;
/* Rule. */
struct
wrtd_rule
rule
;
};
...
...
software/lib/libwrtd-reconfigure.c
View file @
4712b309
...
...
@@ -420,10 +420,9 @@ static enum wrtd_status wrtd_reconfigure_write(struct wrtd_dev *wrtd,
if
(
wrtd_id_null
(
new_rules
[
i
].
rule
.
conf
.
id
)
&&
wrtd_id_null
(
old_rules
[
i
].
rule
.
conf
.
id
))
continue
;
if
(
wrtd_id_eq
(
new_rules
[
i
].
rule
.
conf
.
id
,
old_rules
[
i
].
rule
.
conf
.
id
)
&&
(
new_rules
[
i
].
rule
.
conf
.
enabled
==
old_rules
[
i
].
rule
.
conf
.
enabled
))
if
(
!
old_rules
[
i
].
modified
&&
(
wrtd_id_eq
(
new_rules
[
i
].
rule
.
conf
.
id
,
old_rules
[
i
].
rule
.
conf
.
id
)))
continue
;
status
=
wrtd_write_rule
(
wrtd
,
i
,
caller_func
);
/* FIXME: inconsistent state, free old_rules ? */
...
...
@@ -447,7 +446,7 @@ enum wrtd_status wrtd_reconfigure(struct wrtd_dev *wrtd, const char *caller_func
status
=
wrtd_fill_alarms
(
wrtd
,
caller_func
);
WRTD_RETURN_IF_ERROR
(
status
);
/*
1.
Count number of rules. */
/* Count number of rules. */
status
=
wrtd_reconfigure_alloc_map
(
wrtd
,
&
map
,
caller_func
);
WRTD_RETURN_IF_ERROR
(
status
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment