[src/thorpej_scsipi]: src/sys/dev Move atapiprint() to ic/wdc.c so that we ca...

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

details:   https://anonhg.NetBSD.org/src/rev/e6ebd064bd28
branches:  thorpej_scsipi
changeset: 477393:e6ebd064bd28
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Sun Feb 18 18:27:11 2001 +0000

description:
Move atapiprint() to ic/wdc.c so that we can compile a kernel with IDE
controller but without atapibus.

diffstat:

 sys/dev/ic/wdc.c           |  14 +++++++++++++-
 sys/dev/scsipi/atapiconf.c |  14 +-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diffs (56 lines):

diff -r 1242332128e0 -r e6ebd064bd28 sys/dev/ic/wdc.c
--- a/sys/dev/ic/wdc.c  Sun Feb 18 18:25:29 2001 +0000
+++ b/sys/dev/ic/wdc.c  Sun Feb 18 18:27:11 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wdc.c,v 1.74.2.5 2001/01/18 09:23:21 bouyer Exp $ */
+/*     $NetBSD: wdc.c,v 1.74.2.6 2001/02/18 18:27:11 bouyer Exp $ */
 
 
 /*
@@ -148,6 +148,18 @@
        return (UNCONF);
 }
 
+int
+atapiprint(aux, pnp)
+       void *aux;
+       const char *pnp;
+{
+       struct ata_atapi_attach *aa_link = aux;
+       if (pnp)
+               printf("atapibus at %s", pnp);
+       printf(" channel %d", aa_link->aa_channel);
+       return (UNCONF);
+}
+
 /* Test to see controller with at last one attached drive is there.
  * Returns a bit for each possible drive found (0x01 for drive 0,
  * 0x02 for drive 1).
diff -r 1242332128e0 -r e6ebd064bd28 sys/dev/scsipi/atapiconf.c
--- a/sys/dev/scsipi/atapiconf.c        Sun Feb 18 18:25:29 2001 +0000
+++ b/sys/dev/scsipi/atapiconf.c        Sun Feb 18 18:27:11 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: atapiconf.c,v 1.28.2.7 2001/02/11 19:16:18 bouyer Exp $        */
+/*     $NetBSD: atapiconf.c,v 1.28.2.8 2001/02/18 18:27:11 bouyer Exp $        */
 
 /*
  * Copyright (c) 1996 Manuel Bouyer.  All rights reserved.
@@ -322,18 +322,6 @@
 }
 
 int
-atapiprint(aux, pnp)
-       void *aux;
-       const char *pnp;
-{
-       struct ata_atapi_attach *aa_link = aux;
-       if (pnp)
-               printf("atapibus at %s", pnp);
-       printf(" channel %d", aa_link->aa_channel);
-       return (UNCONF);
-}
-
-int
 atapibusprint(aux, pnp)
        void *aux;
        const char *pnp;