Skip to content

Commit

Permalink
[datapipe] Drop useless datapipe_use_t enumeration. JB#22475
Browse files Browse the repository at this point in the history 
As DATAPIPE_USE_INDATA is the only value left in the enumeration, it
is pointless to pass it as an argument.

Do not use datapipe_use_t values as function arguments.

Remove the whole datapipe_use_t enumeration.

Signed-off-by: Simo Piiroinen <simo.piiroinen@jollamobile.com>
  • Loading branch information
@spiiroin
spiiroin committed Sep 19, 2018
1 parent e0fdd17 commit f8b6518
Show file tree
Hide file tree
Showing 29 changed files with 185 additions and 241 deletions.
36 changes: 10 additions & 26 deletions datapipe.c
View file
Expand Up @@ -47,10 +47,10 @@

const char *datapipe_name (datapipe_t *const datapipe);
gpointer datapipe_value (datapipe_t *const datapipe);
static void datapipe_exec_input_triggers (datapipe_t *const datapipe, gpointer const indata, const datapipe_use_t use_cache);
static gconstpointer datapipe_exec_filters (datapipe_t *const datapipe, gpointer indata, const datapipe_use_t use_cache);
void datapipe_exec_output_triggers (const datapipe_t *const datapipe, gconstpointer indata, const datapipe_use_t use_cache);
gconstpointer datapipe_exec_full (datapipe_t *const datapipe, gpointer indata, const datapipe_use_t use_cache, const datapipe_cache_t cache_indata);
static void datapipe_exec_input_triggers (datapipe_t *const datapipe, gpointer const indata);
static gconstpointer datapipe_exec_filters (datapipe_t *const datapipe, gpointer indata);
void datapipe_exec_output_triggers (const datapipe_t *const datapipe, gconstpointer indata);
gconstpointer datapipe_exec_full (datapipe_t *const datapipe, gpointer indata, const datapipe_cache_t cache_indata);
static void datapipe_add_filter (datapipe_t *const datapipe, gpointer (*filter)(gpointer data));
static void datapipe_remove_filter (datapipe_t *const datapipe, gpointer (*filter)(gpointer data));
static void datapipe_add_input_trigger (datapipe_t *const datapipe, void (*trigger)(gconstpointer data));
Expand Down Expand Up @@ -468,17 +468,13 @@ datapipe_value(datapipe_t *const datapipe)
*
* @param datapipe The datapipe to execute
* @param indata The input data to run through the datapipe
* @param use_cache DATAPIPE_USE_INDATA to use indata
* @param cache_indata DATAPIPE_CACHE_INDATA to cache the indata,
* DATAPIPE_CACHE_NOTHING to keep the old data
*/
static void
datapipe_exec_input_triggers(datapipe_t *const datapipe,
gpointer const indata,
const datapipe_use_t use_cache)
gpointer const indata)
{
(void)use_cache; // TODO: remove

void (*trigger)(gconstpointer const input);
gpointer data;
gint i;
Expand Down Expand Up @@ -507,16 +503,12 @@ datapipe_exec_input_triggers(datapipe_t *const datapipe,
*
* @param datapipe The datapipe to execute
* @param indata The input data to run through the datapipe
* @param use_cache DATAPIPE_USE_INDATA to use indata
* @return The processed data
*/
static gconstpointer
datapipe_exec_filters(datapipe_t *const datapipe,
gpointer indata,
const datapipe_use_t use_cache)
gpointer indata)
{
(void)use_cache; // TODO: remove

gpointer (*filter)(gpointer input);
gpointer data;
gconstpointer retval = NULL;
Expand Down Expand Up @@ -558,14 +550,10 @@ datapipe_exec_filters(datapipe_t *const datapipe,
*
* @param datapipe The datapipe to execute
* @param indata The input data to run through the datapipe
* @param use_cache DATAPIPE_USE_INDATA to use indata
*/
void datapipe_exec_output_triggers(const datapipe_t *const datapipe,
gconstpointer indata,
const datapipe_use_t use_cache)
gconstpointer indata)
{
(void)use_cache; // TODO: remove

void (*trigger)(gconstpointer input);
gconstpointer data;
gint i;
Expand Down Expand Up @@ -593,18 +581,14 @@ void datapipe_exec_output_triggers(const datapipe_t *const datapipe,
*
* @param datapipe The datapipe to execute
* @param indata The input data to run through the datapipe
* @param use_cache DATAPIPE_USE_INDATA to use indata
* @param cache_indata DATAPIPE_CACHE_INDATA to cache the indata,
* DATAPIPE_CACHE_NOTHING to keep the old data
* @return The processed data
*/
gconstpointer datapipe_exec_full(datapipe_t *const datapipe,
gpointer indata,
const datapipe_use_t use_cache,
const datapipe_cache_t cache_indata)
{
(void)use_cache; // TODO: remove

gconstpointer outdata = NULL;

if (datapipe == NULL) {
Expand All @@ -623,13 +607,13 @@ gconstpointer datapipe_exec_full(datapipe_t *const datapipe,
}

/* Execute input value callbacks */
datapipe_exec_input_triggers(datapipe, indata, DATAPIPE_USE_INDATA);
datapipe_exec_input_triggers(datapipe, indata);

/* Determine output value */
if (datapipe->dp_read_only == DATAPIPE_FILTERING_DENIED) {
outdata = indata;
} else {
outdata = datapipe_exec_filters(datapipe, indata, DATAPIPE_USE_INDATA);
outdata = datapipe_exec_filters(datapipe, indata);
}

/* Optionally cache the value at the output stage */
Expand All @@ -642,7 +626,7 @@ gconstpointer datapipe_exec_full(datapipe_t *const datapipe,
}

/* Execute output value callbacks */
datapipe_exec_output_triggers(datapipe, outdata, DATAPIPE_USE_INDATA);
datapipe_exec_output_triggers(datapipe, outdata);

EXIT:
return outdata;
Expand Down
15 changes: 4 additions & 11 deletions datapipe.h
View file
Expand Up @@ -75,13 +75,6 @@ typedef enum {
DATAPIPE_DATA_DYNAMIC = TRUE, /**< Free the cache */
} datapipe_data_t;

/**
* Policy for the data source
*/
typedef enum {
DATAPIPE_USE_INDATA = FALSE, /**< Use the indata as data source */
} datapipe_use_t;

/**
* Policy used for caching indata
*/
Expand Down Expand Up @@ -117,8 +110,8 @@ typedef struct

const char *datapipe_name (datapipe_t *const datapipe);
gpointer datapipe_value (datapipe_t *const datapipe);
void datapipe_exec_output_triggers(const datapipe_t *const datapipe, gconstpointer indata, const datapipe_use_t use_cache);
gconstpointer datapipe_exec_full (datapipe_t *const datapipe, gpointer indata, const datapipe_use_t use_cache, const datapipe_cache_t cache_indata);
void datapipe_exec_output_triggers(const datapipe_t *const datapipe, gconstpointer indata);
gconstpointer datapipe_exec_full (datapipe_t *const datapipe, gpointer indata, const datapipe_cache_t cache_indata);

/* ------------------------------------------------------------------------- *
* MCE_DATAPIPE
Expand Down Expand Up @@ -168,7 +161,7 @@ void mce_datapipe_quit_bindings (datapipe_bindings_t *self);
* last request to reach the queue to "win". */ \
datapipe_exec_full(&display_state_request_pipe,\
GINT_TO_POINTER(req_target),\
DATAPIPE_USE_INDATA, DATAPIPE_CACHE_OUTDATA);\
DATAPIPE_CACHE_OUTDATA);\
} while(0)

/** Execute tklock request
Expand All @@ -180,7 +173,7 @@ void mce_datapipe_quit_bindings (datapipe_bindings_t *self);
tklock_request_repr(tklock_request));\
datapipe_exec_full(&tklock_request_pipe,\
GINT_TO_POINTER(tklock_request),\
DATAPIPE_USE_INDATA, DATAPIPE_CACHE_INDATA);\
DATAPIPE_CACHE_INDATA);\
}while(0)

/* ========================================================================= *
Expand Down
46 changes: 22 additions & 24 deletions event-input.c
View file
Expand Up @@ -1911,8 +1911,7 @@ evin_iomon_generate_activity(struct input_event *ev, bool cooked, bool raw)
if( raw ) {
if( t_raw != t ) {
t_raw = t;
datapipe_exec_output_triggers(&user_activity_event_pipe,
ev, DATAPIPE_USE_INDATA);
datapipe_exec_output_triggers(&user_activity_event_pipe, ev);
}
}

Expand All @@ -1924,7 +1923,7 @@ evin_iomon_generate_activity(struct input_event *ev, bool cooked, bool raw)
t_cooked = t;
datapipe_exec_full(&inactivity_event_pipe,
GINT_TO_POINTER(FALSE),
DATAPIPE_USE_INDATA, DATAPIPE_CACHE_OUTDATA);
DATAPIPE_CACHE_OUTDATA);
}
}

Expand Down Expand Up @@ -2077,13 +2076,13 @@ evin_iomon_touchscreen_cb(mce_io_mon_t *iomon, gpointer data, gsize bytes_read)

/* But otherwise are handled in powerkey.c. */
datapipe_exec_full(&keypress_event_pipe, &ev,
DATAPIPE_USE_INDATA, DATAPIPE_CACHE_NOTHING);
DATAPIPE_CACHE_NOTHING);
}
else if( (ev->type == EV_ABS && ev->code == ABS_PRESSURE) ||
(ev->type == EV_KEY && ev->code == BTN_TOUCH ) ) {
/* Only send pressure events */
datapipe_exec_full(&touchscreen_event_pipe, &ev,
DATAPIPE_USE_INDATA, DATAPIPE_CACHE_NOTHING);
DATAPIPE_CACHE_NOTHING);
}

EXIT:
Expand Down Expand Up @@ -2171,7 +2170,7 @@ evin_iomon_keypress_cb(mce_io_mon_t *iomon, gpointer data, gsize bytes_read)
KEY_STATE_PRESSED : KEY_STATE_RELEASED;
datapipe_exec_full(&lockkey_state_pipe,
GINT_TO_POINTER(key_state),
DATAPIPE_USE_INDATA, DATAPIPE_CACHE_INDATA);
DATAPIPE_CACHE_INDATA);
}

/* For now there's no reason to cache the keypress
Expand All @@ -2193,7 +2192,7 @@ evin_iomon_keypress_cb(mce_io_mon_t *iomon, gpointer data, gsize bytes_read)
(ev->value == 1)) || (ev->value == 0))) &&
((submode & MCE_SUBMODE_PROXIMITY_TKLOCK) == 0)) {
datapipe_exec_full(&keypress_event_pipe, &ev,
DATAPIPE_USE_INDATA, DATAPIPE_CACHE_NOTHING);
DATAPIPE_CACHE_NOTHING);
}
}

Expand All @@ -2205,7 +2204,7 @@ evin_iomon_keypress_cb(mce_io_mon_t *iomon, gpointer data, gsize bytes_read)
COVER_CLOSED : COVER_OPEN;
datapipe_exec_full(&lens_cover_state_pipe,
GINT_TO_POINTER(cover_state),
DATAPIPE_USE_INDATA, DATAPIPE_CACHE_INDATA);
DATAPIPE_CACHE_INDATA);
}

/* Don't generate activity on COVER_CLOSED */
Expand All @@ -2220,7 +2219,7 @@ evin_iomon_keypress_cb(mce_io_mon_t *iomon, gpointer data, gsize bytes_read)
COVER_CLOSED : COVER_OPEN;
datapipe_exec_full(&keyboard_slide_state_pipe,
GINT_TO_POINTER(cover_state),
DATAPIPE_USE_INDATA, DATAPIPE_CACHE_INDATA);
DATAPIPE_CACHE_INDATA);
evin_iomon_keyboard_state_update();
}

Expand All @@ -2236,7 +2235,7 @@ evin_iomon_keypress_cb(mce_io_mon_t *iomon, gpointer data, gsize bytes_read)
COVER_CLOSED : COVER_OPEN;
datapipe_exec_full(&proximity_sensor_actual_pipe,
GINT_TO_POINTER(cover_state),
DATAPIPE_USE_INDATA, DATAPIPE_CACHE_INDATA);
DATAPIPE_CACHE_INDATA);
}

break;
Expand All @@ -2250,7 +2249,7 @@ evin_iomon_keypress_cb(mce_io_mon_t *iomon, gpointer data, gsize bytes_read)
COVER_CLOSED : COVER_OPEN;
datapipe_exec_full(&jack_sense_state_pipe,
GINT_TO_POINTER(cover_state),
DATAPIPE_USE_INDATA, DATAPIPE_CACHE_INDATA);
DATAPIPE_CACHE_INDATA);
}

break;
Expand All @@ -2261,12 +2260,12 @@ evin_iomon_keypress_cb(mce_io_mon_t *iomon, gpointer data, gsize bytes_read)
if( ev->value ) {
datapipe_exec_full(&lid_sensor_actual_pipe,
GINT_TO_POINTER(COVER_CLOSED),
DATAPIPE_USE_INDATA, DATAPIPE_CACHE_INDATA);
DATAPIPE_CACHE_INDATA);
}
else {
datapipe_exec_full(&lid_sensor_actual_pipe,
GINT_TO_POINTER(COVER_OPEN),
DATAPIPE_USE_INDATA, DATAPIPE_CACHE_INDATA);
DATAPIPE_CACHE_INDATA);
}
break;

Expand Down Expand Up @@ -2521,23 +2520,23 @@ evin_iomon_switch_states_update_iter_cb(gpointer io_monitor, gpointer user_data)
if( test_bit(ecode, featurelist) ) {
state = test_bit(ecode, statelist) ? COVER_CLOSED : COVER_OPEN;
datapipe_exec_full(&lens_cover_state_pipe, GINT_TO_POINTER(state),
DATAPIPE_USE_INDATA, DATAPIPE_CACHE_INDATA);
DATAPIPE_CACHE_INDATA);
}

/* Check initial keypad slide state */
ecode = evin_event_mapper_rlookup_switch(SW_KEYPAD_SLIDE);
if( test_bit(ecode, featurelist) ) {
state = test_bit(ecode, statelist) ? COVER_CLOSED : COVER_OPEN;
datapipe_exec_full(&keyboard_slide_state_pipe, GINT_TO_POINTER(state),
DATAPIPE_USE_INDATA, DATAPIPE_CACHE_INDATA);
DATAPIPE_CACHE_INDATA);
}

/* Check initial front proximity state */
ecode = evin_event_mapper_rlookup_switch(SW_FRONT_PROXIMITY);
if( test_bit(ecode, featurelist) ) {
state = test_bit(ecode, statelist) ? COVER_CLOSED : COVER_OPEN;
datapipe_exec_full(&proximity_sensor_actual_pipe, GINT_TO_POINTER(state),
DATAPIPE_USE_INDATA, DATAPIPE_CACHE_INDATA);
DATAPIPE_CACHE_INDATA);
}

/* Check initial lid sensor state */
Expand All @@ -2547,7 +2546,7 @@ evin_iomon_switch_states_update_iter_cb(gpointer io_monitor, gpointer user_data)
mce_log(LL_DEVEL, "SW_LID initial state = %s",
cover_state_repr(state));
datapipe_exec_full(&lid_sensor_actual_pipe, GINT_TO_POINTER(state),
DATAPIPE_USE_INDATA, DATAPIPE_CACHE_INDATA);
DATAPIPE_CACHE_INDATA);
}

/* Need to consider more than one switch state when setting the
Expand Down Expand Up @@ -2575,7 +2574,7 @@ evin_iomon_switch_states_update_iter_cb(gpointer io_monitor, gpointer user_data)
if( have ) {
state = value ? COVER_CLOSED : COVER_OPEN;
datapipe_exec_full(&jack_sense_state_pipe, GINT_TO_POINTER(state),
DATAPIPE_USE_INDATA, DATAPIPE_CACHE_INDATA);
DATAPIPE_CACHE_INDATA);
}

EXIT:
Expand Down Expand Up @@ -2692,7 +2691,7 @@ evin_iomon_keyboard_state_update(void)

datapipe_exec_full(&keyboard_available_state_pipe,
GINT_TO_POINTER(state),
DATAPIPE_USE_INDATA, DATAPIPE_CACHE_INDATA);
DATAPIPE_CACHE_INDATA);
}

/** Scan /dev/input for input event devices
Expand Down Expand Up @@ -2925,7 +2924,7 @@ evin_touchstate_update_cb(gpointer aptr)
mce_log(LL_DEBUG, "touch_detected=%s", touching ? "true" : "false");
datapipe_exec_full(&touch_detected_pipe,
GINT_TO_POINTER(touching),
DATAPIPE_USE_INDATA, DATAPIPE_CACHE_INDATA);
DATAPIPE_CACHE_INDATA);

EXIT:
return FALSE;
Expand Down Expand Up @@ -3218,8 +3217,7 @@ evin_ts_grab_set_led_raw(bool enabled)
datapipe_exec_output_triggers(enabled ?
&led_pattern_activate_pipe :
&led_pattern_deactivate_pipe,
MCE_LED_PATTERN_TOUCH_INPUT_BLOCKED,
DATAPIPE_USE_INDATA);
MCE_LED_PATTERN_TOUCH_INPUT_BLOCKED);
}

/** Handle delayed input grab led pattern activation
Expand Down Expand Up @@ -3309,7 +3307,7 @@ evin_ts_grab_set_active(gboolean grab)
// STATE MACHINE -> OUTPUT DATAPIPE
datapipe_exec_full(&touch_grab_active_pipe,
GINT_TO_POINTER(grab),
DATAPIPE_USE_INDATA, DATAPIPE_CACHE_INDATA);
DATAPIPE_CACHE_INDATA);

EXIT:
return;
Expand Down Expand Up @@ -3564,7 +3562,7 @@ evin_kp_grab_set_active(gboolean grab)
// STATE MACHINE -> OUTPUT DATAPIPE
datapipe_exec_full(&keypad_grab_active_pipe,
GINT_TO_POINTER(grab),
DATAPIPE_USE_INDATA, DATAPIPE_CACHE_INDATA);
DATAPIPE_CACHE_INDATA);

EXIT:
return;
Expand Down

0 comments on commit f8b6518

Please sign in to comment.