From owner-p4-projects@FreeBSD.ORG Sun Aug 10 21:09:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F413C1065674; Sun, 10 Aug 2008 21:09:29 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B2FD11065670 for ; Sun, 10 Aug 2008 21:09:29 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A8AC58FC16 for ; Sun, 10 Aug 2008 21:09:29 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7AL9T37076151 for ; Sun, 10 Aug 2008 21:09:29 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7AL9TFB076149 for perforce@freebsd.org; Sun, 10 Aug 2008 21:09:29 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 10 Aug 2008 21:09:29 GMT Message-Id: <200808102109.m7AL9TFB076149@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 147106 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Aug 2008 21:09:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=147106 Change 147106 by hselasky@hselasky_laptop001 on 2008/08/10 21:08:29 Add support for custom TTY names. Requested by Andrew Thompson. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/serial/usb2_serial.c#5 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/usb2_serial.h#3 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/serial/usb2_serial.c#5 (text+ko) ==== @@ -304,6 +304,7 @@ { struct tty *tp; int error = 0; + char buf[32]; /* temporary TTY device name buffer */ tp = ttyalloc(); @@ -323,11 +324,24 @@ DPRINTF("tp = %p, unit = %d\n", tp, sc->sc_unit); + buf[0] = 0; /* set some default value */ + + /* Check if the client has a custom TTY name */ + if (sc->sc_callback->usb2_com_tty_name) { + sc->sc_callback->usb2_com_tty_name(sc, buf, + sizeof(buf), sc->sc_local_unit); + } + if (buf[0] == 0) { + /* Use default TTY name */ + if (snprintf(buf, sizeof(buf), "U%u", sc->sc_unit)) { + /* ignore */ + } + } #if !(defined(TS_CALLOUT) || (__FreeBSD_version >= 700022)) #define TS_CALLOUT NULL, sc->sc_unit, MINOR_CALLOUT /* compile fix for * FreeBSD 6.x */ #endif - error = ttycreate(tp, TS_CALLOUT, "U%d", sc->sc_unit); + error = ttycreate(tp, TS_CALLOUT, "%s", buf); if (error) { ttyfree(tp); goto done; ==== //depot/projects/usb/src/sys/dev/usb2/serial/usb2_serial.h#3 (text+ko) ==== @@ -91,7 +91,7 @@ * while it is open! */ struct usb2_com_callback { - void (*usb2_com_cfg_get_status) (struct usb2_com_softc *, uint8_t *, uint8_t *); + void (*usb2_com_cfg_get_status) (struct usb2_com_softc *, uint8_t *plsr, uint8_t *pmsr); void (*usb2_com_cfg_set_dtr) (struct usb2_com_softc *, uint8_t); void (*usb2_com_cfg_set_rts) (struct usb2_com_softc *, uint8_t); void (*usb2_com_cfg_set_break) (struct usb2_com_softc *, uint8_t); @@ -105,6 +105,7 @@ void (*usb2_com_stop_read) (struct usb2_com_softc *); void (*usb2_com_start_write) (struct usb2_com_softc *); void (*usb2_com_stop_write) (struct usb2_com_softc *); + void (*usb2_com_tty_name) (struct usb2_com_softc *, char *pbuf, uint16_t buflen, uint16_t local_subunit); }; /* Line status register */