massive looking patch, but in reality it's pretty simple. move the inclusion of mem.h to all.h. this means that many files needed to remove now redudant inclusions of mem.h. including mem.h from all.h allows other includes from all.h to depend on mem.h, which will be necessary. Reference: /n/atom/patch/applied2013/fsmeminall Date: Mon Aug 26 03:10:06 CES 2013 Signed-off-by: quanstro@quanstro.net --- /sys/src/fs/aska/etherctlr.c Mon Aug 26 03:03:58 2013 +++ /sys/src/fs/aska/etherctlr.c Mon Aug 26 03:03:58 2013 @@ -1,6 +1,5 @@ #include "all.h" #include "io.h" -#include "mem.h" #include "../ip/ip.h" #include "etherif.h" --- /sys/src/fs/buda/buda.c Mon Aug 26 03:03:59 2013 +++ /sys/src/fs/buda/buda.c Mon Aug 26 03:03:59 2013 @@ -1,5 +1,4 @@ #include "all.h" -#include "mem.h" #include "io.h" #include "ureg.h" --- /sys/src/fs/buda/dat.h Mon Aug 26 03:04:00 2013 +++ /sys/src/fs/buda/dat.h Mon Aug 26 03:04:01 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/buda/devtab.c Thu Jan 1 00:00:00 1970 +++ /sys/src/fs/buda/devtab.c Mon Aug 26 03:04:01 2013 @@ -0,0 +1,30 @@ +#include "all.h" + +#define NO 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + +void +noream(Device*, int) +{ +} + +Devtab devtab[] = { +[Devnone] 'n', 0, NO + +[Devmcat] '(', ')', mcatread, mcatwrite, mcatsize, 0, 0, mwormream, 0, mcatinit, 0, 0, +[Devmlev] '[', ']', mlevread, mlevwrite, mlevsize, 0, 0, mwormream, 0, mlevinit, 0, 0, +[Devmirr] '{', '}', mirrread, mirrwrite, mirrsize, 0, 0, mwormream, 0, mirrinit, 0, 0, + +[Devcw] 'c', 0, cwread, cwwrite, cwsize, cwsaddr, cwraddr, cwream, cwrecover, cwinit, 0, 0, +[Devro] 'o', 0, roread, rowrite, cwsize, cwsaddr, cwraddr, 0, 0, roinit, 0, 0, +[Devia] 'a', 0, iaread, iawrite, iasize, 0, 0, noream, 0, iainit, 0, 0, +[Devaoe] 'e', 0, aoeread, aoewrite, aoesize, 0, 0, noream, 0, aoeinit, 0, 0, +[Devfworm] 'f', 0, fwormread, fwormwrite, fwormsize, 0, 0, fwormream, 0, fworminit, 0, 0, +[Devide] 'h', 0, NO //ideread, idewrite, idesize, 0, 0, noream, 0, ideinit, idesecsize, 0, +[Devjuke] 'j', 0, NO //jukeread, jukewrite, jukesize, 0, 0, noream, 0, jukeinit, 0, 0, +[Devlworm] 'l', 0, NO //wormread, wormwrite, wormsize, 0,0, noream, 0, jukeinit, 0, 0, +[Devmv] 'm', 0, NO //mvread, mvwrite, mvsize, 0, 0, noream, 0, mvinit, 0, 0, +[Devpart] 'p', 0, partread, partwrite, partsize, 0, 0, noream, 0, partinit, 0, 0, +[Devworm] 'r', 0, NO //wormread, wormwrite, wormsize, 0,0, noream, 0, jukeinit, 0, 0, +[Devwren] 'w', 0, NO //wrenread, wrenwrite, wrensize, 0, 0, noream, 0, wreninit, 0, 0, +[Devswab] 'x', 0, NO //swabread, swabwrite, swabsize, swabsuper, swabraddr, swabream, swabrecover, swabinit, 0, 0, +}; --- /sys/src/fs/buda/etherctlr.c Mon Aug 26 03:04:02 2013 +++ /sys/src/fs/buda/etherctlr.c Mon Aug 26 03:04:02 2013 @@ -1,6 +1,5 @@ #include "all.h" #include "io.h" -#include "mem.h" #include "../ip/ip.h" #include "etherif.h" --- /sys/src/fs/buda/mkfile Mon Aug 26 03:04:03 2013 +++ /sys/src/fs/buda/mkfile Mon Aug 26 03:04:03 2013 @@ -39,6 +39,8 @@ devcec.$O\ devcons.$O\ devcopy.$O\ + devio.$O\ + devtab.$O\ fcmd.$O\ iobuf.$O\ lrand.$O\ @@ -106,13 +108,14 @@ ../port/portdat.h\ ../port/portfns.h\ dat.h\ - fns.h\ + ../pc/fns.h\ ../pc/io.h\ - mem.h\ + ../pc/mem.h\ /$objtype/include/u.h\ /$objtype/include/ureg.h\ LIB=\ + -lfis\ -lauthsrv\ -lc\ -lsec\ Binary files /sys/src/fs/dahlonega/confdir/9fat/fs.nvr and conf/9fat/fs.nvr differ --- /sys/src/fs/dahlonega/conf Thu Jan 1 00:00:00 1970 +++ /sys/src/fs/dahlonega/conf Wed Sep 19 23:48:01 2012 @@ -0,0 +1,6 @@ +console=0 b19200 +bootfile=$bootdev!9fat!9wrensfs.gz +nvr=pa0"9fat"!fs.nvr +ether0=type=m10g +ether1=type=m10g +ether2=type=i82563 --- /sys/src/fs/dahlonega/conf Thu Jan 1 00:00:00 1970 +++ /sys/src/fs/dahlonega/conf Wed Sep 19 23:48:01 2012 @@ -0,0 +1,18 @@ +service wrens +config pa0"fsconfig" +filsys main cpe220.0"fscache"{e220.1e300.1} +filsys dump o +filsys other e220.2 +ipsntp 128.192.1.9 +ip0 10.220.1.17 +ipgw0 10.220.10.1 +ipmask0 255.255.0.0 +ipflag0 cec aoe +ip1 10.220.2.2 +ipgw1 10.220.2.1 +ipmask1 255.255.255.0 +ipflag1 cec aoe aoejumbo +ip2 10.220.3.3 +ipgw2 10.220.3.1 +ipmask2 255.255.255.0 +ipflag2 cec aoe Binary files /sys/src/fs/dahlonega/conf/9fatdir/fs.nvr and 9fat/fs.nvr differ --- /sys/src/fs/dahlonega/conf/9fat Thu Jan 1 00:00:00 1970 +++ /sys/src/fs/dahlonega/conf/9fat Wed Sep 19 23:48:01 2012 @@ -0,0 +1,6 @@ +console=0 b19200 +bootfile=$bootdev!9fat!9wrensfs.gz +nvr=pa0"9fat"!fs.nvr +ether0=type=m10g +ether1=type=m10g +ether2=type=i82563 --- /sys/src/fs/dahlonega/etherctlr.c Mon Aug 26 03:04:14 2013 +++ /sys/src/fs/dahlonega/etherctlr.c Mon Aug 26 03:04:14 2013 @@ -1,6 +1,5 @@ #include "all.h" #include "io.h" -#include "mem.h" #include "../ip/ip.h" #include "etherif.h" --- /sys/src/fs/dev/aoe.c Mon Aug 26 03:04:16 2013 +++ /sys/src/fs/dev/aoe.c Mon Aug 26 03:04:18 2013 @@ -6,7 +6,6 @@ #include "../ip/ip.h" #include "io.h" #include "../pc/etherif.h" -#include "mem.h" #include "aoe.h" #define Ms2tk(t) ((t*HZ)/1000) --- /sys/src/fs/dev/apc.c Mon Aug 26 03:04:19 2013 +++ /sys/src/fs/dev/apc.c Mon Aug 26 03:04:20 2013 @@ -6,7 +6,6 @@ * override port with "port=0" in plan9.ini entry. */ #include "all.h" -#include "mem.h" #include "io.h" //#define DEBUG if(cons.flags&apc.flag)print --- /sys/src/fs/dev/cw.c Mon Aug 26 03:04:22 2013 +++ /sys/src/fs/dev/cw.c Mon Aug 26 03:04:24 2013 @@ -1,5 +1,4 @@ #include "all.h" -#include "mem.h" // for Ticks. #define dprint(...) #define dpprint(...) //print(__VA_ARGS__) --- /sys/src/fs/dev/part.c Mon Aug 26 03:04:25 2013 +++ /sys/src/fs/dev/part.c Mon Aug 26 03:04:25 2013 @@ -1,5 +1,4 @@ #include "all.h" -#include "mem.h" #include "io.h" #include "../pc/dosfs.h" --- /sys/src/fs/fairyland/etherctlr.c Mon Aug 26 03:04:26 2013 +++ /sys/src/fs/fairyland/etherctlr.c Mon Aug 26 03:04:26 2013 @@ -1,6 +1,5 @@ #include "all.h" #include "io.h" -#include "mem.h" #include "../ip/ip.h" #include "etherif.h" --- /sys/src/fs/fs/etherctlr.c Mon Aug 26 03:04:27 2013 +++ /sys/src/fs/fs/etherctlr.c Mon Aug 26 03:04:28 2013 @@ -1,6 +1,5 @@ #include "all.h" #include "io.h" -#include "mem.h" #include "../ip/ip.h" #include "etherif.h" --- /sys/src/fs/fs/fs.c Mon Aug 26 03:04:28 2013 +++ /sys/src/fs/fs/fs.c Mon Aug 26 03:04:29 2013 @@ -1,5 +1,4 @@ #include "all.h" -#include "mem.h" #include "io.h" #include "ureg.h" --- /sys/src/fs/fs64/etherctlr.c Mon Aug 26 03:04:30 2013 +++ /sys/src/fs/fs64/etherctlr.c Mon Aug 26 03:04:30 2013 @@ -1,6 +1,5 @@ #include "all.h" #include "io.h" -#include "mem.h" #include "../ip/ip.h" #include "etherif.h" --- /sys/src/fs/fs64/fs64.c Mon Aug 26 03:04:31 2013 +++ /sys/src/fs/fs64/fs64.c Mon Aug 26 03:04:31 2013 @@ -1,5 +1,4 @@ #include "all.h" -#include "mem.h" #include "io.h" #include "ureg.h" --- /sys/src/fs/ila/dat.h Mon Aug 26 03:04:32 2013 +++ /sys/src/fs/ila/dat.h Mon Aug 26 03:04:33 2013 @@ -4,11 +4,14 @@ * 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{ ulong d0; @@ -20,14 +23,13 @@ ulong limit; } Mbank; -#define MAXBANK 4 - 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/ila/etherctlr.c Mon Aug 26 03:04:33 2013 +++ /sys/src/fs/ila/etherctlr.c Mon Aug 26 03:04:34 2013 @@ -1,6 +1,5 @@ #include "all.h" #include "io.h" -#include "mem.h" #include "../ip/ip.h" #include "etherif.h" --- /sys/src/fs/ila/ila.c Mon Aug 26 03:04:35 2013 +++ /sys/src/fs/ila/ila.c Mon Aug 26 03:04:35 2013 @@ -1,5 +1,4 @@ #include "all.h" -#include "mem.h" #include "io.h" #include "ureg.h" --- /sys/src/fs/ip/icmp.c Mon Aug 26 03:04:36 2013 +++ /sys/src/fs/ip/icmp.c Mon Aug 26 03:04:36 2013 @@ -1,5 +1,4 @@ #include "all.h" -#include "mem.h" #include "../ip/ip.h" --- /sys/src/fs/ip/il.c Mon Aug 26 03:04:38 2013 +++ /sys/src/fs/ip/il.c Mon Aug 26 03:04:38 2013 @@ -1,5 +1,4 @@ #include "all.h" -#include "mem.h" #include "../ip/ip.h" Binary files /sys/src/fs/odum/confdir/9fat/fs.nvr and conf.1/9fat/fs.nvr differ --- /sys/src/fs/odum/conf Thu Jan 1 00:00:00 1970 +++ /sys/src/fs/odum/conf Mon Mar 28 01:03:50 2011 @@ -0,0 +1,5 @@ +console=0 b19200 +bootfile=$bootdev!9fat!9odumfs.gz +nvr=p{a0a1}"9fat"!fs.nvr +ether0=type=i82563 +ether1=type=i82563 --- /sys/src/fs/odum/conf Thu Jan 1 00:00:00 1970 +++ /sys/src/fs/odum/conf Mon Mar 28 01:03:50 2011 @@ -0,0 +1,13 @@ +service odum +config pa0"fsconfig" +filsys main cp{a0a1}"fscache"{a0a1}"fsworm" +filsys dump o +ipsntp 128.192.1.9 +ip0 10.9.8.2 +ipgw0 10.9.8.1 +ipmask0 255.255.0.0 +ipflag0 cec aoe +ip1 10.10.0.2 +ipgw1 10.10.0.1 +ipmask1 255.255.0.0 +ipflag1 cec aoe aoejumbo Binary files /sys/src/fs/odum/conf/9fatdir/fs.nvr and 9fat.1/fs.nvr differ --- /sys/src/fs/odum/conf/9fat Thu Jan 1 00:00:00 1970 +++ /sys/src/fs/odum/conf/9fat Mon Mar 28 01:03:50 2011 @@ -0,0 +1,5 @@ +console=0 b19200 +bootfile=$bootdev!9fat!9odumfs.gz +nvr=p{a0a1}"9fat"!fs.nvr +ether0=type=i82563 +ether1=type=i82563 --- /sys/src/fs/odum/etherctlr.c Mon Aug 26 03:04:49 2013 +++ /sys/src/fs/odum/etherctlr.c Mon Aug 26 03:04:49 2013 @@ -1,6 +1,5 @@ #include "all.h" #include "io.h" -#include "mem.h" #include "../ip/ip.h" #include "etherif.h" --- /sys/src/fs/pc/8250.c Mon Aug 26 03:04:50 2013 +++ /sys/src/fs/pc/8250.c Mon Aug 26 03:04:51 2013 @@ -1,5 +1,4 @@ #include "all.h" -#include "mem.h" #include "ureg.h" #include "io.h" --- /sys/src/fs/pc/8253.c Mon Aug 26 03:04:52 2013 +++ /sys/src/fs/pc/8253.c Mon Aug 26 03:04:53 2013 @@ -1,5 +1,4 @@ #include "all.h" -#include "mem.h" #include "ureg.h" #include "io.h" --- /sys/src/fs/pc/ata.c Mon Aug 26 03:04:55 2013 +++ /sys/src/fs/pc/ata.c Mon Aug 26 03:04:57 2013 @@ -10,7 +10,6 @@ */ #include "all.h" #include "io.h" -#include "mem.h" #define dprint(...) // print(__VA_ARGS__) #define idprint(...) // print(__VA_ARGS__) --- /sys/src/fs/pc/cga.c Mon Aug 26 03:04:57 2013 +++ /sys/src/fs/pc/cga.c Mon Aug 26 03:04:58 2013 @@ -1,5 +1,4 @@ #include "all.h" -#include "mem.h" enum { Width = 160, --- /sys/src/fs/pc/dosfs.c Mon Aug 26 03:04:59 2013 +++ /sys/src/fs/pc/dosfs.c Mon Aug 26 03:05:00 2013 @@ -1,6 +1,5 @@ #include "all.h" #include "io.h" -#include "mem.h" #include "dosfs.h" --- /sys/src/fs/pc/ether2114x.c Mon Aug 26 03:05:02 2013 +++ /sys/src/fs/pc/ether2114x.c Mon Aug 26 03:05:03 2013 @@ -10,7 +10,6 @@ */ #include "all.h" #include "io.h" -#include "mem.h" #include "../ip/ip.h" #include "etherif.h" --- /sys/src/fs/pc/ether8139.c Mon Aug 26 03:05:05 2013 +++ /sys/src/fs/pc/ether8139.c Mon Aug 26 03:05:06 2013 @@ -5,7 +5,6 @@ */ #include "all.h" #include "io.h" -#include "mem.h" #include "../ip/ip.h" #include "etherif.h" --- /sys/src/fs/pc/ether8169.c Mon Aug 26 03:05:07 2013 +++ /sys/src/fs/pc/ether8169.c Mon Aug 26 03:05:08 2013 @@ -9,7 +9,6 @@ */ #include "all.h" #include "io.h" -#include "mem.h" #include "../ip/ip.h" #include "etherif.h" #include "ethermii.h" --- /sys/src/fs/pc/ether82557.c Mon Aug 26 03:05:10 2013 +++ /sys/src/fs/pc/ether82557.c Mon Aug 26 03:05:12 2013 @@ -11,7 +11,6 @@ #include "all.h" #include "io.h" -#include "mem.h" #include "../ip/ip.h" #include "etherif.h" --- /sys/src/fs/pc/ether82563.c Mon Aug 26 03:05:13 2013 +++ /sys/src/fs/pc/ether82563.c Mon Aug 26 03:05:15 2013 @@ -7,7 +7,6 @@ #include "io.h" #include "../ip/ip.h" #include "etherif.h" -#include "mem.h" /* * note: the 82575, 82576 and 82580 are operated using registers aliased --- /sys/src/fs/pc/ether82598.c Mon Aug 26 03:05:16 2013 +++ /sys/src/fs/pc/ether82598.c Mon Aug 26 03:05:17 2013 @@ -6,7 +6,6 @@ #include "io.h" #include "../ip/ip.h" #include "etherif.h" -#include "mem.h" enum{ /* general */ --- /sys/src/fs/pc/ether83815.c Mon Aug 26 03:05:19 2013 +++ /sys/src/fs/pc/ether83815.c Mon Aug 26 03:05:20 2013 @@ -18,7 +18,6 @@ #include "all.h" #include "io.h" -#include "mem.h" #include "../ip/ip.h" #include "etherif.h" --- /sys/src/fs/pc/etherdp83820.c Mon Aug 26 03:05:22 2013 +++ /sys/src/fs/pc/etherdp83820.c Mon Aug 26 03:05:24 2013 @@ -6,7 +6,6 @@ */ #include "all.h" #include "io.h" -#include "mem.h" #include "../ip/ip.h" #include "etherif.h" --- /sys/src/fs/pc/etherelnk3.c Mon Aug 26 03:05:26 2013 +++ /sys/src/fs/pc/etherelnk3.c Mon Aug 26 03:05:28 2013 @@ -43,7 +43,6 @@ */ #include "all.h" #include "io.h" -#include "mem.h" #include "../ip/ip.h" #include "etherif.h" --- /sys/src/fs/pc/etherga620.c Mon Aug 26 03:05:30 2013 +++ /sys/src/fs/pc/etherga620.c Mon Aug 26 03:05:31 2013 @@ -12,7 +12,6 @@ */ #include "all.h" #include "io.h" -#include "mem.h" #include "../ip/ip.h" #define malign(n) ialloc((n), 32) --- /sys/src/fs/pc/etherif.c Mon Aug 26 03:05:32 2013 +++ /sys/src/fs/pc/etherif.c Mon Aug 26 03:05:33 2013 @@ -1,6 +1,5 @@ #include "all.h" #include "io.h" -#include "mem.h" #include "../ip/ip.h" #include "../dev/aoe.h" --- /sys/src/fs/pc/etherigbe.c Mon Aug 26 03:05:35 2013 +++ /sys/src/fs/pc/etherigbe.c Mon Aug 26 03:05:37 2013 @@ -19,7 +19,6 @@ #include "all.h" #include "io.h" -#include "mem.h" #include "../ip/ip.h" #include "etherif.h" --- /sys/src/fs/pc/etherm10g.c Mon Aug 26 03:05:38 2013 +++ /sys/src/fs/pc/etherm10g.c Mon Aug 26 03:05:40 2013 @@ -7,7 +7,6 @@ #include "io.h" #include "../ip/ip.h" #include "etherif.h" -#include "mem.h" #undef MB #define K * 1024 --- /sys/src/fs/pc/ethermii.c Mon Aug 26 03:05:40 2013 +++ /sys/src/fs/pc/ethermii.c Mon Aug 26 03:05:41 2013 @@ -1,6 +1,5 @@ #include "all.h" #include "io.h" -#include "mem.h" #include "../ip/ip.h" #include "etherif.h" --- /sys/src/fs/pc/floppy.c Mon Aug 26 03:05:42 2013 +++ /sys/src/fs/pc/floppy.c Mon Aug 26 03:05:43 2013 @@ -3,7 +3,6 @@ */ #include "all.h" #include "io.h" -#include "mem.h" #define dprint(...) if(0)print(__VA_ARGS__) --- /sys/src/fs/pc/iasata.c Mon Aug 26 03:05:45 2013 +++ /sys/src/fs/pc/iasata.c Mon Aug 26 03:05:46 2013 @@ -5,7 +5,6 @@ #include "all.h" #include "io.h" -#include "mem.h" #include #include "ahci.h" --- /sys/src/fs/pc/kbd.c Mon Aug 26 03:05:47 2013 +++ /sys/src/fs/pc/kbd.c Mon Aug 26 03:05:48 2013 @@ -1,5 +1,4 @@ #include "all.h" -#include "mem.h" #include "io.h" #include "ureg.h" --- /sys/src/fs/pc/l.s Mon Aug 26 03:05:49 2013 +++ /sys/src/fs/pc/l.s Mon Aug 26 03:05:50 2013 @@ -246,7 +246,6 @@ * output a string of longs to a port */ TEXT outsl(SB),$0 - MOVL p+0(FP),DX MOVL a+4(FP),SI MOVL c+8(FP),CX --- /sys/src/fs/pc/lock.c Mon Aug 26 03:05:51 2013 +++ /sys/src/fs/pc/lock.c Mon Aug 26 03:05:52 2013 @@ -1,9 +1,4 @@ - #include "u.h" -#include "lib.h" -#include "dat.h" -#include "fns.h" -#include "io.h" -#include "mem.h" + #include "all.h" void _xinc(long*); long _xdec(long*); --- /sys/src/fs/pc/malloc.c Mon Aug 26 03:05:54 2013 +++ /sys/src/fs/pc/malloc.c Mon Aug 26 03:05:55 2013 @@ -1,5 +1,4 @@ #include "all.h" -#include "mem.h" #include "io.h" uint niob; --- /sys/src/fs/pc/mmu.c Mon Aug 26 03:05:57 2013 +++ /sys/src/fs/pc/mmu.c Mon Aug 26 03:05:58 2013 @@ -1,5 +1,4 @@ #include "all.h" -#include "mem.h" #include "io.h" #include "ureg.h" --- /sys/src/fs/pc/mv50xx.c Mon Aug 26 03:05:59 2013 +++ /sys/src/fs/pc/mv50xx.c Mon Aug 26 03:06:01 2013 @@ -4,7 +4,6 @@ #include "all.h" #include "io.h" -#include "mem.h" enum { NCtlr = 2, --- /sys/src/fs/pc/nfloppy.c Mon Aug 26 03:06:02 2013 +++ /sys/src/fs/pc/nfloppy.c Mon Aug 26 03:06:03 2013 @@ -3,7 +3,6 @@ */ #include "all.h" #include "io.h" -#include "mem.h" #define dprint(...) if(0)print(__VA_ARGS__) --- /sys/src/fs/pc/nvr.c Mon Aug 26 03:06:04 2013 +++ /sys/src/fs/pc/nvr.c Mon Aug 26 03:06:05 2013 @@ -1,5 +1,4 @@ #include "all.h" -#include "mem.h" #include "io.h" #include "ureg.h" --- /sys/src/fs/pc/pc.c Mon Aug 26 03:06:06 2013 +++ /sys/src/fs/pc/pc.c Mon Aug 26 03:06:06 2013 @@ -1,5 +1,4 @@ #include "all.h" -#include "mem.h" #include "io.h" #include "ureg.h" --- /sys/src/fs/pc/pci.c Mon Aug 26 03:06:08 2013 +++ /sys/src/fs/pc/pci.c Mon Aug 26 03:06:09 2013 @@ -5,7 +5,6 @@ */ #include "all.h" #include "io.h" -#include "mem.h" #define dprint(...) print(__VA_ARGS__) --- /sys/src/fs/pc/scsi.c Mon Aug 26 03:06:11 2013 +++ /sys/src/fs/pc/scsi.c Mon Aug 26 03:06:12 2013 @@ -1,6 +1,5 @@ #include "all.h" #include "io.h" -#include "mem.h" extern Scsiio buslogic(int, ISAConf*); extern Scsiio ncr53c8xxreset(int, ISAConf*); --- /sys/src/fs/pc/scsibuslogic.c Mon Aug 26 03:06:14 2013 +++ /sys/src/fs/pc/scsibuslogic.c Mon Aug 26 03:06:15 2013 @@ -11,7 +11,6 @@ */ #include "all.h" #include "io.h" -#include "mem.h" enum { /* registers */ Rcontrol = 0x00, /* WO: control register */ --- /sys/src/fs/pc/sdata.c Mon Aug 26 03:06:19 2013 +++ /sys/src/fs/pc/sdata.c Mon Aug 26 03:06:22 2013 @@ -17,7 +17,6 @@ */ #include "all.h" #include "io.h" -#include "mem.h" #include "sd.h" --- /sys/src/fs/pc/sdscsi.c Mon Aug 26 03:06:23 2013 +++ /sys/src/fs/pc/sdscsi.c Mon Aug 26 03:06:23 2013 @@ -1,6 +1,5 @@ #include "all.h" #include "io.h" -#include "mem.h" #include "sd.h" #include "../ip/ip.h" /* for Ether */ --- /sys/src/fs/pc/toy.c Mon Aug 26 03:06:24 2013 +++ /sys/src/fs/pc/toy.c Mon Aug 26 03:06:25 2013 @@ -1,6 +1,5 @@ #include "all.h" #include "io.h" -#include "mem.h" enum { Paddr= 0x70, /* address port */ --- /sys/src/fs/pc/trap.c Mon Aug 26 03:06:26 2013 +++ /sys/src/fs/pc/trap.c Mon Aug 26 03:06:27 2013 @@ -1,5 +1,4 @@ #include "all.h" -#include "mem.h" #include "ureg.h" #include "io.h" --- /sys/src/fs/port/all.h Mon Aug 26 03:06:28 2013 +++ /sys/src/fs/port/all.h Mon Aug 26 03:06:28 2013 @@ -1,5 +1,6 @@ #include "u.h" #include "lib.h" +#include "mem.h" #include "dat.h" #include "fns.h" --- /sys/src/fs/port/chk.c Mon Aug 26 03:06:30 2013 +++ /sys/src/fs/port/chk.c Mon Aug 26 03:06:31 2013 @@ -1,5 +1,4 @@ #include "all.h" -#include "mem.h" /* for KZERO for PADDR */ /* copied from ../pc/etherif.h; should probably be in all.h */ #define HOWMANY(x, y) (((x)+((y)-1))/(y)) --- /sys/src/fs/port/clock.c Mon Aug 26 03:06:32 2013 +++ /sys/src/fs/port/clock.c Mon Aug 26 03:06:32 2013 @@ -1,5 +1,4 @@ #include "all.h" -#include "mem.h" #include "io.h" #include "ureg.h" --- /sys/src/fs/port/con.c Mon Aug 26 03:06:34 2013 +++ /sys/src/fs/port/con.c Mon Aug 26 03:06:35 2013 @@ -1,5 +1,4 @@ #include "all.h" -#include "mem.h" static char conline[2*Maxword]; static Command command[100]; --- /sys/src/fs/port/devcec.c Mon Aug 26 03:06:36 2013 +++ /sys/src/fs/port/devcec.c Mon Aug 26 03:06:37 2013 @@ -6,7 +6,6 @@ #include "../ip/ip.h" #include "io.h" #include "etherif.h" -#include "mem.h" enum { Ncbuf = 4096, --- /sys/src/fs/port/devcopy.c Mon Aug 26 03:06:38 2013 +++ /sys/src/fs/port/devcopy.c Mon Aug 26 03:06:38 2013 @@ -1,5 +1,4 @@ #include "all.h" -#include "mem.h" typedef struct{ Rendez r; --- /sys/src/fs/port/devsd.c Mon Aug 26 03:06:40 2013 +++ /sys/src/fs/port/devsd.c Mon Aug 26 03:06:40 2013 @@ -3,7 +3,6 @@ */ #include "all.h" #include "io.h" -#include "mem.h" #include "sd.h" #undef error --- /sys/src/fs/port/main.c Mon Aug 26 03:06:42 2013 +++ /sys/src/fs/port/main.c Mon Aug 26 03:06:42 2013 @@ -1,5 +1,4 @@ #include "all.h" -#include "mem.h" #include "io.h" #include "ureg.h" --- /sys/src/fs/port/proc.c Mon Aug 26 03:06:43 2013 +++ /sys/src/fs/port/proc.c Mon Aug 26 03:06:44 2013 @@ -1,8 +1,4 @@ -#include "u.h" -#include "lib.h" -#include "dat.h" -#include "fns.h" -#include "mem.h" +#include "all.h" struct { --- /sys/src/fs/port/rawcopy.c Mon Aug 26 03:06:45 2013 +++ /sys/src/fs/port/rawcopy.c Mon Aug 26 03:06:46 2013 @@ -1,5 +1,4 @@ #include "all.h" -#include "mem.h" typedef struct{ Rendez r; --- /sys/src/fs/port/sub.c Mon Aug 26 03:06:47 2013 +++ /sys/src/fs/port/sub.c Mon Aug 26 03:06:48 2013 @@ -1,6 +1,5 @@ #include "all.h" #include "io.h" -#include "mem.h" #include "../ip/ip.h" Filsys* --- /sys/src/fs/port/time.c Mon Aug 26 03:06:49 2013 +++ /sys/src/fs/port/time.c Mon Aug 26 03:06:50 2013 @@ -1,5 +1,4 @@ #include "all.h" -#include "mem.h" typedef struct Toy Toy; struct Toy { Binary files /sys/src/fs/wrens/confdir/9fat/fs.nvr and conf.2/9fat/fs.nvr differ --- /sys/src/fs/wrens/conf Thu Jan 1 00:00:00 1970 +++ /sys/src/fs/wrens/conf Mon Jan 10 22:19:30 2011 @@ -0,0 +1,6 @@ +console=0 b19200 +bootfile=$bootdev!9fat!9wrensfs.gz +nvr=pa0"9fat"!fs.nvr +ether0=type=m10g +ether1=type=m10g +ether2=type=i82563 --- /sys/src/fs/wrens/conf Thu Jan 1 00:00:00 1970 +++ /sys/src/fs/wrens/conf Mon Jan 24 02:03:00 2011 @@ -0,0 +1,18 @@ +service wrens +config pa0"fsconfig" +filsys main cpe220.0"fscache"{e220.1e300.1} +filsys dump o +filsys other e220.2 +ipsntp 128.192.1.9 +ip0 10.220.1.17 +ipgw0 10.220.10.1 +ipmask0 255.255.0.0 +ipflag0 cec aoe +ip1 10.220.2.2 +ipgw1 10.220.2.1 +ipmask1 255.255.255.0 +ipflag1 cec aoe aoejumbo +ip2 10.220.3.3 +ipgw2 10.220.3.1 +ipmask2 255.255.255.0 +ipflag2 cec aoe Binary files /sys/src/fs/wrens/conf/9fatdir/fs.nvr and 9fat.2/fs.nvr differ --- /sys/src/fs/wrens/conf/9fat Thu Jan 1 00:00:00 1970 +++ /sys/src/fs/wrens/conf/9fat Mon Jan 10 22:19:30 2011 @@ -0,0 +1,6 @@ +console=0 b19200 +bootfile=$bootdev!9fat!9wrensfs.gz +nvr=pa0"9fat"!fs.nvr +ether0=type=m10g +ether1=type=m10g +ether2=type=i82563 --- /sys/src/fs/wrens/etherctlr.c Mon Aug 26 03:07:01 2013 +++ /sys/src/fs/wrens/etherctlr.c Mon Aug 26 03:07:02 2013 @@ -1,6 +1,5 @@ #include "all.h" #include "io.h" -#include "mem.h" #include "../ip/ip.h" #include "etherif.h"