refresh

diff --git a/meta b/meta
index 2631cc0af651e000a9c9400787629e76d51df9c6..a2cbbdbefd0954d29a9487d9ee0b34c30779daec 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 1519fc89613d1d374893000b542b56e1e9a5f614
-Head: 8d70ad25a68ae8528221035fed6e25a249f720d7
+Previous: e587ec5e9ae969edebc3902bb9b739b8b9101ef5
+Head: 6eb4cf68eb983ee1c1a2ccbc5e7ce5b0f76b568e
 Applied:
   rs-iomap: a3630da59297e20652fc7be18edc2a49d77a81bc
-  riostream: ae55bd70e9d1d4768d8a73b12a1be8f71ae83d96
-  refresh-temp: 8d70ad25a68ae8528221035fed6e25a249f720d7
+  riostream: 6eb4cf68eb983ee1c1a2ccbc5e7ce5b0f76b568e
 Unapplied:
   iom-dbg: 12f4abc963b1e0a99f2cf858789902f3b6c00f31
   resv-rs-len: 7b6ff5c4894f54b221d877adcd709795dffb2fe9

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 6436243..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,30 +0,0 @@
-Bottom: b7908a5c682466249184ca18ad389fa1b574c3b9
-Top:    e59a8c8a92560ce29975049974660fa4c31bbe33
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-10-24 18:03:15 -0700
-
-Refresh of riostream
-
----
-
-diff --git a/examples/riostream.c b/examples/riostream.c
-index 7333a3d..dfb03e5 100644
---- a/examples/riostream.c
-+++ b/examples/riostream.c
-@@ -291,7 +291,7 @@ static int send_xfer(int size)
-               if (ret > 0) {
-                       offset += ret;
-               } else if (errno != EWOULDBLOCK && errno != EAGAIN) {
--                      perror("rsend");
-+                      perror("riowrite");
-                       return ret;
-               }
-       }
-@@ -371,6 +371,7 @@ static int run_test(void)
-       *poll_byte = -1;
-       offset = riomap(rs, buf, transfer_size, PROT_WRITE, 0, 0);
-       if (offset ==  -1) {
-+              perror("riomap");
-               ret = -1;
-               goto out;
-       }

diff --git a/patches/riostream b/patches/riostream
index a47023935895ce7828f850b737b2bee176d38739..31d23e86f0e211250b5d542cb47486cdf1b87646 100644 (file)
--- a/patches/riostream
+++ b/patches/riostream
@@ -1,5 +1,5 @@
 Bottom: 7f355c2c4b9a69f80c172a756e9357d22ad478bf
-Top:    b7908a5c682466249184ca18ad389fa1b574c3b9
+Top:    e59a8c8a92560ce29975049974660fa4c31bbe33
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-10-24 10:23:52 -0700
 
@@ -35,10 +35,10 @@ index 4a8b9bc..d72016d 100644
  
 diff --git a/examples/riostream.c b/examples/riostream.c
 new file mode 100644
-index 0000000..7333a3d
+index 0000000..dfb03e5
 --- /dev/null
 +++ b/examples/riostream.c
-@@ -0,0 +1,734 @@
+@@ -0,0 +1,735 @@
 +/*
 + * Copyright (c) 2011-2012 Intel Corporation.  All rights reserved.
 + *
@@ -332,7 +332,7 @@ index 0000000..7333a3d
 +              if (ret > 0) {
 +                      offset += ret;
 +              } else if (errno != EWOULDBLOCK && errno != EAGAIN) {
-+                      perror("rsend");
++                      perror("riowrite");
 +                      return ret;
 +              }
 +      }
@@ -412,6 +412,7 @@ index 0000000..7333a3d
 +      *poll_byte = -1;
 +      offset = riomap(rs, buf, transfer_size, PROT_WRITE, 0, 0);
 +      if (offset ==  -1) {
++              perror("riomap");
 +              ret = -1;
 +              goto out;
 +      }