diff options
| author | peter <peter@FreeBSD.org> | 2002-07-21 21:37:09 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2002-07-21 21:37:09 +0000 |
| commit | 2c9c0765713d6b00a023e29791767dd0e24c3253 (patch) | |
| tree | cc807a52cd2005795f1983f7c1f625b5d5eb9deb | |
| parent | d3d65bab51b673d88859a0bde96e3fe9f7492d8f (diff) | |
| download | FreeBSD-src-2c9c0765713d6b00a023e29791767dd0e24c3253.zip FreeBSD-src-2c9c0765713d6b00a023e29791767dd0e24c3253.tar.gz | |
Remove dependency on NPCI. Use 'options ATA_NOPCI' to compile without
pci support. This really needs to be fixed properly some day, but judging
by the fact that the nopci case hasn't compiled for quite a while, there
does not seem to be much urgency.
Reviewed by: sos
| -rw-r--r-- | sys/conf/options | 1 | ||||
| -rw-r--r-- | sys/dev/ata/ata-isa.c | 8 |
2 files changed, 6 insertions, 3 deletions
diff --git a/sys/conf/options b/sys/conf/options index 064d743..de519c6 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -261,6 +261,7 @@ AST_DEBUG opt_ata.h ATAPI_DEBUG opt_ata.h ATA_DEBUG opt_ata.h ATA_STATIC_ID opt_ata.h +ATA_NOPCI opt_ata.h DEV_ATADISK opt_ata.h DEV_ATAPICD opt_ata.h DEV_ATAPIST opt_ata.h diff --git a/sys/dev/ata/ata-isa.c b/sys/dev/ata/ata-isa.c index fef7c8a..ee87afc 100644 --- a/sys/dev/ata/ata-isa.c +++ b/sys/dev/ata/ata-isa.c @@ -28,6 +28,8 @@ * $FreeBSD$ */ +#include "opt_ata.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -105,8 +107,7 @@ DRIVER_MODULE(ata, isa, ata_isa_driver, ata_devclass, 0, 0); * the following is a bandaid to get ISA only setups to link, * since these are getting rare the ugliness is kept here */ -#include "pci.h" -#if NPCI == 0 +#ifdef ATA_NOPCI int ata_dmaalloc(struct ata_device *atadev) { @@ -134,9 +135,10 @@ ata_dmasetup(struct ata_device *atadev, caddr_t data, int32_t count) return -1; } -void +int ata_dmastart(struct ata_device *atadev, caddr_t data, int32_t count, int dir) { + return -1; } int |
