From 8f8ce000938af7a9098526f37b8e2525392e75c9 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Fri, 29 May 2026 12:13:13 +0200 Subject: [PATCH] ncp: rename requester assembly header Finish the ncpcall.asm/ncpcall.h to ncp.asm/ncp.h rename. Update the Open Watcom build, object names, include directives, header guard, README references and file-level dependency comments to use the shorter ncp naming. The split remains the same: ncp.asm/ncp.h provide the low-level INT 21h and Client32 requester entry points, ncpcall.c contains requester transport helpers, and ncpapi.c contains the ncpXX_YY_* protocol API wrappers. No behavior change. --- CMakeLists.txt | 14 +++++++------- README.md | 6 +++--- map.c | 2 +- ncpcall.asm => ncp.asm | 4 ++-- ncpcall.h => ncp.h | 8 ++++---- ncpcall.c | 2 +- net.h | 6 +++--- netcall.c | 2 +- 8 files changed, 22 insertions(+), 22 deletions(-) rename ncpcall.asm => ncp.asm (99%) rename ncpcall.h => ncp.h (90%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 483fe2e..f82b837 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -95,14 +95,14 @@ if(MARS_NWE_BUILD_DOSUTILS) ) add_custom_command( - OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/ncpcall_asm.obj" + OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/ncp.obj" COMMAND "${CMAKE_COMMAND}" -E env ${OPENWATCOM_ENV} "${OPENWATCOM_WASM}" -q -zq - -fo="${CMAKE_CURRENT_BINARY_DIR}/ncpcall_asm.obj" - "${CMAKE_CURRENT_SOURCE_DIR}/ncpcall.asm" - DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/ncpcall.asm" + -fo="${CMAKE_CURRENT_BINARY_DIR}/ncp.obj" + "${CMAKE_CURRENT_SOURCE_DIR}/ncp.asm" + DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/ncp.asm" WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" VERBATIM ) @@ -135,7 +135,7 @@ if(MARS_NWE_BUILD_DOSUTILS) "${CMAKE_CURRENT_SOURCE_DIR}/${src}" "${CMAKE_CURRENT_SOURCE_DIR}/net.h" "${CMAKE_CURRENT_SOURCE_DIR}/ipx.h" - "${CMAKE_CURRENT_SOURCE_DIR}/ncpcall.h" + "${CMAKE_CURRENT_SOURCE_DIR}/ncp.h" "${CMAKE_CURRENT_SOURCE_DIR}/ncpapi.h" "${CMAKE_CURRENT_SOURCE_DIR}/nwcrypt.h" WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" @@ -156,11 +156,11 @@ if(MARS_NWE_BUILD_DOSUTILS) -fe="${CMAKE_CURRENT_BINARY_DIR}/net.exe" ${DOSUTILS_OBJECTS} "${CMAKE_CURRENT_BINARY_DIR}/ipx.obj" - "${CMAKE_CURRENT_BINARY_DIR}/ncpcall_asm.obj" + "${CMAKE_CURRENT_BINARY_DIR}/ncp.obj" DEPENDS ${DOSUTILS_OBJECTS} "${CMAKE_CURRENT_BINARY_DIR}/ipx.obj" - "${CMAKE_CURRENT_BINARY_DIR}/ncpcall_asm.obj" + "${CMAKE_CURRENT_BINARY_DIR}/ncp.obj" WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" VERBATIM ) diff --git a/README.md b/README.md index ebe8d96..832e6ec 100644 --- a/README.md +++ b/README.md @@ -120,7 +120,7 @@ The modern Client32 path is implemented through a small reusable helper layer: - `ncpapi.c` - `ncpapi.h` -- Client32 assembly entry points in `ncpcall.asm` +- Client32 assembly entry points in `ncp.asm` The working sequence is: @@ -628,7 +628,7 @@ cmake --build build The CMake build: -- assembles `ipx.asm` and `ncpcall.asm` with `wasm` +- assembles `ipx.asm` and `ncp.asm` with `wasm` - compiles each C file to a binary-directory `.obj` - links `net.exe` from those binary-directory objects - keeps `.obj`/`.o` intermediate files out of the source directory @@ -676,7 +676,7 @@ They also install selected copies such as `login.exe`, `map.exe`, and `slist.exe ## Development notes -- `ipx.asm` and `ncpcall.asm` are the split 16-bit Open Watcom assembly implementations used by the modern build. +- `ipx.asm` and `ncp.asm` are the split 16-bit Open Watcom assembly implementations used by the modern build. - `kern.c` was an experimental C-side test wrapper and is no longer required by the current Client32 FLAG/FLAGDIR path. - `ncpapi.c` and `ncpapi.h` contain reusable Client32 NCP helper functions for DOS tools. - `trustee.c` and `trustee.h` contain shared code for `GRANT`, `REVOKE`, and `REMOVE`. diff --git a/map.c b/map.c index 46416de..afc99cc 100644 --- a/map.c +++ b/map.c @@ -20,7 +20,7 @@ /* * Purpose: MAP and PATH command implementation for NetWare drive/search-drive mappings. - * Depends on: net.h, netcall.c requester helpers, tools.c shared utility routines, ncpcall.asm/doc/kern.asm low-level Net_Call glue. + * Depends on: net.h, netcall.c requester helpers, tools.c shared utility routines, ncp.asm/doc/kern.asm low-level Net_Call glue. */ #include "net.h" diff --git a/ncpcall.asm b/ncp.asm similarity index 99% rename from ncpcall.asm rename to ncp.asm index bcec7a5..86fe7ee 100644 --- a/ncpcall.asm +++ b/ncp.asm @@ -18,12 +18,12 @@ ; along with this program; if not, see . ; Purpose: Open Watcom WASM/MASM-syntax NetWare requester and Client32 transport glue. -; Depends on: ncpcall.h declarations, ncpcall.c transport helpers and ncpapi.c API wrappers. +; Depends on: ncp.h declarations, ncpcall.c transport helpers and ncpapi.c API wrappers. ; -; ncpcall.asm +; ncp.asm ; ; Low-level INT 21h Net_Call and Client32 requester entry points used by the ; DOS NCP transport helpers. This file is split from the former combined diff --git a/ncpcall.h b/ncp.h similarity index 90% rename from ncpcall.h rename to ncp.h index 1547bd4..8983291 100644 --- a/ncpcall.h +++ b/ncp.h @@ -20,11 +20,11 @@ /* * Purpose: C declarations for low-level NetWare requester and Client32 transport assembly glue. - * Depends on: ncpcall.asm for Open Watcom builds, ncpcall.c transport helpers, and net.h for shared types. + * Depends on: ncp.asm for Open Watcom builds, ncpcall.c transport helpers, and net.h for shared types. */ -#ifndef NCPCALL_H -#define NCPCALL_H +#ifndef NCP_H +#define NCP_H #if defined(__WATCOMC__) #define NCP_CALL _Cdecl @@ -44,4 +44,4 @@ extern int NCP_CALL ncp_raw_request(UI connLo, UI connHi, #undef NCP_CALL -#endif /* NCPCALL_H */ +#endif /* NCP_H */ diff --git a/ncpcall.c b/ncpcall.c index cbf3c06..56b77f2 100644 --- a/ncpcall.c +++ b/ncpcall.c @@ -20,7 +20,7 @@ /* * Purpose: Low-level NCP requester and Client32 transport helpers for the NetWare DOS tools. - * Depends on: net.h, ncpapi.h, netcall.c requester glue, and ncpcall.asm/doc/kern.asm Net_Call/Client32 request entry points. + * Depends on: net.h, ncpapi.h, netcall.c requester glue, and ncp.asm/doc/kern.asm Net_Call/Client32 request entry points. * * The public ncpXX_YY_* protocol wrappers live in ncpapi.c, which is planned * to become ncpapi.c. This file keeps the lower-level requester/transport diff --git a/net.h b/net.h index 5940785..d30ad68 100644 --- a/net.h +++ b/net.h @@ -20,7 +20,7 @@ /* * Purpose: Shared public header for the DOS utility collection: types, prototypes and common structures. - * Depends on: ipx.h, ncpcall.h, all command modules, netcall.c, ncpcall.c, tools.c and ncpapi.c. + * Depends on: ipx.h, ncp.h, all command modules, netcall.c, ncpcall.c, tools.c and ncpapi.c. */ #include @@ -54,7 +54,7 @@ typedef int (*FUNC_INT)(); #include "ipx.h" -#include "ncpcall.h" +#include "ncp.h" #define UI2NET(i) ( ( (i) << 8) | ( ((i)>>8) & 0xFF) ) @@ -228,7 +228,7 @@ extern int get_volume_name(uint8 nr, char *name); extern int get_search_drive_vektor(SEARCH_VECTOR_ENTRY *vec); extern int set_search_drive_vektor(SEARCH_VECTOR_ENTRY *vec); -/********* ncpcall.h ***********/ +/********* ncp.h ***********/ extern int ncp16_02_get_directory_entry(int dirhandle, uint8 *path, int *sub_dir, diff --git a/netcall.c b/netcall.c index e5bd926..82486f9 100644 --- a/netcall.c +++ b/netcall.c @@ -20,7 +20,7 @@ /* * Purpose: DOS/NetWare requester wrapper layer and environment helpers used by the utilities. - * Depends on: net.h, ipx.asm/ncpcall.asm low-level IPX and Net_Call glue, ncpcall.c high-level NCP helpers, tools.c shared utility routines. + * Depends on: net.h, ipx.asm/ncp.asm low-level IPX and Net_Call glue, ncpcall.c high-level NCP helpers, tools.c shared utility routines. */ #include "net.h"