From owner-svn-src-all@FreeBSD.ORG Wed Oct 22 19:39:16 2008 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5BC4110656FD; Wed, 22 Oct 2008 19:39:16 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4AE678FC17; Wed, 22 Oct 2008 19:39:16 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9MJdGMv037209; Wed, 22 Oct 2008 19:39:16 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9MJdG10037208; Wed, 22 Oct 2008 19:39:16 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <200810221939.m9MJdG10037208@svn.freebsd.org> From: John Baldwin Date: Wed, 22 Oct 2008 19:39:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r184176 - head/sys/dev/ppc X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Oct 2008 19:39:16 -0000 Author: jhb Date: Wed Oct 22 19:39:16 2008 New Revision: 184176 URL: http://svn.freebsd.org/changeset/base/184176 Log: Fix build with PPC_PROBE_CHIPSET enabled. Modified: head/sys/dev/ppc/ppc.c Modified: head/sys/dev/ppc/ppc.c ============================================================================== --- head/sys/dev/ppc/ppc.c Wed Oct 22 19:27:40 2008 (r184175) +++ head/sys/dev/ppc/ppc.c Wed Oct 22 19:39:16 2008 (r184176) @@ -751,7 +751,8 @@ config: if (bootverbose) { outb(csr, 0x1); - device_printf(dev, "SMC registers CR1=0x%x", inb(cio) & 0xff); + device_printf(ppc->ppc_dev, "SMC registers CR1=0x%x", + inb(cio) & 0xff); outb(csr, 0x4); printf(" CR4=0x%x", inb(cio) & 0xff); @@ -1044,7 +1045,7 @@ found: if (bootverbose) { /* dump of registers */ - device_printf(dev, "0x%x - ", w83877f_keys[i]); + device_printf(ppc->ppc_dev, "0x%x - ", w83877f_keys[i]); for (i = 0; i <= 0xd; i ++) { outb(efir, i); printf("0x%x ", inb(efdr)); @@ -1078,7 +1079,8 @@ found: switch (r) { case WINB_W83757: if (bootverbose) - device_printf(dev, "W83757 compatible mode\n"); + device_printf(ppc->ppc_dev, + "W83757 compatible mode\n"); return (-1); /* generic or SMC-like */ case WINB_EXTFDC: @@ -1086,20 +1088,20 @@ found: case WINB_EXT2FDD: case WINB_JOYSTICK: if (bootverbose) - device_printf(dev, + device_printf(ppc->ppc_dev, "not in parallel port mode\n"); return (-1); case (WINB_PARALLEL | WINB_EPP_SPP): ppc->ppc_avm |= PPB_EPP | PPB_SPP; if (bootverbose) - device_printf(dev, "EPP SPP\n"); + device_printf(ppc->ppc_dev, "EPP SPP\n"); break; case (WINB_PARALLEL | WINB_ECP): ppc->ppc_avm |= PPB_ECP | PPB_SPP; if (bootverbose) - device_printf(dev, "ECP SPP\n"); + device_printf(ppc->ppc_dev, "ECP SPP\n"); break; case (WINB_PARALLEL | WINB_ECP_EPP): @@ -1107,7 +1109,7 @@ found: ppc->ppc_type = PPC_TYPE_SMCLIKE; if (bootverbose) - device_printf(dev, "ECP+EPP SPP\n"); + device_printf(ppc->ppc_dev, "ECP+EPP SPP\n"); break; default: printf("%s: unknown case (0x%x)!\n", __func__, r); @@ -1128,20 +1130,21 @@ found: if (chipset_mode & PPB_EPP) { outb(efdr, inb(efdr) | WINB_ECP_EPP); if (bootverbose) - device_printf(dev, "ECP+EPP\n"); + device_printf(ppc->ppc_dev, + "ECP+EPP\n"); ppc->ppc_type = PPC_TYPE_SMCLIKE; } else { outb(efdr, inb(efdr) | WINB_ECP); if (bootverbose) - device_printf(dev, "ECP\n"); + device_printf(ppc->ppc_dev, "ECP\n"); } } else { /* select EPP_SPP otherwise */ outb(efdr, inb(efdr) | WINB_EPP_SPP); if (bootverbose) - device_printf(dev, "EPP SPP\n"); + device_printf(ppc->ppc_dev, "EPP SPP\n"); } ppc->ppc_avm = chipset_mode; }