kernel: cleanup the software mouse cursor mess

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

diff --git a/sys/src/9/pc/fns.h b/sys/src/9/pc/fns.h
index 83367a0a18d94498fea3cad4f3ae6bfe0b77dc1d..fc82116fb1e05ce5243614305db686345f58b7a9 100644 (file)
--- a/sys/src/9/pc/fns.h
+++ b/sys/src/9/pc/fns.h
@@ -21,6 +21,7 @@ void  cpuidprint(void);
 void   (*cycles)(uvlong*);
 void   delay(int);
 void*  dmabva(int);
+#define        dmaflush(clean, addr, len)
 int    dmacount(int);
 int    dmadone(int);
 void   dmaend(int);
@@ -40,9 +41,7 @@ void  fpoff(void);
 void   (*fprestore)(FPsave*);
 void   (*fpsave)(FPsave*);
 void   fpsserestore(FPsave*);
-void   fpsserestore0(FPsave*);
 void   fpssesave(FPsave*);
-void   fpssesave0(FPsave*);
 void   fpx87restore(FPsave*);
 void   fpx87restore0(FPsave*);
 void   fpx87save(FPsave*);
@@ -106,7 +105,8 @@ void        mathinit(void);
 void   mb386(void);
 void   mb586(void);
 void   meminit(void);
-void   memorysummary(void);
+void   meminit0(void);
+void   memreserve(uintptr, uintptr);
 void   mfence(void);
 #define mmuflushtlb(pdb) putcr3(pdb)
 void   mmuinit(void);
@@ -115,7 +115,6 @@ char*       mtrr(uvlong, uvlong, char *);
 void   mtrrclock(void);
 int    mtrrprint(char *, long);
 void   mtrrsync(void);
-void   netconsole(void);
 uchar  nvramread(int);
 void   nvramwrite(int, uchar);
 void   outb(int, int);
@@ -150,6 +149,8 @@ void        pcisetbme(Pcidev*);
 void   pcisetioe(Pcidev*);
 void   pcisetmwi(Pcidev*);
 int    pcisetpms(Pcidev*, int);
+void   pcienable(Pcidev*);
+void   pcidisable(Pcidev*);
 void   pcmcisread(PCMslot*);
 int    pcmcistuple(int, int, int, void*, int);
 PCMmap*        pcmmap(int, ulong, int, int);
@@ -158,7 +159,8 @@ int (*_pcmspecial)(char *, ISAConf *);
 void   pcmspecialclose(int);
 void   (*_pcmspecialclose)(int);
 void   pcmunmap(int, PCMmap*);
-int    pdbmap(ulong*, ulong, ulong, int);
+void   pmap(ulong, ulong, int);
+void   punmap(ulong, int);
 void   procrestore(Proc*);
 void   procsave(Proc*);
 void   procsetup(Proc*);
@@ -174,10 +176,11 @@ void      putdr7(u32int);
 void*  rampage(void);
 int    rdmsr(int, vlong*);
 void   realmode(Ureg*);
+void*  rsdsearch(void);
 void   screeninit(void);
 void   (*screenputs)(char*, int);
 void   setconfenv(void);
-void*  sigsearch(char*);
+void*  sigsearch(char*, int);
 void   syncclock(void);
 void*  tmpmap(Page*);
 void   tmpunmap(void*);
@@ -187,17 +190,15 @@ void      trapinit(void);
 void   trapinit0(void);
 int    tas(void*);
 uvlong tscticks(uvlong*);
-ulong  umbmalloc(ulong, int, int);
-void   umbfree(ulong, int);
-ulong  umbrwmalloc(ulong, int, int);
-void   umbrwfree(ulong, int);
-ulong  upaalloc(int, int);
-void   upafree(ulong, int);
-void   upareserve(ulong, int);
+ulong  umballoc(ulong, ulong, ulong);
+void   umbfree(ulong, ulong);
+ulong  upaalloc(ulong, ulong, ulong);
+void   upafree(ulong, ulong);
 void   vectortable(void);
 void*  vmap(ulong, int);
 int    vmapsync(ulong);
 void   vmxprocrestore(Proc *);
+void   vmxshutdown(void);
 void   vunmap(void*, int);
 void   wbinvd(void);
 void   writeconf(void);