Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Exclude wdc_sataprobe() when no SATA controllers are present. Fix 

build of *_TINY kernels.
This commit is contained in:
bouyer 2006-10-25 20:14:00 +00:00
parent 7ef877a8c0
commit c55d38dab6
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/dev/ata/files.ata
View File

@ -1,4 +1,4 @@
# $NetBSD: files.ata,v 1.13 2005/12/11 12:21:14 christos Exp $
# $NetBSD: files.ata,v 1.14 2006/10/25 20:14:00 bouyer Exp $
#
# Config file and device description for machine-independent devices
# which attach to ATA busses. Included by ports that need it. Ports
@ -25,4 +25,4 @@ attach ld at ataraid with ld_ataraid
file dev/ata/ld_ataraid.c ld_ataraid
# Common SATA subroutines
file dev/ata/sata_subr.c sata
file dev/ata/sata_subr.c sata needs-flag

7
sys/dev/ic/wdc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wdc.c,v 1.239 2006/10/25 17:33:02 bouyer Exp $ */
/* $NetBSD: wdc.c,v 1.240 2006/10/25 20:14:00 bouyer Exp $ */
/*
* Copyright (c) 1998, 2001, 2003 Manuel Bouyer. All rights reserved.
@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: wdc.c,v 1.239 2006/10/25 17:33:02 bouyer Exp $");
__KERNEL_RCSID(0, "$NetBSD: wdc.c,v 1.240 2006/10/25 20:14:00 bouyer Exp $");
#ifndef ATADEBUG
#define ATADEBUG
@ -107,6 +107,7 @@ __KERNEL_RCSID(0, "$NetBSD: wdc.c,v 1.239 2006/10/25 17:33:02 bouyer Exp $");
#include "atapibus.h"
#include "wd.h"
#include "sata.h"
#define WDCDELAY 100 /* 100 microseconds */
#define WDCNDELAY_RST (WDC_RESET_WAIT * 1000 / WDCDELAY)
@ -203,6 +204,7 @@ wdc_allocate_regs(struct wdc_softc *wdc)
sizeof(struct wdc_regs), M_DEVBUF, M_WAITOK);
}
#if NSATA > 0
/*
* probe drives on SATA controllers with standard SATA registers:
* bring the PHYs online, read the drive signature and set drive flags
@ -292,6 +294,7 @@ wdc_sataprobe(struct ata_channel *chp)
sstatus);
}
}
#endif /* NSATA > 0 */
/* Test to see controller with at last one attached drive is there.