Date: Mon, 19 Dec 2005 21:40:32 GMT From: Warner Losh <imp@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 88427 for review Message-ID: <200512192140.jBJLeWPV034096@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=88427 Change 88427 by imp@imp_Speedy on 2005/12/19 21:40:17 Minor renaming Affected files ... .. //depot/projects/arm/src/sys/arm/at91/uart_bus_at91usart.c#2 edit .. //depot/projects/arm/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#2 edit .. //depot/projects/arm/src/sys/arm/at91/uart_dev_at91usart.c#4 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/uart_bus_at91usart.c#2 (text+ko) ==== @@ -45,7 +45,7 @@ static int usart_at91rm92_probe(device_t dev); -extern struct uart_class usart_at91rm92_class; +extern struct uart_class at91_usart_class; static device_method_t usart_at91rm92_methods[] = { /* Device interface */ @@ -93,7 +93,7 @@ */ if (device_get_unit(dev) == 0) sc->sc_sysdev = SLIST_FIRST(&uart_sysdevs); - sc->sc_class = &usart_at91rm92_class; + sc->sc_class = &at91_usart_class; bcopy(&sc->sc_sysdev->bas, &sc->sc_bas, sizeof(sc->sc_bas)); return (uart_bus_probe(dev, 0, 0, 0, 0, 0)); } ==== //depot/projects/arm/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#2 (text+ko) ==== @@ -41,7 +41,7 @@ bus_space_tag_t uart_bus_space_io; bus_space_tag_t uart_bus_space_mem; -extern struct uart_ops usart_at91rm92_ops; +extern struct uart_ops at91_usart_ops; extern struct bus_space at91rm92_bs_tag; int @@ -53,7 +53,7 @@ int uart_cpu_getdev(int devtype, struct uart_devinfo *di) { - di->ops = usart_at91rm92_ops; + di->ops = at91_usart_ops; di->bas.chan = 0; di->bas.bst = &at91rm92_bs_tag; /* ==== //depot/projects/arm/src/sys/arm/at91/uart_dev_at91usart.c#4 (text+ko) ==== @@ -48,28 +48,28 @@ /* * Low-level UART interface. */ -static int usart_at91rm92_probe(struct uart_bas *bas); -static void usart_at91rm92_init(struct uart_bas *bas, int, int, int, int); -static void usart_at91rm92_term(struct uart_bas *bas); -static void usart_at91rm92_putc(struct uart_bas *bas, int); -static int usart_at91rm92_poll(struct uart_bas *bas); -static int usart_at91rm92_getc(struct uart_bas *bas); +static int at91_usart_probe(struct uart_bas *bas); +static void at91_usart_init(struct uart_bas *bas, int, int, int, int); +static void at91_usart_term(struct uart_bas *bas); +static void at91_usart_putc(struct uart_bas *bas, int); +static int at91_usart_poll(struct uart_bas *bas); +static int at91_usart_getc(struct uart_bas *bas); int did_mmu = 0; extern SLIST_HEAD(uart_devinfo_list, uart_devinfo) uart_sysdevs; -struct uart_ops usart_at91rm92_ops = { - .probe = usart_at91rm92_probe, - .init = usart_at91rm92_init, - .term = usart_at91rm92_term, - .putc = usart_at91rm92_putc, - .poll = usart_at91rm92_poll, - .getc = usart_at91rm92_getc, +struct uart_ops at91_usart_ops = { + .probe = at91_usart_probe, + .init = at91_usart_init, + .term = at91_usart_term, + .putc = at91_usart_putc, + .poll = at91_usart_poll, + .getc = at91_usart_getc, }; static int -usart_at91rm92_probe(struct uart_bas *bas) +at91_usart_probe(struct uart_bas *bas) { /* We know that this is always here */ return (0); @@ -79,7 +79,7 @@ * Initialize this device (I think as the console) */ static void -usart_at91rm92_init(struct uart_bas *bas, int baudrate, int databits, int stopbits, +at91_usart_init(struct uart_bas *bas, int baudrate, int databits, int stopbits, int parity) { @@ -92,7 +92,7 @@ * Free resources now that we're no longer the console. */ static void -usart_at91rm92_term(struct uart_bas *bas) +at91_usart_term(struct uart_bas *bas) { /* XXX */ } @@ -102,7 +102,7 @@ * interrutp driven). */ static void -usart_at91rm92_putc(struct uart_bas *bas, int c) +at91_usart_putc(struct uart_bas *bas, int c) { while (!(uart_getreg(bas, USART_CSR) & @@ -114,7 +114,7 @@ * Poll for a character available */ static int -usart_at91rm92_poll(struct uart_bas *bas) +at91_usart_poll(struct uart_bas *bas) { if (!(uart_getreg(bas, USART_CSR) & USART_CSR_RXRDY)) @@ -126,7 +126,7 @@ * Block waiting for a character. */ static int -usart_at91rm92_getc(struct uart_bas *bas) +at91_usart_getc(struct uart_bas *bas) { int c; @@ -137,40 +137,40 @@ return (c); } -static int usart_at91rm92_bus_probe(struct uart_softc *sc); -static int usart_at91rm92_bus_attach(struct uart_softc *sc); -static int usart_at91rm92_bus_flush(struct uart_softc *, int); -static int usart_at91rm92_bus_getsig(struct uart_softc *); -static int usart_at91rm92_bus_ioctl(struct uart_softc *, int, intptr_t); -static int usart_at91rm92_bus_ipend(struct uart_softc *); -static int usart_at91rm92_bus_param(struct uart_softc *, int, int, int, int); -static int usart_at91rm92_bus_receive(struct uart_softc *); -static int usart_at91rm92_bus_setsig(struct uart_softc *, int); -static int usart_at91rm92_bus_transmit(struct uart_softc *); +static int at91_usart_bus_probe(struct uart_softc *sc); +static int at91_usart_bus_attach(struct uart_softc *sc); +static int at91_usart_bus_flush(struct uart_softc *, int); +static int at91_usart_bus_getsig(struct uart_softc *); +static int at91_usart_bus_ioctl(struct uart_softc *, int, intptr_t); +static int at91_usart_bus_ipend(struct uart_softc *); +static int at91_usart_bus_param(struct uart_softc *, int, int, int, int); +static int at91_usart_bus_receive(struct uart_softc *); +static int at91_usart_bus_setsig(struct uart_softc *, int); +static int at91_usart_bus_transmit(struct uart_softc *); -static kobj_method_t usart_at91rm92_methods[] = { - KOBJMETHOD(uart_probe, usart_at91rm92_bus_probe), - KOBJMETHOD(uart_attach, usart_at91rm92_bus_attach), - KOBJMETHOD(uart_flush, usart_at91rm92_bus_flush), - KOBJMETHOD(uart_getsig, usart_at91rm92_bus_getsig), - KOBJMETHOD(uart_ioctl, usart_at91rm92_bus_ioctl), - KOBJMETHOD(uart_ipend, usart_at91rm92_bus_ipend), - KOBJMETHOD(uart_param, usart_at91rm92_bus_param), - KOBJMETHOD(uart_receive, usart_at91rm92_bus_receive), - KOBJMETHOD(uart_setsig, usart_at91rm92_bus_setsig), - KOBJMETHOD(uart_transmit, usart_at91rm92_bus_transmit), +static kobj_method_t at91_usart_methods[] = { + KOBJMETHOD(uart_probe, at91_usart_bus_probe), + KOBJMETHOD(uart_attach, at91_usart_bus_attach), + KOBJMETHOD(uart_flush, at91_usart_bus_flush), + KOBJMETHOD(uart_getsig, at91_usart_bus_getsig), + KOBJMETHOD(uart_ioctl, at91_usart_bus_ioctl), + KOBJMETHOD(uart_ipend, at91_usart_bus_ipend), + KOBJMETHOD(uart_param, at91_usart_bus_param), + KOBJMETHOD(uart_receive, at91_usart_bus_receive), + KOBJMETHOD(uart_setsig, at91_usart_bus_setsig), + KOBJMETHOD(uart_transmit, at91_usart_bus_transmit), {0, 0 } }; int -usart_at91rm92_bus_probe(struct uart_softc *sc) +at91_usart_bus_probe(struct uart_softc *sc) { return (0); } static int -usart_at91rm92_bus_attach(struct uart_softc *sc) +at91_usart_bus_attach(struct uart_softc *sc) { bcopy(&sc->sc_sysdev->bas, &sc->sc_bas, sizeof(sc->sc_bas)); @@ -180,53 +180,53 @@ return (0); } static int -usart_at91rm92_bus_transmit(struct uart_softc *sc) +at91_usart_bus_transmit(struct uart_softc *sc) { return (0); } static int -usart_at91rm92_bus_setsig(struct uart_softc *sc, int sig) +at91_usart_bus_setsig(struct uart_softc *sc, int sig) { return (0); } static int -usart_at91rm92_bus_receive(struct uart_softc *sc) +at91_usart_bus_receive(struct uart_softc *sc) { return (0); } static int -usart_at91rm92_bus_param(struct uart_softc *sc, int baudrate, int databits, +at91_usart_bus_param(struct uart_softc *sc, int baudrate, int databits, int stopbits, int parity) { return (0); } static int -usart_at91rm92_bus_ipend(struct uart_softc *sc) +at91_usart_bus_ipend(struct uart_softc *sc) { return (0); } static int -usart_at91rm92_bus_flush(struct uart_softc *sc, int what) +at91_usart_bus_flush(struct uart_softc *sc, int what) { return (0); } static int -usart_at91rm92_bus_getsig(struct uart_softc *sc) +at91_usart_bus_getsig(struct uart_softc *sc) { return (0); } static int -usart_at91rm92_bus_ioctl(struct uart_softc *sc, int request, intptr_t data) +at91_usart_bus_ioctl(struct uart_softc *sc, int request, intptr_t data) { return (EINVAL); } -struct uart_class usart_at91rm92_class = { - "usart_at91rm92 class", - usart_at91rm92_methods, +struct uart_class at91_usart_class = { + "at91_usart class", + at91_usart_methods, 1, .uc_range = 8, .uc_rclk = DEFAULT_RCLK
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200512192140.jBJLeWPV034096>