Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[worker] Use module prefix also for static variables
Gives context and makes locating points of use easier.

Signed-off-by: Simo Piiroinen <simo.piiroinen@jollamobile.com>
  • Loading branch information
spiiroin committed Sep 5, 2018
1 parent 176b53c commit 700b8f5
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 23 deletions.
38 changes: 19 additions & 19 deletions src/usb_moded-worker.c
Expand Up @@ -53,9 +53,9 @@ static bool worker_is_mtpd_running (void);
static bool worker_stop_mtpd (void);
static bool worker_start_mtpd (void);
static bool worker_switch_to_charging (void);
const char *worker_get_usb_module (void);
bool worker_set_usb_module (const char *module);
void worker_clear_usb_module (void);
const char *worker_get_kernel_module (void);
bool worker_set_kernel_module (const char *module);
void worker_clear_kernel_module (void);
struct mode_list_elem *worker_get_usb_mode_data (void);
void worker_set_usb_mode_data (struct mode_list_elem *data);
static const char *worker_get_activated_mode_locked(void);
Expand Down Expand Up @@ -236,9 +236,9 @@ static bool worker_switch_to_charging(void)
goto SUCCESS;

if( modules_in_use() ) {
if( worker_set_usb_module(MODULE_MASS_STORAGE) )
if( worker_set_kernel_module(MODULE_MASS_STORAGE) )
goto SUCCESS;
worker_set_usb_module(MODULE_NONE);
worker_set_kernel_module(MODULE_NONE);
}

log_err("switch to charging mode failed");
Expand All @@ -253,31 +253,31 @@ static bool worker_switch_to_charging(void)
* ------------------------------------------------------------------------- */

/** The module name for the specific mode */
char *usbmoded_module = NULL;
char *worker_kernel_module = NULL;

/** get the supposedly loaded module
*
* @return The name of the loaded module
*
*/
const char * worker_get_usb_module(void)
const char * worker_get_kernel_module(void)
{
return usbmoded_module ?: MODULE_NONE;
return worker_kernel_module ?: MODULE_NONE;
}

/** set the loaded module
*
* @param module The module name for the requested mode
*
*/
bool worker_set_usb_module(const char *module)
bool worker_set_kernel_module(const char *module)
{
bool ack = false;

if( !module )
module = MODULE_NONE;

const char *current = worker_get_usb_module();
const char *current = worker_get_kernel_module();

log_debug("current module: %s -> %s", current, module);

Expand All @@ -287,31 +287,31 @@ bool worker_set_usb_module(const char *module)
if( modules_unload_module(current) != 0 )
goto EXIT;

free(usbmoded_module), usbmoded_module = 0;
free(worker_kernel_module), worker_kernel_module = 0;

if( modules_load_module(module) != 0 )
goto EXIT;

if( g_strcmp0(module, MODULE_NONE) )
usbmoded_module = strdup(module);
worker_kernel_module = strdup(module);

SUCCESS:
ack = true;
EXIT:
return ack;
}

void worker_clear_usb_module(void)
void worker_clear_kernel_module(void)
{
free(usbmoded_module), usbmoded_module = 0;
free(worker_kernel_module), worker_kernel_module = 0;
}

/* ------------------------------------------------------------------------- *
* MODE_DATA
* ------------------------------------------------------------------------- */

/** Contains the mode data */
struct mode_list_elem *usbmoded_data = NULL;
struct mode_list_elem *worker_mode_data = NULL;

/** get the usb mode data
*
Expand All @@ -320,7 +320,7 @@ struct mode_list_elem *usbmoded_data = NULL;
*/
struct mode_list_elem * worker_get_usb_mode_data(void)
{
return usbmoded_data;
return worker_mode_data;
}

/** set the mode_list_elem data
Expand All @@ -330,7 +330,7 @@ struct mode_list_elem * worker_get_usb_mode_data(void)
*/
void worker_set_usb_mode_data(struct mode_list_elem *data)
{
usbmoded_data = data;
worker_mode_data = data;
}

/* ------------------------------------------------------------------------- *
Expand Down Expand Up @@ -498,7 +498,7 @@ worker_switch_to_mode(const char *mode)
goto FAILED;
}

if( !worker_set_usb_module(data->mode_module) )
if( !worker_set_kernel_module(data->mode_module) )
goto FAILED;

if( !modesetting_enter_dynamic_mode() )
Expand Down Expand Up @@ -528,7 +528,7 @@ worker_switch_to_mode(const char *mode)

override = MODE_UNDEFINED;
log_warning("mode setting failed, fallback to %s", override);
worker_set_usb_module(MODULE_NONE);
worker_set_kernel_module(MODULE_NONE);

SUCCESS:

Expand Down
6 changes: 3 additions & 3 deletions src/usb_moded-worker.h
Expand Up @@ -37,9 +37,9 @@
/* -- worker -- */

bool worker_bailing_out (void);
const char *worker_get_usb_module (void);
bool worker_set_usb_module (const char *module);
void worker_clear_usb_module (void);
const char *worker_get_kernel_module (void);
bool worker_set_kernel_module (const char *module);
void worker_clear_kernel_module (void);
struct mode_list_elem *worker_get_usb_mode_data (void);
void worker_set_usb_mode_data (struct mode_list_elem *data);
void worker_request_hardware_mode(const char *mode);
Expand Down
2 changes: 1 addition & 1 deletion src/usb_moded.c
Expand Up @@ -393,7 +393,7 @@ static void usbmoded_cleanup(void)
#endif

/* Release dynamic memory */
worker_clear_usb_module();
worker_clear_kernel_module();
worker_clear_hardware_mode();
control_clear_cable_state();
control_clear_internal_mode();
Expand Down

0 comments on commit 700b8f5

Please sign in to comment.