Deleted Added
full compact
psychovar.h (128625) psychovar.h (129051)
1/*
2 * Copyright (c) 1999, 2000 Matthew R. Green
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
23 * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
24 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26 * SUCH DAMAGE.
27 *
28 * from: NetBSD: psychovar.h,v 1.6 2001/07/20 00:07:13 eeh Exp
29 *
1/*
2 * Copyright (c) 1999, 2000 Matthew R. Green
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
23 * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
24 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26 * SUCH DAMAGE.
27 *
28 * from: NetBSD: psychovar.h,v 1.6 2001/07/20 00:07:13 eeh Exp
29 *
30 * $FreeBSD: head/sys/sparc64/pci/psychovar.h 128625 2004-04-25 00:30:28Z tmm $
30 * $FreeBSD: head/sys/sparc64/pci/psychovar.h 129051 2004-05-08 13:53:47Z marius $
31 */
32
33#ifndef _SPARC64_PCI_PSYCHOVAR_H_
34#define _SPARC64_PCI_PSYCHOVAR_H_
35
36/*
37 * Per-PCI bus on mainbus softc structure; one for sabre, or two
38 * per pair of psychos.

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

62
63 struct iommu_state *sc_is;
64 u_int32_t sc_dvmabase;
65
66 struct resource *sc_mem_res;
67 struct resource *sc_irq_res[6];
68 void *sc_ihand[6];
69
31 */
32
33#ifndef _SPARC64_PCI_PSYCHOVAR_H_
34#define _SPARC64_PCI_PSYCHOVAR_H_
35
36/*
37 * Per-PCI bus on mainbus softc structure; one for sabre, or two
38 * per pair of psychos.

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

62
63 struct iommu_state *sc_is;
64 u_int32_t sc_dvmabase;
65
66 struct resource *sc_mem_res;
67 struct resource *sc_irq_res[6];
68 void *sc_ihand[6];
69
70#ifdef OFW_NEWPCI
71 struct ofw_bus_iinfo sc_iinfo;
70 struct ofw_bus_iinfo sc_iinfo;
72#endif
73
74 struct upa_ranges *sc_range;
75 int sc_nrange;
76
77 /* Tags for PCI access. */
78 bus_space_tag_t sc_cfgt;
79 bus_space_tag_t sc_memt;
80 bus_space_tag_t sc_iot;

--- 14 unchanged lines hidden ---
71
72 struct upa_ranges *sc_range;
73 int sc_nrange;
74
75 /* Tags for PCI access. */
76 bus_space_tag_t sc_cfgt;
77 bus_space_tag_t sc_memt;
78 bus_space_tag_t sc_iot;

--- 14 unchanged lines hidden ---