diff options
| author | marius <marius@FreeBSD.org> | 2013-04-06 19:12:49 +0000 |
|---|---|---|
| committer | marius <marius@FreeBSD.org> | 2013-04-06 19:12:49 +0000 |
| commit | 769bdd48e62f800a49095832ca9d3bf8e2c4db7b (patch) | |
| tree | beec354e89c1d44f4ee909a0eea535f9fd251eb7 /sys/modules/ata | |
| parent | 916607c00957e1ba06f932ded65c62673d164759 (diff) | |
| download | FreeBSD-src-769bdd48e62f800a49095832ca9d3bf8e2c4db7b.zip FreeBSD-src-769bdd48e62f800a49095832ca9d3bf8e2c4db7b.tar.gz | |
- With the demise of !ATA_CAM, ATA_STATIC_ID is the only ata(4) related
option left but actually consumed by ada(4), so move it to opt_ada.h
and get rid of opt_ata.h.
- Fix stand-alone build of atacore(4) by adding opt_cam.h.
- Use __FBSDID.
- Use DEVMETHOD_END.
- Use NULL instead of 0 for pointers.
Diffstat (limited to 'sys/modules/ata')
29 files changed, 29 insertions, 53 deletions
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> - |
