From owner-svn-src-all@FreeBSD.ORG Thu Jan 22 05:05:57 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0CEC6106564A; Thu, 22 Jan 2009 05:05:57 +0000 (UTC) (envelope-from takawata@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EFB318FC16; Thu, 22 Jan 2009 05:05:56 +0000 (UTC) (envelope-from takawata@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0M55uOC001379; Thu, 22 Jan 2009 05:05:56 GMT (envelope-from takawata@svn.freebsd.org) Received: (from takawata@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0M55uoP001378; Thu, 22 Jan 2009 05:05:56 GMT (envelope-from takawata@svn.freebsd.org) Message-Id: <200901220505.n0M55uoP001378@svn.freebsd.org> From: Takanori Watanabe Date: Thu, 22 Jan 2009 05:05:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r187579 - head/sys/dev/usb2/serial X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Jan 2009 05:05:57 -0000 Author: takawata Date: Thu Jan 22 05:05:56 2009 New Revision: 187579 URL: http://svn.freebsd.org/changeset/base/187579 Log: Rename sc_is_pseudo to sc_nobulk member in ufoma_softc. That was pseudo ucom because it used home brew tty interface. Now, it is integrated to usb serial framework, so it is not pseudo ucom any more. Modified: head/sys/dev/usb2/serial/ufoma2.c Modified: head/sys/dev/usb2/serial/ufoma2.c ============================================================================== --- head/sys/dev/usb2/serial/ufoma2.c Thu Jan 22 04:24:15 2009 (r187578) +++ head/sys/dev/usb2/serial/ufoma2.c Thu Jan 22 05:05:56 2009 (r187579) @@ -175,7 +175,7 @@ struct ufoma_softc { uint16_t sc_line; uint8_t sc_num_msg; - uint8_t sc_is_pseudo; + uint8_t sc_nobulk; uint8_t sc_ctrl_iface_no; uint8_t sc_ctrl_iface_index; uint8_t sc_data_iface_no; @@ -449,9 +449,9 @@ ufoma_attach(device_t dev) } if ((mad->bType == UMCPC_ACM_TYPE_AB5) || (mad->bType == UMCPC_ACM_TYPE_AB6)) { - sc->sc_is_pseudo = 1; + sc->sc_nobulk = 1; } else { - sc->sc_is_pseudo = 0; + sc->sc_nobulk = 0; if (ufoma_modem_setup(dev, sc, uaa)) { goto detach; } @@ -764,7 +764,7 @@ ufoma_intr_callback(struct usb2_xfer *xf } switch (pkt.bNotification) { case UCDC_N_RESPONSE_AVAILABLE: - if (!(sc->sc_is_pseudo)) { + if (!(sc->sc_nobulk)) { DPRINTF("Wrong serial state!\n"); break; } @@ -775,7 +775,7 @@ ufoma_intr_callback(struct usb2_xfer *xf break; case UCDC_N_SERIAL_STATE: - if (sc->sc_is_pseudo) { + if (sc->sc_nobulk) { DPRINTF("Wrong serial state!\n"); break; } @@ -952,7 +952,7 @@ ufoma_cfg_set_break(struct usb2_com_soft struct usb2_device_request req; uint16_t wValue; - if (sc->sc_is_pseudo || + if (sc->sc_nobulk || (sc->sc_currentmode == UMCPC_ACM_MODE_OBEX)) { return; } @@ -1004,7 +1004,7 @@ ufoma_cfg_set_dtr(struct usb2_com_softc { struct ufoma_softc *sc = ucom->sc_parent; - if (sc->sc_is_pseudo) { + if (sc->sc_nobulk) { return; } if (onoff) @@ -1020,7 +1020,7 @@ ufoma_cfg_set_rts(struct usb2_com_softc { struct ufoma_softc *sc = ucom->sc_parent; - if (sc->sc_is_pseudo) { + if (sc->sc_nobulk) { return; } if (onoff) @@ -1044,7 +1044,7 @@ ufoma_cfg_param(struct usb2_com_softc *u struct usb2_device_request req; struct usb2_cdc_line_state ls; - if (sc->sc_is_pseudo || + if (sc->sc_nobulk || (sc->sc_currentmode == UMCPC_ACM_MODE_OBEX)) { return; } @@ -1175,7 +1175,7 @@ ufoma_start_read(struct usb2_com_softc * usb2_transfer_start(sc->sc_ctrl_xfer[UFOMA_CTRL_ENDPT_INTR]); /* start data transfer */ - if (sc->sc_is_pseudo) { + if (sc->sc_nobulk) { usb2_transfer_start(sc->sc_ctrl_xfer[UFOMA_CTRL_ENDPT_READ]); } else { usb2_transfer_start(sc->sc_bulk_xfer[UFOMA_BULK_ENDPT_READ]); @@ -1192,7 +1192,7 @@ ufoma_stop_read(struct usb2_com_softc *u usb2_transfer_stop(sc->sc_ctrl_xfer[UFOMA_CTRL_ENDPT_INTR_CLEAR]); /* stop data transfer */ - if (sc->sc_is_pseudo) { + if (sc->sc_nobulk) { usb2_transfer_stop(sc->sc_ctrl_xfer[UFOMA_CTRL_ENDPT_READ]); } else { usb2_transfer_stop(sc->sc_bulk_xfer[UFOMA_BULK_ENDPT_READ_CLEAR]); @@ -1205,7 +1205,7 @@ ufoma_start_write(struct usb2_com_softc { struct ufoma_softc *sc = ucom->sc_parent; - if (sc->sc_is_pseudo) { + if (sc->sc_nobulk) { usb2_transfer_start(sc->sc_ctrl_xfer[UFOMA_CTRL_ENDPT_WRITE]); } else { usb2_transfer_start(sc->sc_bulk_xfer[UFOMA_BULK_ENDPT_WRITE]); @@ -1217,7 +1217,7 @@ ufoma_stop_write(struct usb2_com_softc * { struct ufoma_softc *sc = ucom->sc_parent; - if (sc->sc_is_pseudo) { + if (sc->sc_nobulk) { usb2_transfer_stop(sc->sc_ctrl_xfer[UFOMA_CTRL_ENDPT_WRITE]); } else { usb2_transfer_stop(sc->sc_bulk_xfer[UFOMA_BULK_ENDPT_WRITE_CLEAR]);