Skip to content

Commit

Permalink
rfkill: export global states to rfkill-input
Browse files Browse the repository at this point in the history
Export the the global switch states to rfkill-input.  This is needed to
properly implement KEY_* handling without disregarding the initial state.

Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Cc: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Henrique de Moraes Holschuh authored and John W. Linville committed Oct 31, 2008
1 parent cf4b4aa commit 68d2413
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 0 deletions.
1 change: 1 addition & 0 deletions net/rfkill/rfkill-input.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@
void rfkill_switch_all(enum rfkill_type type, enum rfkill_state state);
void rfkill_epo(void);
void rfkill_restore_states(void);
enum rfkill_state rfkill_get_global_state(const enum rfkill_type type);

#endif /* __RFKILL_INPUT_H */
14 changes: 14 additions & 0 deletions net/rfkill/rfkill.c
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,19 @@ void rfkill_restore_states(void)
}
EXPORT_SYMBOL_GPL(rfkill_restore_states);

/**
* rfkill_get_global_state - returns global state for a type
* @type: the type to get the global state of
*
* Returns the current global state for a given wireless
* device type.
*/
enum rfkill_state rfkill_get_global_state(const enum rfkill_type type)
{
return rfkill_global_states[type].current_state;
}
EXPORT_SYMBOL_GPL(rfkill_get_global_state);

/**
* rfkill_force_state - Force the internal rfkill radio state
* @rfkill: pointer to the rfkill class to modify.
Expand Down Expand Up @@ -834,6 +847,7 @@ int rfkill_set_default(enum rfkill_type type, enum rfkill_state state)

if (!test_and_set_bit(type, rfkill_states_lockdflt)) {
rfkill_global_states[type].default_state = state;
rfkill_global_states[type].current_state = state;
error = 0;
} else
error = -EPERM;
Expand Down

0 comments on commit 68d2413

Please sign in to comment.