head	1.7;
access;
symbols
	netbsd-11-0-RC3:1.7
	netbsd-11-0-RC2:1.7
	netbsd-11-0-RC1:1.7
	perseant-exfatfs-base-20250801:1.7
	netbsd-11:1.7.0.36
	netbsd-11-base:1.7
	netbsd-10-1-RELEASE:1.7
	perseant-exfatfs-base-20240630:1.7
	perseant-exfatfs:1.7.0.34
	perseant-exfatfs-base:1.7
	netbsd-8-3-RELEASE:1.6
	netbsd-9-4-RELEASE:1.7
	netbsd-10-0-RELEASE:1.7
	netbsd-10-0-RC6:1.7
	netbsd-10-0-RC5:1.7
	netbsd-10-0-RC4:1.7
	netbsd-10-0-RC3:1.7
	netbsd-10-0-RC2:1.7
	thorpej-ifq:1.7.0.32
	thorpej-ifq-base:1.7
	thorpej-altq-separation:1.7.0.30
	thorpej-altq-separation-base:1.7
	netbsd-10-0-RC1:1.7
	netbsd-10:1.7.0.28
	netbsd-10-base:1.7
	bouyer-sunxi-drm:1.7.0.26
	bouyer-sunxi-drm-base:1.7
	netbsd-9-3-RELEASE:1.7
	thorpej-i2c-spi-conf2:1.7.0.24
	thorpej-i2c-spi-conf2-base:1.7
	thorpej-futex2:1.7.0.22
	thorpej-futex2-base:1.7
	thorpej-cfargs2:1.7.0.20
	thorpej-cfargs2-base:1.7
	cjep_sun2x-base1:1.7
	cjep_sun2x:1.7.0.18
	cjep_sun2x-base:1.7
	cjep_staticlib_x-base1:1.7
	netbsd-9-2-RELEASE:1.7
	cjep_staticlib_x:1.7.0.16
	cjep_staticlib_x-base:1.7
	thorpej-i2c-spi-conf:1.7.0.14
	thorpej-i2c-spi-conf-base:1.7
	thorpej-cfargs:1.7.0.12
	thorpej-cfargs-base:1.7
	thorpej-futex:1.7.0.10
	thorpej-futex-base:1.7
	netbsd-9-1-RELEASE:1.7
	bouyer-xenpvh-base2:1.7
	phil-wifi-20200421:1.7
	bouyer-xenpvh-base1:1.7
	phil-wifi-20200411:1.7
	bouyer-xenpvh:1.7.0.8
	bouyer-xenpvh-base:1.7
	is-mlppp:1.7.0.6
	is-mlppp-base:1.7
	phil-wifi-20200406:1.7
	netbsd-8-2-RELEASE:1.6
	ad-namecache-base3:1.7
	netbsd-9-0-RELEASE:1.7
	netbsd-9-0-RC2:1.7
	ad-namecache-base2:1.7
	ad-namecache-base1:1.7
	ad-namecache:1.7.0.4
	ad-namecache-base:1.7
	netbsd-9-0-RC1:1.7
	phil-wifi-20191119:1.7
	netbsd-9:1.7.0.2
	netbsd-9-base:1.7
	phil-wifi-20190609:1.7
	netbsd-8-1-RELEASE:1.6
	netbsd-8-1-RC1:1.6
	isaki-audio2:1.6.0.12
	isaki-audio2-base:1.6
	pgoyette-compat-merge-20190127:1.6
	pgoyette-compat-20190127:1.6
	pgoyette-compat-20190118:1.6
	pgoyette-compat-1226:1.6
	pgoyette-compat-1126:1.6
	pgoyette-compat-1020:1.6
	pgoyette-compat-0930:1.6
	pgoyette-compat-0906:1.6
	netbsd-7-2-RELEASE:1.2.4.1
	pgoyette-compat-0728:1.6
	netbsd-8-0-RELEASE:1.6
	phil-wifi:1.6.0.10
	phil-wifi-base:1.6
	pgoyette-compat-0625:1.6
	netbsd-8-0-RC2:1.6
	pgoyette-compat-0521:1.6
	pgoyette-compat-0502:1.6
	pgoyette-compat-0422:1.6
	netbsd-8-0-RC1:1.6
	pgoyette-compat-0415:1.6
	pgoyette-compat-0407:1.6
	pgoyette-compat-0330:1.6
	pgoyette-compat-0322:1.6
	pgoyette-compat-0315:1.6
	netbsd-7-1-2-RELEASE:1.2.4.1
	pgoyette-compat:1.6.0.8
	pgoyette-compat-base:1.6
	netbsd-7-1-1-RELEASE:1.2.4.1
	tls-maxphys-base-20171202:1.6
	matt-nb8-mediatek:1.6.0.6
	matt-nb8-mediatek-base:1.6
	nick-nhusb-base-20170825:1.6
	perseant-stdc-iso10646:1.6.0.4
	perseant-stdc-iso10646-base:1.6
	netbsd-8:1.6.0.2
	netbsd-8-base:1.6
	prg-localcount2-base3:1.5
	prg-localcount2-base2:1.5
	prg-localcount2-base1:1.5
	prg-localcount2:1.5.0.8
	prg-localcount2-base:1.5
	pgoyette-localcount-20170426:1.5
	bouyer-socketcan-base1:1.5
	jdolecek-ncq:1.5.0.6
	jdolecek-ncq-base:1.5
	pgoyette-localcount-20170320:1.5
	netbsd-7-1:1.2.4.1.0.6
	netbsd-7-1-RELEASE:1.2.4.1
	netbsd-7-1-RC2:1.2.4.1
	nick-nhusb-base-20170204:1.5
	netbsd-7-nhusb-base-20170116:1.2.4.1
	bouyer-socketcan:1.5.0.4
	bouyer-socketcan-base:1.5
	pgoyette-localcount-20170107:1.5
	netbsd-7-1-RC1:1.2.4.1
	nick-nhusb-base-20161204:1.5
	pgoyette-localcount-20161104:1.5
	netbsd-7-0-2-RELEASE:1.2.4.1
	nick-nhusb-base-20161004:1.5
	localcount-20160914:1.5
	netbsd-7-nhusb:1.2.4.1.0.4
	netbsd-7-nhusb-base:1.2.4.1
	pgoyette-localcount-20160806:1.5
	pgoyette-localcount-20160726:1.5
	pgoyette-localcount:1.5.0.2
	pgoyette-localcount-base:1.5
	nick-nhusb-base-20160907:1.5
	nick-nhusb-base-20160529:1.5
	netbsd-7-0-1-RELEASE:1.2.4.1
	nick-nhusb-base-20160422:1.5
	nick-nhusb-base-20160319:1.5
	nick-nhusb-base-20151226:1.4
	netbsd-7-0:1.2.4.1.0.2
	netbsd-7-0-RELEASE:1.2.4.1
	nick-nhusb-base-20150921:1.3
	netbsd-7-0-RC3:1.2.4.1
	netbsd-7-0-RC2:1.2.4.1
	netbsd-7-0-RC1:1.2.4.1
	nick-nhusb-base-20150606:1.3
	nick-nhusb-base-20150406:1.3
	nick-nhusb:1.3.0.2
	nick-nhusb-base:1.3
	netbsd-6-0-6-RELEASE:1.1
	netbsd-6-1-5-RELEASE:1.1
	netbsd-7:1.2.0.4
	netbsd-7-base:1.2
	yamt-pagecache-base9:1.2
	yamt-pagecache-tag8:1.1
	netbsd-6-1-4-RELEASE:1.1
	netbsd-6-0-5-RELEASE:1.1
	tls-earlyentropy:1.2.0.2
	tls-earlyentropy-base:1.2
	riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.2
	riastradh-drm2-base3:1.2
	netbsd-6-1-3-RELEASE:1.1
	netbsd-6-0-4-RELEASE:1.1
	netbsd-6-1-2-RELEASE:1.1
	netbsd-6-0-3-RELEASE:1.1
	rmind-smpnet-nbase:1.2
	netbsd-6-1-1-RELEASE:1.1
	riastradh-drm2-base2:1.1
	riastradh-drm2-base1:1.1
	riastradh-drm2:1.1.0.36
	riastradh-drm2-base:1.1
	rmind-smpnet:1.1.0.28
	rmind-smpnet-base:1.2
	netbsd-6-1:1.1.0.34
	netbsd-6-0-2-RELEASE:1.1
	netbsd-6-1-RELEASE:1.1
	khorben-n900:1.1.0.32
	netbsd-6-1-RC4:1.1
	netbsd-6-1-RC3:1.1
	agc-symver:1.1.0.30
	agc-symver-base:1.1
	netbsd-6-1-RC2:1.1
	netbsd-6-1-RC1:1.1
	yamt-pagecache-base8:1.1
	netbsd-6-0-1-RELEASE:1.1
	yamt-pagecache-base7:1.1
	matt-nb6-plus-nbase:1.1
	yamt-pagecache-base6:1.1
	netbsd-6-0:1.1.0.26
	netbsd-6-0-RELEASE:1.1
	netbsd-6-0-RC2:1.1
	tls-maxphys:1.1.0.24
	tls-maxphys-base:1.2
	matt-nb6-plus:1.1.0.22
	matt-nb6-plus-base:1.1
	netbsd-6-0-RC1:1.1
	jmcneill-usbmp-base10:1.1
	yamt-pagecache-base5:1.1
	jmcneill-usbmp-base9:1.1
	yamt-pagecache-base4:1.1
	jmcneill-usbmp-base8:1.1
	jmcneill-usbmp-base7:1.1
	jmcneill-usbmp-base6:1.1
	jmcneill-usbmp-base5:1.1
	jmcneill-usbmp-base4:1.1
	jmcneill-usbmp-base3:1.1
	jmcneill-usbmp-pre-base2:1.1
	jmcneill-usbmp-base2:1.1
	netbsd-6:1.1.0.20
	netbsd-6-base:1.1
	jmcneill-usbmp:1.1.0.18
	jmcneill-usbmp-base:1.1
	jmcneill-audiomp3:1.1.0.16
	jmcneill-audiomp3-base:1.1
	yamt-pagecache-base3:1.1
	yamt-pagecache-base2:1.1
	yamt-pagecache:1.1.0.14
	yamt-pagecache-base:1.1
	rmind-uvmplock-nbase:1.1
	cherry-xenmp:1.1.0.12
	cherry-xenmp-base:1.1
	bouyer-quota2-nbase:1.1
	bouyer-quota2:1.1.0.10
	bouyer-quota2-base:1.1
	jruoho-x86intr:1.1.0.8
	jruoho-x86intr-base:1.1
	matt-mips64-premerge-20101231:1.1
	uebayasi-xip-base4:1.1
	uebayasi-xip-base3:1.1
	yamt-nfs-mp-base11:1.1
	uebayasi-xip:1.1.0.6
	uebayasi-xip-base2:1.1
	yamt-nfs-mp:1.1.0.4
	yamt-nfs-mp-base10:1.1
	rmind-uvmplock-base:1.1
	rmind-uvmplock:1.1.0.2;
locks; strict;
comment	@# @;


1.7
date	2019.05.08.13.40.19;	author isaki;	state Exp;
branches;
next	1.6;
commitid	LEGDdtzAItkeapmB;

1.6
date	2017.06.01.09.44.30;	author pgoyette;	state Exp;
branches
	1.6.10.1
	1.6.12.1;
next	1.5;
commitid	4ZewSPmyXrhlzETz;

1.5
date	2016.01.26.23.12.14;	author pooka;	state Exp;
branches;
next	1.4;
commitid	kepLkd4K8DWcOuSy;

1.4
date	2015.10.19.16.16.32;	author pooka;	state Exp;
branches;
next	1.3;
commitid	tw5dhIUFxtTYIJFy;

1.3
date	2014.11.18.04.29.06;	author nonaka;	state Exp;
branches
	1.3.2.1;
next	1.2;
commitid	lRnxPA0g2AfEACYx;

1.2
date	2014.03.13.01.57.52;	author pooka;	state Exp;
branches
	1.2.4.1;
next	1.1;
commitid	f2s2YbLJTiP2Ntsx;

1.1
date	2010.05.01.23.19.56;	author pooka;	state Exp;
branches
	1.1.2.1
	1.1.4.1
	1.1.6.1
	1.1.14.1
	1.1.24.1
	1.1.28.1;
next	;

1.6.10.1
date	2019.06.10.22.09.50;	author christos;	state Exp;
branches;
next	;
commitid	jtc8rnCzWiEEHGqB;

1.6.12.1
date	2019.05.07.15.01.50;	author isaki;	state Exp;
branches;
next	;
commitid	K3ORAICznIVcFhmB;

1.3.2.1
date	2015.12.27.12.10.08;	author skrll;	state Exp;
branches;
next	1.3.2.2;
commitid	BTSqUD4SdJ5k7AOy;

1.3.2.2
date	2016.03.19.11.30.34;	author skrll;	state Exp;
branches;
next	1.3.2.3;
commitid	2PHKtPSg1vDV9fZy;

1.3.2.3
date	2017.08.28.17.53.14;	author skrll;	state Exp;
branches;
next	;
commitid	UQQpnjvcNkUZn05A;

1.2.4.1
date	2014.11.23.20.58.15;	author snj;	state Exp;
branches;
next	;
commitid	g4jDwsE6GQsXTlZx;

1.1.2.1
date	2010.05.01.23.19.56;	author rmind;	state dead;
branches;
next	1.1.2.2;

1.1.2.2
date	2010.05.30.05.18.04;	author rmind;	state Exp;
branches;
next	;

1.1.4.1
date	2010.05.01.23.19.56;	author yamt;	state dead;
branches;
next	1.1.4.2;

1.1.4.2
date	2010.08.11.22.55.00;	author yamt;	state Exp;
branches;
next	;

1.1.6.1
date	2010.05.01.23.19.56;	author uebayasi;	state dead;
branches;
next	1.1.6.2;

1.1.6.2
date	2010.08.17.06.47.53;	author uebayasi;	state Exp;
branches;
next	;

1.1.14.1
date	2014.05.22.11.41.11;	author yamt;	state Exp;
branches;
next	;
commitid	VUUXuyNWnt3AKwBx;

1.1.24.1
date	2014.08.20.00.04.37;	author tls;	state Exp;
branches;
next	1.1.24.2;
commitid	jTnpym9Qu0o4R1Nx;

1.1.24.2
date	2017.12.03.11.39.06;	author jdolecek;	state Exp;
branches;
next	;
commitid	XcIYRZTAh1LmerhA;

1.1.28.1
date	2014.05.18.17.46.14;	author rmind;	state Exp;
branches;
next	;
commitid	mL5ZYSzpqK6QS2Bx;


desc
@@


1.7
log
@Merge isaki-audio2 branch, the overhaul of audio subsystem.
- Interrupt-oriented system rather than thread-oriented.
- Improve stability, quality and performance.
- Split playback and record cleanly.  Improve halfduplex support.
- Many bugs are fixed including deadlocks, resource leaks, abuses, etc.
- Simplify audio filter mechanism.  The encoding/channels/frequency
  conversions are completely handled in the upper layer.  So the hard-
  ware driver only converts its hardware encoding (if necessary).
- audio_hw_if changes:
  - Obsoletes query_encoding and add query_format instead.
  - Obsoletes set_params and add set_format instead.
  - Remove drain, setfd, mappage.
  - The call sequences are changed.
- ioctl AUDIO_GETFD/SETFD, AUDIO_GETCHAN/SETCHAN are obsoleted.
- ioctl AUDIO_{QUERY,GET,SET}FORMAT are introduced.
- cleanup config attributes: au*conv and mulaw.
- All hardware drivers should follow it (I've done as much as possible).

Some file paths are changed:
- dev/audio.c         -> dev/audio/audio.c (rewritten)
- dev/audiovar.h      -> dev/audio/audiovar.h
- dev/audio_dai.h     -> dev/audio/audio_dai.h
- dev/audio_if.h      -> dev/audio/audio_if.h
- dev/audiobell.c     -> dev/audio/audiobell.c
- dev/audiobellvar.h  -> dev/audio/audiobellvar.h
- dev/mulaw.[ch]      -> dev/audio/mulaw.[ch] + dev/audio/alaw.c
@
text
@#	$NetBSD: Makefile,v 1.6 2017/06/01 09:44:30 pgoyette Exp $
#

.PATH:	${.CURDIR}/../../../../dev/audio

LIB=	rumpdev_audio
COMMENT=Audio support (incl. /dev/audio and /dev/mixer)

IOCONF=	AUDIO.ioconf

SRCS=	alaw.c audio.c linear.c mulaw.c
SRCS+=	audio_component.c

CPPFLAGS+=	-DNAUDIO=1

.include <bsd.lib.mk>
.include <bsd.klinks.mk>
@


1.6
log
@Add infrastructure for modularization of audio, midi, and sequencer
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.5 2016/01/26 23:12:14 pooka Exp $
d4 1
a4 1
.PATH:	${.CURDIR}/../../../../dev
d11 1
a11 1
SRCS=	audio.c auconv.c aurateconv.c auvolconv.c mulaw.c
d14 1
a14 1
CPPFLAGS+=	-DNAUDIO=1 -DNAURATECONV=1 -DNMULAW=1
@


1.6.10.1
log
@Sync with HEAD
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.7 2019/05/08 13:40:19 isaki Exp $
d4 1
a4 1
.PATH:	${.CURDIR}/../../../../dev/audio
d11 1
a11 1
SRCS=	alaw.c audio.c linear.c mulaw.c
d14 1
a14 1
CPPFLAGS+=	-DNAUDIO=1
@


1.6.12.1
log
@Fix paths and flags.
- aurateconv is gone.  mulaw is a part of audio inseparably.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.6 2017/06/01 09:44:30 pgoyette Exp $
d4 1
a4 1
.PATH:	${.CURDIR}/../../../../dev/audio
d11 1
a11 1
SRCS=	alaw.c audio.c linear.c mulaw.c
d14 1
a14 1
CPPFLAGS+=	-DNAUDIO=1
@


1.5
log
@Put the kernelside rump kernel headers into <rump-sys> instead of
sprinkling them around the faction directories.  Avoids having
to add a CPPFLAGS (or several) to pretty much every component
Makefile.

Leave compat headers around in the old locations.

The commit changes some autogenerated files, but I'll fix the
generators shortly and regen.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.4 2015/10/19 16:16:32 pooka Exp $
d14 2
@


1.4
log
@Add a COMMENT describing what each component roughly does.

"make describe" prints the comment.

Requested/inspired by Vincent Schwarzer on rumpkernel-users
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.3 2014/11/18 04:29:06 nonaka Exp $
a13 2
CPPFLAGS+=	-I${.CURDIR}/../../../librump/rumpvfs

@


1.3
log
@Adopy recent software volume control change.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.2 2014/03/13 01:57:52 pooka Exp $
d7 2
@


1.3.2.1
log
@Sync with HEAD (as of 26th Dec)
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.4 2015/10/19 16:16:32 pooka Exp $
a6 2
COMMENT=Audio support (incl. /dev/audio and /dev/mixer)

@


1.3.2.2
log
@Sync with HEAD
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.3.2.1 2015/12/27 12:10:08 skrll Exp $
d14 2
@


1.3.2.3
log
@Sync with HEAD
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.3.2.2 2016/03/19 11:30:34 skrll Exp $
a13 2
CPPFLAGS+=	-DNAUDIO=1 -DNAURATECONV=1 -DNMULAW=1

@


1.2
log
@rename component.c -> audio_component.c
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.1 2010/05/01 23:19:56 pooka Exp $
d9 1
a9 1
SRCS=	audio.c auconv.c aurateconv.c mulaw.c
@


1.2.4.1
log
@Pull up following revision(s) (requested by jmcneill in ticket #249):
	sys/rump/dev/lib/libaudio/Makefile: revision 1.3
	sys/rump/dev/lib/libpad/Makefile: revision 1.4
Adopy recent software volume control change.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.2 2014/03/13 01:57:52 pooka Exp $
d9 1
a9 1
SRCS=	audio.c auconv.c aurateconv.c auvolconv.c mulaw.c
@


1.1
log
@add audio(4) support
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.1 2010/01/19 22:38:21 pooka Exp $
d10 1
a10 1
SRCS+=	component.c
@


1.1.24.1
log
@Rebase to HEAD as of a few days ago.
@
text
@d1 1
a1 1
#	$NetBSD$
d10 1
a10 1
SRCS+=	audio_component.c
@


1.1.24.2
log
@update from HEAD
@
text
@a6 2
COMMENT=Audio support (incl. /dev/audio and /dev/mixer)

d9 1
a9 1
SRCS=	audio.c auconv.c aurateconv.c auvolconv.c mulaw.c
d12 1
a12 1
CPPFLAGS+=	-DNAUDIO=1 -DNAURATECONV=1 -DNMULAW=1
@


1.1.14.1
log
@sync with head.

for a reference, the tree before this commit was tagged
as yamt-pagecache-tag8.

this commit was splitted into small chunks to avoid
a limitation of cvs.  ("Protocol error: too many arguments")
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.1 2010/05/01 23:19:56 pooka Exp $
d10 1
a10 1
SRCS+=	audio_component.c
@


1.1.28.1
log
@sync with head
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.1 2010/05/01 23:19:56 pooka Exp $
d10 1
a10 1
SRCS+=	audio_component.c
@


1.1.6.1
log
@file Makefile was added on branch uebayasi-xip on 2010-08-17 06:47:53 +0000
@
text
@d1 15
@


1.1.6.2
log
@Sync with HEAD.
@
text
@a0 15
#	$NetBSD$
#

.PATH:	${.CURDIR}/../../../../dev

LIB=	rumpdev_audio
IOCONF=	AUDIO.ioconf

SRCS=	audio.c auconv.c aurateconv.c mulaw.c
SRCS+=	component.c

CPPFLAGS+=	-I${.CURDIR}/../../../librump/rumpvfs

.include <bsd.lib.mk>
.include <bsd.klinks.mk>
@


1.1.4.1
log
@file Makefile was added on branch yamt-nfs-mp on 2010-08-11 22:55:00 +0000
@
text
@d1 15
@


1.1.4.2
log
@sync with head.
@
text
@a0 15
#	$NetBSD$
#

.PATH:	${.CURDIR}/../../../../dev

LIB=	rumpdev_audio
IOCONF=	AUDIO.ioconf

SRCS=	audio.c auconv.c aurateconv.c mulaw.c
SRCS+=	component.c

CPPFLAGS+=	-I${.CURDIR}/../../../librump/rumpvfs

.include <bsd.lib.mk>
.include <bsd.klinks.mk>
@


1.1.2.1
log
@file Makefile was added on branch rmind-uvmplock on 2010-05-30 05:18:04 +0000
@
text
@d1 15
@


1.1.2.2
log
@sync with head
@
text
@a0 15
#	$NetBSD$
#

.PATH:	${.CURDIR}/../../../../dev

LIB=	rumpdev_audio
IOCONF=	AUDIO.ioconf

SRCS=	audio.c auconv.c aurateconv.c mulaw.c
SRCS+=	component.c

CPPFLAGS+=	-I${.CURDIR}/../../../librump/rumpvfs

.include <bsd.lib.mk>
.include <bsd.klinks.mk>
@


