diff options
author | marius <marius@FreeBSD.org> | 2007-11-30 23:02:42 +0000 |
---|---|---|
committer | marius <marius@FreeBSD.org> | 2007-11-30 23:02:42 +0000 |
commit | edd33ddaa93e181a8c159d402224dbd528e62b42 (patch) | |
tree | ada97ecabb3c4798cb957de1d967a7ab648b93e7 /sys/sparc64/pci/psychovar.h | |
parent | b629181a3df55f7f94227715d44156a27585142b (diff) | |
download | FreeBSD-src-edd33ddaa93e181a8c159d402224dbd528e62b42.zip FreeBSD-src-edd33ddaa93e181a8c159d402224dbd528e62b42.tar.gz |
- Add the PCI side of the HOST-PCI bridge itself to the bus. This
is required by the X.Org PCI domains code and additionally needs
a workaround for Hummingbird and Sabre bridges as these don't
allow their config headers to be read at any width, which is an
unusual behavior.
- In psycho(4) take advantage of DEFINE_CLASS_0 and use more
appropriate types for some softc members.
MFC after: 3 days
Diffstat (limited to 'sys/sparc64/pci/psychovar.h')
-rw-r--r-- | sys/sparc64/pci/psychovar.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/sparc64/pci/psychovar.h b/sys/sparc64/pci/psychovar.h index ddb4661..b99181d 100644 --- a/sys/sparc64/pci/psychovar.h +++ b/sys/sparc64/pci/psychovar.h @@ -43,17 +43,17 @@ struct psycho_softc { struct mtx *sc_mtx; /* Interrupt Group Number for this device */ - int sc_ign; + uint32_t sc_ign; bus_addr_t sc_pcictl; phandle_t sc_node; /* Firmware node */ - int sc_mode; + u_int sc_mode; #define PSYCHO_MODE_SABRE 1 #define PSYCHO_MODE_PSYCHO 2 /* Bus A or B of a psycho pair? */ - int sc_half; + u_int sc_half; struct iommu_state *sc_is; @@ -77,6 +77,8 @@ struct psycho_softc { struct rman sc_pci_mem_rman; struct rman sc_pci_io_rman; + uint8_t sc_pci_hpbcfg[16]; + SLIST_ENTRY(psycho_softc) sc_link; }; |