diff options
70 files changed, 63 insertions, 128 deletions
diff --git a/sys/cam/ata/ata_da.c b/sys/cam/ata/ata_da.c index 02d0e2a..c40edba 100644 --- a/sys/cam/ata/ata_da.c +++ b/sys/cam/ata/ata_da.c @@ -28,7 +28,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ada.h" -#include "opt_ata.h" #include <sys/param.h> diff --git a/sys/conf/options b/sys/conf/options index 163358a..63688b7 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -312,7 +312,8 @@ SCSI_NO_SENSE_STRINGS opt_scsi.h SCSI_NO_OP_STRINGS opt_scsi.h # Options used only in cam/ata/ata_da.c -ADA_TEST_FAILURE opt_ada.h +ADA_TEST_FAILURE opt_ada.h +ATA_STATIC_ID opt_ada.h # Options used only in cam/scsi/scsi_cd.c CHANGER_MIN_BUSY_SECONDS opt_cd.h @@ -362,11 +363,6 @@ ISP_INTERNAL_TARGET opt_isp.h # Options used only in dev/iscsi ISCSI_INITIATOR_DEBUG opt_iscsi_initiator.h -# Options used in the 'ata' ATA/ATAPI driver -ATA_STATIC_ID opt_ata.h -ATA_NOPCI opt_ata.h -ATA_REQUEST_TIMEOUT opt_ata.h - # Net stuff. ACCEPT_FILTER_DATA ACCEPT_FILTER_DNS diff --git a/sys/dev/ata/ata-all.c b/sys/dev/ata/ata-all.c index 6367fff..cfd025f 100644 --- a/sys/dev/ata/ata-all.c +++ b/sys/dev/ata/ata-all.c @@ -27,7 +27,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_ata.h" #include <sys/param.h> #include <sys/systm.h> #include <sys/ata.h> diff --git a/sys/dev/ata/ata-all.h b/sys/dev/ata/ata-all.h index 9f0d611..41e3054 100644 --- a/sys/dev/ata/ata-all.h +++ b/sys/dev/ata/ata-all.h @@ -26,8 +26,6 @@ * $FreeBSD$ */ -#include "opt_ata.h" - #if 0 #define ATA_LEGACY_SUPPORT /* Enable obsolete features that break * some modern devices */ diff --git a/sys/dev/ata/ata-cbus.c b/sys/dev/ata/ata-cbus.c index 94376be..489391d 100644 --- a/sys/dev/ata/ata-cbus.c +++ b/sys/dev/ata/ata-cbus.c @@ -27,7 +27,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_ata.h" #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -253,7 +252,7 @@ static driver_t ata_cbus_driver = { static devclass_t ata_cbus_devclass; -DRIVER_MODULE(atacbus, isa, ata_cbus_driver, ata_cbus_devclass, 0, 0); +DRIVER_MODULE(atacbus, isa, ata_cbus_driver, ata_cbus_devclass, NULL, NULL); static int ata_cbuschannel_probe(device_t dev) diff --git a/sys/dev/ata/ata-isa.c b/sys/dev/ata/ata-isa.c index 0900281..c94d262 100644 --- a/sys/dev/ata/ata-isa.c +++ b/sys/dev/ata/ata-isa.c @@ -27,7 +27,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_ata.h" #include <sys/param.h> #include <sys/systm.h> #include <sys/ata.h> @@ -195,7 +194,7 @@ static device_method_t ata_isa_methods[] = { DEVMETHOD(device_suspend, ata_isa_suspend), DEVMETHOD(device_resume, ata_isa_resume), - { 0, 0 } + DEVMETHOD_END }; static driver_t ata_isa_driver = { @@ -204,5 +203,5 @@ static driver_t ata_isa_driver = { sizeof(struct ata_channel), }; -DRIVER_MODULE(ata, isa, ata_isa_driver, ata_devclass, 0, 0); +DRIVER_MODULE(ata, isa, ata_isa_driver, ata_devclass, NULL, NULL); MODULE_DEPEND(ata, ata, 1, 1, 1); diff --git a/sys/dev/ata/ata-lowlevel.c b/sys/dev/ata/ata-lowlevel.c index 53506a0..5ecb753 100644 --- a/sys/dev/ata/ata-lowlevel.c +++ b/sys/dev/ata/ata-lowlevel.c @@ -27,7 +27,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_ata.h" #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> diff --git a/sys/dev/ata/ata-pci.c b/sys/dev/ata/ata-pci.c index 876e1ff..b3cf726 100644 --- a/sys/dev/ata/ata-pci.c +++ b/sys/dev/ata/ata-pci.c @@ -27,7 +27,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_ata.h" #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> diff --git a/sys/dev/ata/ata-sata.c b/sys/dev/ata/ata-sata.c index b219e07..c31175d 100644 --- a/sys/dev/ata/ata-sata.c +++ b/sys/dev/ata/ata-sata.c @@ -27,7 +27,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_ata.h" #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> diff --git a/sys/dev/ata/chipsets/ata-acard.c b/sys/dev/ata/chipsets/ata-acard.c index bfa15e4..e8b9d41 100644 --- a/sys/dev/ata/chipsets/ata-acard.c +++ b/sys/dev/ata/chipsets/ata-acard.c @@ -27,7 +27,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_ata.h" #include <sys/param.h> #include <sys/module.h> #include <sys/systm.h> diff --git a/sys/dev/ata/chipsets/ata-acerlabs.c b/sys/dev/ata/chipsets/ata-acerlabs.c index 7976147..e07348b 100644 --- a/sys/dev/ata/chipsets/ata-acerlabs.c +++ b/sys/dev/ata/chipsets/ata-acerlabs.c @@ -27,7 +27,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_ata.h" #include <sys/param.h> #include <sys/module.h> #include <sys/systm.h> diff --git a/sys/dev/ata/chipsets/ata-adaptec.c b/sys/dev/ata/chipsets/ata-adaptec.c index 076c3f8..0481c74 100644 --- a/sys/dev/ata/chipsets/ata-adaptec.c +++ b/sys/dev/ata/chipsets/ata-adaptec.c @@ -27,7 +27,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_ata.h" #include <sys/param.h> #include <sys/module.h> #include <sys/systm.h> diff --git a/sys/dev/ata/chipsets/ata-ahci.c b/sys/dev/ata/chipsets/ata-ahci.c index 8f19ecd..e0e7f3a 100644 --- a/sys/dev/ata/chipsets/ata-ahci.c +++ b/sys/dev/ata/chipsets/ata-ahci.c @@ -27,7 +27,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_ata.h" #include <sys/param.h> #include <sys/module.h> #include <sys/systm.h> diff --git a/sys/dev/ata/chipsets/ata-amd.c b/sys/dev/ata/chipsets/ata-amd.c index 7a5c533..cd2e701 100644 --- a/sys/dev/ata/chipsets/ata-amd.c +++ b/sys/dev/ata/chipsets/ata-amd.c @@ -27,7 +27,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_ata.h" #include <sys/param.h> #include <sys/module.h> #include <sys/systm.h> diff --git a/sys/dev/ata/chipsets/ata-ati.c b/sys/dev/ata/chipsets/ata-ati.c index a88c825..e8e0237 100644 --- a/sys/dev/ata/chipsets/ata-ati.c +++ b/sys/dev/ata/chipsets/ata-ati.c @@ -27,7 +27,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_ata.h" #include <sys/param.h> #include <sys/module.h> #include <sys/systm.h> diff --git a/sys/dev/ata/chipsets/ata-cenatek.c b/sys/dev/ata/chipsets/ata-cenatek.c index 0bd6616..e46c037 100644 --- a/sys/dev/ata/chipsets/ata-cenatek.c +++ b/sys/dev/ata/chipsets/ata-cenatek.c @@ -27,7 +27,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_ata.h" #include <sys/param.h> #include <sys/module.h> #include <sys/systm.h> diff --git a/sys/dev/ata/chipsets/ata-cypress.c b/sys/dev/ata/chipsets/ata-cypress.c index 19c25eb..e047e9d 100644 --- a/sys/dev/ata/chipsets/ata-cypress.c +++ b/sys/dev/ata/chipsets/ata-cypress.c @@ -27,7 +27,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_ata.h" #include <sys/param.h> #include <sys/module.h> #include <sys/systm.h> diff --git a/sys/dev/ata/chipsets/ata-cyrix.c b/sys/dev/ata/chipsets/ata-cyrix.c index 30334a0..ede61c6 100644 --- a/sys/dev/ata/chipsets/ata-cyrix.c +++ b/sys/dev/ata/chipsets/ata-cyrix.c @@ -27,7 +27,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_ata.h" #include <sys/param.h> #include <sys/module.h> #include <sys/systm.h> diff --git a/sys/dev/ata/chipsets/ata-fsl.c b/sys/dev/ata/chipsets/ata-fsl.c index 5e5a686..17c91da 100644 --- a/sys/dev/ata/chipsets/ata-fsl.c +++ b/sys/dev/ata/chipsets/ata-fsl.c @@ -30,7 +30,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_ata.h" #include <sys/param.h> #include <sys/module.h> #include <sys/systm.h> diff --git a/sys/dev/ata/chipsets/ata-highpoint.c b/sys/dev/ata/chipsets/ata-highpoint.c index aead609..094e535 100644 --- a/sys/dev/ata/chipsets/ata-highpoint.c +++ b/sys/dev/ata/chipsets/ata-highpoint.c @@ -27,7 +27,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_ata.h" #include <sys/param.h> #include <sys/module.h> #include <sys/systm.h> diff --git a/sys/dev/ata/chipsets/ata-intel.c b/sys/dev/ata/chipsets/ata-intel.c index 93c2f79..765af7c 100644 --- a/sys/dev/ata/chipsets/ata-intel.c +++ b/sys/dev/ata/chipsets/ata-intel.c @@ -27,7 +27,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_ata.h" #include <sys/param.h> #include <sys/module.h> #include <sys/systm.h> diff --git a/sys/dev/ata/chipsets/ata-ite.c b/sys/dev/ata/chipsets/ata-ite.c index 82a9920..1ebb773 100644 --- a/sys/dev/ata/chipsets/ata-ite.c +++ b/sys/dev/ata/chipsets/ata-ite.c @@ -27,7 +27,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_ata.h" #include <sys/param.h> #include <sys/module.h> #include <sys/systm.h> diff --git a/sys/dev/ata/chipsets/ata-jmicron.c b/sys/dev/ata/chipsets/ata-jmicron.c index 3fb296a..1ce46ac 100644 --- a/sys/dev/ata/chipsets/ata-jmicron.c +++ b/sys/dev/ata/chipsets/ata-jmicron.c @@ -27,7 +27,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_ata.h" #include <sys/param.h> #include <sys/module.h> #include <sys/systm.h> diff --git a/sys/dev/ata/chipsets/ata-marvell.c b/sys/dev/ata/chipsets/ata-marvell.c index a7a6d10..65d55e4 100644 --- a/sys/dev/ata/chipsets/ata-marvell.c +++ b/sys/dev/ata/chipsets/ata-marvell.c @@ -27,7 +27,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_ata.h" #include <sys/param.h> #include <sys/module.h> #include <sys/systm.h> diff --git a/sys/dev/ata/chipsets/ata-micron.c b/sys/dev/ata/chipsets/ata-micron.c index 985970d..774eadf 100644 --- a/sys/dev/ata/chipsets/ata-micron.c +++ b/sys/dev/ata/chipsets/ata-micron.c @@ -27,7 +27,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_ata.h" #include <sys/param.h> #include <sys/module.h> #include <sys/systm.h> diff --git a/sys/dev/ata/chipsets/ata-national.c b/sys/dev/ata/chipsets/ata-national.c index 51c83a16..b3fc440 100644 --- a/sys/dev/ata/chipsets/ata-national.c +++ b/sys/dev/ata/chipsets/ata-national.c @@ -27,7 +27,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_ata.h" #include <sys/param.h> #include <sys/module.h> #include <sys/systm.h> diff --git a/sys/dev/ata/chipsets/ata-netcell.c b/sys/dev/ata/chipsets/ata-netcell.c index f612872..a954a79 100644 --- a/sys/dev/ata/chipsets/ata-netcell.c +++ b/sys/dev/ata/chipsets/ata-netcell.c @@ -27,7 +27,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_ata.h" #include <sys/param.h> #include <sys/module.h> #include <sys/systm.h> diff --git a/sys/dev/ata/chipsets/ata-nvidia.c b/sys/dev/ata/chipsets/ata-nvidia.c index ed721d9..96de406 100644 --- a/sys/dev/ata/chipsets/ata-nvidia.c +++ b/sys/dev/ata/chipsets/ata-nvidia.c @@ -27,7 +27,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_ata.h" #include <sys/param.h> #include <sys/module.h> #include <sys/systm.h> diff --git a/sys/dev/ata/chipsets/ata-promise.c b/sys/dev/ata/chipsets/ata-promise.c index 52e5740..40a7f72 100644 --- a/sys/dev/ata/chipsets/ata-promise.c +++ b/sys/dev/ata/chipsets/ata-promise.c @@ -27,7 +27,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_ata.h" #include <sys/param.h> #include <sys/module.h> #include <sys/systm.h> diff --git a/sys/dev/ata/chipsets/ata-serverworks.c b/sys/dev/ata/chipsets/ata-serverworks.c index b78dc70..62ed677 100644 --- a/sys/dev/ata/chipsets/ata-serverworks.c +++ b/sys/dev/ata/chipsets/ata-serverworks.c @@ -27,7 +27,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_ata.h" #include <sys/param.h> #include <sys/module.h> #include <sys/systm.h> diff --git a/sys/dev/ata/chipsets/ata-siliconimage.c b/sys/dev/ata/chipsets/ata-siliconimage.c index 2d5c9fd..38d4163 100644 --- a/sys/dev/ata/chipsets/ata-siliconimage.c +++ b/sys/dev/ata/chipsets/ata-siliconimage.c @@ -27,7 +27,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_ata.h" #include <sys/param.h> #include <sys/module.h> #include <sys/systm.h> diff --git a/sys/dev/ata/chipsets/ata-sis.c b/sys/dev/ata/chipsets/ata-sis.c index 71b9709..a4df507 100644 --- a/sys/dev/ata/chipsets/ata-sis.c +++ b/sys/dev/ata/chipsets/ata-sis.c @@ -27,7 +27,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_ata.h" #include <sys/param.h> #include <sys/module.h> #include <sys/systm.h> diff --git a/sys/dev/ata/chipsets/ata-via.c b/sys/dev/ata/chipsets/ata-via.c index 1487fcd..a6aac6b 100644 --- a/sys/dev/ata/chipsets/ata-via.c +++ b/sys/dev/ata/chipsets/ata-via.c @@ -27,7 +27,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_ata.h" #include <sys/param.h> #include <sys/module.h> #include <sys/systm.h> diff --git a/sys/modules/ata/atacard/Makefile b/sys/modules/ata/atacard/Makefile index 1bb8b5b..412a164 100644 --- a/sys/modules/ata/atacard/Makefile +++ b/sys/modules/ata/atacard/Makefile @@ -4,6 +4,6 @@ KMOD= atacard SRCS= ata-card.c -SRCS+= opt_ata.h pccarddevs.h ata_if.h device_if.h bus_if.h isa_if.h card_if.h +SRCS+= ata_if.h bus_if.h card_if.h device_if.h pccarddevs.h .include <bsd.kmod.mk> diff --git a/sys/modules/ata/atacbus/Makefile b/sys/modules/ata/atacbus/Makefile index 2b11a89..2b3c134 100644 --- a/sys/modules/ata/atacbus/Makefile +++ b/sys/modules/ata/atacbus/Makefile @@ -4,6 +4,6 @@ KMOD= atacbus SRCS= ata-cbus.c -SRCS+= opt_ata.h ata_if.h device_if.h bus_if.h isa_if.h +SRCS+= ata_if.h bus_if.h device_if.h bus_if.h .include <bsd.kmod.mk> diff --git a/sys/modules/ata/atacore/Makefile b/sys/modules/ata/atacore/Makefile index cba897f..4ee16cf 100644 --- a/sys/modules/ata/atacore/Makefile +++ b/sys/modules/ata/atacore/Makefile @@ -4,6 +4,6 @@ KMOD= ata SRCS= ata-all.c ata_if.c ata-lowlevel.c -SRCS+= opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h +SRCS+= ata_if.h bus_if.h device_if.h opt_cam.h pci_if.h .include <bsd.kmod.mk> diff --git a/sys/modules/ata/atadevel/Makefile b/sys/modules/ata/atadevel/Makefile index d87c84f..03111d4 100644 --- a/sys/modules/ata/atadevel/Makefile +++ b/sys/modules/ata/atadevel/Makefile @@ -4,7 +4,7 @@ KMOD= atadevel SRCS= ata-devel.c -SRCS+= opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h +SRCS+= ata_if.h device_if.h bus_if.h pci_if.h CFLAGS+=-g .include <bsd.kmod.mk> diff --git a/sys/modules/ata/ataisa/Makefile b/sys/modules/ata/ataisa/Makefile index b43fd2e..5c951c0 100644 --- a/sys/modules/ata/ataisa/Makefile +++ b/sys/modules/ata/ataisa/Makefile @@ -4,6 +4,6 @@ KMOD= ataisa SRCS= ata-isa.c -SRCS+= opt_ata.h ata_if.h device_if.h bus_if.h isa_if.h +SRCS+= ata_if.h bus_if.h device_if.h isa_if.h .include <bsd.kmod.mk> diff --git a/sys/modules/ata/atapci/Makefile b/sys/modules/ata/atapci/Makefile index 6ce854e..0addeb3 100644 --- a/sys/modules/ata/atapci/Makefile +++ b/sys/modules/ata/atapci/Makefile @@ -6,7 +6,6 @@ SUBDIR += chipsets KMOD= atapci SRCS= ata-pci.c ata-dma.c ata-sata.c -SRCS+= opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h +SRCS+= ata_if.h bus_if.h device_if.h pci_if.h .include <bsd.kmod.mk> - diff --git a/sys/modules/ata/atapci/chipsets/ataacard/Makefile b/sys/modules/ata/atapci/chipsets/ataacard/Makefile index 28da0f2..a0e0389 100644 --- a/sys/modules/ata/atapci/chipsets/ataacard/Makefile +++ b/sys/modules/ata/atapci/chipsets/ataacard/Makefile @@ -4,7 +4,6 @@ KMOD= ataacard SRCS= ata-acard.c -SRCS+= opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h +SRCS+= ata_if.h bus_if.h device_if.h pci_if.h .include <bsd.kmod.mk> - diff --git a/sys/modules/ata/atapci/chipsets/ataacerlabs/Makefile b/sys/modules/ata/atapci/chipsets/ataacerlabs/Makefile index 8c36db1..6712f53 100644 --- a/sys/modules/ata/atapci/chipsets/ataacerlabs/Makefile +++ b/sys/modules/ata/atapci/chipsets/ataacerlabs/Makefile @@ -4,7 +4,6 @@ KMOD= ataacerlabs SRCS= ata-acerlabs.c -SRCS+= opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h +SRCS+= ata_if.h bus_if.h device_if.h pci_if.h .include <bsd.kmod.mk> - diff --git a/sys/modules/ata/atapci/chipsets/ataadaptec/Makefile b/sys/modules/ata/atapci/chipsets/ataadaptec/Makefile index a6e22b9..c0664a9 100644 --- a/sys/modules/ata/atapci/chipsets/ataadaptec/Makefile +++ b/sys/modules/ata/atapci/chipsets/ataadaptec/Makefile @@ -4,7 +4,6 @@ KMOD= ataadaptec SRCS= ata-adaptec.c -SRCS+= opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h +SRCS+= ata_if.h bus_if.h device_if.h pci_if.h .include <bsd.kmod.mk> - diff --git a/sys/modules/ata/atapci/chipsets/ataahci/Makefile b/sys/modules/ata/atapci/chipsets/ataahci/Makefile index c21bf19..e8a5d32 100644 --- a/sys/modules/ata/atapci/chipsets/ataahci/Makefile +++ b/sys/modules/ata/atapci/chipsets/ataahci/Makefile @@ -4,7 +4,6 @@ KMOD= ataahci SRCS= ata-ahci.c -SRCS+= opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h +SRCS+= ata_if.h bus_if.h device_if.h pci_if.h .include <bsd.kmod.mk> - diff --git a/sys/modules/ata/atapci/chipsets/ataamd/Makefile b/sys/modules/ata/atapci/chipsets/ataamd/Makefile index f1c6c02..d6dedd5 100644 --- a/sys/modules/ata/atapci/chipsets/ataamd/Makefile +++ b/sys/modules/ata/atapci/chipsets/ataamd/Makefile @@ -4,7 +4,6 @@ KMOD= ataamd SRCS= ata-amd.c -SRCS+= opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h +SRCS+= ata_if.h bus_if.h device_if.h pci_if.h .include <bsd.kmod.mk> - diff --git a/sys/modules/ata/atapci/chipsets/ataati/Makefile b/sys/modules/ata/atapci/chipsets/ataati/Makefile index 5c96e5c..2f59398 100644 --- a/sys/modules/ata/atapci/chipsets/ataati/Makefile +++ b/sys/modules/ata/atapci/chipsets/ataati/Makefile @@ -4,7 +4,6 @@ KMOD= ataati SRCS= ata-ati.c -SRCS+= opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h +SRCS+= ata_if.h bus_if.h device_if.h pci_if.h .include <bsd.kmod.mk> - diff --git a/sys/modules/ata/atapci/chipsets/atacenatek/Makefile b/sys/modules/ata/atapci/chipsets/atacenatek/Makefile index 90eae7a..5986465 100644 --- a/sys/modules/ata/atapci/chipsets/atacenatek/Makefile +++ b/sys/modules/ata/atapci/chipsets/atacenatek/Makefile @@ -4,7 +4,6 @@ KMOD= atacenatek SRCS= ata-cenatek.c -SRCS+= opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h +SRCS+= ata_if.h bus_if.h device_if.h pci_if.h .include <bsd.kmod.mk> - diff --git a/sys/modules/ata/atapci/chipsets/atacypress/Makefile b/sys/modules/ata/atapci/chipsets/atacypress/Makefile index e356ea0..c3fe346 100644 --- a/sys/modules/ata/atapci/chipsets/atacypress/Makefile +++ b/sys/modules/ata/atapci/chipsets/atacypress/Makefile @@ -4,7 +4,6 @@ KMOD= atacypress SRCS= ata-cypress.c -SRCS+= opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h +SRCS+= ata_if.h bus_if.h device_if.h pci_if.h .include <bsd.kmod.mk> - diff --git a/sys/modules/ata/atapci/chipsets/atacyrix/Makefile b/sys/modules/ata/atapci/chipsets/atacyrix/Makefile index 405e8cf..92df121 100644 --- a/sys/modules/ata/atapci/chipsets/atacyrix/Makefile +++ b/sys/modules/ata/atapci/chipsets/atacyrix/Makefile @@ -4,7 +4,6 @@ KMOD= atacyrix SRCS= ata-cyrix.c -SRCS+= opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h +SRCS+= ata_if.h bus_if.h device_if.h pci_if.h .include <bsd.kmod.mk> - diff --git a/sys/modules/ata/atapci/chipsets/atahighpoint/Makefile b/sys/modules/ata/atapci/chipsets/atahighpoint/Makefile index 728829c..89a7d05 100644 --- a/sys/modules/ata/atapci/chipsets/atahighpoint/Makefile +++ b/sys/modules/ata/atapci/chipsets/atahighpoint/Makefile @@ -4,7 +4,6 @@ KMOD= atahighpoint SRCS= ata-highpoint.c -SRCS+= opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h +SRCS+= ata_if.h bus_if.h device_if.h pci_if.h .include <bsd.kmod.mk> - diff --git a/sys/modules/ata/atapci/chipsets/ataintel/Makefile b/sys/modules/ata/atapci/chipsets/ataintel/Makefile index 676ad74..93845d1 100644 --- a/sys/modules/ata/atapci/chipsets/ataintel/Makefile +++ b/sys/modules/ata/atapci/chipsets/ataintel/Makefile @@ -4,7 +4,6 @@ KMOD= ataintel SRCS= ata-intel.c -SRCS+= opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h +SRCS+= ata_if.h bus_if.h device_if.h pci_if.h .include <bsd.kmod.mk> - diff --git a/sys/modules/ata/atapci/chipsets/ataite/Makefile b/sys/modules/ata/atapci/chipsets/ataite/Makefile index f93eea4..f8e596b 100644 --- a/sys/modules/ata/atapci/chipsets/ataite/Makefile +++ b/sys/modules/ata/atapci/chipsets/ataite/Makefile @@ -4,7 +4,6 @@ KMOD= ataite SRCS= ata-ite.c -SRCS+= opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h +SRCS+= ata_if.h bus_if.h device_if.h pci_if.h .include <bsd.kmod.mk> - diff --git a/sys/modules/ata/atapci/chipsets/atajmicron/Makefile b/sys/modules/ata/atapci/chipsets/atajmicron/Makefile index 94b6178..2f74305 100644 --- a/sys/modules/ata/atapci/chipsets/atajmicron/Makefile +++ b/sys/modules/ata/atapci/chipsets/atajmicron/Makefile @@ -4,7 +4,6 @@ KMOD= atajmicron SRCS= ata-jmicron.c -SRCS+= opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h +SRCS+= ata_if.h bus_if.h device_if.h pci_if.h .include <bsd.kmod.mk> - diff --git a/sys/modules/ata/atapci/chipsets/atamarvell/Makefile b/sys/modules/ata/atapci/chipsets/atamarvell/Makefile index c828313..6d644493 100644 --- a/sys/modules/ata/atapci/chipsets/atamarvell/Makefile +++ b/sys/modules/ata/atapci/chipsets/atamarvell/Makefile @@ -4,7 +4,6 @@ KMOD= atamarvell SRCS= ata-marvell.c -SRCS+= opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h +SRCS+= ata_if.h bus_if.h device_if.h pci_if.h .include <bsd.kmod.mk> - diff --git a/sys/modules/ata/atapci/chipsets/atamicron/Makefile b/sys/modules/ata/atapci/chipsets/atamicron/Makefile index b002a0b..820cf91 100644 --- a/sys/modules/ata/atapci/chipsets/atamicron/Makefile +++ b/sys/modules/ata/atapci/chipsets/atamicron/Makefile @@ -4,7 +4,6 @@ KMOD= atamicron SRCS= ata-micron.c -SRCS+= opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h +SRCS+= ata_if.h bus_if.h device_if.h pci_if.h .include <bsd.kmod.mk> - diff --git a/sys/modules/ata/atapci/chipsets/atanational/Makefile b/sys/modules/ata/atapci/chipsets/atanational/Makefile index 52cae4c..62a2dd6 100644 --- a/sys/modules/ata/atapci/chipsets/atanational/Makefile +++ b/sys/modules/ata/atapci/chipsets/atanational/Makefile @@ -4,7 +4,6 @@ KMOD= atanational SRCS= ata-national.c -SRCS+= opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h +SRCS+= ata_if.h bus_if.h device_if.h pci_if.h .include <bsd.kmod.mk> - diff --git a/sys/modules/ata/atapci/chipsets/atanetcell/Makefile b/sys/modules/ata/atapci/chipsets/atanetcell/Makefile index dae87a0..357e4d5 100644 --- a/sys/modules/ata/atapci/chipsets/atanetcell/Makefile +++ b/sys/modules/ata/atapci/chipsets/atanetcell/Makefile @@ -4,7 +4,6 @@ KMOD= atanetcell SRCS= ata-netcell.c -SRCS+= opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h +SRCS+= ata_if.h bus_if.h device_if.h pci_if.h .include <bsd.kmod.mk> - diff --git a/sys/modules/ata/atapci/chipsets/atanvidia/Makefile b/sys/modules/ata/atapci/chipsets/atanvidia/Makefile index 452bf22..f4b7b6f 100644 --- a/sys/modules/ata/atapci/chipsets/atanvidia/Makefile +++ b/sys/modules/ata/atapci/chipsets/atanvidia/Makefile @@ -4,7 +4,6 @@ KMOD= atanvidia SRCS= ata-nvidia.c -SRCS+= opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h +SRCS+= ata_if.h bus_if.h device_if.h pci_if.h .include <bsd.kmod.mk> - diff --git a/sys/modules/ata/atapci/chipsets/atapromise/Makefile b/sys/modules/ata/atapci/chipsets/atapromise/Makefile index 70d46e1..d232725 100644 --- a/sys/modules/ata/atapci/chipsets/atapromise/Makefile +++ b/sys/modules/ata/atapci/chipsets/atapromise/Makefile @@ -4,7 +4,6 @@ KMOD= atapromise SRCS= ata-promise.c -SRCS+= opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h +SRCS+= ata_if.h bus_if.h device_if.h pci_if.h .include <bsd.kmod.mk> - diff --git a/sys/modules/ata/atapci/chipsets/ataserverworks/Makefile b/sys/modules/ata/atapci/chipsets/ataserverworks/Makefile index 2b789a5..19d7557 100644 --- a/sys/modules/ata/atapci/chipsets/ataserverworks/Makefile +++ b/sys/modules/ata/atapci/chipsets/ataserverworks/Makefile @@ -4,7 +4,6 @@ KMOD= ataserverworks SRCS= ata-serverworks.c -SRCS+= opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h +SRCS+= ata_if.h bus_if.h device_if.h pci_if.h .include <bsd.kmod.mk> - diff --git a/sys/modules/ata/atapci/chipsets/atasiliconimage/Makefile b/sys/modules/ata/atapci/chipsets/atasiliconimage/Makefile index ea7aca3..04c44cf 100644 --- a/sys/modules/ata/atapci/chipsets/atasiliconimage/Makefile +++ b/sys/modules/ata/atapci/chipsets/atasiliconimage/Makefile @@ -4,7 +4,6 @@ KMOD= atasiliconimage SRCS= ata-siliconimage.c -SRCS+= opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h +SRCS+= ata_if.h bus_if.h device_if.h pci_if.h .include <bsd.kmod.mk> - diff --git a/sys/modules/ata/atapci/chipsets/atasis/Makefile b/sys/modules/ata/atapci/chipsets/atasis/Makefile index b601452..65d7fa4 100644 --- a/sys/modules/ata/atapci/chipsets/atasis/Makefile +++ b/sys/modules/ata/atapci/chipsets/atasis/Makefile @@ -4,7 +4,6 @@ KMOD= atasis SRCS= ata-sis.c -SRCS+= opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h +SRCS+= ata_if.h bus_if.h device_if.h pci_if.h .include <bsd.kmod.mk> - diff --git a/sys/modules/ata/atapci/chipsets/atavia/Makefile b/sys/modules/ata/atapci/chipsets/atavia/Makefile index 75e66b0..271f2fb 100644 --- a/sys/modules/ata/atapci/chipsets/atavia/Makefile +++ b/sys/modules/ata/atapci/chipsets/atavia/Makefile @@ -4,7 +4,6 @@ KMOD= atavia SRCS= ata-via.c -SRCS+= opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h +SRCS+= ata_if.h bus_if.h device_if.h pci_if.h .include <bsd.kmod.mk> - diff --git a/sys/modules/cam/Makefile b/sys/modules/cam/Makefile index 00a531a..52729dd 100644 --- a/sys/modules/cam/Makefile +++ b/sys/modules/cam/Makefile @@ -9,7 +9,6 @@ KMOD= cam # See sys/conf/options for the flags that go into the different opt_*.h files. SRCS= opt_cam.h SRCS+= opt_ada.h -SRCS+= opt_ata.h SRCS+= opt_scsi.h SRCS+= opt_cd.h SRCS+= opt_pt.h diff --git a/sys/modules/usb/umass/Makefile b/sys/modules/usb/umass/Makefile index d6f6974..7b3b674 100644 --- a/sys/modules/usb/umass/Makefile +++ b/sys/modules/usb/umass/Makefile @@ -30,8 +30,7 @@ S= ${.CURDIR}/../../.. .PATH: $S/dev/usb/storage KMOD= umass -SRCS= ata_if.h bus_if.h device_if.h usb_if.h vnode_if.h \ - opt_usb.h opt_bus.h opt_cam.h opt_ata.h ata_if.h usbdevs.h \ - umass.c +SRCS= bus_if.h device_if.h opt_bus.h opt_cam.h opt_usb.h umass.c usb_if.h \ + usbdevs.h vnode_if.h .include <bsd.kmod.mk> diff --git a/sys/modules/usb/urio/Makefile b/sys/modules/usb/urio/Makefile index 07f238e..0dfc605 100644 --- a/sys/modules/usb/urio/Makefile +++ b/sys/modules/usb/urio/Makefile @@ -30,8 +30,6 @@ S= ${.CURDIR}/../../.. .PATH: $S/dev/usb/storage KMOD= urio -SRCS= ata_if.h bus_if.h device_if.h usb_if.h vnode_if.h \ - opt_usb.h opt_bus.h opt_cam.h opt_ata.h ata_if.h usbdevs.h \ - urio.c +SRCS= bus_if.h device_if.h opt_bus.h opt_usb.h usb_if.h usbdevs.h urio.c .include <bsd.kmod.mk> diff --git a/sys/modules/usb/usfs/Makefile b/sys/modules/usb/usfs/Makefile index ce4148f..a34aae1 100644 --- a/sys/modules/usb/usfs/Makefile +++ b/sys/modules/usb/usfs/Makefile @@ -30,8 +30,7 @@ S= ${.CURDIR}/../../.. .PATH: $S/dev/usb/storage KMOD= usfs -SRCS= ata_if.h bus_if.h device_if.h usb_if.h vnode_if.h \ - opt_usb.h opt_bus.h opt_cam.h opt_ata.h ata_if.h usbdevs.h \ +SRCS= bus_if.h device_if.h opt_bus.h opt_usb.h usb_if.h usbdevs.h \ ustorage_fs.c .include <bsd.kmod.mk> diff --git a/sys/powerpc/powermac/ata_dbdma.c b/sys/powerpc/powermac/ata_dbdma.c index 23434c8..0e3fbde 100644 --- a/sys/powerpc/powermac/ata_dbdma.c +++ b/sys/powerpc/powermac/ata_dbdma.c @@ -23,16 +23,16 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("* $FreeBSD$"); + /* * Common routines for the DMA engine on both the Apple Kauai and MacIO * ATA controllers. */ -#include "opt_ata.h" #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> diff --git a/sys/powerpc/powermac/ata_kauai.c b/sys/powerpc/powermac/ata_kauai.c index ef260d4..1d72f75 100644 --- a/sys/powerpc/powermac/ata_kauai.c +++ b/sys/powerpc/powermac/ata_kauai.c @@ -31,7 +31,6 @@ __FBSDID("$FreeBSD$"); /* * Mac 'Kauai' PCI ATA controller */ -#include "opt_ata.h" #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -99,7 +98,7 @@ static device_method_t ata_kauai_methods[] = { /* ATA interface */ DEVMETHOD(ata_setmode, ata_kauai_setmode), - { 0, 0 } + DEVMETHOD_END }; struct ata_kauai_softc { @@ -120,15 +119,15 @@ static driver_t ata_kauai_driver = { sizeof(struct ata_kauai_softc), }; -DRIVER_MODULE(ata, pci, ata_kauai_driver, ata_devclass, 0, 0); +DRIVER_MODULE(ata, pci, ata_kauai_driver, ata_devclass, NULL, NULL); MODULE_DEPEND(ata, ata, 1, 1, 1); /* * PCI ID search table */ -static struct kauai_pci_dev { - u_int32_t kpd_devid; - char *kpd_desc; +static const struct kauai_pci_dev { + u_int32_t kpd_devid; + const char *kpd_desc; } kauai_pci_devlist[] = { { 0x0033106b, "Uninorth2 Kauai ATA Controller" }, { 0x003b106b, "Intrepid Kauai ATA Controller" }, @@ -152,6 +151,7 @@ static const u_int pio_timing_kauai[] = { 0x05000249, /* PIO3 */ 0x04000148 /* PIO4 */ }; + static const u_int pio_timing_shasta[] = { 0x0a000c97, /* PIO0 */ 0x07000712, /* PIO1 */ @@ -165,6 +165,7 @@ static const u_int dma_timing_kauai[] = { 0x00209000, /* WDMA1 */ 0x00148000 /* WDMA2 */ }; + static const u_int dma_timing_shasta[] = { 0x00820800, /* WDMA0 */ 0x0028b000, /* WDMA1 */ @@ -179,6 +180,7 @@ static const u_int udma_timing_kauai[] = { 0x00002a31, /* UDMA4 */ 0x00002921 /* UDMA5 */ }; + static const u_int udma_timing_shasta[] = { 0x00035901, /* UDMA0 */ 0x000348b1, /* UDMA1 */ @@ -368,4 +370,3 @@ ata_kauai_begin_transaction(struct ata_request *request) return ata_begin_transaction(request); } - diff --git a/sys/powerpc/powermac/ata_macio.c b/sys/powerpc/powermac/ata_macio.c index 447009d..e15ab00 100644 --- a/sys/powerpc/powermac/ata_macio.c +++ b/sys/powerpc/powermac/ata_macio.c @@ -23,14 +23,14 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + /* * Mac-io ATA controller */ -#include "opt_ata.h" #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -85,7 +85,7 @@ struct ide_timings { int active; /* minimum command active time [ns] */ }; -struct ide_timings pio_timings[5] = { +static const struct ide_timings pio_timings[5] = { { 600, 180 }, /* PIO 0 */ { 390, 150 }, /* PIO 1 */ { 240, 105 }, /* PIO 2 */ @@ -122,7 +122,7 @@ static device_method_t ata_macio_methods[] = { /* ATA interface */ DEVMETHOD(ata_setmode, ata_macio_setmode), - { 0, 0 } + DEVMETHOD_END }; struct ata_macio_softc { @@ -143,7 +143,7 @@ static driver_t ata_macio_driver = { sizeof(struct ata_macio_softc), }; -DRIVER_MODULE(ata, macio, ata_macio_driver, ata_devclass, 0, 0); +DRIVER_MODULE(ata, macio, ata_macio_driver, ata_devclass, NULL, NULL); MODULE_DEPEND(ata, ata, 1, 1, 1); static int @@ -332,4 +332,3 @@ ata_macio_begin_transaction(struct ata_request *request) return ata_begin_transaction(request); } - diff --git a/sys/powerpc/psim/ata_iobus.c b/sys/powerpc/psim/ata_iobus.c index 60f6c50..69c2036 100644 --- a/sys/powerpc/psim/ata_iobus.c +++ b/sys/powerpc/psim/ata_iobus.c @@ -23,14 +23,14 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + /* * PSIM local bus ATA controller */ -#include "opt_ata.h" #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -80,7 +80,7 @@ static device_method_t ata_iobus_methods[] = { DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), - { 0, 0 } + DEVMETHOD_END }; static driver_t ata_iobus_driver = { @@ -91,7 +91,8 @@ static driver_t ata_iobus_driver = { static devclass_t ata_iobus_devclass; -DRIVER_MODULE(ataiobus, iobus, ata_iobus_driver, ata_iobus_devclass, 0, 0); +DRIVER_MODULE(ataiobus, iobus, ata_iobus_driver, ata_iobus_devclass, NULL, + NULL); MODULE_DEPEND(ata, ata, 1, 1, 1); static int @@ -221,7 +222,7 @@ static device_method_t ata_iobus_sub_methods[] = { /* ATA interface */ DEVMETHOD(ata_setmode, ata_iobus_sub_setmode), - { 0, 0 } + DEVMETHOD_END }; static driver_t ata_iobus_sub_driver = { @@ -230,7 +231,7 @@ static driver_t ata_iobus_sub_driver = { sizeof(struct ata_channel), }; -DRIVER_MODULE(ata, ataiobus, ata_iobus_sub_driver, ata_devclass, 0, 0); +DRIVER_MODULE(ata, ataiobus, ata_iobus_sub_driver, ata_devclass, NULL, NULL); static int ata_iobus_sub_probe(device_t dev) |
