Skip to content

Commit

Permalink
[mce] Expand also intra-line tabs
Browse files Browse the repository at this point in the history
Expand all tabs in source files that are supposed to use only spaces for
indentation.

Signed-off-by: Simo Piiroinen <simo.piiroinen@jollamobile.com>
  • Loading branch information
spiiroin committed Sep 18, 2018
1 parent 8e8fa84 commit 6633e34
Show file tree
Hide file tree
Showing 13 changed files with 110 additions and 110 deletions.
2 changes: 1 addition & 1 deletion Makefile
Expand Up @@ -660,7 +660,7 @@ NORMALIZE_UNKNOWN = $(filter-out $(NORMALIZE_KNOWN), $(SOURCEFILES_ALL))

normalize::
normalize_whitespace -M Makefile
normalize_whitespace -b -e -s $(NORMALIZE_USES_SPC)
normalize_whitespace -t -b -e -s $(NORMALIZE_USES_SPC)
normalize_whitespace -T -e -s $(NORMALIZE_USES_TAB)
ifneq ($(NORMALIZE_UNKNOWN),)
@echo "Unknown source files: $(NORMALIZE_UNKNOWN)"
Expand Down
42 changes: 21 additions & 21 deletions bme-dbus-names.h
Expand Up @@ -4,33 +4,33 @@
#ifndef _BME_DBUS_NAMES_H_
#define _BME_DBUS_NAMES_H_

#define DBUS_BROADCAST "org.freedesktop.DBus.Broadcast"
#define DBUS_BROADCAST "org.freedesktop.DBus.Broadcast"

#define BME_SERVICE "com.nokia.bme"
#define BME_SERVICE "com.nokia.bme"

#define BME_REQUEST_IF "com.nokia.bme.request"
#define BME_REQUEST_PATH "/com/nokia/bme/request"
#define BME_REQUEST_IF "com.nokia.bme.request"
#define BME_REQUEST_PATH "/com/nokia/bme/request"

#define BME_SIGNAL_IF "com.nokia.bme.signal"
#define BME_SIGNAL_PATH "/com/nokia/bme/signal"
#define BME_SIGNAL_IF "com.nokia.bme.signal"
#define BME_SIGNAL_PATH "/com/nokia/bme/signal"

#define BME_ERROR_FATAL "com.nokia.bme.error.fatal"
#define BME_ERROR_INVALID_ARGS "org.freedesktop.DBus.Error.InvalidArgs"
#define BME_ERROR_FATAL "com.nokia.bme.error.fatal"
#define BME_ERROR_INVALID_ARGS "org.freedesktop.DBus.Error.InvalidArgs"

#define BME_BATTERY_STATE_UPDATE "battery_state_changed"
#define BME_BATTERY_FULL "battery_full"
#define BME_BATTERY_OK "battery_ok"
#define BME_BATTERY_LOW "battery_low"
#define BME_BATTERY_EMPTY "battery_empty"
#define BME_BATTERY_TIMELEFT "battery_timeleft"
#define BME_BATTERY_STATE_UPDATE "battery_state_changed"
#define BME_BATTERY_FULL "battery_full"
#define BME_BATTERY_OK "battery_ok"
#define BME_BATTERY_LOW "battery_low"
#define BME_BATTERY_EMPTY "battery_empty"
#define BME_BATTERY_TIMELEFT "battery_timeleft"

#define BME_CHARGER_CONNECTED "charger_connected"
#define BME_CHARGER_DISCONNECTED "charger_disconnected"
#define BME_CHARGER_CHARGING_ON "charger_charging_on"
#define BME_CHARGER_CHARGING_OFF "charger_charging_off"
#define BME_CHARGER_CHARGING_FAILED "charger_charging_failed"
#define BME_CHARGER_CONNECTED "charger_connected"
#define BME_CHARGER_DISCONNECTED "charger_disconnected"
#define BME_CHARGER_CHARGING_ON "charger_charging_on"
#define BME_CHARGER_CHARGING_OFF "charger_charging_off"
#define BME_CHARGER_CHARGING_FAILED "charger_charging_failed"

#define BME_STATUS_INFO_REQ "status_info_req"
#define BME_TIMELEFT_INFO_REQ "timeleft_info_req"
#define BME_STATUS_INFO_REQ "status_info_req"
#define BME_TIMELEFT_INFO_REQ "timeleft_info_req"

#endif /* _BME_DBUS_NAMES_H_ */
70 changes: 35 additions & 35 deletions event-switches.h
Expand Up @@ -24,112 +24,112 @@
#include <glib.h>

/** Path to the SysFS interface for the lock flicker-key status */
#define MCE_FLICKER_KEY_STATE_PATH "/sys/devices/platform/gpio-switch/kb_lock/state"
#define MCE_FLICKER_KEY_STATE_PATH "/sys/devices/platform/gpio-switch/kb_lock/state"

/** Value for the lock flicker-key active state */
#define MCE_FLICKER_KEY_ACTIVE "closed"
#define MCE_FLICKER_KEY_ACTIVE "closed"

/** Value for the lock flicker-key inactive state */
#define MCE_FLICKER_KEY_INACTIVE "open"
#define MCE_FLICKER_KEY_INACTIVE "open"

/** Path to the SysFS interface for the keyboard slide status */
#define MCE_KBD_SLIDE_STATE_PATH "/sys/devices/platform/gpio-switch/slide/state"
#define MCE_KBD_SLIDE_STATE_PATH "/sys/devices/platform/gpio-switch/slide/state"

/** Value for the keyboard slide open state */
#define MCE_KBD_SLIDE_OPEN "open"
#define MCE_KBD_SLIDE_OPEN "open"

/** Value for the keyboard slide closed state */
#define MCE_KBD_SLIDE_CLOSED "closed"
#define MCE_KBD_SLIDE_CLOSED "closed"

/** Path to the SysFS interface for the camera focus state */
#define MCE_CAM_FOCUS_STATE_PATH "/sys/devices/platform/gpio-switch/cam_focus/state"
#define MCE_CAM_FOCUS_STATE_PATH "/sys/devices/platform/gpio-switch/cam_focus/state"

/** Value for the camera focus active state */
#define MCE_CAM_FOCUS_ACTIVE "active"
#define MCE_CAM_FOCUS_ACTIVE "active"

/** Value for the camera focus inactive state */
#define MCE_CAM_FOCUS_INACTIVE "inactive"
#define MCE_CAM_FOCUS_INACTIVE "inactive"

/** SysFS interface to enable/disable camera focus IRQs */
#define MCE_CAM_FOCUS_DISABLE_PATH "/sys/devices/platform/gpio-switch/cam_focus/disable"
#define MCE_CAM_FOCUS_DISABLE_PATH "/sys/devices/platform/gpio-switch/cam_focus/disable"

/** Path to the SysFS interface for the camera launch state */
#define MCE_CAM_LAUNCH_STATE_PATH "/sys/devices/platform/gpio-switch/cam_launch/state"
#define MCE_CAM_LAUNCH_STATE_PATH "/sys/devices/platform/gpio-switch/cam_launch/state"

/** Value for the camera launch active state */
#define MCE_CAM_LAUNCH_ACTIVE "active"
#define MCE_CAM_LAUNCH_ACTIVE "active"

/** Value for the camera launch inactive state */
#define MCE_CAM_LAUNCH_INACTIVE "inactive"
#define MCE_CAM_LAUNCH_INACTIVE "inactive"

/** Path to the SysFS interface for the lid cover status */
#define MCE_LID_COVER_STATE_PATH "/sys/devices/platform/gpio-switch/prot_shell/cover_switch"
#define MCE_LID_COVER_STATE_PATH "/sys/devices/platform/gpio-switch/prot_shell/cover_switch"

/** Value for the lid cover open state */
#define MCE_LID_COVER_OPEN "open"
#define MCE_LID_COVER_OPEN "open"

/** Value for the lid cover closed state */
#define MCE_LID_COVER_CLOSED "closed"
#define MCE_LID_COVER_CLOSED "closed"

/** Path to the SysFS interface for the proximity sensor status */
#define MCE_PROXIMITY_SENSOR_STATE_PATH "/sys/devices/platform/gpio-switch/proximity/state"
#define MCE_PROXIMITY_SENSOR_STATE_PATH "/sys/devices/platform/gpio-switch/proximity/state"

/** Value for the proximity sensor open state */
#define MCE_PROXIMITY_SENSOR_OPEN "open"
#define MCE_PROXIMITY_SENSOR_OPEN "open"

/** Value for the proximity sensor closed state */
#define MCE_PROXIMITY_SENSOR_CLOSED "closed"
#define MCE_PROXIMITY_SENSOR_CLOSED "closed"

/** SysFS interface to enable/disable proximity sensor IRQs */
#define MCE_PROXIMITY_SENSOR_DISABLE_PATH "/sys/devices/platform/gpio-switch/proximity/disable"
#define MCE_PROXIMITY_SENSOR_DISABLE_PATH "/sys/devices/platform/gpio-switch/proximity/disable"

/**
* Path to the SysFS interface for the MUSB HDRC USB cable status;
* RX-51
*/
#define MCE_MUSB_OMAP3_USB_CABLE_STATE_PATH "/sys/class/i2c-adapter/i2c-1/1-0048/twl4030_usb/vbus"
#define MCE_MUSB_OMAP3_USB_CABLE_STATE_PATH "/sys/class/i2c-adapter/i2c-1/1-0048/twl4030_usb/vbus"

/** Value for the MUSB HDRC USB cable connected state */
#define MCE_MUSB_OMAP3_USB_CABLE_CONNECTED "1"
#define MCE_MUSB_OMAP3_USB_CABLE_CONNECTED "1"

/** Value for the MUSB HDRC USB cable disconnected state */
#define MCE_MUSB_OMAP3_USB_CABLE_DISCONNECTED "0"
#define MCE_MUSB_OMAP3_USB_CABLE_DISCONNECTED "0"

/** Path to the SysFS interface for the RX-51 MMC0 cover status */
#define MCE_MMC0_COVER_STATE_PATH "/sys/class/mmc_host/mmc0/cover_switch"
#define MCE_MMC0_COVER_STATE_PATH "/sys/class/mmc_host/mmc0/cover_switch"

/** Value for the RX-51 MMC0 cover open state */
#define MCE_MMC_COVER_OPEN "open"
#define MCE_MMC_COVER_OPEN "open"

/** Value for the RX-51 MMC0 cover closed state */
#define MCE_MMC_COVER_CLOSED "closed"
#define MCE_MMC_COVER_CLOSED "closed"

/** Path to the SysFS interface for the MMC cover status */
#define MCE_MMC_COVER_STATE_PATH "/sys/devices/platform/gpio-switch/mmci-omap.2/cover_switch"
#define MCE_MMC_COVER_STATE_PATH "/sys/devices/platform/gpio-switch/mmci-omap.2/cover_switch"

/** Value for the MMC cover open state */
#define MCE_MMC_COVER_OPEN "open"
#define MCE_MMC_COVER_OPEN "open"

/** Value for the MMC cover closed state */
#define MCE_MMC_COVER_CLOSED "closed"
#define MCE_MMC_COVER_CLOSED "closed"

/** Path to the SysFS interface for the lens cover status */
#define MCE_LENS_COVER_STATE_PATH "/sys/devices/platform/gpio-switch/cam_shutter/state"
#define MCE_LENS_COVER_STATE_PATH "/sys/devices/platform/gpio-switch/cam_shutter/state"

/** Value for the lens cover open state */
#define MCE_LENS_COVER_OPEN "open"
#define MCE_LENS_COVER_OPEN "open"

/** Value for the lens cover closed state */
#define MCE_LENS_COVER_CLOSED "closed"
#define MCE_LENS_COVER_CLOSED "closed"

/** Path to the SysFS interface for the battery cover status */
#define MCE_BATTERY_COVER_STATE_PATH "/sys/devices/platform/gpio-switch/bat_cover/cover_switch"
#define MCE_BATTERY_COVER_STATE_PATH "/sys/devices/platform/gpio-switch/bat_cover/cover_switch"

/** Value for the battery cover open state */
#define MCE_BATTERY_COVER_OPEN "open"
#define MCE_BATTERY_COVER_OPEN "open"

/** Value for the battery cover closed state */
#define MCE_BATTERY_COVER_CLOSED "closed"
#define MCE_BATTERY_COVER_CLOSED "closed"

/* When MCE is made modular, this will be handled differently */
gboolean mce_switches_init(void);
Expand Down
8 changes: 4 additions & 4 deletions mce-modules.h
Expand Up @@ -24,16 +24,16 @@
#include <glib.h>

/** Name of Modules configuration group */
#define MCE_CONF_MODULES_GROUP "Modules"
#define MCE_CONF_MODULES_GROUP "Modules"

/** Name of configuration key for module path */
#define MCE_CONF_MODULES_PATH "ModulePath"
#define MCE_CONF_MODULES_PATH "ModulePath"

/** Name of configuration key for modules to load */
#define MCE_CONF_MODULES_MODULES "Modules"
#define MCE_CONF_MODULES_MODULES "Modules"

/** Default value for module path */
#define DEFAULT_MCE_MODULE_PATH "/usr/lib/mce/modules"
#define DEFAULT_MCE_MODULE_PATH "/usr/lib/mce/modules"

void mce_modules_dump_info(void);
gboolean mce_modules_init(void);
Expand Down
2 changes: 1 addition & 1 deletion mce-sensorfw.c
Expand Up @@ -240,7 +240,7 @@ sensor_id_available(sensor_id_t id)
* ========================================================================= */

/** How long to wait before retrying failed sensorfw dbus requests */
#define SENSORFW_RETRY_DELAY_MS 10000
#define SENSORFW_RETRY_DELAY_MS 10000

/** D-Bus name of the sensord service */
#define SENSORFW_SERVICE "com.nokia.SensorService"
Expand Down
8 changes: 4 additions & 4 deletions modetransition.h
Expand Up @@ -24,11 +24,11 @@
#include <glib.h>

/** Path to the boot detection file */
#define MCE_BOOTUP_FILENAME G_STRINGIFY(MCE_RUN_DIR) "/boot"
#define MCE_BOOTUP_FILENAME G_STRINGIFY(MCE_RUN_DIR) "/boot"

#define SPLASH_DELAY 500 /**< 0.5 seconds */
#define ACTDEAD_DELAY 1500 /**< 1.5 seconds */
#define POWERUP_DELAY 3500 /**< 3.5 seconds */
#define SPLASH_DELAY 500 /**< 0.5 seconds */
#define ACTDEAD_DELAY 1500 /**< 1.5 seconds */
#define POWERUP_DELAY 3500 /**< 3.5 seconds */

/* When MCE is made modular, this will be handled differently */
gboolean mce_mode_init(void);
Expand Down
6 changes: 3 additions & 3 deletions modules/audiorouting.c
Expand Up @@ -30,7 +30,7 @@
#include <gmodule.h>

/** Module name */
#define MODULE_NAME "audiorouting"
#define MODULE_NAME "audiorouting"

/** Functionality provided by this module */
static const gchar *const provides[] = { MODULE_NAME, NULL };
Expand All @@ -46,10 +46,10 @@ G_MODULE_EXPORT module_info_struct module_info = {
};

/** D-Bus interface for the policy framework */
#define POLICY_DBUS_INTERFACE "com.nokia.policy"
#define POLICY_DBUS_INTERFACE "com.nokia.policy"

/** D-Bus signal for actions from the policy framework */
#define POLICY_AUDIO_ACTIONS "audio_actions"
#define POLICY_AUDIO_ACTIONS "audio_actions"

/** Bits for members values available in ohm_decision_t */
enum
Expand Down
14 changes: 7 additions & 7 deletions modules/camera.h
Expand Up @@ -22,24 +22,24 @@
#define _CAMERA_H_

/** Path to the SysFS interface for the camera active state */
#define CAMERA_ACTIVE_STATE_PATH "/sys/devices/platform/omap24xxcam/streaming"
#define CAMERA_ACTIVE_STATE_PATH "/sys/devices/platform/omap24xxcam/streaming"

/** Value for the camera active state */
#define MCE_CAMERA_ACTIVE "active"
#define MCE_CAMERA_ACTIVE "active"

/** Value for the camera inactive state */
#define MCE_CAMERA_INACTIVE "inactive"
#define MCE_CAMERA_INACTIVE "inactive"

/** Path to the SysFS interface for the camera pop-out state */
#define CAMERA_POPOUT_STATE_PATH "/sys/devices/platform/gpio-switch/cam_act/state"
#define CAMERA_POPOUT_STATE_PATH "/sys/devices/platform/gpio-switch/cam_act/state"

/** Value for the camera in popped out state */
#define MCE_CAMERA_POPPED_OUT "active"
#define MCE_CAMERA_POPPED_OUT "active"

/** Value for the camera in popped in state */
#define MCE_CAMERA_POPPED_IN "inactive"
#define MCE_CAMERA_POPPED_IN "inactive"

/** Default fallback setting for the touchscreen/keypad autolock */
#define DEFAULT_CAMERA_POPOUT_UNLOCK TRUE /* FALSE / TRUE */
#define DEFAULT_CAMERA_POPOUT_UNLOCK TRUE /* FALSE / TRUE */

#endif /* _CAMERA_H_ */
26 changes: 13 additions & 13 deletions modules/keypad.h
Expand Up @@ -22,44 +22,44 @@
#define _KEYPAD_H_

/** Path to keypad backlight fade-time /sys entry */
#define MCE_KEYPAD_BACKLIGHT_FADETIME_SYS_PATH MCE_LED_DIRECT_SYS_PATH MCE_LED_COVER_PREFIX "/time"
#define MCE_KEYPAD_BACKLIGHT_FADETIME_SYS_PATH MCE_LED_DIRECT_SYS_PATH MCE_LED_COVER_PREFIX "/time"

/** Path to keyboard backlight /sys directory */
#define MCE_KEYBOARD_BACKLIGHT_SYS_PATH "/sys/class/leds/keyboard"
#define MCE_KEYBOARD_BACKLIGHT_SYS_PATH "/sys/class/leds/keyboard"

/** Path to the SysFS interface for the keyboard backlight fade-time */
#define MCE_KEYBOARD_BACKLIGHT_FADETIME_SYS_PATH MCE_LED_DIRECT_SYS_PATH MCE_LED_KEYBOARD_PREFIX "/time"
#define MCE_KEYBOARD_BACKLIGHT_FADETIME_SYS_PATH MCE_LED_DIRECT_SYS_PATH MCE_LED_KEYBOARD_PREFIX "/time"

/** Maximum Lysti backlight LED current */
#define MAXIMUM_LYSTI_BACKLIGHT_LED_CURRENT 50 /* 5 mA */
#define MAXIMUM_LYSTI_BACKLIGHT_LED_CURRENT 50 /* 5 mA */

/** Default key backlight brightness */
#define DEFAULT_KEY_BACKLIGHT_LEVEL 255
#define DEFAULT_KEY_BACKLIGHT_LEVEL 255

/** Default key backlight timeout in seconds */
#define DEFAULT_KEY_BACKLIGHT_TIMEOUT 30 /* 30 s */
#define DEFAULT_KEY_BACKLIGHT_TIMEOUT 30 /* 30 s */

/** Default key backlight fade in time in milliseconds */
#define DEFAULT_KEY_BACKLIGHT_FADE_IN_TIME 250 /* 250 ms */
#define DEFAULT_KEY_BACKLIGHT_FADE_IN_TIME 250 /* 250 ms */

/** Default key backlight fade out time in milliseconds */
#define DEFAULT_KEY_BACKLIGHT_FADE_OUT_TIME 1000 /* 1000 ms */
#define DEFAULT_KEY_BACKLIGHT_FADE_OUT_TIME 1000 /* 1000 ms */

#ifndef MCE_CONF_KEYPAD_GROUP
/** Name of Keypad configuration group */
# define MCE_CONF_KEYPAD_GROUP "KeyPad"
# define MCE_CONF_KEYPAD_GROUP "KeyPad"
#endif

/** Name of configuration key for keyboard backlight timeout */
#define MCE_CONF_KEY_BACKLIGHT_TIMEOUT "BacklightTimeout"
#define MCE_CONF_KEY_BACKLIGHT_TIMEOUT "BacklightTimeout"

/** Name of configuration key for keyboard backlight fade in time */
#define MCE_CONF_KEY_BACKLIGHT_FADE_IN_TIME "BacklightFadeInTime"
#define MCE_CONF_KEY_BACKLIGHT_FADE_IN_TIME "BacklightFadeInTime"

/** Name of configuration key for keyboard backlight fade out time */
#define MCE_CONF_KEY_BACKLIGHT_FADE_OUT_TIME "BacklightFadeOutTime"
#define MCE_CONF_KEY_BACKLIGHT_FADE_OUT_TIME "BacklightFadeOutTime"

/** Name of configuration key for keyboard backlight path */
#define MCE_CONF_KEY_BACKLIGHT_SYS_PATH "BrightnessDirectory"
#define MCE_CONF_KEY_BACKLIGHT_SYS_PATH "BrightnessDirectory"

#endif /* _KEYPAD_H_ */

0 comments on commit 6633e34

Please sign in to comment.