[src/trunk]: src/sys/dev/usb Handle DCD differently so it's not always assert...

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

details:   https://anonhg.NetBSD.org/src/rev/a6e50f0fd3c6
branches:  trunk
changeset: 580976:a6e50f0fd3c6
user:      augustss <augustss%NetBSD.org@localhost>
date:      Wed May 18 11:26:11 2005 +0000

description:
Handle DCD differently so it's not always asserted.  From kern/30268 from
Wolfgang Stukenbrock.

diffstat:

 sys/dev/usb/ucom.c |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (37 lines):

diff -r ea5f8dbfcc68 -r a6e50f0fd3c6 sys/dev/usb/ucom.c
--- a/sys/dev/usb/ucom.c        Wed May 18 01:36:16 2005 +0000
+++ b/sys/dev/usb/ucom.c        Wed May 18 11:26:11 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ucom.c,v 1.53 2004/09/13 12:55:49 drochner Exp $       */
+/*     $NetBSD: ucom.c,v 1.54 2005/05/18 11:26:11 augustss Exp $       */
 
 /*
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.53 2004/09/13 12:55:49 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.54 2005/05/18 11:26:11 augustss Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -793,7 +793,8 @@
                            ISSET(sc->sc_msr, UMSR_DCD));
        } else {
                sc->sc_lsr = 0;
-               sc->sc_msr = 0;
+               /* Assume DCD is present, if we have no chance to check it. */
+               sc->sc_msr = UMSR_DCD;
        }
 }
 
@@ -850,7 +851,7 @@
         * explicit request.
         */
        DPRINTF(("ucomparam: l_modem\n"));
-       (void) (*tp->t_linesw->l_modem)(tp, 1 /* XXX carrier */ );
+       (void) (*tp->t_linesw->l_modem)(tp, ISSET(sc->sc_msr, UMSR_DCD));
 
 #if 0
 XXX what if the hardware is not open