ether8169: support rtl8402 variant

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

diff --git a/sys/src/9/bcm/dat.h b/sys/src/9/bcm/dat.h
index 0c4f7351f234daae7a727d8ac05be9dbab9adbb4..dec4e58609e615b8583b8c317b1e87f1a5dd5361 100644 (file)
--- a/sys/src/9/bcm/dat.h
+++ b/sys/src/9/bcm/dat.h
@@ -99,7 +99,7 @@ enum
 struct Confmem
 {
        uintptr base;
-       usize   npage;
+       ulong   npage;
        uintptr limit;
        uintptr kbase;
        uintptr klimit;
@@ -111,7 +111,7 @@ struct Conf
        ulong   nproc;          /* processes */
        Confmem mem[1];         /* physical memory */
        ulong   npage;          /* total physical pages of memory */
-       usize   upages;         /* user page pool */
+       ulong   upages;         /* user page pool */
        ulong   copymode;       /* 0 is copy on write, 1 is copy on reference */
        ulong   ialloc;         /* max interrupt time allocation in bytes */
        ulong   pipeqsize;      /* size in bytes of pipe queues */
@@ -150,42 +150,17 @@ struct Mach
 {
        int     machno;                 /* physical id of processor */
        uintptr splpc;                  /* pc of last caller to splhi */
-
-       Proc*   proc;                   /* current process */
+       Proc*   proc;                   /* current process on this processor */
 
        MMMU;
-       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 */
+       /* end of offsets known to asm */
 
-       Proc*   readied;                /* for runproc */
-       ulong   schedticks;             /* next forced context switch */
+       PMach;
 
        int     cputype;
        ulong   delayloop;
-
-       /* stats */
-       int     tlbfault;
-       int     tlbpurge;
-       int     pfault;
-       int     cs;
-       int     syscall;
-       int     load;
-       int     intr;
-       uvlong  fastclock;              /* last sampled value */
-       uvlong  inidle;                 /* time spent in idlehands() */
-       ulong   spuriousintr;
-       int     lastintr;
-       int     ilockdepth;
-       Perf    perf;                   /* performance counters */
-
-
        int     cpumhz;
        uvlong  cpuhz;                  /* speed of cpu */
-       uvlong  cyclefreq;              /* Frequency of user readable cycle counter */
 
        /* vfp2 or vfp3 fpu */
        int     havefp;
@@ -206,7 +181,7 @@ struct Mach
        u32int  smon[5];                /* probably not needed */
        u32int  ssys[5];
 
-       int     stack[1];
+       uintptr stack[1];
 };
 
 /*