kernel: massive pci code rewrite

[plan9front.git] / sys / src / 9 / pc64 / fns.h

diff --git a/sys/src/9/pc64/fns.h b/sys/src/9/pc64/fns.h
index 2bbd3ffd8a514519eb6c7facd384b338399a28f6..39afc48640c615786a07d1f87852af9f4ce67dd9 100644 (file)
--- a/sys/src/9/pc64/fns.h
+++ b/sys/src/9/pc64/fns.h
@@ -124,32 +124,10 @@ void      outl(int, ulong);
 void   outsl(int, void*, int);
 uintptr        paddr(void*);
 void   patwc(void*, int);
-ulong  pcibarsize(Pcidev*, int);
-void   pcibussize(Pcidev*, uvlong*, ulong*);
-int    pcicfgr8(Pcidev*, int);
-int    pcicfgr16(Pcidev*, int);
-int    pcicfgr32(Pcidev*, int);
-void   pcicfgw8(Pcidev*, int, int);
-void   pcicfgw16(Pcidev*, int, int);
-void   pcicfgw32(Pcidev*, int, int);
-void   pciclrbme(Pcidev*);
-void   pciclrioe(Pcidev*);
-void   pciclrmwi(Pcidev*);
-int    pcigetpms(Pcidev*);
-void   pcihinv(Pcidev*);
-uchar  pciipin(Pcidev*, uchar);
-Pcidev* pcimatch(Pcidev*, int, int);
-Pcidev* pcimatchtbdf(int);
-int    pcicap(Pcidev*, int);
-int    pcihtcap(Pcidev*, int);
-void   pcireset(void);
-int    pciscan(int, Pcidev**);
-void   pcisetbme(Pcidev*);
-void   pcisetioe(Pcidev*);
-void   pcisetmwi(Pcidev*);
-int    pcisetpms(Pcidev*, int);
-void   pcienable(Pcidev*);
-void   pcidisable(Pcidev*);
+void   pcicfginit(void);
+int    (*pcicfgrw8)(int, int, int, int);
+int    (*pcicfgrw16)(int, int, int, int);
+int    (*pcicfgrw32)(int, int, int, int);
 void   pcmcisread(PCMslot*);
 int    pcmcistuple(int, int, int, void*, int);
 PCMmap*        pcmmap(int, ulong, int, int);
@@ -192,6 +170,7 @@ uvlong      tscticks(uvlong*);
 ulong  umballoc(ulong, ulong, ulong);
 void   umbfree(ulong, ulong);
 uvlong upaalloc(uvlong, ulong, ulong);
+uvlong upaallocwin(uvlong, ulong, ulong, ulong);
 void   upafree(uvlong, ulong);
 void   vectortable(void);
 void   vmxprocrestore(Proc *);