[src/trunk]: src/sys/dev only include umass_isdata.c if atabus present, and l...

[jdolecek <jdolecek%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/60505eca75b3
branches:  trunk
changeset: 994187:60505eca75b3
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Wed Oct 24 07:42:12 2018 +0000

description:
only include umass_isdata.c if atabus present, and likewise ata_subr.c

diffstat:

 sys/dev/ata/files.ata |  4 ++--
 sys/dev/usb/files.usb |  4 ++--
 sys/dev/usb/umass.c   |  7 ++++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diffs (70 lines):

diff -r 4485e6db6735 -r 60505eca75b3 sys/dev/ata/files.ata
--- a/sys/dev/ata/files.ata     Wed Oct 24 06:53:26 2018 +0000
+++ b/sys/dev/ata/files.ata     Wed Oct 24 07:42:12 2018 +0000
@@ -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_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
diff -r 4485e6db6735 -r 60505eca75b3 sys/dev/usb/files.usb
--- a/sys/dev/usb/files.usb     Wed Oct 24 06:53:26 2018 +0000
+++ b/sys/dev/usb/files.usb     Wed Oct 24 07:42:12 2018 +0000
@@ -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 @@
 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)
 
diff -r 4485e6db6735 -r 60505eca75b3 sys/dev/usb/umass.c
--- a/sys/dev/usb/umass.c       Wed Oct 24 06:53:26 2018 +0000
+++ b/sys/dev/usb/umass.c       Wed Oct 24 07:42:12 2018 +0000
@@ -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 @@
                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");