On Wed, May 30, 2018 at 03:27:22PM +0200, Mark Kettenis wrote:
> Remove unused infrastructure. After this we arm64 and armv7 com_fdt.c
> are identical and I can move it into dev/fdt.
>
> ok?
ok, there is also
dev/fdt/imxuart.c:extern int comcnspeed;
dev/fdt/imxuart.c:extern int comcnmode;
>
>
> Index: armv7/armv7_machdep.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/armv7/armv7/armv7_machdep.c,v
> retrieving revision 1.53
> diff -u -p -r1.53 armv7_machdep.c
> --- armv7/armv7_machdep.c 15 May 2018 11:11:35 -0000 1.53
> +++ armv7/armv7_machdep.c 30 May 2018 13:23:36 -0000
> @@ -207,16 +207,6 @@ void consinit(void);
>
> bs_protos(bs_notimpl);
>
> -#ifndef CONSPEED
> -#define CONSPEED B115200 /* What u-boot */
> -#endif
> -#ifndef CONMODE
> -#define CONMODE ((TTYDEF_CFLAG & ~(CSIZE | CSTOPB | PARENB)) | CS8) /* 8N1 */
> -#endif
> -
> -int comcnspeed = CONSPEED;
> -int comcnmode = CONMODE;
> -
> int stdout_node;
> int stdout_speed;
>
> Index: dev/com_fdt.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/armv7/dev/com_fdt.c,v
> retrieving revision 1.13
> diff -u -p -r1.13 com_fdt.c
> --- dev/com_fdt.c 14 May 2018 19:25:54 -0000 1.13
> +++ dev/com_fdt.c 30 May 2018 13:23:36 -0000
> @@ -39,9 +39,6 @@ int com_fdt_match(struct device *, void
> void com_fdt_attach(struct device *, struct device *, void *);
> int com_fdt_intr_designware(void *);
>
> -extern int comcnspeed;
> -extern int comcnmode;
> -
> struct cfattach com_fdt_ca = {
> sizeof (struct com_softc), com_fdt_match, com_fdt_attach
> };
> @@ -135,8 +132,7 @@ com_fdt_attach(struct device *parent, st
> SET(sc->sc_hwflags, COM_HW_CONSOLE);
> SET(sc->sc_swflags, COM_SW_SOFTCAR);
> comconsfreq = sc->sc_frequency;
> - comconsrate = stdout_speed ? stdout_speed : comcnspeed;
> - comconscflag = comcnmode;
> + comconsrate = stdout_speed ? stdout_speed : B115200;
> }
>
> if (bus_space_map(sc->sc_iot, faa->fa_reg[0].addr,
> Index: dev/pluart.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/armv7/dev/pluart.c,v
> retrieving revision 1.7
> diff -u -p -r1.7 pluart.c
> --- dev/pluart.c 19 Feb 2018 08:59:52 -0000 1.7
> +++ dev/pluart.c 30 May 2018 13:23:36 -0000
> @@ -182,9 +182,6 @@ struct pluart_softc *pluart_sc(dev_t dev
>
> int pluart_intr(void *);
>
> -extern int comcnspeed;
> -extern int comcnmode;
> -
> /* XXX - we imitate 'com' serial ports and take over their entry points */
> /* XXX: These belong elsewhere */
> cdev_decl(pluart);
> @@ -214,7 +211,7 @@ pluart_init_cons(void)
> if (fdt_get_reg(node, 0, ®))
> return;
>
> - pluartcnattach(&armv7_bs_tag, reg.addr, comcnspeed, comcnmode);
> + pluartcnattach(&armv7_bs_tag, reg.addr, B115200, TTYDEF_CFLAG);
> }
>
> int
> Index: exynos/exuart.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/armv7/exynos/exuart.c,v
> retrieving revision 1.14
> diff -u -p -r1.14 exuart.c
> --- exynos/exuart.c 19 Feb 2018 08:59:52 -0000 1.14
> +++ exynos/exuart.c 30 May 2018 13:23:36 -0000
> @@ -108,9 +108,6 @@ struct exuart_softc *exuart_sc(dev_t dev
>
> int exuart_intr(void *);
>
> -extern int comcnspeed;
> -extern int comcnmode;
> -
> /* XXX - we imitate 'com' serial ports and take over their entry points */
> /* XXX: These belong elsewhere */
> cdev_decl(exuart);
> @@ -152,7 +149,7 @@ exuart_init_cons(void)
> if (fdt_get_reg(node, 0, ®))
> return;
>
> - exuartcnattach(&armv7_bs_tag, reg.addr, comcnspeed, comcnmode);
> + exuartcnattach(&armv7_bs_tag, reg.addr, B115200, TTYDEF_CFLAG);
> }
>
> int
>
