[ofa-general] [PATCH 06/11] uDAPL scm: remove old udapl_scm code replaced by openib_scm.
Davis, Arlin R
arlin.r.davis at intel.com
Mon Jul 6 12:52:14 PDT 2009
Signed-off-by: Arlin Davis <arlin.r.davis at intel.com>
---
dapl/udapl_scm/SOURCES | 45 -------------
dapl/udapl_scm/makefile | 7 --
dapl/udapl_scm/udapl.rc | 48 --------------
dapl/udapl_scm/udapl_scm_exports.src | 14 ----
dapl/udapl_scm/udapl_sources.c | 120 ----------------------------------
5 files changed, 0 insertions(+), 234 deletions(-)
delete mode 100644 dapl/udapl_scm/SOURCES
delete mode 100644 dapl/udapl_scm/makefile
delete mode 100644 dapl/udapl_scm/udapl.rc
delete mode 100644 dapl/udapl_scm/udapl_scm_exports.src
delete mode 100644 dapl/udapl_scm/udapl_sources.c
diff --git a/dapl/udapl_scm/SOURCES b/dapl/udapl_scm/SOURCES
deleted file mode 100644
index f382923..0000000
--- a/dapl/udapl_scm/SOURCES
+++ /dev/null
@@ -1,45 +0,0 @@
-!if $(FREEBUILD)
-TARGETNAME=dapl2-scm
-!else
-TARGETNAME=dapl2-scmd
-!endif
-TARGETPATH=..\..\..\..\bin\user\obj$(BUILD_ALT_DIR)
-TARGETTYPE=DYNLINK
-DLLENTRY=_DllMainCRTStartup
-DLLDEF=$O\udapl_scm_exports.def
-USE_CRTDLL=1
-
-# pickup local files, then via udapl_sources.c get common files
-
-SOURCES=udapl.rc \
- udapl_sources.c
-
-INCLUDES=..\include;..\common;..\udapl-scm;..\udapl;..\udapl\windows;\
- ..\ibal-scm;..\ibal;..\..\dat\include;..\..\..\..\inc;\
- ..\..\..\..\inc\user;
-
-DAPL_OPTS= -DEXPORT_DAPL_SYMBOLS -D_VENDOR_IBAL_ -DDAPL_MERGE_CM_DTO
-
-DAPL_OPTS= $(DAPL_OPTS) -DDAT_EXTENSIONS=1 -DSOCK_CM=1
-
-USER_C_FLAGS=$(USER_C_FLAGS) $(DAPL_OPTS)
-!if !$(FREEBUILD)
-USER_C_FLAGS=$(USER_C_FLAGS) -DDAPL_DBG #-DDAPL_COUNTERS
-!endif
-
-TARGETLIBS= \
- $(SDK_LIB_PATH)\kernel32.lib \
- $(SDK_LIB_PATH)\ws2_32.lib \
-!if $(FREEBUILD)
- $(TARGETPATH)\*\dat2.lib \
- $(TARGETPATH)\*\complib.lib \
- $(TARGETPATH)\*\ibal.lib
-!else
- $(TARGETPATH)\*\dat2d.lib \
- $(TARGETPATH)\*\complibd.lib \
- $(TARGETPATH)\*\ibald.lib
-!endif
-
-# FIX ME ASAP
-#MSC_WARNING_LEVEL= /W3
-MSC_WARNING_LEVEL= /W1 /wd4113 /Wp64
diff --git a/dapl/udapl_scm/makefile b/dapl/udapl_scm/makefile
deleted file mode 100644
index e26e1c0..0000000
--- a/dapl/udapl_scm/makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# DO NOT EDIT THIS FILE!!! Edit .\sources. if you want to add a new source
-# file to this component. This file merely indirects to the real make file
-# that is shared by all the driver components of the OpenIB Windows project.
-#
-
-!INCLUDE ..\..\..\..\inc\openib.def
diff --git a/dapl/udapl_scm/udapl.rc b/dapl/udapl_scm/udapl.rc
deleted file mode 100644
index 622169a..0000000
--- a/dapl/udapl_scm/udapl.rc
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2007 Intel Corporation. All rights reserved.
- *
- * This software is available to you under the OpenIB.org BSD license
- * below:
- *
- * Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met:
- *
- * - Redistributions of source code must retain the above
- * copyright notice, this list of conditions and the following
- * disclaimer.
- *
- * - Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials
- * provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * $Id$
- */
-
-
-#include <oib_ver.h>
-
-#define VER_FILETYPE VFT_DLL
-#define VER_FILESUBTYPE VFT2_UNKNOWN
-
-#if DBG
-#define VER_FILEDESCRIPTION_STR "Direct Access Provider Library v2.0 (socket-cm) (Debug)"
-#define VER_INTERNALNAME_STR "dapl2-scmd.dll"
-#define VER_ORIGINALFILENAME_STR "dapl2-scmd.dll"
-#else
-#define VER_FILEDESCRIPTION_STR "Direct Access Provider Library v2.0 (socket-cm)"
-#define VER_INTERNALNAME_STR "dapl2-scm.dll"
-#define VER_ORIGINALFILENAME_STR "dapl2-scm.dll"
-#endif
-
-#include <common.ver>
diff --git a/dapl/udapl_scm/udapl_scm_exports.src b/dapl/udapl_scm/udapl_scm_exports.src
deleted file mode 100644
index 6702c89..0000000
--- a/dapl/udapl_scm/udapl_scm_exports.src
+++ /dev/null
@@ -1,14 +0,0 @@
-#if DBG
-LIBRARY dapl2-scmd.dll
-#else
-LIBRARY dapl2-scm.dll
-#endif
-
-
-EXPORTS
-dat_provider_init
-dat_provider_fini
-#ifdef DAT_EXTENSIONS
-dapl_extensions
-#endif
-
diff --git a/dapl/udapl_scm/udapl_sources.c b/dapl/udapl_scm/udapl_sources.c
deleted file mode 100644
index 109c484..0000000
--- a/dapl/udapl_scm/udapl_sources.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Include all files that are not in children directories.
- */
-#include "dapl_cno_util.c"
-#include "dapl_cookie.c"
-#include "dapl_cr_accept.c"
-#include "dapl_cr_callback.c"
-#include "dapl_cr_handoff.c"
-#include "dapl_cr_query.c"
-#include "dapl_cr_reject.c"
-#include "dapl_cr_util.c"
-#include "dapl_csp.c"
-#include "dapl_debug.c"
-#include "dapl_ep_connect.c"
-#include "dapl_ep_create.c"
-#include "dapl_ep_disconnect.c"
-#include "dapl_ep_dup_connect.c"
-#include "dapl_ep_free.c"
-#include "dapl_ep_get_status.c"
-#include "dapl_ep_modify.c"
-#include "dapl_ep_post_rdma_read.c"
-#include "dapl_ep_post_rdma_read_to_rmr.c"
-#include "dapl_ep_post_rdma_write.c"
-#include "dapl_ep_post_recv.c"
-#include "dapl_ep_post_send.c"
-#include "dapl_ep_post_send_invalidate.c"
-#include "dapl_ep_query.c"
-#include "dapl_ep_recv_query.c"
-#include "dapl_ep_reset.c"
-#include "dapl_ep_set_watermark.c"
-#include "dapl_ep_util.c"
-#include "dapl_evd_connection_callb.c"
-#include "dapl_evd_cq_async_error_callb.c"
-#include "dapl_evd_dequeue.c"
-#include "dapl_evd_dto_callb.c"
-#include "dapl_evd_free.c"
-#include "dapl_evd_post_se.c"
-#include "dapl_evd_qp_async_error_callb.c"
-#include "dapl_evd_resize.c"
-#include "dapl_evd_un_async_error_callb.c"
-#include "dapl_evd_util.c"
-#include "dapl_get_consumer_context.c"
-#include "dapl_get_handle_type.c"
-#include "dapl_hash.c"
-#include "dapl_hca_util.c"
-#include "dapl_ia_close.c"
-#include "dapl_ia_ha.c"
-#include "dapl_ia_open.c"
-#include "dapl_ia_query.c"
-#include "dapl_ia_util.c"
-#include "dapl_llist.c"
-#include "dapl_lmr_free.c"
-#include "dapl_lmr_query.c"
-#include "dapl_lmr_sync_rdma_read.c"
-#include "dapl_lmr_sync_rdma_write.c"
-#include "dapl_lmr_util.c"
-#include "dapl_mr_util.c"
-#include "dapl_name_service.c"
-#include "dapl_provider.c"
-#include "dapl_psp_create.c"
-#include "dapl_psp_create_any.c"
-#include "dapl_psp_free.c"
-#include "dapl_psp_query.c"
-#include "dapl_pz_create.c"
-#include "dapl_pz_free.c"
-#include "dapl_pz_query.c"
-#include "dapl_pz_util.c"
-#include "dapl_ring_buffer_util.c"
-#include "dapl_rmr_bind.c"
-#include "dapl_rmr_create.c"
-#include "dapl_rmr_free.c"
-#include "dapl_rmr_query.c"
-#include "dapl_rmr_util.c"
-#include "dapl_rsp_create.c"
-#include "dapl_rsp_free.c"
-#include "dapl_rsp_query.c"
-#include "dapl_set_consumer_context.c"
-#include "dapl_sp_util.c"
-#include "dapl_ep_create_with_srq.c"
-#include "dapl_srq_create.c"
-#include "dapl_srq_free.c"
-#include "dapl_srq_post_recv.c"
-#include "dapl_srq_query.c"
-#include "dapl_srq_resize.c"
-#include "dapl_srq_set_lw.c"
-#include "dapl_srq_util.c"
-#include "dapl_timer_util.c"
-
-#include "..\udapl\dapl_cno_create.c"
-#include "..\udapl\dapl_cno_free.c"
-#include "..\udapl\dapl_cno_modify_agent.c"
-#include "..\udapl\dapl_cno_query.c"
-#include "..\udapl\dapl_cno_wait.c"
-#include "..\udapl\dapl_evd_clear_unwaitable.c"
-#include "..\udapl\dapl_evd_create.c"
-#include "..\udapl\dapl_evd_disable.c"
-#include "..\udapl\dapl_evd_enable.c"
-#include "..\udapl\dapl_evd_modify_cno.c"
-#include "..\udapl\dapl_evd_query.c"
-#include "..\udapl\dapl_evd_set_unwaitable.c"
-#include "..\udapl\dapl_evd_wait.c"
-#include "..\udapl\dapl_init.c"
-#include "..\udapl\dapl_lmr_create.c"
-
-#include "..\ibal-scm\dapl_ibal-scm_cm.c"
-#include "..\ibal-scm\dapl_ibal-scm_util.c"
-
-#include "..\ibal\dapl_ibal_qp.c"
-#include "..\ibal\dapl_ibal_cq.c"
-#include "..\ibal\dapl_ibal_util.c"
-#include "..\ibal\dapl_ibal_name_service.c"
-
-//#include "..\ibal\dapl_ibal_mrdb.c"
-
-#ifdef DAT_EXTENSIONS
-#include "..\ibal\dapl_ibal_extensions.c"
-#endif
-
-#include "windows\dapl_osd.c"
-
--
1.5.2.5
More information about the general
mailing list