Send commitlog mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:
1. r4352 - trunk/src/target/audio/om-gta02
([EMAIL PROTECTED])
2. r4353 -
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit
([EMAIL PROTECTED])
3. r4354 - trunk/src/target/OM-2007.2/daemons/neod/src
([EMAIL PROTECTED])
--- Begin Message ---
Author: sean_chiang
Date: 2008-04-14 06:05:48 +0200 (Mon, 14 Apr 2008)
New Revision: 4352
Modified:
trunk/src/target/audio/om-gta02/gsmhandset.state
Log:
low the volumn of reciever at gsmhandset.state
Modified: trunk/src/target/audio/om-gta02/gsmhandset.state
===================================================================
--- trunk/src/target/audio/om-gta02/gsmhandset.state 2008-04-12 08:08:42 UTC
(rev 4351)
+++ trunk/src/target/audio/om-gta02/gsmhandset.state 2008-04-14 04:05:48 UTC
(rev 4352)
@@ -36,8 +36,8 @@
comment.range '0 - 127'
iface MIXER
name 'Speaker Playback Volume'
- value.0 118
- value.1 118
+ value.0 97
+ value.1 97
}
control.5 {
comment.access 'read write'
@@ -112,7 +112,7 @@
comment.range '0 - 7'
iface MIXER
name 'Mono Sidetone Playback Volume'
- value 6
+ value 5
}
control.13 {
comment.access 'read write'
--- End Message ---
--- Begin Message ---
Author: sean_chiang
Date: 2008-04-14 07:18:31 +0200 (Mon, 14 Apr 2008)
New Revision: 4353
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-sound.c
Log:
missing comma
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-sound.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-sound.c
2008-04-14 04:05:48 UTC (rev 4352)
+++
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-sound.c
2008-04-14 05:18:31 UTC (rev 4353)
@@ -26,7 +26,7 @@
"/usr/share/openmoko/scenarios/gsmhandset.state",
"/usr/share/openmoko/scenarios/gsmheadset.state",
"/usr/share/openmoko/scenarios/gsmspeakerout.state",
- "/usr/share/openmoko/scenarios/stereoout.state"
+ "/usr/share/openmoko/scenarios/stereoout.state",
"/usr/share/openmoko/scenarios/headset.state"
};
--- End Message ---
--- Begin Message ---
Author: sean_chiang
Date: 2008-04-14 08:59:13 +0200 (Mon, 14 Apr 2008)
New Revision: 4354
Modified:
trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c
Log:
change the way about detect the change of headset in or out
Modified: trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c
===================================================================
--- trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c 2008-04-14
05:18:31 UTC (rev 4353)
+++ trunk/src/target/OM-2007.2/daemons/neod/src/buttonactions.c 2008-04-14
06:59:13 UTC (rev 4354)
@@ -79,26 +79,6 @@
#define BIT_TEST( bitmask, bit ) \
( bitmask[ (bit) / sizeof(short) / 8 ] & (1u << ( (bit) % (sizeof(short) *
8))) )
-#ifdef NEOD_PLATFORM_FIC_NEO1973
-/*
- * For neo, headset in headset out
- * 05 02 01 05 02 00
- * 05 02 00 05 02 01
- * 05 02 01 05 02 00
- */
-enum {
- HEADSET_STATE_IDLE = 0,
- HEADSET_STATE_START_IN,
- HEADSET_STATE_START_OUT,
- HEADSET_STATE_IN,
- HEADSET_STATE_OUT,
- HEADSET_STATE_END_IN,
- HEADSET_STATE_END_OUT,
-};
-
-static int headset_state = HEADSET_STATE_IDLE;
-#endif
-
static gboolean moko_debug = TRUE;
GPollFD input_fd[10];
@@ -424,65 +404,24 @@
else
if ( event.type == 5 && event.code ==
HEADPHONE_INSERTION_SWITCHCODE )
{
-#ifdef NEOD_PLATFORM_FIC_NEO1973
if ( event.value == 1 ) /* inserted */
{
- switch (headset_state) {
- case HEADSET_STATE_IDLE:
- headset_state = HEADSET_STATE_START_IN;
- if ( moko_debug ) g_debug( "HEADSET_STATE_START_IN"
);
- break;
- case HEADSET_STATE_IN:
- headset_state = HEADSET_STATE_END_IN;
- if ( moko_debug ) g_debug( "HEADSET_STATE_END_IN" );
- if ( moko_debug ) g_debug( "headphones IN" );
- g_spawn_command_line_async( "dbus-send
--session --type=signal /org/openmoko/PhoneKit/Headset
org.openmoko.PhoneKit.Headset.HeadsetIn", NULL );
- break;
- case HEADSET_STATE_START_OUT:
- headset_state = HEADSET_STATE_OUT;
- if ( moko_debug ) g_debug( "HEADSET_STATE_OUT" );
- break;
- default:
- headset_state = HEADSET_STATE_IDLE;
- if ( moko_debug ) g_debug( "HEADSET_STATE_IDLE 1" );
- break;
- }
- }
- else if ( event.value == 0 ) /* released */
- {
- switch (headset_state) {
- case HEADSET_STATE_IDLE:
- headset_state = HEADSET_STATE_START_OUT;
- if ( moko_debug ) g_debug(
"HEADSET_STATE_START_OUT" );
- break;
- case HEADSET_STATE_OUT:
- headset_state = HEADSET_STATE_END_OUT;
- if ( moko_debug ) g_debug( "HEADSET_STATE_END_OUT"
);
- if ( moko_debug ) g_debug( "headphones OUT" );
- g_spawn_command_line_async( "dbus-send
--session --type=signal /org/openmoko/PhoneKit/Headset
org.openmoko.PhoneKit.Headset.HeadsetOut", NULL );
- break;
- case HEADSET_STATE_START_IN:
- headset_state = HEADSET_STATE_IN;
- if ( moko_debug ) g_debug( "HEADSET_STATE_IN" );
- break;
- default:
- headset_state = HEADSET_STATE_IDLE;
- if ( moko_debug ) g_debug( "HEADSET_STATE_IDLE 0" );
- break;
- }
- }
-#else
- if ( event.value == 1 ) /* inserted */
- {
if ( moko_debug ) g_debug( "headphones IN" );
- g_spawn_command_line_async( "amixer sset \"Amp Mode\"
\"Headphones\"", NULL );
+#ifdef NEOD_PLATFORM_FIC_NEO1973
+ g_spawn_command_line_async( "dbus-send --session
--type=signal /org/openmoko/PhoneKit/Headset
org.openmoko.PhoneKit.Headset.HeadsetIn", NULL );
+#else
+ g_spawn_command_line_async( "amixer sset \"Amp Mode\"
\"Headphones\"", NULL );
+#endif
}
else if ( event.value == 0 ) /* released */
{
if ( moko_debug ) g_debug( "headphones OUT" );
- g_spawn_command_line_async( "amixer sset \"Amp Mode\"
\"Stereo Speakers\"", NULL );
- }
+#ifdef NEOD_PLATFORM_FIC_NEO1973
+ g_spawn_command_line_async( "dbus-send --session
--type=signal /org/openmoko/PhoneKit/Headset
org.openmoko.PhoneKit.Headset.HeadsetOut", NULL );
+#else
+ g_spawn_command_line_async( "amixer sset \"Amp Mode\"
\"Stereo Speakers\"", NULL );
#endif
+ }
neod_buttonactions_powersave_reset();
#if 0
if ( power_state != NORMAL )
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
