make sure uintmem is defined for all fses so we can use it in port. this should move to a new file ../$arch/archdat.h. Reference: /n/atom/patch/applied2013/fsdatumem Date: Sun Aug 25 23:44:25 CES 2013 Signed-off-by: quanstro@quanstro.net --- /sys/src/fs/aska/dat.h Sun Aug 25 23:43:22 2013 +++ /sys/src/fs/aska/dat.h Sun Aug 25 23:43:23 2013 @@ -9,6 +9,8 @@ MAXBANK = 4, /* discontiguous memory banks. */ }; +typedef ulong uintmem; + #include "../port/portdat.h" typedef struct{ --- /sys/src/fs/dahlonega/dat.h Sun Aug 25 23:43:23 2013 +++ /sys/src/fs/dahlonega/dat.h Sun Aug 25 23:43:24 2013 @@ -9,6 +9,8 @@ MAXBANK = 4, /* discontiguous memory banks. */ }; +typedef ulong uintmem; + #include "../port/portdat.h" typedef struct{ --- /sys/src/fs/fs/dat.h Sun Aug 25 23:43:24 2013 +++ /sys/src/fs/fs/dat.h Sun Aug 25 23:43:25 2013 @@ -4,15 +4,17 @@ * for one thing, RBUFSIZE determines FEPERBUF, which determines * the number of elements in a free-list-block array. */ -#define RBUFSIZE (4*1024) /* raw buffer size */ +enum{ + RBUFSIZE = 4*1024, /* raw buffer size */ + MAXBANK = 8, +}; -#include "../port/portdat.h" +typedef ulong uintmem; -extern Mach mach0; +#include "../port/portdat.h" typedef struct Segdesc Segdesc; -struct Segdesc -{ +struct Segdesc{ ulong d0; ulong d1; }; @@ -22,14 +24,13 @@ ulong limit; } Mbank; -#define MAXBANK 8 - typedef struct Mconf { Lock; Mbank bank[MAXBANK]; int nbank; ulong topofmem; } Mconf; -extern Mconf mconf; -extern char nvrfile[128]; +extern Mach mach0; +extern Mconf mconf; +extern char nvrfile[128]; --- /sys/src/fs/fs64/dat.h Sun Aug 25 23:43:25 2013 +++ /sys/src/fs/fs64/dat.h Sun Aug 25 23:43:26 2013 @@ -4,32 +4,32 @@ * for one thing, RBUFSIZE determines FEPERBUF, which determines * the number of elements in a free-list-block array. */ -#define RBUFSIZE (8*1024) /* raw buffer size */ +enum{ + RBUFSIZE = 8*1024, /* raw buffer size */ + MAXBANK = 4, /* discontiguous memory banks. */ +}; -#include "../port/portdat.h" +typedef ulong uintmem; -extern Mach mach0; +#include "../port/portdat.h" -typedef struct Segdesc Segdesc; -struct Segdesc -{ +typedef struct{ ulong d0; ulong d1; -}; +}Segdesc; typedef struct Mbank { ulong base; ulong limit; } Mbank; -#define MAXBANK 8 - typedef struct Mconf { Lock; Mbank bank[MAXBANK]; int nbank; ulong topofmem; } Mconf; -extern Mconf mconf; -extern char nvrfile[128]; +extern Mach mach0; +extern Mconf mconf; +extern char nvrfile[128]; --- /sys/src/fs/odum/dat.h Sun Aug 25 23:43:27 2013 +++ /sys/src/fs/odum/dat.h Sun Aug 25 23:43:27 2013 @@ -9,6 +9,8 @@ MAXBANK = 4, /* discontiguous memory banks. */ }; +typedef ulong uintmem; + #include "../port/portdat.h" typedef struct{ --- /sys/src/fs/wrens/dat.h Sun Aug 25 23:43:28 2013 +++ /sys/src/fs/wrens/dat.h Sun Aug 25 23:43:28 2013 @@ -9,6 +9,8 @@ MAXBANK = 4, /* discontiguous memory banks. */ }; +typedef ulong uintmem; + #include "../port/portdat.h" typedef struct{