Skip to content

Commit

Permalink
[datapipe] Fix datapipes incorrectly marked as dynamic. JB#22475
Browse files Browse the repository at this point in the history
The following datapipes are not used to store dynamically
allocated data eventhough they are marked as such:

- led_pattern_activate_pipe
- led_pattern_deactivate_pipe
- keypress_event_pipe
- touchscreen_event_pipe

Switch types from DATAPIPE_DATA_DYNAMIC to DATAPIPE_DATA_LITERAL.

Signed-off-by: Simo Piiroinen <simo.piiroinen@jollamobile.com>
  • Loading branch information
spiiroin committed Sep 19, 2018
1 parent f8b6518 commit b02651f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions datapipe.c
Expand Up @@ -979,19 +979,19 @@ void mce_datapipe_init(void)
0, GINT_TO_POINTER(0));
datapipe_init(lpm_brightness_pipe, DATAPIPE_FILTERING_ALLOWED, DATAPIPE_DATA_LITERAL,
0, GINT_TO_POINTER(0));
datapipe_init(led_pattern_activate_pipe, DATAPIPE_FILTERING_DENIED, DATAPIPE_DATA_DYNAMIC,
datapipe_init(led_pattern_activate_pipe, DATAPIPE_FILTERING_DENIED, DATAPIPE_DATA_LITERAL,
0, NULL);
datapipe_init(resume_detected_event_pipe, DATAPIPE_FILTERING_DENIED, DATAPIPE_DATA_LITERAL,
0, NULL);
datapipe_init(led_pattern_deactivate_pipe, DATAPIPE_FILTERING_DENIED, DATAPIPE_DATA_DYNAMIC,
datapipe_init(led_pattern_deactivate_pipe, DATAPIPE_FILTERING_DENIED, DATAPIPE_DATA_LITERAL,
0, NULL);
datapipe_init(user_activity_event_pipe, DATAPIPE_FILTERING_DENIED, DATAPIPE_DATA_LITERAL,
0, NULL);
datapipe_init(key_backlight_brightness_pipe, DATAPIPE_FILTERING_ALLOWED, DATAPIPE_DATA_LITERAL,
0, GINT_TO_POINTER(0));
datapipe_init(keypress_event_pipe, DATAPIPE_FILTERING_DENIED, DATAPIPE_DATA_DYNAMIC,
datapipe_init(keypress_event_pipe, DATAPIPE_FILTERING_DENIED, DATAPIPE_DATA_LITERAL,
sizeof (struct input_event), NULL);
datapipe_init(touchscreen_event_pipe, DATAPIPE_FILTERING_DENIED, DATAPIPE_DATA_DYNAMIC,
datapipe_init(touchscreen_event_pipe, DATAPIPE_FILTERING_DENIED, DATAPIPE_DATA_LITERAL,
sizeof (struct input_event), NULL);
datapipe_init(device_inactive_pipe, DATAPIPE_FILTERING_DENIED, DATAPIPE_DATA_LITERAL,
0, GINT_TO_POINTER(TRUE));
Expand Down
8 changes: 4 additions & 4 deletions tests/ut/ut_display.c
Expand Up @@ -1282,15 +1282,15 @@ static void stub_setup_checked(void)
0, GINT_TO_POINTER(0));
datapipe_init(&led_brightness_pipe, DATAPIPE_FILTERING_ALLOWED, DATAPIPE_DATA_LITERAL,
0, GINT_TO_POINTER(0));
datapipe_init(&led_pattern_activate_pipe, DATAPIPE_FILTERING_DENIED, DATAPIPE_DATA_DYNAMIC,
datapipe_init(&led_pattern_activate_pipe, DATAPIPE_FILTERING_DENIED, DATAPIPE_DATA_LITERAL,
0, NULL);
datapipe_init(&led_pattern_deactivate_pipe, DATAPIPE_FILTERING_DENIED, DATAPIPE_DATA_DYNAMIC,
datapipe_init(&led_pattern_deactivate_pipe, DATAPIPE_FILTERING_DENIED, DATAPIPE_DATA_LITERAL,
0, NULL);
datapipe_init(&key_backlight_brightness_pipe, DATAPIPE_FILTERING_ALLOWED, DATAPIPE_DATA_LITERAL,
0, GINT_TO_POINTER(0));
datapipe_init(&keypress_event_pipe, DATAPIPE_FILTERING_DENIED, DATAPIPE_DATA_DYNAMIC,
datapipe_init(&keypress_event_pipe, DATAPIPE_FILTERING_DENIED, DATAPIPE_DATA_LITERAL,
sizeof (struct input_event), NULL);
datapipe_init(&touchscreen_event_pipe, DATAPIPE_FILTERING_DENIED, DATAPIPE_DATA_DYNAMIC,
datapipe_init(&touchscreen_event_pipe, DATAPIPE_FILTERING_DENIED, DATAPIPE_DATA_LITERAL,
sizeof (struct input_event), NULL);
datapipe_init(&device_inactive_pipe, DATAPIPE_FILTERING_ALLOWED, DATAPIPE_DATA_LITERAL,
0, GINT_TO_POINTER(FALSE));
Expand Down

0 comments on commit b02651f

Please sign in to comment.