Module Name: src Committed By: bsh Date: Sat Nov 27 13:37:27 UTC 2010
Modified Files: src/sys/arch/arm/imx: imx31_uart.c imx51_uart.c imxuart.c imxuartvar.h Log Message: use device_t correctly for imxuart. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/imx/imx31_uart.c \ src/sys/arch/arm/imx/imx51_uart.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/imx/imxuart.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/imx/imxuartvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/arm/imx/imx31_uart.c diff -u src/sys/arch/arm/imx/imx31_uart.c:1.1 src/sys/arch/arm/imx/imx31_uart.c:1.2 --- src/sys/arch/arm/imx/imx31_uart.c:1.1 Sat Nov 13 06:12:17 2010 +++ src/sys/arch/arm/imx/imx31_uart.c Sat Nov 27 13:37:27 2010 @@ -36,7 +36,7 @@ int -imxuart_match(struct device *parent, struct cfdata *cf, void *aux) +imxuart_match(device_t parent, struct cfdata *cf, void *aux) { struct aips_attach_args * const aipsa = aux; @@ -53,7 +53,7 @@ } void -imxuart_attach(struct device *parent, struct device *self, void *aux) +imxuart_attach(device_t parent, device_t self, void *aux) { struct aips_attach_args * aa = aux; Index: src/sys/arch/arm/imx/imx51_uart.c diff -u src/sys/arch/arm/imx/imx51_uart.c:1.1 src/sys/arch/arm/imx/imx51_uart.c:1.2 --- src/sys/arch/arm/imx/imx51_uart.c:1.1 Sat Nov 13 06:12:17 2010 +++ src/sys/arch/arm/imx/imx51_uart.c Sat Nov 27 13:37:27 2010 @@ -36,7 +36,7 @@ int -imxuart_match(struct device *parent, struct cfdata *cf, void *aux) +imxuart_match(device_t parent, struct cfdata *cf, void *aux) { struct axi_attach_args * const aa = aux; @@ -51,7 +51,7 @@ } void -imxuart_attach(struct device *parent, struct device *self, void *aux) +imxuart_attach(device_t parent, device_t self, void *aux) { struct axi_attach_args * aa = aux; Index: src/sys/arch/arm/imx/imxuart.c diff -u src/sys/arch/arm/imx/imxuart.c:1.5 src/sys/arch/arm/imx/imxuart.c:1.6 --- src/sys/arch/arm/imx/imxuart.c:1.5 Sat Nov 13 06:12:17 2010 +++ src/sys/arch/arm/imx/imxuart.c Sat Nov 27 13:37:27 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: imxuart.c,v 1.5 2010/11/13 06:12:17 bsh Exp $ */ +/* $NetBSD: imxuart.c,v 1.6 2010/11/27 13:37:27 bsh Exp $ */ /* * Copyright (c) 2009, 2010 Genetec Corporation. All rights reserved. @@ -96,7 +96,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: imxuart.c,v 1.5 2010/11/13 06:12:17 bsh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: imxuart.c,v 1.6 2010/11/27 13:37:27 bsh Exp $"); #include "opt_imxuart.h" #include "opt_ddb.h" @@ -388,7 +388,7 @@ void -imxuart_attach_common(struct device *parent, struct device *self, +imxuart_attach_common(device_t parent, device_t self, bus_space_tag_t iot, paddr_t iobase, size_t size, int intr, int flags) { imxuart_softc_t *sc = device_private(self); Index: src/sys/arch/arm/imx/imxuartvar.h diff -u src/sys/arch/arm/imx/imxuartvar.h:1.3 src/sys/arch/arm/imx/imxuartvar.h:1.4 --- src/sys/arch/arm/imx/imxuartvar.h:1.3 Sat Nov 13 06:12:17 2010 +++ src/sys/arch/arm/imx/imxuartvar.h Sat Nov 27 13:37:27 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: imxuartvar.h,v 1.3 2010/11/13 06:12:17 bsh Exp $ */ +/* $NetBSD: imxuartvar.h,v 1.4 2010/11/27 13:37:27 bsh Exp $ */ /* * driver include for Freescale i.MX31 and i.MX31L UARTs */ @@ -36,7 +36,7 @@ #include <sys/termios.h> /* for tcflag_t */ -void imxuart_attach_common(struct device *parent, struct device *self, +void imxuart_attach_common(device_t parent, device_t self, bus_space_tag_t, paddr_t, size_t, int, int); int imxuart_kgdb_attach(bus_space_tag_t, paddr_t, u_int, tcflag_t);