From 1bd596dc0193404c82416a9cfaec8720b1150ca9 Mon Sep 17 00:00:00 2001 From: Burer Date: Sun, 11 Jan 2026 16:30:02 +0200 Subject: [PATCH] Remove unused alias, clarify constants --- kernel/trunk/docs/sysfuncr.txt | 36 ++++++++-------- kernel/trunk/docs/sysfuncs.txt | 64 ++++++++++++++-------------- programs/KOSfuncs.inc | 3 +- programs/develop/koldbg/kosfuncs.inc | 29 ++++++------- 4 files changed, 65 insertions(+), 67 deletions(-) diff --git a/kernel/trunk/docs/sysfuncr.txt b/kernel/trunk/docs/sysfuncr.txt index 6a6b60000..4c67a6d48 100644 --- a/kernel/trunk/docs/sysfuncr.txt +++ b/kernel/trunk/docs/sysfuncr.txt @@ -4557,8 +4557,8 @@ Architecture Software Developer's Manual, Volume 3, Appendix B); * eax = количество активных сетевых устройств ---------------------- Константы для регистров: ---------------------- - eax - SF_NETWORK_GET (74) / SF_NETWORK_DEVICE (74) - bl - SSF_DEVICE_COUNT (255) + eax - SF_NETWORK_GET (74) + bl - SSF_DEVICE_COUNT (-1 / 255) ====================================================================== ==== Функция 74, подфункция 0, Получить тип сетевого устройства. ===== ====================================================================== @@ -4570,7 +4570,7 @@ Architecture Software Developer's Manual, Volume 3, Appendix B); * eax = тип устройства ---------------------- Константы для регистров: ---------------------- - eax - SF_NETWORK_GET (74) / SF_NETWORK_DEVICE (74) + eax - SF_NETWORK_GET (74) bl - SSF_DEVICE_TYPE (0) ====================================================================== ==== Функция 74, подфункция 1, Получить имя сетевого устройства. ===== @@ -4585,7 +4585,7 @@ Architecture Software Developer's Manual, Volume 3, Appendix B); * В случае успеха в буфер записывается имя сетевого устройства ---------------------- Константы для регистров: ---------------------- - eax - SF_NETWORK_GET (74) / SF_NETWORK_DEVICE (74) + eax - SF_NETWORK_GET (74) bl - SSF_DEVICE_NAME (1) ====================================================================== ======= Функция 74, подфункция 2, Сброс сетевого устройства. ========= @@ -4598,7 +4598,7 @@ Architecture Software Developer's Manual, Volume 3, Appendix B); * eax = -1 для ошибки ---------------------- Константы для регистров: ---------------------- - eax - SF_NETWORK_GET (74) / SF_NETWORK_DEVICE (74) + eax - SF_NETWORK_GET (74) bl - SSF_RESET_DEVICE (2) ====================================================================== ====== Функция 74, подфункция 3, Остановить сетевое устройство. ====== @@ -4611,7 +4611,7 @@ Architecture Software Developer's Manual, Volume 3, Appendix B); * eax = -1 для ошибки ---------------------- Константы для регистров: ---------------------- - eax - SF_NETWORK_GET (74) / SF_NETWORK_DEVICE (74) + eax - SF_NETWORK_GET (74) bl - SSF_STOP_DEVICE (3) ====================================================================== ===== Функция 74, подфункция 4, Получить указатель на устройство ===== @@ -4624,7 +4624,7 @@ Architecture Software Developer's Manual, Volume 3, Appendix B); * eax = указатель, -1 для ошибки ---------------------- Константы для регистров: ---------------------- - eax - SF_NETWORK_GET (74) / SF_NETWORK_DEVICE (74) + eax - SF_NETWORK_GET (74) bl - SSF_DEVICE_POINTER (4) ====================================================================== === Функция 74, подфункция 6, Получить количество посланых пакетов === @@ -4637,7 +4637,7 @@ Architecture Software Developer's Manual, Volume 3, Appendix B); * eax = количество с момента старта устройства, -1 для ошибки ---------------------- Константы для регистров: ---------------------- - eax - SF_NETWORK_GET (74) / SF_NETWORK_DEVICE (74) + eax - SF_NETWORK_GET (74) bl - SSF_TX_PACKET_COUNT (6) ====================================================================== === Функция 74, подфункция 7, Получить количество принятых пакетов === @@ -4650,7 +4650,7 @@ Architecture Software Developer's Manual, Volume 3, Appendix B); * eax = количество с момента старта устройства, -1 для ошибки ---------------------- Константы для регистров: ---------------------- - eax - SF_NETWORK_GET (74) / SF_NETWORK_DEVICE (74) + eax - SF_NETWORK_GET (74) bl - SSF_RX_PACKET_COUNT (7) ====================================================================== ==== Функция 74, подфункция 8, Получить количество посланых байт. ==== @@ -4664,7 +4664,7 @@ Architecture Software Developer's Manual, Volume 3, Appendix B); * ebx = старшая часть ---------------------- Константы для регистров: ---------------------- - eax - SF_NETWORK_GET (74) / SF_NETWORK_DEVICE (74) + eax - SF_NETWORK_GET (74) bl - SSF_TX_BYTE_COUNT (8) ====================================================================== ==== Функция 74, подфункция 9, Получить количество принятых байт. ==== @@ -4678,7 +4678,7 @@ Architecture Software Developer's Manual, Volume 3, Appendix B); * ebx = старшая часть ---------------------- Константы для регистров: ---------------------- - eax - SF_NETWORK_GET (74) / SF_NETWORK_DEVICE (74) + eax - SF_NETWORK_GET (74) bl - SSF_RX_BYTE_COUNT (9) ====================================================================== ======= Функция 74, подфункция 10, Получить статус соединения. ======= @@ -4699,7 +4699,7 @@ Architecture Software Developer's Manual, Volume 3, Appendix B); 10b = флаг полного дуплекса ---------------------- Константы для регистров: ---------------------- - eax - SF_NETWORK_GET (74) / SF_NETWORK_DEVICE (74) + eax - SF_NETWORK_GET (74) bl - SSF_LINK_STATUS (10) ====================================================================== == Функция 74.11, Получить количество пакетов переданных с ошибкой. == @@ -4713,7 +4713,7 @@ Architecture Software Developer's Manual, Volume 3, Appendix B); устройства, -1 при ошибке ---------------------- Константы для регистров: ---------------------- - eax - SF_NETWORK_GET (74) / SF_NETWORK_DEVICE (74) + eax - SF_NETWORK_GET (74) bl - SSF_TX_PACKET_ERROR_COUNT (11) ====================================================================== === Функция 74.12, Получить число пакетов отброшенных при отправке. == @@ -4727,7 +4727,7 @@ Architecture Software Developer's Manual, Volume 3, Appendix B); -1 при ошибке ---------------------- Константы для регистров: ---------------------- - eax - SF_NETWORK_GET (74) / SF_NETWORK_DEVICE (74) + eax - SF_NETWORK_GET (74) bl - SSF_TX_PACKET_DROP_COUNT (12) ====================================================================== === Функция 74.13, Получить число пакетов утерянных при отправке. ==== @@ -4741,7 +4741,7 @@ Architecture Software Developer's Manual, Volume 3, Appendix B); -1 при ошибке ---------------------- Константы для регистров: ---------------------- - eax - SF_NETWORK_GET (74) / SF_NETWORK_DEVICE (74) + eax - SF_NETWORK_GET (74) bl - SSF_TX_PACKET_MISS_COUNT (13) ====================================================================== @@ -4756,7 +4756,7 @@ Architecture Software Developer's Manual, Volume 3, Appendix B); устройства, -1 при ошибке ---------------------- Константы для регистров: ---------------------- - eax - SF_NETWORK_GET (74) / SF_NETWORK_DEVICE (74) + eax - SF_NETWORK_GET (74) bl - SSF_RX_PACKET_ERROR_COUNT (14) ====================================================================== @@ -4771,7 +4771,7 @@ Architecture Software Developer's Manual, Volume 3, Appendix B); -1 при ошибке ---------------------- Константы для регистров: ---------------------- - eax - SF_NETWORK_GET (74) / SF_NETWORK_DEVICE (74) + eax - SF_NETWORK_GET (74) bl - SSF_RX_PACKET_DROP_COUNT (15) ====================================================================== === Функция 74.16, Получить число пакетов утерянных при получении. === @@ -4785,7 +4785,7 @@ Architecture Software Developer's Manual, Volume 3, Appendix B); -1 при ошибке ---------------------- Константы для регистров: ---------------------- - eax - SF_NETWORK_GET (74) / SF_NETWORK_DEVICE (74) + eax - SF_NETWORK_GET (74) bl - SSF_RX_PACKET_MISS_COUNT (16) ====================================================================== ============== Функция 75, подфункция 0, Открыть сокет. ============== diff --git a/kernel/trunk/docs/sysfuncs.txt b/kernel/trunk/docs/sysfuncs.txt index 280732315..ccbd328b4 100644 --- a/kernel/trunk/docs/sysfuncs.txt +++ b/kernel/trunk/docs/sysfuncs.txt @@ -3678,9 +3678,9 @@ Returned value: Remarks: * The driver entry is called with DRV_EXIT before unloading. ----------------------- Constants for registers: ---------------------- - eax - SF_SYS_MISC (68) - ebx - SSF_UNLOAD_DRIVER (30) +---------------------- Constants for registers: ---------------------- + eax - SF_SYS_MISC (68) + ebx - SSF_UNLOAD_DRIVER (30) ====================================================================== =========== Function 68, subfunction 31 - get driver data. =========== @@ -4504,17 +4504,17 @@ Returned value: ---------------------- Constants for registers: ---------------------- eax - SF_BLITTER (73) ====================================================================== -= Function 74, Subfunction 255, Get number of active network devices. = += Function 74, Subfunction -1, Get number of active network devices. = ====================================================================== Parameters: * eax = 74 - function number - * bl = 255 - subfunction number + * bl = -1 (255) - subfunction number Returned value: * eax = number of active network devices ---------------------- Constants for registers: ---------------------- - eax - SF_NETWORK_GET (74) / SF_NETWORK_DEVICE (74) - bl - SSF_DEVICE_COUNT (255) + eax - SF_NETWORK_GET (74) + bl - SSF_DEVICE_COUNT (-1 / 255) ====================================================================== ======== Function 74, Subfunction 0, Get network device type. ======== ====================================================================== @@ -4526,7 +4526,7 @@ Returned value: * eax = device type number, -1 on error ---------------------- Constants for registers: ---------------------- - eax - SF_NETWORK_GET (74) / SF_NETWORK_DEVICE (74) + eax - SF_NETWORK_GET (74) bl - SSF_DEVICE_TYPE (0) ====================================================================== ======== Function 74, Subfunction 1, Get network device name. ======== @@ -4541,7 +4541,7 @@ Returned value: * The network device name is written into the buffer, on success ---------------------- Constants for registers: ---------------------- - eax - SF_NETWORK_GET (74) / SF_NETWORK_DEVICE (74) + eax - SF_NETWORK_GET (74) bl - SSF_DEVICE_NAME (1) ====================================================================== ========= Function 74, Subfunction 2, Reset network device. ========== @@ -4554,7 +4554,7 @@ Returned value: * eax = -1 on error ---------------------- Constants for registers: ---------------------- - eax - SF_NETWORK_GET (74) / SF_NETWORK_DEVICE (74) + eax - SF_NETWORK_GET (74) bl - SSF_RESET_DEVICE (2) ====================================================================== ========== Function 74, Subfunction 3, Stop network device. ========== @@ -4567,7 +4567,7 @@ Returned value: * eax = -1 on error ---------------------- Constants for registers: ---------------------- - eax - SF_NETWORK_GET (74) / SF_NETWORK_DEVICE (74) + eax - SF_NETWORK_GET (74) bl - SSF_STOP_DEVICE (3) ====================================================================== =========== Function 74, Subfunction 4, Get device pointer. ========== @@ -4580,7 +4580,7 @@ Returned value: * eax = device pointer, -1 on error ---------------------- Constants for registers: ---------------------- - eax - SF_NETWORK_GET (74) / SF_NETWORK_DEVICE (74) + eax - SF_NETWORK_GET (74) bl - SSF_DEVICE_POINTER (4) ====================================================================== ========= Function 74, Subfunction 6, Get packet TX counter. ========= @@ -4593,7 +4593,7 @@ Returned value: * eax = Number of packets sent since device start, -1 on error ---------------------- Constants for registers: ---------------------- - eax - SF_NETWORK_GET (74) / SF_NETWORK_DEVICE (74) + eax - SF_NETWORK_GET (74) bl - SSF_TX_PACKET_COUNT (6) ====================================================================== ========= Function 74, Subfunction 7, Get packet RX counter. ========= @@ -4606,7 +4606,7 @@ Returned value: * eax = Number of packets received since device start, -1 on error ---------------------- Constants for registers: ---------------------- - eax - SF_NETWORK_GET (74) / SF_NETWORK_DEVICE (74) + eax - SF_NETWORK_GET (74) bl - SSF_RX_PACKET_COUNT (7) ====================================================================== ========== Function 74, Subfunction 8, Get TX byte counter. ========== @@ -4621,7 +4621,7 @@ Returned value: * ebx = Number of bytes sent since device start (higher dword) ---------------------- Constants for registers: ---------------------- - eax - SF_NETWORK_GET (74) / SF_NETWORK_DEVICE (74) + eax - SF_NETWORK_GET (74) bl - SSF_TX_BYTE_COUNT (8) ====================================================================== ========== Function 74, Subfunction 9, Get RX byte counter. ========== @@ -4636,7 +4636,7 @@ Returned value: * ebx = Number of bytes received since device start (higher dword) ---------------------- Constants for registers: ---------------------- - eax - SF_NETWORK_GET (74) / SF_NETWORK_DEVICE (74) + eax - SF_NETWORK_GET (74) bl - SSF_RX_BYTE_COUNT (9) ====================================================================== ========== Function 74, Subfunction 10, Get link status. ============= @@ -4657,7 +4657,7 @@ Returned value: ETH_LINK_1G = 1100b ; gigabit ---------------------- Constants for registers: ---------------------- - eax - SF_NETWORK_GET (74) / SF_NETWORK_DEVICE (74) + eax - SF_NETWORK_GET (74) bl - SSF_LINK_STATUS (10) ====================================================================== ==== Function 74, Subfunction 11, Get TX error packets counter. ====== @@ -4670,7 +4670,7 @@ Returned value: * eax = Number of erroneous packets transmitted since device start, -1 on error ---------------------- Constants for registers: ---------------------- - eax - SF_NETWORK_GET (74) / SF_NETWORK_DEVICE (74) + eax - SF_NETWORK_GET (74) bl - SSF_TX_PACKET_ERROR_COUNT (11) ====================================================================== === Function 74, Subfunction 12, Get TX dropped packets counter. ===== @@ -4683,7 +4683,7 @@ Returned value: * eax = Number of dropped packets since device start, -1 on error ---------------------- Constants for registers: ---------------------- - eax - SF_NETWORK_GET (74) / SF_NETWORK_DEVICE (74) + eax - SF_NETWORK_GET (74) bl - SSF_TX_PACKET_DROP_COUNT (12) ====================================================================== ==== Function 74, Subfunction 13, Get TX missed packets counter. ===== @@ -4696,7 +4696,7 @@ Returned value: * eax = Number of missed packets since device start, -1 on error ---------------------- Constants for registers: ---------------------- - eax - SF_NETWORK_GET (74) / SF_NETWORK_DEVICE (74) + eax - SF_NETWORK_GET (74) bl - SSF_TX_PACKET_MISS_COUNT (13) ====================================================================== ==== Function 74, Subfunction 14, Get RX error packets counter. ====== @@ -4709,7 +4709,7 @@ Returned value: * eax = Number of erroneous packets received since device start, -1 on error ---------------------- Constants for registers: ---------------------- - eax - SF_NETWORK_GET (74) / SF_NETWORK_DEVICE (74) + eax - SF_NETWORK_GET (74) bl - SSF_RX_PACKET_ERROR_COUNT (14) ====================================================================== === Function 74, Subfunction 15, Get RX dropped packets counter. ===== @@ -4722,7 +4722,7 @@ Returned value: * eax = Number of dropped packets since device start, -1 on error ---------------------- Constants for registers: ---------------------- - eax - SF_NETWORK_GET (74) / SF_NETWORK_DEVICE (74) + eax - SF_NETWORK_GET (74) bl - SSF_RX_PACKET_DROP_COUNT (15) ====================================================================== ==== Function 74, Subfunction 16, Get RX missed packets counter. ===== @@ -4735,7 +4735,7 @@ Returned value: * eax = Number of missed packets since device start, -1 on error ---------------------- Constants for registers: ---------------------- - eax - SF_NETWORK_GET (74) / SF_NETWORK_DEVICE (74) + eax - SF_NETWORK_GET (74) bl - SSF_RX_PACKET_MISS_COUNT (16) ====================================================================== ============== Function 75, Subfunction 0, Open socket. ============== @@ -5340,9 +5340,9 @@ Returned value: Remarks: * Only pipe descriptors are supported. ----------------------- Constants for registers: ---------------------- - eax - SF_FUTEX (77) - ebx - SSF_PIPE_READ (10) +---------------------- Constants for registers: ---------------------- + eax - SF_FUTEX (77) + ebx - SSF_PIPE_READ (10) ====================================================================== =========== Function 77, Subfunction 11, Write to pipe. ============= ====================================================================== @@ -5357,9 +5357,9 @@ Returned value: Remarks: * Only pipe descriptors are supported. ----------------------- Constants for registers: ---------------------- - eax - SF_FUTEX (77) - ebx - SSF_PIPE_WRITE (11) +---------------------- Constants for registers: ---------------------- + eax - SF_FUTEX (77) + ebx - SSF_PIPE_WRITE (11) ====================================================================== ========== Function 77, Subfunction 13, Create pipe. ================ ====================================================================== @@ -5375,9 +5375,9 @@ Remarks: * On success, pipefd[0] is a read descriptor and pipefd[1] is a write descriptor. ----------------------- Constants for registers: ---------------------- - eax - SF_FUTEX (77) - ebx - SSF_PIPE_CREATE (13) +---------------------- Constants for registers: ---------------------- + eax - SF_FUTEX (77) + ebx - SSF_PIPE_CREATE (13) ====================================================================== === Function 80 - file system interface with parameter of encoding === ====================================================================== diff --git a/programs/KOSfuncs.inc b/programs/KOSfuncs.inc index 00e874e69..e33af8e55 100644 --- a/programs/KOSfuncs.inc +++ b/programs/KOSfuncs.inc @@ -231,8 +231,7 @@ SF_FILE=70 SF_SET_CAPTION=71 SF_SEND_MESSAGE=72 SF_BLITTER=73 -SF_NETWORK_DEVICE=74 -SF_NETWORK_GET=74 ; alias +SF_NETWORK_GET=74 SSF_DEVICE_COUNT=255 ; get number of active network devices SSF_DEVICE_TYPE=0 SSF_DEVICE_NAME=1 diff --git a/programs/develop/koldbg/kosfuncs.inc b/programs/develop/koldbg/kosfuncs.inc index 978eb613f..e33af8e55 100644 --- a/programs/develop/koldbg/kosfuncs.inc +++ b/programs/develop/koldbg/kosfuncs.inc @@ -201,11 +201,11 @@ SF_SYS_MISC=68 SSF_MEM_CLOSE=23 SSF_SET_EXCEPTION_HANDLER=24 SSF_SET_EXCEPTION_STATE=25 - SSF_MEM_FREE_EXT=26 - SSF_LOAD_FILE=27 - SSF_MEM_ALLOC_RING=29 - SSF_UNLOAD_DRIVER=30 - SSF_GET_DRIVER_DATA=31 + SSF_MEM_FREE_EXT=26 + SSF_LOAD_FILE=27 + SSF_MEM_ALLOC_RING=29 + SSF_UNLOAD_DRIVER=30 + SSF_GET_DRIVER_DATA=31 SF_DEBUG=69 SSF_SET_MESSAGE_AREA=0 SSF_GET_REGISTERS=1 @@ -231,8 +231,7 @@ SF_FILE=70 SF_SET_CAPTION=71 SF_SEND_MESSAGE=72 SF_BLITTER=73 -SF_NETWORK_DEVICE=74 -SF_NETWORK_GET=74 ; alias +SF_NETWORK_GET=74 SSF_DEVICE_COUNT=255 ; get number of active network devices SSF_DEVICE_TYPE=0 SSF_DEVICE_NAME=1 @@ -290,14 +289,14 @@ SF_NETWORK_PROTOCOL=76 SSF_ARP_DEL_ENTRY=50005h SSF_ARP_SEND_ANNOUNCE=50006h SSF_ARP_CONFLICTS_COUNT=50007h -SF_FUTEX=77 - SSF_CREATE=0 - SSF_DESTROY=1 - SSF_WAIT=2 - SSF_WAKE=3 - SSF_PIPE_READ=10 - SSF_PIPE_WRITE=11 - SSF_PIPE_CREATE=13 +SF_FUTEX=77 + SSF_CREATE=0 + SSF_DESTROY=1 + SSF_WAIT=2 + SSF_WAKE=3 + SSF_PIPE_READ=10 + SSF_PIPE_WRITE=11 + SSF_PIPE_CREATE=13 ; File system errors: FSERR_SUCCESS=0