Hi, Attached are:
- a patch to quiet down a hell lot of warnings when compiling alsa against 2.4.20 with the XFS patch. - a manpage for alsaconf. Jordi -- Jordi Mallach Pérez -- Debian developer http://www.debian.org/ [EMAIL PROTECTED] [EMAIL PROTECTED] http://www.sindominio.net/ GnuPG public key information available at http://oskuro.net/~jordi/
#! /bin/sh -e
# 08_vmap_vunmap_calls.dpatch by Steve Kowalik
#
# DP: Undefine vmap, vunmap; replace calls to them.
. debian/patches/patch-opts
if [ $# -ne 1 ]; then
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
exit 1
fi
case "$1" in
-patch) patch $patch_opts < $0;;
-unpatch) patch $patch_opts -R < $0;;
*)
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
exit 1;;
esac
exit 0
--- alsa-driver/include/adriver.h 1 Feb 2003 11:09:21 -0000 1.1.1.2
+++ alsa-driver/include/adriver.h 20 Feb 2003 12:43:42 -0000
@@ -320,11 +320,11 @@
#endif /* 2.5.0 */
/* vmap/vunmap wrappers */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0)
+/* #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0) */
/* 2.4 kernels with xfs patch have the following, but we don't use them anyway... */
-#define vmap(array,pages) remap_page_array(array,pages,0)
-#define vunmap(ptr) vfree_nocheck(ptr)
-#endif /* 2.5.0 */
+/* #define vmap(array,pages) remap_page_array(array,pages,0)
+#define vunmap(ptr) vfree_nocheck(ptr) */
+/* #endif 2.5.0 */
/* vmalloc_to_page wrapper */
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 19)
--- alsa-driver/alsa-kernel/core/pcm_sgbuf.c 1 Feb 2003 11:13:05 -0000 1.1.1.2
+++ alsa-driver/alsa-kernel/core/pcm_sgbuf.c 20 Feb 2003 12:43:42 -0000
@@ -109,7 +109,7 @@
}
sgbuf->size = size;
- vmaddr = vmap(sgbuf->page_table, sgbuf->pages);
+ vmaddr = remap_page_array(sgbuf->page_table, sgbuf->pages, 0);
if (! vmaddr)
goto _failed;
return vmaddr;
@@ -133,7 +133,7 @@
int snd_pcm_sgbuf_free_pages(struct snd_sg_buf *sgbuf, void *vmaddr)
{
if (vmaddr)
- vunmap(vmaddr);
+ vfree_nocheck(vmaddr);
while (sgbuf->pages > 0) {
sgbuf->pages--;
.\" Hey, EMACS: -*- nroff -*- .\" alsaconf.8 is copyright 2003 by Jordi Mallach <[EMAIL PROTECTED]> .\" .\" This is free documentation, see the latest version of the GNU .\" General Public License for copying conditions. There is NO warranty. .TH ALSACONF 8 "February 23, 2003" .SH NAME alsaconf \- configuration tool for the Advanced Linux Sound Architecture .SH SYNOPSIS .B alsaconf .RI [ options ] .SH DESCRIPTION This manual page documents briefly the .B alsaconf command. This manual page was written for the Debian distribution because the original program does not have a manual page. .PP \fBAlsaconf\fP is a simple shell script which tries to detect the sound cards on your system and writes a suitable configuration file for ALSA. It will try to guess what GNU/Linux distribution you're running, and will act accordingly to the standards of that distribution, if specific support is available. .PP Alsaconf will write a modutils snippet which can be then used by modutils to load the correct parameters for your sound card. .SH OPTIONS Alsaconf accepts the following options: .TP .B \-l, \-\-legacy Check only for legacy non-isapnp cards .TP .B \-m, \-\-modinfo Read module descriptions instead of reading a card database. .TP .B \-s, \-\-sound\-wav\-file Use the specified wav file as a test sound .TP .B \-u, \-\-uid uid Set the uid for the ALSA devices (default = 0) .TP .B \-g, \-\-gid gid Set the gid for the ALSA devices (default = 0) .TP .B \-d, \-\-devmode mode Set the device mode for the ALSA devices (default = 0666) .TP .B \-r, \-\-strict Set strict device mode (equiv. with -g 17 -d 0660) .TP .B \-L, \-\-log Logging on /tmp/alsaconf.log .TP .B \-p, \-\-probe card-name Probe a legacy non-isapnp card and print module options .TP .B \-h, \-\-help Displays this help text .SH DEBIAN SPECIFIC In Debian, the default gid of the device files is 29 (corresponding to the audio group) and the default device mode is 0660. .SH SEE ALSO .I /usr/share/doc/alsa-base/ .SH HOMEPAGE http://www.alsa-project.org/ .SH AUTHOR This manual page was written by Jordi Mallach <[EMAIL PROTECTED]>, for the Debian system (but may be used by others).
pgp00000.pgp
Description: PGP signature
