From 38ba08afc5a606895e74397ed94b542f36abc823 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Wed, 17 Feb 2010 15:04:22 -0800 Subject: [PATCH] refresh --- meta | 7 +++---- patches/refresh-temp | 22 ---------------------- patches/retry-ibat | 6 +++--- 3 files changed, 6 insertions(+), 29 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index 11950796..9b9c92b2 100644 --- a/meta +++ b/meta @@ -1,6 +1,6 @@ Version: 1 -Previous: 45cf8b8523f30077ad6222178e217dc668f1c8c2 -Head: 9db9e0f0e320e6c7d241fd7df1abecf66e5ceaea +Previous: 168c313dc6d08d2fa7340cc713d258ec9371acd5 +Head: d90a5fc37d68e916475551301b89c4fcc966b7a8 Applied: rm-build: 6ece22f911fcfc6fceeb779a3cb16702ab4ba386 dapl-cleanup2: 81e62e90410bb28ef7b1d23f0f6d7e50aede57a2 @@ -8,8 +8,7 @@ Applied: debug-wv: f98e9be2365ed35d30abdf31128c331322849c93 dapl-clean-lock: 33cc4404015c647a832803d6f029938d31c0ba67 dapl-queue: eae59391d42fc62a1790bad6abf914274720f81c - retry-ibat: 3eb48c5fa0f4dee99ea8fc4bad2c39396c022e9a - refresh-temp: 9db9e0f0e320e6c7d241fd7df1abecf66e5ceaea + retry-ibat: d90a5fc37d68e916475551301b89c4fcc966b7a8 Unapplied: dapl-debug: e13c7a46d1fab529c3008c37bac955a1d7738195 dapl-close: 81beb1f83c87c85a473f9cc153ec564e6d832f57 diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index b8e02a57..00000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,22 +0,0 @@ -Bottom: c8717016363ea4510580f4eaf9918392bc8975a7 -Top: 63c9fdc97cde2b7f9fdb6aff7bc8413f3b8db205 -Author: Sean Hefty -Date: 2010-02-17 15:04:18 -0800 - -Refresh of retry-ibat - ---- - -diff --git a/trunk/core/ibat/user/ibat.cpp b/trunk/core/ibat/user/ibat.cpp -index f3c4289..46d3301 100644 ---- a/trunk/core/ibat/user/ibat.cpp -+++ b/trunk/core/ibat/user/ibat.cpp -@@ -371,7 +371,7 @@ ResolvePath( - INT64 to; - HRESULT hr; - -- to = (Timeout == INFINITE) ? 1 << 63 : (INT64) ((UINT64) Timeout); -+ to = (Timeout == INFINITE) ? MAXINT64 : (INT64) ((UINT64) Timeout); - do { - hr = Resolve(pSrcAddr, pDestAddr, pPath); - if( hr != E_PENDING || to <= 0 ) diff --git a/patches/retry-ibat b/patches/retry-ibat index 84eed3d5..d97290ef 100644 --- a/patches/retry-ibat +++ b/patches/retry-ibat @@ -1,5 +1,5 @@ Bottom: b022ea9e3b49aa9b9088a3e8e3d23c0d2de66303 -Top: c8717016363ea4510580f4eaf9918392bc8975a7 +Top: 63c9fdc97cde2b7f9fdb6aff7bc8413f3b8db205 Author: Sean Hefty Date: 2010-02-17 10:12:23 -0800 @@ -24,7 +24,7 @@ Signed-off-by: Sean Hefty --- diff --git a/trunk/core/ibat/user/ibat.cpp b/trunk/core/ibat/user/ibat.cpp -index 69d9186..f3c4289 100644 +index 69d9186..46d3301 100644 --- a/trunk/core/ibat/user/ibat.cpp +++ b/trunk/core/ibat/user/ibat.cpp @@ -358,9 +358,34 @@ Resolve( @@ -45,7 +45,7 @@ index 69d9186..f3c4289 100644 + INT64 to; + HRESULT hr; + -+ to = (Timeout == INFINITE) ? 1 << 63 : (INT64) ((UINT64) Timeout); ++ to = (Timeout == INFINITE) ? MAXINT64 : (INT64) ((UINT64) Timeout); + do { + hr = Resolve(pSrcAddr, pDestAddr, pPath); + if( hr != E_PENDING || to <= 0 ) -- 2.46.0