Move the uaudio and ata-usb drivers into their correct locations.
This commit is contained in:
parent
4f560d7595
commit
3a3f90c6c3
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=188957
@ -502,6 +502,7 @@ dev/ata/chipsets/ata-sis.c optional ata pci | atasis
|
||||
dev/ata/chipsets/ata-via.c optional ata pci | atavia
|
||||
dev/ata/ata-disk.c optional atadisk
|
||||
dev/ata/ata-raid.c optional ataraid
|
||||
dev/ata/ata-usb.c optional atausb usb
|
||||
legacy/dev/ata/ata-usb.c optional atausb ousb
|
||||
dev/ata/atapi-cd.c optional atapicd
|
||||
dev/ata/atapi-fd.c optional atapifd
|
||||
@ -1393,7 +1394,8 @@ dev/sound/pcm/mixer_if.m optional sound
|
||||
dev/sound/pcm/sndstat.c optional sound
|
||||
dev/sound/pcm/sound.c optional sound
|
||||
dev/sound/pcm/vchan.c optional sound
|
||||
#dev/sound/usb/upcm.c optional snd_upcm ousb
|
||||
dev/sound/usb/uaudio.c optional snd_uaudio usb
|
||||
dev/sound/usb/uaudio_pcm.c optional snd_uaudio usb
|
||||
legacy/dev/sound/usb/uaudio.c optional snd_uaudio ousb
|
||||
legacy/dev/sound/usb/uaudio_pcm.c optional snd_uaudio ousb
|
||||
dev/sound/midi/midi.c optional sound
|
||||
@ -1552,7 +1554,6 @@ dev/usb/controller/usb_controller.c optional usb
|
||||
#
|
||||
# USB storage drivers
|
||||
#
|
||||
dev/usb/storage/ata-usb.c optional atausb
|
||||
dev/usb/storage/umass.c optional umass
|
||||
dev/usb/storage/urio.c optional urio
|
||||
dev/usb/storage/ustorage_fs.c optional usfs
|
||||
@ -1654,11 +1655,6 @@ dev/usb/template/usb_template_mtp.c optional usb_template
|
||||
#
|
||||
dev/usb/image/uscanner.c optional uscanner
|
||||
#
|
||||
# USB sound and MIDI drivers
|
||||
#
|
||||
dev/usb/sound/uaudio.c optional usound
|
||||
dev/usb/sound/uaudio_pcm.c optional usound
|
||||
#
|
||||
# USB END
|
||||
#
|
||||
dev/utopia/idtphy.c optional utopia
|
||||
|
@ -71,12 +71,12 @@
|
||||
#include <dev/usb/usb_dynamic.h>
|
||||
|
||||
#include <dev/usb/quirk/usb_quirk.h>
|
||||
#include <dev/usb/sound/uaudio_reg.h>
|
||||
#include <dev/usb/sound/uaudio.h>
|
||||
|
||||
#include <sys/reboot.h> /* for bootverbose */
|
||||
|
||||
#include <dev/sound/pcm/sound.h>
|
||||
#include <dev/sound/usb/uaudioreg.h>
|
||||
#include <dev/sound/usb/uaudio.h>
|
||||
#include <dev/sound/chip.h>
|
||||
#include "feeder_if.h"
|
||||
|
@ -30,8 +30,7 @@
|
||||
#include <sys/soundcard.h>
|
||||
#include <dev/sound/pcm/sound.h>
|
||||
#include <dev/sound/chip.h>
|
||||
|
||||
#include <dev/usb/sound/uaudio.h>
|
||||
#include <dev/sound/usb/uaudio.h>
|
||||
|
||||
#include "mixer_if.h"
|
||||
|
@ -4,6 +4,7 @@
|
||||
|
||||
KMOD= atausb
|
||||
SRCS= ata-usb.c
|
||||
SRCS+= opt_usb.h opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h
|
||||
SRCS+= opt_bus.h opt_usb.h opt_ata.h usbdevs.h
|
||||
SRCS+= ata_if.h device_if.h bus_if.h pci_if.h usb_if.h
|
||||
|
||||
.include <bsd.kmod.mk>
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
S= ${.CURDIR}/../../../..
|
||||
|
||||
.PATH: $S/dev/usb/sound
|
||||
.PATH: $S/dev/sound/usb
|
||||
|
||||
KMOD= snd_uaudio
|
||||
SRCS= bus_if.h device_if.h usb_if.h vnode_if.h
|
||||
|
Loading…
Reference in New Issue
Block a user