Skip site navigation (1)Skip section navigation (2) 
Date:      Wed, 22 Oct 2008 15:00:22 +0000 (UTC)
From:      John Baldwin <jhb@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r184164 - head/sys/dev/ppbus
Message-ID:  <200810221500.m9MF0MvH031614@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: jhb
Date: Wed Oct 22 15:00:22 2008
New Revision: 184164
URL: http://svn.freebsd.org/changeset/base/184164

Log:
  Fix build breakage.
  
  Pointy hat:	jhb

Modified:
  head/sys/dev/ppbus/lpt.c
  head/sys/dev/ppbus/ppi.c

Modified: head/sys/dev/ppbus/lpt.c
==============================================================================
--- head/sys/dev/ppbus/lpt.c	Wed Oct 22 14:58:23 2008	(r184163)
+++ head/sys/dev/ppbus/lpt.c	Wed Oct 22 15:00:22 2008	(r184164)
@@ -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
 	} 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) {

Modified: head/sys/dev/ppbus/ppi.c
==============================================================================
--- head/sys/dev/ppbus/ppi.c	Wed Oct 22 14:58:23 2008	(r184163)
+++ head/sys/dev/ppbus/ppi.c	Wed Oct 22 15:00:22 2008	(r184164)
@@ -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, c
 {
 	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;

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200810221500.m9MF0MvH031614>