vmx: emulate ps/2 intellimouse scrolling

[plan9front.git] / sys / src / cmd / vmx / fns.h

diff --git a/sys/src/cmd/vmx/fns.h b/sys/src/cmd/vmx/fns.h
index 464613030af46930f7afa6149d8dbb37ddd3c2fb..7ec146ee013677434aca3763cc17f7f00d45c612 100644 (file)
--- a/sys/src/cmd/vmx/fns.h
+++ b/sys/src/cmd/vmx/fns.h
@@ -1,3 +1,5 @@
+#define MIN(a,b) ((a)<(b)?(a):(b))
+#define MAX(a,b) ((a)>(b)?(a):(b))
 void *emalloc(ulong);
 void loadkernel(char *);
 uvlong rget(char *);
@@ -10,7 +12,8 @@ void pitadvance(void);
 void rtcadvance(void);
 void settimer(vlong targ);
 void vmerror(char *, ...);
-#define vmdebug vmerror
+#pragma varargck argpos vmerror 1
+#define vmdebug if(!debug) {} else vmerror
 int ctl(char *, ...);
 void registermmio(uvlong, uvlong, uvlong (*)(int, uvlong, uvlong));
 void irqline(int, int);
@@ -23,6 +26,7 @@ PCIDev *mkpcidev(u32int, u32int, u32int, int);
 PCIBar *mkpcibar(PCIDev *, u8int, u32int, u32int, void *, void *);
 PCICap *mkpcicap(PCIDev *, u8int, u32int (*)(PCICap *, u8int), void(*)(PCICap *, u8int, u32int, u32int));
 u32int allocbdf(void);
+Region *regptr(u64int);
 void *gptr(u64int, u64int);
 void *gend(void *);
 uintptr gpa(void *);
@@ -50,3 +54,5 @@ uintptr vmemread(void *, uintptr, uintptr);
 uintptr vmemwrite(void *, uintptr, uintptr);
 int x86access(int, uintptr, int, uvlong*, int, int, TLB *);
 u32int io(int, u16int, u32int, int);
+int x86step(void);
+uvlong nanosec(void);