X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=vizzini.c;h=e5688533bedd3e73a112699f3e76a8eafd613050;hb=refs%2Fheads%2Fmaster;hp=bbd78bd66af2088289747e43a3be4119c0558821;hpb=bf496445ebb4f7c55f6df2d45ef066a4bbfe5bb2;p=exar-uart-driver.git diff --git a/vizzini.c b/vizzini.c index bbd78bd..e568853 100644 --- a/vizzini.c +++ b/vizzini.c @@ -1094,7 +1094,6 @@ static void acm_tty_set_termios(struct tty_struct *tty, } else { format_size = UART_FORMAT_SIZE_8; } - acm->trans9 = (format_size == UART_FORMAT_SIZE_9); if (cflag & PARENB) { if (cflag & PARODD) { @@ -1120,17 +1119,6 @@ static void acm_tty_set_termios(struct tty_struct *tty, format_stop = UART_FORMAT_STOP_1; } -#ifdef VIZZINI_IWA - if (format_size == UART_FORMAT_SIZE_8) { - acm->iwa = format_parity; - if (portdata->iwa != UART_FORMAT_PARITY_NONE) { - format_size = UART_FORMAT_SIZE_9; - format_parity = UART_FORMAT_PARITY_NONE; - } - } else { - acm->iwa = UART_FORMAT_PARITY_NONE; - } -#endif vizzini_set_reg(acm, block, UART_FORMAT, format_size | format_parity | format_stop); if (cflag & CRTSCTS) { @@ -1153,17 +1141,9 @@ static void acm_tty_set_termios(struct tty_struct *tty, vizzini_set_reg(acm, block, UART_FLOW, flow); vizzini_set_reg(acm, block, UART_GPIO_MODE, gpio_mode); - if (acm->trans9) { - /* Turn on wide mode if we're 9-bit transparent. */ - vizzini_set_reg(acm, EPLOCALS_REG_BLOCK, (block * MEM_EP_LOCALS_SIZE) + EP_WIDE_MODE, 1); -#ifdef VIZZINI_IWA - } else if (acm->iwa != UART_FORMAT_PARITY_NONE) { - vizzini_set_reg(acm, EPLOCALS_REG_BLOCK, (block * MEM_EP_LOCALS_SIZE) + EP_WIDE_MODE, 1); -#endif - } else if (!acm->preciseflags) { - /* Turn off wide mode unless we have precise flags. */ - vizzini_set_reg(acm, EPLOCALS_REG_BLOCK, (block * MEM_EP_LOCALS_SIZE) + EP_WIDE_MODE, 0); - } + vizzini_set_reg(acm, EPLOCALS_REG_BLOCK, + (block * MEM_EP_LOCALS_SIZE) + EP_WIDE_MODE, + format_size == UART_FORMAT_SIZE_9); rate = cpu_to_le32(tty_get_baud_rate(tty)); if(rate)