From adf1528ae6bd8dbe337c45c0a67cac4d76b1635f Mon Sep 17 00:00:00 2001 From: Niklas Hallqvist Date: Mon, 4 Mar 1996 07:36:50 +0000 Subject: From NetBSD: 960217 merge --- sys/netccitt/ccitt_proto.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) (limited to 'sys/netccitt/ccitt_proto.c') diff --git a/sys/netccitt/ccitt_proto.c b/sys/netccitt/ccitt_proto.c index 4e1e88bb6d0..275a3ea3d0a 100644 --- a/sys/netccitt/ccitt_proto.c +++ b/sys/netccitt/ccitt_proto.c @@ -1,4 +1,5 @@ -/* $NetBSD: ccitt_proto.c,v 1.5 1994/06/29 06:37:00 cgd Exp $ */ +/* $OpenBSD: ccitt_proto.c,v 1.2 1996/03/04 07:36:20 niklas Exp $ */ +/* $NetBSD: ccitt_proto.c,v 1.6 1996/02/13 22:04:21 christos Exp $ */ /* * Copyright (c) University of British Columbia, 1984 @@ -57,36 +58,38 @@ extern struct domain ccittdomain; #define DOMAIN &ccittdomain #ifdef LLC -int llc_output(); -void llc_ctlinput(), llc_init(), llc_timer(); +#include +#include +#include +#include +#include #endif #ifdef HDLC -int hd_output(); -void hd_ctlinput(), hd_init(), hd_timer(); +#include +#include #endif -int pk_usrreq(), pk_ctloutput(); -void pk_timer(), pk_init(), pk_input(), pk_ctlinput(); +#include struct protosw ccittsw[] = { #ifdef LLC - { 0, DOMAIN, IEEEPROTO_802LLC,0, +{ 0, DOMAIN, IEEEPROTO_802LLC,0, 0, llc_output, llc_ctlinput, 0, 0, llc_init, 0, llc_timer, 0, - }, +}, #endif #ifdef HDLC - { 0, DOMAIN, CCITTPROTO_HDLC,0, +{ 0, DOMAIN, CCITTPROTO_HDLC,0, 0, hd_output, hd_ctlinput, 0, 0, hd_init, 0, hd_timer, 0, - }, +}, #endif - { SOCK_STREAM, DOMAIN, CCITTPROTO_X25, PR_CONNREQUIRED|PR_ATOMIC|PR_WANTRCVD, +{ SOCK_STREAM, DOMAIN, CCITTPROTO_X25, PR_CONNREQUIRED|PR_ATOMIC|PR_WANTRCVD, pk_input, 0, pk_ctlinput, pk_ctloutput, pk_usrreq, pk_init, 0, pk_timer, 0, - } +} }; struct domain ccittdomain = -- cgit v1.2.3