From owner-freebsd-current Tue Jan 8 9:42:54 2002 Delivered-To: freebsd-current@freebsd.org Received: from outel.org (outel.org [207.173.133.28]) by hub.freebsd.org (Postfix) with ESMTP id E1A5437B400 for ; Tue, 8 Jan 2002 09:42:31 -0800 (PST) Received: from [192.168.1.20] (athlon [192.168.1.20]) by outel.org (8.11.6/8.11.6) with ESMTP id g08HgOV77789 for ; Tue, 8 Jan 2002 09:42:24 -0800 (PST) (envelope-from qumqats@outel.org) Date: Tue, 08 Jan 2002 09:43:40 -0800 From: "Joel M. Baldwin" To: current@FreeBSD.ORG Subject: sys/dev/usb/uhci.c needs patch to compile Message-ID: <1015598223.1010483020@[192.168.1.20]> In-Reply-To: <20020108181442.A63472@shalmaneser.enst.fr> References: <20020108181442.A63472@shalmaneser.enst.fr> X-Mailer: Mulberry/2.1.2 (Win32 Demo) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Content-Disposition: inline Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG I've been having to apply the following patch to get a kernel compile to go through. The problem sees to be that when you have options UHCI_DEBUG AND options DIAGNOSTIC some conditional code gets added that trys to call uhci_dump_ii which isn't defined anywhere. Also on line 694 there is: uhci_dump_qh(sc->sc_ctl_start->qh.hlink); which produces cc -c -O -pipe -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -fformat-extensions -ansi -nostdinc -I- -I. -I../../.. -I../../../dev -I../../../contrib/dev/acpica -I../../../contrib/ipfilter -I../../../../include -D_KERNEL -ffreestanding -include opt_global.h -elf -mpreferred-stack-boundary=2 ../../../dev/usb/uhci.c ../../../dev/usb/uhci.c: In function `uhci_dump_all': ../../../dev/usb/uhci.c:693: structure has no member named `hlink' ../../../dev/usb/uhci.c: At top level: ../../../dev/usb/uhci.c:1268: warning: `uhci_reset' defined but not used *** Error code 1 -------- patch starts on the next line -------------- *** uhci.c.orig Mon Jan 7 07:32:06 2002 --- uhci.c Mon Jan 7 07:37:32 2002 *************** *** 258,264 **** Static void uhci_dump_qh(uhci_soft_qh_t *); Static void uhci_dump_tds(uhci_soft_td_t *); Static void uhci_dump_td(uhci_soft_td_t *); - Static void uhci_dump_ii(uhci_intr_info_t *ii); void uhci_dump(void); #endif --- 258,263 ---- *************** *** 691,697 **** uhci_dumpregs(sc); printf("intrs=%d\n", sc->sc_bus.no_intrs); /*printf("framelist[i].link = %08x\n", sc->sc_framelist[0].link);*/ ! uhci_dump_qh(sc->sc_ctl_start->qh.hlink); } --- 690,696 ---- uhci_dumpregs(sc); printf("intrs=%d\n", sc->sc_bus.no_intrs); /*printf("framelist[i].link = %08x\n", sc->sc_framelist[0].link);*/ ! /* uhci_dump_qh(sc->sc_ctl_start->qh.hlink); */ } *************** *** 1093,1099 **** splx(s); #ifdef UHCI_DEBUG printf("uhci_idone: ii is done!\n "); - uhci_dump_ii(ii); #else printf("uhci_idone: ii=%p is done!\n", ii); #endif --- 1092,1097 ---- *************** *** 2296,2302 **** if (ii->stdend == NULL) { printf("uhci_device_isoc_done: xfer=%p stdend==NULL\n", xfer); #ifdef UHCI_DEBUG - uhci_dump_ii(ii); #endif return; } --- 2294,2299 ---- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message