mtx: fix pci access routines (see changeset 8012:78891f472fbf)

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

diff --git a/sys/src/9/mtx/dat.h b/sys/src/9/mtx/dat.h
index 4e3c7414d3f5a631fbb0052fc4ae560ce28ac82a..8b74eb439cf2e082a818bb230ccaf08bb8237354 100644 (file)
--- a/sys/src/9/mtx/dat.h
+++ b/sys/src/9/mtx/dat.h
@@ -1,11 +1,11 @@
 typedef struct Conf    Conf;
 typedef struct Confmem Confmem;
 typedef struct FPsave  FPsave;
+typedef struct PFPU    PFPU;
 typedef struct ISAConf ISAConf;
 typedef struct Label   Label;
 typedef struct Lock    Lock;
 typedef struct Mach    Mach;
-typedef struct Notsave Notsave;
 typedef struct Page    Page;
 typedef struct PCArch  PCArch;
 typedef struct Pcidev  Pcidev;
@@ -45,16 +45,6 @@ struct Label
        ulong   pc;
 };
 
-/*
- * Proc.fpstate
- */
-enum
-{
-       FPinit,
-       FPactive,
-       FPinactive,
-};
-
 /*
  * This structure must agree with fpsave and fprestore asm routines
  */
@@ -70,6 +60,19 @@ struct       FPsave
        };
 };
 
+struct PFPU
+{
+       int     fpstate;
+       FPsave  fpsave[1];
+};
+
+enum
+{
+       FPinit,
+       FPactive,
+       FPinactive,
+};
+
 struct Confmem
 {
        ulong   base;
@@ -103,14 +106,6 @@ struct PMMU
        int     mmupid;
 };
 
-/*
- *  things saved in the Proc structure during a notify
- */
-struct Notsave
-{
-       ulong   UNUSED;
-};
-
 #include "../port/portdat.h"
 
 /*
@@ -180,9 +175,8 @@ struct Mach
 
 struct
 {
-       Lock;
-       short   machs;
-       short   exiting;
+       char    machs[MAXMACH];
+       int     exiting;
 }active;
 
 /*