fix alsa, remove unneeded patches

This commit is contained in:
Stephan Raue 2009-03-23 03:13:41 +01:00
parent 3c7125e980
commit ae2fe73c53
21 changed files with 2440 additions and 54 deletions

View File

@ -0,0 +1,45 @@
#!/bin/sh
. config/options
$SCRIPTS/build toolchain
ALSA_CARDS="seq-dummy, hrtimer, rtctimer, hpet, pcsp, dummy, hda-intel, hdsp, hdspm,"
ALSA_OPTIONS="seq-hrtimer-default, seq-rtctimer-default, \
support-old-api, verbose-procfs, verbose-printk, \
pcm-xrun-debug, ac97-power-save, hda-hwdep, \
hda-reconfig, hda-input-beep, hda-codec-realtek, \
hda-codec-analog, hda-codec-sigmatel, \
hda-codec-via, hda-codec-atihdmi, \
hda-codec-nvhdmi, hda-codec-intelhdmi, \
hda-codec-conexant, hda-codec-cmedia, \
hda-codec-si3054, hda-generic, hda-power-save,"
#CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=32 -fPIC -DPIC"
cd $BUILD/$1*
./configure --host=$TARGET_NAME \
--build=$HOST_NAME \
--prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
--disable-static \
--enable-shared \
--with-kernel=$(kernel_path) \
--with-isapnp=no \
--with-sequencer=yes \
--with-oss=no \
--with-pcm-oss-plugins=no \
--with-cards="$ALSA_CARDS" \
--with-card-options="$ALSA_OPTIONS" \
$MAKE
#$STRIP src/.libs/libasound.so*
#$MAKE -C include DESTDIR=$SYSROOT_PREFIX install-data
#$MAKE -C src DESTDIR=$SYSROOT_PREFIX install-exec
#$MAKE -C utils DESTDIR=$SYSROOT_PREFIX install-pkgconfigDATA

View File

@ -0,0 +1,19 @@
#!/bin/sh
. config/options
mkdir -p $INSTALL/usr/lib
cp -PR $BUILD/$1*/src/.libs/libasound.so* $INSTALL/usr/lib
#mkdir -p $INSTALL/usr/lib/alsa-lib/smixer
#cp -PR $BUILD/$1*/modules/mixer/simple/.libs/*.so $INSTALL/usr/lib/alsa-lib/smixer
mkdir -p $INSTALL/usr/share/alsa
sed 's%.*~/\.asoundrc.*%%' $BUILD/$1*/src/conf/alsa.conf > $INSTALL/usr/share/alsa/alsa.conf
#cp -PR $BUILD/$1*/src/conf/smixer.conf $INSTALL/usr/share/alsa
#cp -PR $BUILD/$1*/src/conf/*.alisp $INSTALL/usr/share/alsa
cp -rf $BUILD/$1*/src/conf/cards $INSTALL/usr/share/alsa/
cp -rf $BUILD/$1*/src/conf/pcm $INSTALL/usr/share/alsa/
rm -f $INSTALL/usr/share/alsa/cards/Makefile*
rm -f $INSTALL/usr/share/alsa/pcm/Makefile*

View File

@ -0,0 +1 @@
ftp://ftp.alsa-project.org/pub/driver/alsa-driver-1.0.19.tar.bz2

View File

@ -0,0 +1,24 @@
diff -ur alsa.old/src/Makefile.in alsa.dev/src/Makefile.in
--- alsa.old/src/Makefile.in 2006-04-19 09:50:27.000000000 +0200
+++ alsa.dev/src/Makefile.in 2006-10-14 17:16:10.000000000 +0200
@@ -360,7 +360,7 @@
rm -f "$${dir}/so_locations"; \
done
libasound.la: $(libasound_la_OBJECTS) $(libasound_la_DEPENDENCIES)
- $(LINK) -rpath $(libdir) $(libasound_la_LDFLAGS) $(libasound_la_OBJECTS) $(libasound_la_LIBADD) $(LIBS)
+ $(LINK) -rpath $(DESTDIR)$(libdir) $(libasound_la_LDFLAGS) $(libasound_la_OBJECTS) $(libasound_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
diff -ur alsa.old/src/pcm/scopes/Makefile.in alsa.dev/src/pcm/scopes/Makefile.in
--- alsa.old/src/pcm/scopes/Makefile.in 2006-04-19 09:50:38.000000000 +0200
+++ alsa.dev/src/pcm/scopes/Makefile.in 2006-10-14 17:16:38.000000000 +0200
@@ -317,7 +317,7 @@
rm -f "$${dir}/so_locations"; \
done
scope-level.la: $(scope_level_la_OBJECTS) $(scope_level_la_DEPENDENCIES)
- $(LINK) -rpath $(pkglibdir) $(scope_level_la_LDFLAGS) $(scope_level_la_OBJECTS) $(scope_level_la_LIBADD) $(LIBS)
+ $(LINK) -rpath $(DESTDIR)$(pkglibdir) $(scope_level_la_LDFLAGS) $(scope_level_la_OBJECTS) $(scope_level_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)

View File

@ -0,0 +1,53 @@
From: Takashi Iwai <tiwai@suse.de>
Date: Wed, 21 Jan 2009 08:25:48 +0000 (+0100)
Subject: Fix build with softfloat option
X-Git-Url: http://git.alsa-project.org/?p=alsa-lib.git;a=commitdiff_plain;h=a789b66d00644eeeb72fd424d686c7fe8faa5daa
Fix build with softfloat option
Fix build of alsa-lib when --with-softfloat is used:
- disable ladspa plugin
- don't use sqrt() function
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
diff --git a/configure.in b/configure.in
index 9a71d95..ea6a8a0 100644
--- a/configure.in
+++ b/configure.in
@@ -367,6 +367,7 @@ AC_ARG_ENABLE(seq,
AC_ARG_ENABLE(alisp,
AS_HELP_STRING([--disable-alisp], [disable the alisp component]),
[build_alisp="$enableval"], [build_alisp="yes"])
+test "$softfloat" = "yes" && build_alisp="no"
AC_ARG_ENABLE(old-symbols,
AS_HELP_STRING([--disable-old-symbols], [disable old obsoleted symbols]),
[keep_old_symbols="$enableval"], [keep_old_symbols="yes"])
@@ -474,6 +475,7 @@ fi
if test "$softfloat" = "yes"; then
build_pcm_lfloat="no"
+ build_pcm_ladspa="no"
fi
AM_CONDITIONAL(BUILD_PCM_PLUGIN, test x$build_pcm_plugin = xyes)
diff --git a/src/mixer/simple_none.c b/src/mixer/simple_none.c
index 0f4dd3a..4802200 100644
--- a/src/mixer/simple_none.c
+++ b/src/mixer/simple_none.c
@@ -1450,7 +1450,14 @@ static int simple_add1(snd_mixer_class_t *class, const char *name,
}
if (ctype != SND_CTL_ELEM_TYPE_BOOLEAN)
return 0;
+#ifdef HAVE_SOFT_FLOAT
+ /* up to 256 channels */
+ for (n = 1; n < 256; n++)
+ if (n * n == values)
+ break;
+#else
n = sqrt((double)values);
+#endif
if (n * n != values)
return 0;
values = n;

View File

@ -0,0 +1,28 @@
From: Takashi Iwai <tiwai@suse.de>
Date: Wed, 21 Jan 2009 08:29:35 +0000 (+0100)
Subject: Add missing -ldl to modules/mixer/simple/*
X-Git-Url: http://git.alsa-project.org/?p=alsa-lib.git;a=commitdiff_plain;h=3b728db20d1729f1270731006f44c20ab910bee0
Add missing -ldl to modules/mixer/simple/*
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
diff --git a/modules/mixer/simple/Makefile.am b/modules/mixer/simple/Makefile.am
index f73871f..bad0944 100644
--- a/modules/mixer/simple/Makefile.am
+++ b/modules/mixer/simple/Makefile.am
@@ -21,11 +21,11 @@ smixer_sbase_la_LIBADD = ../../../src/libasound.la
smixer_ac97_la_SOURCES = ac97.c sbasedl.c
smixer_ac97_la_LDFLAGS = -module -avoid-version $(LDFLAGS_NOUNDEFINED)
-smixer_ac97_la_LIBADD = ../../../src/libasound.la
+smixer_ac97_la_LIBADD = ../../../src/libasound.la -ldl
smixer_hda_la_SOURCES = hda.c sbasedl.c
smixer_hda_la_LDFLAGS = -module -avoid-version $(LDFLAGS_NOUNDEFINED)
-smixer_hda_la_LIBADD = ../../../src/libasound.la
+smixer_hda_la_LIBADD = ../../../src/libasound.la -ldl
if BUILD_PYTHON
smixer_python_la_SOURCES = python.c

View File

@ -10,7 +10,11 @@ export CPPFLAGS="$CPPFLAGS -I$LIB_PREFIX/include/ncurses"
export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/usr/lib64 -L$LIB_PREFIX/lib"
ALSAMIXER_CONFIG="--disable-alsamixer"
ALSATEST_CONFIG="--disable-alsatest"
ALSACONF_CONFIG="--disable-alsaconf"
[ "$DEVTOOLS" = yes ] && ALSAMIXER_CONFIG="--enable-alsamixer"
[ "$DEVTOOLS" = yes ] && ALSATEST_CONFIG="--enable-alsatest"
[ "$DEVTOOLS" = yes ] && ALSACONF_CONFIG="--enable-alsaconf"
cd $BUILD/$1*
./configure --host=$TARGET_NAME \
@ -21,12 +25,17 @@ cd $BUILD/$1*
--disable-dependency-tracking \
$ALSAMIXER_CONFIG
sed -i -e 's/^\(man_MANS[ \t]*=[ \t]*\).*$/\1/' alsactl/Makefile.*
make -C amixer
make -C alsactl
if [ "$DEVTOOLS" = yes ]; then
make -C alsamixer
make -C alsaconf
make -C aplay
make -C iecset
make -C speaker-test
fi
exit 0

View File

@ -0,0 +1,13 @@
# Give the audio group ownership of sound devices
SUBSYSTEM=="sound", GROUP="audio"
SUBSYSTEM=="snd", GROUP="audio"
# ALSA Devices
# When a sound device is detected, restore the volume settings
KERNEL=="controlC[0-9]*", NAME="snd/%k", ACTION=="add", RUN+="/usr/sbin/alsactl restore %n"
KERNEL=="hw[CD0-9]*", NAME="snd/%k"
KERNEL=="pcm[CD0-9cp]*", NAME="snd/%k"
KERNEL=="midiC[D0-9]*", NAME="snd/%k"
KERNEL=="timer", NAME="snd/%k"
KERNEL=="seq", NAME="snd/%k"

View File

@ -0,0 +1,115 @@
#!/bin/sh
#
# setup alsa (especially the mixer config)
#
# runlevels: openelec, debug, configure
echo "### Setting up sound card ###"
# include audio configuration file
. /etc/audio
[ ! -f /etc/asound.conf ] && echo "" > /etc/asound.conf
mixer() {
parm=${3:-on}
amixer -c $ALSA_CARD sset "$1" "$2" $parm >/dev/null 2>&1
amixer -c $ALSA_CARD sset "$1" $parm >/dev/null 2>&1
}
# set alsa channel mode (6ch, 4ch, 2ch)
mixer 'Channel Mode' "${CHANNELS}ch"
# set common mixer params
mixer Master 90%
mixer Front 90%
mixer PCM 90%
mixer Synth 90%
# mute CD, since using digital audio instead
mixer CD 0% mute
# Only unmute Line and Aux if they are possibly used.
if [ -e /var/use_dxr3 -o -e /var/tvcard -o -e /var/dvbcard -o -e /var/digimatrix ]; then
mixer Line 90%
mixer Aux 90%
else
mixer Line 0% mute
mixer Aux 0% mute
fi
# mute mic
mixer Mic 0% mute
# ESS 1969 chipset has 2 PCM channels
mixer PCM,1 90%
# Trident/YMFPCI/emu10k1
mixer Wave 100%
mixer Music 100%
mixer AC97 100%
mixer Surround 90%
mixer 'Surround Digital' 90%
mixer 'Wave Surround' 90%
if [ "$CHANNELS" = 6 ]; then
mixer 'Duplicate Front' 0% off
else
mixer 'Duplicate Front' 90%
fi
mixer 'Sigmatel 4-Speaker Stereo' 90%
# CS4237B chipset:
mixer 'Master Digital' 90%
# DRC
mixer 'Dynamic Range Compression' 90%
# Envy24 chips with analog outs
mixer DAC 90%
mixer DAC,0 90%
mixer DAC,1 90%
# some notebooks use headphone instead of master
mixer Headphone 90%
mixer 'Internal Speaker' 75%
mixer Playback 100%
mixer Center 90%
mixer LFE 90%
mixer Center/LFE 90%
# Required for newer Via hardware
mixer 'VIA DXS,0' 80%
mixer 'VIA DXS,1' 80%
mixer 'VIA DXS,2' 80%
mixer 'VIA DXS,3' 80%
# Intel P4P800-MX (Ubuntu bug #5813)
mixer 'Master Playback Switch' on
# Required at least for Via 823x hardware on DFI K8M800-MLVF Mobo
mixer 'IEC958 Capture Monitor' 0% off
# Required on some notebooks with ICH4:
mixer 'Headphone Jack Sense' 0% off
mixer 'Line Jack Sense' 0% off
# Required on some Vaio notebooks (B3XP):
mixer 'External Amplifier' 0% mute
# Required for either Analog or Digital output
mixer 'SB Live Analog/Digital Output Jack' $SBL_AUDIGY
mixer 'Audigy Analog/Digital Output Jack' $SBL_AUDIGY
# set SPDIF mixer params
if [ "$SOUNDCARD_MODE" = SPDIF ]; then
mixer 'IEC958' 90% on
mixer 'IEC958 Output' 90%
mixer 'IEC958 Playback AC97-SPSA' $AC97_SPSA
mixer 'IEC958 Coaxial' 90%
mixer 'IEC958 LiveDrive' 90%
mixer 'IEC958 Optical Raw' 90%
mixer 'SPDIF Out' 90%
mixer 'SPDIF Front' 90%
mixer 'SPDIF Rear' 90%
mixer 'SPDIF Center/LFE' 90%
mixer 'Master Digital' 80%
else
mixer 'SPDIF Out' 0% off
mixer 'Analog Front' 90%
mixer 'Analog Rear' 90%
mixer 'Analog Center/LFE' 90%
fi
exit 0

View File

@ -4,13 +4,40 @@
$SCRIPTS/install alsa-lib
PKG_DIR=`find $PACKAGES -type d -name $1`
mkdir -p $INSTALL/usr/bin
cp $BUILD/$1*/amixer/amixer $INSTALL/usr/bin
mkdir -p $INSTALL/usr/sbin
cp $BUILD/$1*/alsactl/alsactl $INSTALL/usr/sbin
mkdir -p $INSTALL/usr/share/alsa/init
cp $BUILD/$1*/alsactl/init/* $INSTALL/usr/share/alsa/init
rm -rf $INSTALL/usr/share/alsa/init/Makefile*
mkdir -p $INSTALL/etc/udev/rules.d
cp $PKG_DIR/config/rules.d/* $INSTALL/etc/udev/rules.d
mkdir -p $INSTALL/etc
touch $INSTALL/etc/asound.state
if [ "$DEVTOOLS" = yes ]; then
cp $BUILD/$1*/alsaconf/alsaconf $INSTALL/usr/bin
chmod +x $INSTALL/usr/bin/alsaconf
cp $BUILD/$1*/alsamixer/alsamixer $INSTALL/usr/bin
cp $BUILD/$1*/aplay/aplay $INSTALL/usr/bin
ln -sf /usr/bin/aplay $INSTALL/usr/bin/arecord
cp $BUILD/$1*/iecset/iecset $INSTALL/usr/bin
cp $BUILD/$1*/speaker-test/speaker-test $INSTALL/usr/bin
mkdir -p $INSTALL/usr/share/alsa/speaker-test
cp $BUILD/$1*/speaker-test/samples/*.csv $INSTALL/usr/share/alsa/speaker-test
mkdir -p $INSTALL/usr/share/sounds/alsa
cp $BUILD/$1*/speaker-test/samples/*.wav $INSTALL/usr/share/sounds/alsa
fi
exit 0

View File

@ -16,5 +16,21 @@ options snd-cmipci mpu_port=0x330 fm_port=0x388
options snd-hda-intel probe_mask=1
# Some Toshiba laptops might require this
# options snd-hda-intel model=toshiba
options snd-hda-intel model=auto
options snd-hda-intel model=toshiba
#options snd-hda-intel model=auto
# ALSA portion
alias char-major-116 snd
alias snd-card-0 snd-hda-intel
# module options should go here
# OSS/Free portion
alias char-major-14 soundcore
alias sound-slot-0 snd-card-0
# card #1
alias sound-service-0-0 snd-mixer-oss
alias sound-service-0-1 snd-seq-oss
alias sound-service-0-3 snd-pcm-oss
alias sound-service-0-8 snd-seq-oss
alias sound-service-0-12 snd-pcm-oss

View File

@ -308,7 +308,6 @@ CONFIG_ACPI_SYSFS_POWER=y
# CONFIG_ACPI_AC is not set
# CONFIG_ACPI_BATTERY is not set
CONFIG_ACPI_BUTTON=y
# CONFIG_ACPI_VIDEO is not set
CONFIG_ACPI_FAN=y
CONFIG_ACPI_DOCK=y
CONFIG_ACPI_PROCESSOR=y
@ -1290,15 +1289,7 @@ CONFIG_FB_VESA=y
# CONFIG_FB_VIRTUAL is not set
# CONFIG_FB_METRONOME is not set
# CONFIG_FB_MB862XX is not set
CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_LCD_CLASS_DEVICE=y
# CONFIG_LCD_ILI9320 is not set
# CONFIG_LCD_PLATFORM is not set
CONFIG_BACKLIGHT_CLASS_DEVICE=y
CONFIG_BACKLIGHT_GENERIC=y
# CONFIG_BACKLIGHT_PROGEAR is not set
# CONFIG_BACKLIGHT_MBP_NVIDIA is not set
# CONFIG_BACKLIGHT_SAHARA is not set
# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
#
# Display device support
@ -1322,18 +1313,15 @@ CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
# CONFIG_FONTS is not set
CONFIG_FONT_8x8=y
CONFIG_FONT_8x16=y
CONFIG_LOGO=y
# CONFIG_LOGO_LINUX_MONO is not set
# CONFIG_LOGO_LINUX_VGA16 is not set
CONFIG_LOGO_LINUX_CLUT224=y
# CONFIG_LOGO is not set
#
# Bootsplash configuration
#
CONFIG_BOOTSPLASH=y
CONFIG_SOUND=y
# CONFIG_BOOTSPLASH is not set
CONFIG_SOUND=m
CONFIG_SOUND_OSS_CORE=y
CONFIG_SND=y
CONFIG_SND=m
CONFIG_SND_TIMER=m
CONFIG_SND_PCM=m
CONFIG_SND_JACK=y
@ -1354,12 +1342,7 @@ CONFIG_SND_DEBUG=y
CONFIG_SND_DEBUG_VERBOSE=y
# CONFIG_SND_PCM_XRUN_DEBUG is not set
CONFIG_SND_VMASTER=y
CONFIG_SND_DRIVERS=y
# CONFIG_SND_DUMMY is not set
# CONFIG_SND_VIRMIDI is not set
# CONFIG_SND_MTPAV is not set
# CONFIG_SND_SERIAL_U16550 is not set
# CONFIG_SND_MPU401 is not set
# CONFIG_SND_DRIVERS is not set
CONFIG_SND_PCI=y
# CONFIG_SND_AD1889 is not set
# CONFIG_SND_ALS300 is not set
@ -1662,38 +1645,38 @@ CONFIG_EXT4_FS=y
# CONFIG_EXT4_FS_XATTR is not set
CONFIG_JBD=y
CONFIG_JBD2=y
CONFIG_REISERFS_FS=y
CONFIG_REISERFS_FS=m
# CONFIG_REISERFS_CHECK is not set
# CONFIG_REISERFS_PROC_INFO is not set
# CONFIG_REISERFS_FS_XATTR is not set
CONFIG_JFS_FS=y
CONFIG_JFS_FS=m
# CONFIG_JFS_POSIX_ACL is not set
# CONFIG_JFS_SECURITY is not set
# CONFIG_JFS_DEBUG is not set
# CONFIG_JFS_STATISTICS is not set
CONFIG_FS_POSIX_ACL=y
CONFIG_FILE_LOCKING=y
CONFIG_XFS_FS=y
CONFIG_XFS_FS=m
# CONFIG_XFS_QUOTA is not set
# CONFIG_XFS_POSIX_ACL is not set
# CONFIG_XFS_RT is not set
# CONFIG_XFS_DEBUG is not set
# CONFIG_GFS2_FS is not set
# CONFIG_OCFS2_FS is not set
CONFIG_BTRFS_FS=y
CONFIG_BTRFS_FS=m
# CONFIG_BTRFS_FS_POSIX_ACL is not set
# CONFIG_DNOTIFY is not set
CONFIG_INOTIFY=y
CONFIG_INOTIFY_USER=y
# CONFIG_QUOTA is not set
# CONFIG_AUTOFS_FS is not set
CONFIG_AUTOFS4_FS=y
CONFIG_AUTOFS4_FS=m
CONFIG_FUSE_FS=y
#
# CD-ROM/DVD Filesystems
#
CONFIG_ISO9660_FS=y
CONFIG_ISO9660_FS=m
CONFIG_JOLIET=y
CONFIG_ZISOFS=y
CONFIG_UDF_FS=m
@ -1702,12 +1685,12 @@ CONFIG_UDF_NLS=y
#
# DOS/FAT/NT Filesystems
#
CONFIG_FAT_FS=y
CONFIG_MSDOS_FS=y
CONFIG_VFAT_FS=y
CONFIG_FAT_FS=m
CONFIG_MSDOS_FS=m
CONFIG_VFAT_FS=m
CONFIG_FAT_DEFAULT_CODEPAGE=850
CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
CONFIG_NTFS_FS=y
CONFIG_NTFS_FS=m
# CONFIG_NTFS_DEBUG is not set
CONFIG_NTFS_RW=y
@ -1745,23 +1728,23 @@ CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
# CONFIG_SYSV_FS is not set
# CONFIG_UFS_FS is not set
CONFIG_NETWORK_FILESYSTEMS=y
CONFIG_NFS_FS=y
CONFIG_NFS_FS=m
CONFIG_NFS_V3=y
CONFIG_NFS_V3_ACL=y
CONFIG_NFS_V4=y
# CONFIG_NFSD is not set
CONFIG_LOCKD=y
CONFIG_LOCKD=m
CONFIG_LOCKD_V4=y
CONFIG_EXPORTFS=y
CONFIG_NFS_ACL_SUPPORT=y
CONFIG_EXPORTFS=m
CONFIG_NFS_ACL_SUPPORT=m
CONFIG_NFS_COMMON=y
CONFIG_SUNRPC=y
CONFIG_SUNRPC_GSS=y
CONFIG_SUNRPC=m
CONFIG_SUNRPC_GSS=m
# CONFIG_SUNRPC_REGISTER_V4 is not set
CONFIG_RPCSEC_GSS_KRB5=y
CONFIG_RPCSEC_GSS_KRB5=m
# CONFIG_RPCSEC_GSS_SPKM3 is not set
# CONFIG_SMB_FS is not set
CONFIG_CIFS=y
CONFIG_CIFS=m
# CONFIG_CIFS_STATS is not set
# CONFIG_CIFS_WEAK_PW_HASH is not set
# CONFIG_CIFS_XATTR is not set
@ -2016,7 +1999,7 @@ CONFIG_CRC32=y
CONFIG_LIBCRC32C=y
CONFIG_AUDIT_GENERIC=y
CONFIG_ZLIB_INFLATE=y
CONFIG_ZLIB_DEFLATE=y
CONFIG_ZLIB_DEFLATE=m
CONFIG_PLIST=y
CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT=y

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,13 @@
diff --git a/sound/pci/hda/hda_beep.c b/sound/pci/hda/hda_beep.c
index 3ecd7e7..2762b40 100644
--- a/sound/pci/hda/hda_beep.c
+++ b/sound/pci/hda/hda_beep.c
@@ -122,7 +122,7 @@ int snd_hda_attach_beep_device(struct hda_codec *codec, int nid)
beep->nid = nid;
beep->dev = input_dev;
beep->codec = codec;
- beep->enabled = 1;
+ beep->enabled = 0;
codec->beep = beep;
INIT_WORK(&beep->beep_work, &snd_hda_generate_beep);

View File

@ -0,0 +1,35 @@
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index c8d9178..7d3bb15 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -1774,6 +1774,7 @@ azx_attach_pcm_stream(struct hda_bus *bus, struct hda_codec *codec,
struct azx_pcm *apcm;
int pcm_dev = cpcm->device;
int s, err;
+ size_t prealloc_min = 64*1024; /* 64KB */
if (pcm_dev >= AZX_MAX_PCMS) {
snd_printk(KERN_ERR SFX "Invalid PCM device number %d\n",
@@ -1807,10 +1808,21 @@ azx_attach_pcm_stream(struct hda_bus *bus, struct hda_codec *codec,
if (cpcm->stream[s].substreams)
snd_pcm_set_ops(pcm, s, &azx_pcm_ops);
}
+
/* buffer pre-allocation */
+
+ /* subtle, don't allocate a big buffer for modems...
+ * also, don't just test 32BIT_MASK, since azx supports
+ * 64-bit DMA in some cases.
+ */
+ /* lennart wants a 2.2MB buffer for 2sec of 48khz */
+ if (pcm->dev_class == SNDRV_PCM_CLASS_GENERIC &&
+ chip->pci->dma_mask >= DMA_32BIT_MASK)
+ prealloc_min = 4 * 1024 * 1024; /* 4MB */
+
snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG,
snd_dma_pci_data(chip->pci),
- 1024 * 64, 32 * 1024 * 1024);
+ prealloc_min, 32 * 1024 * 1024);
return 0;
}

View File

@ -8,8 +8,8 @@
/bin/busybox mdev -s
/bin/busybox mount -o ro,noatime $BOOT /flash
/bin/busybox mount -o rw,noatime $DISK /storage
/bin/busybox mount -t ext3 -o ro,noatime $BOOT /flash
/bin/busybox mount -t ext3 -o rw,noatime $DISK /storage
if [ -f "/flash/openelec.system" ]; then
/bin/busybox mount /flash/openelec.system /sysroot

View File

@ -33,14 +33,6 @@ KERNEL=="capi[0-9]*", NAME="capi/%n"
KERNEL=="pktcdvd", NAME="pktcdvd/control"
KERNEL=="pktcdvd[0-9]*", NAME="pktcdvd/%k"
# Sound devices, group under /dev/snd
KERNEL=="controlC[0-9]*", NAME="snd/%k", RUN="/etc/init.d/40_alsa"
KERNEL=="hwC[D0-9]*", NAME="snd/%k"
KERNEL=="midiC[D0-9]*", NAME="snd/%k"
KERNEL=="pcmC[D0-9cp]*", NAME="snd/%k"
KERNEL=="seq", NAME="snd/%k"
KERNEL=="timer", NAME="snd/%k"
# USB devices (usbfs replacement), group under /dev/bus/usb
SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", \
NAME="bus/usb/$env{BUSNUM}/$env{DEVNUM}"