diff options
107 files changed, 292 insertions, 292 deletions
@@ -10,7 +10,7 @@ The Cornucopia libraries contain utility functions for freesmartphone.org API im Paradigm: Test Driven Development Indentation: -bad -bap -bbb -bl -bli0 -bs -cbi4 -cli4 -i4 -l100 -lp - -nbbo -nbc -ncs -npcs -npsl -nut + -nbbo -nbc -ncs -npcs -npsl -nut -pi0 -prs-saf -sai -saw -sbi4 -st Note: Some of this code may need several Vala patches that have not been integrated into @@ -1,5 +1,5 @@ ==libfsobasics== -* add SmartKeyFile.pathValue( section, key, constraints, defaultpath ) querying for a path from the configuration, +* add SmartKeyFile.pathValue( section, key, constraints, defaultpath ) querying for a path from the configuration, checking several whether the constraints are met; if not, return the default. * make read/write a bit more flexible ** read/write: sometimes it should not complain, if there is no file diff --git a/docs/fsogsmd/freescale_neptune/callreceive.sample b/docs/fsogsmd/freescale_neptune/callreceive.sample index 15827a54..be69f1ba 100644 --- a/docs/fsogsmd/freescale_neptune/callreceive.sample +++ b/docs/fsogsmd/freescale_neptune/callreceive.sample @@ -39,4 +39,4 @@ (20080702.2038.27: got 14 bytes from /dev/mux6: '\r\n+CIEV: 3,0\r\n') (20080702.2038.27: got 14 bytes from /dev/mux7: '\r\n+CIEV: 3,0\r\n') (20080702.2038.27: got 14 bytes from /dev/mux0: '\r\n+CIEV: 1,5\r\n') - + diff --git a/docs/fsogsmd/freescale_neptune/modem b/docs/fsogsmd/freescale_neptune/modem index d9a58a03..8a7898a0 100644 --- a/docs/fsogsmd/freescale_neptune/modem +++ b/docs/fsogsmd/freescale_neptune/modem @@ -2,20 +2,20 @@ === Behaviour === -* +CFUN=0;+CFUN=1 does _not_ reset the PIN lock; sending these commands too often / too fast confuses the +* +CFUN=0;+CFUN=1 does _not_ reset the PIN lock; sending these commands too often / too fast confuses the modem. * Giving a valid PIN to unlock starts autoregister (likewise, for an unlocked SIM +CFUN=1 will autoregister) - + * Modem needs +EPMS? and +EGML=4 before +CGML (and friends) will work. Said commands will only work once after BP initialization though. Afterwards they will return +CMS ERROR 500 (unknown error). * Unregistering is generally frowned upon -- if you query the operator too early after unregistering, you'll get garbage: - 2008.07.02 22:19:38 ogsmd DEBUG <MiscChannel via /dev/mux6>: got 31 bytes from: '\r\n+COPS: 0,2,"\x10*Zd\x12\x04I\xdc"\r\n\r\nOK\r\n' + 2008.07.02 22:19:38 ogsmd DEBUG <MiscChannel via /dev/mux6>: got 31 bytes from: '\r\n+COPS: 0,2,"\x10*Zd\x12\x04I\xdc"\r\n\r\nOK\r\n' Without antenna off/on, it doesn't seem to be possible to reregister again -* After +CFUN=1 (previously +CFUN=0), the modem sends quite a bunch of URCs, e.g. +CMSM: 3 and +EMSR: 0, +* After +CFUN=1 (previously +CFUN=0), the modem sends quite a bunch of URCs, e.g. +CMSM: 3 and +EMSR: 0, +EFLEX, and much more. * To enable USB charging, you need to issue +USBSTAT=255,1 @@ -42,7 +42,7 @@ modem. * +CLIN: 0 indicates an incoming call on line 0 -* +CMSM: 3 means "SIM unlocked"; +CMSM: 0 means "SIM locked". If the SIM slot is empty, it will not appear at +* +CMSM: 3 means "SIM unlocked"; +CMSM: 0 means "SIM locked". If the SIM slot is empty, it will not appear at all after +CFUN=1 (before +ESCR) * +EHOZ: 0,"" (homezone indication, homezone name) diff --git a/docs/fsogsmd/lessons b/docs/fsogsmd/lessons index 23b0d727..673a634f 100644 --- a/docs/fsogsmd/lessons +++ b/docs/fsogsmd/lessons @@ -26,19 +26,19 @@ data. When we are actually waiting for an answer and it triggers, try to escalate resetting the parser and/or (transparently) relaunching the last command. [done in frameworkd] [DONE] - + * Per-command retries _might_ make sense. * Dragging an error callback around for every command does not make sense, if the error refers to channel errors (such as a timeout), as opposed to an actual command response error (which makes sense). [DONE] - + * If there's no reliable way to detect unsolicited responses (such as a physical or a virtual RING line) _and_ the modem does not guarantee delaying them between a request and a response, then the low level parser needs to be fed a list of valid prefixes for every command. [done in frameworkd] [DONE] - + * It _might_ make sense to define every AT command as a struct, including: * a list of valid prefixes, * a regular expression that groups values into elements, diff --git a/docs/fsogsmd/qualcomm_htc/urcs b/docs/fsogsmd/qualcomm_htc/urcs index b18e6e32..6c85e946 100644 --- a/docs/fsogsmd/qualcomm_htc/urcs +++ b/docs/fsogsmd/qualcomm_htc/urcs @@ -6,5 +6,5 @@ Qualcomm HTC Proprietary URCs [WCDMA] Current RRC Status = 0 -+GTKI: ++GTKI: D03D810301250082028182050C42415345204469656E7374658F0901534D5320496E666F8F0C0253707261636820496E666F8F0B034D756C74696D65646961 diff --git a/docs/fsogsmd/ti_calypso/modem b/docs/fsogsmd/ti_calypso/modem index dc59d022..6e2757d5 100644 --- a/docs/fsogsmd/ti_calypso/modem +++ b/docs/fsogsmd/ti_calypso/modem @@ -4,14 +4,14 @@ * Before entering the multiplex mode, you have to set echo off (ATE0), otherwise you won't get any 07.10 packets in return - + * No response to test commands === AT Level === * On channel init, we better send \x1a first -- just in case something crashed while we were inside a multiline request command - + * +CCLK? violates 07.07, it doesn't use %02d, but %d for the individual components. Moreover, +CCLK needs the UTC offset, but doesn't honor it. diff --git a/docs/fsogsmd/ussd-session b/docs/fsogsmd/ussd-session index 4fb9e1b1..9c425de8 100644 --- a/docs/fsogsmd/ussd-session +++ b/docs/fsogsmd/ussd-session @@ -88,5 +88,5 @@ OK +CUSD: 0,"Sie haben noch 5091,13 MB Internet zur Verf~gung. Kostenlos bei o2 Prepaid! Individuelle Tarifberatung und pers|nlicher Service - 017955282",15 - + OK diff --git a/fsodatad/Makefile.decl b/fsodatad/Makefile.decl index 20ad96db..31c69513 100644 --- a/fsodatad/Makefile.decl +++ b/fsodatad/Makefile.decl @@ -1,6 +1,6 @@ # GLIB - Library of useful C routines -GTESTER = gtester +GTESTER = gtester GTESTER_REPORT = gtester-report # initialize variables for unconditional += appending diff --git a/fsodatad/data/fsodatad.conf b/fsodatad/data/fsodatad.conf index 567cf287..6ce104f5 100644 --- a/fsodatad/data/fsodatad.conf +++ b/fsodatad/data/fsodatad.conf @@ -8,6 +8,6 @@ </policy> <policy context="default"> <allow send_interface="org.freedesktop.DBus.Introspectable"/> - <allow send_interface="org.freedesktop.DBus.Peer"/> + <allow send_interface="org.freedesktop.DBus.Peer"/> </policy> </busconfig> diff --git a/fsodatad/src/Makefile.am b/fsodatad/src/Makefile.am index 5f7c873a..a23e23bb 100644 --- a/fsodatad/src/Makefile.am +++ b/fsodatad/src/Makefile.am @@ -1,5 +1,5 @@ include $(top_srcdir)/Makefile.decl -NULL = +NULL = AUTOMAKE_OPTIONS = subdir-objects diff --git a/fsodatad/src/plugins/Makefile.am b/fsodatad/src/plugins/Makefile.am index 3dbdd2ab..e5f1f0c4 100644 --- a/fsodatad/src/plugins/Makefile.am +++ b/fsodatad/src/plugins/Makefile.am @@ -1,5 +1,5 @@ include $(top_srcdir)/Makefile.decl -NULL = +NULL = AUTOMAKE_OPTIONS = subdir-objects diff --git a/fsodatad/vapi/config.vapi b/fsodatad/vapi/config.vapi index f06761e2..74d1604a 100644 --- a/fsodatad/vapi/config.vapi +++ b/fsodatad/vapi/config.vapi @@ -6,4 +6,4 @@ namespace Config public const string PACKAGE_DATADIR; public const string MBPI_DATABASE_PATH; } - + diff --git a/fsodeviced/Makefile.decl b/fsodeviced/Makefile.decl index 20ad96db..31c69513 100644 --- a/fsodeviced/Makefile.decl +++ b/fsodeviced/Makefile.decl @@ -1,6 +1,6 @@ # GLIB - Library of useful C routines -GTESTER = gtester +GTESTER = gtester GTESTER_REPORT = gtester-report # initialize variables for unconditional += appending diff --git a/fsodeviced/configure.ac b/fsodeviced/configure.ac index 557a96a9..d12f39e3 100644 --- a/fsodeviced/configure.ac +++ b/fsodeviced/configure.ac @@ -101,7 +101,7 @@ AM_CONDITIONAL( [WANT_FSORESOURCE], [test x"$fsoresource" = x"yes"]) # optional feature: kernel26_rfkill AC_ARG_ENABLE(kernel26_rfkill, [ --enable-kernel26-rfkill Enable building the rfkill power control plugin (default=disabled)], - [rfkill=$enableval], + [rfkill=$enableval], [rfkill="no"]) if test x$rfkill = "xyes"; then @@ -114,7 +114,7 @@ AM_CONDITIONAL( [WANT_RFKILL], [test x"$rfkill" = x"yes"]) # optional feature: player_canberra AC_ARG_ENABLE(player_canberra, [ --enable-player-canberra Enable building the libcanberra audio player plugin (default=disabled)], - [canberra=$enableval], + [canberra=$enableval], [canberra="no"]) if test x$canberra = "xyes"; then @@ -132,7 +132,7 @@ AM_CONDITIONAL( [WANT_CANBERRA], [test x"$canberra" = x"yes"]) # optional feature: player_gstreamer AC_ARG_ENABLE(player_gstreamer, [ --enable-player-gstreamer Enable building the gstreamer audio player plugin (default=disabled)], - [gstreamer=$enableval], + [gstreamer=$enableval], [gstreamer="no"]) if test x$gstreamer = "xyes"; then @@ -148,7 +148,7 @@ AM_CONDITIONAL( [WANT_GSTREAMER], [test x"$gstreamer" = x"yes"]) # check for debugging AC_ARG_ENABLE(debug, [ --enable-debug Enable debug build (default=disabled)], - [debug=$enableval], + [debug=$enableval], [debug="no"]) AM_CONDITIONAL( [WANT_DEBUG], [test x"$debug" = x"yes"]) diff --git a/fsodeviced/data/fsodeviced.conf b/fsodeviced/data/fsodeviced.conf index 495d539e..330fe7fe 100644 --- a/fsodeviced/data/fsodeviced.conf +++ b/fsodeviced/data/fsodeviced.conf @@ -8,6 +8,6 @@ </policy> <policy context="default"> <allow send_interface="org.freedesktop.DBus.Introspectable"/> - <allow send_interface="org.freedesktop.DBus.Peer"/> + <allow send_interface="org.freedesktop.DBus.Peer"/> </policy> </busconfig> diff --git a/fsodeviced/src/Makefile.am b/fsodeviced/src/Makefile.am index fff80237..86fe3be7 100644 --- a/fsodeviced/src/Makefile.am +++ b/fsodeviced/src/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/Makefile.decl -NULL = +NULL = AUTOMAKE_OPTIONS = subdir-objects diff --git a/fsodeviced/src/plugins/palmpre_powersupply/plugin.vala b/fsodeviced/src/plugins/palmpre_powersupply/plugin.vala index c71876c6..1e63a0fa 100644 --- a/fsodeviced/src/plugins/palmpre_powersupply/plugin.vala +++ b/fsodeviced/src/plugins/palmpre_powersupply/plugin.vala @@ -22,7 +22,7 @@ using GLib; namespace PalmPre { -class TokenLib +class TokenLib { public static string tokenValue(string key, string def) { @@ -33,7 +33,7 @@ class TokenLib return ""; } - FsoFramework.SmartKeyFile tf = + FsoFramework.SmartKeyFile tf = new FsoFramework.SmartKeyFile(); if (tf.loadFromFile(tokens_file)) tf.stringValue("tokens", key, def); @@ -75,7 +75,7 @@ class BatteryPowerSupply : FreeSmartphone.Device.PowerSupply, FsoFramework.Abstr /* check that we only use a valid battery */ if (authenticateBattery()) return; - + subsystem.registerServiceName(FsoFramework.Device.ServiceDBusName); subsystem.registerServiceObject(FsoFramework.Device.ServiceDBusName, "%s/%u".printf( FsoFramework.Device.PowerSupplyServicePath, 0), @@ -93,7 +93,7 @@ class BatteryPowerSupply : FreeSmartphone.Device.PowerSupply, FsoFramework.Abstr var mac_node = @"$(slave_node)/mac"; FsoFramework.FileHandling.write(battToCh, mac_node); - + string response = FsoFramework.FileHandling.read(mac_node); if (response != battToResp) { logger.error("battery does not answer with the right response!"); diff --git a/fsodeviced/src/plugins/router_palmpre/plugin.vala b/fsodeviced/src/plugins/router_palmpre/plugin.vala index fed62031..12cf1082 100644 --- a/fsodeviced/src/plugins/router_palmpre/plugin.vala +++ b/fsodeviced/src/plugins/router_palmpre/plugin.vala @@ -41,7 +41,7 @@ private class KernelScriptInterface FsoFramework.theLogger.debug( @"executing audio script '$(script_name)'" ); FsoFramework.FileHandling.write(script_name, FSO_PALMPRE_AUDIO_SCRUN_PATH); } - + public static void runScripts(string[] scripts) { foreach ( var script in scripts ) @@ -77,7 +77,7 @@ private enum AudioStateType private string audioStateTypeToString( AudioStateType state ) { string result = "<unknown>"; - + switch ( state ) { case AudioStateType.MEDIA_BACKSPEAKER: @@ -138,7 +138,7 @@ private string audioStateTypeToString( AudioStateType state ) result = "VOICE_DIALING_HEADSET"; break; } - + return result; } @@ -158,7 +158,7 @@ private enum AudioEventType private AudioEventType stringToAudioEventType( string str ) { AudioEventType event = AudioEventType.NONE; - + switch ( str ) { case "CALL_STARTED": @@ -186,7 +186,7 @@ private AudioEventType stringToAudioEventType( string str ) event = AudioEventType.VOIP_ENDED; break; } - + return event; } @@ -225,16 +225,16 @@ private string audioEventTypeToString( AudioEventType event ) private class AudioTransition : GLib.Object { - public AudioStateType next_state - { + public AudioStateType next_state + { get; private set; } - - public AudioEventType event - { + + public AudioEventType event + { get; private set; } - + public AudioTransition( AudioEventType event, AudioStateType next_state ) { this.event = event; @@ -251,51 +251,51 @@ class PalmPre : FsoDevice.BaseAudioRouter private Gee.HashMap<AudioStateType,Gee.ArrayList<AudioTransition>> transitions; private AudioStateType current_state; private string[] available_events = {}; - + construct { current_state = AudioStateType.MEDIA_BACKSPEAKER; - + /* * Here we add all currently available state transitions */ - + transitions = new Gee.HashMap<AudioStateType,Gee.ArrayList<AudioTransition>>(); - + transitions[AudioStateType.MEDIA_BACKSPEAKER] = new Gee.ArrayList<AudioTransition>(); transitions[AudioStateType.MEDIA_BACKSPEAKER].add(new AudioTransition( AudioEventType.HEADSET_IN, AudioStateType.MEDIA_HEADSET ) ); transitions[AudioStateType.MEDIA_BACKSPEAKER].add(new AudioTransition( AudioEventType.CALL_STARTED, AudioStateType.PHONE_BACKSPEAKER ) ) ; transitions[AudioStateType.MEDIA_BACKSPEAKER].add(new AudioTransition( AudioEventType.SWITCH_TO_FRONT_SPEAKER, AudioStateType.MEDIA_FRONTSPEAKER ) ); - + transitions[AudioStateType.MEDIA_FRONTSPEAKER] = new Gee.ArrayList<AudioTransition>(); transitions[AudioStateType.MEDIA_FRONTSPEAKER].add(new AudioTransition( AudioEventType.SWITCH_TO_BACK_SPEAKER, AudioStateType.MEDIA_BACKSPEAKER ) ); transitions[AudioStateType.MEDIA_FRONTSPEAKER].add(new AudioTransition( AudioEventType.HEADSET_IN, AudioStateType.MEDIA_HEADSET ) ); transitions[AudioStateType.MEDIA_FRONTSPEAKER].add(new AudioTransition( AudioEventType.CALL_STARTED, AudioStateType.PHONE_FRONTSPEAKER ) ); - + transitions[AudioStateType.MEDIA_HEADSET] = new Gee.ArrayList<AudioTransition>(); transitions[AudioStateType.MEDIA_HEADSET].add(new AudioTransition( AudioEventType.HEADSET_OUT, AudioStateType.MEDIA_BACKSPEAKER ) ); transitions[AudioStateType.MEDIA_HEADSET].add(new AudioTransition( AudioEventType.CALL_STARTED, AudioStateType.PHONE_HEADSET ) ); - + transitions[AudioStateType.PHONE_BACKSPEAKER] = new Gee.ArrayList<AudioTransition>(); transitions[AudioStateType.PHONE_BACKSPEAKER].add(new AudioTransition( AudioEventType.HEADSET_IN, AudioStateType.PHONE_HEADSET ) ); transitions[AudioStateType.PHONE_BACKSPEAKER].add(new AudioTransition( AudioEventType.CALL_ENDED, AudioStateType.MEDIA_BACKSPEAKER ) ); transitions[AudioStateType.PHONE_BACKSPEAKER].add(new AudioTransition( AudioEventType.SWITCH_TO_FRONT_SPEAKER, AudioStateType.PHONE_FRONTSPEAKER ) ); - + transitions[AudioStateType.PHONE_FRONTSPEAKER] = new Gee.ArrayList<AudioTransition>(); transitions[AudioStateType.PHONE_FRONTSPEAKER].add(new AudioTransition( AudioEventType.HEADSET_IN, AudioStateType.PHONE_HEADSET ) ); transitions[AudioStateType.PHONE_FRONTSPEAKER].add(new AudioTransition( AudioEventType.CALL_ENDED, AudioStateType.MEDIA_FRONTSPEAKER ) ); transitions[AudioStateType.PHONE_FRONTSPEAKER].add(new AudioTransition( AudioEventType.SWITCH_TO_BACK_SPEAKER, AudioStateType.PHONE_BACKSPEAKER ) ); - + transitions[AudioStateType.PHONE_HEADSET] = new Gee.ArrayList<AudioTransition>(); transitions[AudioStateType.PHONE_HEADSET].add(new AudioTransition( AudioEventType.HEADSET_OUT, AudioStateType.PHONE_BACKSPEAKER ) ); transitions[AudioStateType.PHONE_HEADSET].add(new AudioTransition( AudioEventType.CALL_ENDED, AudioStateType.MEDIA_HEADSET ) ); transitions[AudioStateType.PHONE_HEADSET].add(new AudioTransition( AudioEventType.SWITCH_TO_BACK_SPEAKER, AudioStateType.PHONE_BACKSPEAKER ) ); transitions[AudioStateType.PHONE_HEADSET].add(new AudioTransition( AudioEventType.SWITCH_TO_FRONT_SPEAKER, AudioStateType.PHONE_FRONTSPEAKER ) ); - + /* * All available events */ - + available_events += audioEventTypeToString(AudioEventType.CALL_STARTED); available_events += audioEventTypeToString(AudioEventType.CALL_ENDED); available_events += audioEventTypeToString(AudioEventType.HEADSET_IN); @@ -304,12 +304,12 @@ class PalmPre : FsoDevice.BaseAudioRouter available_events += audioEventTypeToString(AudioEventType.SWITCH_TO_FRONT_SPEAKER); available_events += audioEventTypeToString(AudioEventType.VOIP_STARTED); available_events += audioEventTypeToString(AudioEventType.VOIP_ENDED); - + /* * Load all needed scripts */ var script_path = FsoFramework.theConfig.stringValue( "fsodevice.router_palmpre", "script_path", "/etc/audio/scripts" ); - string[] scripts_needed = { + string[] scripts_needed = { "media_back_speaker", "media_front_speaker", "media_headset", @@ -317,18 +317,18 @@ class PalmPre : FsoDevice.BaseAudioRouter "phone_front_speaker", "phone_headset" }; - + foreach ( var script in scripts_needed ) { KernelScriptInterface.loadAndStoreScriptFromFile( @"$(script_path)/$(script).txt" ); } } - + private void handleEvent( AudioEventType event ) - { + { foreach ( var transition in transitions[current_state] ) { - if ( transition.event == event ) + if ( transition.event == event ) { FsoFramework.theLogger.debug( @"Event '$(audioEventTypeToString(event))' is known by the current state '$(audioStateTypeToString(current_state))'" ); releaseState( current_state ); @@ -337,24 +337,24 @@ class PalmPre : FsoDevice.BaseAudioRouter current_state = transition.next_state; break; } - + if ( transition.event == AudioEventType.CALL_STARTED ) { KernelScriptInterface.runScript( "call_started" ); } - else if ( transition.event == AudioEventType.CALL_ENDED ) + else if ( transition.event == AudioEventType.CALL_ENDED ) { KernelScriptInterface.runScript( "call_ended" ); } } } - + private void initState( AudioStateType state ) - { + { string[] scripts = { }; - + FsoFramework.theLogger.debug(@"Init '$(audioStateTypeToString(state))' state"); - + switch ( state ) { case AudioStateType.MEDIA_BACKSPEAKER: @@ -376,33 +376,33 @@ class PalmPre : FsoDevice.BaseAudioRouter scripts += "phone_headset"; break; } - + KernelScriptInterface.runScripts(scripts); } - + private void releaseState( AudioStateType state ) - { + { string[] scripts = { }; - + FsoFramework.theLogger.debug(@"Release '$(audioStateTypeToString(state))' state"); - + switch ( state ) { default: break; } - + KernelScriptInterface.runScripts(scripts); } - + public override void setScenario( string scenario ) { FsoFramework.theLogger.debug("got a $(scenario) audio event"); - // For now we treat the scenario give as event. API need to be + // For now we treat the scenario give as event. API need to be // reworked for a audio state machine ... handleEvent( stringToAudioEventType( scenario.up() ) ); } - + public override bool isScenarioAvailable( string scenario ) { return (scenario in available_events); @@ -412,9 +412,9 @@ class PalmPre : FsoDevice.BaseAudioRouter { return available_events; } - + /* - * NOTE: The following methods are not used by this plugin as we + * NOTE: The following methods are not used by this plugin as we * don't implement audio routing in the way the other plugins * does. */ diff --git a/fsogsmd/Makefile.decl b/fsogsmd/Makefile.decl index 20ad96db..31c69513 100644 --- a/fsogsmd/Makefile.decl +++ b/fsogsmd/Makefile.decl @@ -1,6 +1,6 @@ # GLIB - Library of useful C routines -GTESTER = gtester +GTESTER = gtester GTESTER_REPORT = gtester-report # initialize variables for unconditional += appending diff --git a/fsogsmd/conf/palm_pre/fsogsmd.conf b/fsogsmd/conf/palm_pre/fsogsmd.conf index 923bc62b..b7b59899 100644 --- a/fsogsmd/conf/palm_pre/fsogsmd.conf +++ b/fsogsmd/conf/palm_pre/fsogsmd.conf @@ -23,7 +23,7 @@ lowlevel_type = palmpre sms_storage_dir = /tmp/fsogsmd/sms/ [fsogsm.modem_qualcomm_palm] -launch_msmcommd = 1 +launch_msmcommd = 1 workdir_msmcommd = /var/run/msmcommd [fsogsm.pdp_ppp] diff --git a/fsogsmd/configure.ac b/fsogsmd/configure.ac index 2bf7c727..7596689d 100644 --- a/fsogsmd/configure.ac +++ b/fsogsmd/configure.ac @@ -95,7 +95,7 @@ AC_SUBST(FSO_LIBS) # optional feature: ppp AC_ARG_ENABLE(ppp-support, [ --disable-ppp-support Disable building ppp support (default=enabled)], - [ppp=$enableval], + [ppp=$enableval], [ppp="yes"]) if test "x$ppp" = "xyes"; then @@ -109,7 +109,7 @@ AM_CONDITIONAL( [WANT_PPP], [test x"$ppp" = x"yes"]) # optional feature: libgsm0710mux support AC_ARG_ENABLE(libgsm0710mux, [ --enable-libgsm0710mux Build modem plugins which require libgsm0710mux (default=disabled)], - [mux=$enableval], + [mux=$enableval], [mux="no"]) if test x$mux = "xyes"; then @@ -124,7 +124,7 @@ AM_CONDITIONAL( [WANT_MUX], [test x"$mux" = x"yes"]) # optional feature: palm pre (plus) support AC_ARG_ENABLE(modem-qualcomm-palm, [ --enable-modem-qualcomm-palm Enable building the modem_qualcomm_palm plugin (default=disabled)], - [palm=$enableval], + [palm=$enableval], [palm="no"]) if test x$palm = "xyes"; then @@ -159,7 +159,7 @@ AC_DEFINE_UNQUOTED([PACKAGE_LIBDIR], ["${PACKAGE_LIBDIR}"], [Module directory]) # check for debugging AC_ARG_ENABLE(debug, [ --enable-debug Enable debug build (default=disabled)], - [debug=$enableval], + [debug=$enableval], [debug="no"]) AM_CONDITIONAL( [WANT_DEBUG], [test x"$debug" = x"yes"]) diff --git a/fsogsmd/data/Makefile.am b/fsogsmd/data/Makefile.am index a48367f6..4cc0e36a 100644 --- a/fsogsmd/data/Makefile.am +++ b/fsogsmd/data/Makefile.am @@ -1,5 +1,5 @@ include $(top_srcdir)/Makefile.decl -NULL = +NULL = dbusconfdir = @DBUS_DIR@/system.d dist_dbusconf_DATA = fsogsmd.conf diff --git a/fsogsmd/data/fsogsmd.conf b/fsogsmd/data/fsogsmd.conf index b8d57bca..8ce26c6e 100644 --- a/fsogsmd/data/fsogsmd.conf +++ b/fsogsmd/data/fsogsmd.conf @@ -8,6 +8,6 @@ </policy> <policy context="default"> <allow send_interface="org.freedesktop.DBus.Introspectable"/> - <allow send_interface="org.freedesktop.DBus.Peer"/> + <allow send_interface="org.freedesktop.DBus.Peer"/> </policy> </busconfig> diff --git a/fsogsmd/src/3rdparty/smsutil.h b/fsogsmd/src/3rdparty/smsutil.h index 8af5441b..3baf962b 100644 --- a/fsogsmd/src/3rdparty/smsutil.h +++ b/fsogsmd/src/3rdparty/smsutil.h @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * */ - + #ifndef SMSUTIL_H #define SMSUTIL_H diff --git a/fsogsmd/src/3rdparty/util.c b/fsogsmd/src/3rdparty/util.c index 57e2ba2c..5bd73ee9 100644 --- a/fsogsmd/src/3rdparty/util.c +++ b/fsogsmd/src/3rdparty/util.c @@ -492,7 +492,7 @@ static unsigned short gsm_single_shift_lookup(unsigned char k, struct codepoint key = { k, 0 }; const struct codepoint *table; unsigned int len; - + table = alphabet_lookup[lang].togsm_single_shift; len = alphabet_lookup[lang].togsm_single_shift_len; @@ -508,7 +508,7 @@ static unsigned short unicode_locking_shift_lookup(unsigned short k, table = alphabet_lookup[lang].tounicode_locking_shift; - return codepoint_lookup(&key, table, len); + return codepoint_lookup(&key, table, len); } static unsigned short unicode_single_shift_lookup(unsigned short k, diff --git a/fsogsmd/src/Makefile.am b/fsogsmd/src/Makefile.am index f7b82b14..51b08b36 100644 --- a/fsogsmd/src/Makefile.am +++ b/fsogsmd/src/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/Makefile.decl -NULL = +NULL = AUTOMAKE_OPTIONS = subdir-objects diff --git a/fsogsmd/src/lib/Makefile.am b/fsogsmd/src/lib/Makefile.am index fe28f4d3..f284a3c9 100644 --- a/fsogsmd/src/lib/Makefile.am +++ b/fsogsmd/src/lib/Makefile.am @@ -71,7 +71,7 @@ libfsogsm_la_VALASOURCES = \ $(NULL) if WANT_MUX -VALAC_ARGS += --pkg gsm0710mux-1.0 +VALAC_ARGS += --pkg gsm0710mux-1.0 libfsogsm_la_VALASOURCES += \ muxtransport.vala \ $(NULL) diff --git a/fsogsmd/src/lib/genatcommands.py b/fsogsmd/src/lib/genatcommands.py index 3032f6b2..ca51ff49 100755 --- a/fsogsmd/src/lib/genatcommands.py +++ b/fsogsmd/src/lib/genatcommands.py @@ -38,7 +38,7 @@ def nameToClassName( name ): #========================================================================# commands = { \ - "+CFUN": ( "standard", [ "+CFUN: ", "<int=fun>" ] ), + "+CFUN": ( "standard", [ "+CFUN: ", "<int=fun>" ] ), #"+COPS": ( "standard", [ "+COPS: ", "<digit=registration>", "[digit=mode]", "[string=provider]" ] ), "+COPS": ( "standard", ( "+COPS: digit=opStatus,[digit=mode[,string=oper]]" ] "+COPS": ( "standard", "+COPS: digit=opStatus,[digit=mode[,string=oper]]" ] diff --git a/fsogsmd/src/lib/modem.vala b/fsogsmd/src/lib/modem.vala index 7bf06c17..f97ed68a 100644 --- a/fsogsmd/src/lib/modem.vala +++ b/fsogsmd/src/lib/modem.vala @@ -580,18 +580,18 @@ public abstract class FsoGsm.AbstractModem : FsoGsm.Modem, FsoFramework.Abstract { return new GenericWatchDog(); } - + /** - * Override this to power on external components before the maintransport + * Override this to power on external components before the maintransport * will be opened **/ protected virtual bool powerOn() { return true; } - + /** - * Override this to power off external components before the maintransport + * Override this to power off external components before the maintransport * will be closed **/ protected virtual void powerOff() @@ -629,7 +629,7 @@ public abstract class FsoGsm.AbstractModem : FsoGsm.Modem, FsoFramework.Abstract { return false; } - + if ( !powerOn() ) { return false; @@ -683,7 +683,7 @@ public abstract class FsoGsm.AbstractModem : FsoGsm.Modem, FsoFramework.Abstract } lowlevel.poweroff(); - + powerOff(); advanceToState( Modem.Status.CLOSED, true ); // force wraparound diff --git a/fsogsmd/src/plugins/Makefile.am b/fsogsmd/src/plugins/Makefile.am index 3ec3cd95..2e7a65ac 100644 --- a/fsogsmd/src/plugins/Makefile.am +++ b/fsogsmd/src/plugins/Makefile.am @@ -1,7 +1,7 @@ include $(top_srcdir)/Makefile.decl -NULL = +NULL = AUTOMAKE_OPTIONS = subdir-objects diff --git a/fsogsmd/src/plugins/lowlevel_palmpre/plugin.vala b/fsogsmd/src/plugins/lowlevel_palmpre/plugin.vala index 9245781b..47900ef6 100644 --- a/fsogsmd/src/plugins/lowlevel_palmpre/plugin.vala +++ b/fsogsmd/src/plugins/lowlevel_palmpre/plugin.vala @@ -35,7 +35,7 @@ class LowLevel.PalmPre : FsoGsm.LowLevel, FsoFramework.AbstractObject powerOnNode = config.stringValue( MODULE_NAME, "power_on_node", "unknown" ); wakeupModemNode = config.stringValue( MODULE_NAME, "wakeup_modem_node", "unknown" ); bootModeNode = config.stringValue( MODULE_NAME, "boot_mode_node", "unknown" ); - + // modem modem = FsoGsm.theModem as FsoGsm.AbstractModem; @@ -65,7 +65,7 @@ class LowLevel.PalmPre : FsoGsm.LowLevel, FsoFramework.AbstractObject FsoFramework.FileHandling.write( "1\n", powerOnNode ); FsoFramework.FileHandling.write( "1\n", wakeupModemNode ); - + return true; } diff --git a/fsogsmd/src/plugins/modem_qualcomm_palm/plugin.vala b/fsogsmd/src/plugins/modem_qualcomm_palm/plugin.vala index 88fe30dd..7362f9f0 100644 --- a/fsogsmd/src/plugins/modem_qualcomm_palm/plugin.vala +++ b/fsogsmd/src/plugins/modem_qualcomm_palm/plugin.vala @@ -34,8 +34,8 @@ class QualcommPalm.Modem : FsoGsm.AbstractModem private const string MSM_CHANNEL_NAME = "main"; private bool launch_msmcommd = false; private string workdir_msmcommd = "/tmp"; - - construct + + construct { launch_msmcommd = config.boolValue("fsogsm.modem_qualcomm_palm", "launch_msmcommd", false); workdir_msmcommd = config.stringValue("fsogsm.modem_qualcomm_palm", "workdir_msmcommd", "/tmp"); @@ -45,7 +45,7 @@ class QualcommPalm.Modem : FsoGsm.AbstractModem { return "<>"; } - + private bool launchMsmcommDaemon(bool restart) { if (Msmcomm.isDaemonRunning()) { @@ -58,19 +58,19 @@ class QualcommPalm.Modem : FsoGsm.AbstractModem return true; } } - + if (!Msmcomm.launchDaemon(workdir_msmcommd)) { logger.error("Could not launch the Msmcomm daemon - that is bad, everything else will even fail"); return false; } - + logger.info("Msmcomm daemon was successfully started"); - + Thread.usleep(1000 * 1000); - + return true; } - + private void shutdownMsmcommDaemon() { if (Msmcomm.isDaemonRunning()) { @@ -81,17 +81,17 @@ class QualcommPalm.Modem : FsoGsm.AbstractModem logger.error("Msmcomm daemon could not be shut down as it is not running anymore. Maybe it was killed or died itself?"); } } - + protected override bool powerOn() { /* As per configuration option we have to launch the msmcomm daemon * before the channel and transport are opened as both depend on it */ var result = false; - if (launch_msmcommd && launchMsmcommDaemon(true) || !launch_msmcommd) + if (launch_msmcommd && launchMsmcommDaemon(true) || !launch_msmcommd) result = true; return result; } - + protected override void powerOff() { if (launch_msmcommd) @@ -106,7 +106,7 @@ class QualcommPalm.Modem : FsoGsm.AbstractModem var parser = new FsoGsm.StateBasedAtParser(); new FsoGsm.AtChannel( AT_CHANNEL_NAME, datatransport, parser ); #endif - + // create MAIN channel var maintransport = FsoFramework.Transport.create( modem_transport, modem_port, modem_speed ); if (maintransport != null) diff --git a/fsoinitd/Makefile.decl b/fsoinitd/Makefile.decl index 20ad96db..31c69513 100644 --- a/fsoinitd/Makefile.decl +++ b/fsoinitd/Makefile.decl @@ -1,6 +1,6 @@ # GLIB - Library of useful C routines -GTESTER = gtester +GTESTER = gtester GTESTER_REPORT = gtester-report # initialize variables for unconditional += appending diff --git a/fsoinitd/configure.ac b/fsoinitd/configure.ac index 183f21fb..8819d221 100644 --- a/fsoinitd/configure.ac +++ b/fsoinitd/configure.ac @@ -57,7 +57,7 @@ AC_SUBST(DBUS_LIBS) # check for debugging AC_ARG_ENABLE(debug, [ --enable-debug Enable debug build (default=disabled)], - [debug=$enableval], + [debug=$enableval], [debug="no"]) AM_CONDITIONAL( [WANT_DEBUG], [test x"$debug" = x"yes"]) diff --git a/fsoinitd/src/Makefile.am b/fsoinitd/src/Makefile.am index 8048a0cd..d38d9856 100644 --- a/fsoinitd/src/Makefile.am +++ b/fsoinitd/src/Makefile.am @@ -44,7 +44,7 @@ fsoinitd_VALASOURCES = \ dbusactivatoraction.vala \ validatesystemaction.vala \ $(NULL) - + if WANT_MACHINE_PALMPRE fsoinitd_VALASOURCES += configurations/palmpre.vala endif @@ -76,7 +76,7 @@ fsoinitd_LDADD = \ $(GLIB_LIBS) \ $(GEE_LIBS) \ $(NULL) - + EXTRA_DIST += \ $(fsoinitd_VALASOURCES) \ $(BUILT_SOURCES) \ diff --git a/fsoinitd/src/actionqueue.vala b/fsoinitd/src/actionqueue.vala index 127af594..0efaae19 100644 --- a/fsoinitd/src/actionqueue.vala +++ b/fsoinitd/src/actionqueue.vala @@ -31,28 +31,28 @@ public class ActionQueue : IActionQueue, GLib.Object { actions = new ArrayList<IAction>(); } - + public void registerAction(IAction action) { actions.add(action); } - public bool run() + public bool run() { foreach (var action in actions) { - + FsoFramework.theLogger.debug(@"run '$(action.name)' action ..."); FsoFramework.theLogger.debug(@"ACTION INFO: $(action.to_string())"); - + if (!action.run()) { FsoFramework.theLogger.error(@"an error occured while running action '$(action.name)'"); FsoFramework.theLogger.error(@"action was executed as the following: "); FsoFramework.theLogger.error(@" -> $(action.to_string())"); return false; - } - else + } + else { FsoFramework.theLogger.debug(@"--> finished action'$(action.name)'"); } diff --git a/fsoinitd/src/additionalbootprocessaction.vala b/fsoinitd/src/additionalbootprocessaction.vala index 590adf16..ca1adfe9 100644 --- a/fsoinitd/src/additionalbootprocessaction.vala +++ b/fsoinitd/src/additionalbootprocessaction.vala @@ -22,24 +22,24 @@ namespace FsoInit { public class AdditionalBootProcessAction : IAction, GLib.Object { public string name { get { return "AdditionalBootProcessAction"; } } - + public string to_string() { return @"[$(name)] :: no parameter"; } - + public bool run() { if (FsoFramework.FileHandling.isPresent("/etc/rc.local")) { var res = Posix.system("/bin/sh /etc/rc.local &"); - if (res < 0) + if (res < 0) { FsoFramework.theLogger.error("Could not launch additional boot process from /etc/rc.local"); return false; } } - + return true; } diff --git a/fsoinitd/src/configurations/dummy.vala b/fsoinitd/src/configurations/dummy.vala index 234935f7..83f7f4c3 100644 --- a/fsoinitd/src/configurations/dummy.vala +++ b/fsoinitd/src/configurations/dummy.vala @@ -34,7 +34,7 @@ public class DummyConfiguration : BaseConfiguration public override void registerActionsInQueue(IActionQueue queue) { - + } } diff --git a/fsoinitd/src/configurations/om-gta02.vala b/fsoinitd/src/configurations/om-gta02.vala index 439d5942..b6e167cd 100644 --- a/fsoinitd/src/configurations/om-gta02.vala +++ b/fsoinitd/src/configurations/om-gta02.vala @@ -20,7 +20,7 @@ namespace FsoInit { -public BaseConfiguration createMachineConfiguration() +public BaseConfiguration createMachineConfiguration() { return new GTA02Configuration(); } @@ -38,19 +38,19 @@ public class GTA02Configuration : BaseConfiguration queue.registerAction(new SpawnProcessAction.with_settings("mount -o remount,rw /")); queue.registerAction(new MountFilesystemAction.with_settings((Posix.mode_t) 0555, "proc", "/proc", "proc", Linux.MountFlags.MS_SILENT)); queue.registerAction(new MountFilesystemAction.with_settings((Posix.mode_t) 0755, "sys", "/sys", "sysfs", Linux.MountFlags.MS_SILENT | Linux.MountFlags.MS_NOEXEC | Linux.MountFlags.MS_NODEV | Linux.MountFlags.MS_NOSUID )); - + // Turn led on, so the user know the init process has been started queue.registerAction(new SysfsConfigAction.with_settings("/sys/class/leds/gta02-aux:red/brightness", "50")); - + // Mount relevant filesystems queue.registerAction(new MountFilesystemAction.with_settings((Posix.mode_t) 0755, "devtmpfs", "/dev", "devtmpfs", Linux.MountFlags.MS_SILENT | Linux.MountFlags.MS_NOEXEC | Linux.MountFlags.MS_NODEV | Linux.MountFlags.MS_NOSUID )); queue.registerAction(new MountFilesystemAction.with_settings((Posix.mode_t) 0755, "tmpfs", "/tmp", "tmpfs", Linux.MountFlags.MS_SILENT)); queue.registerAction(new MountFilesystemAction.with_settings((Posix.mode_t) 0755, "devpts", "/dev/pts", "devpts", Linux.MountFlags.MS_SILENT | Linux.MountFlags.MS_NOEXEC | Linux.MountFlags.MS_NODEV | Linux.MountFlags.MS_NOSUID )); - + // Configure network interface queue.registerAction(new ConfigureNetworkInterfaceAction.with_settings("lo", "127.0.0.1", "255.255.255.0")); queue.registerAction(new ConfigureNetworkInterfaceAction.with_settings("usb0", "192.168.0.202", "255.255.255.0")); - + // Launch several other daemons we need right after the init process is over queue.registerAction(new SpawnProcessAction.with_settings("dbus --system --fork")); queue.registerAction(new SpawnProcessAction.with_settings("/etc/init.d/fsodeviced start")); @@ -58,7 +58,7 @@ public class GTA02Configuration : BaseConfiguration queue.registerAction(new SpawnProcessAction.with_settings("/etc/init.d/sshd start")); queue.registerAction(new SpawnProcessAction.with_settings("/etc/init.d/phonefsod start")); queue.registerAction(new SpawnProcessAction.with_settings("/etc/init.d/xserver-nodm start")); - + // Turn led off to let the user know we have finished queue.registerAction(new SysfsConfigAction.with_settings("/sys/class/leds/gta02-aux:red/brightness", "0")); } diff --git a/fsoinitd/src/configurations/palmpre.vala b/fsoinitd/src/configurations/palmpre.vala index 43b2c590..1af4b15b 100644 --- a/fsoinitd/src/configurations/palmpre.vala +++ b/fsoinitd/src/configurations/palmpre.vala @@ -20,7 +20,7 @@ namespace FsoInit { -public BaseConfiguration createMachineConfiguration() +public BaseConfiguration createMachineConfiguration() { return new PalmPreConfiguration(); } @@ -40,44 +40,44 @@ public class PalmPreConfiguration : BaseConfiguration queue.registerAction(new MountFilesystemAction.with_settings(0555, "proc", "/proc", "proc", Linux.MountFlags.MS_SILENT)); queue.registerAction(new MountFilesystemAction.with_settings(0755, "sys", "/sys", "sysfs", Linux.MountFlags.MS_SILENT | Linux.MountFlags.MS_NOEXEC | Linux.MountFlags.MS_NODEV | Linux.MountFlags.MS_NOSUID)); queue.registerAction(new MountFilesystemAction.with_settings(0755, "devpts", "/dev/pts", "devpts", Linux.MountFlags.MS_SILENT | Linux.MountFlags.MS_NOEXEC | Linux.MountFlags.MS_NODEV | Linux.MountFlags.MS_NOSUID)); - + // Remount rootfs read-write queue.registerAction(new SpawnProcessAction.with_settings("/bin/mount -o remount,rw /")); - + // Turn led on, so the user know the init process has been started queue.registerAction(new SysfsConfigAction.with_settings("/sys/class/leds/core_navi_center/brightness", "10")); - - // FIXME: we don't want to use udev anymore, but currently we + + // FIXME: we don't want to use udev anymore, but currently we // don't have devtmpfs in our kernel. When devtmpfs is ported to // our kernel we stop using udev - + // Start udev queue.registerAction(new SpawnProcessAction.with_settings("/etc/init.d/udev start")); - + // Turn led on, so the user know the init process has been started queue.registerAction(new SysfsConfigAction.with_settings("/sys/class/leds/core_navi_center/brightness", "50")); - + // Populate volatile // FIXME - + // Debug! queue.registerAction(new SysfsConfigAction.with_settings("/sys/class/leds/core_navi_left/brightness", "50")); // Set the hostname queue.registerAction(new SetupHostnameAction()); - + // Configure network interface queue.registerAction(new ConfigureNetworkInterfaceAction.with_settings("usb0", "192.168.0.202", "255.255.255.0")); - + // Debug! queue.registerAction(new SysfsConfigAction.with_settings("/sys/class/leds/core_navi_right/brightness", "50")); // Launch several other daemons we need right after the init process is over queue.registerAction(new SpawnProcessAction.with_settings("/usr/bin/dbus-daemon --system --fork")); queue.registerAction(new SpawnProcessAction.with_settings("/etc/init.d/dropbear start")); - + queue.registerAction(new SpawnProcessAction.with_settings("/sbin/getty 115200 console")); - + // Debug! queue.registerAction(new SysfsConfigAction.with_settings("/sys/class/leds/core_navi_right/brightness", "0")); queue.registerAction(new SysfsConfigAction.with_settings("/sys/class/leds/core_navi_left/brightness", "0")); diff --git a/fsoinitd/src/configurenetworkinterfaceaction.vala b/fsoinitd/src/configurenetworkinterfaceaction.vala index b1630bb8..f92e1514 100644 --- a/fsoinitd/src/configurenetworkinterfaceaction.vala +++ b/fsoinitd/src/configurenetworkinterfaceaction.vala @@ -20,7 +20,7 @@ using GLib; namespace FsoInit { - + public enum RouteType { DEFAULT, @@ -28,10 +28,10 @@ public enum RouteType HOST } -public string routeTypeToString (RouteType type) +public string routeTypeToString (RouteType type) { var result = "<unknown>"; - switch (type) + switch (type) { case RouteType.DEFAULT: result = "DEFAULT"; @@ -64,7 +64,7 @@ public class ConfigureNetworkInterfaceAction : IAction, GLib.Object this.netmask = netmask; } - public string to_string() + public string to_string() { string tmp = @"[$(name)] :: "; tmp += @"iface='$(iface)' "; @@ -120,7 +120,7 @@ public class ConfigureNetworkInterfaceAction : IAction, GLib.Object /* FIXME */ return true; } - + public bool run() { if (!configureInterfaceWithAddress(iface, address, netmask) || @@ -128,7 +128,7 @@ public class ConfigureNetworkInterfaceAction : IAction, GLib.Object { return false; } - + return true; } diff --git a/fsoinitd/src/dbusactivatoraction.vala b/fsoinitd/src/dbusactivatoraction.vala index 1b85b4bf..3488c5d4 100644 --- a/fsoinitd/src/dbusactivatoraction.vala +++ b/fsoinitd/src/dbusactivatoraction.vala @@ -22,14 +22,14 @@ namespace FsoInit { public class DBusActivatorAction : IAction, GLib.Object { public string name { get { return "DBusActivatorAction"; } } - + public string service_name { get; set; default = ""; } public bool use_system_bus { get; set; default = true; } public string object_name { get; set; default = ""; } public string object_path { get; set; default = ""; } public string iface { get; set; default = ""; } - - public DBusActivatorAction.with_settings(string service_name, + + public DBusActivatorAction.with_settings(string service_name, bool use_system_bus, string object_name, string object_path, @@ -41,7 +41,7 @@ public class DBusActivatorAction : IAction, GLib.Object this.object_path = object_path; this.iface = iface; } - + public string to_string() { var res = @"[$(name)] :: "; @@ -53,24 +53,24 @@ public class DBusActivatorAction : IAction, GLib.Object res += @"iface='$(iface)' "; return res; } - + public bool run() { - try - { + try + { var bus_type = use_system_bus ? DBus.BusType.SYSTEM : DBus.BusType.SESSION; var conn = DBus.Bus.get(bus_type); var obj = conn.get_object(object_name, object_path, iface); - + if (obj == null) { /* FIXME */ } // FIXME maybe call the Ping() function? } - catch (DBus.Error err) + catch (DBus.Error err) { FsoFramework.theLogger.error(@"Could not activate dbus service '$(service_name)'"); return false; } - + return true; } diff --git a/fsoinitd/src/initprocessworker.vala b/fsoinitd/src/initprocessworker.vala index 1c3ea25d..ee5974a0 100644 --- a/fsoinitd/src/initprocessworker.vala +++ b/fsoinitd/src/initprocessworker.vala @@ -26,11 +26,11 @@ public class InitProcessWorker : GLib.Object private IActionQueue actionQueue; private BaseConfiguration configuration; - construct + construct { actionQueue = new ActionQueue(); } - + public void setup() { configuration = createMachineConfiguration(); @@ -40,10 +40,10 @@ public class InitProcessWorker : GLib.Object configuration.registerActionsInQueue(actionQueue); } - public bool run() + public bool run() { assert(configuration != null); - + FsoFramework.theLogger.info(@"run all actions for machine configuration '$(configuration.name)'"); return actionQueue.run(); } diff --git a/fsoinitd/src/main.vala b/fsoinitd/src/main.vala index f8f589be..9c2417cc 100644 --- a/fsoinitd/src/main.vala +++ b/fsoinitd/src/main.vala @@ -20,24 +20,24 @@ GLib.MainLoop mainloop; -int main( string[] args ) +int main( string[] args ) { var bin = FsoFramework.Utility.programName(); - + FsoFramework.theLogger.info("startup ..."); mainloop = new GLib.MainLoop(null, false); - + var worker = new FsoInit.InitProcessWorker(); worker.setup(); if (!worker.run()) return -1; - + FsoFramework.theLogger.info( "%s => mainloop".printf( bin ) ); mainloop.run(); FsoFramework.theLogger.info( "mainloop => %s".printf( bin ) ); FsoFramework.theLogger.info( "%s exit".printf( bin ) ); - + return 0; } diff --git a/fsoinitd/src/mountfilesystemaction.vala b/fsoinitd/src/mountfilesystemaction.vala index b69751ce..7fb95f6a 100644 --- a/fsoinitd/src/mountfilesystemaction.vala +++ b/fsoinitd/src/mountfilesystemaction.vala @@ -27,12 +27,12 @@ public class MountFilesystemAction : IAction, GLib.Object public string target { get; set; default = ""; } public string name { get { return "MountFileSystemAction"; } } public long flags { get; set; default = Linux.MountFlags.MS_SILENT; } - + construct { mode = (Posix.mode_t) 0755; } - + public MountFilesystemAction.with_settings(Posix.mode_t mode, string source, string target, string fs_type, Linux.MountFlags flags) { this.mode = mode; @@ -42,7 +42,7 @@ public class MountFilesystemAction : IAction, GLib.Object this.flags = flags; } - public string to_string() + public string to_string() { string tmp = @"[$(name)] :: "; tmp += "mode='%l' ".printf((long)mode); @@ -50,7 +50,7 @@ public class MountFilesystemAction : IAction, GLib.Object tmp += @"target='$(target)' "; tmp += @"fs_type='$(fs_type)' "; // FIXME write function to translate flags into string - tmp += @"flags=''"; + tmp += @"flags=''"; return tmp; } @@ -65,13 +65,13 @@ public class MountFilesystemAction : IAction, GLib.Object return false; } } - + if (Linux.mount(source, target, fs_type, (Linux.MountFlags)flags) == -1) { FsoFramework.theLogger.error(@"can't mount $(source) on $(target)"); return false; } - + return true; } @@ -79,13 +79,13 @@ public class MountFilesystemAction : IAction, GLib.Object { if (!FsoFramework.FileHandling.isPresent( target )) { - if (Linux.umount(target) == -1) + if (Linux.umount(target) == -1) { FsoFramework.theLogger.error(@"can not umount $(target)"); return false; } } - + return true; } } diff --git a/fsoinitd/src/setuphostnameaction.vala b/fsoinitd/src/setuphostnameaction.vala index 74f44f0b..eb837196 100644 --- a/fsoinitd/src/setuphostnameaction.vala +++ b/fsoinitd/src/setuphostnameaction.vala @@ -22,22 +22,22 @@ namespace FsoInit { public class SetupHostnameAction : IAction, GLib.Object { public string name { get { return "SetupHostnameAction"; } } - + public string to_string() { return @"[$(name)] :: no parameter"; } - + public bool run() { - if (FsoFramework.FileHandling.isPresent("/etc/hostname")) + if (FsoFramework.FileHandling.isPresent("/etc/hostname")) { string hostname = FsoFramework.FileHandling.read("/etc/hostname"); - if (hostname.length > 0) + if (hostname.length > 0) { FsoFramework.theLogger.debug(@"Set hostname to '$(hostname)'"); var res = Linux.sethostname(hostname, hostname.length); - + if (res < 0) { FsoFramework.theLogger.error(@"Cannot set hostname to '$(hostname)'"); @@ -45,7 +45,7 @@ public class SetupHostnameAction : IAction, GLib.Object } } } - + return true; } diff --git a/fsoinitd/src/spawnprocessaction.vala b/fsoinitd/src/spawnprocessaction.vala index ca1b22fc..2b803696 100644 --- a/fsoinitd/src/spawnprocessaction.vala +++ b/fsoinitd/src/spawnprocessaction.vala @@ -24,17 +24,17 @@ public class SpawnProcessAction : IAction, GLib.Object public string name { get { return "SpawnProcessAction"; } } public string cmdline { get; set; default = ""; } public bool inBackground { get; set; default = false; } - + construct { } - + public SpawnProcessAction.with_settings(string cmdline, bool inBackground = false) { this.cmdline = cmdline; this.inBackground = inBackground; } - public string to_string() + public string to_string() { return @"[$(name)] :: cmdline = '$(cmdline)'"; } @@ -49,7 +49,7 @@ public class SpawnProcessAction : IAction, GLib.Object FsoFramework.theLogger.debug(@"Spawn process with '$(command)'"); res = Posix.system(command); - if (res < 0) + if (res < 0) { var msg = "Could not spawn process '"; msg += cmdline.length > 1 ? cmdline : "<unknown>"; @@ -57,7 +57,7 @@ public class SpawnProcessAction : IAction, GLib.Object FsoFramework.theLogger.error(msg); return false; } - + return true; } diff --git a/fsoinitd/src/sysfsconfigaction.vala b/fsoinitd/src/sysfsconfigaction.vala index 56ede410..08370987 100644 --- a/fsoinitd/src/sysfsconfigaction.vala +++ b/fsoinitd/src/sysfsconfigaction.vala @@ -24,38 +24,38 @@ public class SysfsConfigAction : IAction, GLib.Object public string name { get { return "SysfsConfigAction"; } } public string path { get; set; default = ""; } public string valueForWrite { get; set; default = ""; } - - - public SysfsConfigAction.with_settings(string pathname, string val) + + + public SysfsConfigAction.with_settings(string pathname, string val) { this.path = pathname; this.valueForWrite = val; } - public string to_string() + public string to_string() { return @"[$(name)] :: path='$(path)' valueForWrite='$(valueForWrite)'"; } public bool run() { - if (path.length == 0 && valueForWrite.length == 0) + if (path.length == 0 && valueForWrite.length == 0) { FsoFramework.theLogger.error("Arguments are invalid!"); return false; } - - if (FsoFramework.FileHandling.isPresent(path)) + + if (FsoFramework.FileHandling.isPresent(path)) { FsoFramework.theLogger.debug(@"SysfsConfigAction: '$(valueForWrite)' = '$(path)'"); FsoFramework.FileHandling.write(valueForWrite, path); } - else + else { FsoFramework.theLogger.error("Could not sysfs node"); return false; } - + return true; } diff --git a/fsoinitd/src/util.vala b/fsoinitd/src/util.vala index 94a089e2..500cc893 100644 --- a/fsoinitd/src/util.vala +++ b/fsoinitd/src/util.vala @@ -49,13 +49,13 @@ public bool setupConsole(bool reset) /* Release tty */ tty_fd = open(TTY_PATH, O_RDWR | O_NOCTTY | O_NONBLOCK); - if (tty_fd < 0) + if (tty_fd < 0) { FsoFramework.theLogger.error(@"Could not open tty on '$(TTY_PATH)'"); return false; } - if (ioctl(tty_fd, Linux.Termios.TIOCNOTTY) < 0) + if (ioctl(tty_fd, Linux.Termios.TIOCNOTTY) < 0) { close(tty_fd); FsoFramework.theLogger.error(@"Could not run ioctl(TIOCNOTTY) on $(TTY_PATH)"); @@ -70,7 +70,7 @@ public bool setupConsole(bool reset) FsoFramework.theLogger.error(@"Could not open console on '$(CONSOLE_PATH)'"); return false; } - + null_fd = open(DEV_NULL_PATH, O_RDONLY); if (null_fd < 0) { close(tty_fd); @@ -80,7 +80,7 @@ public bool setupConsole(bool reset) GLib.assert(tty_fd >= 3); GLib.assert(null_fd >= 3); - + /* Reset to sane defaults, cribbed from sysviit, initng, etc. */ if (reset) { termios tty = {}; @@ -115,7 +115,7 @@ public bool setupConsole(bool reset) /* move stdout/stderr to /dev/console and stdin to /dev/null */ if (dup2(tty_fd, STDOUT_FILENO) < 0 || dup2(tty_fd, STDERR_FILENO) < 0 || - dup2(null_fd, STDIN_FILENO) < 0) + dup2(null_fd, STDIN_FILENO) < 0) { close(tty_fd); close(null_fd); diff --git a/fsoinitd/src/validatesystemaction.vala b/fsoinitd/src/validatesystemaction.vala index dabb376a..97492419 100644 --- a/fsoinitd/src/validatesystemaction.vala +++ b/fsoinitd/src/validatesystemaction.vala @@ -19,14 +19,14 @@ using FsoInit.Util; -namespace FsoInit +namespace FsoInit { public class ValidateSystemAction : IAction, GLib.Object { public string name { get { return "ValidateSystemAction"; } } - public string to_string() + public string to_string() { return @"[$(name)] :: no parameters"; } @@ -46,8 +46,8 @@ public class ValidateSystemAction : IAction, GLib.Object /* Become the leader of a new session and process group */ Posix.setsid(); - /* Set root directory to be at the right place if we were - * started from some strange place + /* Set root directory to be at the right place if we were + * started from some strange place */ res = Posix.chdir("/"); if (!Util.CHECK( () => { return res > -1; }, "Cannot set root directory!")) diff --git a/fsoinitd/vapi/util.vapi b/fsoinitd/vapi/util.vapi index d9df38e7..34e2bcd9 100644 --- a/fsoinitd/vapi/util.vapi +++ b/fsoinitd/vapi/util.vapi @@ -20,7 +20,7 @@ namespace Posix { } // namespace [CCode (cprefix = "", lower_case_cprefix = "")] -namespace Linux +namespace Linux { - + } // namespace diff --git a/fsomusicd/Makefile.decl b/fsomusicd/Makefile.decl index 20ad96db..31c69513 100644 --- a/fsomusicd/Makefile.decl +++ b/fsomusicd/Makefile.decl @@ -1,6 +1,6 @@ # GLIB - Library of useful C routines -GTESTER = gtester +GTESTER = gtester GTESTER_REPORT = gtester-report # initialize variables for unconditional += appending diff --git a/fsomusicd/README b/fsomusicd/README index f8fc730a..85a2b2c2 100644 --- a/fsomusicd/README +++ b/fsomusicd/README @@ -2,11 +2,11 @@ A daemon that logs data from the frameworkd, such as: * Usage statistics - Resource on/off - + * Location Updates - GPS Coordinates - GSM Cell IDs - + * Diagnostic Data - Modem Info - Wakeup Reason diff --git a/fsomusicd/data/fsomusicd.conf b/fsomusicd/data/fsomusicd.conf index a24d5931..9730a208 100644 --- a/fsomusicd/data/fsomusicd.conf +++ b/fsomusicd/data/fsomusicd.conf @@ -8,6 +8,6 @@ </policy> <policy context="default"> <allow send_interface="org.freedesktop.DBus.Introspectable"/> - <allow send_interface="org.freedesktop.DBus.Peer"/> + <allow send_interface="org.freedesktop.DBus.Peer"/> </policy> </busconfig> diff --git a/fsomusicd/src/Makefile.am b/fsomusicd/src/Makefile.am index bbb21e6a..215aa76d 100644 --- a/fsomusicd/src/Makefile.am +++ b/fsomusicd/src/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/Makefile.decl -NULL = +NULL = AUTOMAKE_OPTIONS = subdir-objects diff --git a/fsomusicd/src/config.vala b/fsomusicd/src/config.vala index 743b57ef..a06abafc 100644 --- a/fsomusicd/src/config.vala +++ b/fsomusicd/src/config.vala @@ -1,4 +1,4 @@ -/* +/* * File Name: config.vala * Creation Date: 23-08-2009 * Last Modified: 15-11-2009 23:36:40 @@ -54,5 +54,5 @@ namespace FsoMusic.Config //Timout for quering the current position in milliseconds public const int poll_timeout = 1000; //precision of the progress. should be power 0f 10 in nanoseconds - public const int precision = 1; + public const int precision = 1; } diff --git a/fsomusicd/src/interfaces.vala b/fsomusicd/src/interfaces.vala index 2135fb39..3eeb0b8c 100644 --- a/fsomusicd/src/interfaces.vala +++ b/fsomusicd/src/interfaces.vala @@ -1,5 +1,5 @@ -/* - * File Name: +/* + * File Name: * Creation Date: 23-08-2009 * Last Modified: * @@ -26,7 +26,7 @@ using DBus; namespace DBus { [DBus (name = "org.freedesktop.DBus")] - public interface Service : GLib.Object + public interface Service : GLib.Object { public abstract string hello() throws DBus.Error; public abstract uint request_name(string param0, uint param1) throws DBus.Error; diff --git a/fsomusicd/src/musicplayer.vala b/fsomusicd/src/musicplayer.vala index 9b94f54e..95a670ef 100644 --- a/fsomusicd/src/musicplayer.vala +++ b/fsomusicd/src/musicplayer.vala @@ -1,4 +1,4 @@ -/* +/* * File Name: musicplayer.vala * Creation Date: 23-08-2009 * Last Modified: 09-01-2010 18:54:15 @@ -82,7 +82,7 @@ namespace FsoMusic private ObjectPath current_playlist { get{ return _current_playlist; } - set + set { var playlist = playlists.lookup( value ); if( playlist != null ) @@ -113,7 +113,7 @@ namespace FsoMusic private string last_extension = null; private string last_protcol = null; private MusicPlayerState cur_state = FreeSmartphone.MusicPlayerState.STOPPED; - private MusicPlayerState _state { + private MusicPlayerState _state { get{ return this.cur_state; } set { @@ -411,7 +411,7 @@ namespace FsoMusic playlists.remove( list ); playlist_removed( list ); the_list = null; - + } public async ObjectPath new_playlist( string name ) throws MusicPlayerError, DBus.Error { @@ -494,7 +494,7 @@ namespace FsoMusic key_file.set_string( Config.MUSIC_PLAYER_GROUP, Config.LAST_PLAYLIST, list ); foreach( var k in playlists.get_values() ) - { + { k.save(); } logger.info( @"saving config to $(Config.get_config_path())" ); @@ -569,7 +569,7 @@ namespace FsoMusic return false; } } - return true; + return true; } // @@ -682,9 +682,9 @@ namespace FsoMusic private class TagHelper: GLib.Object { - public HashTable<string,GLib.Value?> tags{ - get; - set; + public HashTable<string,GLib.Value?> tags{ + get; + set; default = new HashTable<string,GLib.Value?>(str_hash, str_equal );} public void foreach_tag( Gst.TagList list, string tag ) { diff --git a/fsonetworkd/Makefile.decl b/fsonetworkd/Makefile.decl index 20ad96db..31c69513 100644 --- a/fsonetworkd/Makefile.decl +++ b/fsonetworkd/Makefile.decl @@ -1,6 +1,6 @@ # GLIB - Library of useful C routines -GTESTER = gtester +GTESTER = gtester GTESTER_REPORT = gtester-report # initialize variables for unconditional += appending diff --git a/fsonetworkd/data/fsonetworkd.conf b/fsonetworkd/data/fsonetworkd.conf index 27a22105..276ebde9 100644 --- a/fsonetworkd/data/fsonetworkd.conf +++ b/fsonetworkd/data/fsonetworkd.conf @@ -8,6 +8,6 @@ </policy> <policy context="default"> <allow send_interface="org.freedesktop.DBus.Introspectable"/> - <allow send_interface="org.freedesktop.DBus.Peer"/> + <allow send_interface="org.freedesktop.DBus.Peer"/> </policy> </busconfig> diff --git a/fsonetworkd/src/Makefile.am b/fsonetworkd/src/Makefile.am index fff80237..86fe3be7 100644 --- a/fsonetworkd/src/Makefile.am +++ b/fsonetworkd/src/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/Makefile.decl -NULL = +NULL = AUTOMAKE_OPTIONS = subdir-objects diff --git a/fsonetworkd/src/plugins/Makefile.am b/fsonetworkd/src/plugins/Makefile.am index 681d2d2a..a7f8e321 100644 --- a/fsonetworkd/src/plugins/Makefile.am +++ b/fsonetworkd/src/plugins/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/Makefile.decl -NULL = +NULL = AUTOMAKE_OPTIONS = subdir-objects diff --git a/fsotdld/Makefile.decl b/fsotdld/Makefile.decl index 20ad96db..31c69513 100644 --- a/fsotdld/Makefile.decl +++ b/fsotdld/Makefile.decl @@ -1,6 +1,6 @@ # GLIB - Library of useful C routines -GTESTER = gtester +GTESTER = gtester GTESTER_REPORT = gtester-report # initialize variables for unconditional += appending diff --git a/fsotdld/data/fsotdld.conf b/fsotdld/data/fsotdld.conf index ff08a20e..07f91346 100644 --- a/fsotdld/data/fsotdld.conf +++ b/fsotdld/data/fsotdld.conf @@ -11,6 +11,6 @@ </policy> <policy context="default"> <allow send_interface="org.freedesktop.DBus.Introspectable"/> - <allow send_interface="org.freedesktop.DBus.Peer"/> + <allow send_interface="org.freedesktop.DBus.Peer"/> </policy> </busconfig> diff --git a/fsotdld/src/Makefile.am b/fsotdld/src/Makefile.am index 5f7c873a..a23e23bb 100644 --- a/fsotdld/src/Makefile.am +++ b/fsotdld/src/Makefile.am @@ -1,5 +1,5 @@ include $(top_srcdir)/Makefile.decl -NULL = +NULL = AUTOMAKE_OPTIONS = subdir-objects diff --git a/fsotdld/src/plugins/Makefile.am b/fsotdld/src/plugins/Makefile.am index 57fe20ba..ba318bdc 100644 --- a/fsotdld/src/plugins/Makefile.am +++ b/fsotdld/src/plugins/Makefile.am @@ -1,5 +1,5 @@ include $(top_srcdir)/Makefile.decl -NULL = +NULL = AUTOMAKE_OPTIONS = subdir-objects diff --git a/fsousaged/Makefile.decl b/fsousaged/Makefile.decl index 20ad96db..31c69513 100644 --- a/fsousaged/Makefile.decl +++ b/fsousaged/Makefile.decl @@ -1,6 +1,6 @@ # GLIB - Library of useful C routines -GTESTER = gtester +GTESTER = gtester GTESTER_REPORT = gtester-report # initialize variables for unconditional += appending diff --git a/fsousaged/configure.ac b/fsousaged/configure.ac index dc889400..812da88a 100644 --- a/fsousaged/configure.ac +++ b/fsousaged/configure.ac @@ -82,7 +82,7 @@ AC_SUBST(FSO_LIBS) # check for debugging AC_ARG_ENABLE(debug, [ --enable-debug Enable debug build (default=disabled)], - [debug=$enableval], + [debug=$enableval], [debug="no"]) AM_CONDITIONAL( [WANT_DEBUG], [test x"$debug" = x"yes"]) @@ -126,7 +126,7 @@ echo echo "Configuration Options:" echo echo " prefix..................: $prefix" -echo +echo echo " debug...................: $debug" echo echo "------------------------------------------------------------------------" diff --git a/fsousaged/data/fsousaged.conf b/fsousaged/data/fsousaged.conf index 05d28adf..9e121720 100644 --- a/fsousaged/data/fsousaged.conf +++ b/fsousaged/data/fsousaged.conf @@ -8,6 +8,6 @@ </policy> <policy context="default"> <allow send_interface="org.freedesktop.DBus.Introspectable"/> - <allow send_interface="org.freedesktop.DBus.Peer"/> + <allow send_interface="org.freedesktop.DBus.Peer"/> </policy> </busconfig> diff --git a/fsousaged/src/Makefile.am b/fsousaged/src/Makefile.am index fff80237..86fe3be7 100644 --- a/fsousaged/src/Makefile.am +++ b/fsousaged/src/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/Makefile.decl -NULL = +NULL = AUTOMAKE_OPTIONS = subdir-objects diff --git a/fsousaged/src/plugins/Makefile.am b/fsousaged/src/plugins/Makefile.am index d3d020fd..d8ea3ef7 100644 --- a/fsousaged/src/plugins/Makefile.am +++ b/fsousaged/src/plugins/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/Makefile.decl -NULL = +NULL = AUTOMAKE_OPTIONS = subdir-objects diff --git a/fsousaged/src/plugins/lowlevel_palmpre/plugin.vala b/fsousaged/src/plugins/lowlevel_palmpre/plugin.vala index 1230a03e..3d5f988b 100644 --- a/fsousaged/src/plugins/lowlevel_palmpre/plugin.vala +++ b/fsousaged/src/plugins/lowlevel_palmpre/plugin.vala @@ -67,17 +67,17 @@ class LowLevel.PalmPre : FsoUsage.LowLevel, FsoFramework.AbstractObject { var reasons = FsoFramework.FileHandling.read( sys_resume_reason ).split( "\n" ); var reasonkey = "unknown"; - + /* * An entry in /sys/power/wakeup_event_list looks like this: * [ 0.000012] GPIO (HEADSET_INSERT) omap3_wakeup_sources_save+0x114/0x144 (a004962c) */ - try + try { var regex = new Regex("""\[.*\]\sGPIO\s\((\w*)\).*"""); - + // We want only the last reason ! - if (reasons != null && reasons.length > 0) + if (reasons != null && reasons.length > 0) { string[] parts = regex.split_full(reasons[reasons.length-1]); if (parts != null && parts.length == 3) @@ -90,7 +90,7 @@ class LowLevel.PalmPre : FsoUsage.LowLevel, FsoFramework.AbstractObject { logger.error("Regex determination of the resumevalue failed"); } - + var reasonvalue = eventSources.lookup( reasonkey ); if ( reasonvalue == 0 ) { diff --git a/fsousaged/tests/Makefile.am b/fsousaged/tests/Makefile.am index a5578ed4..b21fc064 100644 --- a/fsousaged/tests/Makefile.am +++ b/fsousaged/tests/Makefile.am @@ -21,7 +21,7 @@ EXTRA_DIST += $(NULL) # touch $@ # testsmartkeyfile_LDADD = $(progs_ldadd) # EXTRA_DIST += $(testsmartkeyfile_VALASOURCES) -# +# CLEANFILES = \ $(TEST_PROGS) \ diff --git a/libfsobasics/Makefile.decl b/libfsobasics/Makefile.decl index 20ad96db..31c69513 100644 --- a/libfsobasics/Makefile.decl +++ b/libfsobasics/Makefile.decl @@ -1,6 +1,6 @@ # GLIB - Library of useful C routines -GTESTER = gtester +GTESTER = gtester GTESTER_REPORT = gtester-report # initialize variables for unconditional += appending diff --git a/libfsobasics/README b/libfsobasics/README index b46df411..006a7134 100644 --- a/libfsobasics/README +++ b/libfsobasics/README @@ -11,7 +11,7 @@ It contains classes for * inotify watching * netlink watching * kobject watching - + While being used primarily for the freesmartphone.org project, it is versatile enough to be of use for many 3rd party projects. diff --git a/libfsobasics/fsobasics/logger.vala b/libfsobasics/fsobasics/logger.vala index a861fd9b..489d31cf 100644 --- a/libfsobasics/fsobasics/logger.vala +++ b/libfsobasics/fsobasics/logger.vala @@ -429,7 +429,7 @@ public class FsoFramework.SyslogLogger : FsoFramework.AbstractLogger } /** - * @class KmsgLogger + * @class KmsgLogger */ public class FsoFramework.KmsgLogger : FsoFramework.AbstractLogger { @@ -447,7 +447,7 @@ public class FsoFramework.KmsgLogger : FsoFramework.AbstractLogger return str; } - public KmsgLogger(string domain) + public KmsgLogger(string domain) { base(domain); kmsg_fd = Posix.open("/dev/kmsg", Posix.O_WRONLY | Posix.O_NOCTTY); diff --git a/libfsobasics/fsobasics/threading.vala b/libfsobasics/fsobasics/threading.vala index 6b09c773..c4a23341 100644 --- a/libfsobasics/fsobasics/threading.vala +++ b/libfsobasics/fsobasics/threading.vala @@ -26,7 +26,7 @@ internal class DummyThread private VoidFuncWithVoidStarParam func; private void* param; public DummyThread* pself; - + public DummyThread( VoidFuncWithVoidStarParam func, void* param ) { this.func = func; diff --git a/libfsobasics/tests/testthreading.vala b/libfsobasics/tests/testthreading.vala index 10bcb53d..42508311 100644 --- a/libfsobasics/tests/testthreading.vala +++ b/libfsobasics/tests/testthreading.vala @@ -63,7 +63,7 @@ public void anotherDelegate( void* data ) //=========================================================================== void test_threading_call_delegate_on_main_thread_async() //=========================================================================== -{ +{ loop = new MainLoop(); Thread.create( thread_func_async, false); loop.run(); diff --git a/libfsoframework/Makefile.decl b/libfsoframework/Makefile.decl index 20ad96db..31c69513 100644 --- a/libfsoframework/Makefile.decl +++ b/libfsoframework/Makefile.decl @@ -1,6 +1,6 @@ # GLIB - Library of useful C routines -GTESTER = gtester +GTESTER = gtester GTESTER_REPORT = gtester-report # initialize variables for unconditional += appending diff --git a/libfsoframework/configure.ac b/libfsoframework/configure.ac index d77083d8..00388b31 100644 --- a/libfsoframework/configure.ac +++ b/libfsoframework/configure.ac @@ -61,7 +61,7 @@ AC_DEFINE_UNQUOTED([PACKAGE_LIBDIR], ["${PACKAGE_LIBDIR}"], [Module directory]) # check for debugging AC_ARG_ENABLE(debug, [ --enable-debug Enable debug build (default=disabled)], - [debug=$enableval], + [debug=$enableval], [debug="no"]) AM_CONDITIONAL( [WANT_DEBUG], [test x"$debug" = x"yes"]) diff --git a/libfsoresource/Makefile.decl b/libfsoresource/Makefile.decl index 20ad96db..31c69513 100644 --- a/libfsoresource/Makefile.decl +++ b/libfsoresource/Makefile.decl @@ -1,6 +1,6 @@ # GLIB - Library of useful C routines -GTESTER = gtester +GTESTER = gtester GTESTER_REPORT = gtester-report # initialize variables for unconditional += appending diff --git a/libfsoresource/configure.ac b/libfsoresource/configure.ac index 4711f65c..25e59016 100644 --- a/libfsoresource/configure.ac +++ b/libfsoresource/configure.ac @@ -42,7 +42,7 @@ AC_SUBST(GLIB_LIBS) # check for debugging AC_ARG_ENABLE(debug, [ --enable-debug Enable debug build (default=disabled)], - [debug=$enableval], + [debug=$enableval], [debug="no"]) AM_CONDITIONAL( [WANT_DEBUG], [test x"$debug" = x"yes"]) diff --git a/libfsoresource/tests/testresource.vala b/libfsoresource/tests/testresource.vala index c4edfbe7..793282e1 100644 --- a/libfsoresource/tests/testresource.vala +++ b/libfsoresource/tests/testresource.vala @@ -34,7 +34,7 @@ public class DummyResource : AbstractDBusResource void async testit() { - + } */ @@ -54,7 +54,7 @@ void test_resource_all() testit.begin(); loop = new MainLoop(); loop.run(); - + */ } diff --git a/libfsotransport/Makefile.decl b/libfsotransport/Makefile.decl index 20ad96db..31c69513 100644 --- a/libfsotransport/Makefile.decl +++ b/libfsotransport/Makefile.decl @@ -1,6 +1,6 @@ # GLIB - Library of useful C routines -GTESTER = gtester +GTESTER = gtester GTESTER_REPORT = gtester-report # initialize variables for unconditional += appending diff --git a/libgsm0710mux/configure.ac b/libgsm0710mux/configure.ac index cf11746d..2368e5bd 100644 --- a/libgsm0710mux/configure.ac +++ b/libgsm0710mux/configure.ac @@ -40,7 +40,7 @@ AC_SUBST(DEPS_LIBS) # check for debugging AC_ARG_ENABLE(debug, [ --enable-debug Enable debug build (default=disabled)], - [debug=$enableval], + [debug=$enableval], [debug="no"]) AM_CONDITIONAL( [WANT_DEBUG], [test x"$debug" = x"yes"]) diff --git a/misc/Makefile.am b/misc/Makefile.am index a635f90d..8deceb0d 100644 --- a/misc/Makefile.am +++ b/misc/Makefile.am @@ -5,7 +5,7 @@ NULL = SUBDIRS = \ vapi \ $(NULL) - + if MAKE_TESTS SUBDIRS += tests endif @@ -16,7 +16,7 @@ pkgconfig_DATA = misc-vapi-1.0.pc EXTRA_DIST += \ MAINTAINERS \ misc-vapi-1.0.pc.in \ - $(NULL) + $(NULL) MAINTAINERCLEANFILES = \ aclocal.m4 compile config.guess config.sub \ diff --git a/misc/Makefile.decl b/misc/Makefile.decl index 20ad96db..31c69513 100644 --- a/misc/Makefile.decl +++ b/misc/Makefile.decl @@ -1,6 +1,6 @@ # GLIB - Library of useful C routines -GTESTER = gtester +GTESTER = gtester GTESTER_REPORT = gtester-report # initialize variables for unconditional += appending diff --git a/misc/configure.ac b/misc/configure.ac index a0654f77..afd64d5a 100644 --- a/misc/configure.ac +++ b/misc/configure.ac @@ -45,11 +45,11 @@ if test "$enable_tests" != no; then PKG_CHECK_MODULES(ALSA, alsa >= $ALSA_REQUIRED) AC_SUBST(ALSA_CFLAGS) - AC_SUBST(ALSA_LIBS) + AC_SUBST(ALSA_LIBS) else AC_MSG_RESULT(no) fi - + # # output # diff --git a/misc/tests/testalsapcm.vala b/misc/tests/testalsapcm.vala index da9ed95d..3a9743bb 100644 --- a/misc/tests/testalsapcm.vala +++ b/misc/tests/testalsapcm.vala @@ -3,7 +3,7 @@ using GLib; int main( string[] args ) { - + return 0; } diff --git a/tools/apm2/Makefile.decl b/tools/apm2/Makefile.decl index 20ad96db..31c69513 100644 --- a/tools/apm2/Makefile.decl +++ b/tools/apm2/Makefile.decl @@ -1,6 +1,6 @@ # GLIB - Library of useful C routines -GTESTER = gtester +GTESTER = gtester GTESTER_REPORT = gtester-report # initialize variables for unconditional += appending diff --git a/tools/fso-abyss/ChangeLog b/tools/fso-abyss/ChangeLog index b83233ad..f2219d5d 100644 --- a/tools/fso-abyss/ChangeLog +++ b/tools/fso-abyss/ChangeLog @@ -20,7 +20,7 @@ 2009-02-20 Michael Lauer <mlauer@vanille-media.de> * Support for wakeup threshold and waitms is now configurable as well. - + * Released as 0.3.1 2009-02-15 Michael Lauer <mlauer@vanille-media.de> diff --git a/tools/fso-alsa/Makefile.decl b/tools/fso-alsa/Makefile.decl index 20ad96db..31c69513 100644 --- a/tools/fso-alsa/Makefile.decl +++ b/tools/fso-alsa/Makefile.decl @@ -1,6 +1,6 @@ # GLIB - Library of useful C routines -GTESTER = gtester +GTESTER = gtester GTESTER_REPORT = gtester-report # initialize variables for unconditional += appending diff --git a/tools/fso-boot/Makefile.decl b/tools/fso-boot/Makefile.decl index 20ad96db..31c69513 100644 --- a/tools/fso-boot/Makefile.decl +++ b/tools/fso-boot/Makefile.decl @@ -1,6 +1,6 @@ # GLIB - Library of useful C routines -GTESTER = gtester +GTESTER = gtester GTESTER_REPORT = gtester-report # initialize variables for unconditional += appending diff --git a/tools/fso-boot/configure.ac b/tools/fso-boot/configure.ac index 34ebc29a..1a7fb72b 100644 --- a/tools/fso-boot/configure.ac +++ b/tools/fso-boot/configure.ac @@ -44,7 +44,7 @@ AC_SUBST(DBUS_LIBS) # check for debugging AC_ARG_ENABLE(debug, [ --enable-debug Enable debug build (default=disabled)], - [debug=$enableval], + [debug=$enableval], [debug="no"]) AM_CONDITIONAL( [WANT_DEBUG], [test x"$debug" = x"yes"]) diff --git a/tools/fso-boot/src/Makefile.am b/tools/fso-boot/src/Makefile.am index 2cb71fff..ccbf26b2 100644 --- a/tools/fso-boot/src/Makefile.am +++ b/tools/fso-boot/src/Makefile.am @@ -41,7 +41,7 @@ fso_boot_LDADD = \ $(DBUS_LIBS) \ $(GLIB_LIBS) \ $(NULL) - + EXTRA_DIST += \ $(fso_boot_VALASOURCES) \ $(BUILT_SOURCES) \ diff --git a/tools/fso-raw/Makefile.decl b/tools/fso-raw/Makefile.decl index 20ad96db..31c69513 100644 --- a/tools/fso-raw/Makefile.decl +++ b/tools/fso-raw/Makefile.decl @@ -1,6 +1,6 @@ # GLIB - Library of useful C routines -GTESTER = gtester +GTESTER = gtester GTESTER_REPORT = gtester-report # initialize variables for unconditional += appending diff --git a/tools/fso-raw/README b/tools/fso-raw/README index 079aacd5..1a746d1a 100644 --- a/tools/fso-raw/README +++ b/tools/fso-raw/README @@ -1,6 +1,6 @@ fso-raw 1.0 ========= * Vala port of fsoraw. - + fsoraw has been written by Nicola Ranaldo after an idea of Jörg Reisenweber. diff --git a/tools/mdbus2/Makefile.decl b/tools/mdbus2/Makefile.decl index 20ad96db..31c69513 100644 --- a/tools/mdbus2/Makefile.decl +++ b/tools/mdbus2/Makefile.decl @@ -1,6 +1,6 @@ # GLIB - Library of useful C routines -GTESTER = gtester +GTESTER = gtester GTESTER_REPORT = gtester-report # initialize variables for unconditional += appending diff --git a/tools/mdbus2/README b/tools/mdbus2/README index 294dca46..8f611624 100644 --- a/tools/mdbus2/README +++ b/tools/mdbus2/README @@ -1,7 +1,7 @@ mdbus 2.0 ========= * Vala port of mdbus in Python w/ interactive commandline - + Todo: * argument validation, since dbus is finnicky and fragile - + diff --git a/tools/mdbus2/configure.ac b/tools/mdbus2/configure.ac index 6349abe4..76ed4967 100644 --- a/tools/mdbus2/configure.ac +++ b/tools/mdbus2/configure.ac @@ -73,7 +73,7 @@ AC_SUBST(DBUS_LIBS) # check for debugging AC_ARG_ENABLE(debug, [ --enable-debug Enable debug build (default=disabled)], - [debug=$enableval], + [debug=$enableval], [debug="no"]) AM_CONDITIONAL( [WANT_DEBUG], [test x"$debug" = x"yes"]) diff --git a/tools/mioctl/Makefile.decl b/tools/mioctl/Makefile.decl index 20ad96db..31c69513 100644 --- a/tools/mioctl/Makefile.decl +++ b/tools/mioctl/Makefile.decl @@ -1,6 +1,6 @@ # GLIB - Library of useful C routines -GTESTER = gtester +GTESTER = gtester GTESTER_REPORT = gtester-report # initialize variables for unconditional += appending diff --git a/tools/mkdump/vapi/config.vapi b/tools/mkdump/vapi/config.vapi index 99b20e02..ef3520d9 100644 --- a/tools/mkdump/vapi/config.vapi +++ b/tools/mkdump/vapi/config.vapi @@ -4,4 +4,4 @@ namespace Config public const string PACKAGE_VERSION; public const string PACKAGE_DATADIR; } - + diff --git a/tools/mterm2/vapi/config.vapi b/tools/mterm2/vapi/config.vapi index 99b20e02..ef3520d9 100644 --- a/tools/mterm2/vapi/config.vapi +++ b/tools/mterm2/vapi/config.vapi @@ -4,4 +4,4 @@ namespace Config public const string PACKAGE_VERSION; public const string PACKAGE_DATADIR; } - + diff --git a/tools/serial_forward/Makefile.decl b/tools/serial_forward/Makefile.decl index 20ad96db..31c69513 100644 --- a/tools/serial_forward/Makefile.decl +++ b/tools/serial_forward/Makefile.decl @@ -1,6 +1,6 @@ # GLIB - Library of useful C routines -GTESTER = gtester +GTESTER = gtester GTESTER_REPORT = gtester-report # initialize variables for unconditional += appending diff --git a/tools/serial_forward/src/Makefile.am b/tools/serial_forward/src/Makefile.am index 1824744d..d9461f44 100644 --- a/tools/serial_forward/src/Makefile.am +++ b/tools/serial_forward/src/Makefile.am @@ -25,7 +25,7 @@ serial_forward_LDFLAGS = \ pty_forward_SOURCES = \ pty_forward.c \ $(NULL) - + pty_forward_LDADD = \ -lutil diff --git a/tools/serial_forward/src/hsuart.h b/tools/serial_forward/src/hsuart.h index 1cba4d80..93c14c03 100644 --- a/tools/serial_forward/src/hsuart.h +++ b/tools/serial_forward/src/hsuart.h @@ -33,7 +33,7 @@ #define HSUART_SPEED_115K 115200 #define HSUART_SPEED_3686K 3686400 -/* +/* Specifies target HSUART_IOCTL_CLEAR_FIFO/HSUART_IOCTL_FLUSH */ #define HSUART_RX_FIFO (1 << 0) // UART RX FIFO @@ -41,7 +41,7 @@ #define HSUART_TX_QUEUE (1 << 2) // RX BUFFERS #define HSUART_RX_QUEUE (1 << 3) // TX BUFFERS -/* +/* * Rx flow control */ #define HSUART_RX_FLOW_OFF 0 // DEPRECATED @@ -80,7 +80,7 @@ struct hsuart_stat { #define HSUART_MODE_PARITY_NONE (0 << HSUART_MODE_PARITY_BIT) #define HSUART_MODE_PARITY_ODD (1 << HSUART_MODE_PARITY_BIT) #define HSUART_MODE_PARITY_EVEN (2 << HSUART_MODE_PARITY_BIT) - + /* IOCTLs */ #define HSUART_IOCTL_GET_VERSION _IOR('h', 0x01, int) @@ -103,7 +103,7 @@ struct hsuart_stat { struct hsuart_platform_data { const char *dev_name; - int uart_mode; // default uart mode + int uart_mode; // default uart mode int uart_speed; // default uart speed int options; // operation options int tx_buf_size; // size of tx buffer @@ -112,10 +112,10 @@ struct hsuart_platform_data { int rx_buf_num; // number of preallocated rx buffers int max_packet_size; // max packet size int min_packet_size; // min packet size - int rx_latency; // in bytes at current speed + int rx_latency; // in bytes at current speed int rts_pin; // uart rts line pin - char *rts_act_mode; // uart rts line active mode - char *rts_gpio_mode; // uart rts line gpio mode + char *rts_act_mode; // uart rts line active mode + char *rts_gpio_mode; // uart rts line gpio mode int idle_timeout; // idle timeout int idle_poll_timeout; // idle poll timeout int dbg_level; // default debug level. |