Author: marius
Date: Sat Apr 6 19:12:49 2013
New Revision: 249213
URL: http://svnweb.freebsd.org/changeset/base/249213
Log:
- 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.
Modified:
head/sys/cam/ata/ata_da.c
head/sys/conf/options
head/sys/dev/ata/ata-all.c
head/sys/dev/ata/ata-all.h
head/sys/dev/ata/ata-cbus.c
head/sys/dev/ata/ata-isa.c
head/sys/dev/ata/ata-lowlevel.c
head/sys/dev/ata/ata-pci.c
head/sys/dev/ata/ata-sata.c
head/sys/dev/ata/chipsets/ata-acard.c
head/sys/dev/ata/chipsets/ata-acerlabs.c
head/sys/dev/ata/chipsets/ata-adaptec.c
head/sys/dev/ata/chipsets/ata-ahci.c
head/sys/dev/ata/chipsets/ata-amd.c
head/sys/dev/ata/chipsets/ata-ati.c
head/sys/dev/ata/chipsets/ata-cenatek.c
head/sys/dev/ata/chipsets/ata-cypress.c
head/sys/dev/ata/chipsets/ata-cyrix.c
head/sys/dev/ata/chipsets/ata-fsl.c
head/sys/dev/ata/chipsets/ata-highpoint.c
head/sys/dev/ata/chipsets/ata-intel.c
head/sys/dev/ata/chipsets/ata-ite.c
head/sys/dev/ata/chipsets/ata-jmicron.c
head/sys/dev/ata/chipsets/ata-marvell.c
head/sys/dev/ata/chipsets/ata-micron.c
head/sys/dev/ata/chipsets/ata-national.c
head/sys/dev/ata/chipsets/ata-netcell.c
head/sys/dev/ata/chipsets/ata-nvidia.c
head/sys/dev/ata/chipsets/ata-promise.c
head/sys/dev/ata/chipsets/ata-serverworks.c
head/sys/dev/ata/chipsets/ata-siliconimage.c
head/sys/dev/ata/chipsets/ata-sis.c
head/sys/dev/ata/chipsets/ata-via.c
head/sys/modules/ata/atacard/Makefile
head/sys/modules/ata/atacbus/Makefile
head/sys/modules/ata/atacore/Makefile
head/sys/modules/ata/atadevel/Makefile
head/sys/modules/ata/ataisa/Makefile
head/sys/modules/ata/atapci/Makefile
head/sys/modules/ata/atapci/chipsets/ataacard/Makefile
head/sys/modules/ata/atapci/chipsets/ataacerlabs/Makefile
head/sys/modules/ata/atapci/chipsets/ataadaptec/Makefile
head/sys/modules/ata/atapci/chipsets/ataahci/Makefile
head/sys/modules/ata/atapci/chipsets/ataamd/Makefile
head/sys/modules/ata/atapci/chipsets/ataati/Makefile
head/sys/modules/ata/atapci/chipsets/atacenatek/Makefile
head/sys/modules/ata/atapci/chipsets/atacypress/Makefile
head/sys/modules/ata/atapci/chipsets/atacyrix/Makefile
head/sys/modules/ata/atapci/chipsets/atahighpoint/Makefile
head/sys/modules/ata/atapci/chipsets/ataintel/Makefile
head/sys/modules/ata/atapci/chipsets/ataite/Makefile
head/sys/modules/ata/atapci/chipsets/atajmicron/Makefile
head/sys/modules/ata/atapci/chipsets/atamarvell/Makefile
head/sys/modules/ata/atapci/chipsets/atamicron/Makefile
head/sys/modules/ata/atapci/chipsets/atanational/Makefile
head/sys/modules/ata/atapci/chipsets/atanetcell/Makefile
head/sys/modules/ata/atapci/chipsets/atanvidia/Makefile
head/sys/modules/ata/atapci/chipsets/atapromise/Makefile
head/sys/modules/ata/atapci/chipsets/ataserverworks/Makefile
head/sys/modules/ata/atapci/chipsets/atasiliconimage/Makefile
head/sys/modules/ata/atapci/chipsets/atasis/Makefile
head/sys/modules/ata/atapci/chipsets/atavia/Makefile
head/sys/modules/cam/Makefile
head/sys/modules/usb/umass/Makefile
head/sys/modules/usb/urio/Makefile
head/sys/modules/usb/usfs/Makefile
head/sys/powerpc/powermac/ata_dbdma.c
head/sys/powerpc/powermac/ata_kauai.c
head/sys/powerpc/powermac/ata_macio.c
head/sys/powerpc/psim/ata_iobus.c
Modified: head/sys/cam/ata/ata_da.c
==============================================================================
--- head/sys/cam/ata/ata_da.c Sat Apr 6 19:11:12 2013 (r249212)
+++ head/sys/cam/ata/ata_da.c Sat Apr 6 19:12:49 2013 (r249213)
@@ -28,7 +28,6 @@
__FBSDID("$FreeBSD$");
#include "opt_ada.h"
-#include "opt_ata.h"
#include <sys/param.h>
Modified: head/sys/conf/options
==============================================================================
--- head/sys/conf/options Sat Apr 6 19:11:12 2013 (r249212)
+++ head/sys/conf/options Sat Apr 6 19:12:49 2013 (r249213)
@@ -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
Modified: head/sys/dev/ata/ata-all.c
==============================================================================
--- head/sys/dev/ata/ata-all.c Sat Apr 6 19:11:12 2013 (r249212)
+++ head/sys/dev/ata/ata-all.c Sat Apr 6 19:12:49 2013 (r249213)
@@ -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>
Modified: head/sys/dev/ata/ata-all.h
==============================================================================
--- head/sys/dev/ata/ata-all.h Sat Apr 6 19:11:12 2013 (r249212)
+++ head/sys/dev/ata/ata-all.h Sat Apr 6 19:12:49 2013 (r249213)
@@ -26,8 +26,6 @@
* $FreeBSD$
*/
-#include "opt_ata.h"
-
#if 0
#define ATA_LEGACY_SUPPORT /* Enable obsolete features
that break
* some modern devices */
Modified: head/sys/dev/ata/ata-cbus.c
==============================================================================
--- head/sys/dev/ata/ata-cbus.c Sat Apr 6 19:11:12 2013 (r249212)
+++ head/sys/dev/ata/ata-cbus.c Sat Apr 6 19:12:49 2013 (r249213)
@@ -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)
Modified: head/sys/dev/ata/ata-isa.c
==============================================================================
--- head/sys/dev/ata/ata-isa.c Sat Apr 6 19:11:12 2013 (r249212)
+++ head/sys/dev/ata/ata-isa.c Sat Apr 6 19:12:49 2013 (r249213)
@@ -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);
Modified: head/sys/dev/ata/ata-lowlevel.c
==============================================================================
--- head/sys/dev/ata/ata-lowlevel.c Sat Apr 6 19:11:12 2013
(r249212)
+++ head/sys/dev/ata/ata-lowlevel.c Sat Apr 6 19:12:49 2013
(r249213)
@@ -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>
Modified: head/sys/dev/ata/ata-pci.c
==============================================================================
--- head/sys/dev/ata/ata-pci.c Sat Apr 6 19:11:12 2013 (r249212)
+++ head/sys/dev/ata/ata-pci.c Sat Apr 6 19:12:49 2013 (r249213)
@@ -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>
Modified: head/sys/dev/ata/ata-sata.c
==============================================================================
--- head/sys/dev/ata/ata-sata.c Sat Apr 6 19:11:12 2013 (r249212)
+++ head/sys/dev/ata/ata-sata.c Sat Apr 6 19:12:49 2013 (r249213)
@@ -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>
Modified: head/sys/dev/ata/chipsets/ata-acard.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-acard.c Sat Apr 6 19:11:12 2013
(r249212)
+++ head/sys/dev/ata/chipsets/ata-acard.c Sat Apr 6 19:12:49 2013
(r249213)
@@ -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>
Modified: head/sys/dev/ata/chipsets/ata-acerlabs.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-acerlabs.c Sat Apr 6 19:11:12 2013
(r249212)
+++ head/sys/dev/ata/chipsets/ata-acerlabs.c Sat Apr 6 19:12:49 2013
(r249213)
@@ -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>
Modified: head/sys/dev/ata/chipsets/ata-adaptec.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-adaptec.c Sat Apr 6 19:11:12 2013
(r249212)
+++ head/sys/dev/ata/chipsets/ata-adaptec.c Sat Apr 6 19:12:49 2013
(r249213)
@@ -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>
Modified: head/sys/dev/ata/chipsets/ata-ahci.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-ahci.c Sat Apr 6 19:11:12 2013
(r249212)
+++ head/sys/dev/ata/chipsets/ata-ahci.c Sat Apr 6 19:12:49 2013
(r249213)
@@ -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>
Modified: head/sys/dev/ata/chipsets/ata-amd.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-amd.c Sat Apr 6 19:11:12 2013
(r249212)
+++ head/sys/dev/ata/chipsets/ata-amd.c Sat Apr 6 19:12:49 2013
(r249213)
@@ -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>
Modified: head/sys/dev/ata/chipsets/ata-ati.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-ati.c Sat Apr 6 19:11:12 2013
(r249212)
+++ head/sys/dev/ata/chipsets/ata-ati.c Sat Apr 6 19:12:49 2013
(r249213)
@@ -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>
Modified: head/sys/dev/ata/chipsets/ata-cenatek.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-cenatek.c Sat Apr 6 19:11:12 2013
(r249212)
+++ head/sys/dev/ata/chipsets/ata-cenatek.c Sat Apr 6 19:12:49 2013
(r249213)
@@ -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>
Modified: head/sys/dev/ata/chipsets/ata-cypress.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-cypress.c Sat Apr 6 19:11:12 2013
(r249212)
+++ head/sys/dev/ata/chipsets/ata-cypress.c Sat Apr 6 19:12:49 2013
(r249213)
@@ -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>
Modified: head/sys/dev/ata/chipsets/ata-cyrix.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-cyrix.c Sat Apr 6 19:11:12 2013
(r249212)
+++ head/sys/dev/ata/chipsets/ata-cyrix.c Sat Apr 6 19:12:49 2013
(r249213)
@@ -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>
Modified: head/sys/dev/ata/chipsets/ata-fsl.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-fsl.c Sat Apr 6 19:11:12 2013
(r249212)
+++ head/sys/dev/ata/chipsets/ata-fsl.c Sat Apr 6 19:12:49 2013
(r249213)
@@ -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>
Modified: head/sys/dev/ata/chipsets/ata-highpoint.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-highpoint.c Sat Apr 6 19:11:12 2013
(r249212)
+++ head/sys/dev/ata/chipsets/ata-highpoint.c Sat Apr 6 19:12:49 2013
(r249213)
@@ -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>
Modified: head/sys/dev/ata/chipsets/ata-intel.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-intel.c Sat Apr 6 19:11:12 2013
(r249212)
+++ head/sys/dev/ata/chipsets/ata-intel.c Sat Apr 6 19:12:49 2013
(r249213)
@@ -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>
Modified: head/sys/dev/ata/chipsets/ata-ite.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-ite.c Sat Apr 6 19:11:12 2013
(r249212)
+++ head/sys/dev/ata/chipsets/ata-ite.c Sat Apr 6 19:12:49 2013
(r249213)
@@ -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>
Modified: head/sys/dev/ata/chipsets/ata-jmicron.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-jmicron.c Sat Apr 6 19:11:12 2013
(r249212)
+++ head/sys/dev/ata/chipsets/ata-jmicron.c Sat Apr 6 19:12:49 2013
(r249213)
@@ -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>
Modified: head/sys/dev/ata/chipsets/ata-marvell.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-marvell.c Sat Apr 6 19:11:12 2013
(r249212)
+++ head/sys/dev/ata/chipsets/ata-marvell.c Sat Apr 6 19:12:49 2013
(r249213)
@@ -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>
Modified: head/sys/dev/ata/chipsets/ata-micron.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-micron.c Sat Apr 6 19:11:12 2013
(r249212)
+++ head/sys/dev/ata/chipsets/ata-micron.c Sat Apr 6 19:12:49 2013
(r249213)
@@ -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>
Modified: head/sys/dev/ata/chipsets/ata-national.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-national.c Sat Apr 6 19:11:12 2013
(r249212)
+++ head/sys/dev/ata/chipsets/ata-national.c Sat Apr 6 19:12:49 2013
(r249213)
@@ -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>
Modified: head/sys/dev/ata/chipsets/ata-netcell.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-netcell.c Sat Apr 6 19:11:12 2013
(r249212)
+++ head/sys/dev/ata/chipsets/ata-netcell.c Sat Apr 6 19:12:49 2013
(r249213)
@@ -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>
Modified: head/sys/dev/ata/chipsets/ata-nvidia.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-nvidia.c Sat Apr 6 19:11:12 2013
(r249212)
+++ head/sys/dev/ata/chipsets/ata-nvidia.c Sat Apr 6 19:12:49 2013
(r249213)
@@ -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>
Modified: head/sys/dev/ata/chipsets/ata-promise.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-promise.c Sat Apr 6 19:11:12 2013
(r249212)
+++ head/sys/dev/ata/chipsets/ata-promise.c Sat Apr 6 19:12:49 2013
(r249213)
@@ -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>
Modified: head/sys/dev/ata/chipsets/ata-serverworks.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-serverworks.c Sat Apr 6 19:11:12 2013
(r249212)
+++ head/sys/dev/ata/chipsets/ata-serverworks.c Sat Apr 6 19:12:49 2013
(r249213)
@@ -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>
Modified: head/sys/dev/ata/chipsets/ata-siliconimage.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-siliconimage.c Sat Apr 6 19:11:12
2013 (r249212)
+++ head/sys/dev/ata/chipsets/ata-siliconimage.c Sat Apr 6 19:12:49
2013 (r249213)
@@ -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>
Modified: head/sys/dev/ata/chipsets/ata-sis.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-sis.c Sat Apr 6 19:11:12 2013
(r249212)
+++ head/sys/dev/ata/chipsets/ata-sis.c Sat Apr 6 19:12:49 2013
(r249213)
@@ -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>
Modified: head/sys/dev/ata/chipsets/ata-via.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-via.c Sat Apr 6 19:11:12 2013
(r249212)
+++ head/sys/dev/ata/chipsets/ata-via.c Sat Apr 6 19:12:49 2013
(r249213)
@@ -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>
Modified: head/sys/modules/ata/atacard/Makefile
==============================================================================
--- head/sys/modules/ata/atacard/Makefile Sat Apr 6 19:11:12 2013
(r249212)
+++ head/sys/modules/ata/atacard/Makefile Sat Apr 6 19:12:49 2013
(r249213)
@@ -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>
Modified: head/sys/modules/ata/atacbus/Makefile
==============================================================================
--- head/sys/modules/ata/atacbus/Makefile Sat Apr 6 19:11:12 2013
(r249212)
+++ head/sys/modules/ata/atacbus/Makefile Sat Apr 6 19:12:49 2013
(r249213)
@@ -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>
Modified: head/sys/modules/ata/atacore/Makefile
==============================================================================
--- head/sys/modules/ata/atacore/Makefile Sat Apr 6 19:11:12 2013
(r249212)
+++ head/sys/modules/ata/atacore/Makefile Sat Apr 6 19:12:49 2013
(r249213)
@@ -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>
Modified: head/sys/modules/ata/atadevel/Makefile
==============================================================================
--- head/sys/modules/ata/atadevel/Makefile Sat Apr 6 19:11:12 2013
(r249212)
+++ head/sys/modules/ata/atadevel/Makefile Sat Apr 6 19:12:49 2013
(r249213)
@@ -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>
Modified: head/sys/modules/ata/ataisa/Makefile
==============================================================================
--- head/sys/modules/ata/ataisa/Makefile Sat Apr 6 19:11:12 2013
(r249212)
+++ head/sys/modules/ata/ataisa/Makefile Sat Apr 6 19:12:49 2013
(r249213)
@@ -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>
Modified: head/sys/modules/ata/atapci/Makefile
==============================================================================
--- head/sys/modules/ata/atapci/Makefile Sat Apr 6 19:11:12 2013
(r249212)
+++ head/sys/modules/ata/atapci/Makefile Sat Apr 6 19:12:49 2013
(r249213)
@@ -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>
-
Modified: head/sys/modules/ata/atapci/chipsets/ataacard/Makefile
==============================================================================
--- head/sys/modules/ata/atapci/chipsets/ataacard/Makefile Sat Apr 6
19:11:12 2013 (r249212)
+++ head/sys/modules/ata/atapci/chipsets/ataacard/Makefile Sat Apr 6
19:12:49 2013 (r249213)
@@ -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>
-
Modified: head/sys/modules/ata/atapci/chipsets/ataacerlabs/Makefile
==============================================================================
--- head/sys/modules/ata/atapci/chipsets/ataacerlabs/Makefile Sat Apr 6
19:11:12 2013 (r249212)
+++ head/sys/modules/ata/atapci/chipsets/ataacerlabs/Makefile Sat Apr 6
19:12:49 2013 (r249213)
@@ -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>
-
Modified: head/sys/modules/ata/atapci/chipsets/ataadaptec/Makefile
==============================================================================
--- head/sys/modules/ata/atapci/chipsets/ataadaptec/Makefile Sat Apr 6
19:11:12 2013 (r249212)
+++ head/sys/modules/ata/atapci/chipsets/ataadaptec/Makefile Sat Apr 6
19:12:49 2013 (r249213)
@@ -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>
-
Modified: head/sys/modules/ata/atapci/chipsets/ataahci/Makefile
==============================================================================
--- head/sys/modules/ata/atapci/chipsets/ataahci/Makefile Sat Apr 6
19:11:12 2013 (r249212)
+++ head/sys/modules/ata/atapci/chipsets/ataahci/Makefile Sat Apr 6
19:12:49 2013 (r249213)
@@ -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>
-
Modified: head/sys/modules/ata/atapci/chipsets/ataamd/Makefile
==============================================================================
--- head/sys/modules/ata/atapci/chipsets/ataamd/Makefile Sat Apr 6
19:11:12 2013 (r249212)
+++ head/sys/modules/ata/atapci/chipsets/ataamd/Makefile Sat Apr 6
19:12:49 2013 (r249213)
@@ -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>
-
Modified: head/sys/modules/ata/atapci/chipsets/ataati/Makefile
==============================================================================
--- head/sys/modules/ata/atapci/chipsets/ataati/Makefile Sat Apr 6
19:11:12 2013 (r249212)
+++ head/sys/modules/ata/atapci/chipsets/ataati/Makefile Sat Apr 6
19:12:49 2013 (r249213)
@@ -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>
-
Modified: head/sys/modules/ata/atapci/chipsets/atacenatek/Makefile
==============================================================================
--- head/sys/modules/ata/atapci/chipsets/atacenatek/Makefile Sat Apr 6
19:11:12 2013 (r249212)
+++ head/sys/modules/ata/atapci/chipsets/atacenatek/Makefile Sat Apr 6
19:12:49 2013 (r249213)
@@ -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>
-
Modified: head/sys/modules/ata/atapci/chipsets/atacypress/Makefile
==============================================================================
--- head/sys/modules/ata/atapci/chipsets/atacypress/Makefile Sat Apr 6
19:11:12 2013 (r249212)
+++ head/sys/modules/ata/atapci/chipsets/atacypress/Makefile Sat Apr 6
19:12:49 2013 (r249213)
@@ -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>
-
Modified: head/sys/modules/ata/atapci/chipsets/atacyrix/Makefile
==============================================================================
--- head/sys/modules/ata/atapci/chipsets/atacyrix/Makefile Sat Apr 6
19:11:12 2013 (r249212)
+++ head/sys/modules/ata/atapci/chipsets/atacyrix/Makefile Sat Apr 6
19:12:49 2013 (r249213)
@@ -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>
-
Modified: head/sys/modules/ata/atapci/chipsets/atahighpoint/Makefile
==============================================================================
--- head/sys/modules/ata/atapci/chipsets/atahighpoint/Makefile Sat Apr 6
19:11:12 2013 (r249212)
+++ head/sys/modules/ata/atapci/chipsets/atahighpoint/Makefile Sat Apr 6
19:12:49 2013 (r249213)
@@ -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>
-
Modified: head/sys/modules/ata/atapci/chipsets/ataintel/Makefile
==============================================================================
--- head/sys/modules/ata/atapci/chipsets/ataintel/Makefile Sat Apr 6
19:11:12 2013 (r249212)
+++ head/sys/modules/ata/atapci/chipsets/ataintel/Makefile Sat Apr 6
19:12:49 2013 (r249213)
@@ -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>
-
Modified: head/sys/modules/ata/atapci/chipsets/ataite/Makefile
==============================================================================
--- head/sys/modules/ata/atapci/chipsets/ataite/Makefile Sat Apr 6
19:11:12 2013 (r249212)
+++ head/sys/modules/ata/atapci/chipsets/ataite/Makefile Sat Apr 6
19:12:49 2013 (r249213)
@@ -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>
-
Modified: head/sys/modules/ata/atapci/chipsets/atajmicron/Makefile
==============================================================================
--- head/sys/modules/ata/atapci/chipsets/atajmicron/Makefile Sat Apr 6
19:11:12 2013 (r249212)
+++ head/sys/modules/ata/atapci/chipsets/atajmicron/Makefile Sat Apr 6
19:12:49 2013 (r249213)
@@ -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>
-
Modified: head/sys/modules/ata/atapci/chipsets/atamarvell/Makefile
==============================================================================
--- head/sys/modules/ata/atapci/chipsets/atamarvell/Makefile Sat Apr 6
19:11:12 2013 (r249212)
+++ head/sys/modules/ata/atapci/chipsets/atamarvell/Makefile Sat Apr 6
19:12:49 2013 (r249213)
@@ -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>
-
Modified: head/sys/modules/ata/atapci/chipsets/atamicron/Makefile
==============================================================================
--- head/sys/modules/ata/atapci/chipsets/atamicron/Makefile Sat Apr 6
19:11:12 2013 (r249212)
+++ head/sys/modules/ata/atapci/chipsets/atamicron/Makefile Sat Apr 6
19:12:49 2013 (r249213)
@@ -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>
-
Modified: head/sys/modules/ata/atapci/chipsets/atanational/Makefile
==============================================================================
--- head/sys/modules/ata/atapci/chipsets/atanational/Makefile Sat Apr 6
19:11:12 2013 (r249212)
+++ head/sys/modules/ata/atapci/chipsets/atanational/Makefile Sat Apr 6
19:12:49 2013 (r249213)
@@ -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>
-
Modified: head/sys/modules/ata/atapci/chipsets/atanetcell/Makefile
==============================================================================
--- head/sys/modules/ata/atapci/chipsets/atanetcell/Makefile Sat Apr 6
19:11:12 2013 (r249212)
+++ head/sys/modules/ata/atapci/chipsets/atanetcell/Makefile Sat Apr 6
19:12:49 2013 (r249213)
@@ -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>
-
Modified: head/sys/modules/ata/atapci/chipsets/atanvidia/Makefile
==============================================================================
--- head/sys/modules/ata/atapci/chipsets/atanvidia/Makefile Sat Apr 6
19:11:12 2013 (r249212)
+++ head/sys/modules/ata/atapci/chipsets/atanvidia/Makefile Sat Apr 6
19:12:49 2013 (r249213)
@@ -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>
-
Modified: head/sys/modules/ata/atapci/chipsets/atapromise/Makefile
==============================================================================
--- head/sys/modules/ata/atapci/chipsets/atapromise/Makefile Sat Apr 6
19:11:12 2013 (r249212)
+++ head/sys/modules/ata/atapci/chipsets/atapromise/Makefile Sat Apr 6
19:12:49 2013 (r249213)
@@ -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>
-
Modified: head/sys/modules/ata/atapci/chipsets/ataserverworks/Makefile
==============================================================================
--- head/sys/modules/ata/atapci/chipsets/ataserverworks/Makefile Sat Apr
6 19:11:12 2013 (r249212)
+++ head/sys/modules/ata/atapci/chipsets/ataserverworks/Makefile Sat Apr
6 19:12:49 2013 (r249213)
@@ -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>
-
Modified: head/sys/modules/ata/atapci/chipsets/atasiliconimage/Makefile
==============================================================================
--- head/sys/modules/ata/atapci/chipsets/atasiliconimage/Makefile Sat Apr
6 19:11:12 2013 (r249212)
+++ head/sys/modules/ata/atapci/chipsets/atasiliconimage/Makefile Sat Apr
6 19:12:49 2013 (r249213)
@@ -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>
-
Modified: head/sys/modules/ata/atapci/chipsets/atasis/Makefile
==============================================================================
--- head/sys/modules/ata/atapci/chipsets/atasis/Makefile Sat Apr 6
19:11:12 2013 (r249212)
+++ head/sys/modules/ata/atapci/chipsets/atasis/Makefile Sat Apr 6
19:12:49 2013 (r249213)
@@ -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>
-
Modified: head/sys/modules/ata/atapci/chipsets/atavia/Makefile
==============================================================================
--- head/sys/modules/ata/atapci/chipsets/atavia/Makefile Sat Apr 6
19:11:12 2013 (r249212)
+++ head/sys/modules/ata/atapci/chipsets/atavia/Makefile Sat Apr 6
19:12:49 2013 (r249213)
@@ -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>
-
Modified: head/sys/modules/cam/Makefile
==============================================================================
--- head/sys/modules/cam/Makefile Sat Apr 6 19:11:12 2013
(r249212)
+++ head/sys/modules/cam/Makefile Sat Apr 6 19:12:49 2013
(r249213)
@@ -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
Modified: head/sys/modules/usb/umass/Makefile
==============================================================================
--- head/sys/modules/usb/umass/Makefile Sat Apr 6 19:11:12 2013
(r249212)
+++ head/sys/modules/usb/umass/Makefile Sat Apr 6 19:12:49 2013
(r249213)
@@ -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>
Modified: head/sys/modules/usb/urio/Makefile
==============================================================================
--- head/sys/modules/usb/urio/Makefile Sat Apr 6 19:11:12 2013
(r249212)
+++ head/sys/modules/usb/urio/Makefile Sat Apr 6 19:12:49 2013
(r249213)
@@ -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>
Modified: head/sys/modules/usb/usfs/Makefile
==============================================================================
--- head/sys/modules/usb/usfs/Makefile Sat Apr 6 19:11:12 2013
(r249212)
+++ head/sys/modules/usb/usfs/Makefile Sat Apr 6 19:12:49 2013
(r249213)
@@ -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>
Modified: head/sys/powerpc/powermac/ata_dbdma.c
==============================================================================
--- head/sys/powerpc/powermac/ata_dbdma.c Sat Apr 6 19:11:12 2013
(r249212)
+++ head/sys/powerpc/powermac/ata_dbdma.c Sat Apr 6 19:12:49 2013
(r249213)
@@ -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>
Modified: head/sys/powerpc/powermac/ata_kauai.c
==============================================================================
--- head/sys/powerpc/powermac/ata_kauai.c Sat Apr 6 19:11:12 2013
(r249212)
+++ head/sys/powerpc/powermac/ata_kauai.c Sat Apr 6 19:12:49 2013
(r249213)
@@ -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_r
return ata_begin_transaction(request);
}
-
Modified: head/sys/powerpc/powermac/ata_macio.c
==============================================================================
--- head/sys/powerpc/powermac/ata_macio.c Sat Apr 6 19:11:12 2013
(r249212)
+++ head/sys/powerpc/powermac/ata_macio.c Sat Apr 6 19:12:49 2013
(r249213)
@@ -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_r
return ata_begin_transaction(request);
}
-
Modified: head/sys/powerpc/psim/ata_iobus.c
==============================================================================
--- head/sys/powerpc/psim/ata_iobus.c Sat Apr 6 19:11:12 2013
(r249212)
+++ head/sys/powerpc/psim/ata_iobus.c Sat Apr 6 19:12:49 2013
(r249213)
@@ -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_met
/* 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)
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
