[BACK]Return to com.c CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / sys / dev / ic

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/sys/dev/ic/com.c between version 1.331 and 1.332

version 1.331, 2015/03/07 21:53:33 version 1.332, 2015/03/07 22:13:16
Line 472  com_attach_subr(struct com_softc *sc)
Line 472  com_attach_subr(struct com_softc *sc)
   
         sc->sc_fifolen = 1;          sc->sc_fifolen = 1;
         /* look for a NS 16550AF UART with FIFOs */          /* look for a NS 16550AF UART with FIFOs */
         if(sc->sc_type == COM_TYPE_INGENIC) {          if (sc->sc_type == COM_TYPE_INGENIC) {
                 CSR_WRITE_1(regsp, COM_REG_FIFO,                  CSR_WRITE_1(regsp, COM_REG_FIFO,
                     FIFO_ENABLE | FIFO_RCV_RST | FIFO_XMT_RST |                      FIFO_ENABLE | FIFO_RCV_RST | FIFO_XMT_RST |
                     FIFO_TRIGGER_14 | FIFO_UART_ON);                      FIFO_TRIGGER_14 | FIFO_UART_ON);
Line 527  com_attach_subr(struct com_softc *sc)
Line 527  com_attach_subr(struct com_softc *sc)
                         uint8_t iir1, iir2;                          uint8_t iir1, iir2;
                         uint8_t fcr = FIFO_ENABLE | FIFO_TRIGGER_14;                          uint8_t fcr = FIFO_ENABLE | FIFO_TRIGGER_14;
   
                         if(sc->sc_type == COM_TYPE_INGENIC)                          if (sc->sc_type == COM_TYPE_INGENIC)
                                 fcr |= FIFO_UART_ON;                                  fcr |= FIFO_UART_ON;
   
                         lcr = CSR_READ_1(regsp, COM_REG_LCR);                          lcr = CSR_READ_1(regsp, COM_REG_LCR);
Line 568  com_attach_subr(struct com_softc *sc)
Line 568  com_attach_subr(struct com_softc *sc)
                         fifo_msg = "ns16550, broken fifo";                          fifo_msg = "ns16550, broken fifo";
         else          else
                 fifo_msg = "ns8250 or ns16450, no fifo";                  fifo_msg = "ns8250 or ns16450, no fifo";
         if(sc->sc_type == COM_TYPE_INGENIC) {          if (sc->sc_type == COM_TYPE_INGENIC) {
                 CSR_WRITE_1(regsp, COM_REG_FIFO, FIFO_UART_ON);                  CSR_WRITE_1(regsp, COM_REG_FIFO, FIFO_UART_ON);
         } else          } else
                 CSR_WRITE_1(regsp, COM_REG_FIFO, 0);                  CSR_WRITE_1(regsp, COM_REG_FIFO, 0);
Line 1479  comparam(struct tty *tp, struct termios 
Line 1479  comparam(struct tty *tp, struct termios 
         } else          } else
                 sc->sc_fifo = 0;                  sc->sc_fifo = 0;
   
         if(sc->sc_type == COM_TYPE_INGENIC)          if (sc->sc_type == COM_TYPE_INGENIC)
                 sc->sc_fifo |= FIFO_UART_ON;                  sc->sc_fifo |= FIFO_UART_ON;
   
         /* And copy to tty. */          /* And copy to tty. */
Legend:
Removed from v.1.331  
changed lines
  Added in v.1.332
CVSweb <webmaster@jp.NetBSD.org>