Skip to content
Draft
Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
eedc8a5
Uses endian independent structure layouts to access returned ethernet…
nbriggs Oct 30, 2025
cdaa7b6
Cleans up the interrupt state structure to match Lisp naming
nbriggs Dec 8, 2025
a074c4a
Adds required include of <string.h> for strncpy in non-BYTESWAP compi…
nbriggs Dec 8, 2025
5432d73
Adds generation of SIGIO on X11 connection if O_ASYNC defined
nbriggs Dec 11, 2025
3a4a943
Merge branch 'master' into nhb-pcap-ethernet
nbriggs Mar 20, 2026
6c80962
Replaces display subsystem specific procedures with process_Display_e…
nbriggs Apr 29, 2026
116aba2
Adds new ethernet implementation ether_pcap.c, enabled in subsequent …
nbriggs Apr 30, 2026
c10b512
Further clean up of boolean extended_frame in llstk.c
nbriggs May 1, 2026
3cdbaf8
Minor updates to timer and I/O signalling
nbriggs May 28, 2026
156208e
Cleanup in ldeether
nbriggs May 29, 2026
7661a97
Adds raw XNS ethernet packet access via the PCAP library, along with …
nbriggs Jun 1, 2026
967a227
Response to Gemini review - truncate overly large ether packets
nbriggs Jun 1, 2026
fc4e89f
Avoid buffer overflow parsing ldex.EtherNet interface name for pcap mode
nbriggs Jun 1, 2026
ea468cd
Addresses "major" complaints from Gemini review
nbriggs Jun 1, 2026
6f277ed
Addresses additional error handling and setup order complaints
nbriggs Jun 1, 2026
3038906
Cleanly update PENDINGINTERRUPT when a frame has been extended
nbriggs Jun 1, 2026
959b523
Introduces XrmValueCopy to safely copy a value{address, size} into a …
nbriggs Jun 1, 2026
e874b31
Cleans up signedness mismatch on ether_ifname string
nbriggs Jun 1, 2026
ba914df
Add comments re ideas on -E option parsing and restructure slightly
nbriggs Jun 1, 2026
36ce427
Improves robustness of handling pcap_next_ex() results and error repo…
nbriggs Jun 1, 2026
1de5296
Handle case where PCAP selectable fd is greater than FD_SETSIZE
nbriggs Jun 1, 2026
e3f65ba
Update comments to help Gemini get over its mistaken idea of the max …
nbriggs Jun 1, 2026
de1ce7b
Fixes uninitialized fd set in SunOS/Solaris check_ether code.
nbriggs Jun 2, 2026
b410f13
Handles errors (unlikely) from pcap_inject(); updates comment on XNS …
nbriggs Jun 2, 2026
443f356
Adds safety check to XrmValueCopy for passing NULL for dst or 0 for d…
nbriggs Jun 2, 2026
2c39b39
Removes unnecessary include nlist.h from ether_pcap.c
nbriggs Jun 2, 2026
f7e605e
Use common style for declaration of ethernet addresses in ether_addr_…
nbriggs Jun 2, 2026
f970d24
Corrects erroneous use of bitwise-and in place of logical and.
nbriggs Jun 2, 2026
eee15b1
Fixes missing void in parameterless procedure decl. Removes unused v…
nbriggs Jun 2, 2026
b50f976
Improves ease-of-use of -E option (pcap) by allowing -E interface-name
nbriggs Jun 3, 2026
9761836
Minor cleanup for pcap_next_ex() packet type, safety check on addr le…
nbriggs Jun 22, 2026
f7284f2
Remove unused xfd in X_init, setting async i/o has to be deferred.
nbriggs Jun 22, 2026
c964877
improves accuracy for periodic interrupt frequency calculation (maybe)
nbriggs Jun 22, 2026
c579084
Improves the error messages for bad -E/ldex.EtherNet resources
nbriggs Jun 22, 2026
b0706d4
Eliminates strncpy() in main.c in favor of snprintf()
nbriggs Jun 23, 2026
9812285
Reinstates maxpages limit X resource on contiguous pages dumped in sy…
nbriggs Jun 23, 2026
1a5196c
Eliminates strncpy in favor of memcpy for moving non null-terminated …
nbriggs Jun 23, 2026
374a41e
Eliminates strncpy() in favor of memcpy()/snprintf()
nbriggs Jun 23, 2026
81d993d
Eliminates strncpy() in favor of memcpy() for body of BCPL string.
nbriggs Jun 23, 2026
af4a1f6
Eliminates a stpncpy/strncpy pair in favor of an snprintf()
nbriggs Jun 23, 2026
ba77097
Eliminates strncpy() in favor of memcpy() since not a null-terminated…
nbriggs Jun 23, 2026
c7d2676
Eliminates strcpy()/strncpy() in favor of memcpy()
nbriggs Jun 23, 2026
f8f4ddf
Eliminate unnecessry strlcpy()/strlcat() calls, protect from no HOME …
nbriggs Jun 23, 2026
5164fef
Eliminate strcpy/strncat in favor of snprintf()
nbriggs Jun 24, 2026
74cea17
Eliminate strcpy in favor of memcpy into a Lisp string
nbriggs Jun 24, 2026
cba5dd6
Merge branch 'master' into nhb-pcap-ethernet
nbriggs Jul 4, 2026
4558c8b
Fixes inverted sense of check for access OK on user .Xdefaults file
nbriggs Jul 5, 2026
ce4f791
Ensure captured packet is complete, and of usable size.
nbriggs Jul 5, 2026
10724d0
Really force 64-bit arithmetic for periodic timer count on all archit…
nbriggs Jul 5, 2026
f8d1f4c
Frees compiled packet match filter on error return from init_pcap
nbriggs Jul 5, 2026
4f7be29
Updates comments on how the interface name/address finding should be …
nbriggs Jul 6, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 18 additions & 11 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -127,24 +127,27 @@ ENDIF()
# the following 2 lines should produce a dropdown-box in the cmake-gui
# but this will happen only after running the command line version of cmake,
# possibly after "clearing the cache" (i.e. starting with a fresh build directory)
SET(MAIKO_NETWORK_TYPE NONE CACHE STRING "Type of networking to use: one of: NONE, SUN_DLPI, SUN_NIT, NETHUB")
SET_PROPERTY(CACHE MAIKO_NETWORK_TYPE PROPERTY STRINGS NONE SUN_DLPI SUN_NIT NETHUB)
SET(MAIKO_NETWORK_TYPE NONE CACHE STRING "Type of network implementation to use: one of: NONE, PCAP, SUN_DLPI, SUN_NIT, NETHUB")
SET_PROPERTY(CACHE MAIKO_NETWORK_TYPE PROPERTY STRINGS NONE PCAP SUN_DLPI SUN_NIT NETHUB)

# configure networking implementation to use
IF(MAIKO_NETWORK_TYPE STREQUAL "NETHUB")
LIST(APPEND MAIKO_DEFINITIONS "-DMAIKO_ENABLE_NETHUB")
MESSAGE("-- Configured for NETHUB network support")
LIST(APPEND MAIKO_DEFINITIONS "-DMAIKO_ENABLE_ETHERNET -DUSE_NETHUB")
MESSAGE("-- Configured for NETHUB network implementation")
ELSEIF(MAIKO_NETWORK_TYPE STREQUAL "SUN_DLPI")
LIST(APPEND MAIKO_DEFINITIONS "-DMAIKO_ENABLE_ETHERNET -DUSE_DLPI")
MESSAGE("-- Configured for (SunOS) DLPI networking")
MESSAGE("-- Configured for (SunOS) DLPI network implementation")
ELSEIF(MAIKO_NETWORK_TYPE STREQUAL "SUN_NIT")
LIST(APPEND MAIKO_DEFINITIONS "-DMAIKO_ENABLE_ETHERNET -DUSE_NIT")
MESSAGE("-- Configured for (SunOS) NIT networking")
MESSAGE("-- Configured for (SunOS) NIT network implementation")
ELSEIF(MAIKO_NETWORK_TYPE STREQUAL "PCAP")
LIST(APPEND MAIKO_DEFINITIONS "-DMAIKO_ENABLE_ETHERNET -DUSE_PCAP")
LIST(APPEND MAIKO_LIBRARIES "pcap")
MESSAGE("-- Configured for PCAP network implementation")
ELSEIF(NOT MAIKO_NETWORK_TYPE STREQUAL "NONE")
MESSAGE(WARNING "Invalid option given for MAIKO_NETWORK_TYPE, must be one of:\nNONE, SUN_DLPI, SUN_NIT, NETHUB")
MESSAGE(WARNING "Invalid option given for MAIKO_NETWORK_TYPE, must be one of:\nNONE, PCAP, SUN_DLPI, SUN_NIT, NETHUB")
ENDIF()


IF(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
LIST(APPEND MAIKO_DEFINITIONS
"-DOS5"
Expand Down Expand Up @@ -220,6 +223,7 @@ SET(MAIKO_SRCS
src/ether_common.c
src/ether_sunos.c
src/ether_nethub.c
src/ether_pcap.c
src/findkey.c
src/foreign.c
src/fp.c
Expand Down Expand Up @@ -469,9 +473,12 @@ IF(MAIKO_DISPLAY_SDL)
TARGET_COMPILE_DEFINITIONS(lde PRIVATE ${MAIKO_DISPLAY_SDL_DEFINITIONS})
ENDIF()

ADD_EXECUTABLE(ldeether src/ldeether.c src/dlpi.c)
TARGET_COMPILE_DEFINITIONS(ldeether PRIVATE ${MAIKO_DEFINITIONS})
TARGET_INCLUDE_DIRECTORIES(ldeether PRIVATE inc)
IF(MAIKO_NETWORK_TYPE STREQUAL "SUN_DLPI" OR MAIKO_NETWORK_TYPE STREQUAL "SUN_NIT")
MESSAGE("-- Adding ldeether")
ADD_EXECUTABLE(ldeether src/ldeether.c src/dlpi.c)
TARGET_COMPILE_DEFINITIONS(ldeether PRIVATE ${MAIKO_DEFINITIONS})
TARGET_INCLUDE_DIRECTORIES(ldeether PRIVATE inc)
ENDIF()

IF(MAIKO_DISPLAY_X11)
ADD_EXECUTABLE(ldex
Expand Down
23 changes: 12 additions & 11 deletions bin/compile-flags
Original file line number Diff line number Diff line change
Expand Up @@ -124,19 +124,20 @@ BIGATOMS True if this emulator will support 3-byte symbols, instead of
NEWBITBLT True if we want to use assembler BITBLT code, rather than
have code created inline by macro calls.

USE_DLPI True if the ethernet API is via the SysV Data Link Provider
Interface. Solaris uses DLPI.

USE_NIT True if the ethernet API is via the Network Interface Tap.
SunOS uses NIT.

MAIKO_ENABLE_ETHERNET enables support for networking, the flavor of networking
is chosen with a USE_xxx flag as follows
USE_NETHUB - Dodo Nethub networking for Dodo XNS services, see
documentation: Using-Dodo-networking-with-Maiko.md
USE_PCAP - raw ethernet access for XNS and PUP networking using
the libpcap library
USE_DLPI - raw ethernet access for XNS networking using the
data link provider interface (Solaris only)
USE_NIT - raw ethernet access for XNS networking using the
/dev/nit interface (SunOS/Solaris 1 only)

PKTFILTER True if the ethernet packets are to be filtered before being
passed to the Lisp ethernet handler. Available on Sun systems
for both the NIT and DLPI cases.

MAIKO_ENABLE_NETHUB enables the support for Dodo Nethub networking for Dodo
XNS services, see documentation: using-dodo-networking-with-maiko.md
(implicitely disables USE_DLPI and USE_NIT)
for both the USE_NIT and USE_DLPI cases.

MAIKO_EMULATE_TIMER_INTERRUPTS enables emulation of recurring timer interrupts for
platforms where SIGVTALRM/ITIMER_VIRTUAL or SIGALRM/ITIMER_REAL
Expand Down
1 change: 0 additions & 1 deletion bin/linux-x.mk
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

XFILES = $(OBJECTDIR)xmkicon.o \
$(OBJECTDIR)xbbt.o \
$(OBJECTDIR)dspif.o \
$(OBJECTDIR)xinit.o \
$(OBJECTDIR)xscroll.o \
$(OBJECTDIR)xcursor.o \
Expand Down
1 change: 0 additions & 1 deletion bin/makefile-darwin.386-x
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ CC = clang -m32 $(CLANG_CFLAGS)

XFILES = $(OBJECTDIR)xmkicon.o \
$(OBJECTDIR)xbbt.o \
$(OBJECTDIR)dspif.o \
$(OBJECTDIR)xinit.o \
$(OBJECTDIR)xscroll.o \
$(OBJECTDIR)xcursor.o \
Expand Down
1 change: 0 additions & 1 deletion bin/makefile-darwin.aarch64-x
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ CC = clang -target aarch64-apple-darwin $(CLANG_CFLAGS)

XFILES = $(OBJECTDIR)xmkicon.o \
$(OBJECTDIR)xbbt.o \
$(OBJECTDIR)dspif.o \
$(OBJECTDIR)xinit.o \
$(OBJECTDIR)xscroll.o \
$(OBJECTDIR)xcursor.o \
Expand Down
1 change: 0 additions & 1 deletion bin/makefile-darwin.ppc-x
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ CC = cc $(GCC_CFLAGS)

XFILES = $(OBJECTDIR)xmkicon.o \
$(OBJECTDIR)xbbt.o \
$(OBJECTDIR)dspif.o \
$(OBJECTDIR)xinit.o \
$(OBJECTDIR)xscroll.o \
$(OBJECTDIR)xcursor.o \
Expand Down
1 change: 0 additions & 1 deletion bin/makefile-darwin.x86_64-x
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ CC = clang -target x86_64-apple-darwin $(CLANG_CFLAGS)

XFILES = $(OBJECTDIR)xmkicon.o \
$(OBJECTDIR)xbbt.o \
$(OBJECTDIR)dspif.o \
$(OBJECTDIR)xinit.o \
$(OBJECTDIR)xscroll.o \
$(OBJECTDIR)xcursor.o \
Expand Down
2 changes: 1 addition & 1 deletion bin/makefile-emscripten.wasm-wasm
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ XFLAGS = -DSDL=2 -sUSE_SDL=2

# OPTFLAGS is normally -O2.
OPTFLAGS = -O2
DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE) -DMAIKO_ENABLE_NETHUB
DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE) -DMAIKO_ENABLE_ETHERNET -DUSE_NETHUB

MEDLEY?=../../medley
SYSOUT?=$(MEDLEY)/loadups/full.sysout
Expand Down
2 changes: 1 addition & 1 deletion bin/makefile-emscripten.wasm_nl-wasm_nl
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ XFLAGS = -DSDL=2 -sUSE_SDL=2

# OPTFLAGS is normally -O2.
OPTFLAGS = -O2
DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE) -DMAIKO_ENABLE_NETHUB
DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE) -DMAIKO_ENABLE_ETHERNET -DUSE_NETHUB

MEDLEY?=../../medley
SYSOUT?=$(MEDLEY)/loadups/full.sysout
Expand Down
1 change: 0 additions & 1 deletion bin/makefile-freebsd.386-x
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ CC = clang -m32 $(CLANG_CFLAGS)

XFILES = $(OBJECTDIR)xmkicon.o \
$(OBJECTDIR)xbbt.o \
$(OBJECTDIR)dspif.o \
$(OBJECTDIR)xinit.o \
$(OBJECTDIR)xscroll.o \
$(OBJECTDIR)xcursor.o \
Expand Down
1 change: 0 additions & 1 deletion bin/makefile-freebsd.aarch64-x
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ CC = clang -m64 $(CLANG_CFLAGS)

XFILES = $(OBJECTDIR)xmkicon.o \
$(OBJECTDIR)xbbt.o \
$(OBJECTDIR)dspif.o \
$(OBJECTDIR)xinit.o \
$(OBJECTDIR)xscroll.o \
$(OBJECTDIR)xcursor.o \
Expand Down
1 change: 0 additions & 1 deletion bin/makefile-freebsd.x86_64-x
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ CC = clang -m64 $(CLANG_CFLAGS)

XFILES = $(OBJECTDIR)xmkicon.o \
$(OBJECTDIR)xbbt.o \
$(OBJECTDIR)dspif.o \
$(OBJECTDIR)xinit.o \
$(OBJECTDIR)xscroll.o \
$(OBJECTDIR)xcursor.o \
Expand Down
13 changes: 13 additions & 0 deletions bin/makefile-header
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,19 @@ CLANG_CFLAGS = -std=gnu99 -fno-strict-aliasing
GCC_CFLAGS = -std=gnu99 -fno-strict-aliasing
DEVSTUDIO_CFLAGS = -std=gnu99 -fno-strict-aliasing

# Network implementations
NETWORK = NONE # NONE, PCAP, SUN_DLPI, SUN_NIT, NETHUB
NETWORK_CC_NONE =
NETWORK_CC_PCAP = -DMAIKO_ENABLE_ETHERNET -DUSE_PCAP
NETWORK_CC_NETHUB = -DMAIKO_ENABLE_ETHERNET -DUSE_NETHUB
NETWORK_CC_SUN_DLPI = -DMAIKO_ENABLE_ETHERNET -DUSE_DLPI
NETWORK_CC_SUN_NIT = -DMAIKO_ENABLE_ETHERNET -DUSE_NIT
NETWORK_LIB_NONE =
NETWORK_LIB_PCAP = -lpcap
NETWORK_LIB_NETHUB =
NETWORK_LIB_SUN_DLPI =
NETWORK_LIB_SUN_NIT =

DLPIFILES =

# for files needed by X windows version
Expand Down
1 change: 0 additions & 1 deletion bin/makefile-init-darwin.386
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ CC = clang -m32 $(CLANG_CFLAGS)

XFILES = $(OBJECTDIR)xmkicon.o \
$(OBJECTDIR)xbbt.o \
$(OBJECTDIR)dspif.o \
$(OBJECTDIR)xinit.o \
$(OBJECTDIR)xscroll.o \
$(OBJECTDIR)xcursor.o \
Expand Down
1 change: 0 additions & 1 deletion bin/makefile-init-darwin.aarch64
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ CC = clang -target aarch64-apple-darwin $(CLANG_CFLAGS)

XFILES = $(OBJECTDIR)xmkicon.o \
$(OBJECTDIR)xbbt.o \
$(OBJECTDIR)dspif.o \
$(OBJECTDIR)xinit.o \
$(OBJECTDIR)xscroll.o \
$(OBJECTDIR)xcursor.o \
Expand Down
3 changes: 1 addition & 2 deletions bin/makefile-init-darwin.x86_64
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ CC = clang -m64 -target x86_64-apple-darwin $(CLANG_CFLAGS)

XFILES = $(OBJECTDIR)xmkicon.o \
$(OBJECTDIR)xbbt.o \
$(OBJECTDIR)dspif.o \
$(OBJECTDIR)xinit.o \
$(OBJECTDIR)xscroll.o \
$(OBJECTDIR)xcursor.o \
Expand All @@ -16,7 +15,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
XFLAGS = -I/opt/X11/include -DXWINDOW

# OPTFLAGS is normally -O2.
OPTFLAGS = -O0 -g
OPTFLAGS = -O3 -g
DEBUGFLAGS = # -DDEBUG -DOPTRACE
DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=$(RELEASE) -DNOVERSION -DINIT

Expand Down
1 change: 0 additions & 1 deletion bin/makefile-init-freebsd.386
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ CC = clang -m32 $(CLANG_CFLAGS)

XFILES = $(OBJECTDIR)xmkicon.o \
$(OBJECTDIR)xbbt.o \
$(OBJECTDIR)dspif.o \
$(OBJECTDIR)xinit.o \
$(OBJECTDIR)xscroll.o \
$(OBJECTDIR)xcursor.o \
Expand Down
1 change: 0 additions & 1 deletion bin/makefile-init-freebsd.aarch64
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ CC = clang -m64 $(CLANG_CFLAGS)

XFILES = $(OBJECTDIR)xmkicon.o \
$(OBJECTDIR)xbbt.o \
$(OBJECTDIR)dspif.o \
$(OBJECTDIR)xinit.o \
$(OBJECTDIR)xscroll.o \
$(OBJECTDIR)xcursor.o \
Expand Down
1 change: 0 additions & 1 deletion bin/makefile-init-freebsd.x86_64
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ CC = clang -m64 $(CLANG_CFLAGS)

XFILES = $(OBJECTDIR)xmkicon.o \
$(OBJECTDIR)xbbt.o \
$(OBJECTDIR)dspif.o \
$(OBJECTDIR)xinit.o \
$(OBJECTDIR)xscroll.o \
$(OBJECTDIR)xcursor.o \
Expand Down
1 change: 0 additions & 1 deletion bin/makefile-init-openbsd.x86_64
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ CC = clang -m64 $(CLANG_CFLAGS)

XFILES = $(OBJECTDIR)xmkicon.o \
$(OBJECTDIR)xbbt.o \
$(OBJECTDIR)dspif.o \
$(OBJECTDIR)xinit.o \
$(OBJECTDIR)xscroll.o \
$(OBJECTDIR)xcursor.o \
Expand Down
1 change: 0 additions & 1 deletion bin/makefile-init-sunos5.sparc
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ CC = cc -m32 $(DEVSTUDIO_CFLAGS)

XFILES = $(OBJECTDIR)xmkicon.o \
$(OBJECTDIR)xbbt.o \
$(OBJECTDIR)dspif.o \
$(OBJECTDIR)xinit.o \
$(OBJECTDIR)xscroll.o \
$(OBJECTDIR)xcursor.o \
Expand Down
1 change: 0 additions & 1 deletion bin/makefile-openbsd.x86_64-x
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ CC = clang -m64 $(CLANG_CFLAGS)

XFILES = $(OBJECTDIR)xmkicon.o \
$(OBJECTDIR)xbbt.o \
$(OBJECTDIR)dspif.o \
$(OBJECTDIR)xinit.o \
$(OBJECTDIR)xscroll.o \
$(OBJECTDIR)xcursor.o \
Expand Down
1 change: 0 additions & 1 deletion bin/makefile-sunos5.386-x
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ CC = clang -m32 $(CLANG_CFLAGS)

XFILES = $(OBJECTDIR)xmkicon.o \
$(OBJECTDIR)xbbt.o \
$(OBJECTDIR)dspif.o \
$(OBJECTDIR)xinit.o \
$(OBJECTDIR)xscroll.o \
$(OBJECTDIR)xcursor.o \
Expand Down
1 change: 0 additions & 1 deletion bin/makefile-sunos5.i386-x
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ CC = gcc

XFILES = $(OBJECTDIR)xmkicon.o \
$(OBJECTDIR)xbbt.o \
$(OBJECTDIR)dspif.o \
$(OBJECTDIR)xinit.o \
$(OBJECTDIR)xscroll.o \
$(OBJECTDIR)xcursor.o \
Expand Down
3 changes: 1 addition & 2 deletions bin/makefile-sunos5.sparc-x
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ CC = cc -m32 $(DEVSTUDIO_CFLAGS)

XFILES = $(OBJECTDIR)xmkicon.o \
$(OBJECTDIR)xbbt.o \
$(OBJECTDIR)dspif.o \
$(OBJECTDIR)xinit.o \
$(OBJECTDIR)xscroll.o \
$(OBJECTDIR)xcursor.o \
Expand All @@ -40,7 +39,7 @@ OPTFLAGS = -O2 -g3

DEBUGFLAGS = # -DSTACKCHECK -DFNSTKCHECK

MACHINEFLAGS = -DOS5 -DUSE_DLPI
MACHINEFLAGS = -DOS5 -DMAIKO_ENABLE_ETHERNET -DUSE_DLPI

DFLAGS = $(XFLAGS) \
$(DEBUGFLAGS) \
Expand Down
1 change: 0 additions & 1 deletion bin/makefile-sunos5.x86_64-x
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ CC = clang $(CLANG_CFLAGS)

XFILES = $(OBJECTDIR)xmkicon.o \
$(OBJECTDIR)xbbt.o \
$(OBJECTDIR)dspif.o \
$(OBJECTDIR)xinit.o \
$(OBJECTDIR)xscroll.o \
$(OBJECTDIR)xcursor.o \
Expand Down
15 changes: 12 additions & 3 deletions bin/makefile-tail
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

REQUIRED-INCS = $(INCDIR)version.h $(INCDIR)maiko/platform.h

CFLAGS = $(OPTFLAGS) $(DFLAGS)
CFLAGS = $(OPTFLAGS) $(DFLAGS) $(NETWORK_CC_$(NETWORK))
RFLAGS = -c $(CFLAGS) -I$(INCDIR) -I$(INCLUDEDIR)

OFILES = $(OBJECTDIR)arithops.o \
Expand Down Expand Up @@ -83,7 +83,7 @@ OFILES = $(OBJECTDIR)arithops.o \
$(OBJECTDIR)unixcomm.o \
$(OBJECTDIR)uraid.o \
$(OBJECTDIR)rpc.o \
$(OBJECTDIR)ufn.o \
$(OBJECTDIR)ufn.o \
$(OBJECTDIR)z2.o \
$(OBJECTDIR)eqf.o \
$(OBJECTDIR)fp.o \
Expand All @@ -109,6 +109,7 @@ GCFILES = $(OBJECTDIR)gcscan.o \
$(OBJECTDIR)gcoflow.o

DEVICES = $(OBJECTDIR)dspsubrs.o \
$(OBJECTDIR)dspif.o \
$(OBJECTDIR)initdsp.o \
$(OBJECTDIR)dsk.o \
$(OBJECTDIR)ufs.o \
Expand All @@ -118,6 +119,7 @@ DEVICES = $(OBJECTDIR)dspsubrs.o \
$(OBJECTDIR)ether_common.o \
$(OBJECTDIR)ether_sunos.o \
$(OBJECTDIR)ether_nethub.o \
$(OBJECTDIR)ether_pcap.o \
$(OBJECTDIR)tty.o \
$(OBJECTDIR)initkbd.o

Expand Down Expand Up @@ -148,7 +150,7 @@ $(OSARCHDIR)lde: $(OBJECTDIR)ldeboot.o $(OBJECTDIR)unixfork.o
$(CC) $(OBJECTDIR)ldeboot.o $(OBJECTDIR)unixfork.o $(LDELDFLAGS) -o $(OSARCHDIR)lde

$(OSARCHDIR)$(LDENAME): $(LIBFILES) $(EXTFILES) $(OBJECTDIR)vdate.o
$(CC) $(LIBFILES) $(EXTFILES) $(OBJECTDIR)vdate.o $(LDFLAGS) -o $(OSARCHDIR)$(LDENAME)
$(CC) $(LIBFILES) $(EXTFILES) $(OBJECTDIR)vdate.o $(LDFLAGS) $(NETWORK_LIB_$(NETWORK)) -o $(OSARCHDIR)$(LDENAME)
@ echo ""
@ echo "Executable is now named '$(OSARCHDIR)$(LDENAME)'"

Expand Down Expand Up @@ -495,6 +497,13 @@ $(OBJECTDIR)ether_nethub.o: $(SRCDIR)ether_nethub.c $(REQUIRED-INCS) \
$(INCDIR)dbprint.h $(INCDIR)etherdefs.h
$(CC) $(RFLAGS) $(SRCDIR)ether_nethub.c -o $(OBJECTDIR)ether_nethub.o

$(OBJECTDIR)ether_pcap.o: $(SRCDIR)ether_pcap.c $(REQUIRED-INCS) \
$(INCDIR)commondefs.h $(INCDIR)lispemul.h \
$(INCDIR)lispmap.h $(INCDIR)emlglob.h $(INCDIR)lsptypes.h $(INCDIR)lspglob.h \
$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)adr68k.h \
$(INCDIR)dbprint.h $(INCDIR)etherdefs.h
$(CC) $(RFLAGS) $(SRCDIR)ether_pcap.c -o $(OBJECTDIR)ether_pcap.o

$(OBJECTDIR)findkey.o: $(SRCDIR)findkey.c $(REQUIRED-INCS) \
$(INCDIR)lispemul.h $(INCDIR)lispmap.h \
$(INCDIR)emlglob.h $(INCDIR)stack.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h \
Expand Down
2 changes: 1 addition & 1 deletion inc/etherdefs.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ LispPTR check_ether(void);
void init_ifpage_ether(void);
void init_ether(void);
LispPTR check_sum(LispPTR *args);

int ether_addr_equal(const uint8_t addr1[6], const uint8_t addr2[6]);
Comment thread
nbriggs marked this conversation as resolved.
Outdated
void setNethubHost(char* host);
void setNethubPort(int port);
void setNethubMac(int m0, int m1, int m2, int m3, int m4, int m5);
Expand Down
Loading