# HG changeset patch
# User Francisco J Ballesteros <nemo.mbox@gmail.com>
# Date 1328651945 0
# Node ID d3dade392d5627700f90ea9c727b718aa8fe06da
# Parent  bd8703e1e0a0fffaaef5711a5a8dd4c209d24dd5
ix: update

R=nixiedev, john
CC=nix-dev
http://codereview.appspot.com/5556045

Committer: John Floren <john@jfloren.net>

diff -r bd8703e1e0a0 -r d3dade392d56 sys/src/cmd/ix/fmt.c
--- a/sys/src/cmd/ix/fmt.c	Tue Feb 07 20:16:33 2012 +0000
+++ b/sys/src/cmd/ix/fmt.c	Tue Feb 07 21:59:05 2012 +0000
@@ -179,14 +179,6 @@
 		seprint(buf, e, "Rmove");
 		break;
 
-	case IXTcopy:
-		seprint(buf, e, "Tcopy nmsg %d offset %lld count %ud dstfid %ud dstoffset %lld",
-			f->nmsg, f->offset, f->count, f->dstfid, f->dstoffset);
-		break;
-	case IXRcopy:
-		seprint(buf, e, "Rcopy count %ud", f->count);
-		break;
-
 	case IXTflush:
 		seprint(buf, e, "Tflush");
 		break;
diff -r bd8703e1e0a0 -r d3dade392d56 sys/src/cmd/ix/fs.c
--- a/sys/src/cmd/ix/fs.c	Tue Feb 07 20:16:33 2012 +0000
+++ b/sys/src/cmd/ix/fs.c	Tue Feb 07 21:59:05 2012 +0000
@@ -837,7 +837,6 @@
 [IXTwattr]	fswattr,
 [IXTcond]	fscond,
 [IXTmove]	fsmove,
-[IXTcopy]	fscopy,
 [IXTflush]	fsflush,
 };
 
diff -r bd8703e1e0a0 -r d3dade392d56 sys/src/cmd/ix/ixreqs.c
--- a/sys/src/cmd/ix/ixreqs.c	Tue Feb 07 20:16:33 2012 +0000
+++ b/sys/src/cmd/ix/ixreqs.c	Tue Feb 07 21:59:05 2012 +0000
@@ -279,25 +279,6 @@
 	return sendreq(ch, &t, m, last);
 }
 
-int
-ixtcopy(Ch *ch, int nmsg, long count, uvlong offset, long msz,
-		int dstfid, uvlong dstoffset, int last)
-{
-	IXcall t;
-	Msg *m;
-
-	m = newmsg(spool);
-	t.type = IXTcopy;
-	t.offset = offset;
-	t.count = count;
-	if(msz != 0 && t.count > msz)
-		t.count = msz;
-	t.nmsg = nmsg;
-	t.dstfid = dstfid;
-	t.dstoffset = dstoffset;
-	return sendreq(ch, &t, m, last);
-}
-
 static Msg*
 getreply(Ch *ch, int type, IXcall *r)
 {
@@ -553,19 +534,6 @@
 	return ixrmsg(ch, IXRmove);
 }
 
-long
-ixrcopy(Ch *ch)
-{
-	Msg *m;
-	IXcall r;
-
-	m = getreply(ch, IXRcopy, &r);
-	if(m == nil)
-		return -1;
-	freemsg(m);
-	return r.count;
-}
-
 /*
  * NB: Tflush, Rflush are done by aborting the channel
  * in this implementation.
diff -r bd8703e1e0a0 -r d3dade392d56 sys/src/cmd/ix/pack.c
--- a/sys/src/cmd/ix/pack.c	Tue Feb 07 20:16:33 2012 +0000
+++ b/sys/src/cmd/ix/pack.c	Tue Feb 07 21:59:05 2012 +0000
@@ -197,12 +197,6 @@
 	case IXRmove:
 		break;
 
-	case IXTcopy:
-		n += BIT32SZ;
-		break;
-	case IXRcopy:
-		break;
-
 	case IXTflush:
 	case IXRflush:
 		break;
@@ -384,23 +378,6 @@
 	case IXRmove:
 		break;
 
-	case IXTcopy:
-		PBIT16(p, f->nmsg);
-		p += BIT16SZ;
-		PBIT64(p, f->offset);
-		p += BIT64SZ;
-		PBIT32(p, f->count);
-		p += BIT32SZ;
-		PBIT32(p, f->dstfid);
-		p += BIT32SZ;
-		PBIT64(p, f->dstoffset);
-		p += BIT64SZ;
-		break;
-	case IXRcopy:
-		PBIT32(p, f->count);
-		p += BIT32SZ;
-		break;
-
 	case IXTflush:
 	case IXRflush:
 		break;
@@ -664,27 +641,6 @@
 	case IXRmove:
 		break;
 
-	case IXTcopy:
-		if(p+BIT16SZ+BIT64SZ+BIT32SZ + BIT32SZ+BIT64SZ > ep)
-			return 0;
-		f->nmsg = GBIT16(p);
-		p += BIT16SZ;
-		f->offset = GBIT64(p);
-		p += BIT64SZ;
-		f->count = GBIT32(p);
-		p += BIT32SZ;
-		f->dstfid = GBIT32(p);
-		p += BIT32SZ;
-		f->dstoffset = GBIT64(p);
-		p += BIT64SZ;
-		break;
-	case IXRcopy:
-		if(p+BIT32SZ > ep)
-			return 0;
-		f->count = GBIT32(p);
-		p += BIT32SZ;
-		break;
-
 	case IXTflush:
 	case IXRflush:
 		break;