diff options
| author | jmcneill <jmcneill@NetBSD.org> | 2015-03-28 14:09:58 +0000 |
|---|---|---|
| committer | jmcneill <jmcneill@NetBSD.org> | 2015-03-28 14:09:58 +0000 |
| commit | 7b8ad1185eff25626d13dc51ec6ba7e10e3cc642 (patch) | |
| tree | 4950c42cc9bc1b9049b61e45408b161ec59fad4a /sys/modules | |
| parent | 23ecca55ef03dca3b6f3bbdd1b2e39f01616b709 (diff) | |
Split hdaudio and PCI attach glue. Even though the driver was written with
this separation in mind, all of the code lived in sys/dev/pci/hdaudio. Move
common parts to sys/dev/hdaudio and PCI attach glue to sys/dev/pci.
Diffstat (limited to 'sys/modules')
| -rw-r--r-- | sys/modules/Makefile | 3 | ||||
| -rw-r--r-- | sys/modules/hdafg/Makefile.inc | 4 | ||||
| -rw-r--r-- | sys/modules/hdafg/hdafg.ioconf | 3 | ||||
| -rw-r--r-- | sys/modules/hdaudio/Makefile | 5 | ||||
| -rw-r--r-- | sys/modules/hdaudio/Makefile.inc | 11 | ||||
| -rw-r--r-- | sys/modules/hdaudio_pci/Makefile | 8 | ||||
| -rw-r--r-- | sys/modules/hdaudio_pci/Makefile.inc | 10 | ||||
| -rw-r--r-- | sys/modules/hdaudio_pci/hdaudio_pci.ioconf (renamed from sys/modules/hdaudio/hdaudio.ioconf) | 4 | ||||
| -rw-r--r-- | sys/modules/hdaudioverbose/Makefile | 4 |
9 files changed, 33 insertions, 19 deletions
diff --git a/sys/modules/Makefile b/sys/modules/Makefile index d5d10216a75..e8aadd948e7 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.143 2015/03/07 14:16:51 jmcneill Exp $ +# $NetBSD: Makefile,v 1.144 2015/03/28 14:09:58 jmcneill Exp $ .include <bsd.own.mk> @@ -136,6 +136,7 @@ SUBDIR+= coretemp SUBDIR+= est SUBDIR+= hdafg SUBDIR+= hdaudio +SUBDIR+= hdaudio_pci SUBDIR+= hdaudioverbose SUBDIR+= hpet SUBDIR+= odcm diff --git a/sys/modules/hdafg/Makefile.inc b/sys/modules/hdafg/Makefile.inc index 3d54a916f65..0b18ede7353 100644 --- a/sys/modules/hdafg/Makefile.inc +++ b/sys/modules/hdafg/Makefile.inc @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.inc,v 1.1 2014/11/19 00:17:10 pooka Exp $ +# $NetBSD: Makefile.inc,v 1.2 2015/03/28 14:09:59 jmcneill Exp $ # This file is used by modules and rump kernels IOCONFDIR:= ${.PARSEDIR} -.PATH: ${NETBSDSRCDIR}/sys/dev/pci/hdaudio ${IOCONFDIR} +.PATH: ${NETBSDSRCDIR}/sys/dev/hdaudio ${IOCONFDIR} IOCONF= hdafg.ioconf SRCS= hdafg.c hdafg_dd.c diff --git a/sys/modules/hdafg/hdafg.ioconf b/sys/modules/hdafg/hdafg.ioconf index 1e089f68b06..ef292416914 100644 --- a/sys/modules/hdafg/hdafg.ioconf +++ b/sys/modules/hdafg/hdafg.ioconf @@ -1,8 +1,9 @@ -# $NetBSD: hdafg.ioconf,v 1.1 2011/01/07 15:32:11 jmcneill Exp $ +# $NetBSD: hdafg.ioconf,v 1.2 2015/03/28 14:09:59 jmcneill Exp $ ioconf hdafg include "conf/files" +# XXX shouldn't be here, but nbconfig crashes without it include "dev/pci/files.pci" pseudo-root hdaudio* diff --git a/sys/modules/hdaudio/Makefile b/sys/modules/hdaudio/Makefile index 25d880c72ae..c4ceadfa429 100644 --- a/sys/modules/hdaudio/Makefile +++ b/sys/modules/hdaudio/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2014/11/19 00:17:10 pooka Exp $ +# $NetBSD: Makefile,v 1.5 2015/03/28 14:09:59 jmcneill Exp $ + +# This file is used by modules and rump kernels .include "../Makefile.inc" -.include "${.CURDIR}/Makefile.inc" KMOD= hdaudio diff --git a/sys/modules/hdaudio/Makefile.inc b/sys/modules/hdaudio/Makefile.inc index 1008fe5a326..489d37128ac 100644 --- a/sys/modules/hdaudio/Makefile.inc +++ b/sys/modules/hdaudio/Makefile.inc @@ -1,11 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.1 2014/11/19 00:17:10 pooka Exp $ +# $NetBSD: Makefile.inc,v 1.2 2015/03/28 14:09:59 jmcneill Exp $ -# This file is used by modules and rump kernels - -IOCONFDIR:= ${.PARSEDIR} - -.PATH: ${NETBSDSRCDIR}/sys/dev/pci/hdaudio ${IOCONFDIR} - -IOCONF= hdaudio.ioconf +.PATH: ${S}/dev/hdaudio SRCS= hdaudio.c -SRCS+= hdaudio_pci.c diff --git a/sys/modules/hdaudio_pci/Makefile b/sys/modules/hdaudio_pci/Makefile new file mode 100644 index 00000000000..e2697254fa6 --- /dev/null +++ b/sys/modules/hdaudio_pci/Makefile @@ -0,0 +1,8 @@ +# $NetBSD: Makefile,v 1.1 2015/03/28 14:09:59 jmcneill Exp $ + +.include "../Makefile.inc" +.include "${.CURDIR}/Makefile.inc" + +KMOD= hdaudio_pci + +.include <bsd.kmodule.mk> diff --git a/sys/modules/hdaudio_pci/Makefile.inc b/sys/modules/hdaudio_pci/Makefile.inc new file mode 100644 index 00000000000..45ba2a0eac5 --- /dev/null +++ b/sys/modules/hdaudio_pci/Makefile.inc @@ -0,0 +1,10 @@ +# $NetBSD: Makefile.inc,v 1.1 2015/03/28 14:09:59 jmcneill Exp $ + +# This file is used by modules and rump kernels + +IOCONFDIR:= ${.PARSEDIR} + +.PATH: ${NETBSDSRCDIR}/sys/dev/pci ${IOCONFDIR} + +IOCONF= hdaudio_pci.ioconf +SRCS= hdaudio_pci.c diff --git a/sys/modules/hdaudio/hdaudio.ioconf b/sys/modules/hdaudio_pci/hdaudio_pci.ioconf index be4c2c99dc2..a9dab8250d7 100644 --- a/sys/modules/hdaudio/hdaudio.ioconf +++ b/sys/modules/hdaudio_pci/hdaudio_pci.ioconf @@ -1,6 +1,6 @@ -# $NetBSD: hdaudio.ioconf,v 1.1 2011/01/07 15:32:12 jmcneill Exp $ +# $NetBSD: hdaudio_pci.ioconf,v 1.1 2015/03/28 14:09:59 jmcneill Exp $ -ioconf hdaudio +ioconf hdaudio_pci include "conf/files" include "dev/pci/files.pci" diff --git a/sys/modules/hdaudioverbose/Makefile b/sys/modules/hdaudioverbose/Makefile index bf462e51f8a..c03032ce522 100644 --- a/sys/modules/hdaudioverbose/Makefile +++ b/sys/modules/hdaudioverbose/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.1 2014/09/19 17:25:47 christos Exp $ +# $NetBSD: Makefile,v 1.2 2015/03/28 14:09:59 jmcneill Exp $ .include "../Makefile.inc" KMOD= hdaudioverbose -.PATH: ${S}/dev/pci/hdaudio +.PATH: ${S}/dev/hdaudio SRCS= hdaudio_verbose.c .include <bsd.kmodule.mk> |
