aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/pci/pcivar.h
diff options
context:
space:
mode:
authorDoug Rabson <dfr@FreeBSD.org>1998-07-22 08:39:08 +0000
committerDoug Rabson <dfr@FreeBSD.org>1998-07-22 08:39:08 +0000
commitdf9efa9a8b9a3272e6667e6f6cd41d9b5f2a1203 (patch)
tree15290e4528970d4247fb49c4839b8375847ca4fe /sys/dev/pci/pcivar.h
parent0bf030847d4b8aeff770f24b6968518434d2dbb2 (diff)
downloadsrc-df9efa9a8b9a3272e6667e6f6cd41d9b5f2a1203.tar.gz
src-df9efa9a8b9a3272e6667e6f6cd41d9b5f2a1203.zip
On the alpha, ports may be allocated above 64k.
Change the port address argument to pci_map_port to pci_port_t* which is defined as u_int on the alpha, u_short on i386. This is a stopgap with a hopefully limited lifetime. Discussed with: Stefan Esser <se@freebsd.org>
Notes
Notes: svn path=/head/; revision=37841
Diffstat (limited to 'sys/dev/pci/pcivar.h')
-rw-r--r--sys/dev/pci/pcivar.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/sys/dev/pci/pcivar.h b/sys/dev/pci/pcivar.h
index b164e4e5eb53..f624678e4f32 100644
--- a/sys/dev/pci/pcivar.h
+++ b/sys/dev/pci/pcivar.h
@@ -26,7 +26,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: pcivar.h,v 1.17 1997/08/21 07:05:54 fsmp Exp $
+ * $Id: pcivar.h,v 1.18 1997/08/21 08:31:41 fsmp Exp $
*
*/
@@ -192,10 +192,16 @@ struct pci_lkm {
struct pci_lkm *next;
};
+#ifdef __i386__
+typedef u_short pci_port_t;
+#else
+typedef u_int pci_port_t;
+#endif
+
u_long pci_conf_read (pcici_t tag, u_long reg);
void pci_conf_write (pcici_t tag, u_long reg, u_long data);
void pci_configure (void);
-int pci_map_port (pcici_t tag, u_long reg, u_short* pa);
+int pci_map_port (pcici_t tag, u_long reg, pci_port_t* pa);
int pci_map_mem (pcici_t tag, u_long reg, vm_offset_t* va, vm_offset_t* pa);
int pci_map_int (pcici_t tag, pci_inthand_t *func, void *arg, unsigned *maskptr);
int pci_unmap_int (pcici_t tag);