From owner-p4-projects Thu Dec 26 13:39:56 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C9F0437B405; Thu, 26 Dec 2002 13:39:54 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7827837B401 for ; Thu, 26 Dec 2002 13:39:54 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2C5FD43ED8 for ; Thu, 26 Dec 2002 13:39:54 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBQLdrfh009932 for ; Thu, 26 Dec 2002 13:39:54 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBQLdrwe009929 for perforce@freebsd.org; Thu, 26 Dec 2002 13:39:53 -0800 (PST) Date: Thu, 26 Dec 2002 13:39:53 -0800 (PST) Message-Id: <200212262139.gBQLdrwe009929@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22764 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22764 Change 22764 by marcel@marcel_nfs on 2002/12/26 13:39:16 Fix a brainfart. The flags used for INTR_FAST is not the same flags used in the device table. Revert to using INTR_FAST and remove PUC_FLAGS_FASTINTR. It appears the flags were previously unused. This fixes the IRQ allocation problem. Affected files ... .. //depot/projects/ia64/sys/dev/puc/puc.c#10 edit .. //depot/projects/ia64/sys/dev/puc/pucvar.h#7 edit Differences ... ==== //depot/projects/ia64/sys/dev/puc/puc.c#10 (text+ko) ==== @@ -163,7 +163,7 @@ irq_setup = BUS_SETUP_INTR(device_get_parent(dev), dev, res, INTR_TYPE_TTY | INTR_FAST, puc_intr, sc, &sc->intr_cookie); if (irq_setup == 0) - sc->fastintr = PUC_FLAGS_FASTINTR; + sc->fastintr = INTR_FAST; else irq_setup = BUS_SETUP_INTR(device_get_parent(dev), dev, res, INTR_TYPE_TTY, puc_intr, sc, &sc->intr_cookie); @@ -471,7 +471,7 @@ struct puc_softc *sc; sc = (struct puc_softc *)device_get_softc(dev); - if ((flags & PUC_FLAGS_FASTINTR) != sc->fastintr) + if ((flags & INTR_FAST) != sc->fastintr) return (ENXIO); for (i = 0; PUC_PORT_VALID(sc->sc_desc, i); i++) { if (sc->sc_ports[i].dev == child) { ==== //depot/projects/ia64/sys/dev/puc/pucvar.h#7 (text+ko) ==== @@ -91,8 +91,7 @@ #define PUC_PORT_TYPE_COM 1 #define PUC_PORT_TYPE_LPT 2 -#define PUC_FLAGS_FASTINTR 0x0001 /* Use fast interrupts. */ -#define PUC_FLAGS_MEMORY 0x0002 /* Use memory mapped I/O. */ +#define PUC_FLAGS_MEMORY 0x0001 /* Use memory mapped I/O. */ #define PUC_PORT_VALID(desc, port) \ ((port) < PUC_MAX_PORTS && (desc)->ports[(port)].type != PUC_PORT_TYPE_NONE) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message