From owner-freebsd-mobile Tue Jun 26 21:17:17 2001 Delivered-To: freebsd-mobile@freebsd.org Received: from portege.clkao.org (103.c210-85-10.ethome.net.tw [210.85.10.103]) by hub.freebsd.org (Postfix) with ESMTP id 8378C37B40B for ; Tue, 26 Jun 2001 21:17:11 -0700 (PDT) (envelope-from clkao@portege.clkao.org) Received: (from clkao@localhost) by portege.clkao.org (8.11.3/8.11.3) id f5R4BF500528; Wed, 27 Jun 2001 12:11:15 +0800 (CST) (envelope-from clkao) Date: Wed, 27 Jun 2001 12:11:15 +0800 From: Chia-liang Kao To: Warner Losh Cc: mobile@FreeBSD.ORG Subject: Re: Test patch for -stable Message-ID: <20010627121114.A434@clk.cirx.org> References: <20010625112826.A97362@stevenwills.com> <200106242329.f5ONToV92394@harmony.village.org> <20010625112826.A97362@stevenwills.com> <200106251551.f5PFp9V98988@harmony.village.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-md5; protocol="application/pgp-signature"; boundary="0ntfKIWw70PvrIHh" Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <200106251551.f5PFp9V98988@harmony.village.org>; from imp@harmony.village.org on Mon, Jun 25, 2001 at 09:51:09AM -0600 Sender: owner-freebsd-mobile@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org --0ntfKIWw70PvrIHh Content-Type: multipart/mixed; boundary="+HP7ph2BbKc20aGI" Content-Disposition: inline --+HP7ph2BbKc20aGI Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Mon, Jun 25, 2001 at 09:51:09AM -0600, Warner Losh wrote: > I thought I'd tested all that, but this one slipped through the > cracks. I've updated the patch. > http://people.freebsd.org/~imp/pcic-stable.diff.3 The attached tiny patch makes the kernel compile on -stable. Also, there were no machine/pci_cfgreg.h to be included from pci_cfgreg.c > There are still a few active issues with this code in current, so it > may be a while before it is MFC'd. It looks like the issues are > sorting themsleves out. While my pcic disappeared with the new kernel. Normally it should be: pcic0: at port 0x3e0 iomem 0xd0000 irq 10 on isa0 pcic0: management irq 10 pccard0: on pcic0 pccard1: on pcic0 What information could I provide to help? Cheers, CLK --+HP7ph2BbKc20aGI Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="pcic.more.diff" Index: pci/pcic_p.c =================================================================== RCS file: /mnt/fome/ncvs/src/sys/pci/Attic/pcic_p.c,v retrieving revision 1.20.2.3 diff -u -r1.20.2.3 pcic_p.c --- pci/pcic_p.c 2001/03/25 20:20:31 1.20.2.3 +++ pci/pcic_p.c 2001/06/27 03:29:52 @@ -65,7 +65,7 @@ * sequentially. We only initialize the first socket's legacy port, * the other is a dummy. */ - io_port = PCIC_INDEX_0 + num6832 * CLPD6832_NUM_REGS; + io_port = PCIC_PORT_0 + num6832 * CLPD6832_NUM_REGS; if (unit == 0) pci_write_config(dev, CLPD6832_LEGACY_16BIT_IOADDR, io_port & ~CLPD6832_LEGACY_16BIT_IOENABLE, 4); Index: conf/files.i386 =================================================================== RCS file: /mnt/fome/ncvs/src/sys/conf/files.i386,v retrieving revision 1.307.2.10 diff -u -r1.307.2.10 files.i386 --- conf/files.i386 2001/05/22 08:32:25 1.307.2.10 +++ conf/files.i386 2001/06/27 03:35:49 @@ -253,6 +253,7 @@ i386/isa/pcaudio.c optional pca i386/isa/pcf.c optional pcf i386/isa/pcibus.c optional pci +i386/isa/pci_cfgreg.c optional pci i386/isa/pcvt/pcvt_drv.c optional vt i386/isa/pcvt/pcvt_ext.c optional vt i386/isa/pcvt/pcvt_kbd.c optional vt --+HP7ph2BbKc20aGI-- --0ntfKIWw70PvrIHh Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.0.6 (FreeBSD) Comment: For info see http://www.gnupg.org iD8DBQE7OVzik1XldlEkA5YRAq/wAJ4vBaaQOVMWIhzjMsJnuY0mA9OQEACggpMn 1qw651K/DwlglBc2iQ2ve9o= =5BcI -----END PGP SIGNATURE----- --0ntfKIWw70PvrIHh-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-mobile" in the body of the message