archacpi: make *acpi=1 the default

[plan9front.git] / sys / src / 9 / cycv / dat.h

diff --git a/sys/src/9/cycv/dat.h b/sys/src/9/cycv/dat.h
index 7195e7ad7fb5c4b581d1c758bb2dc74e47e7da87..1e08c3dab89b5363949348a022b368d0dccba3f0 100644 (file)
--- a/sys/src/9/cycv/dat.h
+++ b/sys/src/9/cycv/dat.h
@@ -13,6 +13,7 @@ typedef struct Proc   Proc;
 typedef struct PMMU    PMMU;
 typedef struct Ureg    Ureg;
 typedef struct ISAConf ISAConf;
+typedef struct DMAC    DMAC;
 typedef uvlong         Tval;
 
 #pragma incomplete Ureg
@@ -115,47 +116,23 @@ struct MMMU
 
 struct Mach
 {
-       /* known to assembly */
        int     machno;                 /* physical id of processor */
        uintptr splpc;                  /* pc of last caller to splhi */
        Proc*   proc;                   /* current process */
        ulong   excregs[3];
        ulong   cycleshi;
-       /* end of known to assembly */
+       /* end of known offsets to assembly */
 
-       int     flushmmu;               /* flush current proc mmu state */
-
-       ulong   ticks;                  /* of the clock since boot time */
-       Label   sched;                  /* scheduler wakeup */
-       Lock    alarmlock;              /* access to alarm list */
-       void*   alarm;                  /* alarms bound to this clock */
-       int     inclockintr;
-
-       Proc*   readied;                /* for runproc */
-       ulong   schedticks;             /* next forced context switch */
+       MMMU;
 
-       ulong   delayloop;
+       PMach;
 
-       /* stats */
-       int     tlbfault;
-       int     tlbpurge;
-       int     pfault;
-       int     cs;
-       int     syscall;
-       int     load;
-       int     intr;
        int     lastintr;
-       int     ilockdepth;
-       Perf    perf;                   /* performance counters */
-
 
        int     cpumhz;
        uvlong  cpuhz;                  /* speed of cpu */
-       uvlong  cyclefreq;              /* Frequency of user readable cycle counter */
-       
-       MMMU;
 
-       int     stack[1];
+       uintptr stack[1];
 };
 
 #define NISAOPT                8
@@ -200,3 +177,10 @@ struct DevConf
 };
 
 #define mpcore ((ulong*)MPCORE_BASE)
+#define resetmgr ((ulong*)RESETMGR_BASE)
+#define sysmgr ((ulong*)SYSMGR_BASE)
+#define l3 ((ulong*)L3_BASE)
+
+/*dmacopy*/
+#define SRC_INC (1<<0)
+#define DST_INC (1<<14)