[src/trunk]: src/sys/dev/usb Don't use atapi_print since if there are no wdc'...

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

details:   https://anonhg.NetBSD.org/src/rev/1b28c8c3e64d
branches:  trunk
changeset: 500791:1b28c8c3e64d
user:      matt <matt%NetBSD.org@localhost>
date:      Mon Dec 18 19:57:47 2000 +0000

description:
Don't use atapi_print since if there are no wdc's, it won't be present.

diffstat:

 sys/dev/usb/umass.c |  11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diffs (28 lines):

diff -r cdef843cfc4e -r 1b28c8c3e64d sys/dev/usb/umass.c
--- a/sys/dev/usb/umass.c       Mon Dec 18 19:44:33 2000 +0000
+++ b/sys/dev/usb/umass.c       Mon Dec 18 19:57:47 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: umass.c,v 1.45 2000/12/08 02:33:44 augustss Exp $      */
+/*     $NetBSD: umass.c,v 1.46 2000/12/18 19:57:47 matt Exp $  */
 /*-
  * Copyright (c) 1999 MAEKAWA Masahide <bishop%rr.iij4u.or.jp@localhost>,
  *                   Nick Hibma <n_hibma%freebsd.org@localhost>
@@ -1182,13 +1182,14 @@
                return (scsiprint(aux, pnp));
        else {
 #if NATAPIBUS > 0
-               extern int atapi_print(void *aux, const char *pnp);
-               return (atapi_print(aux, pnp));
-#else
+               struct ata_atapi_attach *aa_link = aux;
+#endif
                if (pnp)
                        printf("atapibus at %s", pnp);
+#if NATAPIBUS > 0
+               printf(" channel %d", aa_link->aa_channel);
+#endif
                return (UNCONF);
-#endif
        }
 }