1*** ../sys.old/conf/files	Fri Jul  6 10:19:49 1990
2--- ./conf/files	Thu Mar 12 17:33:58 1992
3***************
4*** 75,80 ****
5--- 75,87 ----
6  net/netinet/tcp_timer.c	optional inet Binary
7  net/netinet/tcp_usrreq.c	optional inet Binary
8  net/netinet/udp_usrreq.c	optional inet Binary
9+ net/netatalk/aarp.c	optional atalk
10+ net/netatalk/at_control.c	optional atalk
11+ net/netatalk/at_proto.c	optional atalk
12+ net/netatalk/at_ultrix.c	optional atalk
13+ net/netatalk/ddp_input.c	optional atalk
14+ net/netatalk/ddp_output.c	optional atalk
15+ net/netatalk/ddp_usrreq.c	optional atalk
16  net/netbsc/bsc_pcb.c	optional bsc Binary
17  net/netbsc/bsc_proto.c	optional bsc 
18  net/netbsc/bsc_states.c	optional bsc Binary
19*** ../sys.old/data/af_data.c	Fri Jul  6 09:40:50 1990
20--- ./data/af_data.c	Thu Mar 12 17:34:03 1992
21***************
22*** 69,74 ****
23--- 69,82 ----
24  #define AFNS	AFNULL
25  #endif NS
26  
27+ #ifdef ATALK
28+ extern int atalk_hash(), atalk_netmatch();
29+ #define AFATALK \
30+ 	{ atalk_hash,	atalk_netmatch }
31+ #else
32+ #define AFATALK	AFNULL
33+ #endif
34+ 
35  #ifdef BINARY
36  
37  extern	struct afswitch afswitch[];
38***************
39*** 78,83 ****
40  struct afswitch afswitch[AF_MAX] = {
41  	AFNULL,	AFNULL,	AFINET,	AFINET,	AFPUP,
42  	AFNULL,	AFNS,	AFNULL,	AFNULL,	AFNULL,
43! 	AFNULL
44  };
45  #endif
46--- 86,92 ----
47  struct afswitch afswitch[AF_MAX] = {
48  	AFNULL,	AFNULL,	AFINET,	AFINET,	AFPUP,
49  	AFNULL,	AFNS,	AFNULL,	AFNULL,	AFNULL,
50! 	AFNULL, AFNULL, AFNULL, AFNULL, AFNULL,
51! 	AFNULL, AFATALK, AFNULL, AFNULL, AFNULL,
52  };
53  #endif
54*** ../sys.old/data/if_to_proto_data.c	Fri Jul  6 09:40:26 1990
55--- ./data/if_to_proto_data.c	Thu Jun  3 11:53:44 1993
56***************
57*** 135,140 ****
58--- 135,156 ----
59          { ETHERTYPE_RC,         AF_DLI,         0,              0 }
60  #endif
61  
62+ /*
63+  * Hook for netatalk.  We receive all packets.  If we're not interested
64+  * in the packet, we do a normal search on if_family for someone else
65+  * who might want the packet.
66+  * (Not yet. XXX)
67+  */
68+ #ifdef ATALK
69+ #include "atalk.h"
70+ #undef s_net
71+ #include "../net/netatalk/at.h"
72+ #define ETHER_ATALK \
73+ 	{ -1,			AF_APPLETALK,	ATPROTO_DDP,	0 }
74+ #else ATALK
75+ #define ETHER_ATALK	IFNULL
76+ #endif ATALK
77+ 
78  #ifdef	BINARY
79  
80  extern struct if_family if_family[];
81***************
82*** 145,151 ****
83  
84  struct if_family if_family[] = {
85! 	ETHER_DECNET,	ETHER_LAT,	ETHER_APPLE, ETHER_APPLEARP,
86  	ETHER_NS,	ETHER_DLI,	IFEND
87  };
88  
89  #endif
90--- 162,168 ----
91  
92  struct if_family if_family[] = {
93! 	ETHER_ATALK,	ETHER_DECNET,	ETHER_LAT,	ETHER_APPLE, ETHER_APPLEARP,
94  	ETHER_NS,	ETHER_DLI,	IFEND
95  };
96  
97  #endif
98*** ../sys.old/data/uipc_domain_data.c	Fri Jul  6 09:40:44 1990
99--- ./data/uipc_domain_data.c	Thu Mar 12 17:38:18 1992
100***************
101*** 107,112 ****
102--- 107,116 ----
103  	ADDDOMAIN(ccitt);
104  #endif CCITT
105  #endif
106+ #ifdef ATALK
107+ #include "atalk.h"
108+ 	ADDDOMAIN(atalk);
109+ #endif ATALK
110  
111  	for (dp = domains; dp; dp = dp->dom_next)
112  		for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++)
113*** ../sys.old/net/net/conf_net.c	Fri Jul  6 10:03:25 1990
114--- ./net/net/conf_net.c	Thu Mar 12 17:39:11 1992
115***************
116*** 236,241 ****
117--- 236,245 ----
118  extern int ddpintr();
119  #endif
120  
121+ #ifdef ATALK
122+ extern int atintr();
123+ #endif
124+ 
125  #include "../net/net/netisr.h" 
126  /*
127   * table of interrupt vectors - scanned in locore when sofware 
128***************
129*** 280,285 ****
130--- 284,292 ----
131  #ifdef OSI
132          {NETISR_OSI,osiintr},
133  #endif OSI
134+ #ifdef ATALK
135+ 	{NETISR_AT,atintr},
136+ #endif ATALK
137  	{-1	,0}
138  };
139  
140*** ../sys.old/net/net/netisr.h	Fri Jul  6 10:03:28 1990
141--- ./net/net/netisr.h	Thu Mar 12 17:39:45 1992
142***************
143*** 66,71 ****
144--- 66,72 ----
145  #define NETISR_DLI	13		/* same as AF_DLI */
146  #define NETISR_LAT	14		/* same as AF_LAT */
147  #define NETISR_BSC	15		/* same as AF_BSC */
148+ #define NETISR_AT	16		/* same as AF_APPLETALK */
149  #define NETISR_OSI      19              /* same as AF_OSI */
150  
151  #define	schednetisr(anisr)	{ set_bit_atomic(anisr,&netisr); setsoftnet(); }
152