From 19ac67608442755505184f6129eecaa78efaad31 Mon Sep 17 00:00:00 2001
From: Weikuan Yu <yuw@lanl.gov>
Date: Tue, 31 Aug 2004 18:37:06 +0000
Subject: [PATCH] -- Just got basic Thread-based progression working -- Will
 focus on more extensive testing

This commit was SVN r2415.
---
 src/mca/ptl/elan/src/ptl_elan.c      | 4 +---
 src/mca/ptl/elan/src/ptl_elan_priv.c | 8 +++-----
 src/mca/ptl/elan/src/ptl_elan_priv.h | 3 ++-
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/mca/ptl/elan/src/ptl_elan.c b/src/mca/ptl/elan/src/ptl_elan.c
index a727386b62..a0da10cdb0 100644
--- a/src/mca/ptl/elan/src/ptl_elan.c
+++ b/src/mca/ptl/elan/src/ptl_elan.c
@@ -380,8 +380,7 @@ mca_ptl_elan_get (struct mca_ptl_base_module_t *ptl,
     return rc;
 }
 
-/*
- *  A posted receive has been matched 
+/* A posted receive has been matched 
  *  + Copy the data into user buffer
  *  + Return an ack if need to 
  */
@@ -476,4 +475,3 @@ mca_ptl_elan_matched (mca_ptl_base_module_t * ptl,
 	mca_ptl_elan_recv_frag_done (header, frag, request);
     }
 }
-
diff --git a/src/mca/ptl/elan/src/ptl_elan_priv.c b/src/mca/ptl/elan/src/ptl_elan_priv.c
index 1d0f24f0c7..7b561ac56f 100644
--- a/src/mca/ptl/elan/src/ptl_elan_priv.c
+++ b/src/mca/ptl/elan/src/ptl_elan_priv.c
@@ -712,7 +712,6 @@ int
 mca_ptl_elan_wait_queue(mca_ptl_elan_module_t * ptl,
        	ompi_ptl_elan_recv_queue_t *rxq, long usecs)
 {
-    int     ret = 1;
     RAIL   *rail; 
     ELAN4_CTX  *ctx; 
     ADDR_SDRAM  ready;
@@ -731,8 +730,8 @@ mca_ptl_elan_wait_queue(mca_ptl_elan_module_t * ptl,
 	    rail, ctx, ready, ready);
 
     /* Poll for usec (at least one), then go to sleep. */
-    if (ret = elan4_pollevent_word(ctx, readyWord, usecs)) {
-	return ret;
+    if (elan4_pollevent_word(ctx, readyWord, usecs)) {
+	return 0xdeadbeef;
     }
 
     LOG_PRINT(PTL_ELAN_DEBUG_THREAD,
@@ -764,10 +763,9 @@ mca_ptl_elan_wait_queue(mca_ptl_elan_module_t * ptl,
 	OMPI_UNLOCK(&mca_ptl_elan_component.elan_lock);
     }
     END_FUNC(PTL_ELAN_DEBUG_THREAD);
-    return ret;
+    return 0xdeadbeef;
 }
 
-
 #if OMPI_PTL_ELAN_ENABLE_GET && defined (HAVE_GET_INTERFACE)
 int
 mca_ptl_elan_start_get (mca_ptl_elan_send_frag_t * frag,
diff --git a/src/mca/ptl/elan/src/ptl_elan_priv.h b/src/mca/ptl/elan/src/ptl_elan_priv.h
index f82f61f936..6522ccf215 100644
--- a/src/mca/ptl/elan/src/ptl_elan_priv.h
+++ b/src/mca/ptl/elan/src/ptl_elan_priv.h
@@ -53,7 +53,8 @@
 #define  PTL_ELAN_DEBUG_CHAIN   (0x800)
 
 #define  PTL_ELAN_DEBUG_FLAG \
-    (PTL_ELAN_DEBUG_FIN | PTL_ELAN_DEBUG_INIT | PTL_ELAN_DEBUG_THREAD)
+    (PTL_ELAN_DEBUG_PUT | PTL_ELAN_DEBUG_GET | PTL_ELAN_DEBUG_MAC | \
+     PTL_ELAN_DEBUG_FIN | PTL_ELAN_DEBUG_INIT | PTL_ELAN_DEBUG_THREAD)
 
 #define START_FUNC(flag)                                       \
 do {                                                           \