Module Name: src
Committed By: jdolecek
Date: Wed Oct 24 07:42:12 UTC 2018
Modified Files:
src/sys/dev/ata: files.ata
src/sys/dev/usb: files.usb umass.c
Log Message:
only include umass_isdata.c if atabus present, and likewise ata_subr.c
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/ata/files.ata
cvs rdiff -u -r1.152 -r1.153 src/sys/dev/usb/files.usb
cvs rdiff -u -r1.163 -r1.164 src/sys/dev/usb/umass.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ata/files.ata
diff -u src/sys/dev/ata/files.ata:1.29 src/sys/dev/ata/files.ata:1.30
--- src/sys/dev/ata/files.ata:1.29 Wed Oct 24 06:53:26 2018
+++ src/sys/dev/ata/files.ata Wed Oct 24 07:42:12 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.ata,v 1.29 2018/10/24 06:53:26 jdolecek Exp $
+# $NetBSD: files.ata,v 1.30 2018/10/24 07:42:12 jdolecek Exp $
#
# Config file and device description for machine-independent devices
# which attach to ATA busses. Included by ports that need it. Ports
@@ -15,7 +15,7 @@ defflag opt_wd.h WD_SOFTBADSECT
defflag opt_wd.h WD_CHAOS_MONKEY
file dev/ata/ata.c (ata_hl | atapi) & atabus
-file dev/ata/ata_subr.c (ata_hl | atapi)
+file dev/ata/ata_subr.c (ata_hl | atapi) & atabus
file dev/ata/ata_recovery.c (ata_hl | atapi) & atabus
# ATA RAID configuration support
Index: src/sys/dev/usb/files.usb
diff -u src/sys/dev/usb/files.usb:1.152 src/sys/dev/usb/files.usb:1.153
--- src/sys/dev/usb/files.usb:1.152 Sat Aug 25 20:12:22 2018
+++ src/sys/dev/usb/files.usb Wed Oct 24 07:42:12 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.usb,v 1.152 2018/08/25 20:12:22 rin Exp $
+# $NetBSD: files.usb,v 1.153 2018/10/24 07:42:12 jdolecek Exp $
#
# Config file and device description for machine-independent USB code.
# Included by ports that need it. Ports that use it must provide
@@ -200,7 +200,7 @@ file dev/usb/ulpt.c ulpt needs-flag
device umass: scsi, atapi, ata_hl
attach umass at usbifif
file dev/usb/umass.c umass
-file dev/usb/umass_isdata.c umass & wd
+file dev/usb/umass_isdata.c umass & wd & atabus
file dev/usb/umass_quirks.c umass
file dev/usb/umass_scsipi.c umass & (scsibus | atapibus)
Index: src/sys/dev/usb/umass.c
diff -u src/sys/dev/usb/umass.c:1.163 src/sys/dev/usb/umass.c:1.164
--- src/sys/dev/usb/umass.c:1.163 Sun Jan 21 13:57:12 2018
+++ src/sys/dev/usb/umass.c Wed Oct 24 07:42:12 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: umass.c,v 1.163 2018/01/21 13:57:12 skrll Exp $ */
+/* $NetBSD: umass.c,v 1.164 2018/10/24 07:42:12 jdolecek Exp $ */
/*
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -124,13 +124,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.163 2018/01/21 13:57:12 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.164 2018/10/24 07:42:12 jdolecek Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
#endif
#include "atapibus.h"
+#include "ata_dma.h"
#include "scsibus.h"
#include "wd.h"
@@ -751,7 +752,7 @@ umass_attach(device_t parent, device_t s
break;
case UMASS_CPROTO_ISD_ATA:
-#if NWD > 0
+#if NWD > 0 && NATABUS > 0
error = umass_isdata_attach(sc);
#else
aprint_error_dev(self, "isdata not configured\n");
