From 7eee86071820dfe40d612f1daf488a983e30afe9 Mon Sep 17 00:00:00 2001 From: Marin Ramesa Date: Fri, 6 Dec 2013 16:29:57 +0100 Subject: i386/i386at/com.c: fix initialization from incompatible pointer type * i386/i386at/com.c (comprobe): Modify argument types. (comprobe): Cast from (struct bus_ctrl *) to (struct bus_device *). comprobe_general() uses only a small subset of members, so it's all the same which struct it is. * i386/i386at/com.h (comprobe): Modify argument types. --- i386/i386at/com.c | 4 ++-- i386/i386at/com.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/i386/i386at/com.c b/i386/i386at/com.c index 7b184e3..4a62bb7 100644 --- a/i386/i386at/com.c +++ b/i386/i386at/com.c @@ -169,9 +169,9 @@ comprobe_general(struct bus_device *dev, int noisy) * all of bus_device_init */ int -comprobe(int port, struct bus_device *dev) +comprobe(vm_offset_t port, struct bus_ctlr *dev) { - return comprobe_general(dev, /*noisy*/ 0); + return comprobe_general((struct bus_device *)dev, /*noisy*/ 0); } /* diff --git a/i386/i386at/com.h b/i386/i386at/com.h index ae9434d..81fccfa 100644 --- a/i386/i386at/com.h +++ b/i386/i386at/com.h @@ -51,7 +51,7 @@ extern int comcngetc(dev_t dev, int wait); extern int comcnputc(dev_t dev, int c); extern void comintr(int unit); -int comprobe(int port, struct bus_device *dev); +int comprobe(vm_offset_t port, struct bus_ctlr *dev); int commctl(struct tty *tp, int bits, int how); void comstart(struct tty *tp); void comstop(struct tty *tp, int flags); -- cgit v1.2.3