summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2008-10-22 15:00:22 +0000
committerjhb <jhb@FreeBSD.org>2008-10-22 15:00:22 +0000
commitc16b8be4793f74b96b99f111cd2dafdd854c0e9e (patch)
tree4e31270f57aac047d4234b11e1fc842ee781adde
parentf864c915d793f375a0376b4bd34c2a42dc90f58b (diff)
downloadFreeBSD-src-c16b8be4793f74b96b99f111cd2dafdd854c0e9e.zip
FreeBSD-src-c16b8be4793f74b96b99f111cd2dafdd854c0e9e.tar.gz
Fix build breakage.
Pointy hat: jhb
-rw-r--r--sys/dev/ppbus/lpt.c4
-rw-r--r--sys/dev/ppbus/ppi.c3
2 files changed, 4 insertions, 3 deletions
diff --git a/sys/dev/ppbus/lpt.c b/sys/dev/ppbus/lpt.c
index 9bd92be..f6e034c 100644
--- a/sys/dev/ppbus/lpt.c
+++ b/sys/dev/ppbus/lpt.c
@@ -399,7 +399,7 @@ lpt_attach(device_t dev)
sc->cdev_bypass = make_dev(&lpt_cdevsw, unit,
UID_ROOT, GID_WHEEL, 0600, LPT_NAME "%d.ctl", unit);
sc->cdev_bypass->si_drv1 = sc;
- sc->cdev_bypass->si_drv2 = LP_BYPASS;
+ sc->cdev_bypass->si_drv2 = (void *)LP_BYPASS;
return (0);
}
@@ -476,7 +476,7 @@ lptopen(struct cdev *dev, int flags, int fmt, struct thread *td)
} else
sc->sc_state |= LPTINIT;
- sc->sc_flags = dev->si_drv2;
+ sc->sc_flags = (uintptr_t)dev->si_drv2;
/* Check for open with BYPASS flag set. */
if (sc->sc_flags & LP_BYPASS) {
diff --git a/sys/dev/ppbus/ppi.c b/sys/dev/ppbus/ppi.c
index e28b3cd..4c05667 100644
--- a/sys/dev/ppbus/ppi.c
+++ b/sys/dev/ppbus/ppi.c
@@ -171,7 +171,7 @@ ppi_attach(device_t dev)
UID_ROOT, GID_WHEEL,
0600, "ppi%d", device_get_unit(dev));
if (ppi->ppi_cdev == NULL) {
- device_printf("Failed to create character device\n");
+ device_printf(dev, "Failed to create character device\n");
return (ENXIO);
}
ppi->ppi_cdev->si_drv1 = ppi;
@@ -496,6 +496,7 @@ ppiioctl(struct cdev *dev, u_long cmd, caddr_t data, int flags, struct thread *t
{
struct ppi_data *ppi = dev->si_drv1;
device_t ppidev = ppi->ppi_device;
+ device_t ppbus = device_get_parent(ppidev);
int error = 0;
u_int8_t *val = (u_int8_t *)data;
OpenPOWER on IntegriCloud