diff --git a/datapipe.c b/datapipe.c index a6991f3b..230dedf5 100644 --- a/datapipe.c +++ b/datapipe.c @@ -51,19 +51,18 @@ void datapipe_remove_output_trigger(datapipe_t *const datapipe, void void datapipe_init (datapipe_t *const datapipe, const datapipe_filtering_t read_only, const datapipe_data_t free_cache, const gsize datasize, gpointer initial_data); void datapipe_free (datapipe_t *const datapipe); -void datapipe_handlers_install (datapipe_handler_t *bindings); -void datapipe_handlers_remove (datapipe_handler_t *bindings); -void datapipe_handlers_execute (datapipe_handler_t *bindings); -static gboolean datapipe_handlers_execute_cb (gpointer aptr); -void datapipe_bindings_init (datapipe_bindings_t *self); -void datapipe_bindings_quit (datapipe_bindings_t *self); - /* ------------------------------------------------------------------------- * * MCE_DATAPIPE * ------------------------------------------------------------------------- */ -void mce_datapipe_init(void); -void mce_datapipe_quit(void); +void mce_datapipe_install_handlers (datapipe_handler_t *bindings); +void mce_datapipe_remove_handlers (datapipe_handler_t *bindings); +void mce_datapipe_execute_handlers (datapipe_handler_t *bindings); +static gboolean mce_datapipe_execute_handlers_cb(gpointer aptr); +void mce_datapipe_init_bindings (datapipe_bindings_t *self); +void mce_datapipe_quit_bindings (datapipe_bindings_t *self); +void mce_datapipe_init (void); +void mce_datapipe_quit (void); /* ------------------------------------------------------------------------- * * SUBMODE @@ -1781,7 +1780,7 @@ const char *fpstate_repr(fpstate_t state) "FPSTATE_UNKNOWN"); } -void datapipe_handlers_install(datapipe_handler_t *bindings) +void mce_datapipe_install_handlers(datapipe_handler_t *bindings) { if( !bindings ) goto EXIT; @@ -1808,7 +1807,7 @@ void datapipe_handlers_install(datapipe_handler_t *bindings) return; } -void datapipe_handlers_remove(datapipe_handler_t *bindings) +void mce_datapipe_remove_handlers(datapipe_handler_t *bindings) { if( !bindings ) goto EXIT; @@ -1835,7 +1834,7 @@ void datapipe_handlers_remove(datapipe_handler_t *bindings) return; } -void datapipe_handlers_execute(datapipe_handler_t *bindings) +void mce_datapipe_execute_handlers(datapipe_handler_t *bindings) { if( !bindings ) goto EXIT; @@ -1852,7 +1851,7 @@ void datapipe_handlers_execute(datapipe_handler_t *bindings) return; } -static gboolean datapipe_handlers_execute_cb(gpointer aptr) +static gboolean mce_datapipe_execute_handlers_cb(gpointer aptr) { datapipe_bindings_t *self = aptr; @@ -1865,7 +1864,7 @@ static gboolean datapipe_handlers_execute_cb(gpointer aptr) self->execute_id = 0; mce_log(LL_INFO, "module=%s", self->module ?: "unknown"); - datapipe_handlers_execute(self->handlers); + mce_datapipe_execute_handlers(self->handlers); EXIT: return FALSE; @@ -1873,22 +1872,22 @@ static gboolean datapipe_handlers_execute_cb(gpointer aptr) /** Append triggers/filters to datapipes */ -void datapipe_bindings_init(datapipe_bindings_t *self) +void mce_datapipe_init_bindings(datapipe_bindings_t *self) { mce_log(LL_INFO, "module=%s", self->module ?: "unknown"); /* Set up datapipe callbacks */ - datapipe_handlers_install(self->handlers); + mce_datapipe_install_handlers(self->handlers); /* Get initial values for output triggers from idle * callback, i.e. when all modules have been loaded */ if( !self->execute_id ) - self->execute_id = g_idle_add(datapipe_handlers_execute_cb, self); + self->execute_id = g_idle_add(mce_datapipe_execute_handlers_cb, self); } /** Remove triggers/filters from datapipes */ -void datapipe_bindings_quit(datapipe_bindings_t *self) +void mce_datapipe_quit_bindings(datapipe_bindings_t *self) { mce_log(LL_INFO, "module=%s", self->module ?: "unknown"); @@ -1899,5 +1898,5 @@ void datapipe_bindings_quit(datapipe_bindings_t *self) } /* Remove datapipe callbacks */ - datapipe_handlers_remove(self->handlers); + mce_datapipe_remove_handlers(self->handlers); } diff --git a/datapipe.h b/datapipe.h index bc4b2480..48f1abe0 100644 --- a/datapipe.h +++ b/datapipe.h @@ -127,18 +127,18 @@ void datapipe_add_output_trigger (datapipe_t *const datapipe, void ( void datapipe_remove_output_trigger(datapipe_t *const datapipe, void (*trigger)(gconstpointer data)); void datapipe_init (datapipe_t *const datapipe, const datapipe_filtering_t read_only, const datapipe_data_t free_cache, const gsize datasize, gpointer initial_data); void datapipe_free (datapipe_t *const datapipe); -void datapipe_handlers_install (datapipe_handler_t *bindings); -void datapipe_handlers_remove (datapipe_handler_t *bindings); -void datapipe_handlers_execute (datapipe_handler_t *bindings); -void datapipe_bindings_init (datapipe_bindings_t *self); -void datapipe_bindings_quit (datapipe_bindings_t *self); /* ------------------------------------------------------------------------- * * MCE_DATAPIPE * ------------------------------------------------------------------------- */ -void mce_datapipe_init(void); -void mce_datapipe_quit(void); +void mce_datapipe_install_handlers(datapipe_handler_t *bindings); +void mce_datapipe_remove_handlers (datapipe_handler_t *bindings); +void mce_datapipe_execute_handlers(datapipe_handler_t *bindings); +void mce_datapipe_init_bindings (datapipe_bindings_t *self); +void mce_datapipe_quit_bindings (datapipe_bindings_t *self); +void mce_datapipe_init (void); +void mce_datapipe_quit (void); /* ========================================================================= * * Macros diff --git a/mce-common.c b/mce-common.c index 6bc442e9..6d1dc4d8 100644 --- a/mce-common.c +++ b/mce-common.c @@ -618,14 +618,14 @@ static datapipe_bindings_t common_datapipe_bindings = */ static void common_datapipe_init(void) { - datapipe_bindings_init(&common_datapipe_bindings); + mce_datapipe_init_bindings(&common_datapipe_bindings); } /** Remove triggers/filters from datapipes */ static void common_datapipe_quit(void) { - datapipe_bindings_quit(&common_datapipe_bindings); + mce_datapipe_quit_bindings(&common_datapipe_bindings); } /* ========================================================================= * diff --git a/mce-dsme.c b/mce-dsme.c index 317a2d42..d58806ec 100644 --- a/mce-dsme.c +++ b/mce-dsme.c @@ -976,14 +976,14 @@ static datapipe_bindings_t mce_dsme_datapipe_bindings = */ static void mce_dsme_datapipe_init(void) { - datapipe_bindings_init(&mce_dsme_datapipe_bindings); + mce_datapipe_init_bindings(&mce_dsme_datapipe_bindings); } /** Remove triggers/filters from datapipes */ static void mce_dsme_datapipe_quit(void) { - datapipe_bindings_quit(&mce_dsme_datapipe_bindings); + mce_datapipe_quit_bindings(&mce_dsme_datapipe_bindings); } /* ========================================================================= * diff --git a/mce-hbtimer.c b/mce-hbtimer.c index 8d45b4d9..534f454e 100644 --- a/mce-hbtimer.c +++ b/mce-hbtimer.c @@ -1036,14 +1036,14 @@ static datapipe_bindings_t mht_datapipe_bindings = */ static void mht_datapipe_init(void) { - datapipe_bindings_init(&mht_datapipe_bindings); + mce_datapipe_init_bindings(&mht_datapipe_bindings); } /** Remove triggers/filters from datapipes */ static void mht_datapipe_quit(void) { - datapipe_bindings_quit(&mht_datapipe_bindings); + mce_datapipe_quit_bindings(&mht_datapipe_bindings); } /* ========================================================================= * diff --git a/modules/battery-statefs.c b/modules/battery-statefs.c index 12a029a6..e68ae2ee 100644 --- a/modules/battery-statefs.c +++ b/modules/battery-statefs.c @@ -433,14 +433,14 @@ static datapipe_bindings_t bsf_datapipe_bindings = */ static void bsf_datapipe_init(void) { - datapipe_bindings_init(&bsf_datapipe_bindings); + mce_datapipe_init_bindings(&bsf_datapipe_bindings); } /** Remove triggers/filters from datapipes */ static void bsf_datapipe_quit(void) { - datapipe_bindings_quit(&bsf_datapipe_bindings); + mce_datapipe_quit_bindings(&bsf_datapipe_bindings); } /* ========================================================================= * diff --git a/modules/bluetooth.c b/modules/bluetooth.c index 750bb0eb..7803d92c 100644 --- a/modules/bluetooth.c +++ b/modules/bluetooth.c @@ -329,14 +329,14 @@ static datapipe_bindings_t bluetooth_datapipe_bindings = */ static void bluetooth_datapipe_init(void) { - datapipe_bindings_init(&bluetooth_datapipe_bindings); + mce_datapipe_init_bindings(&bluetooth_datapipe_bindings); } /** Remove triggers/filters from datapipes */ static void bluetooth_datapipe_quit(void) { - datapipe_bindings_quit(&bluetooth_datapipe_bindings); + mce_datapipe_quit_bindings(&bluetooth_datapipe_bindings); } /* ========================================================================= * diff --git a/modules/buttonbacklight.c b/modules/buttonbacklight.c index 107b4284..ae99c2c3 100644 --- a/modules/buttonbacklight.c +++ b/modules/buttonbacklight.c @@ -348,7 +348,7 @@ static datapipe_bindings_t bbl_datapipe_bindings = static void bbl_datapipes_init(void) { - datapipe_bindings_init(&bbl_datapipe_bindings); + mce_datapipe_init_bindings(&bbl_datapipe_bindings); } /** Remove triggers/filters from datapipes @@ -356,7 +356,7 @@ bbl_datapipes_init(void) static void bbl_datapipes_quit(void) { - datapipe_bindings_quit(&bbl_datapipe_bindings); + mce_datapipe_quit_bindings(&bbl_datapipe_bindings); } /* ========================================================================= * diff --git a/modules/callstate.c b/modules/callstate.c index 04ecbfed..57178c54 100644 --- a/modules/callstate.c +++ b/modules/callstate.c @@ -1897,7 +1897,7 @@ static datapipe_bindings_t callstate_datapipe_bindings = static void callstate_datapipes_init(void) { - datapipe_bindings_init(&callstate_datapipe_bindings); + mce_datapipe_init_bindings(&callstate_datapipe_bindings); } /** Remove triggers/filters from datapipes @@ -1905,7 +1905,7 @@ callstate_datapipes_init(void) static void callstate_datapipes_quit(void) { - datapipe_bindings_quit(&callstate_datapipe_bindings); + mce_datapipe_quit_bindings(&callstate_datapipe_bindings); } /* ========================================================================= * diff --git a/modules/display.c b/modules/display.c index 16f51857..048ac64d 100644 --- a/modules/display.c +++ b/modules/display.c @@ -2239,13 +2239,13 @@ static datapipe_bindings_t mdy_datapipe_bindings = */ static void mdy_datapipe_init(void) { - datapipe_bindings_init(&mdy_datapipe_bindings); + mce_datapipe_init_bindings(&mdy_datapipe_bindings); } /** Remove triggers/filters from datapipes */ static void mdy_datapipe_quit(void) { - datapipe_bindings_quit(&mdy_datapipe_bindings); + mce_datapipe_quit_bindings(&mdy_datapipe_bindings); } /* ========================================================================= * diff --git a/modules/filter-brightness-als.c b/modules/filter-brightness-als.c index 44556929..7b9076f0 100644 --- a/modules/filter-brightness-als.c +++ b/modules/filter-brightness-als.c @@ -1458,7 +1458,7 @@ static datapipe_bindings_t fba_datapipe_bindings = static void fba_datapipe_init(void) { - datapipe_bindings_init(&fba_datapipe_bindings); + mce_datapipe_init_bindings(&fba_datapipe_bindings); } /** Remove datapipe triggers/filters @@ -1466,7 +1466,7 @@ fba_datapipe_init(void) static void fba_datapipe_quit(void) { - datapipe_bindings_quit(&fba_datapipe_bindings); + mce_datapipe_quit_bindings(&fba_datapipe_bindings); } /* ========================================================================= * diff --git a/modules/fingerprint.c b/modules/fingerprint.c index 30c1de17..87d3f569 100644 --- a/modules/fingerprint.c +++ b/modules/fingerprint.c @@ -1690,7 +1690,7 @@ static void fingerprint_datapipe_init(void) { // triggers - datapipe_bindings_init(&fingerprint_datapipe_bindings); + mce_datapipe_init_bindings(&fingerprint_datapipe_bindings); } /** Remove triggers/filters from datapipes */ @@ -1698,7 +1698,7 @@ static void fingerprint_datapipe_quit(void) { // triggers - datapipe_bindings_quit(&fingerprint_datapipe_bindings); + mce_datapipe_quit_bindings(&fingerprint_datapipe_bindings); } /* ========================================================================= * diff --git a/modules/inactivity.c b/modules/inactivity.c index d5212777..8aeaaeea 100644 --- a/modules/inactivity.c +++ b/modules/inactivity.c @@ -840,13 +840,13 @@ static datapipe_bindings_t mia_datapipe_bindings = */ static void mia_datapipe_init(void) { - datapipe_bindings_init(&mia_datapipe_bindings); + mce_datapipe_init_bindings(&mia_datapipe_bindings); } /** Remove triggers/filters from datapipes */ static void mia_datapipe_quit(void) { - datapipe_bindings_quit(&mia_datapipe_bindings); + mce_datapipe_quit_bindings(&mia_datapipe_bindings); } /* ========================================================================= * diff --git a/modules/led.c b/modules/led.c index 7d1b5b48..5c098144 100644 --- a/modules/led.c +++ b/modules/led.c @@ -3156,7 +3156,7 @@ static datapipe_bindings_t mce_led_datapipe_bindings = static void mce_led_datapipes_init(void) { - datapipe_bindings_init(&mce_led_datapipe_bindings); + mce_datapipe_init_bindings(&mce_led_datapipe_bindings); } /** Remove triggers/filters from datapipes @@ -3164,7 +3164,7 @@ mce_led_datapipes_init(void) static void mce_led_datapipes_quit(void) { - datapipe_bindings_quit(&mce_led_datapipe_bindings); + mce_datapipe_quit_bindings(&mce_led_datapipe_bindings); } /** diff --git a/modules/packagekit.c b/modules/packagekit.c index 36ce89ab..1a1c75f4 100644 --- a/modules/packagekit.c +++ b/modules/packagekit.c @@ -535,14 +535,14 @@ static datapipe_bindings_t xpkgkit_datapipe_bindings = */ static void xpkgkit_datapipe_init(void) { - datapipe_bindings_init(&xpkgkit_datapipe_bindings); + mce_datapipe_init_bindings(&xpkgkit_datapipe_bindings); } /** Remove triggers/filters from datapipes */ static void xpkgkit_datapipe_quit(void) { - datapipe_bindings_quit(&xpkgkit_datapipe_bindings); + mce_datapipe_quit_bindings(&xpkgkit_datapipe_bindings); } /* ========================================================================= * diff --git a/modules/sensor-gestures.c b/modules/sensor-gestures.c index 04044eb3..f648009b 100644 --- a/modules/sensor-gestures.c +++ b/modules/sensor-gestures.c @@ -426,13 +426,13 @@ static datapipe_bindings_t sg_datapipe_bindings = */ static void sg_datapipe_init(void) { - datapipe_bindings_init(&sg_datapipe_bindings); + mce_datapipe_init_bindings(&sg_datapipe_bindings); } /** Remove triggers/filters from datapipes */ static void sg_datapipe_quit(void) { - datapipe_bindings_quit(&sg_datapipe_bindings); + mce_datapipe_quit_bindings(&sg_datapipe_bindings); } /* ========================================================================= * diff --git a/modules/usbmode.c b/modules/usbmode.c index b2ad4187..7703d89e 100644 --- a/modules/usbmode.c +++ b/modules/usbmode.c @@ -386,14 +386,14 @@ static datapipe_bindings_t usbmode_datapipe_bindings = static void usbmode_datapipe_init(void) { // triggers - datapipe_bindings_init(&usbmode_datapipe_bindings); + mce_datapipe_init_bindings(&usbmode_datapipe_bindings); } /** Remove triggers/filters from datapipes */ static void usbmode_datapipe_quit(void) { // triggers - datapipe_bindings_quit(&usbmode_datapipe_bindings); + mce_datapipe_quit_bindings(&usbmode_datapipe_bindings); } /* ========================================================================= * diff --git a/powerkey.c b/powerkey.c index a28cbe93..ab39f4e8 100644 --- a/powerkey.c +++ b/powerkey.c @@ -3179,7 +3179,7 @@ static datapipe_bindings_t pwrkey_datapipe_bindings = static void pwrkey_datapipes_init(void) { - datapipe_bindings_init(&pwrkey_datapipe_bindings); + mce_datapipe_init_bindings(&pwrkey_datapipe_bindings); } /** Remove triggers/filters from datapipes @@ -3187,7 +3187,7 @@ pwrkey_datapipes_init(void) static void pwrkey_datapipes_quit(void) { - datapipe_bindings_quit(&pwrkey_datapipe_bindings); + mce_datapipe_quit_bindings(&pwrkey_datapipe_bindings); } /* ========================================================================= * diff --git a/tklock.c b/tklock.c index c1e8831a..3aaa0768 100644 --- a/tklock.c +++ b/tklock.c @@ -2289,14 +2289,14 @@ static datapipe_bindings_t tklock_datapipe_bindings = */ static void tklock_datapipe_init(void) { - datapipe_bindings_init(&tklock_datapipe_bindings); + mce_datapipe_init_bindings(&tklock_datapipe_bindings); } /** Remove triggers/filters from datapipes */ static void tklock_datapipe_quit(void) { - datapipe_bindings_quit(&tklock_datapipe_bindings); + mce_datapipe_quit_bindings(&tklock_datapipe_bindings); } /* ========================================================================= *