Skip to content

Commit 4f3cb4d

Browse files
nbriggsnbriggs
committed
Removes ether.h and merges Lisp interface structs into lsptypes.h
1 parent b98e161 commit 4f3cb4d

File tree

8 files changed

+112
-129
lines changed

8 files changed

+112
-129
lines changed

‎CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,6 @@ SET(MAIKO_HDRS
316316
inc/emlglob.h
317317
inc/eqfdefs.h
318318
inc/etherdefs.h
319-
inc/ether.h
320319
inc/fast_dsp.h
321320
inc/findkeydefs.h
322321
inc/foreigndefs.h

‎bin/makefile-dos‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ SRCFILES = conspage.c gcoflow.c shift.c dbgtool.c gcr.c gcrcell.c llstk.
1818
OFILES = conspage.obj gcoflow.obj shift.obj dbgtool.obj gcr.obj gcrcell.obj llstk.obj gcscan.obj loopsops.obj storage.obj allocmds.obj dir.obj gvar2.obj lowlev1.obj subr.obj arithops.obj lowlev2.obj subr0374.obj doscomm.obj hardrtn.obj lsthandl.obj sxhash.obj draw.obj main.obj testtool.obj array.obj dsk.obj inet.obj misc7.obj timer.obj array2.obj dspif.obj initdsp.obj miscn.obj typeof.obj array3.obj initkbd.obj ubf1.obj array4.obj dspsubrs.obj initsout.obj mkatom.obj ubf2.obj array5.obj eqf.obj intcall.obj mkcell.obj ubf3.obj array6.obj ether.obj ufn.obj atom.obj findkey.obj kbdsubrs.obj mouseif.obj ufs.obj bbtsub.obj foreign.obj keyevent.obj unixcomm.obj bin.obj fp.obj binds.obj fvar.obj mvs.obj unwind.obj bitblt.obj gc.obj uraid.obj blt.obj gc2.obj kprint.obj osmsg.obj usrsubr.obj byteswap.obj gcarray.obj perrno.obj uutils.obj carcdr.obj asmbbt.obj gccode.obj vars3.obj gcfinal.obj ldsout.obj return.obj vmemsave.obj chardev.obj gchtfind.obj lineblt8.obj rpc.obj xc.obj common.obj gcmain3.obj lisp2c.obj rplcons.obj z2.obj vdate.obj $(COLORFILES) $(ARCHFILES) $(LPFILES)
1919

2020

21-
HFILES = address.h adr68k.h arithopsdefs.h arith.h cell.h dbprint.h display.h dspif.h ifpage.h iopage.h lispemul.h lispmap.h lsptypes.h miscstat.h lspglob.h array.h bb.h bitblt.h debug.h devconf.h dspdata.h ether.h fast_dsp.h gcdata.h initatms.h inlinec.h keyboard.h lispver1.h lispver2.h lldsp.h locfile.h medleyfp.h mouseif.h my.h opcodes.h osmsg.h pilotbbt.h print.h return.h stack.h stream.h subrs.h timeout.h tos1defs.h tosfns.h tosret.h xdefs.h xbitmaps.h xkeymap.h
21+
HFILES = address.h adr68k.h arithopsdefs.h arith.h cell.h dbprint.h display.h dspif.h ifpage.h iopage.h lispemul.h lispmap.h lsptypes.h miscstat.h lspglob.h array.h bb.h bitblt.h debug.h devconf.h dspdata.h fast_dsp.h gcdata.h initatms.h inlinec.h keyboard.h lispver1.h lispver2.h lldsp.h locfile.h medleyfp.h mouseif.h my.h opcodes.h osmsg.h pilotbbt.h print.h return.h stack.h stream.h subrs.h timeout.h tos1defs.h tosfns.h tosret.h xdefs.h xbitmaps.h xkeymap.h
2222

2323

2424

‎bin/makefile-tail‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -478,21 +478,21 @@ $(OBJECTDIR)ether_common.o: $(SRCDIR)ether_common.c $(REQUIRED-INCS) \
478478
$(INCDIR)commondefs.h $(INCDIR)lispemul.h \
479479
$(INCDIR)lispmap.h $(INCDIR)emlglob.h $(INCDIR)lsptypes.h $(INCDIR)lspglob.h \
480480
$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)adr68k.h \
481-
$(INCDIR)ether.h $(INCDIR)dbprint.h $(INCDIR)etherdefs.h
481+
$(INCDIR)dbprint.h $(INCDIR)etherdefs.h
482482
$(CC) $(RFLAGS) $(SRCDIR)ether_common.c -o $(OBJECTDIR)ether_common.o
483483

484484
$(OBJECTDIR)ether_sunos.o: $(SRCDIR)ether_sunos.c $(REQUIRED-INCS) \
485485
$(INCDIR)commondefs.h $(INCDIR)lispemul.h \
486486
$(INCDIR)lispmap.h $(INCDIR)emlglob.h $(INCDIR)lsptypes.h $(INCDIR)lspglob.h \
487487
$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)adr68k.h \
488-
$(INCDIR)ether.h $(INCDIR)dbprint.h $(INCDIR)etherdefs.h
488+
$(INCDIR)dbprint.h $(INCDIR)etherdefs.h
489489
$(CC) $(RFLAGS) $(SRCDIR)ether_sunos.c -o $(OBJECTDIR)ether_sunos.o
490490

491491
$(OBJECTDIR)ether_nethub.o: $(SRCDIR)ether_nethub.c $(REQUIRED-INCS) \
492492
$(INCDIR)commondefs.h $(INCDIR)lispemul.h \
493493
$(INCDIR)lispmap.h $(INCDIR)emlglob.h $(INCDIR)lsptypes.h $(INCDIR)lspglob.h \
494494
$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)adr68k.h \
495-
$(INCDIR)ether.h $(INCDIR)dbprint.h $(INCDIR)etherdefs.h
495+
$(INCDIR)dbprint.h $(INCDIR)etherdefs.h
496496
$(CC) $(RFLAGS) $(SRCDIR)ether_nethub.c -o $(OBJECTDIR)ether_nethub.o
497497

498498
$(OBJECTDIR)findkey.o: $(SRCDIR)findkey.c $(REQUIRED-INCS) \
@@ -640,7 +640,7 @@ $(OBJECTDIR)inet.o: $(SRCDIR)inet.c $(REQUIRED-INCS) \
640640
$(INCDIR)lispemul.h $(INCDIR)lispmap.h \
641641
$(INCDIR)lsptypes.h $(INCDIR)arith.h $(INCDIR)emlglob.h $(INCDIR)lspglob.h \
642642
$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)adr68k.h \
643-
$(INCDIR)ether.h $(INCDIR)dbprint.h $(INCDIR)locfile.h $(INCDIR)lispver2.h \
643+
$(INCDIR)dbprint.h $(INCDIR)locfile.h $(INCDIR)lispver2.h \
644644
$(INCDIR)inetdefs.h $(INCDIR)byteswapdefs.h $(INCDIR)commondefs.h \
645645
$(INCDIR)mkcelldefs.h
646646
$(CC) $(RFLAGS) $(SRCDIR)inet.c -o $(OBJECTDIR)inet.o

‎inc/ether.h‎

Lines changed: 0 additions & 120 deletions
This file was deleted.

‎inc/lsptypes.h‎

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -699,4 +699,111 @@ typedef
699699
/* low-order 12 bits first. */
700700
} BIGNUM;
701701

702+
703+
/* Ethernet records */
704+
705+
#ifndef BYTESWAP
706+
typedef struct {
707+
DLword DLLOCALHOST0;
708+
DLword DLLOCALHOST1;
709+
DLword DLLOCALHOST2;
710+
DLword DLFIRSTICB;
711+
DLword DLINPUTMASK;
712+
DLword DLFIRSTOCB;
713+
DLword DLOUTPUTMASK;
714+
DLword DLMISSEDPACKETS;
715+
DLword DLLASTICB;
716+
DLword DLLASTOCB;
717+
} DLETHERCSB;
718+
719+
typedef struct{
720+
DLword DLIOCBLENGTH;
721+
DLword DLIOCBBUFFERLO;
722+
DLword DLIOCBBUFFERHI;
723+
DLword DLRETRANSMISSIONMASK;
724+
DLword DLIOCBBYTESUSED;
725+
DLword DLIOCBSTATUS;
726+
DLword DLNEXTIOCB;
727+
DLword DLFOROUTPUTUSE;
728+
} DLETHERIOCB;
729+
730+
typedef struct {
731+
unsigned int NETTYPE : 8;
732+
unsigned int NDBNEXT : 24;
733+
unsigned int NDBPUPNET : 8;
734+
unsigned int NDBNSNET : 24;
735+
unsigned int NDBTASK : 8;
736+
unsigned int NDBBROADCASTP : 24;
737+
unsigned int NDBPUPHOST : 8;
738+
unsigned int NDBTRANSMITTER : 24;
739+
unsigned int nil1: 8;
740+
unsigned int NDBENCAPSULATOR : 24;
741+
unsigned int NDBIQLENGTH : 8; /* DATATYPE */
742+
unsigned int NDBCSB : 24; /* DATATYPE */
743+
LispPTR NDBIQ;
744+
LispPTR NDBTQ;
745+
LispPTR NDBTRANSLATIONS;
746+
LispPTR NDBETHERFLUSHER;
747+
LispPTR NDBWATCHER;
748+
LispPTR NDBCANHEARSELF;
749+
LispPTR NDBIPNET;
750+
LispPTR NDBIPHOST;
751+
DLword NDBPUPTYPE;
752+
DLword nil2;
753+
LispPTR nil3;
754+
} NDB;
755+
#else
756+
/***********************************************/
757+
/* Byte-swapped definitions, for e.g., 80386's */
758+
/***********************************************/
759+
typedef struct {
760+
DLword DLLOCALHOST1;
761+
DLword DLLOCALHOST0;
762+
DLword DLFIRSTICB;
763+
DLword DLLOCALHOST2;
764+
DLword DLFIRSTOCB;
765+
DLword DLINPUTMASK;
766+
DLword DLMISSEDPACKETS;
767+
DLword DLOUTPUTMASK;
768+
DLword DLLASTOCB;
769+
DLword DLLASTICB;
770+
} DLETHERCSB;
771+
772+
typedef struct{
773+
DLword DLIOCBBUFFERLO;
774+
DLword DLIOCBLENGTH;
775+
DLword DLRETRANSMISSIONMASK;
776+
DLword DLIOCBBUFFERHI;
777+
DLword DLIOCBSTATUS;
778+
DLword DLIOCBBYTESUSED;
779+
DLword DLFOROUTPUTUSE;
780+
DLword DLNEXTIOCB;
781+
} DLETHERIOCB;
782+
783+
typedef struct {
784+
unsigned int NDBNEXT : 24;
785+
unsigned int NETTYPE : 8;
786+
unsigned int NDBNSNET : 24;
787+
unsigned int NDBPUPNET : 8;
788+
unsigned int NDBBROADCASTP : 24;
789+
unsigned int NDBTASK : 8;
790+
unsigned int NDBTRANSMITTER : 24;
791+
unsigned int NDBPUPHOST : 8;
792+
unsigned int NDBENCAPSULATOR : 24;
793+
unsigned int nil1: 8;
794+
unsigned int NDBCSB : 24; /* DATATYPE */
795+
unsigned int NDBIQLENGTH : 8; /* DATATYPE */
796+
LispPTR NDBIQ;
797+
LispPTR NDBTQ;
798+
LispPTR NDBTRANSLATIONS;
799+
LispPTR NDBETHERFLUSHER;
800+
LispPTR NDBWATCHER;
801+
LispPTR NDBCANHEARSELF;
802+
LispPTR NDBIPNET;
803+
LispPTR NDBIPHOST;
804+
DLword nil2;
805+
DLword NDBPUPTYPE;
806+
LispPTR nil3;
807+
} NDB;
808+
#endif /* BYTESWAP */
702809
#endif /* LSPTYPES_H */

‎src/ether_nethub.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
#include "lsptypes.h"
3232
#include "lspglob.h"
3333
#include "adr68k.h"
34-
#include "ether.h"
3534
#include "dbprint.h"
3635
#include "etherdefs.h"
3736
#include "ifpage.h"

‎src/ether_sunos.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@
7171
#include "lsptypes.h"
7272
#include "lspglob.h"
7373
#include "adr68k.h"
74-
#include "ether.h"
7574
#include "dbprint.h"
7675
#include "etherdefs.h"
7776
#include "ifpage.h"

‎src/inet.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
#include "emlglob.h"
4242
#include "lspglob.h"
4343
#include "adr68k.h"
44-
#include "ether.h"
4544
#include "dbprint.h"
4645
#include "locfile.h"
4746

0 commit comments

Comments
 (0)