[DAPL] reconstitute changes that were omitted by WDK changes svn 1091 vs. 1101.

git-svn-id: svn://openib.tc.cornell.edu/gen1/trunk@1116 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/ulp/dapl/dapl/common/dapl_ep_free.c b/ulp/dapl/dapl/common/dapl_ep_free.c
index b6c206f..0f4ff67 100644 (file)
--- a/ulp/dapl/dapl/common/dapl_ep_free.c
+++ b/ulp/dapl/dapl/common/dapl_ep_free.c
@@ -191,7 +191,6 @@ dapl_ep_free (
 \r
 bail:\r
     return dat_status;\r
-\r
 }\r
 \r
 /*\r

diff --git a/ulp/dapl/dapl/common/dapl_evd_dequeue.c b/ulp/dapl/dapl/common/dapl_evd_dequeue.c
index bc67cab..91ec67f 100644 (file)
--- a/ulp/dapl/dapl/common/dapl_evd_dequeue.c
+++ b/ulp/dapl/dapl/common/dapl_evd_dequeue.c
@@ -115,12 +115,11 @@ DAT_RETURN dapl_evd_dequeue (
      * This keeps events in order if dat_evd_wait() has copied events\r
      * from CQ to EVD.  \r
      */\r
-    local_event = (DAT_EVENT *)dapls_rbuf_remove (&evd_ptr->pending_event_queue);\r
+    local_event = (DAT_EVENT *)dapls_rbuf_remove(&evd_ptr->pending_event_queue);\r
     if (local_event != NULL)\r
     {\r
        *event = *local_event;\r
-       dat_status = dapls_rbuf_add (&evd_ptr->free_event_queue, \r
-                                    local_event);\r
+       dat_status = dapls_rbuf_add (&evd_ptr->free_event_queue, local_event);\r
        DAPL_CNTR(DCNT_EVD_DEQUEUE_FOUND);\r
     }\r
     else if (evd_ptr->ib_cq_handle != IB_INVALID_HANDLE)\r

diff --git a/ulp/dapl/dapl/ibal/dapl_ibal_cm.c b/ulp/dapl/dapl/ibal/dapl_ibal_cm.c
index 68bb42a..06a603a 100644 (file)
--- a/ulp/dapl/dapl/ibal/dapl_ibal_cm.c
+++ b/ulp/dapl/dapl/ibal/dapl_ibal_cm.c
@@ -1269,13 +1269,13 @@ dapls_ib_connect (
     cm_req.init_depth       = (uint8_t)ep_ptr->param.ep_attr.max_rdma_read_out;\r
 \r
     /* time wait before retrying a pkt after receiving a RNR NAK */\r
-    cm_req.rnr_nak_timeout  = 12; /* 163.84ms */\r
+    cm_req.rnr_nak_timeout  = IB_RNR_NAK_TIMEOUT; /* dapl_ibal_util.h */\r
     \r
        /* \r
      * number of time local QP should retry after receiving RNR NACK before\r
      * reporting an error\r
      */\r
-    cm_req.rnr_retry_cnt       = 6;    /* 7 is infinite */\r
+    cm_req.rnr_retry_cnt       = IB_RNR_RETRY_CNT;\r
 \r
     cm_req.remote_resp_timeout = 16;   /* 250ms */\r
     cm_req.local_resp_timeout  = 16;   /* 250ms */\r
@@ -1343,14 +1343,10 @@ DAT_RETURN
         IN        DAPL_EP                     *ep_ptr,\r
         IN        DAT_CLOSE_FLAGS             disconnect_flags)\r
 {\r
-    DAPL_IA                        *ia_ptr;\r
-    ib_api_status_t                ib_status;\r
-    ib_cm_dreq_t                   cm_dreq;\r
+    ib_api_status_t    ib_status = IB_SUCCESS;\r
+    ib_cm_dreq_t       cm_dreq;\r
 \r
-       UNUSED_PARAM( disconnect_flags );\r
-\r
-    ia_ptr    = ep_ptr->header.owner_ia;\r
-    ib_status = IB_SUCCESS;\r
+    UNUSED_PARAM( disconnect_flags );\r
 \r
     dapl_os_memzero(&cm_dreq, sizeof(ib_cm_dreq_t));\r
 \r
@@ -1376,8 +1372,18 @@ DAT_RETURN
        ep_ptr->sent_discreq = DAT_TRUE;\r
         ib_status = ib_cm_dreq ( &cm_dreq );\r
         \r
-       dapl_dbg_log (DAPL_DBG_TYPE_CM,"--> DsD: EP=%p  QP= %p  DREQ SENT status =%s\n", \r
-                       ep_ptr, ep_ptr->qp_handle,ib_get_err_str(ib_status));\r
+       /* tolerate INVALID_STATE error as the other side can race ahead and\r
+        * generate a DREQ before we do.\r
+        */ \r
+       if ( ib_status == IB_INVALID_STATE )\r
+           ib_status = IB_SUCCESS;\r
+\r
+       if (ib_status )\r
+       {\r
+           dapl_dbg_log (DAPL_DBG_TYPE_ERR,\r
+               "--> DsD: EP=%p  QP= %p  DREQ SEND status %s\n", \r
+               ep_ptr, ep_ptr->qp_handle,ib_get_err_str(ib_status));\r
+       }\r
     }\r
     return dapl_ib_status_convert (ib_status);\r
 }\r
@@ -1736,8 +1742,9 @@ dapls_ib_accept_connection (
     cm_rep.flags             = 0;\r
     cm_rep.failover_accepted = IB_FAILOVER_ACCEPT_UNSUPPORTED;\r
     cm_rep.target_ack_delay  = 14;\r
-    cm_rep.rnr_nak_timeout   = 12;\r
-    cm_rep.rnr_retry_cnt     = 6;\r
+    /* see dapl_ibal_util.h for IB_RNR_XXX */;\r
+    cm_rep.rnr_nak_timeout   = IB_RNR_NAK_TIMEOUT;\r
+    cm_rep.rnr_retry_cnt     = IB_RNR_RETRY_CNT;\r
     cm_rep.p_recv_wr         = NULL;\r
     cm_rep.pp_recv_failure   = NULL;\r
      \r

diff --git a/ulp/dapl/dapl/ibal/dapl_ibal_dto.h b/ulp/dapl/dapl/ibal/dapl_ibal_dto.h
index 5724235..5b7bd9b 100644 (file)
--- a/ulp/dapl/dapl/ibal/dapl_ibal_dto.h
+++ b/ulp/dapl/dapl/ibal/dapl_ibal_dto.h
@@ -42,13 +42,13 @@ dapls_ib_cq_late_alloc (
  */\r
 STATIC _INLINE_ DAT_RETURN \r
 dapls_ib_post_recv (\r
-       IN  DAPL_EP                     *ep_ptr,\r
+       IN  DAPL_EP                             *ep_ptr,\r
        IN  DAPL_COOKIE                 *cookie,\r
        IN  DAT_COUNT                   num_segments,\r
        IN  DAT_LMR_TRIPLET             *local_iov)\r
 {\r
     ib_api_status_t     ib_status;\r
-    ib_recv_wr_t       recv_wr, *failed_wr_p;\r
+    ib_recv_wr_t               recv_wr, *failed_wr_p;\r
     ib_local_ds_t       ds_array[DAPL_DEFAULT_DS_ENTRIES], *ds_array_p;\r
     DAT_COUNT           i, total_len;\r
 \r
@@ -64,31 +64,30 @@ dapls_ib_post_recv (
        {\r
                ds_array_p = dapl_os_alloc( num_segments * sizeof(ib_local_ds_t) );\r
        }\r
-    recv_wr.ds_array     = ds_array_p;\r
+    recv_wr.ds_array = ds_array_p;\r
 \r
     if (NULL == ds_array_p)\r
     {\r
        return (DAT_INSUFFICIENT_RESOURCES);\r
     }\r
 \r
-    total_len                   = 0;\r
+    total_len = 0;\r
 \r
     for (i = 0; i < num_segments; i++, ds_array_p++)\r
     {\r
-      ds_array_p->length = (uint32_t)local_iov[i].segment_length;\r
-       ds_array_p->lkey  = local_iov[i].lmr_context;\r
-       ds_array_p->vaddr = local_iov[i].virtual_address;\r
-       total_len        += ds_array_p->length;\r
+               ds_array_p->length = (uint32_t)local_iov[i].segment_length;\r
+               ds_array_p->lkey   = local_iov[i].lmr_context;\r
+               ds_array_p->vaddr  = local_iov[i].virtual_address;\r
+               total_len         += ds_array_p->length;\r
     }\r
 \r
     if (cookie != NULL)\r
     {\r
-       cookie->val.dto.size            =  total_len;\r
-\r
-        dapl_dbg_log (DAPL_DBG_TYPE_EP, "--> DsPR: EP = %p QP = %p cookie= %p, num_seg= %d\n", \r
-                      ep_ptr, ep_ptr->qp_handle, cookie, num_segments);\r
+               cookie->val.dto.size = total_len;\r
+        dapl_dbg_log (DAPL_DBG_TYPE_EP,\r
+                                       "--> DsPR: EP = %p QP = %p cookie= %p, num_seg= %d\n", \r
+                                       ep_ptr, ep_ptr->qp_handle, cookie, num_segments);\r
     }\r
-\r
     recv_wr.p_next = NULL;\r
 \r
     ib_status = ib_post_recv( ep_ptr->qp_handle, &recv_wr, &failed_wr_p );\r
@@ -98,21 +97,19 @@ dapls_ib_post_recv (
 \r
     if (IB_SUCCESS == ib_status)\r
     {\r
-       return DAT_SUCCESS;\r
+               return DAT_SUCCESS;\r
     }\r
-    else\r
-    {\r
-        dapl_dbg_log (DAPL_DBG_TYPE_EP, "--> DsPR: post_recv status = %s\n", \r
-                      ib_get_err_str(ib_status));\r
 \r
-        /*\r
-         * Moving QP to error state; \r
-         */\r
-        ib_status = dapls_modify_qp_state_to_error ( ep_ptr->qp_handle);\r
-        ep_ptr->qp_state = IB_QPS_ERROR;\r
+    dapl_dbg_log (DAPL_DBG_TYPE_DTO_COMP_ERR,\r
+                                       "--> DsPR: post_recv status %s\n",\r
+                                       ib_get_err_str(ib_status));\r
+    /*\r
+     * Moving QP to error state; \r
+     */\r
+    (void) dapls_modify_qp_state_to_error ( ep_ptr->qp_handle);\r
+    ep_ptr->qp_state = IB_QPS_ERROR;\r
 \r
        return (dapl_ib_status_convert (ib_status));\r
-    }\r
 }\r
 \r
 \r
@@ -123,15 +120,15 @@ dapls_ib_post_recv (
  */\r
 STATIC _INLINE_ DAT_RETURN \r
 dapls_ib_post_send (\r
-       IN  DAPL_EP                     *ep_ptr,\r
-       IN  ib_send_op_type_t           op_type,\r
-       IN  DAPL_COOKIE                 *cookie,\r
-       IN  DAT_COUNT                   num_segments,\r
-       IN  DAT_LMR_TRIPLET             *local_iov,\r
-       IN  const DAT_RMR_TRIPLET       *remote_iov,\r
-       IN  DAT_COMPLETION_FLAGS        completion_flags)\r
+       IN  DAPL_EP                *ep_ptr,\r
+       IN  ib_send_op_type_t      op_type,\r
+       IN  DAPL_COOKIE                    *cookie,\r
+       IN  DAT_COUNT                      num_segments,\r
+       IN  DAT_LMR_TRIPLET                *local_iov,\r
+       IN  const DAT_RMR_TRIPLET  *remote_iov,\r
+       IN  DAT_COMPLETION_FLAGS   completion_flags )\r
 {\r
-    ib_api_status_t            ib_status;\r
+    ib_api_status_t     ib_status;\r
     ib_send_wr_t               send_wr, *failed_wr_p;\r
     ib_local_ds_t       ds_array[DAPL_DEFAULT_DS_ENTRIES], *ds_array_p;\r
     DAT_COUNT                  i, total_len;\r
@@ -139,14 +136,17 @@ dapls_ib_post_send (
        if (ep_ptr->param.ep_state != DAT_EP_STATE_CONNECTED)\r
        {\r
                ib_qp_attr_t             qp_attr;\r
+\r
                ib_query_qp ( ep_ptr->qp_handle, &qp_attr );\r
 \r
-               dapl_dbg_log (DAPL_DBG_TYPE_ERR, "--> DsPS: !CONN EP (%p) ep_state=%d QP_state=%d\n", \r
+               dapl_dbg_log (DAPL_DBG_TYPE_ERR,\r
+                      "--> DsPS: !CONN EP (%p) ep_state=%d QP_state=%d\n", \r
                       ep_ptr, ep_ptr->param.ep_state, qp_attr.state );\r
 \r
-        return ( DAT_ERROR(DAT_INVALID_STATE, DAT_INVALID_STATE_EP_DISCONNECTED ) );\r
+        return(DAT_ERROR(DAT_INVALID_STATE, DAT_INVALID_STATE_EP_DISCONNECTED));\r
        }\r
     dapl_os_memzero (&send_wr, sizeof(ib_send_wr_t));\r
+\r
     send_wr.wr_type            = op_type;\r
     send_wr.num_ds             = num_segments;\r
 \r
@@ -158,35 +158,36 @@ dapls_ib_post_send (
        {\r
                ds_array_p = dapl_os_alloc( num_segments * sizeof(ib_local_ds_t) );\r
        }\r
-    send_wr.ds_array     = ds_array_p;\r
+    send_wr.ds_array = ds_array_p;\r
 \r
     if (NULL == ds_array_p)\r
     {\r
-       return (DAT_INSUFFICIENT_RESOURCES);\r
+               return (DAT_INSUFFICIENT_RESOURCES);\r
     }\r
 \r
-    total_len                   = 0;\r
+    total_len = 0;\r
 \r
     for (i = 0; i < num_segments; i++, ds_array_p++)\r
     {\r
-      ds_array_p->length = (uint32_t)local_iov[i].segment_length;\r
-       ds_array_p->lkey   = local_iov[i].lmr_context;\r
-       ds_array_p->vaddr  = local_iov[i].virtual_address;\r
-       total_len         += ds_array_p->length;\r
+        ds_array_p->length = (uint32_t)local_iov[i].segment_length;\r
+        ds_array_p->lkey   = local_iov[i].lmr_context;\r
+        ds_array_p->vaddr  = local_iov[i].virtual_address;\r
+        total_len         += ds_array_p->length;\r
     }\r
 \r
+       /* NULL cookie is OK if no Completion event is requested */\r
     if (cookie != NULL)\r
     {\r
-       cookie->val.dto.size            =  total_len;\r
+        dapl_os_assert( cookie->ep == ep_ptr );\r
+           cookie->val.dto.size            =  total_len;\r
 \r
-               dapl_dbg_log (DAPL_DBG_TYPE_EP,\r
-                       "--> DsPS: EVD=%p EP=%p QP=%p type=%d, sg=%d ln=%d, ck=%p 0x" F64x "\n", \r
+               dapl_dbg_log (DAPL_DBG_TYPE_EP, "--> DsPS: EVD=%p EP=%p QP=%p type=%d "\r
+            "sg=%d ln=%d ck=%p 0x" F64x "\n", \r
                        ep_ptr->param.request_evd_handle, ep_ptr, ep_ptr->qp_handle, \r
                        op_type, num_segments, total_len,\r
                        cookie, cookie->val.dto.cookie.as_64 );\r
     }\r
-\r
-    send_wr.wr_id              = (DAT_UINT64)cookie;\r
+    send_wr.wr_id = (DAT_UINT64)cookie;\r
 \r
     /* RC for now */\r
     if (total_len > 0)\r
@@ -195,14 +196,14 @@ dapls_ib_post_send (
         send_wr.remote_ops.rkey         = remote_iov->rmr_context;\r
     }\r
 \r
-    send_wr.send_opt           = 0;\r
+    send_wr.send_opt = 0;\r
 \r
-    send_wr.send_opt   |= (DAT_COMPLETION_BARRIER_FENCE_FLAG & \r
-                          completion_flags) ? IB_SEND_OPT_FENCE : 0;\r
-    send_wr.send_opt   |= (DAT_COMPLETION_SUPPRESS_FLAG & \r
-                          completion_flags) ? 0 : IB_SEND_OPT_SIGNALED;\r
-    send_wr.send_opt   |= (DAT_COMPLETION_SOLICITED_WAIT_FLAG & \r
-                          completion_flags) ? IB_SEND_OPT_SOLICITED : 0;\r
+    send_wr.send_opt |= (DAT_COMPLETION_BARRIER_FENCE_FLAG & \r
+                                                               completion_flags) ? IB_SEND_OPT_FENCE : 0;\r
+    send_wr.send_opt |= (DAT_COMPLETION_SUPPRESS_FLAG & \r
+                                                               completion_flags) ? 0 : IB_SEND_OPT_SIGNALED;\r
+    send_wr.send_opt |= (DAT_COMPLETION_SOLICITED_WAIT_FLAG & \r
+                                                               completion_flags) ? IB_SEND_OPT_SOLICITED : 0;\r
 \r
     dapl_dbg_log (DAPL_DBG_TYPE_EP, "--> DsPS: EP=%p QP=%p send_opt=0x%x,"\r
                   "rem_addr=%p, rem_rkey=0x%x completion_flags=0x%x\n",\r
@@ -222,21 +223,19 @@ dapls_ib_post_send (
 \r
     if (IB_SUCCESS == ib_status)\r
     {\r
-       return DAT_SUCCESS;\r
+        return DAT_SUCCESS;\r
     }\r
-    else\r
-    {\r
-        dapl_dbg_log (DAPL_DBG_TYPE_EP, "--> DsPS: EP=%p post_send status = %s\n", \r
-                      ep_ptr, ib_get_err_str(ib_status));\r
 \r
-        /*\r
-         * Moving QP to error state; \r
-         */\r
-        ib_status = dapls_modify_qp_state_to_error ( ep_ptr->qp_handle);\r
-        ep_ptr->qp_state = IB_QPS_ERROR;\r
+    dapl_dbg_log (DAPL_DBG_TYPE_DTO_COMP_ERR,\r
+                                 "--> DsPS: EP=%p post_send status %s\n", \r
+                  ep_ptr, ib_get_err_str(ib_status));\r
+    /*\r
+     * Moving QP to error state; \r
+     */\r
+    (void) dapls_modify_qp_state_to_error ( ep_ptr->qp_handle);\r
+    ep_ptr->qp_state = IB_QPS_ERROR;\r
 \r
        return (dapl_ib_status_convert (ib_status));\r
-    }\r
 }\r
 \r
 /*\r

diff --git a/ulp/dapl/dapl/ibal/dapl_ibal_qp.c b/ulp/dapl/dapl/ibal/dapl_ibal_qp.c
index afbe51e..90db767 100644 (file)
--- a/ulp/dapl/dapl/ibal/dapl_ibal_qp.c
+++ b/ulp/dapl/dapl/ibal/dapl_ibal_qp.c
@@ -541,7 +541,7 @@ dapls_modify_qp_state_to_rtr (
     qp_mod.state.rtr.rq_psn                 = DAPL_IBAL_START_PSN;\r
     qp_mod.state.rtr.dest_qp                = dest_qp;\r
     qp_mod.state.rtr.resp_res               = 7;\r
-    qp_mod.state.rtr.rnr_nak_timeout        = 7;\r
+    qp_mod.state.rtr.rnr_nak_timeout        = IB_RNR_NAK_TIMEOUT;\r
     qp_mod.state.rtr.primary_av.sl          = 0;\r
     qp_mod.state.rtr.primary_av.dlid        = dest_lid;\r
     qp_mod.state.rtr.primary_av.port_num    = p_port->p_attr->port_num;\r
@@ -549,7 +549,7 @@ dapls_modify_qp_state_to_rtr (
     qp_mod.state.rtr.primary_av.path_bits   = 0;\r
     qp_mod.state.rtr.primary_av.static_rate = IB_PATH_RECORD_RATE_10_GBS;\r
     qp_mod.state.rtr.primary_av.conn.path_mtu = p_port->p_attr->mtu;\r
-    qp_mod.state.rtr.primary_av.conn.rnr_retry_cnt     = 7;\r
+    qp_mod.state.rtr.primary_av.conn.rnr_retry_cnt     = IB_RNR_RETRY_CNT;\r
     qp_mod.state.rtr.primary_av.conn.local_ack_timeout = 7;\r
     qp_mod.state.rtr.primary_av.conn.seq_err_retry_cnt = 7;\r
  \r
@@ -575,8 +575,9 @@ dapls_modify_qp_state_to_rts (
     qp_mod.req_state                 = IB_QPS_RTS;\r
     qp_mod.state.rts.sq_psn          = DAPL_IBAL_START_PSN;\r
     qp_mod.state.rts.retry_cnt = 7;\r
-    qp_mod.state.rts.rnr_retry_cnt = 6;\r
-    qp_mod.state.rts.rnr_nak_timeout = 7;\r
+    /* see dapl_ibal_util.h  for IB_RNR_XXX */\r
+    qp_mod.state.rts.rnr_retry_cnt = IB_RNR_RETRY_CNT;\r
+    qp_mod.state.rts.rnr_nak_timeout = IB_RNR_NAK_TIMEOUT;\r
     qp_mod.state.rts.local_ack_timeout = 7;\r
     qp_mod.state.rts.init_depth = 4; \r
 \r

diff --git a/ulp/dapl/dapl/ibal/dapl_ibal_util.h b/ulp/dapl/dapl/ibal/dapl_ibal_util.h
index 337748f..a0c3e80 100644 (file)
--- a/ulp/dapl/dapl/ibal/dapl_ibal_util.h
+++ b/ulp/dapl/dapl/ibal/dapl_ibal_util.h
@@ -35,8 +35,8 @@ dapl_ib_status_convert (
  * Typedefs to map IBAL types to more generic 'ib' types\r
  */\r
 typedef          ib_net64_t                    IB_HCA_NAME;\r
-typedef          ib_listen_handle_t            ib_cm_srvc_handle_t ; \r
-typedef          ib_ca_handle_t                ib_hca_handle_t; \r
+typedef          ib_listen_handle_t            ib_cm_srvc_handle_t;\r
+typedef          ib_ca_handle_t                ib_hca_handle_t;\r
 typedef          DAT_PVOID                     ib_cqd_handle_t;\r
 typedef          ib_async_event_rec_t          ib_error_record_t;\r
 typedef          ib_wr_type_t                  ib_send_op_type_t;\r
@@ -102,6 +102,32 @@ typedef struct _ib_hca_name
 #define          IB_MAX_DREQ_PDATA_SIZE     220\r
 #define          IB_MAX_DREP_PDATA_SIZE     224\r
 \r
+/* Resource Not Ready\r
+       1-6 is an actual retry count which is decremented to zero before\r
+        an error condition is set.\r
+    7 is 'magic' in that it implies Infinite retry, just keeps trying.\r
+*/\r
+#define                IB_RNR_RETRY_CNT   7\r
+\r
+/*\r
+IB 1.2 spec, page 331, table 45, RNR NAK timeout encoding (5-bits)\r
+ \r
+00000=655.36ms(milliseconds)\r
+00001=0.01ms\r
+00010=0.02ms\r
+00011=0.03ms\r
+00100=0.04ms\r
+00101=0.06ms\r
+00110=0.08ms\r
+00111=0.12ms\r
+\r
+11100=163.84ms 28d\r
+11101=245.76ms 29d\r
+11110=327.68ms 30d\r
+11111=491.52ms 31d\r
+*/\r
+#define                IB_RNR_NAK_TIMEOUT   0\r
+\r
 typedef void\r
 (*dapl_ibal_pfn_destructor_t)(\r
     IN    void*    context );\r
@@ -366,7 +392,6 @@ extern ib_api_status_t
 dapls_modify_qp_state_to_rts (\r
     ib_qp_handle_t);\r
 \r
-\r
 extern void\r
 dapli_ibal_ca_async_error_callback(\r
     IN    ib_async_event_rec_t* p_err_rec );\r

diff --git a/ulp/dapl/test/udapl/dapltest/SOURCES b/ulp/dapl/test/udapl/dapltest/SOURCES
index 4c56327..5828578 100644 (file)
--- a/ulp/dapl/test/udapl/dapltest/SOURCES
+++ b/ulp/dapl/test/udapl/dapltest/SOURCES
@@ -1,4 +1,8 @@
+!if $(FREEBUILD)\r
 TARGETNAME=dapltest\r
+!else\r
+TARGETNAME=dapltestd\r
+!endif\r
 TARGETPATH=..\..\..\..\..\bin\user\obj$(BUILD_ALT_DIR)\r
 TARGETTYPE=PROGRAM\r
 UMTYPE=console\r
@@ -54,10 +58,12 @@ RCOPTIONS=/I..\..\..\..\..\inc;
 USER_C_FLAGS=$(USER_C_FLAGS) -DDYNAMIC_DAT_LOADING\r
 !if $(FREEBUILD)\r
 USER_C_FLAGS=$(USER_C_FLAGS) -DDAT_DLL_NAME=\"dat.dll\"\r
+DATLIB=dat.lib\r
 !else\r
 USER_C_FLAGS=$(USER_C_FLAGS) -DDAT_DLL_NAME=\"datd.dll\"\r
+DATLIB=datd.lib\r
 !endif\r
 \r
-TARGETLIBS=$(SDK_LIB_PATH)\ws2_32.lib\r
+TARGETLIBS=$(TARGETPATH)\*\$(DATLIB) $(SDK_LIB_PATH)\ws2_32.lib\r
 \r
 MSC_WARNING_LEVEL= /W3\r

diff --git a/ulp/dapl/test/udapl/dapltest/dapltest.rc b/ulp/dapl/test/udapl/dapltest/dapltest.rc
index cf5770b..230df9f 100644 (file)
--- a/ulp/dapl/test/udapl/dapltest/dapltest.rc
+++ b/ulp/dapl/test/udapl/dapltest/dapltest.rc
@@ -32,16 +32,18 @@
 \r
 #include <oib_ver.h>\r
 \r
-#define VER_FILETYPE                           VFT_APP\r
-#define VER_FILESUBTYPE                                VFT2_UNKNOWN\r
+#define VER_FILETYPE                   VFT_APP\r
+#define VER_FILESUBTYPE                        VFT2_UNKNOWN\r
 \r
 #if DBG\r
-#define VER_FILEDESCRIPTION_STR                "DAPL/DAT[1.1] test Application (Debug)"\r
+#define VER_FILEDESCRIPTION_STR                "DAPL/DAT[1.1] test application (Debug)"\r
+#define VER_INTERNALNAME_STR           "dapltestd.exe"\r
+#define VER_ORIGINALFILENAME_STR       "dapltestd.exe"\r
 #else\r
-#define VER_FILEDESCRIPTION_STR                "DAPL/DAT[1.1] test Application"\r
-#endif\r
-\r
+#define VER_FILEDESCRIPTION_STR                "DAPL/DAT[1.1] test application"\r
 #define VER_INTERNALNAME_STR           "dapltest.exe"\r
 #define VER_ORIGINALFILENAME_STR       "dapltest.exe"\r
+#endif\r
 \r
 #include <common.ver>\r
+\r