diff --git a/vblade/aoe.c b/vblade/aoe.c index 168f923..e8dd800 100644 --- a/vblade/aoe.c +++ b/vblade/aoe.c @@ -18,6 +18,18 @@ enum { Alen= 6, }; + +int shelf; +int slot; +ulong aoetag; +uchar mac[6]; +int bfd; // block file descriptor +int sfd; // socket file descriptor +vlong size; // size of vblade +vlong offset; +char *progname; +char serial[Nserial+1]; + uchar masks[Nmasks*Alen]; int nmasks; uchar srr[Nsrr*Alen]; diff --git a/vblade/ata.c b/vblade/ata.c index a53310f..18ad6f8 100644 --- a/vblade/ata.c +++ b/vblade/ata.c @@ -6,6 +6,12 @@ #include "dat.h" #include "fns.h" +extern vlong size; +extern vlong offset; +extern int bfd; +extern int sfd; +extern char serial[]; + enum { // err bits UNC = 1<<6, diff --git a/vblade/bpf.c b/vblade/bpf.c index 2527348..0eab1d9 100644 --- a/vblade/bpf.c +++ b/vblade/bpf.c @@ -8,6 +8,9 @@ #include "dat.h" #include "fns.h" +extern int shelf; +extern int slot; + struct bpf_insn { ushort code; uchar jt; diff --git a/vblade/dat.h b/vblade/dat.h index ddd17f6..e9d037f 100644 --- a/vblade/dat.h +++ b/vblade/dat.h @@ -162,14 +162,3 @@ enum { Nserial= 20, }; - -int shelf, slot; -ulong aoetag; -uchar mac[6]; -int bfd; // block file descriptor -int sfd; // socket file descriptor -vlong size; // size of vblade -vlong offset; -char *progname; -char serial[Nserial+1]; - diff --git a/vblade/freebsd.c b/vblade/freebsd.c index 6b657c0..6e864a5 100644 --- a/vblade/freebsd.c +++ b/vblade/freebsd.c @@ -41,6 +41,9 @@ static uchar *pktbuf = NULL; static int pktbufsz = 0; +extern int shelf; +extern int slot; + int dial(char *eth, int bufcnt) { diff --git a/vblade/linux.c b/vblade/linux.c index a8fb3c7..deb5ec3 100644 --- a/vblade/linux.c +++ b/vblade/linux.c @@ -31,7 +31,8 @@ int getindx(int, char *); int getea(int, char *, uchar *); - +extern int shelf; +extern int slot; int dial(char *eth, int bufcnt) // get us a raw connection to an interface