mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-24 02:18:20 -07:00
Code Issues Packages Projects Releases Activity

Un-devbranch the network switch

Browse Source
This commit is contained in:
RichardG867
2026-01-07 21:00:22 -03:00
parent 0aac48d6f2
commit 4ab6c318ed
5 changed files with 3 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/network/CMakeLists.txt
View File

@@ -19,6 +19,7 @@ list(APPEND net_sources
network.c
net_pcap.c
net_slirp.c
net_switch.c
net_dp8390.c
net_3c501.c
net_3c503.c
@@ -57,13 +58,6 @@ if(WIN32)
target_link_libraries(86Box ws2_32)
endif()
if(NETSWITCH)
add_compile_definitions(USE_NETSWITCH)
list(APPEND net_sources
net_switch.c
)
endif()
if (UNIX)
if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
set_source_files_properties(net_slirp.c PROPERTIES COMPILE_FLAGS "-I/usr/local/include")

2
src/network/network.c
View File

@@ -499,13 +499,11 @@ network_attach(void *card_drv, uint8_t *mac, NETRXCB rx, NETSETLINKSTATE set_lin
card->host_drv.priv = card->host_drv.init(card, mac, net_cards_conf[net_card_current].host_dev_name, net_drv_error);
break;
#endif
#ifdef USE_NETSWITCH
case NET_TYPE_NLSWITCH:
case NET_TYPE_NRSWITCH:
card->host_drv = net_switch_drv;
card->host_drv.priv = card->host_drv.init(card, mac, &net_cards_conf[net_card_current], net_drv_error);
break;
#endif /* USE_NETSWITCH */
default:
card->host_drv.priv = NULL;
break;