Date: Thu, 26 Dec 2002 13:39:53 -0800 (PST) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 22764 for review Message-ID: <200212262139.gBQLdrwe009929@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200212262139.gBQLdrwe009929>