Date: Tue, 24 Dec 2002 16:58:25 -0800 (PST) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 22731 for review Message-ID: <200212250058.gBP0wPoo058120@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=22731 Change 22731 by marcel@marcel_vaio on 2002/12/24 16:57:47 Converge on the use of "com" for the softc. Even though I like "sc" better, the inconsistency is worse. In other words: fix compile breakage caused by the previous untested submission... :-/ Affected files ... .. //depot/projects/ia64/sys/dev/sio/sio.c#29 edit Differences ... ==== //depot/projects/ia64/sys/dev/sio/sio.c#29 (text+ko) ==== @@ -271,51 +271,51 @@ * any data in the RHR after we have reset the FIFOs. */ static void -sioinitfifo(struct com_s *sc) +sioinitfifo(struct com_s *com) { - sio_setreg(sc, com_mcr, sc->reg_mcr | MCR_LOOPBACK); + sio_setreg(com, com_mcr, com->reg_mcr | MCR_LOOPBACK); /* XXX barrier */ - sio_setreg(sc, com_fcr, FCR_ENABLE); + sio_setreg(com, com_fcr, FCR_ENABLE); /* XXX barrier */ - sio_setreg(sc, com_fcr, FCR_ENABLE | FCR_RCV_RST | FCR_XMT_RST); + sio_setreg(com, com_fcr, FCR_ENABLE | FCR_RCV_RST | FCR_XMT_RST); /* XXX barrier */ DELAY(100); - sc->reg_fcr = 0; - sc->hasfifo = (sio_getreg(sc, com_iir) & IIR_FIFO_MASK) ? 1 : 0; - if (sc->hasfifo) { - while (sio_getreg(sc, com_lsr) & LSR_RXRDY) { - (void)sio_getreg(sc, com_data); + com->reg_fcr = 0; + com->hasfifo = (sio_getreg(com, com_iir) & IIR_FIFO_MASK) ? 1 : 0; + if (com->hasfifo) { + while (sio_getreg(com, com_lsr) & LSR_RXRDY) { + (void)sio_getreg(com, com_data); /* XXX barrier */ } - sc->reg_fcr = FCR_ENABLE | FCR_RX_HIGH; - sio_setreg(sc, com_mcr, sc->reg_fcr); + com->reg_fcr = FCR_ENABLE | FCR_RX_HIGH; + sio_setreg(com, com_mcr, com->reg_fcr); /* XXX barrier */ - sc->fifosize = 16; /* Minimal FIFO size. */ + com->fifosize = 16; /* Minimal FIFO size. */ /* * XXX count the number of characters we can send before * we have a receive interrupt. This tells us how large * the FIFOs are. */ } - sio_setreg(sc, com_mcr, sc->reg_mcr); + sio_setreg(com, com_mcr, com->reg_mcr); /* XXX barrier */ } static void -siodescribe(struct com_s *sc) +siodescribe(struct com_s *com) { int has_spr; u_char spr; - if (sc->hasfifo) { + if (com->hasfifo) { /* * NS16550 or higher. The minimum FIFO size is 16 bytes for * the NS16550. The ST16C650 has 32 bytes FIFOs and the * NS16750 has 64 bytes FIFOs. */ - switch (sc->fifosize) { + switch (com->fifosize) { case 16: /* * XXX Should we try to see if we have a broken @@ -348,12 +348,12 @@ * NS16450 or lower. Use the Scratch Pad Register (SPR) to * differentiate the NS16450 from the INS8250. */ - spr = sio_getreg(sc, com_scr); - sio_setreg(sc, com_scr, ~spr); + spr = sio_getreg(com, com_scr); + sio_setreg(com, com_scr, ~spr); /* XXX barrier */ - has_spr = (sio_getreg(sc, com_scr) == ~spr) ? 1 : 0; + has_spr = (sio_getreg(com, com_scr) == ~spr) ? 1 : 0; /* XXX barrier */ - sio_setreg(sc, com_scr, spr); + sio_setreg(com, com_scr, spr); /* XXX barrier */ if (!has_spr) device_set_desc(com->dev, "8250 or compatible"); @@ -390,36 +390,36 @@ * Do some non-destructive (for this device that is) tests * to make sure we have something that looks like an UART. */ -int sioprobe1(struct com_s *sc) +int sioprobe1(struct com_s *com) { u_char lcr, val; - lcr = sio_getreg(sc, com_lcr); - sio_setreg(sc, com_lcr, lcr & ~LCR_DLAB); + lcr = sio_getreg(com, com_lcr); + sio_setreg(com, com_lcr, lcr & ~LCR_DLAB); /* Check known 0 bits that don't depend on DLAB. */ - val = sio_getreg(sc, com_iir); + val = sio_getreg(com, com_iir); if (val & 0x30) goto fail; - val = sio_getreg(sc, com_mcr); + val = sio_getreg(com, com_mcr); if (val & 0xe0) goto fail; /* Check known 0 bits that depend on !DLAB. */ - val = sio_getreg(sc, com_ier); + val = sio_getreg(com, com_ier); if (val & 0xf0) goto fail; /* XXX we can do more. */ - sio_setreg(sc, com_ier, 0); + sio_setreg(com, com_ier, 0); /* XXX barrier */ - sio_setreg(sc, com_lcr, lcr); + sio_setreg(com, com_lcr, lcr); /* XXX barrier */ return (0); fail: - sio_setreg(sc, com_lcr, lcr); + sio_setreg(com, com_lcr, lcr); /* XXX barrier */ return (ENXIO); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200212250058.gBP0wPoo058120>