ncpcalls: rename probe helpers as requester calls

Rename the remaining Client32 transport helper symbols from Probe-style names
to request-style names.

These helpers are no longer only diagnostic probes; they are the low-level
requester paths used by the NCP API wrappers. Rename the raw5 helper to the
more general ncp_raw_request() name and update the MapVar/OpenRef helpers to
ncp_mapvar_request() and ncp_openref_request().

No behavior change.
This commit is contained in:
Mario Fetka
2026-05-29 11:40:32 +02:00
parent 40e7ebf939
commit d7f2a6551f
5 changed files with 57 additions and 57 deletions

View File

@@ -45,9 +45,9 @@ public _IPXclose_socket
public _IPXlisten
public _xmemmove
public _Net_Call
public _NCP_Raw5_Probe
public _NCP_OpenRef_Probe
public _NCP_MapVar_Probe
public _ncp_raw_request
public _ncp_openref_request
public _ncp_mapvar_request
_IPXinit proc far
push bp
mov bp, sp
@@ -242,7 +242,7 @@ _Net_Call endp
; int NCP_OpenRef_Probe(UI refLo, UI refHi, void *outbuf)
; int ncp_openref_request(UI refLo, UI refHi, void *outbuf)
;
; Opens a Client32 connection by connection reference using the same d32wrap
; convention as _CONNOpenByReference / w95ocref.o.
@@ -262,7 +262,7 @@ _Net_Call endp
; +10 return DX
; +12 handle low
; +14 handle high
_NCP_OpenRef_Probe proc far
_ncp_openref_request proc far
push bp
mov bp, sp
sub sp, 80
@@ -404,11 +404,11 @@ c32openref_store:
c32openref_name db 'CONNOpenByReference',0
_NCP_OpenRef_Probe endp
_ncp_openref_request endp
; int NCP_MapVar_Probe(UI specLen, UI flag, void *outbuf)
; int ncp_mapvar_request(UI specLen, UI flag, void *outbuf)
;
; Exact-ish raw version of w95mconn.o::__C32MapConn16To32 second step.
;
@@ -436,7 +436,7 @@ _NCP_OpenRef_Probe endp
; +14 resultRef high
; +16 connRefLocal low ; corresponds to d32conni local -1c
; +18 connRefLocal high
_NCP_MapVar_Probe proc far
_ncp_mapvar_request proc far
push bp
mov bp, sp
sub sp, 140
@@ -691,21 +691,21 @@ c32mapvar_store:
c32mapvar_name db 'CONNScanInfo',0
_NCP_MapVar_Probe endp
_ncp_mapvar_request endp
; int NCP_Raw5_Probe(UI connLo, UI connHi,
; int ncp_raw_request(UI connLo, UI connHi,
; void *hdr, UI hdrLen,
; void *path, UI pathLen,
; void *rep0, UI rep0Len,
; void *rep1, UI rep1Len,
; void *outbuf)
;
; Same as NCP_Raw_Probe but uses d32wrap-compatible 5-slot
; Sends a raw NCP request through the d32wrap-compatible 5-slot
; fragment tables: 5 * 8 = 0x28 bytes for request and reply.
_NCP_Raw5_Probe proc far
_ncp_raw_request proc far
push bp
mov bp, sp
sub sp, 180
@@ -727,11 +727,11 @@ _NCP_Raw5_Probe proc far
db 66h, 89h, 4Eh, 0F6h ; trampoline at [bp-10]
or ax, ax
jne raw5_fail
jne raw_fail
; resolve COMPATNcpRequestReply
push cs
push offset raw5_name
push offset raw_name
push 0
push 0
call dword ptr [bp-6]
@@ -739,10 +739,10 @@ _NCP_Raw5_Probe proc far
mov [bp-14], ax
mov [bp-12], dx
or ax, dx
jne raw5_have_func
jmp raw5_fail
jne raw_have_func
jmp raw_fail
raw5_have_func:
raw_have_func:
; actual reply len dword at [bp-36]
mov word ptr [bp-36], 0
mov word ptr [bp-34], 0
@@ -937,9 +937,9 @@ raw5_have_func:
call dword ptr [bp-6]
add sp, 0cH
jmp short raw5_store
jmp short raw_store
raw5_fail:
raw_fail:
mov word ptr [bp-14], 0
mov word ptr [bp-12], 0
mov word ptr [bp-52], 0ffffH
@@ -947,7 +947,7 @@ raw5_fail:
mov word ptr [bp-36], 0
mov word ptr [bp-34], 0
raw5_store:
raw_store:
les di, dword ptr [bp+22H]
mov ax, [bp-2]
mov es:[di+0], ax
@@ -981,9 +981,9 @@ raw5_store:
xor ah, ah
ret
raw5_name db 'COMPATNcpRequestReply',0
raw_name db 'COMPATNcpRequestReply',0
_NCP_Raw5_Probe endp
_ncp_raw_request endp
end