Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a few logical vs. physical port number confusions to make this

Browse Source 
driver work with two port variants.
This commit is contained in:
martin 2014-08-23 21:37:56 +00:00
parent fe275f49d7
commit f0b5a13b43
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sys/dev/usb/umcs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: umcs.c,v 1.7 2014/05/05 20:56:15 joerg Exp $ */ /* $NetBSD: umcs.c,v 1.8 2014/08/23 21:37:56 martin Exp $ */
/* $FreeBSD: head/sys/dev/usb/serial/umcs.c 260559 2014-01-12 11:44:28Z hselasky $ */ /* $FreeBSD: head/sys/dev/usb/serial/umcs.c 260559 2014-01-12 11:44:28Z hselasky $ */
/*- /*-
@ -41,7 +41,7 @@
* *
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: umcs.c,v 1.7 2014/05/05 20:56:15 joerg Exp $"); __KERNEL_RCSID(0, "$NetBSD: umcs.c,v 1.8 2014/08/23 21:37:56 martin Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -420,7 +420,8 @@ umcs7840_set_UART_reg(struct umcs7840_softc *sc, uint8_t portno, uint8_t reg, ui
} }
static int static int
umcs7840_set_baudrate(struct umcs7840_softc *sc, uint8_t portno, uint32_t rate) umcs7840_set_baudrate(struct umcs7840_softc *sc, uint8_t portno,
uint32_t rate)
{ {
int err; int err;
uint16_t divisor; uint16_t divisor;
@ -434,7 +435,8 @@ umcs7840_set_baudrate(struct umcs7840_softc *sc, uint8_t portno, uint32_t rate)
return (-1); return (-1);
} }
if (divisor == 0 || (clk & MCS7840_DEV_SPx_CLOCK_MASK) != clk) { if (divisor == 0 || (clk & MCS7840_DEV_SPx_CLOCK_MASK) != clk) {
DPRINTF(("Port %d bad speed calculation: %d\n", portno, rate)); DPRINTF(("Port %d bad speed calculation: %d\n", portno,
rate));
return (-1); return (-1);
} }
DPRINTF(("Port %d set speed: %d (%02x / %d)\n", portno, rate, clk, divisor)); DPRINTF(("Port %d set speed: %d (%02x / %d)\n", portno, rate, clk, divisor));
@ -585,20 +587,19 @@ static void
umcs7840_set(void *self, int portno, int reg, int onoff) umcs7840_set(void *self, int portno, int reg, int onoff)
{ {
struct umcs7840_softc *sc = self; struct umcs7840_softc *sc = self;
int pn = sc->sc_ports[portno].sc_port_phys;
if (sc->sc_dying) if (sc->sc_dying)
return; return;
switch (reg) { switch (reg) {
case UCOM_SET_DTR: case UCOM_SET_DTR:
umcs7840_dtr(sc, pn, onoff); umcs7840_dtr(sc, portno, onoff);
break; break;
case UCOM_SET_RTS: case UCOM_SET_RTS:
umcs7840_rts(sc, pn, onoff); umcs7840_rts(sc, portno, onoff);
break; break;
case UCOM_SET_BREAK: case UCOM_SET_BREAK:
umcs7840_break(sc, pn, onoff); umcs7840_break(sc, portno, onoff);
break; break;
default: default:
break; break;
@ -665,7 +666,7 @@ umcs7840_param(void *self, int portno, struct termios *t)
umcs7840_set_UART_reg(sc, pn, MCS7840_UART_REG_MCR, umcs7840_set_UART_reg(sc, pn, MCS7840_UART_REG_MCR,
sc->sc_ports[pn].sc_port_mcr); sc->sc_ports[pn].sc_port_mcr);
if (umcs7840_set_baudrate(sc, pn, t->c_ospeed)) if (umcs7840_set_baudrate(sc, portno, t->c_ospeed))
return EIO; return EIO;
return 0; return 0;
@ -804,7 +805,7 @@ umcs7840_port_open(void *self, int portno)
return EIO; return EIO;
/* Set speed 9600 */ /* Set speed 9600 */
if (umcs7840_set_baudrate(sc, pn, 9600)) if (umcs7840_set_baudrate(sc, portno, 9600))
return EIO; return EIO;