[openib-general] [PATCH] kdapltest: remove bool, use dat's boolean_t

Tom Duffy tduffy at sun.com
Wed May 11 10:29:38 PDT 2005


On Wed, 2005-05-11 at 10:49 -0400, James Lentini wrote:
> > Surprisingly, some DAT code just uses "bool" (below).
> 
> Good point. This is test code, but we should still change it to be 
> consistent.

Signed-off-by: Tom Duffy <tduffy at sun.com>

Index: linux-kernel/test/dapltest/test/dapl_performance_util.c
===================================================================
--- linux-kernel/test/dapltest/test/dapl_performance_util.c	(revision 2306)
+++ linux-kernel/test/dapltest/test/dapl_performance_util.c	(working copy)
@@ -30,7 +30,7 @@
 #define DT_Mdep_GetContextSwitchNum() 0 /* FIXME */
 
 /****************************************************************************/
-bool
+boolean_t
 DT_Performance_Test_Create (
     Per_Test_Data_t 		*pt_ptr,
     DAT_IA_HANDLE 		*ia_handle,
@@ -52,7 +52,7 @@ DT_Performance_Test_Create (
 			       sizeof (Performance_Test_t));
     if ( NULL == test_ptr )
     {
-	return false;
+	return FALSE;
     }
 
     *perf_test = test_ptr;
@@ -72,7 +72,7 @@ DT_Performance_Test_Create (
     {
 	DT_Tdep_PT_Printf (phead, "Test[" F64x "]: dat_ia_query error: %s\n",
 		       test_ptr->base_port, DT_RetToString (ret));
-	return false;
+	return FALSE;
     }
 
     pipeline_len = DT_min (
@@ -101,7 +101,7 @@ DT_Performance_Test_Create (
 	DT_Tdep_PT_Printf (phead, "Test[" F64x "]: dat_pz_create error: %s\n",
 		       test_ptr->base_port, DT_RetToString (ret));
 	test_ptr->pz_handle = DAT_HANDLE_NULL;
-	return false;
+	return FALSE;
     }
 
     /* create 4 EVDs - recv, request+RMR, conn-request, connect */
@@ -115,7 +115,7 @@ DT_Performance_Test_Create (
 	DT_Tdep_PT_Printf (phead, "Test[" F64x "]: dat_evd_create (recv) error: %s\n",
 		       test_ptr->base_port, DT_RetToString (ret));
 	test_ptr->recv_evd_hdl = DAT_HANDLE_NULL;
-	return false;
+	return FALSE;
     }
 
     ret = DT_Tdep_evd_create (test_ptr->ia_handle,
@@ -128,7 +128,7 @@ DT_Performance_Test_Create (
 	DT_Tdep_PT_Printf (phead, "Test[" F64x "]: 0x%x dat_evd_create (request) error: %s\n",
 		       test_ptr->reqt_evd_length,test_ptr->base_port, DT_RetToString (ret));
 	test_ptr->reqt_evd_hdl = DAT_HANDLE_NULL;
-	return false;
+	return FALSE;
     }
 
 
@@ -145,7 +145,7 @@ DT_Performance_Test_Create (
 	    DT_Tdep_PT_Printf (phead, "Test[" F64x "]: dat_evd_create (cr) error: %s\n",
 			   test_ptr->base_port, DT_RetToString (ret));
 	    test_ptr->creq_evd_hdl = DAT_HANDLE_NULL;
-	    return false;
+	    return FALSE;
 	}
     }
 
@@ -159,7 +159,7 @@ DT_Performance_Test_Create (
 	DT_Tdep_PT_Printf (phead, "Test[" F64x "]: dat_evd_create (conn) error: %s\n",
 		       test_ptr->base_port, DT_RetToString (ret));
 	test_ptr->conn_evd_hdl = DAT_HANDLE_NULL;
-	return false;
+	return FALSE;
     }
 
     /*
@@ -188,7 +188,7 @@ DT_Performance_Test_Create (
 	DT_Tdep_PT_Printf (phead, "Test[" F64x "]: dat_ep_create error: %s\n",
 		       test_ptr->base_port, DT_RetToString (ret));
 	test_ptr->ep_context.ep_handle = DAT_HANDLE_NULL;
-	return false;
+	return FALSE;
     }
 
     /*
@@ -204,13 +204,13 @@ DT_Performance_Test_Create (
 					    DT_PERF_SYNC_BUFF_SIZE,
 					    2, /* 2 RMIs */
 					    255, /* FIXME should query for this */
-					    false,
-					    false);
+					    FALSE,
+					    FALSE);
     if ( !test_ptr->ep_context.bp )
     {
 	DT_Tdep_PT_Printf (phead, "Test[" F64x "]: no memory for remote memory buffers\n",
 		       test_ptr->base_port);
-	return false;
+	return FALSE;
     }
 
     DT_Tdep_PT_Debug (3, (phead, 
@@ -232,7 +232,7 @@ DT_Performance_Test_Create (
 			      DT_PERF_SYNC_BUFF_SIZE) )
     {
 	/* error message printed by DT_post_recv_buffer */
-	return false;
+	return FALSE;
     }
 
     /*
@@ -257,7 +257,7 @@ DT_Performance_Test_Create (
     /* update pipeline_len */
     pt_ptr->Params.Client_Stats_P.pipeline_len = pipeline_len;
 
-    return true;
+    return TRUE;
 }
 
 
@@ -414,7 +414,7 @@ DT_Performance_Test_Destroy (
 
 
 /****************************************************************************/
-bool
+boolean_t
 DT_performance_post_rdma_op (
     Performance_Ep_Context_t 	*ep_context,
     DAT_EVD_HANDLE 		reqt_evd_hdl,
@@ -488,14 +488,14 @@ DT_performance_post_rdma_op (
 
     if ( DAT_SUCCESS != ret )
     {
-	return false;
+	return FALSE;
     }
 
     DT_performance_stats_record_post (stats,
 				     post_ctxt_num - pre_ctxt_num,
 				     post_ts - pre_ts);
 
-    return true;
+    return TRUE;
 }
 
 /****************************************************************************/
Index: linux-kernel/test/dapltest/test/dapl_performance_client.c
===================================================================
--- linux-kernel/test/dapltest/test/dapl_performance_client.c	(revision 2306)
+++ linux-kernel/test/dapltest/test/dapl_performance_client.c	(working copy)
@@ -49,7 +49,7 @@ DT_Performance_Test_Client (
     if ( !DT_Performance_Test_Create (pt_ptr,
 				     ia_handle,
 				     remote_ia_addr,
-				     false,
+				     FALSE,
 				     pt_ptr->Server_Info.is_little_endian,
 				     &test_ptr) )
     {
@@ -78,7 +78,7 @@ DT_Performance_Test_Client (
      *  because there was never a connection.
      */
 
-    status = DT_Performance_Test_Destroy (pt_ptr, test_ptr, false);
+    status = DT_Performance_Test_Destroy (pt_ptr, test_ptr, FALSE);
     DT_Tdep_PT_Debug (1,(phead,"Client: Finished performance test\n"));
 
     return status;
@@ -86,7 +86,7 @@ DT_Performance_Test_Client (
 
 
 /****************************************************************************/
-bool
+boolean_t
 DT_Performance_Test_Client_Connect (
     DT_Tdep_Print_Head		*phead,
     Performance_Test_t 		*test_ptr)
@@ -114,7 +114,7 @@ retry:
     {
 	DT_Tdep_PT_Printf (phead, "Test[" F64x "]: dat_ep_connect error: %s\n",
 		       test_ptr->base_port, DT_RetToString (ret));
-	return false;
+	return FALSE;
     }
 
     /* wait for DAT_CONNECTION_EVENT_ESTABLISHED */
@@ -135,17 +135,17 @@ retry:
 	    }
 	}
 	/* error message printed by DT_cr_event_wait */
-	return false;
+	return FALSE;
     }
 
     DT_Tdep_PT_Debug (1,(phead,"Client[" F64x "]: Got Connection\n", test_ptr->base_port));
 
-    return true;
+    return TRUE;
 }
 
 
 /****************************************************************************/
-static bool
+static boolean_t
 DT_Performance_Test_Client_Phase1 (
     DT_Tdep_Print_Head		*phead,
     Performance_Test_t 		*test_ptr,
@@ -164,7 +164,7 @@ DT_Performance_Test_Client_Phase1 (
 
     if ( !DT_Mdep_GetCpuStat (&pre_cpu_stat) )
     {
-	return false;
+	return FALSE;
     }
 
     pre_ts = DT_Mdep_GetTimeStamp ();
@@ -182,7 +182,7 @@ DT_Performance_Test_Client_Phase1 (
 	    DT_Tdep_PT_Debug (1,(phead,"Test[" F64x "]: Post %i failed\n",
 			   test_ptr->base_port,
 			   post_cnt));
-	    return false;
+	    return FALSE;
 	}
     }
 
@@ -206,7 +206,7 @@ DT_Performance_Test_Client_Phase1 (
 	    DT_Tdep_PT_Debug (1,(phead,"Test[" F64x "]: Poll %i failed\n",
 			    test_ptr->base_port,
 			    reap_cnt));
-	    return false;
+	    return FALSE;
 	}
 
 	/* repost */
@@ -222,7 +222,7 @@ DT_Performance_Test_Client_Phase1 (
 		DT_Tdep_PT_Debug (1,(phead,"Test[" F64x "]: Post %i failed\n",
 				test_ptr->base_port,
 				post_cnt));
-		return false;
+		return FALSE;
 	    }
 	}
 
@@ -237,16 +237,16 @@ DT_Performance_Test_Client_Phase1 (
 
     if ( !DT_Mdep_GetCpuStat (&post_cpu_stat) )
     {
-	return false;
+	return FALSE;
     }
     stats->post_cpu_stat = post_cpu_stat;
     stats->pre_cpu_stat = pre_cpu_stat;
-    return true;
+    return TRUE;
 }
 
 
 /****************************************************************************/
-static bool
+static boolean_t
 DT_Performance_Test_Client_Phase2 (
     DT_Tdep_Print_Head		*phead, 
     Performance_Test_t 		*test_ptr,
@@ -318,7 +318,7 @@ DT_Performance_Test_Client_Phase2 (
 
 	if ( DAT_SUCCESS != ret )
 	{
-	    return false;
+	    return FALSE;
 	}
 
 	for (;;)
@@ -337,7 +337,7 @@ DT_Performance_Test_Client_Phase2 (
 	    {
 		DT_Tdep_PT_Printf (phead, "Test Error: dapl_event_dequeue failed: %s\n",
 				DT_RetToString (ret));
-		return false;
+		return FALSE;
 	    }
 	    else if (event.event_number == DAT_DTO_COMPLETION_EVENT)
 	    {
@@ -351,17 +351,17 @@ DT_Performance_Test_Client_Phase2 (
 		    "Warning: dapl_performance_wait swallowing %s event\n",
 		    DT_EventToSTr (event.event_number));
 
-		return false;
+		return FALSE;
 	    }
 	}
     }
 
-    return true;
+    return TRUE;
 }
 
 
 /****************************************************************************/
-bool
+boolean_t
 DT_Performance_Test_Client_Exchange (
     Params_t			*params_ptr,
     DT_Tdep_Print_Head		*phead,
@@ -382,14 +382,14 @@ DT_Performance_Test_Client_Exchange (
 		      test_ptr->ep_context.op.seg_size,
 		      test_ptr->ep_context.op.num_segs,
 		      256, /* FIXME should query for this */
-		      false,
-		      false);
+		      FALSE,
+		      FALSE);
 
     if ( !test_ptr->ep_context.op.bp )
     {
 	DT_Tdep_PT_Printf (phead, "Test[" F64x "]: no memory for buffers (RDMA/RD)\n",
 		       test_ptr->base_port);
-	return false;
+	return FALSE;
     }
 
     /*
@@ -411,7 +411,7 @@ DT_Performance_Test_Client_Exchange (
 			dto_cookie,
 			"Recieve Sync_Msg") )
     {
-	return false;
+	return FALSE;
     }
 
     /*
@@ -450,12 +450,12 @@ DT_Performance_Test_Client_Exchange (
 
     if ( !DT_Performance_Test_Client_Phase1 (phead, test_ptr, &stats) )
     {
-	return false;
+	return FALSE;
     }
 
     if ( !DT_Performance_Test_Client_Phase2 (phead, test_ptr, &stats) )
     {
-	return false;
+	return FALSE;
     }
 
     DT_Tdep_PT_Debug (1,(phead,"Test[" F64x "]: Sending Sync Msg\n", test_ptr->base_port));
@@ -467,7 +467,7 @@ DT_Performance_Test_Client_Exchange (
 			     DT_PERF_SYNC_BUFF_SIZE))
     {
 	/* error message printed by DT_post_send_buffer */
-	return false;
+	return FALSE;
     }
 
     dto_cookie.as_64 = LZERO;
@@ -483,9 +483,9 @@ DT_Performance_Test_Client_Exchange (
 		       dto_cookie,
 		       "Client_Sync_Send"))
     {
-	return false;
+	return FALSE;
     }
     stats.pipeline_len = params_ptr->Client_Stats_P.pipeline_len;
     params_ptr->Client_Stats_P = stats;
-    return true;
+    return TRUE;
 }
Index: linux-kernel/test/dapltest/test/dapl_transaction_stats.c
===================================================================
--- linux-kernel/test/dapltest/test/dapl_transaction_stats.c	(revision 2306)
+++ linux-kernel/test/dapltest/test/dapl_transaction_stats.c	(working copy)
@@ -53,7 +53,7 @@ DT_transaction_stats_set_ready (DT_Tdep_
     DT_Mdep_Unlock (&transaction_stats->lock);
 }
 
-bool
+boolean_t
 DT_transaction_stats_wait_for_all (DT_Tdep_Print_Head *phead,
 				   Transaction_Stats_t * transaction_stats)
 {
@@ -68,9 +68,9 @@ DT_transaction_stats_wait_for_all (DT_Td
     {
 	DT_Tdep_PT_Printf (phead, "FAIL: %d Server test connections did not report ready.\n",
 		    transaction_stats->wait_count);
-	return false;
+	return FALSE;
     }
-    return true;
+    return TRUE;
 }
 
 
Index: linux-kernel/test/dapltest/test/dapl_server.c
===================================================================
--- linux-kernel/test/dapltest/test/dapl_server.c	(revision 2306)
+++ linux-kernel/test/dapltest/test/dapl_server.c	(working copy)
@@ -240,8 +240,8 @@ DT_cs_Server (Params_t * params_ptr)
 			       DT_RoundSize (sizeof (Transaction_Cmd_t), 8192),
 			       3,	/* num_buffers */
 			       256, /* FIXME query for this value */
-			       false,
-			       false);
+			       FALSE,
+			       FALSE);
     if (ps_ptr->bpool == 0)
     {
 	DT_Tdep_PT_Printf (phead, 
@@ -290,7 +290,7 @@ DT_cs_Server (Params_t * params_ptr)
 	}
 	DT_MemListInit (pt_ptr);
 	DT_Thread_Init (pt_ptr);
-	pt_ptr->local_is_server = true;
+	pt_ptr->local_is_server = TRUE;
 	pt_ptr->ps_ptr = ps_ptr;
 	memcpy ( (void *) (uintptr_t) &pt_ptr->Params,
 		(const void *) params_ptr,
@@ -436,7 +436,7 @@ DT_cs_Server (Params_t * params_ptr)
 	    {
 		Transaction_Cmd = (Transaction_Cmd_t *)
 					DT_Bpool_GetBuffer (ps_ptr->bpool, 1);
-		DT_Transaction_Cmd_Endian (Transaction_Cmd, false);
+		DT_Transaction_Cmd_Endian (Transaction_Cmd, FALSE);
 		memcpy ( (void *) (uintptr_t)&pt_ptr->Params.u.Transaction_Cmd,
 		    (const void *)Transaction_Cmd,
 		    sizeof (Transaction_Cmd_t));
@@ -446,7 +446,7 @@ DT_cs_Server (Params_t * params_ptr)
             case QUIT_TEST:
             {
         	Quit_Cmd = (Quit_Cmd_t*)DT_Bpool_GetBuffer (ps_ptr->bpool, 1);
-        	DT_Quit_Cmd_Endian (Quit_Cmd, false);
+        	DT_Quit_Cmd_Endian (Quit_Cmd, FALSE);
         	memcpy ( (void *) (uintptr_t)&pt_ptr->Params.u.Quit_Cmd,
             	(const void *)Quit_Cmd,
 		sizeof (Quit_Cmd_t));
@@ -555,7 +555,7 @@ DT_cs_Server (Params_t * params_ptr)
 
 	/* Start the new test thread */
 	DT_Tdep_PT_Debug (1,(phead,"%s: Starting Test Thread\n", module));
-	if (DT_Thread_Start (pt_ptr->thread) == false)
+	if (DT_Thread_Start (pt_ptr->thread) == FALSE)
 	{
 	    DT_Tdep_PT_Debug (1,(phead,"failed to start test thread\n"));
             status = 1;
Index: linux-kernel/test/dapltest/test/dapl_thread.c
===================================================================
--- linux-kernel/test/dapltest/test/dapl_thread.c	(revision 2306)
+++ linux-kernel/test/dapltest/test/dapl_thread.c	(working copy)
@@ -124,7 +124,7 @@ DT_Thread_Destroy (Thread * thread_ptr, 
  * to starting it whereas DT_Thread_Create just sets up some data structures.
  * (this is counter-intuitive)
  */
-bool
+boolean_t
 DT_Thread_Start (Thread * thread_ptr)
 {
     return DT_Mdep_Thread_Start (thread_ptr);
Index: linux-kernel/test/dapltest/test/dapl_fft_util.c
===================================================================
--- linux-kernel/test/dapltest/test/dapl_fft_util.c	(revision 2306)
+++ linux-kernel/test/dapltest/test/dapl_fft_util.c	(working copy)
@@ -137,7 +137,7 @@ void DT_fft_init_conn_struct (FFT_Connec
     conn->remote_netaddr = NULL;
     conn->bpool = NULL;
     conn->pt_ptr = NULL;
-    conn->connected = false;
+    conn->connected = FALSE;
 }
 
 /* helper function that simplifies many dat calls for the initiialization of a
@@ -298,7 +298,7 @@ void DT_fft_init_server (Params_t *param
     /* allocate memory for buffers */
     conn->bpool = DT_BpoolAlloc (NULL, phead, conn->ia_handle, conn->pz_handle, 
                                  NULL, NULL, 8192, 2, 256 /* FIXME query */, 
-                                 false, false);
+                                 FALSE, FALSE);
     DT_assert (phead, conn->bpool);
 cleanup:
     return;
@@ -330,8 +330,8 @@ void DT_fft_listen (Params_t *params_ptr
 	       DT_conn_event_wait (phead, 
 		   		   conn->ep_handle, 
 				   conn->conn_evd,
-				   &conn->event_num) == true);
-    conn->connected = true;
+				   &conn->event_num) == TRUE);
+    conn->connected = TRUE;
 cleanup:
     return;
 }
@@ -361,7 +361,7 @@ int DT_fft_connect (Params_t *params_ptr
 		   DT_conn_event_wait (phead, 
 		       		       conn->ep_handle, 
 				       conn->conn_evd,
-				       &conn->event_num) == true);
+				       &conn->event_num) == TRUE);
 
 	/* make sure we weren't rejected by the peer */
 	if (conn->event_num == DAT_CONNECTION_EVENT_PEER_REJECTED)
@@ -373,7 +373,7 @@ int DT_fft_connect (Params_t *params_ptr
 cleanup:
     if (conn->event_num == DAT_CONNECTION_EVENT_ESTABLISHED)
     {
-	conn->connected = true;
+	conn->connected = TRUE;
     }
     /* returns true if connected, false otherwise */
     return (conn->connected);
Index: linux-kernel/test/dapltest/test/dapl_limit.c
===================================================================
--- linux-kernel/test/dapltest/test/dapl_limit.c	(revision 2306)
+++ linux-kernel/test/dapltest/test/dapl_limit.c	(working copy)
@@ -31,7 +31,7 @@
  * Increase the size of an array of handles
  */
 
-static bool
+static boolean_t
 more_handles (DT_Tdep_Print_Head *phead,
 	     DAT_HANDLE **old_ptrptr,	/* pointer to current pointer	*/
 	     unsigned int *old_count,	/* number  pointed to	     	*/
@@ -44,14 +44,14 @@ more_handles (DT_Tdep_Print_Head *phead,
     if (!handle_tmp)
     {
 	DT_Tdep_PT_Printf (phead, "Out of memory for more DAT_HANDLEs\n");
-	return (false);
+	return (FALSE);
     }
 
     memcpy (handle_tmp, old_handles, count*size);
     DT_Mdep_Free (old_handles);
     *old_ptrptr = handle_tmp;
     *old_count  = count * 2;
-    return (true);
+    return (TRUE);
 }
 
 
@@ -69,7 +69,7 @@ more_handles (DT_Tdep_Print_Head *phead,
  *  the constructor for the object indicated by 'depth', providing for
  *  increased (or at least different) stress on the DAPL.
  */
-static bool
+static boolean_t
 limit_test ( DT_Tdep_Print_Head *phead,
 	    Limit_Cmd_t *cmd,
 	    Limit_Index depth)
@@ -91,7 +91,7 @@ limit_test ( DT_Tdep_Print_Head *phead,
     } Obj_Set;
 
     Obj_Set *hdl_sets	    = (Obj_Set *) NULL;
-    bool     retval	    = false;
+    boolean_t     retval	    = FALSE;
     char    *module	    = "LimitTest";
 
 #if defined (WIN32)
@@ -183,7 +183,7 @@ limit_test ( DT_Tdep_Print_Head *phead,
 				    sizeof (*hdlptr)))
 		{
 		    DT_Tdep_PT_Printf (phead, "%s: IAs opened: %d\n", module, w);
-		    retval = true;
+		    retval = TRUE;
 		    break;
 		}
 		/* Specify that we want to get back an async EVD.  */
@@ -197,13 +197,13 @@ limit_test ( DT_Tdep_Print_Head *phead,
 		    DT_Tdep_PT_Printf (phead, "%s: dat_ia_open (%s) #%d fails: %s\n",
 				    module,  cmd->device_name,
 				    w+1,  DT_RetToString (ret));
-		    retval = true;
+		    retval = TRUE;
 		    break;
 		}
 	    }
 
 	    DT_Tdep_PT_Printf (phead, "%s: IAs opened: %d\n", module, w);
-	    retval = true;
+	    retval = TRUE;
 
 	    /* IA Cleanup loop */
 	    for (tmp = 0;  tmp < w;  tmp++)
@@ -215,7 +215,7 @@ limit_test ( DT_Tdep_Print_Head *phead,
 		{
 		    DT_Tdep_PT_Printf (phead, "%s: dat_ia_close (graceful) fails: %s\n",
 			    module,  DT_RetToString (ret));
-		    retval = false;
+		    retval = FALSE;
 		    ret = dat_ia_close (hdlptr[tmp].ia_handle,
 					DAT_CLOSE_ABRUPT_FLAG);
 		    if (ret != DAT_SUCCESS)
@@ -284,7 +284,7 @@ limit_test ( DT_Tdep_Print_Head *phead,
 				    sizeof (*hdlptr)))
 		{
 		    DT_Tdep_PT_Printf (phead, "%s: PZs created: %d\n", module, w);
-		    retval = true;
+		    retval = TRUE;
 		    break;
 		}
 		ret = dat_pz_create (hdl_sets[w % cmd->width].ia_handle,
@@ -293,13 +293,13 @@ limit_test ( DT_Tdep_Print_Head *phead,
 		{
 		    DT_Tdep_PT_Printf (phead, "%s: dat_pz_create #%d fails: %s\n",
 				    module,  w+1,  DT_RetToString (ret));
-		    retval = true;
+		    retval = TRUE;
 		    break;
 		}
 	    }
 
 	    DT_Tdep_PT_Printf (phead, "%s: PZs created: %d\n", module, w);
-	    retval = true;
+	    retval = TRUE;
 
 	    /* PZ Cleanup loop */
 	    for (tmp = 0;  tmp < w;  tmp++)
@@ -310,7 +310,7 @@ limit_test ( DT_Tdep_Print_Head *phead,
 		{
 		    DT_Tdep_PT_Printf (phead, "%s: dat_pz_free fails: %s\n",
 			    module,  DT_RetToString (ret));
-		    retval = false;
+		    retval = FALSE;
 		}
 	    }
 	    DT_Mdep_Free (hdlptr);
@@ -382,7 +382,7 @@ limit_test ( DT_Tdep_Print_Head *phead,
 				    sizeof (*hdlptr)))
 		{
 		    DT_Tdep_PT_Printf (phead, "%s: CNOs created: %d\n", module, w);
-		    retval = true;
+		    retval = TRUE;
 		    break;
 		}
 		ret = dat_cno_create (hdl_sets[w % cmd->width].ia_handle,
@@ -392,20 +392,20 @@ limit_test ( DT_Tdep_Print_Head *phead,
 		{
 		    DT_Tdep_PT_Printf (phead, "%s: dat_cno_create unimplemented\n",
 				    module);
-		    retval = true;
+		    retval = TRUE;
 		    break;
 		}
 		else if (ret != DAT_SUCCESS)
 		{
 		    DT_Tdep_PT_Printf (phead, "%s: dat_cno_create #%d fails: %s\n",
 				    module,  w+1,  DT_RetToString (ret));
-		    retval = true;
+		    retval = TRUE;
 		    break;
 		}
 	    }
 
 	    DT_Tdep_PT_Printf (phead, "%s: CNOs created: %d\n", module, w);
-	    retval = true;
+	    retval = TRUE;
 
 	    /* CNO Cleanup loop */
 	    for (tmp = 0;  tmp < w;  tmp++)
@@ -416,7 +416,7 @@ limit_test ( DT_Tdep_Print_Head *phead,
 		{
 		    DT_Tdep_PT_Printf (phead, "%s: dat_cno_free fails: %s\n",
 			    module,  DT_RetToString (ret));
-		    retval = false;
+		    retval = FALSE;
 		}
 	    }
 	    DT_Mdep_Free (hdlptr);
@@ -521,7 +521,7 @@ limit_test ( DT_Tdep_Print_Head *phead,
 				    sizeof (*hdlptr)))
 		{
 		    DT_Tdep_PT_Printf (phead, "%s: EVDs created: %d\n", module, w);
-		    retval = true;
+		    retval = TRUE;
 		    break;
 		}
 		ret = DT_Tdep_evd_create (hdl_sets[w % cmd->width].ia_handle,
@@ -533,13 +533,13 @@ limit_test ( DT_Tdep_Print_Head *phead,
 		{
 		    DT_Tdep_PT_Printf (phead, "%s: dat_evd_create #%d fails: %s\n",
 				    module,  w+1,  DT_RetToString (ret));
-		    retval = true;
+		    retval = TRUE;
 		    break;
 		}
 	    }
 
 	    DT_Tdep_PT_Printf (phead, "%s: EVDs created: %d\n", module, w);
-	    retval = true;
+	    retval = TRUE;
 
 	    /* EVD Cleanup loop */
 	    if (conn_handle != DAT_HANDLE_NULL)
@@ -555,7 +555,7 @@ limit_test ( DT_Tdep_Print_Head *phead,
 		{
 		    DT_Tdep_PT_Printf (phead, "%s: dat_evd_free fails: %s\n",
 			    module,  DT_RetToString (ret));
-		    retval = false;
+		    retval = FALSE;
 		}
 	    }
 	    DT_Mdep_Free (hdlptr);
@@ -620,7 +620,7 @@ limit_test ( DT_Tdep_Print_Head *phead,
 				    sizeof (*hdlptr)))
 		{
 		    DT_Tdep_PT_Printf (phead, "%s: EPs created: %d\n", module, w);
-		    retval = true;
+		    retval = TRUE;
 		    break;
 		}
 		ret = dat_ep_create (hdl_sets[w % cmd->width].ia_handle,
@@ -634,13 +634,13 @@ limit_test ( DT_Tdep_Print_Head *phead,
 		{
 		    DT_Tdep_PT_Printf (phead, "%s: dat_ep_create #%d fails: %s\n",
 				    module,  w+1,  DT_RetToString (ret));
-		    retval = true;
+		    retval = TRUE;
 		    break;
 		}
 	    }
 
 	    DT_Tdep_PT_Printf (phead, "%s: EPs created: %d\n", module, w);
-	    retval = true;
+	    retval = TRUE;
 
 	    /* EP Cleanup loop */
 	    for (tmp = 0;  tmp < w;  tmp++)
@@ -651,7 +651,7 @@ limit_test ( DT_Tdep_Print_Head *phead,
 		{
 		    DT_Tdep_PT_Printf (phead, "%s: dat_ep_free fails: %s\n",
 			    module,  DT_RetToString (ret));
-		    retval = false;
+		    retval = FALSE;
 		}
 	    }
 	    DT_Mdep_Free (hdlptr);
@@ -697,7 +697,7 @@ limit_test ( DT_Tdep_Print_Head *phead,
 				       sizeof (*hdlptr)))
 		    {
 			DT_Tdep_PT_Printf (phead, "%s: RSPs created: %d\n", module, w);
-			retval = true;
+			retval = TRUE;
 			break;
 		    }
 		    if (!more_handles (phead, (DAT_HANDLE **) &epptr,
@@ -705,7 +705,7 @@ limit_test ( DT_Tdep_Print_Head *phead,
 				       sizeof (*epptr)))
 		    {
 			DT_Tdep_PT_Printf (phead, "%s: RSPs created: %d\n", module, w);
-			retval = true;
+			retval = TRUE;
 			break;
 		    }
 
@@ -713,7 +713,7 @@ limit_test ( DT_Tdep_Print_Head *phead,
 		    {
 			DT_Tdep_PT_Printf (phead, "%s: Mismatch in allocation of handle arrays at point %d\n",
 					module, w);
-			retval = true;
+			retval = TRUE;
 			break;
 		    }
 
@@ -734,7 +734,7 @@ limit_test ( DT_Tdep_Print_Head *phead,
 		{
 		    DT_Tdep_PT_Printf (phead, "%s: dat_ep_create #%d fails: %s testing RSPs\n",
 				    module,  w+1,  DT_RetToString (ret));
-		    retval = true;
+		    retval = TRUE;
 		    break;
 		}
 
@@ -748,7 +748,7 @@ limit_test ( DT_Tdep_Print_Head *phead,
 		    DT_Tdep_PT_Printf (phead, "%s: dat_rsp_create unimplemented\n",
 				    module);
 		    /* ignore this error */
-		    retval = true;
+		    retval = TRUE;
 		    break;
 		}
 		else if (ret != DAT_SUCCESS)
@@ -762,13 +762,13 @@ limit_test ( DT_Tdep_Print_Head *phead,
 			DT_Tdep_PT_Printf (phead, "%s: dat_ep_free (internal cleanup @ #%d) fails: %s\n",
 					module, w+1, DT_RetToString (ret));
 		    }
-		    retval = true;
+		    retval = TRUE;
 		    break;
 		}
 	    }
 
 	    DT_Tdep_PT_Printf (phead, "%s: RSPs created: %d\n", module, w);
-	    retval = true;
+	    retval = TRUE;
 
 	    /* RSP Cleanup loop */
 	    for (tmp = 0;  tmp < w;  tmp++)
@@ -779,7 +779,7 @@ limit_test ( DT_Tdep_Print_Head *phead,
 		{
 		    DT_Tdep_PT_Printf (phead, "%s: dat_rsp_free fails: %s\n",
 			    module,  DT_RetToString (ret));
-		    retval = false;
+		    retval = FALSE;
 		}
 		/* Free EPs */
 		ret = dat_ep_free (epptr[tmp]);
@@ -787,7 +787,7 @@ limit_test ( DT_Tdep_Print_Head *phead,
 		{
 		    DT_Tdep_PT_Printf (phead, "%s: dat_ep_free fails: %s for RSPs\n",
 			    module,  DT_RetToString (ret));
-		    retval = false;
+		    retval = FALSE;
 		}
 	    }
 	    DT_Mdep_Free (hdlptr);
@@ -827,7 +827,7 @@ limit_test ( DT_Tdep_Print_Head *phead,
 				    sizeof (*hdlptr)))
 		{
 		    DT_Tdep_PT_Printf (phead, "%s: PSPs created: %d\n", module, w);
-		    retval = true;
+		    retval = TRUE;
 		    break;
 		}
 		ret = dat_psp_create (hdl_sets[w % cmd->width].ia_handle,
@@ -839,14 +839,14 @@ limit_test ( DT_Tdep_Print_Head *phead,
 		{
 		    DT_Tdep_PT_Printf (phead, "%s: dat_psp_create #%d fails: %s\n",
 				    module,  w+1,  DT_RetToString (ret));
-		    retval = true;
+		    retval = TRUE;
 		    hdlptr[w] = DAT_HANDLE_NULL;
 		    break;
 		}
 	    }
 
 	    DT_Tdep_PT_Printf (phead, "%s: PSPs created: %d\n", module, w);
-	    retval = true;
+	    retval = TRUE;
 
 	    /* PSP Cleanup loop */
 	    for (tmp = 0;  tmp < w;  tmp++)
@@ -864,7 +864,7 @@ limit_test ( DT_Tdep_Print_Head *phead,
 		{
 		    DT_Tdep_PT_Printf (phead, "%s: dat_psp_free fails: %s\n",
 			    module,  DT_RetToString (ret));
-		    retval = false;
+		    retval = FALSE;
 		}
 	    }
 	    DT_Mdep_Free (hdlptr);
@@ -956,7 +956,7 @@ limit_test ( DT_Tdep_Print_Head *phead,
 		    DT_Tdep_PT_Printf (phead, "%s: no memory for LMR handles\n",
 					module);
 		    DT_Tdep_PT_Printf (phead, "%s: LMRs created: %d\n", module, w);
-		    retval = true;
+		    retval = TRUE;
 		    break;
 		}
 		/*
@@ -973,18 +973,18 @@ limit_test ( DT_Tdep_Print_Head *phead,
 					  DFLT_BUFFSZ,
 					  1,
 					  256, /* FIXME should query for this */
-					  false,
-					  false);
+					  FALSE,
+					  FALSE);
 		if (!hdlptr[w])
 		{
 		    DT_Tdep_PT_Printf (phead, "%s: LMRs created: %d\n", module, w);
-		    retval = true;
+		    retval = TRUE;
 		    break;
 		}
 	    }
 
 	    DT_Tdep_PT_Printf (phead, "%s: LMRs created: %d\n", module, w);
-	    retval = true;
+	    retval = TRUE;
 
 	    /* LMR Cleanup loop */
 	    for (tmp = 0;  tmp <= w;  tmp++)
@@ -1037,7 +1037,7 @@ limit_test ( DT_Tdep_Print_Head *phead,
 					module,
 					w,
 					w * cmd->width);
-		    done = retval = true;
+		    done = retval = TRUE;
 		    break;
 		}
 		for (i = 0;  i < cmd->width;  i++)
@@ -1068,13 +1068,13 @@ limit_test ( DT_Tdep_Print_Head *phead,
 					module,
 					w,
 					w * cmd->width + i);
-			done = retval = true;
+			done = retval = TRUE;
 			break;
 		    }
 		}   /* end for each EP wide */
 	    }	/* end forever (!done) loop */
 
-	    retval = true;
+	    retval = TRUE;
 	    DT_Tdep_PT_Printf (phead, "%s: recv buffers posted per EP: %d\n"
 			    "\t\t (total posted: %d)\n",
 			    module,
@@ -1096,7 +1096,7 @@ limit_test ( DT_Tdep_Print_Head *phead,
 		{
 		    DT_Tdep_PT_Printf (phead, "%s: dat_ep_disconnect (abrupt) fails: %s\n",
 				    module,  DT_RetToString (ret));
-		    retval = false;
+		    retval = FALSE;
 		}
 		else
 		{
@@ -1137,22 +1137,22 @@ limit_test ( DT_Tdep_Print_Head *phead,
 					  test_size,
 					  1,
 					  256, /* FIXME should query for this */
-					  false,
-					  false);
+					  FALSE,
+					  FALSE);
 
 	    if (!test_bpool)
 	    {
 		DT_Tdep_PT_Printf (phead, "%s: Largest LMR was 0x%x bytes\n"
 			       "\t (failed attempting 0x%x bytes)\n",
 			       module, last_size, test_size);
-		retval = true;
+		retval = TRUE;
 		break;
 	    }
 	    else if (!DT_Bpool_Destroy ((Per_Test_Data_t *)0, phead, test_bpool))
 	    {
 		DT_Tdep_PT_Printf (phead, "%s: Largest LMR was 0x%x bytes\n",
 			       module, test_size);
-		retval = true;
+		retval = TRUE;
 		break;
 	    }
 
@@ -1163,7 +1163,7 @@ limit_test ( DT_Tdep_Print_Head *phead,
 		/* could conceivably wrap on 32-bit architectures */
 		DT_Tdep_PT_Printf (phead, "%s: LMR of 0x%x bytes OK - %s\n",
 			       module, last_size, "stopping now.");
-		retval = true;
+		retval = TRUE;
 		break;
 	    }
 	}   /* end forever loop */
@@ -1192,7 +1192,7 @@ clean_up_now:
 		{
 		    DT_Tdep_PT_Printf (phead, "%s: dat_lmr_free fails: %s\n",
 			    module,  DT_RetToString (ret));
-		    retval = false;
+		    retval = FALSE;
 		}
 	    }
 	    if ((void *) hdl_sets[w].lmr_buffer)
@@ -1227,7 +1227,7 @@ clean_up_now:
 		{
 		    DT_Tdep_PT_Printf (phead, "%s: dat_ep_free fails: %s\n",
 			    module,  DT_RetToString (ret));
-		    retval = false;
+		    retval = FALSE;
 		}
 	    }
 	}
@@ -1251,7 +1251,7 @@ clean_up_now:
 		{
 		    DT_Tdep_PT_Printf (phead, "%s: dat_evd_free fails: %s\n",
 			    module,  DT_RetToString (ret));
-		    retval = false;
+		    retval = FALSE;
 		}
 	    }
 	}
@@ -1271,7 +1271,7 @@ clean_up_now:
 		{
 		    DT_Tdep_PT_Printf (phead, "%s: dat_cno_free fails: %s\n",
 			    module,  DT_RetToString (ret));
-		    retval = false;
+		    retval = FALSE;
 		}
 	    }
 	}
@@ -1291,7 +1291,7 @@ clean_up_now:
 		{
 		    DT_Tdep_PT_Printf (phead, "%s: dat_pz_free fails: %s\n",
 			    module,  DT_RetToString (ret));
-		    retval = false;
+		    retval = FALSE;
 		}
 	    }
 	}
@@ -1317,7 +1317,7 @@ clean_up_now:
 		     * this really is an error.  But if we get here,
 		     * we may as well try the largest hammer we have.
 		     */
-		    retval = false;
+		    retval = FALSE;
 		    ret = dat_ia_close (hdl_sets[w].ia_handle,
 					DAT_CLOSE_ABRUPT_FLAG);
 		    if (ret != DAT_SUCCESS)
Index: linux-kernel/test/dapltest/test/dapl_transaction_test.c
===================================================================
--- linux-kernel/test/dapltest/test/dapl_transaction_test.c	(revision 2306)
+++ linux-kernel/test/dapltest/test/dapl_transaction_test.c	(working copy)
@@ -69,7 +69,7 @@ DT_Transaction_Test_Client (Per_Test_Dat
 	DT_Tdep_PT_Debug (1,(phead,"Client: Starting Client side of test\n"));
 	if (!DT_Transaction_Create_Test (pt_ptr,
 				     ia_handle,
-				     false,
+				     FALSE,
 				     port_num,
 				     pt_ptr->Server_Info.is_little_endian,
 				     remote_ia_addr))
@@ -111,7 +111,7 @@ DT_Transaction_Test_Server (void *params
 
 	if (!DT_Transaction_Create_Test (pt_ptr,
 				     pt_ptr->ps_ptr->ia_handle,
-				     true,
+				     TRUE,
 				     port_num,
 				     pt_ptr->Client_Info.is_little_endian,
 				     (DAT_IA_ADDRESS_PTR) 0))
@@ -156,7 +156,7 @@ DT_Transaction_Test_Server (void *params
  * work.
  */
 
-bool
+boolean_t
 DT_Transaction_Create_Test (Per_Test_Data_t * pt_ptr,
 			DAT_IA_HANDLE *ia_handle,
 			boolean_t is_server,
@@ -176,7 +176,7 @@ DT_Transaction_Create_Test (Per_Test_Dat
     if (!test_ptr)
     {
 	DT_Tdep_PT_Printf (phead, "No Memory to create transaction test structure!\n");
-	return false;
+	return FALSE;
     }
 
     /* Unused fields zeroed by allocator */
@@ -207,11 +207,11 @@ DT_Transaction_Create_Test (Per_Test_Dat
     {
 	DT_Tdep_PT_Printf (phead, "No memory!\n");
 	DT_MemListFree (test_ptr->pt_ptr, test_ptr);
-	return false;
+	return FALSE;
     }
     DT_Thread_Start (test_ptr->thread);
 
-    return true;
+    return TRUE;
 }
 
 
@@ -231,7 +231,7 @@ DT_Transaction_Main (void *param)
     Transaction_Test_t  *test_ptr = (Transaction_Test_t *) param;
     DAT_RETURN          ret;
     u32          i, j;
-    bool		success = false;
+    boolean_t 	success = FALSE;
     Per_Test_Data_t     *pt_ptr;
     Thread              *thread;
     DAT_DTO_COOKIE	dto_cookie;
@@ -394,8 +394,8 @@ DT_Transaction_Main (void *param)
 						buff_size,
 						4,
 						pt_ptr->provider_attr.optimal_buffer_alignment,
-						false,
-						false);
+						FALSE,
+						FALSE);
 	if (!test_ptr->ep_context[i].bp)
 	{
 	    DT_Tdep_PT_Printf (phead, "Test[" F64x "]: no memory for remote memory buffers\n",
@@ -844,8 +844,8 @@ retry:
 				   test_ptr->ep_context[i].op[j].seg_size,
 				   test_ptr->ep_context[i].op[j].num_segs,
 				   pt_ptr->provider_attr.optimal_buffer_alignment,
-				   false,
-				   !us ? true : false);
+				   FALSE,
+				   !us ? TRUE : FALSE);
 		    if (!test_ptr->ep_context[i].op[j].bp)
 		    {
 			DT_Tdep_PT_Printf (phead, "Test[" F64x "]: no memory for buffers (RDMA/RD)\n",
@@ -880,8 +880,8 @@ retry:
 				   test_ptr->ep_context[i].op[j].seg_size,
 				   test_ptr->ep_context[i].op[j].num_segs,
 				   pt_ptr->provider_attr.optimal_buffer_alignment,
-				   !us ? true : false,
-				   false);
+				   !us ? TRUE : FALSE,
+				   FALSE);
 		    if (!test_ptr->ep_context[i].op[j].bp)
 		    {
 			DT_Tdep_PT_Printf (phead, "Test[" F64x "]: no memory for buffers (RDMA/WR)\n",
@@ -915,8 +915,8 @@ retry:
 				   test_ptr->ep_context[i].op[j].seg_size,
 				   test_ptr->ep_context[i].op[j].num_segs,
 				   pt_ptr->provider_attr.optimal_buffer_alignment,
-				   false,
-				   false);
+				   FALSE,
+				   FALSE);
 		    if (!test_ptr->ep_context[i].op[j].bp)
 		    {
 			DT_Tdep_PT_Printf (phead, "Test[" F64x "]: no memory for buffers (S/R)\n",
@@ -1286,15 +1286,15 @@ test_failure:
 /* -----------------------------------------------------------------------
  * The actual performance test
  */
-bool
+boolean_t
 DT_Transaction_Run (DT_Tdep_Print_Head *phead, Transaction_Test_t * test_ptr)
 {
     unsigned int    op;
     unsigned int    iteration;
     int             bytes;
-    bool            ours;
-    bool	    success = false;
-    bool	    repost_recv;
+    boolean_t            ours;
+    boolean_t     success = FALSE;
+    boolean_t     repost_recv;
     unsigned int    i;
 
     /* pre-post all receive buffers */
@@ -1624,7 +1624,7 @@ DT_Transaction_Run (DT_Tdep_Print_Head *
 		    test_ptr->stats.stat_bytes_rdma_write);
     }
     DT_Tdep_PT_Debug (1,(phead,"Test[" F64x "]: End Successfully\n", test_ptr->base_port));
-    success = true;
+    success = TRUE;
 
 bail:
     return ( success );
@@ -1637,7 +1637,7 @@ DT_Transaction_Validation_Fill ( DT_Tdep
 				Transaction_Test_t * test_ptr,
 				unsigned int iteration)
 {
-    bool            ours;
+    boolean_t            ours;
     unsigned int    op;
     unsigned int    i;
     unsigned int    j;
@@ -1746,13 +1746,13 @@ DT_Transaction_Validation_Fill ( DT_Tdep
 
 
 /*------------------------------------------------------------------------------ */
-bool
+boolean_t
 DT_Transaction_Validation_Check (DT_Tdep_Print_Head *phead,
 				Transaction_Test_t * test_ptr,
 				int iteration)
 {
-    bool            ours;
-    bool            success = true;
+    boolean_t            ours;
+    boolean_t            success = TRUE;
     unsigned int    op;
     unsigned int    i;
     unsigned int    j;
@@ -1811,7 +1811,7 @@ DT_Transaction_Validation_Check (DT_Tdep
 					(phead,
 					"\twq=%d op=%d seg=%d byte=%d ptr=%p\n",
 					ind, op, i, j, buff));
-				    success = false;
+				    success = FALSE;
 				    break;
 				}
 			    }
@@ -1851,7 +1851,7 @@ DT_Transaction_Validation_Check (DT_Tdep
 					(phead,
 					"\twq=%d op=%d seg=%d byte=%d ptr=%p\n",
 					ind, op, i, j, buff));
-				    success = false;
+				    success = FALSE;
 				    break;
 				}
 			    }
@@ -1898,7 +1898,7 @@ DT_Transaction_Validation_Check (DT_Tdep
 					(phead,
 					"\twq=%d op=%d seg=%d byte=%d ptr=%p\n",
 					ind, op, i, j, buff));
-				    success = false;
+				    success = FALSE;
 				    break;
 				}
 			    }
Index: linux-kernel/test/dapltest/test/dapl_performance_server.c
===================================================================
--- linux-kernel/test/dapltest/test/dapl_performance_server.c	(revision 2306)
+++ linux-kernel/test/dapltest/test/dapl_performance_server.c	(working copy)
@@ -43,7 +43,7 @@ DT_Performance_Test_Server (
     if ( !DT_Performance_Test_Create (pt_ptr,
 				     pt_ptr->ps_ptr->ia_handle,
 				     (DAT_IA_ADDRESS_PTR) 0,
-				     true,
+				     TRUE,
 				     pt_ptr->Client_Info.is_little_endian,
 				     &test_ptr) )
     {
@@ -68,7 +68,7 @@ DT_Performance_Test_Server (
 	}
     }
 
-    status = DT_Performance_Test_Destroy (pt_ptr, test_ptr, true);
+    status = DT_Performance_Test_Destroy (pt_ptr, test_ptr, TRUE);
 
     DT_Tdep_PT_Printf (phead, "Server: Finished performance test.  Detaching.\n");
 
@@ -94,13 +94,13 @@ DT_Performance_Test_Server (
 
 
 /****************************************************************************/
-bool
+boolean_t
 DT_Performance_Test_Server_Connect (
     DT_Tdep_Print_Head		*phead,
     Performance_Test_t 		*test_ptr)
 {
     DAT_RETURN 			ret;
-    bool			status;
+    boolean_t 		status;
     DAT_RSP_HANDLE              rsp_handle;
     DAT_PSP_HANDLE              psp_handle;
 
@@ -126,7 +126,7 @@ DT_Performance_Test_Server_Connect (
 	{
 	    DT_Tdep_PT_Printf (phead, "Test[" F64x "]: dat_rsp_create error: %s\n",
 			   test_ptr->base_port, DT_RetToString (ret));
-	    status = false;
+	    status = FALSE;
 	    goto psp_free;
 	}
 
@@ -141,7 +141,7 @@ DT_Performance_Test_Server_Connect (
 			  &cr_handle,
 			  "Server") )
 	{
-	    status = false;
+	    status = FALSE;
 	    goto psp_free;
 	}
 
@@ -154,7 +154,7 @@ DT_Performance_Test_Server_Connect (
 	    DT_Tdep_PT_Printf (phead, "Test[" F64x "]: dat_cr_accept error: %s\n",
 			   test_ptr->base_port, DT_RetToString (ret));
 	    /* cr_handle consumed on failure */
-	    status = false;
+	    status = FALSE;
 	    goto psp_free;
 	}
 
@@ -164,7 +164,7 @@ DT_Performance_Test_Server_Connect (
 				  &event_num))
 	{
 	    /* error message printed by DT_conn_event_wait */
-	    status = false;
+	    status = FALSE;
 	    goto psp_free;
 	}
 
@@ -175,7 +175,7 @@ DT_Performance_Test_Server_Connect (
 	/*
 	 * Server - use a short-lived PSP instead of an RSP
 	 */
-	status = true;
+	status = TRUE;
 
 	ret = dat_psp_create (test_ptr->ia_handle,
 			      test_ptr->ep_context.port,
@@ -186,7 +186,7 @@ DT_Performance_Test_Server_Connect (
 	{
 	    DT_Tdep_PT_Printf (phead, "Test[" F64x "]: dat_psp_create error: %s\n",
 			   test_ptr->base_port, DT_RetToString (ret));
-	    status = false;
+	    status = FALSE;
 	    psp_handle = DAT_HANDLE_NULL;
 	    return (status);
 	}
@@ -213,7 +213,7 @@ DT_Performance_Test_Server_Connect (
 		       &cr_handle,
 		       "Server") )
     {
-	status = false;
+	status = FALSE;
 	goto psp_free;
     }
 
@@ -227,7 +227,7 @@ DT_Performance_Test_Server_Connect (
 	DT_Tdep_PT_Printf (phead, "Test[" F64x "]: dat_cr_accept error: %s\n",
 			test_ptr->base_port, DT_RetToString (ret));
 	/* cr_handle consumed on failure */
-	status = false;
+	status = FALSE;
 	goto psp_free;
     }
 
@@ -238,7 +238,7 @@ DT_Performance_Test_Server_Connect (
 			     &event_num ) )
     {
 	/* error message printed by DT_cr_event_wait */
-	status = false;
+	status = FALSE;
 	goto psp_free;
     }
 
@@ -253,7 +253,7 @@ psp_free:
 	{
 	    DT_Tdep_PT_Printf (phead, "Test[" F64x "]: dat_psp_free error: %s\n",
 			    test_ptr->base_port, DT_RetToString (ret));
-	    status = false;
+	    status = FALSE;
 	}
     }
     if ( DAT_HANDLE_NULL != rsp_handle )
@@ -264,7 +264,7 @@ psp_free:
 	{
 	    DT_Tdep_PT_Printf (phead, "Test[" F64x "]: dat_rsp_free error: %s\n",
 			    test_ptr->base_port, DT_RetToString (ret));
-	    status = false;
+	    status = FALSE;
 	}
     }	/* end short-lived PSP */
 
@@ -274,7 +274,7 @@ psp_free:
 
 
 /****************************************************************************/
-bool
+boolean_t
 DT_Performance_Test_Server_Exchange (
     DT_Tdep_Print_Head		*phead,
     Performance_Test_t 		*test_ptr)
@@ -293,14 +293,14 @@ DT_Performance_Test_Server_Exchange (
 		      test_ptr->ep_context.op.seg_size,
 		      test_ptr->ep_context.op.num_segs,
 		      256, /* FIXME should query for this */
-		      true,
-		      true);
+		      TRUE,
+		      TRUE);
 
     if ( !test_ptr->ep_context.op.bp )
     {
 	DT_Tdep_PT_Printf (phead, "Test[" F64x "]: no memory for buffers (RDMA/RD)\n",
 		       test_ptr->base_port);
-	return false;
+	return FALSE;
     }
 
     test_ptr->ep_context.op.Rdma_Context =
@@ -350,7 +350,7 @@ DT_Performance_Test_Server_Exchange (
 			     DT_PERF_SYNC_BUFF_SIZE))
     {
 	/* error message printed by DT_post_send_buffer */
-	return false;
+	return FALSE;
     }
 
     /* reap the send and verify it */
@@ -367,7 +367,7 @@ DT_Performance_Test_Server_Exchange (
 		       dto_cookie,
 		       "Send Sync_Msg") )
     {
-	return false;
+	return FALSE;
     }
 
     /*
@@ -389,12 +389,12 @@ DT_Performance_Test_Server_Exchange (
 			dto_cookie,
 			"Recieve Sync_Msg") )
     {
-	return false;
+	return FALSE;
     }
 
     DT_Tdep_PT_Debug (1,(phead,"Test[" F64x "]: Received Sync Msg\n",
 		    test_ptr->base_port));
 
-    return true;
+    return TRUE;
 }
 
Index: linux-kernel/test/dapltest/test/dapl_fft_dataxfer_client.c
===================================================================
--- linux-kernel/test/dapltest/test/dapl_fft_dataxfer_client.c	(revision 2306)
+++ linux-kernel/test/dapltest/test/dapl_fft_dataxfer_client.c	(working copy)
@@ -65,8 +65,8 @@ int DT_dataxfer_client_generic (DT_Tdep_
 				    4096, 
 				    2, 
 				    256, /* FIXME should query for this */
-				    false, 
-				    false);
+				    FALSE, 
+				    FALSE);
 	DT_assert (phead, conn.bpool != 0);
 	rc = DT_post_send_buffer (phead, conn.ep_handle, conn.bpool, 0,
 		    DT_Bpool_GetBuffSize (conn.bpool, 0));
Index: linux-kernel/test/dapltest/test/dapl_bpool.c
===================================================================
--- linux-kernel/test/dapltest/test/dapl_bpool.c	(revision 2306)
+++ linux-kernel/test/dapltest/test/dapl_bpool.c	(working copy)
@@ -312,13 +312,13 @@ err:
 }
 
 /*****************************************************************************/
-bool
+boolean_t
 DT_Bpool_Destroy (Per_Test_Data_t * pt_ptr,
 		  DT_Tdep_Print_Head *phead,
 		  Bpool * bpool_ptr)
 {
     unsigned char *module = "DT_Bpool_Destroy";
-    bool 	   rval = true;
+    boolean_t 	   rval = TRUE;
 
     if (bpool_ptr)
     {
@@ -353,7 +353,7 @@ DT_Bpool_Destroy (Per_Test_Data_t * pt_p
 			    	    "%s: dat_rmr_free failed %s\n",
 				    module, 
 				    DT_RetToString (ret));
-		    rval = false;
+		    rval = FALSE;
 		}
 	    }
 
@@ -366,7 +366,7 @@ DT_Bpool_Destroy (Per_Test_Data_t * pt_p
 			    	     "%s: dat_lmr_free failed %s\n",
 				     module, 
 				     DT_RetToString (ret));
-		    rval = false;
+		    rval = FALSE;
 		}
 	    }
 	    DT_MemListFree (pt_ptr, bpool_ptr->alloc_ptr);
Index: linux-kernel/test/dapltest/test/dapl_test_util.c
===================================================================
--- linux-kernel/test/dapltest/test/dapl_test_util.c	(revision 2306)
+++ linux-kernel/test/dapltest/test/dapl_test_util.c	(working copy)
@@ -53,7 +53,7 @@ DT_query (   Per_Test_Data_t *pt_ptr,
 	DT_Tdep_PT_Printf (phead, "%s: dat_ia_query error: %s\n",
 		    module,
 		    DT_RetToString (ret));
-	return ( false );
+	return ( FALSE );
     }
 
     /* Query the EP */
@@ -63,7 +63,7 @@ DT_query (   Per_Test_Data_t *pt_ptr,
 	DT_Tdep_PT_Printf (phead, "%s: dat_ep_query error: %s\n",
 		    module,
 		    DT_RetToString (ret));
-	return ( false );
+	return ( FALSE );
     }
     pt_ptr->ep_attr = ep_params.ep_attr;
 
@@ -151,7 +151,7 @@ DT_query (   Per_Test_Data_t *pt_ptr,
 	DT_Tdep_PT_Printf (phead, "***** ***** ***** ***** ***** *****\n");
     }
 
-    return ( true );
+    return ( TRUE );
 }
 
 
@@ -194,9 +194,9 @@ DT_post_recv_buffer (DT_Tdep_Print_Head 
 	DT_Tdep_PT_Printf (phead, "Test Error: dat_ep_post_recv failed: %s\n",
 		    DT_RetToString (ret));
 	DT_Test_Error ();
-	return false;
+	return FALSE;
     }
-    return true;
+    return TRUE;
 }
 
 
@@ -238,16 +238,16 @@ DT_post_send_buffer (DT_Tdep_Print_Head 
 	DT_Tdep_PT_Printf (phead, "Test Error: dat_ep_post_send failed: %s\n",
 		    DT_RetToString (ret));
 	DT_Test_Error ();
-	return false;
+	return FALSE;
     }
-    return true;
+    return TRUE;
 }
 
 
 /* -----------------------------------------------------------
  * Wait for a CR event, returning false on error.
  */
-bool
+boolean_t
 DT_cr_event_wait ( DT_Tdep_Print_Head *phead,
 		   DAT_EVD_HANDLE evd_handle,
 		   struct dat_cr_arrival_event_data *cr_stat_p)
@@ -290,21 +290,21 @@ DT_cr_event_wait ( DT_Tdep_Print_Head *p
 	    {
 		*cr_stat_p = event.event_data.cr_arrival_event_data;
 	    }
-	    return (true);
+	    return (TRUE);
 	}
 
 	DT_Tdep_PT_Printf (phead, "Warning: cr_event_wait swallowing %s event\n",
 		    DT_EventToSTr (event.event_number));
     }
 
-    return (false);
+    return (FALSE);
 }
 
 
 /* -----------------------------------------------------------
  * Wait for a connection event, returning false on error.
  */
-bool
+boolean_t
 DT_conn_event_wait (DT_Tdep_Print_Head *phead,
 		    DAT_EP_HANDLE  ep_handle,
 		    DAT_EVD_HANDLE evd_handle,
@@ -345,21 +345,21 @@ DT_conn_event_wait (DT_Tdep_Print_Head *
 	     *      event.event_data.connect_event_data.private_data_size
 	     *      event.event_data.connect_event_data.private_data
 	     */
-	    return (true);
+	    return (TRUE);
 	}
 
 	DT_Tdep_PT_Printf (phead, "Warning: conn_event_wait swallowing %s event\n",
 		    DT_EventToSTr (event.event_number));
     }
 
-    return (false);
+    return (FALSE);
 }
 
 
 /* -----------------------------------------------------------
  * Wait for a disconnection event, returning false on error.
  */
-bool
+boolean_t
 DT_disco_event_wait ( DT_Tdep_Print_Head *phead,
 		      DAT_EVD_HANDLE evd_handle,
 		      DAT_EP_HANDLE  *ep_handle )
@@ -396,24 +396,24 @@ DT_disco_event_wait ( DT_Tdep_Print_Head
 	    {
 		*ep_handle = event.event_data.connect_event_data.ep_handle;
 	    }
-	    return (true);
+	    return (TRUE);
 	}
 
 	DT_Tdep_PT_Printf (phead, "Warning: conn_event_wait swallowing %s event\n",
 		    DT_EventToSTr (event.event_number));
     }
 
-    return (false);
+    return (FALSE);
 }
 
 
 /* -----------------------------------------------------------
  * Reap a DTO event using a wait or polling, returning false on error.
  */
-bool
+boolean_t
 DT_dto_event_reap (DT_Tdep_Print_Head *phead,
 		  DAT_EVD_HANDLE evd_handle,
-		  bool poll,
+		  boolean_t poll,
 		  struct dat_dto_completion_event_data *dto_statusp)
 {
     if (poll)
@@ -430,7 +430,7 @@ DT_dto_event_reap (DT_Tdep_Print_Head *p
 /* -----------------------------------------------------------
  * Poll for a DTO event, returning false on error.
  */
-bool
+boolean_t
 DT_dto_event_poll (DT_Tdep_Print_Head *phead,
 		  DAT_EVD_HANDLE evd_handle,
 		  struct dat_dto_completion_event_data *dto_statusp)
@@ -468,21 +468,21 @@ DT_dto_event_poll (DT_Tdep_Print_Head *p
 		*dto_statusp = event.event_data.dto_completion_event_data;
 	    }
 
-	    return (true);
+	    return (TRUE);
 	}
 
 	DT_Tdep_PT_Printf (phead, "Warning: dto_event_poll swallowing %s event\n",
 		    DT_EventToSTr (event.event_number));
     }
 
-    return (false);
+    return (FALSE);
 }
 
 
 /* -----------------------------------------------------------
  * Wait for a DTO event, returning false on error.
  */
-bool
+boolean_t
 DT_dto_event_wait (DT_Tdep_Print_Head *phead,
 		    DAT_EVD_HANDLE evd_handle,
 		    struct dat_dto_completion_event_data *dto_statusp)
@@ -512,21 +512,21 @@ DT_dto_event_wait (DT_Tdep_Print_Head *p
 	    {
 		*dto_statusp = event.event_data.dto_completion_event_data;
 	    }
-	    return (true);
+	    return (TRUE);
 	}
 
 	DT_Tdep_PT_Printf (phead, "Warning: dto_event_wait swallowing %s event\n",
 		    DT_EventToSTr (event.event_number));
     }
 
-    return (false);
+    return (FALSE);
 }
 
 
 /* -----------------------------------------------------------
  * Wait for a RMR event, returning false on error.
  */
-bool
+boolean_t
 DT_rmr_event_wait (DT_Tdep_Print_Head *phead,
 		    DAT_EVD_HANDLE evd_handle,
 		    struct dat_rmr_bind_completion_event_data *rmr_statusp)
@@ -555,21 +555,21 @@ DT_rmr_event_wait (DT_Tdep_Print_Head *p
 	    {
 		*rmr_statusp = event.event_data.rmr_completion_event_data;
 	    }
-	    return (true);
+	    return (TRUE);
 	}
 
 	DT_Tdep_PT_Printf (phead, "Warning: rmr_event_wait swallowing %s event\n",
 		    DT_EventToSTr (event.event_number));
     }
 
-    return (false);
+    return (FALSE);
 }
 
 
 /* -----------------------------------------------------------
  * Check a DTO and print some debug info if anything is amiss.
  */
-bool
+boolean_t
 DT_dto_check ( DT_Tdep_Print_Head *phead,
 	       struct dat_dto_completion_event_data *dto_p,
 	       DAT_EP_HANDLE   ep_expected,
@@ -607,17 +607,17 @@ DT_dto_check ( DT_Tdep_Print_Head *phead
 			   dto_p->user_cookie.as_64,
 			   cookie_expected.as_64);
 	}
-	return ( false );
+	return ( FALSE );
     }
 
-    return ( true );
+    return ( TRUE );
 }
 
 
 /* -----------------------------------------------------------
  * Check an RMR Bind  and print some debug info if anything is amiss.
  */
-bool
+boolean_t
 DT_rmr_check ( DT_Tdep_Print_Head *phead,
 		struct dat_rmr_bind_completion_event_data *rmr_p,
 		DAT_RMR_HANDLE  rmr_expected,
@@ -646,17 +646,17 @@ DT_rmr_check ( DT_Tdep_Print_Head *phead
 			    rmr_p->user_cookie.as_ptr,
 			    cookie_expected);
 	}
-	return ( false );
+	return ( FALSE );
     }
 
-    return ( true );
+    return ( TRUE );
 }
 
 
 /* -----------------------------------------------------------
  * Check a CR and print some debug info if anything is amiss.
  */
-bool
+boolean_t
 DT_cr_check (  DT_Tdep_Print_Head *phead,
 		struct dat_cr_arrival_event_data *cr_stat_p,
 		DAT_PSP_HANDLE  psp_handle_expected,
@@ -704,12 +704,12 @@ DT_cr_check (  DT_Tdep_Print_Head *phead
 				    DT_RetToString (ret));
 	    }
 	}
-	return ( false );
+	return ( FALSE );
     }
 
     if (cr_handlep)
     {
 	*cr_handlep = cr_stat_p->cr_handle;
     }
-    return ( true );
+    return ( TRUE );
 }
Index: linux-kernel/test/dapltest/test/dapl_client.c
===================================================================
--- linux-kernel/test/dapltest/test/dapl_client.c	(revision 2306)
+++ linux-kernel/test/dapltest/test/dapl_client.c	(working copy)
@@ -82,7 +82,7 @@ DT_cs_Client (Params_t * params_ptr,
     }
     DT_MemListInit (pt_ptr);	    /* init MemlistLock and memListHead */
     DT_Thread_Init (pt_ptr);	    /* init ThreadLock and threadcount */
-    pt_ptr->local_is_server                 = false;
+    pt_ptr->local_is_server                 = FALSE;
     pt_ptr->Client_Info.dapltest_version    = DAPLTEST_VERSION;
     pt_ptr->Client_Info.is_little_endian    = DT_local_is_little_endian;
     pt_ptr->Client_Info.test_type           = params_ptr->test_type;
@@ -213,8 +213,8 @@ DT_cs_Client (Params_t * params_ptr,
 		       DT_RoundSize (sizeof (Transaction_Cmd_t), 8192),
 		       3,	/* num_buffers */
 		       pt_ptr->provider_attr.optimal_buffer_alignment,
-		       false,
-		       false);
+		       FALSE,
+		       FALSE);
     if (bpool == 0)
     {
 	DT_Tdep_PT_Printf (phead, 
@@ -363,7 +363,7 @@ retry:
 	    memcpy ( (void *)buffp,
 		    (const void *)Transaction_Cmd,
 		    sizeof (Transaction_Cmd_t));
-	    DT_Transaction_Cmd_Endian ((Transaction_Cmd_t *)buffp, true);
+	    DT_Transaction_Cmd_Endian ((Transaction_Cmd_t *)buffp, TRUE);
 	    break;
 	}
 
@@ -373,7 +373,7 @@ retry:
         memcpy ( (void *)buffp,
             (const void *)Quit_Cmd,
             sizeof (Quit_Cmd_t));
-        DT_Quit_Cmd_Endian ((Quit_Cmd_t *) buffp, true);
+        DT_Quit_Cmd_Endian ((Quit_Cmd_t *) buffp, TRUE);
         break;
     }
 
Index: linux-kernel/test/dapltest/test/dapl_fft_endpoint.c
===================================================================
--- linux-kernel/test/dapltest/test/dapl_fft_endpoint.c	(revision 2306)
+++ linux-kernel/test/dapltest/test/dapl_fft_endpoint.c	(working copy)
@@ -33,7 +33,7 @@
 
 int DT_endpoint_generic (Params_t *params_ptr,
 			 FFT_Cmd_t *cmd,
-			 bool destroy_pz_early)
+			 boolean_t destroy_pz_early)
 {
     char *dev_name;
     DAT_IA_HANDLE ia_handle;
@@ -148,7 +148,7 @@ int DT_endpoint_case0 (Params_t *params_
 	Description: Test if we can normally create endpoint and destory it.\n");
     DT_Tdep_PT_Printf (phead, "\
 	The endpoint is not associated with a CQ\n");
-    return DT_endpoint_generic (params_ptr, cmd, false);    /* destroy pz early */
+    return DT_endpoint_generic (params_ptr, cmd, FALSE);    /* destroy pz early */
 }
 
 int DT_endpoint_case1 (Params_t *params_ptr, FFT_Cmd_t *cmd)
@@ -158,7 +158,7 @@ int DT_endpoint_case1 (Params_t *params_
     phead = params_ptr->phead;
     DT_Tdep_PT_Printf (phead, "\
 	Description: try to create endpoint with pz already destroyed\n");
-    return DT_endpoint_generic (params_ptr, cmd, true);	/* destroy pz early */
+    return DT_endpoint_generic (params_ptr, cmd, TRUE);	/* destroy pz early */
 }
 
 int DT_endpoint_case2 (Params_t *params_ptr, FFT_Cmd_t *cmd)
@@ -201,13 +201,13 @@ int DT_endpoint_case2 (Params_t *params_
 		       &ep_handle);
     DT_assert_dat (phead, rc == DAT_SUCCESS);
     bpool = DT_BpoolAlloc (NULL, phead, ia_handle, pz_handle, NULL, NULL, 4096, 
-                           1, 256 /* FIXME query */, false, false);
+                           1, 256 /* FIXME query */, FALSE, FALSE);
     DT_assert (phead, bpool != 0);
     DT_assert (phead, DT_post_recv_buffer (phead, 
 				    ep_handle, 
 				    bpool, 
 				    0, 
-				    4096) == true);
+				    4096) == TRUE);
     if (ep_handle)
     {
 	rc = dat_ep_free (ep_handle);
@@ -228,7 +228,7 @@ cleanup:
     if (bpool)
     {
 	rc = DT_Bpool_Destroy (NULL, phead, bpool);
-	DT_assert_clean (phead, rc != false);
+	DT_assert_clean (phead, rc != FALSE);
     }
     if (pz_handle)
     {
Index: linux-kernel/test/dapltest/test/dapl_transaction_util.c
===================================================================
--- linux-kernel/test/dapltest/test/dapl_transaction_util.c	(revision 2306)
+++ linux-kernel/test/dapltest/test/dapl_transaction_util.c	(working copy)
@@ -30,7 +30,7 @@
 /* -----------------------------------------------------------
  * Post a recv buffer on each of this thread's EPs.
  */
-bool
+boolean_t
 DT_handle_post_recv_buf (DT_Tdep_Print_Head *phead, 
 			Ep_Context_t * ep_context,
 			unsigned int num_eps,
@@ -71,24 +71,24 @@ DT_handle_post_recv_buf (DT_Tdep_Print_H
 		    	"Test Error: dat_ep_post_recv failed: %s\n",
 			DT_RetToString (ret));
 	    DT_Test_Error ();
-	    return false;
+	    return FALSE;
 	}
     }
 
-    return true;
+    return TRUE;
 }
 
 
 /* -----------------------------------------------------------
  * Post a send buffer on each of this thread's EPs.
  */
-bool
+boolean_t
 DT_handle_send_op (DT_Tdep_Print_Head *phead, 
 		  Ep_Context_t * ep_context,
 		  DAT_EVD_HANDLE reqt_evd_hdl,
 		  unsigned int num_eps,
 		  int op_indx,
-		  bool poll)
+		  boolean_t poll)
 {
     unsigned int    i, j;
     unsigned char   *completion_reaped;
@@ -97,7 +97,7 @@ DT_handle_send_op (DT_Tdep_Print_Head *p
 
     if (!completion_reaped)
     {
-	return false;
+	return FALSE;
     }
 
     for (i = 0;  i < num_eps;  i++)
@@ -135,7 +135,7 @@ DT_handle_send_op (DT_Tdep_Print_Head *p
 			DT_RetToString (ret));
 	    DT_Test_Error ();
 	    DT_Mdep_Free (completion_reaped);
-	    return false;
+	    return FALSE;
 	}
     }
 
@@ -147,7 +147,7 @@ DT_handle_send_op (DT_Tdep_Print_Head *p
 	{
 	    /* we will reap the send on the recv (Client SR) */
 	    DT_Mdep_Free (completion_reaped);
-	    return true;
+	    return TRUE;
 	}
     }
 
@@ -164,7 +164,7 @@ DT_handle_send_op (DT_Tdep_Print_Head *p
 	if (!DT_dto_event_reap (phead, reqt_evd_hdl, poll, &dto_stat))
 	{
 	    DT_Mdep_Free (completion_reaped);
-	    return false;
+	    return FALSE;
 	}
 
 	epnum = dto_stat.user_cookie.as_64 >> 32;
@@ -177,7 +177,7 @@ DT_handle_send_op (DT_Tdep_Print_Head *p
 			   dto_stat.transfered_length);
 	    DT_Test_Error ();
 	    DT_Mdep_Free (completion_reaped);
-	    return false;
+	    return FALSE;
 	}
 
 	op = &ep_context[epnum].op[op_indx];
@@ -194,7 +194,7 @@ DT_handle_send_op (DT_Tdep_Print_Head *p
 			  "Send"))
 	{
 	    DT_Mdep_Free (completion_reaped);
-	    return false;
+	    return FALSE;
 	}
 
 	if (completion_reaped[epnum])
@@ -204,7 +204,7 @@ DT_handle_send_op (DT_Tdep_Print_Head *p
 			   ep_context[epnum].ep_handle, epnum);
 	    DT_Test_Error ();
 	    DT_Mdep_Free (completion_reaped);
-	    return ( false );
+	    return ( FALSE );
 	}
 	completion_reaped[epnum] = 1;
     }
@@ -218,12 +218,12 @@ DT_handle_send_op (DT_Tdep_Print_Head *p
 			   ep_context[i].ep_handle, i);
 	    DT_Test_Error ();
 	    DT_Mdep_Free (completion_reaped);
-	    return ( false );
+	    return ( FALSE );
 	}
     }
 
     DT_Mdep_Free (completion_reaped);
-    return true;
+    return TRUE;
 }
 
 
@@ -232,15 +232,15 @@ DT_handle_send_op (DT_Tdep_Print_Head *p
  * then if requested reap the corresponding send ops,
  * and re-post all of the recv buffers.
  */
-bool
+boolean_t
 DT_handle_recv_op (DT_Tdep_Print_Head *phead,
 		  Ep_Context_t * ep_context,
 		  DAT_EVD_HANDLE recv_evd_hdl,
 		  DAT_EVD_HANDLE reqt_evd_hdl,
 		  unsigned int num_eps,
 		  int op_indx,
-		  bool poll,
-		  bool repost_recv)
+		  boolean_t poll,
+		  boolean_t repost_recv)
 {
     unsigned int    i;
     unsigned char   *recv_completion_reaped;
@@ -249,14 +249,14 @@ DT_handle_recv_op (DT_Tdep_Print_Head *p
     recv_completion_reaped = DT_Mdep_Malloc (num_eps);
     if (recv_completion_reaped == NULL)
     {
-	return false;
+	return FALSE;
     }
 
     send_completion_reaped = DT_Mdep_Malloc (num_eps);
     if (send_completion_reaped == NULL)
     {
 	DT_Mdep_Free (recv_completion_reaped);
-	return false;
+	return FALSE;
     }
 
     /* Foreach EP, reap */
@@ -274,7 +274,7 @@ DT_handle_recv_op (DT_Tdep_Print_Head *p
 	{
 	    DT_Mdep_Free (recv_completion_reaped);
 	    DT_Mdep_Free (send_completion_reaped);
-	    return false;
+	    return FALSE;
 	}
 
 	epnum = dto_stat.user_cookie.as_64 >> 32;
@@ -288,7 +288,7 @@ DT_handle_recv_op (DT_Tdep_Print_Head *p
 	    DT_Test_Error ();
 	    DT_Mdep_Free (recv_completion_reaped);
 	    DT_Mdep_Free (send_completion_reaped);
-	    return false;
+	    return FALSE;
 	}
 
 	op = &ep_context[epnum].op[op_indx];
@@ -308,7 +308,7 @@ DT_handle_recv_op (DT_Tdep_Print_Head *p
 	    DT_Test_Error ();
 	    DT_Mdep_Free (recv_completion_reaped);
 	    DT_Mdep_Free (send_completion_reaped);
-	    return false;
+	    return FALSE;
 	}
 
 	if (recv_completion_reaped[epnum])
@@ -319,7 +319,7 @@ DT_handle_recv_op (DT_Tdep_Print_Head *p
 	    DT_Test_Error ();
 	    DT_Mdep_Free (recv_completion_reaped);
 	    DT_Mdep_Free (send_completion_reaped);
-	    return ( false );
+	    return ( FALSE );
 	}
 	recv_completion_reaped[epnum] = 1;
 
@@ -337,14 +337,14 @@ DT_handle_recv_op (DT_Tdep_Print_Head *p
 				" but current op == #%d\n", op_indx);
 		DT_Mdep_Free (recv_completion_reaped);
 		DT_Mdep_Free (send_completion_reaped);
-		return false;
+		return FALSE;
 	    }
 
 	    if (!DT_dto_event_reap (phead, reqt_evd_hdl, poll, &dto_stat))
 	    {
 		DT_Mdep_Free (recv_completion_reaped);
 		DT_Mdep_Free (send_completion_reaped);
-		return false;
+		return FALSE;
 	    }
 
 	    epnum = dto_stat.user_cookie.as_64 >> 32;
@@ -358,7 +358,7 @@ DT_handle_recv_op (DT_Tdep_Print_Head *p
 		DT_Test_Error ();
 		DT_Mdep_Free (recv_completion_reaped);
 		DT_Mdep_Free (send_completion_reaped);
-		return false;
+		return FALSE;
 	    }
 
 	    /*
@@ -388,7 +388,7 @@ DT_handle_recv_op (DT_Tdep_Print_Head *p
 		DT_Test_Error ();
 		DT_Mdep_Free (recv_completion_reaped);
 		DT_Mdep_Free (send_completion_reaped);
-		return false;
+		return FALSE;
 	    }
 
 	    if (send_completion_reaped[epnum])
@@ -399,7 +399,7 @@ DT_handle_recv_op (DT_Tdep_Print_Head *p
 		DT_Test_Error ();
 		DT_Mdep_Free (recv_completion_reaped);
 		DT_Mdep_Free (send_completion_reaped);
-		return ( false );
+		return ( FALSE );
 	    }
 	    send_completion_reaped[epnum] = 1;
 	}
@@ -415,7 +415,7 @@ DT_handle_recv_op (DT_Tdep_Print_Head *p
 	    DT_Test_Error ();
 	    DT_Mdep_Free (recv_completion_reaped);
 	    DT_Mdep_Free (send_completion_reaped);
-	    return ( false );
+	    return ( FALSE );
 	}
     }
 
@@ -432,7 +432,7 @@ DT_handle_recv_op (DT_Tdep_Print_Head *p
 		DT_Test_Error ();
 		DT_Mdep_Free (recv_completion_reaped);
 		DT_Mdep_Free (send_completion_reaped);
-		return ( false );
+		return ( FALSE );
 	    }
 	}
     }
@@ -447,27 +447,27 @@ DT_handle_recv_op (DT_Tdep_Print_Head *p
 	    DT_Test_Error ();
 	    DT_Mdep_Free (recv_completion_reaped);
 	    DT_Mdep_Free (send_completion_reaped);
-	    return false;
+	    return FALSE;
 	}
     }
 
     DT_Mdep_Free (recv_completion_reaped);
     DT_Mdep_Free (send_completion_reaped);
-    return true;
+    return TRUE;
 }
 
 
 /* -----------------------------------------------------------
  * Initiate an RDMA op (synchronous) on each of this thread's EPs.
  */
-bool
+boolean_t
 DT_handle_rdma_op (DT_Tdep_Print_Head *phead,
 		  Ep_Context_t * ep_context,
 		  DAT_EVD_HANDLE reqt_evd_hdl,
 		  unsigned int num_eps,
 		  DT_Transfer_Type opcode,
 		  int op_indx,
-		  bool poll)
+		  boolean_t poll)
 {
     unsigned int    i, j;
     DAT_RETURN      ret;
@@ -477,7 +477,7 @@ DT_handle_rdma_op (DT_Tdep_Print_Head *p
 
     if (!completion_reaped)
     {
-	return false;
+	return FALSE;
     }
 
     /* Initiate the operation */
@@ -542,7 +542,7 @@ DT_handle_rdma_op (DT_Tdep_Print_Head *p
 			DT_RetToString (ret));
 	    DT_Test_Error ();
 	    DT_Mdep_Free (completion_reaped);
-	    return ( false );
+	    return ( FALSE );
 	}
 	else
 	{
@@ -565,7 +565,7 @@ DT_handle_rdma_op (DT_Tdep_Print_Head *p
 	if (!DT_dto_event_reap (phead, reqt_evd_hdl, poll, &dto_stat))
 	{
 	    DT_Mdep_Free (completion_reaped);
-	    return ( false );
+	    return ( FALSE );
 	}
 
 	epnum = dto_stat.user_cookie.as_64 >> 32;
@@ -578,7 +578,7 @@ DT_handle_rdma_op (DT_Tdep_Print_Head *p
 			   dto_stat.transfered_length);
 	    DT_Test_Error ();
 	    DT_Mdep_Free (completion_reaped);
-	    return false;
+	    return FALSE;
 	}
 	op = &ep_context[epnum].op[op_indx];
 
@@ -594,7 +594,7 @@ DT_handle_rdma_op (DT_Tdep_Print_Head *p
 			    (opcode == RDMA_WRITE ? "RDMA/WR" : "RDMA/RD")))
 	{
 	    DT_Mdep_Free (completion_reaped);
-	    return ( false );
+	    return ( FALSE );
 	}
 
 	if (completion_reaped[epnum])
@@ -604,7 +604,7 @@ DT_handle_rdma_op (DT_Tdep_Print_Head *p
 			   ep_context[epnum].ep_handle, epnum);
 	    DT_Test_Error ();
 	    DT_Mdep_Free (completion_reaped);
-	    return ( false );
+	    return ( FALSE );
 	}
 	completion_reaped[epnum] = 1;
 
@@ -622,13 +622,13 @@ DT_handle_rdma_op (DT_Tdep_Print_Head *p
 			   ep_context[i].ep_handle, i);
 	    DT_Test_Error ();
 	    DT_Mdep_Free (completion_reaped);
-	    return ( false );
+	    return ( FALSE );
 	}
     }
 
     DT_Mdep_Free (completion_reaped);
 
-    return ( true );
+    return ( TRUE );
 }
 
 
@@ -636,7 +636,7 @@ DT_handle_rdma_op (DT_Tdep_Print_Head *p
  * Verify whether we (the client side) can support
  * the requested 'T' test.
  */
-bool
+boolean_t
 DT_check_params (Per_Test_Data_t  *pt_ptr,
 		unsigned char	 *module)
 {
@@ -646,7 +646,7 @@ DT_check_params (Per_Test_Data_t  *pt_pt
     unsigned long	num_rdma_wr = 0U;
     unsigned long	max_size    = 0U;
     unsigned long	max_segs    = 0U;
-    bool		rval	    = true;
+    boolean_t 	rval	    = TRUE;
     unsigned int	i;
     DT_Tdep_Print_Head *phead;
 
@@ -715,13 +715,13 @@ DT_check_params (Per_Test_Data_t  *pt_pt
     }
     case QUIT_TEST:
     {
-        return true;
+        return TRUE;
     }
 
     default:
     {
         DT_Tdep_PT_Printf (phead, "Unknown Test Type\n");
-        return false;
+        return FALSE;
     }
     }
 
@@ -748,7 +748,7 @@ DT_check_params (Per_Test_Data_t  *pt_pt
 			module,
 			num_recvs > num_sends ? num_recvs : num_sends,
 			pt_ptr->ia_attr.max_dto_per_ep);
-	rval = false;
+	rval = FALSE;
     }
     if (max_size > pt_ptr->ia_attr.max_lmr_block_size)
     {
@@ -758,7 +758,7 @@ DT_check_params (Per_Test_Data_t  *pt_pt
 			module,
 			max_size,
 			pt_ptr->ia_attr.max_lmr_block_size);
-	rval = false;
+	rval = FALSE;
     }
     if (max_segs > pt_ptr->ep_attr.max_recv_iov ||
 	max_segs > pt_ptr->ep_attr.max_request_iov)
@@ -775,7 +775,7 @@ DT_check_params (Per_Test_Data_t  *pt_pt
 			max_segs,
 			pt_ptr->ep_attr.max_request_iov,
 			pt_ptr->ep_attr.max_recv_iov );
-	rval = false;
+	rval = FALSE;
     }
 
     return ( rval );
Index: linux-kernel/test/dapltest/test/dapl_fft_pz.c
===================================================================
--- linux-kernel/test/dapltest/test/dapl_fft_pz.c	(revision 2306)
+++ linux-kernel/test/dapltest/test/dapl_fft_pz.c	(working copy)
@@ -188,7 +188,7 @@ int DT_pz_case2 (Params_t *params_ptr, F
     /* allocate and register bpool */
     bpool = DT_BpoolAlloc (NULL, phead, ia_handle, pz_handle, NULL,
                            NULL, BUFFSIZE, 1, 256 /* FIXME query */,
-                           false, false);
+                           FALSE, FALSE);
     DT_assert (phead, bpool != 0);
 
     if (pz_handle)
@@ -200,7 +200,7 @@ int DT_pz_case2 (Params_t *params_ptr, F
 cleanup:
 
     /* deregister and free bpool */
-    if (DT_Bpool_Destroy (NULL, phead, bpool)==false)
+    if (DT_Bpool_Destroy (NULL, phead, bpool)==FALSE)
     {
 	DT_Tdep_PT_Printf (phead, "Warning: Destroy bpool fails, reboot for cleanup\n");
 	return 0;
Index: linux-kernel/test/dapltest/include/dapl_server_cmd.h
===================================================================
--- linux-kernel/test/dapltest/include/dapl_server_cmd.h	(revision 2306)
+++ linux-kernel/test/dapltest/include/dapl_server_cmd.h	(working copy)
@@ -32,7 +32,7 @@
 
 typedef struct
 {
-    bool            debug;		/* -d */
+    boolean_t            debug;		/* -d */
     char            dapl_name[256];	/* -D device name */
     DAT_QOS         ReliabilityLevel;	/* -R */
     DAT_MEM_TYPE    DT_mem_type; /* -M */ 
Index: linux-kernel/test/dapltest/include/dapl_global.h
===================================================================
--- linux-kernel/test/dapltest/include/dapl_global.h	(revision 2306)
+++ linux-kernel/test/dapltest/include/dapl_global.h	(working copy)
@@ -31,6 +31,6 @@
 #include "dapl_proto.h"
 
 extern DAT_COUNT        DT_dapltest_debug;
-extern bool             DT_local_is_little_endian;
+extern boolean_t             DT_local_is_little_endian;
 
 #endif
Index: linux-kernel/test/dapltest/include/dapl_fft_cmd.h
===================================================================
--- linux-kernel/test/dapltest/include/dapl_fft_cmd.h	(revision 2306)
+++ linux-kernel/test/dapltest/include/dapl_fft_cmd.h	(working copy)
@@ -58,7 +58,7 @@ typedef struct
     FFT_Type_e		fft_type;
     char 		device_name[256];	/* -D */
     char		server_name[256];
-    bool		cases_flag[MAXCASES];
+    boolean_t 	cases_flag[MAXCASES];
     int 		size;
     int 		num_iter;	/* -i */
     int 		num_threads;	/* -t */
Index: linux-kernel/test/dapltest/include/dapl_proto.h
===================================================================
--- linux-kernel/test/dapltest/include/dapl_proto.h	(revision 2306)
+++ linux-kernel/test/dapltest/include/dapl_proto.h	(working copy)
@@ -91,7 +91,7 @@ Bpool *         DT_BpoolAlloc (Per_Test_
 			       boolean_t enable_rdma_write,
 			       boolean_t enable_rdma_read);
 
-bool            DT_Bpool_Destroy (Per_Test_Data_t * pt_ptr,
+boolean_t            DT_Bpool_Destroy (Per_Test_Data_t * pt_ptr,
 				  DT_Tdep_Print_Head *phead,
 				     Bpool * bpool_ptr);
 
@@ -126,7 +126,7 @@ void            DT_init_transaction_stat
 void            DT_transaction_stats_set_ready (DT_Tdep_Print_Head* phead, 
 					Transaction_Stats_t* transaction_stats);
 
-bool            DT_transaction_stats_wait_for_all (DT_Tdep_Print_Head* phead,
+boolean_t            DT_transaction_stats_wait_for_all (DT_Tdep_Print_Head* phead,
 					Transaction_Stats_t* transaction_stats);
 
 void            DT_update_transaction_stats (Transaction_Stats_t * transaction_stats,
@@ -166,22 +166,22 @@ void            Dapltest_Main_Usage (voi
 /* dapl_mdep.c */
 void            DT_Mdep_Init (void);
 void            DT_Mdep_End (void);
-bool            DT_Mdep_GetDefaultDeviceName (char *dapl_name);
+boolean_t            DT_Mdep_GetDefaultDeviceName (char *dapl_name);
 void            DT_Mdep_Sleep (int msec);
 void 		DT_Mdep_Schedule (void);
-bool		DT_Mdep_GetCpuStat (DT_CpuStat *sys_stat);
+boolean_t 	DT_Mdep_GetCpuStat (DT_CpuStat *sys_stat);
 unsigned long   DT_Mdep_GetTime (void);
 double          DT_Mdep_GetCpuMhz (void);
 unsigned long   DT_Mdep_GetContextSwitchNum (void);
 void           *DT_Mdep_Malloc (size_t l_);
 void            DT_Mdep_Free (void *a_);
-bool            DT_Mdep_LockInit (DT_Mdep_LockType * lock_ptr);
+boolean_t            DT_Mdep_LockInit (DT_Mdep_LockType * lock_ptr);
 void            DT_Mdep_LockDestroy (DT_Mdep_LockType * lock_ptr);
 void            DT_Mdep_Lock (DT_Mdep_LockType * lock_ptr);
 void            DT_Mdep_Unlock (DT_Mdep_LockType * lock_ptr);
 void            DT_Mdep_Thread_Init_Attributes (Thread * thread_ptr);
 void            DT_Mdep_Thread_Destroy_Attributes (Thread * thread_ptr);
-bool            DT_Mdep_Thread_Start (Thread * thread_ptr);
+boolean_t            DT_Mdep_Thread_Start (Thread * thread_ptr);
 
 void 			DT_Mdep_Thread_Detach (DT_Mdep_ThreadHandleType thread_id);
 DT_Mdep_ThreadHandleType DT_Mdep_Thread_SELF ( void );
@@ -208,7 +208,7 @@ void            DT_MemListFree (Per_Test
 void            DT_PrintMemList (Per_Test_Data_t * pt_ptr);
 
 /* dapl_netaddr.c */
-bool            DT_NetAddrLookupHostAddress (DAT_IA_ADDRESS_PTR to_netaddr,
+boolean_t            DT_NetAddrLookupHostAddress (DAT_IA_ADDRESS_PTR to_netaddr,
 					     char *hostname);
 
 DAT_IA_ADDRESS_PTR DT_NetAddrAlloc (Per_Test_Data_t * pt_ptr);
@@ -217,16 +217,16 @@ void            DT_NetAddrFree (Per_Test
 				DAT_IA_ADDRESS_PTR netaddr);
 
 /* dapl_params.c */
-bool            DT_Params_Parse (int argc,
+boolean_t            DT_Params_Parse (int argc,
 				char *argv[],
 				Params_t * params_ptr);
 
 /* dapl_performance_cmd.c */
 const char *    DT_PerformanceModeToString (Performance_Mode_Type mode);
 
-bool            DT_Performance_Cmd_Init (Performance_Cmd_t * cmd);
+boolean_t            DT_Performance_Cmd_Init (Performance_Cmd_t * cmd);
 
-bool            DT_Performance_Cmd_Parse (Performance_Cmd_t * cmd,
+boolean_t            DT_Performance_Cmd_Parse (Performance_Cmd_t * cmd,
 					  int my_argc,
 					  char **my_argv,
 					  mygetopt_t * opts);
@@ -243,11 +243,11 @@ int             DT_Performance_Test_Clie
 					       DAT_IA_HANDLE * ia_handle,
 					       DAT_IA_ADDRESS_PTR remote);
 
-bool            DT_Performance_Test_Client_Connect (
+boolean_t            DT_Performance_Test_Client_Connect (
 	DT_Tdep_Print_Head *phead,
 	Performance_Test_t * test_ptr);
 
-bool            DT_Performance_Test_Client_Exchange (
+boolean_t            DT_Performance_Test_Client_Exchange (
 	Params_t	   *params_ptr,
 	DT_Tdep_Print_Head *phead,
 	Performance_Test_t *test_ptr);
@@ -255,16 +255,16 @@ bool            DT_Performance_Test_Clie
 /* dapl_performance_server.c */
 void            DT_Performance_Test_Server (void * pt_ptr);
 
-bool            DT_Performance_Test_Server_Connect (
+boolean_t            DT_Performance_Test_Server_Connect (
 	DT_Tdep_Print_Head *phead,
 	Performance_Test_t * test_ptr);
 
-bool            DT_Performance_Test_Server_Exchange (
+boolean_t            DT_Performance_Test_Server_Exchange (
 	DT_Tdep_Print_Head *phead,
 	Performance_Test_t *test_ptr);
 
 /* dapl_performance_util.c */
-bool            DT_Performance_Test_Create (Per_Test_Data_t * pt_ptr,
+boolean_t            DT_Performance_Test_Create (Per_Test_Data_t * pt_ptr,
 					   DAT_IA_HANDLE * ia_handle,
 					   DAT_IA_ADDRESS_PTR remote_ia_addr,
 					   boolean_t is_server,
@@ -275,7 +275,7 @@ int             DT_Performance_Test_Dest
 					    Performance_Test_t *test_ptr,
 					    boolean_t is_server);
 
-bool            DT_performance_post_rdma_op (Performance_Ep_Context_t *ep_context,
+boolean_t            DT_performance_post_rdma_op (Performance_Ep_Context_t *ep_context,
 					    DAT_EVD_HANDLE 	reqt_evd_hdl,
 					    Performance_Stats_t *stats);
 
@@ -326,7 +326,7 @@ int             DT_cs_Server (Params_t *
 /* dapl_server_cmd.c */
 void            DT_Server_Cmd_Init (Server_Cmd_t * Server_Cmd);
 
-bool            DT_Server_Cmd_Parse (Server_Cmd_t * Server_Cmd,
+boolean_t            DT_Server_Cmd_Parse (Server_Cmd_t * Server_Cmd,
 						     int my_argc,
 						     char **my_argv,
 						     mygetopt_t * opts);
@@ -365,50 +365,50 @@ boolean_t     DT_post_send_buffer (DT_Td
 					int index,
 					int size);
 
-bool            DT_conn_event_wait (DT_Tdep_Print_Head* phead,  
+boolean_t            DT_conn_event_wait (DT_Tdep_Print_Head* phead,  
     				       DAT_EP_HANDLE ep_handle,
 				       DAT_EVD_HANDLE evd_handle,
 				       DAT_EVENT_NUMBER *event_number);
 
-bool		DT_disco_event_wait ( DT_Tdep_Print_Head* phead, 
+boolean_t 	DT_disco_event_wait ( DT_Tdep_Print_Head* phead, 
 				    DAT_EVD_HANDLE evd_handle,
 				      DAT_EP_HANDLE  *ep_handle );
 
-bool            DT_cr_event_wait (DT_Tdep_Print_Head* phead, 
+boolean_t            DT_cr_event_wait (DT_Tdep_Print_Head* phead, 
 				DAT_EVD_HANDLE evd_handle,
 				  struct dat_cr_arrival_event_data *cr_stat_p);
 
-bool            DT_dto_event_reap (DT_Tdep_Print_Head* phead, 
+boolean_t            DT_dto_event_reap (DT_Tdep_Print_Head* phead, 
 				   DAT_EVD_HANDLE evd_handle,
-				   bool poll,
+				   boolean_t poll,
 				   struct dat_dto_completion_event_data *dtop);
 
-bool            DT_dto_event_wait (DT_Tdep_Print_Head* phead, 
+boolean_t            DT_dto_event_wait (DT_Tdep_Print_Head* phead, 
 				   DAT_EVD_HANDLE evd_handle,
 				   struct dat_dto_completion_event_data *dtop);
 
-bool            DT_dto_event_poll (DT_Tdep_Print_Head* phead, 
+boolean_t            DT_dto_event_poll (DT_Tdep_Print_Head* phead, 
 				   DAT_EVD_HANDLE evd_handle,
 				   struct dat_dto_completion_event_data *dtop);
 
-bool            DT_rmr_event_wait (DT_Tdep_Print_Head* phead, 
+boolean_t            DT_rmr_event_wait (DT_Tdep_Print_Head* phead, 
 				DAT_EVD_HANDLE evd_handle,
 			struct dat_rmr_bind_completion_event_data *rmr_ptr);
 
-bool            DT_dto_check ( DT_Tdep_Print_Head* phead, 
+boolean_t            DT_dto_check ( DT_Tdep_Print_Head* phead, 
 				  struct dat_dto_completion_event_data *dto_p,
 				  DAT_EP_HANDLE   ep_expected,
 				  DAT_COUNT       len_expected,
 				  DAT_DTO_COOKIE  cookie_expected,
 				  char            *message);
 
-bool            DT_rmr_check ( DT_Tdep_Print_Head* phead, 
+boolean_t            DT_rmr_check ( DT_Tdep_Print_Head* phead, 
 			      struct dat_rmr_bind_completion_event_data *rmr_p,
 				  DAT_RMR_HANDLE  rmr_expected,
 				  DAT_PVOID       cookie_expected,
 				  char            *message);
 
-bool            DT_cr_check (DT_Tdep_Print_Head* phead, 
+boolean_t            DT_cr_check (DT_Tdep_Print_Head* phead, 
 				struct dat_cr_arrival_event_data *cr_stat_p,
 				DAT_PSP_HANDLE psp_handle_expected,
 				DAT_CONN_QUAL  port_expected,
@@ -428,20 +428,20 @@ Thread         *DT_Thread_Create (Per_Te
 void            DT_Thread_Destroy (Thread * thread_ptr,
 				    Per_Test_Data_t * pt_ptr);
 
-bool            DT_Thread_Start (Thread * thread_ptr);
+boolean_t            DT_Thread_Start (Thread * thread_ptr);
 
 /* dapl_quit_cmd.c */
 void            DT_Quit_Cmd_Init (Quit_Cmd_t * cmd);
 
-bool            DT_Quit_Cmd_Parse (Quit_Cmd_t * cmd,
+boolean_t            DT_Quit_Cmd_Parse (Quit_Cmd_t * cmd,
 				   int my_argc,
 				   char **my_argv,
 				   mygetopt_t * opts);
 
-bool            DT_Quit_Cmd_Validate (Quit_Cmd_t * cmd);
+boolean_t            DT_Quit_Cmd_Validate (Quit_Cmd_t * cmd);
 
 void            DT_Quit_Cmd_Endian (Quit_Cmd_t * cmd,
-				    bool to_wire);
+				    boolean_t to_wire);
 
 void            DT_Quit_Cmd_Print (Quit_Cmd_t * cmd);
 void            DT_Quit_Cmd_PT_Print (DT_Tdep_Print_Head *phead, Quit_Cmd_t * cmd);
@@ -451,7 +451,7 @@ void            DT_Quit_Cmd_Usage (void)
 /* dapl_transaction_cmd.c */
 void            DT_Transaction_Cmd_Init (Transaction_Cmd_t * cmd);
 
-bool            DT_Transaction_Cmd_Parse (Transaction_Cmd_t * cmd,
+boolean_t            DT_Transaction_Cmd_Parse (Transaction_Cmd_t * cmd,
 					  int my_argc,
 					  char **my_argv,
 					  mygetopt_t * opts);
@@ -461,7 +461,7 @@ void            DT_Transaction_Cmd_PT_Pr
 					    Transaction_Cmd_t * cmd);
 
 void            DT_Transaction_Cmd_Endian (Transaction_Cmd_t * cmd,
-					   bool to_wire);
+					   boolean_t to_wire);
 /* dapl_transaction_test.c */
 int             DT_Transaction_Test_Client (Per_Test_Data_t * pt_ptr,
 					    DAT_IA_HANDLE ia_handle,
@@ -469,7 +469,7 @@ int             DT_Transaction_Test_Clie
 
 void            DT_Transaction_Test_Server (void *params);
 
-bool            DT_Transaction_Create_Test (Per_Test_Data_t * pt_ptr,
+boolean_t            DT_Transaction_Create_Test (Per_Test_Data_t * pt_ptr,
 					    DAT_IA_HANDLE * ia_handle,
 					    boolean_t is_server,
 					    unsigned int port_num,
@@ -477,47 +477,47 @@ bool            DT_Transaction_Create_Te
 					    DAT_IA_ADDRESS_PTR remote_ia_addr);
 
 void            DT_Transaction_Main (void *param);
-bool            DT_Transaction_Run (DT_Tdep_Print_Head* phead, 
+boolean_t            DT_Transaction_Run (DT_Tdep_Print_Head* phead, 
 						 Transaction_Test_t * test_ptr);
 void            DT_Transaction_Validation_Fill (DT_Tdep_Print_Head* phead, 
 						 Transaction_Test_t * test_ptr,
 						unsigned int iteration);
-bool            DT_Transaction_Validation_Check (DT_Tdep_Print_Head* phead, 
+boolean_t            DT_Transaction_Validation_Check (DT_Tdep_Print_Head* phead, 
 						 Transaction_Test_t * test_ptr,
 						 int iteration);
 void            DT_Print_Transaction_Test (DT_Tdep_Print_Head* phead, 
 					    Transaction_Test_t* test_ptr);
 /* dapl_transaction_util.c */
-bool            DT_handle_post_recv_buf (DT_Tdep_Print_Head* phead, 
+boolean_t            DT_handle_post_recv_buf (DT_Tdep_Print_Head* phead, 
 					Ep_Context_t * ep_context,
 					      unsigned int num_eps,
 					      int op_indx);
 
-bool            DT_handle_send_op (DT_Tdep_Print_Head* phead, 
+boolean_t            DT_handle_send_op (DT_Tdep_Print_Head* phead, 
 					Ep_Context_t * ep_context,
 					DAT_EVD_HANDLE reqt_evd_hdl,
 					unsigned int num_eps,
 					int op_indx,
-					bool poll);
+					boolean_t poll);
 
-bool            DT_handle_recv_op (DT_Tdep_Print_Head* phead, 
+boolean_t            DT_handle_recv_op (DT_Tdep_Print_Head* phead, 
 					Ep_Context_t * ep_context,
 					DAT_EVD_HANDLE recv_evd_hdl,
 					DAT_EVD_HANDLE reqt_evd_hdl,
 					unsigned int num_eps,
 					int op_indx,
-					bool poll,
-					bool repost_recv);
+					boolean_t poll,
+					boolean_t repost_recv);
 
-bool            DT_handle_rdma_op (DT_Tdep_Print_Head* phead, 
+boolean_t            DT_handle_rdma_op (DT_Tdep_Print_Head* phead, 
 					Ep_Context_t * ep_context,
 					DAT_EVD_HANDLE reqt_evd_hdl,
 					unsigned int num_eps,
 					DT_Transfer_Type opcode,
 					int op_indx,
-					bool poll);
+					boolean_t poll);
 
-bool            DT_check_params (Per_Test_Data_t     *pt_ptr,
+boolean_t            DT_check_params (Per_Test_Data_t     *pt_ptr,
 				    unsigned char	*module);
 
 void        	DT_Test_Error (void);
@@ -544,7 +544,7 @@ DAT_COUNT       DT_RoundSize (DAT_COUNT 
 /* dapl_limit_cmd.c */
 void	    DT_Limit_Cmd_Init (	Limit_Cmd_t * cmd);
 
-bool	    DT_Limit_Cmd_Parse ( Limit_Cmd_t * cmd,
+boolean_t     DT_Limit_Cmd_Parse ( Limit_Cmd_t * cmd,
 					int my_argc,
 					char **my_argv,
 					mygetopt_t * opts);
@@ -557,7 +557,7 @@ void        DT_cs_Limit (Params_t *param
 /* dapl_fft_cmd.c */
 void	    DT_FFT_Cmd_Init ( FFT_Cmd_t * cmd);
 
-bool	    DT_FFT_Cmd_Parse ( FFT_Cmd_t * cmd,
+boolean_t     DT_FFT_Cmd_Parse ( FFT_Cmd_t * cmd,
 					int my_argc,
 					char **my_argv,
 					mygetopt_t * opts);
@@ -581,7 +581,7 @@ int	    DT_hwconn_case7 (Params_t *param
 /* dapl_fft_endpoint.c */
 void	    DT_endpoint_test (Params_t *params_ptr, FFT_Cmd_t *cmd);
 int	    DT_endpoint_generic (Params_t *params_ptr, FFT_Cmd_t *cmd,
-				 bool destroy_pz_early);
+				 boolean_t destroy_pz_early);
 int	    DT_endpoint_case0 (Params_t *params_ptr, FFT_Cmd_t *cmd);
 int	    DT_endpoint_case1 (Params_t *params_ptr, FFT_Cmd_t *cmd);
 int	    DT_endpoint_case2 (Params_t *params_ptr, FFT_Cmd_t *cmd);
Index: linux-kernel/test/dapltest/include/dapl_test_data.h
===================================================================
--- linux-kernel/test/dapltest/include/dapl_test_data.h	(revision 2306)
+++ linux-kernel/test/dapltest/include/dapl_test_data.h	(working copy)
@@ -76,7 +76,7 @@ typedef struct
     int             	Thread_counter;
     Thread         	*thread;
 
-    bool            	local_is_server;
+    boolean_t            	local_is_server;
     Server_Info_t   	Server_Info;
     Client_Info_t   	Client_Info;
     Params_t        	Params;
Index: linux-kernel/test/dapltest/include/dapl_fft_util.h
===================================================================
--- linux-kernel/test/dapltest/include/dapl_fft_util.h	(revision 2306)
+++ linux-kernel/test/dapltest/include/dapl_fft_util.h	(working copy)
@@ -68,7 +68,7 @@ typedef struct
     DAT_EVENT_NUMBER event_num;
     DAT_IA_ADDRESS_PTR remote_netaddr;
     Per_Test_Data_t *pt_ptr;
-    bool connected;
+    boolean_t connected;
 } FFT_Connection_t;
 
 typedef enum
Index: linux-kernel/test/dapltest/include/dapl_params.h
===================================================================
--- linux-kernel/test/dapltest/include/dapl_params.h	(revision 2306)
+++ linux-kernel/test/dapltest/include/dapl_params.h	(working copy)
@@ -64,8 +64,8 @@ typedef struct
     DAT_QOS         ReliabilityLevel;
     struct sockaddr   server_netaddr;
     void *	    phead;
-    bool	    local_is_little_endian;
-    bool	    debug;
+    boolean_t     local_is_little_endian;
+    boolean_t     debug;
     DAT_MEM_TYPE    mem_type;
     Transaction_Stats2_t Client_Stats_T;
     Performance_Stats_t Client_Stats_P;
Index: linux-kernel/test/dapltest/cmd/dapl_netaddr.c
===================================================================
--- linux-kernel/test/dapltest/cmd/dapl_netaddr.c	(revision 2306)
+++ linux-kernel/test/dapltest/cmd/dapl_netaddr.c	(working copy)
@@ -48,7 +48,7 @@ DT_NetAddrFree (Per_Test_Data_t * pt_ptr
 }
 
 
-bool
+boolean_t
 DT_NetAddrLookupHostAddress (DAT_IA_ADDRESS_PTR	to_netaddr,
 			    DAT_NAME_PTR 	hostname)
 {
Index: linux-kernel/test/dapltest/cmd/dapl_limit_cmd.c
===================================================================
--- linux-kernel/test/dapltest/cmd/dapl_limit_cmd.c	(revision 2306)
+++ linux-kernel/test/dapltest/cmd/dapl_limit_cmd.c	(working copy)
@@ -39,7 +39,7 @@ DT_Limit_Cmd_Init (Limit_Cmd_t * cmd)
 }
 
 /* --------------------------------------------------- */
-bool
+boolean_t
 DT_Limit_Cmd_Parse ( Limit_Cmd_t * cmd,
 		    int my_argc,
 		    char **my_argv,
@@ -70,7 +70,7 @@ DT_Limit_Cmd_Parse ( Limit_Cmd_t * cmd,
 	    case 'd':		    /* print debug messages */
 	    {
 		DT_dapltest_debug++;
-		cmd->debug = true;
+		cmd->debug = TRUE;
 		break;
 	    }
 	    case 'm':		/* maximum for exhaustion testing */
@@ -81,7 +81,7 @@ DT_Limit_Cmd_Parse ( Limit_Cmd_t * cmd,
 		{
 		    DT_Mdep_printf ("Syntax Error -m<maximum> option\n");
 		    DT_Limit_Cmd_Usage ();
-		    return (false);
+		    return (FALSE);
 		}
 		cmd->maximum = atol (opts->optarg);
 		break;
@@ -94,7 +94,7 @@ DT_Limit_Cmd_Parse ( Limit_Cmd_t * cmd,
 		{
 		    DT_Mdep_printf ("Syntax Error -w<width> option\n");
 		    DT_Limit_Cmd_Usage ();
-		    return (false);
+		    return (FALSE);
 		}
 		cmd->width = atol (opts->optarg);
 		break;
@@ -104,7 +104,7 @@ DT_Limit_Cmd_Parse ( Limit_Cmd_t * cmd,
 	    {
 		DT_Mdep_printf ("Invalid Limit Test Parameter: %c\n", c);
 		DT_Limit_Cmd_Usage ();
-		return (false);
+		return (FALSE);
 	    }
 	}
     }
@@ -114,7 +114,7 @@ DT_Limit_Cmd_Parse ( Limit_Cmd_t * cmd,
 	{
 	    DT_Mdep_printf ("can't get default device name\n");
 	    DT_Limit_Cmd_Usage ();
-	    return (false);
+	    return (FALSE);
 	}
     }
 
@@ -189,12 +189,12 @@ DT_Limit_Cmd_Parse ( Limit_Cmd_t * cmd,
 
 	    DT_Mdep_printf ("Cannot find this limit test: %s\n", my_argv[i]);
 	    DT_Limit_Cmd_Usage ();
-	    return (false);
+	    return (FALSE);
 
 	}	/* end foreach remaining argv */
     }
 
-    return (true);
+    return (TRUE);
 }
 
 /* --------------------------------------------------- */
Index: linux-kernel/test/dapltest/cmd/dapl_fft_cmd.c
===================================================================
--- linux-kernel/test/dapltest/cmd/dapl_fft_cmd.c	(revision 2306)
+++ linux-kernel/test/dapltest/cmd/dapl_fft_cmd.c	(working copy)
@@ -37,7 +37,7 @@ void DT_FFT_Cmd_Init (FFT_Cmd_t *cmd)
     cmd->server_name[0] = '\0';
     for (i=0; i<MAXCASES; i++)
     {
-	cmd->cases_flag[i] = false;
+	cmd->cases_flag[i] = FALSE;
     }
     cmd->size = 0;
     cmd->num_iter = 1000;
@@ -48,7 +48,7 @@ void DT_FFT_Cmd_Init (FFT_Cmd_t *cmd)
 }
 
 /*------------------------------------------------------------------------------*/
-bool DT_FFT_Cmd_Parse (FFT_Cmd_t *cmd,
+boolean_t DT_FFT_Cmd_Parse (FFT_Cmd_t *cmd,
 		    int               my_argc,
 		    char              ** my_argv,
 		    mygetopt_t        *opts)
@@ -83,7 +83,7 @@ bool DT_FFT_Cmd_Parse (FFT_Cmd_t *cmd,
 		{
 		    DT_Mdep_printf ("Syntax Error -i<iterations> option\n");
 		    DT_FFT_Cmd_Usage ();
-		    return (false);
+		    return (FALSE);
 		}
 		cmd->num_iter = atoi (opts->optarg);
 		break;
@@ -95,7 +95,7 @@ bool DT_FFT_Cmd_Parse (FFT_Cmd_t *cmd,
 		{
 		    DT_Mdep_printf ("Syntax Error -t<num_threads> option\n");
 		    DT_FFT_Cmd_Usage ();
-		    return (false);
+		    return (FALSE);
 		}
 		cmd->num_threads = atoi (opts->optarg);
 		break;
@@ -107,7 +107,7 @@ bool DT_FFT_Cmd_Parse (FFT_Cmd_t *cmd,
 		{
 		    DT_Mdep_printf ("Syntax Error -v<num_vis> option\n");
 		    DT_FFT_Cmd_Usage ();
-		    return (false);
+		    return (FALSE);
 		}
 		cmd->num_vis = atoi (opts->optarg);
 		break;
@@ -207,7 +207,7 @@ bool DT_FFT_Cmd_Parse (FFT_Cmd_t *cmd,
 		    DT_Mdep_printf ("don't know this function feature: %s\n",
 			opts->optarg);
 		    DT_FFT_Cmd_Usage ();
-		    return (false);
+		    return (FALSE);
 		}
 	    }
 	    case 'R':  /* Service Reliability Level */
@@ -217,7 +217,7 @@ bool DT_FFT_Cmd_Parse (FFT_Cmd_t *cmd,
 		{
 		    DT_Mdep_printf ("Invalid FFT Test Parameter: %c\n", c);
 		    DT_FFT_Cmd_Usage ();
-		    return (false);
+		    return (FALSE);
 		}
 		break;
 	    }
@@ -227,7 +227,7 @@ bool DT_FFT_Cmd_Parse (FFT_Cmd_t *cmd,
 	    {
 		DT_Mdep_printf ("Invalid FFT Test Parameter: %c\n", c);
 		DT_FFT_Cmd_Usage ();
-		return (false);
+		return (FALSE);
 	    }
 	}
     }
@@ -237,7 +237,7 @@ bool DT_FFT_Cmd_Parse (FFT_Cmd_t *cmd,
 	{
 	    DT_Mdep_printf ("can't get default device name\n");
 	    DT_FFT_Cmd_Usage ();
-	    return (false);
+	    return (FALSE);
 	}
     }
 
@@ -245,7 +245,7 @@ bool DT_FFT_Cmd_Parse (FFT_Cmd_t *cmd,
     {
 	DT_Mdep_printf ("must define the function feature with -f to test\n");
 	DT_FFT_Cmd_Usage ();
-	return (false);
+	return (FALSE);
     }
     if (cmd->server_name[0] =='\0' &&
 	(cmd->fft_type==CONNMGT_CLIENT || cmd->fft_type == DATAXFER_CLIENT ||
@@ -253,7 +253,7 @@ bool DT_FFT_Cmd_Parse (FFT_Cmd_t *cmd,
     {
 	DT_Mdep_printf ("must define the server name with -s option\n");
 	DT_FFT_Cmd_Usage ();
-	return (false);
+	return (FALSE);
     }
 
     if (cmd->server_name[0] =='\0' && cmd->fft_type==NS )
@@ -261,7 +261,7 @@ bool DT_FFT_Cmd_Parse (FFT_Cmd_t *cmd,
 	DT_Mdep_printf ("\
 	    Must specify host name or host IP address with -s option to be tested\n");
 	DT_FFT_Cmd_Usage ();
-	return (false);
+	return (FALSE);
     }
 
     /* now parse the test cases */
@@ -269,9 +269,9 @@ bool DT_FFT_Cmd_Parse (FFT_Cmd_t *cmd,
     {
 	for (i=0; i<cmd->size; i++)
 	{
-	    cmd->cases_flag[i] = true;
+	    cmd->cases_flag[i] = TRUE;
 	}
-	return true;
+	return TRUE;
     }
 
     /* test specified cases */
@@ -282,14 +282,14 @@ bool DT_FFT_Cmd_Parse (FFT_Cmd_t *cmd,
 	{
 	    DT_Mdep_printf ("test cases format is not correct: %s\n", my_argv[i]);
 	    DT_FFT_Cmd_Usage ();
-	    return (false);
+	    return (FALSE);
 	}
 	len = strspn (my_argv[i] + 4, "0123456789");
 	if (len==0 || len != strlen (my_argv[i] + 4) )
 	{
 	    DT_Mdep_printf ("must specify case number: %s\n", my_argv[i]);
 	    DT_FFT_Cmd_Usage ();
-	    return (false);
+	    return (FALSE);
 	}
 	caseNum = atoi (my_argv[i] + 4);
 	if (caseNum<0 || caseNum>=cmd->size)
@@ -297,12 +297,12 @@ bool DT_FFT_Cmd_Parse (FFT_Cmd_t *cmd,
 	    DT_Mdep_printf ("test case number must be within range : 0 -- %d\n",
 		cmd->size-1);
 	    DT_FFT_Cmd_Usage ();
-	    return (false);
+	    return (FALSE);
 	}
-	cmd->cases_flag[caseNum] = true;
+	cmd->cases_flag[caseNum] = TRUE;
 	i++;
     }
-    return (true);
+    return (TRUE);
 }
 
 /*--------------------------------------------------------------*/
Index: linux-kernel/test/dapltest/cmd/dapl_params.c
===================================================================
--- linux-kernel/test/dapltest/cmd/dapl_params.c	(revision 2306)
+++ linux-kernel/test/dapltest/cmd/dapl_params.c	(working copy)
@@ -32,7 +32,7 @@
 
 
 /* Parse command line arguments */
-bool
+boolean_t
 DT_Params_Parse (int argc, char *argv[], Params_t * params_ptr)
 {
     Server_Cmd_t   	*Server_Cmd;
@@ -73,9 +73,9 @@ DT_Params_Parse (int argc, char *argv[],
 	if (!DT_Mdep_GetDefaultDeviceName (Server_Cmd->dapl_name))
 	{
 	    DT_Mdep_printf ("can't get default device name\n");
-	    return false;
+	    return FALSE;
 	}
-	return true;
+	return TRUE;
     }
     /* check for a script file */
     if (strncmp (argv[1], "-f", 2) == 0)
@@ -273,7 +273,7 @@ DT_Params_Parse (int argc, char *argv[],
 	    params_ptr->mem_type = FFT_Cmd->DT_mem_type;
             DT_NetAddrLookupHostAddress (&params_ptr->server_netaddr,
                                          FFT_Cmd->server_name);
-	    params_ptr->debug = false;
+	    params_ptr->debug = FALSE;
 	    break;
 	}
 	
@@ -292,7 +292,7 @@ DT_Params_Parse (int argc, char *argv[],
 	}
 	fclose (fd);
     }
-    return true;
+    return TRUE;
 
 main_usage:
     Dapltest_Main_Usage ();
@@ -305,7 +305,7 @@ error_return:
 	}
 	fclose (fd);
     }
-    return false;
+    return FALSE;
 }
 
 DAT_MEM_TYPE
Index: linux-kernel/test/dapltest/cmd/dapl_performance_cmd.c
===================================================================
--- linux-kernel/test/dapltest/cmd/dapl_performance_cmd.c	(revision 2306)
+++ linux-kernel/test/dapltest/cmd/dapl_performance_cmd.c	(working copy)
@@ -58,7 +58,7 @@ DT_Performance_Cmd_Usage (void)
     DT_Mdep_printf ("USAGE:     [seg_size [num_segs] ]      : (4096, 1)\n");
 }
 
-static bool
+static boolean_t
 DT_Performance_Cmd_Parse_Op (
     Performance_Cmd_t * cmd,
     int 		index,
@@ -74,7 +74,7 @@ DT_Performance_Cmd_Parse_Op (
     if ( index == my_argc )
     {
 	DT_Mdep_printf ("Operation Missing Transfer Type\n");
-	return (false);
+	return (FALSE);
     }
 
     for ( i = 0; index < my_argc; i++, index++ )
@@ -94,7 +94,7 @@ DT_Performance_Cmd_Parse_Op (
 		else
 		{
 		    DT_Mdep_printf ("OP type must be <RR/RW/SR>\n");
-		    return (false);
+		    return (FALSE);
 		}
 		break;
 	    }
@@ -111,35 +111,35 @@ DT_Performance_Cmd_Parse_Op (
 	    default:
 	    {
 		DT_Mdep_printf ("Too many OP args\n");
-		return (false);
+		return (FALSE);
 	    }
 	}
     }
 
-    return (true);
+    return (TRUE);
 }
 
 
-static bool
+static boolean_t
 DT_Performance_Cmd_Validate (
     Performance_Cmd_t 		*cmd)
 {
     if ( '\0' == cmd->server_name[0] )
     {
 	DT_Mdep_printf ("Must specify server_name in command line or scriptfile\n");
-	return (false);
+	return (FALSE);
     }
 
     if ( '\0' == cmd->dapl_name[0] )
     {
 	DT_Mdep_printf ("Must specify device_name in command line or scriptfile\n");
-	return (false);
+	return (FALSE);
     }
 
     if ( 0 == cmd->pipeline_len )
     {
 	DT_Mdep_printf ("Pipeline size must not be 0\n");
-	return (false);
+	return (FALSE);
     }
 
     if ( cmd->debug )
@@ -147,10 +147,10 @@ DT_Performance_Cmd_Validate (
 	DT_Performance_Cmd_Print (cmd);
     }
 
-    return true;
+    return TRUE;
 }
 
-bool
+boolean_t
 DT_Performance_Cmd_Parse (
     Performance_Cmd_t 	*cmd,
     int 		my_argc,
@@ -179,7 +179,7 @@ DT_Performance_Cmd_Parse (
 	    case 'd':		    /* print debug messages */
 	    {
 		DT_dapltest_debug++;
-		cmd->debug = true;
+		cmd->debug = TRUE;
 		break;
 	    }
 	    case 'm':		/* mode */
@@ -196,7 +196,7 @@ DT_Performance_Cmd_Parse (
 		{
 		    DT_Mdep_printf ("Syntax Error -m <mode> option\n");
 		    DT_Performance_Cmd_Usage ();
-		    return (false);
+		    return (FALSE);
 		}
 
 		break;
@@ -208,7 +208,7 @@ DT_Performance_Cmd_Parse (
 		{
 		    DT_Mdep_printf ("Syntax Error -i <iterations> option\n");
 		    DT_Performance_Cmd_Usage ();
-		    return (false);
+		    return (FALSE);
 		}
 		cmd->num_iterations = atol (opts->optarg);
 		break;
@@ -220,7 +220,7 @@ DT_Performance_Cmd_Parse (
 		{
 		    DT_Mdep_printf ("Syntax Error -p <piplein> option\n");
 		    DT_Performance_Cmd_Usage ();
-		    return (false);
+		    return (FALSE);
 		}
 		cmd->pipeline_len = atol (opts->optarg);
 		break;
@@ -243,7 +243,7 @@ DT_Performance_Cmd_Parse (
 		{
 		    DT_Mdep_printf ("must specify server name\n");
 		    DT_Performance_Cmd_Usage ();
-		    return (false);
+		    return (FALSE);
 		}
 
 		strncpy (cmd->server_name, opts->optarg, NAME_SZ);
@@ -253,7 +253,7 @@ DT_Performance_Cmd_Parse (
 	    {
 		DT_Mdep_printf ("Invalid Performance Test Parameter: %c\n", c);
 		DT_Performance_Cmd_Usage ();
-		return (false);
+		return (FALSE);
 	    }
 	}
     }
@@ -264,27 +264,27 @@ DT_Performance_Cmd_Parse (
     if ( !DT_Performance_Cmd_Parse_Op (cmd, opts->optind, my_argc, my_argv) )
     {
 	DT_Performance_Cmd_Usage ();
-	return (false);
+	return (FALSE);
     }
 
     if ( !DT_Performance_Cmd_Validate (cmd) )
     {
 	DT_Performance_Cmd_Usage ();
-	return (false);
+	return (FALSE);
     }
 
-    return (true);
+    return (TRUE);
 }
 
 
-bool
+boolean_t
 DT_Performance_Cmd_Init (Performance_Cmd_t * cmd)
 {
     memset (cmd, 0, sizeof (Performance_Cmd_t));
     cmd->dapltest_version = DAPLTEST_VERSION;
     cmd->client_is_little_endian = DT_local_is_little_endian;
     cmd->qos = DAT_QOS_BEST_EFFORT;
-    cmd->debug = false;
+    cmd->debug = FALSE;
     cmd->num_iterations = 1000;
     cmd->pipeline_len = ~0;
 
@@ -296,10 +296,10 @@ DT_Performance_Cmd_Init (Performance_Cmd
     if ( !DT_Mdep_GetDefaultDeviceName (cmd->dapl_name) )
     {
 	DT_Mdep_printf ("can't get default device name\n");
-	return (false);
+	return (FALSE);
     }
 
-    return (true);
+    return (TRUE);
 }
 
 void
Index: linux-kernel/test/dapltest/cmd/dapl_quit_cmd.c
===================================================================
--- linux-kernel/test/dapltest/cmd/dapl_quit_cmd.c	(revision 2306)
+++ linux-kernel/test/dapltest/cmd/dapl_quit_cmd.c	(working copy)
@@ -37,7 +37,7 @@ DT_Quit_Cmd_Init (Quit_Cmd_t * cmd)
 }
 
 /*--------------------------------------------------------- */
-bool
+boolean_t
 DT_Quit_Cmd_Parse (Quit_Cmd_t * cmd,
 	       int my_argc,
 	       char **my_argv,
@@ -67,7 +67,7 @@ DT_Quit_Cmd_Parse (Quit_Cmd_t * cmd,
 	    case 'd':		    /* print debug messages */
 	    {
 		DT_dapltest_debug++;
-		cmd->debug = true;
+		cmd->debug = TRUE;
 		break;
 	    }
 	    case 'R':		    /* Service Reliability Level */
@@ -85,7 +85,7 @@ DT_Quit_Cmd_Parse (Quit_Cmd_t * cmd,
 	    {
 		DT_Mdep_printf ("Invalid Quit option: %c\n", opts->optopt);
 		DT_Quit_Cmd_Usage ();
-		return (false);
+		return (FALSE);
 	    }
 	}
     }
@@ -95,27 +95,27 @@ DT_Quit_Cmd_Parse (Quit_Cmd_t * cmd,
 	{
 	    DT_Mdep_printf ("can't get default device name\n");
 	    DT_Quit_Cmd_Usage ();
-	    return (false);
+	    return (FALSE);
 	}
     }
     if (!DT_Quit_Cmd_Validate (cmd))
     {
 	DT_Quit_Cmd_Usage ();
-	return (false);
+	return (FALSE);
     }
-    return (true);
+    return (TRUE);
 }
 
 /*------------------------------------------------------------------------------ */
-bool
+boolean_t
 DT_Quit_Cmd_Validate (Quit_Cmd_t * cmd)
 {
     if (cmd->server_name[0] == '\0')
     {
 	DT_Mdep_printf ("Must specify server_name in command line or scriptfile\n");
-	return (false);
+	return (FALSE);
     }
-    return (true);
+    return (TRUE);
 }
 
 /*--------------------------------------------------------- */
Index: linux-kernel/test/dapltest/cmd/dapl_transaction_cmd.c
===================================================================
--- linux-kernel/test/dapltest/cmd/dapl_transaction_cmd.c	(revision 2306)
+++ linux-kernel/test/dapltest/cmd/dapl_transaction_cmd.c	(working copy)
@@ -27,7 +27,7 @@
 
 #include "dapl_proto.h"
 
-static bool
+static boolean_t
 DT_Transaction_Cmd_Parse_Op (Transaction_Cmd_t * cmd, char *arg)
 {
     char           *c_ptr;
@@ -43,7 +43,7 @@ DT_Transaction_Cmd_Parse_Op (Transaction
     /* set some defaults */
     cmd->op[op].seg_size = 4096;
     cmd->op[op].num_segs = 1;
-    cmd->op[op].reap_send_on_recv = false;
+    cmd->op[op].reap_send_on_recv = FALSE;
 
     /*
      * packet format: <server/client> <RR/RW/SR> [seg_size] [num_segs]
@@ -57,13 +57,13 @@ DT_Transaction_Cmd_Parse_Op (Transaction
     /* first token is <who>: */
     if (strcmp (c_ptr, "server") == 0)
     {
-	cmd->op[op].server_initiated = true;
+	cmd->op[op].server_initiated = TRUE;
     }
     else
     {
 	if (strcmp (c_ptr, "client") == 0)
 	{
-	    cmd->op[op].server_initiated = false;
+	    cmd->op[op].server_initiated = FALSE;
 	}
 	else
 	{
@@ -119,7 +119,7 @@ DT_Transaction_Cmd_Parse_Op (Transaction
     }
     if (c_ptr && strcmp (c_ptr, "-f") == 0)
     {
-	cmd->op[op].reap_send_on_recv = true;
+	cmd->op[op].reap_send_on_recv = TRUE;
 	if (cmd->op[op].transfer_type != SEND_RECV)
 	{
 	    DT_Mdep_printf ("OP: -f only valid on SEND_RECV\n");
@@ -132,27 +132,27 @@ DT_Transaction_Cmd_Parse_Op (Transaction
 	DT_Mdep_printf ("OP too many args \n");
 	goto error_return;
     }
-    return true;
+    return TRUE;
 
 error_return:
-    return false;
+    return FALSE;
 }
 
-static bool
+static boolean_t
 DT_Transaction_Cmd_Validate (Transaction_Cmd_t * cmd)
 {
     unsigned int    i;
-    bool            has_server_send;
-    bool            has_client_send;
+    boolean_t            has_server_send;
+    boolean_t            has_client_send;
     unsigned int    reap_count;
-    has_server_send = false;
-    has_client_send = false;
+    has_server_send = FALSE;
+    has_client_send = FALSE;
     reap_count = 0;
 
     if (cmd->server_name[0] == '\0')
     {
 	DT_Mdep_printf ("Must specify server_name in command line or scriptfile\n");
-	return (false);
+	return (FALSE);
     }
     for (i = 0; i < cmd->num_ops; i++)
     {
@@ -162,11 +162,11 @@ DT_Transaction_Cmd_Validate (Transaction
 	    {
 		if (cmd->op[i].server_initiated)
 		{
-		    has_server_send = true;
+		    has_server_send = TRUE;
 		}
 		else
 		{
-		    has_client_send = true;
+		    has_client_send = TRUE;
 		}
 		if (cmd->op[i].reap_send_on_recv)
 		{
@@ -185,7 +185,7 @@ DT_Transaction_Cmd_Validate (Transaction
 			else
 			{
 			    DT_Mdep_printf ("OP: Unbalanced -f options\n");
-			    return false;
+			    return FALSE;
 			}
 		    }
 		}
@@ -206,18 +206,18 @@ DT_Transaction_Cmd_Validate (Transaction
     {
 	DT_Mdep_printf ("Error: Transaction test requires \n");
 	DT_Mdep_printf ("Error: At least one server SR and one client SR Operation\n");
-	return false;
+	return FALSE;
     }
     if (reap_count != 0)
     {
 	DT_Mdep_printf ("OP: Unbalanced -f options\n");
-	return false;
+	return FALSE;
     }
     if (cmd->debug)
     {
 	DT_Transaction_Cmd_Print (cmd);
     }
-    return true;
+    return TRUE;
 }
 
 
@@ -275,15 +275,15 @@ DT_Transaction_Cmd_Init (Transaction_Cmd
     cmd->num_iterations = 1000;
     cmd->num_threads = 1;
     cmd->eps_per_thread = 1;
-    cmd->debug = false;
-    cmd->validate = false;
+    cmd->debug = FALSE;
+    cmd->validate = FALSE;
     cmd->ReliabilityLevel = DAT_QOS_BEST_EFFORT;
-    cmd->poll = false;
+    cmd->poll = FALSE;
     cmd->DT_mem_type = DAT_MEM_TYPE_PHYSICAL; 
 }
 
 
-bool
+boolean_t
 DT_Transaction_Cmd_Parse (Transaction_Cmd_t * cmd,
 		      int my_argc,
 		      char **my_argv,
@@ -309,7 +309,7 @@ DT_Transaction_Cmd_Parse (Transaction_Cm
 		{
 		    DT_Mdep_printf ("must specify server name\n");
 		    DT_Transaction_Cmd_Usage ();
-		    return (false);
+		    return (FALSE);
 		}
 		strcpy (cmd->server_name, opts->optarg);
 		break;
@@ -327,7 +327,7 @@ DT_Transaction_Cmd_Parse (Transaction_Cm
 		{
 		    DT_Mdep_printf ("Syntax Error -i<iterations> option\n");
 		    DT_Transaction_Cmd_Usage ();
-		    return (false);
+		    return (FALSE);
 		}
 		cmd->num_iterations = atol (opts->optarg);
 
@@ -340,7 +340,7 @@ DT_Transaction_Cmd_Parse (Transaction_Cm
 		{
 		    DT_Mdep_printf ("Syntax Error -t<num threads> option\n");
 		    DT_Transaction_Cmd_Usage ();
-		    return (false);
+		    return (FALSE);
 		}
 		cmd->num_threads = atol (opts->optarg);
 		break;
@@ -352,7 +352,7 @@ DT_Transaction_Cmd_Parse (Transaction_Cm
 		{
 		    DT_Mdep_printf ("Syntax Error -w<EPs/thread> option\n");
 		    DT_Transaction_Cmd_Usage ();
-		    return (false);
+		    return (FALSE);
 		}
 		cmd->eps_per_thread = atol (opts->optarg);
 		break;
@@ -360,22 +360,22 @@ DT_Transaction_Cmd_Parse (Transaction_Cm
 	    case 'd':		    /* print debug messages */
 	    {
 		DT_dapltest_debug++;
-		cmd->debug = true;
+		cmd->debug = TRUE;
 		break;
 	    }
 	    case 'r':		    /* use RSP instead of PSP */
 	    {
-		cmd->use_rsp = true;
+		cmd->use_rsp = TRUE;
 		break;
 	    }
 	    case 'V':		    /* validate data being sent/received */
 	    {
-		cmd->validate = true;
+		cmd->validate = TRUE;
 		break;
 	    }
 	    case 'P':		    /* use completion polling */
 	    {
-		cmd->poll = true;
+		cmd->poll = TRUE;
 		break;
 	    }
 	    case 'R':		    /* Service Reliability Level */
@@ -393,7 +393,7 @@ DT_Transaction_Cmd_Parse (Transaction_Cm
 	    {
 		DT_Mdep_printf ("Invalid Transaction Test Parameter: %c\n", c);
 		DT_Transaction_Cmd_Usage ();
-		return (false);
+		return (FALSE);
 	    }
 	}
     }
@@ -403,7 +403,7 @@ DT_Transaction_Cmd_Parse (Transaction_Cm
 	{
 	    DT_Mdep_printf ("can't get default device name\n");
 	    DT_Transaction_Cmd_Usage ();
-	    return (false);
+	    return (FALSE);
 	}
     }
     /*
@@ -428,7 +428,7 @@ DT_Transaction_Cmd_Parse (Transaction_Cm
 	if (!DT_Transaction_Cmd_Parse_Op (cmd, op))
 	{
 	    DT_Transaction_Cmd_Usage ();
-	    return (false);
+	    return (FALSE);
 	}
     }
 
@@ -463,9 +463,9 @@ DT_Transaction_Cmd_Parse (Transaction_Cm
     if (!DT_Transaction_Cmd_Validate (cmd))
     {
 	DT_Transaction_Cmd_Usage ();
-	return (false);
+	return (FALSE);
     }
-    return (true);
+    return (TRUE);
 }
 
 void
Index: linux-kernel/test/dapltest/cmd/dapl_server_cmd.c
===================================================================
--- linux-kernel/test/dapltest/cmd/dapl_server_cmd.c	(revision 2306)
+++ linux-kernel/test/dapltest/cmd/dapl_server_cmd.c	(working copy)
@@ -31,14 +31,14 @@ void
 DT_Server_Cmd_Init (Server_Cmd_t * Server_Cmd)
 {
     DT_dapltest_debug = 0;
-    Server_Cmd->debug = false;
+    Server_Cmd->debug = FALSE;
     Server_Cmd->dapl_name[0] = '\0';
     Server_Cmd->ReliabilityLevel = DAT_QOS_BEST_EFFORT;
     Server_Cmd->DT_mem_type = DAT_MEM_TYPE_PHYSICAL; 
 }
 
 
-bool
+boolean_t
 DT_Server_Cmd_Parse (Server_Cmd_t * Server_Cmd,
 		     int my_argc,
 		     char **my_argv,
@@ -62,7 +62,7 @@ DT_Server_Cmd_Parse (Server_Cmd_t * Serv
 	    case 'd':
 	    {
 		DT_dapltest_debug++;
-		Server_Cmd->debug = true;
+		Server_Cmd->debug = TRUE;
 		break;
 	    }
 	    case 'R':		    /* Service Reliability Level */
@@ -70,7 +70,7 @@ DT_Server_Cmd_Parse (Server_Cmd_t * Serv
 		Server_Cmd->ReliabilityLevel = DT_ParseQoS (opts->optarg);
 		if (0 == Server_Cmd->ReliabilityLevel)
 		{
-		    return (false);
+		    return (FALSE);
 		}
 		break;
 	    }
@@ -84,7 +84,7 @@ DT_Server_Cmd_Parse (Server_Cmd_t * Serv
 	    {
 		DT_Mdep_printf ("Invalid Server option: %c\n", opts->optopt);
 		DT_Server_Cmd_Usage ();
-		return (false);
+		return (FALSE);
 	    }
 	}
     }
@@ -94,10 +94,10 @@ DT_Server_Cmd_Parse (Server_Cmd_t * Serv
 	{
 	    DT_Mdep_printf ("can't get default device name\n");
 	    DT_Server_Cmd_Usage ();
-	    return (false);
+	    return (FALSE);
 	}
     }
-    return (true);
+    return (TRUE);
 }
 
 void
Index: linux-kernel/test/dapltest/mdep/linux/dapl_mdep_user.c
===================================================================
--- linux-kernel/test/dapltest/mdep/linux/dapl_mdep_user.c	(revision 2306)
+++ linux-kernel/test/dapltest/mdep/linux/dapl_mdep_user.c	(working copy)
@@ -92,11 +92,11 @@ DT_Mdep_End (void)
  * Generate name of IB device
  */
 
-bool
+boolean_t
 DT_Mdep_GetDefaultDeviceName (char *dapl_name)
 {
     strcpy (dapl_name, DT_MdepDeviceName);
-    return true;
+    return TRUE;
 }
 
 /*
@@ -121,7 +121,7 @@ DT_Mdep_Schedule (void)
  * Get system statistics including uptime and idle time
  */
 
-bool
+boolean_t
 DT_Mdep_GetCpuStat (
     DT_CpuStat 			*cpu_stat )
 {
@@ -164,7 +164,7 @@ DT_Mdep_GetCpuStat (
 
     rewind (Stat_Fp);
 
-    return true;
+    return TRUE;
 }
 
 /*
@@ -302,10 +302,10 @@ DT_Mdep_Free (void *a_)
  *
  * Lock object constructor
  */
-bool
+boolean_t
 DT_Mdep_LockInit (DT_Mdep_LockType * lock_ptr)
 {
-    return pthread_mutex_init (lock_ptr, 0) ? false : true;
+    return pthread_mutex_init (lock_ptr, 0) ? FALSE : TRUE;
 }
 
 /*
@@ -361,7 +361,7 @@ DT_Mdep_Thread_Destroy_Attributes (Threa
 /*
  * Start the thread
  */
-bool
+boolean_t
 DT_Mdep_Thread_Start (Thread * thread_ptr)
 {
     return pthread_create (&thread_ptr->thread_handle,
@@ -505,7 +505,7 @@ DT_Mdep_wait_object_wait (
 	/* Reset the signaled status if we were woken up.  */
 	if (pthread_status == 0)
 	{
-	    wait_obj->signaled = false;
+	    wait_obj->signaled = FALSE;
 	}
 	pthread_mutex_unlock (&wait_obj->lock);
     }
@@ -520,7 +520,7 @@ DT_Mdep_wait_object_wait (
 	/* Reset the signaled status if we were woken up.  */
 	if (pthread_status == 0)
 	{
-	    wait_obj->signaled = false;
+	    wait_obj->signaled = FALSE;
 	}
 	pthread_mutex_unlock (&wait_obj->lock);
     }
@@ -555,7 +555,7 @@ DT_Mdep_wait_object_wakeup (
 	DT_WAIT_OBJECT *wait_obj )
 {
     pthread_mutex_lock ( &wait_obj->lock );
-    wait_obj->signaled = true;
+    wait_obj->signaled = TRUE;
     pthread_mutex_unlock ( &wait_obj->lock );
     if ( 0 != pthread_cond_signal ( &wait_obj->cv ) )
     {
Index: linux-kernel/test/dapltest/mdep/linux/dapl_mdep_kernel.c
===================================================================
--- linux-kernel/test/dapltest/mdep/linux/dapl_mdep_kernel.c	(revision 2306)
+++ linux-kernel/test/dapltest/mdep/linux/dapl_mdep_kernel.c	(working copy)
@@ -57,7 +57,7 @@ DT_Mdep_Schedule (void)
  * Get system statistics including uptime and idle time
  */
 
-bool
+boolean_t
 DT_Mdep_GetCpuStat (
     DT_CpuStat 			*cpu_stat )
 {
@@ -98,7 +98,7 @@ DT_Mdep_GetCpuStat (
     }
 #endif
 	cpu_stat->idle = (unsigned long)(jif * num_of_cpus - (cpu_stat->user + nice + cpu_stat->system));
-	return true;
+	return TRUE;
 }
 
 /*
@@ -161,11 +161,11 @@ DT_Mdep_Free (void *a_)
  *
  * Lock object constructor
  */
-bool
+boolean_t
 DT_Mdep_LockInit (DT_Mdep_LockType * lock_ptr)
 {
     spin_lock_init (lock_ptr);
-    return true;
+    return TRUE;
 }
 
 /*
@@ -217,7 +217,7 @@ DT_Mdep_Thread_Destroy_Attributes (Threa
 /*
  * Start the thread
  */
-bool
+boolean_t
 DT_Mdep_Thread_Start (Thread * thread_ptr)
 {
     thread_ptr->thread_handle = kernel_thread (
Index: linux-kernel/test/dapltest/mdep/linux/dapl_mdep_user.h
===================================================================
--- linux-kernel/test/dapltest/mdep/linux/dapl_mdep_user.h	(revision 2306)
+++ linux-kernel/test/dapltest/mdep/linux/dapl_mdep_user.h	(working copy)
@@ -54,12 +54,6 @@
 /* Default Device Name */
 #define DT_MdepDeviceName    "ia0a"
 
-/* Boolean */
-typedef int     bool;
-
-#define true (1)
-#define false (0)
-
 #ifndef __BASE_FILE__
 #define __BASE_FILE__ __FILE__
 #endif
@@ -78,7 +72,7 @@ typedef pthread_mutex_t DT_Mdep_LockType
 
 typedef struct
 {
-    bool		signaled;
+    boolean_t 	signaled;
     pthread_cond_t	cv;
     pthread_mutex_t	lock;
 } DT_WAIT_OBJECT;
Index: linux-kernel/test/dapltest/mdep/linux/dapl_mdep_kernel.h
===================================================================
--- linux-kernel/test/dapltest/mdep/linux/dapl_mdep_kernel.h	(revision 2306)
+++ linux-kernel/test/dapltest/mdep/linux/dapl_mdep_kernel.h	(working copy)
@@ -46,12 +46,6 @@
 /* Default Device Name */
 #define DT_MdepDeviceName    "ia0a"
 
-/* Boolean */
-typedef int     bool;
-
-#define true (1)
-#define false (0)
-
 #ifndef __BASE_FILE__
 #define __BASE_FILE__ __FILE__
 #endif
Index: linux-kernel/test/dapltest/common/dapl_global.c
===================================================================
--- linux-kernel/test/dapltest/common/dapl_global.c	(revision 2306)
+++ linux-kernel/test/dapltest/common/dapl_global.c	(working copy)
@@ -27,7 +27,7 @@
 
 #include "dapl_proto.h"
 
-bool            DT_local_is_little_endian;
+boolean_t            DT_local_is_little_endian;
 DAT_COUNT       DT_dapltest_debug = 0;
 
 
Index: linux-kernel/test/dapltest/common/dapl_quit_cmd_util.c
===================================================================
--- linux-kernel/test/dapltest/common/dapl_quit_cmd_util.c	(revision 2306)
+++ linux-kernel/test/dapltest/common/dapl_quit_cmd_util.c	(working copy)
@@ -30,7 +30,7 @@
 /*--------------------------------------------------------- */
 void
 DT_Quit_Cmd_Endian (Quit_Cmd_t * cmd,
-		bool to_wire)
+		boolean_t to_wire)
 {
     /* do nothing */
 }
Index: linux-kernel/test/dapltest/common/dapl_transaction_cmd_util.c
===================================================================
--- linux-kernel/test/dapltest/common/dapl_transaction_cmd_util.c	(revision 2306)
+++ linux-kernel/test/dapltest/common/dapl_transaction_cmd_util.c	(working copy)
@@ -29,7 +29,7 @@
 
 
 void
-DT_Transaction_Cmd_Endian (Transaction_Cmd_t * cmd, bool to_wire)
+DT_Transaction_Cmd_Endian (Transaction_Cmd_t * cmd, boolean_t to_wire)
 {
     unsigned int    i;
 




More information about the general mailing list