Deleted Added
full compact
psycho.c (108830) psycho.c (109623)
1/*
2 * Copyright (c) 1999, 2000 Matthew R. Green
3 * All rights reserved.
4 * Copyright 2001 by Thomas Moestl <tmm@FreeBSD.org>. All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

--- 14 unchanged lines hidden (view full) ---

23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
24 * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
25 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
29 * from: NetBSD: psycho.c,v 1.39 2001/10/07 20:30:41 eeh Exp
30 *
1/*
2 * Copyright (c) 1999, 2000 Matthew R. Green
3 * All rights reserved.
4 * Copyright 2001 by Thomas Moestl <tmm@FreeBSD.org>. All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

--- 14 unchanged lines hidden (view full) ---

23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
24 * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
25 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
29 * from: NetBSD: psycho.c,v 1.39 2001/10/07 20:30:41 eeh Exp
30 *
31 * $FreeBSD: head/sys/sparc64/pci/psycho.c 108830 2003-01-06 21:59:54Z tmm $
31 * $FreeBSD: head/sys/sparc64/pci/psycho.c 109623 2003-01-21 08:56:16Z alfred $
32 */
33
34/*
35 * Support for `psycho' and `psycho+' UPA to PCI bridge and
36 * UltraSPARC IIi and IIe `sabre' PCI controllers.
37 */
38
39#include "opt_psycho.h"

--- 566 unchanged lines hidden (view full) ---

606#ifdef PSYCHO_STRAY
607 /*
608 * This can cause interrupt storms, and is therefore disabled
609 * by default.
610 * XXX: use intr_setup() to not confuse higher level code
611 */
612 if (INTVEC(mr) != 0x7e6 && INTVEC(mr) != 0x7e7 &&
613 INTVEC(mr) != 0) {
32 */
33
34/*
35 * Support for `psycho' and `psycho+' UPA to PCI bridge and
36 * UltraSPARC IIi and IIe `sabre' PCI controllers.
37 */
38
39#include "opt_psycho.h"

--- 566 unchanged lines hidden (view full) ---

606#ifdef PSYCHO_STRAY
607 /*
608 * This can cause interrupt storms, and is therefore disabled
609 * by default.
610 * XXX: use intr_setup() to not confuse higher level code
611 */
612 if (INTVEC(mr) != 0x7e6 && INTVEC(mr) != 0x7e7 &&
613 INTVEC(mr) != 0) {
614 sclr = malloc(sizeof(*sclr), M_DEVBUF, M_WAITOK);
614 sclr = malloc(sizeof(*sclr), M_DEVBUF, 0);
615 sclr->psc_sc = sc;
616 sclr->psc_clr = clr;
617 intr_setup(PIL_LOW, intr_fast, INTVEC(mr),
618 psycho_intr_stray, sclr);
619 }
620#endif
621 PSYCHO_WRITE8(sc, map, INTMAP_ENABLE(mr, PCPU_GET(mid)));
622 }

--- 789 unchanged lines hidden ---
615 sclr->psc_sc = sc;
616 sclr->psc_clr = clr;
617 intr_setup(PIL_LOW, intr_fast, INTVEC(mr),
618 psycho_intr_stray, sclr);
619 }
620#endif
621 PSYCHO_WRITE8(sc, map, INTMAP_ENABLE(mr, PCPU_GET(mid)));
622 }

--- 789 unchanged lines hidden ---