[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 15/18] i386/i386at/com.c: fix initialization from incompatible po
From: |
Marin Ramesa |
Subject: |
[PATCH 15/18] i386/i386at/com.c: fix initialization from incompatible pointer type |
Date: |
Fri, 6 Dec 2013 16:29:57 +0100 |
* 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 2e4acb5..9998240 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 3762c1f..eeed62e 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);
--
1.8.1.4
- Re: [PATCH 09/18] kern/bootstrap.c: move struct definition to a header file, (continued)
- [PATCH 10/18] kern/startup.c: use boolean values, Marin Ramesa, 2013/12/06
- [PATCH 12/18] kern/debug.c: fix implicit declaration of function, Marin Ramesa, 2013/12/06
- [PATCH 11/18] kern/exception.c: move struct definition to a header file, Marin Ramesa, 2013/12/06
- [PATCH 14/18] Fix initialization from incompatible pointer type, Marin Ramesa, 2013/12/06
- [PATCH 13/18] kern/machine.c: fix implicit declaration of function, Marin Ramesa, 2013/12/06
- [PATCH 15/18] i386/i386at/com.c: fix initialization from incompatible pointer type,
Marin Ramesa <=
- [PATCH 16/18] i386/i386at/com.c: fix assignment from incompatible pointer type, Marin Ramesa, 2013/12/06
- [PATCH 17/18] i386/i386at/kd_event.c: fix difference in signedness, Marin Ramesa, 2013/12/06
- [PATCH 18/18] i386/i386at/lpr.c: fix initalization from incompatible pointer type, Marin Ramesa, 2013/12/06