diff options
| author | Santiago Collazo <scollazo@activitycentral.com> | 2013-03-10 21:28:26 (GMT) |
|---|---|---|
| committer | Santiago Collazo <scollazo@activitycentral.com> | 2013-03-10 21:28:26 (GMT) |
| commit | f3f0596d737ae14aaf2f898444520102e631a73e (patch) | |
| tree | 02afe8bc1e10666f3b30ff4b123c8d9acd26c37a | |
| parent | d5358dda7f3f07e0f4eb0085af76fbe1459f4642 (diff) | |
| parent | e9013f35db2f5484ccf75755fa4a62dece483fa5 (diff) | |
Merge remote-tracking branch 'upstream/master' into dextrose4-au
| -rw-r--r-- | examples/olpc-os-13.1.0-xo4.ini | 4 | ||||
| -rw-r--r-- | modules/xo4/kspost.50.xo4-tweaks.inc | 27 |
2 files changed, 31 insertions, 0 deletions
diff --git a/examples/olpc-os-13.1.0-xo4.ini b/examples/olpc-os-13.1.0-xo4.ini index ab09624..794c69a 100644 --- a/examples/olpc-os-13.1.0-xo4.ini +++ b/examples/olpc-os-13.1.0-xo4.ini @@ -71,5 +71,9 @@ protected_activities= [sugar_activity_group] url=http://wiki.laptop.org/go/Activities/G1G1 +; temporarily disabled for MP +[powerd] +enable_idle_suspend=0 + [buildnr_from_file] path=latestbuild diff --git a/modules/xo4/kspost.50.xo4-tweaks.inc b/modules/xo4/kspost.50.xo4-tweaks.inc index d72f834..d1f8e9d 100644 --- a/modules/xo4/kspost.50.xo4-tweaks.inc +++ b/modules/xo4/kspost.50.xo4-tweaks.inc @@ -10,3 +10,30 @@ ln -sf /lib/systemd/system/serial-getty@.service \ # FIXME: remove this once XO-4 bluetooth works better touch /runin/no-bluetooth echo "blacklist btmrvl_sdio" > /etc/modprobe.d/btmrvl.conf + +# enable dmix and dsnoop software sound mixing (#12487, #12606) +# FIXME: this should be upstreamed (perhaps in a different form) +cat <<'EOF' > /usr/share/alsa/cards/OLPC_XO-1_75.conf +# default with dmix/dsnoop +OLPC_XO-1_75.pcm.default { + @args [ CARD ] + @args.CARD { + type string + } + type asym + playback.pcm { + type plug + slave.pcm { + @func concat + strings [ "dmix:CARD=" $CARD ] + } + } + capture.pcm { + type plug + slave.pcm { + @func concat + strings [ "dsnoop:CARD=" $CARD ] + } + } +} +EOF |