diff options
| author | alfred <alfred@FreeBSD.org> | 2002-03-20 08:00:54 +0000 |
|---|---|---|
| committer | alfred <alfred@FreeBSD.org> | 2002-03-20 08:00:54 +0000 |
| commit | c61e01af359e8d97fd53e0494a2168613d9e1da2 (patch) | |
| tree | 2a7f34126a185f91f1613cd64a3874d01b325fe5 /sys/netatm/uni | |
| parent | 728484a7457c5aef1f6a3d30a7bf3f6e215bf900 (diff) | |
| download | FreeBSD-src-c61e01af359e8d97fd53e0494a2168613d9e1da2.zip FreeBSD-src-c61e01af359e8d97fd53e0494a2168613d9e1da2.tar.gz | |
Remove __P.
Diffstat (limited to 'sys/netatm/uni')
28 files changed, 516 insertions, 518 deletions
diff --git a/sys/netatm/uni/q2110_sigaa.c b/sys/netatm/uni/q2110_sigaa.c index bcccfb5..06531ce 100644 --- a/sys/netatm/uni/q2110_sigaa.c +++ b/sys/netatm/uni/q2110_sigaa.c @@ -58,10 +58,10 @@ __RCSID("@(#) $FreeBSD$"); /* * Local functions */ -static void sscop_resreq_ready __P((struct sscop *, int, int)); -static void sscop_resrsp_inresyn __P((struct sscop *, int, int)); -static void sscop_recrsp_recovrsp __P((struct sscop *, int, int)); -static void sscop_recrsp_inrecov __P((struct sscop *, int, int)); +static void sscop_resreq_ready(struct sscop *, int, int); +static void sscop_resrsp_inresyn(struct sscop *, int, int); +static void sscop_recrsp_recovrsp(struct sscop *, int, int); +static void sscop_recrsp_inrecov(struct sscop *, int, int); /* @@ -69,7 +69,7 @@ static void sscop_recrsp_inrecov __P((struct sscop *, int, int)); */ /* SSCOP_INIT */ static void (*sscop_init_tab[SOS_NUMSTATES]) - __P((struct sscop *, int, int)) = { + (struct sscop *, int, int) = { sscop_init_inst, /* SOS_INST */ NULL, /* SOS_IDLE */ NULL, /* SOS_OUTCONN */ @@ -86,7 +86,7 @@ static void (*sscop_init_tab[SOS_NUMSTATES]) /* SSCOP_TERM */ static void (*sscop_term_tab[SOS_NUMSTATES]) - __P((struct sscop *, int, int)) = { + (struct sscop *, int, int) = { sscop_term_all, /* SOS_INST */ sscop_term_all, /* SOS_IDLE */ sscop_term_all, /* SOS_OUTCONN */ @@ -103,7 +103,7 @@ static void (*sscop_term_tab[SOS_NUMSTATES]) /* SSCOP_ESTABLISH_REQ */ static void (*sscop_estreq_tab[SOS_NUMSTATES]) - __P((struct sscop *, int, int)) = { + (struct sscop *, int, int) = { NULL, /* SOS_INST */ sscop_estreq_idle, /* SOS_IDLE */ NULL, /* SOS_OUTCONN */ @@ -120,7 +120,7 @@ static void (*sscop_estreq_tab[SOS_NUMSTATES]) /* SSCOP_ESTABLISH_RSP */ static void (*sscop_estrsp_tab[SOS_NUMSTATES]) - __P((struct sscop *, int, int)) = { + (struct sscop *, int, int) = { NULL, /* SOS_INST */ NULL, /* SOS_IDLE */ NULL, /* SOS_OUTCONN */ @@ -137,7 +137,7 @@ static void (*sscop_estrsp_tab[SOS_NUMSTATES]) /* SSCOP_RELEASE_REQ */ static void (*sscop_relreq_tab[SOS_NUMSTATES]) - __P((struct sscop *, int, int)) = { + (struct sscop *, int, int) = { NULL, /* SOS_INST */ NULL, /* SOS_IDLE */ sscop_relreq_outconn, /* SOS_OUTCONN */ @@ -154,7 +154,7 @@ static void (*sscop_relreq_tab[SOS_NUMSTATES]) /* SSCOP_DATA_REQ */ static void (*sscop_datreq_tab[SOS_NUMSTATES]) - __P((struct sscop *, int, int)) = { + (struct sscop *, int, int) = { NULL, /* SOS_INST */ NULL, /* SOS_IDLE */ NULL, /* SOS_OUTCONN */ @@ -171,7 +171,7 @@ static void (*sscop_datreq_tab[SOS_NUMSTATES]) /* SSCOP_RESYNC_REQ */ static void (*sscop_resreq_tab[SOS_NUMSTATES]) - __P((struct sscop *, int, int)) = { + (struct sscop *, int, int) = { NULL, /* SOS_INST */ NULL, /* SOS_IDLE */ NULL, /* SOS_OUTCONN */ @@ -188,7 +188,7 @@ static void (*sscop_resreq_tab[SOS_NUMSTATES]) /* SSCOP_RESYNC_RSP */ static void (*sscop_resrsp_tab[SOS_NUMSTATES]) - __P((struct sscop *, int, int)) = { + (struct sscop *, int, int) = { NULL, /* SOS_INST */ NULL, /* SOS_IDLE */ NULL, /* SOS_OUTCONN */ @@ -205,7 +205,7 @@ static void (*sscop_resrsp_tab[SOS_NUMSTATES]) /* SSCOP_RECOVER_RSP */ static void (*sscop_recrsp_tab[SOS_NUMSTATES]) - __P((struct sscop *, int, int)) = { + (struct sscop *, int, int) = { NULL, /* SOS_INST */ NULL, /* SOS_IDLE */ NULL, /* SOS_OUTCONN */ @@ -222,7 +222,7 @@ static void (*sscop_recrsp_tab[SOS_NUMSTATES]) /* SSCOP_UNITDATA_REQ */ static void (*sscop_udtreq_tab[SOS_NUMSTATES]) - __P((struct sscop *, int, int)) = { + (struct sscop *, int, int) = { NULL, /* SOS_INST */ sscop_udtreq_all, /* SOS_IDLE */ sscop_udtreq_all, /* SOS_OUTCONN */ @@ -239,7 +239,7 @@ static void (*sscop_udtreq_tab[SOS_NUMSTATES]) /* SSCOP_RETRIEVE_REQ */ static void (*sscop_retreq_tab[SOS_NUMSTATES]) - __P((struct sscop *, int, int)) = { + (struct sscop *, int, int) = { NULL, /* SOS_INST */ NULL, /* SOS_IDLE */ NULL, /* SOS_OUTCONN */ @@ -259,7 +259,7 @@ static void (*sscop_retreq_tab[SOS_NUMSTATES]) * Stack command lookup table */ void (*(*sscop_q2110_aatab[SSCOP_CMD_SIZE])) - __P((struct sscop *, int, int)) = { + (struct sscop *, int, int) = { NULL, sscop_init_tab, sscop_term_tab, diff --git a/sys/netatm/uni/q2110_sigcpcs.c b/sys/netatm/uni/q2110_sigcpcs.c index 276edf0..5d79961 100644 --- a/sys/netatm/uni/q2110_sigcpcs.c +++ b/sys/netatm/uni/q2110_sigcpcs.c @@ -65,28 +65,28 @@ __RCSID("@(#) $FreeBSD$"); /* * Local functions */ -static void sscop_bgn_outconn __P((struct sscop *, KBuffer *, caddr_t)); -static void sscop_bgn_inconn __P((struct sscop *, KBuffer *, caddr_t)); -static void sscop_bgn_ready __P((struct sscop *, KBuffer *, caddr_t)); -static void sscop_bgrej_outrecov __P((struct sscop *, KBuffer *, caddr_t)); -static void sscop_end_outrecov __P((struct sscop *, KBuffer *, caddr_t)); -static void sscop_end_ready __P((struct sscop *, KBuffer *, caddr_t)); -static void sscop_endak_outrecov __P((struct sscop *, KBuffer *, caddr_t)); -static void sscop_rs_outresyn __P((struct sscop *, KBuffer *, caddr_t)); -static void sscop_rs_inresyn __P((struct sscop *, KBuffer *, caddr_t)); -static void sscop_rs_outrecov __P((struct sscop *, KBuffer *, caddr_t)); -static void sscop_rs_ready __P((struct sscop *, KBuffer *, caddr_t)); -static void sscop_er_error __P((struct sscop *, KBuffer *, caddr_t)); -static void sscop_er_idle __P((struct sscop *, KBuffer *, caddr_t)); -static void sscop_er_outrecov __P((struct sscop *, KBuffer *, caddr_t)); -static void sscop_er_recovrsp __P((struct sscop *, KBuffer *, caddr_t)); -static void sscop_er_inrecov __P((struct sscop *, KBuffer *, caddr_t)); -static void sscop_er_ready __P((struct sscop *, KBuffer *, caddr_t)); -static void sscop_erak_error __P((struct sscop *, KBuffer *, caddr_t)); -static void sscop_erak_idle __P((struct sscop *, KBuffer *, caddr_t)); -static void sscop_erak_outrecov __P((struct sscop *, KBuffer *, caddr_t)); -static void sscop_sd_ready __P((struct sscop *, KBuffer *, caddr_t)); -static void sscop_poll_ready __P((struct sscop *, KBuffer *, caddr_t)); +static void sscop_bgn_outconn(struct sscop *, KBuffer *, caddr_t); +static void sscop_bgn_inconn(struct sscop *, KBuffer *, caddr_t); +static void sscop_bgn_ready(struct sscop *, KBuffer *, caddr_t); +static void sscop_bgrej_outrecov(struct sscop *, KBuffer *, caddr_t); +static void sscop_end_outrecov(struct sscop *, KBuffer *, caddr_t); +static void sscop_end_ready(struct sscop *, KBuffer *, caddr_t); +static void sscop_endak_outrecov(struct sscop *, KBuffer *, caddr_t); +static void sscop_rs_outresyn(struct sscop *, KBuffer *, caddr_t); +static void sscop_rs_inresyn(struct sscop *, KBuffer *, caddr_t); +static void sscop_rs_outrecov(struct sscop *, KBuffer *, caddr_t); +static void sscop_rs_ready(struct sscop *, KBuffer *, caddr_t); +static void sscop_er_error(struct sscop *, KBuffer *, caddr_t); +static void sscop_er_idle(struct sscop *, KBuffer *, caddr_t); +static void sscop_er_outrecov(struct sscop *, KBuffer *, caddr_t); +static void sscop_er_recovrsp(struct sscop *, KBuffer *, caddr_t); +static void sscop_er_inrecov(struct sscop *, KBuffer *, caddr_t); +static void sscop_er_ready(struct sscop *, KBuffer *, caddr_t); +static void sscop_erak_error(struct sscop *, KBuffer *, caddr_t); +static void sscop_erak_idle(struct sscop *, KBuffer *, caddr_t); +static void sscop_erak_outrecov(struct sscop *, KBuffer *, caddr_t); +static void sscop_sd_ready(struct sscop *, KBuffer *, caddr_t); +static void sscop_poll_ready(struct sscop *, KBuffer *, caddr_t); /* @@ -94,7 +94,7 @@ static void sscop_poll_ready __P((struct sscop *, KBuffer *, caddr_t)); */ /* BGN PDU */ static void (*sscop_bgn_tab[SOS_NUMSTATES]) - __P((struct sscop *, KBuffer *, caddr_t)) = { + (struct sscop *, KBuffer *, caddr_t) = { NULL, /* SOS_INST */ sscop_bgn_idle, /* SOS_IDLE */ sscop_bgn_outconn, /* SOS_OUTCONN */ @@ -111,7 +111,7 @@ static void (*sscop_bgn_tab[SOS_NUMSTATES]) /* BGAK PDU */ static void (*sscop_bgak_tab[SOS_NUMSTATES]) - __P((struct sscop *, KBuffer *, caddr_t)) = { + (struct sscop *, KBuffer *, caddr_t) = { NULL, /* SOS_INST */ sscop_bgak_idle, /* SOS_IDLE */ sscop_bgak_outconn, /* SOS_OUTCONN */ @@ -128,7 +128,7 @@ static void (*sscop_bgak_tab[SOS_NUMSTATES]) /* BGREJ PDU */ static void (*sscop_bgrej_tab[SOS_NUMSTATES]) - __P((struct sscop *, KBuffer *, caddr_t)) = { + (struct sscop *, KBuffer *, caddr_t) = { NULL, /* SOS_INST */ sscop_bgrej_error, /* SOS_IDLE */ sscop_bgrej_outconn, /* SOS_OUTCONN */ @@ -145,7 +145,7 @@ static void (*sscop_bgrej_tab[SOS_NUMSTATES]) /* END PDU */ static void (*sscop_end_tab[SOS_NUMSTATES]) - __P((struct sscop *, KBuffer *, caddr_t)) = { + (struct sscop *, KBuffer *, caddr_t) = { NULL, /* SOS_INST */ sscop_end_idle, /* SOS_IDLE */ sscop_noop, /* SOS_OUTCONN */ @@ -162,7 +162,7 @@ static void (*sscop_end_tab[SOS_NUMSTATES]) /* ENDAK PDU */ static void (*sscop_endak_tab[SOS_NUMSTATES]) - __P((struct sscop *, KBuffer *, caddr_t)) = { + (struct sscop *, KBuffer *, caddr_t) = { NULL, /* SOS_INST */ sscop_noop, /* SOS_IDLE */ sscop_noop, /* SOS_OUTCONN */ @@ -179,7 +179,7 @@ static void (*sscop_endak_tab[SOS_NUMSTATES]) /* RS PDU */ static void (*sscop_rs_tab[SOS_NUMSTATES]) - __P((struct sscop *, KBuffer *, caddr_t)) = { + (struct sscop *, KBuffer *, caddr_t) = { NULL, /* SOS_INST */ sscop_rs_idle, /* SOS_IDLE */ sscop_noop, /* SOS_OUTCONN */ @@ -196,7 +196,7 @@ static void (*sscop_rs_tab[SOS_NUMSTATES]) /* RSAK PDU */ static void (*sscop_rsak_tab[SOS_NUMSTATES]) - __P((struct sscop *, KBuffer *, caddr_t)) = { + (struct sscop *, KBuffer *, caddr_t) = { NULL, /* SOS_INST */ sscop_rsak_idle, /* SOS_IDLE */ sscop_noop, /* SOS_OUTCONN */ @@ -213,7 +213,7 @@ static void (*sscop_rsak_tab[SOS_NUMSTATES]) /* ER PDU */ static void (*sscop_er_tab[SOS_NUMSTATES]) - __P((struct sscop *, KBuffer *, caddr_t)) = { + (struct sscop *, KBuffer *, caddr_t) = { NULL, /* SOS_INST */ sscop_er_idle, /* SOS_IDLE */ sscop_noop, /* SOS_OUTCONN */ @@ -230,7 +230,7 @@ static void (*sscop_er_tab[SOS_NUMSTATES]) /* ERAK PDU */ static void (*sscop_erak_tab[SOS_NUMSTATES]) - __P((struct sscop *, KBuffer *, caddr_t)) = { + (struct sscop *, KBuffer *, caddr_t) = { NULL, /* SOS_INST */ sscop_erak_idle, /* SOS_IDLE */ sscop_noop, /* SOS_OUTCONN */ @@ -247,7 +247,7 @@ static void (*sscop_erak_tab[SOS_NUMSTATES]) /* SD PDU */ static void (*sscop_sd_tab[SOS_NUMSTATES]) - __P((struct sscop *, KBuffer *, caddr_t)) = { + (struct sscop *, KBuffer *, caddr_t) = { NULL, /* SOS_INST */ sscop_sd_idle, /* SOS_IDLE */ sscop_noop, /* SOS_OUTCONN */ @@ -264,7 +264,7 @@ static void (*sscop_sd_tab[SOS_NUMSTATES]) /* POLL PDU */ static void (*sscop_poll_tab[SOS_NUMSTATES]) - __P((struct sscop *, KBuffer *, caddr_t)) = { + (struct sscop *, KBuffer *, caddr_t) = { NULL, /* SOS_INST */ sscop_poll_idle, /* SOS_IDLE */ sscop_noop, /* SOS_OUTCONN */ @@ -281,7 +281,7 @@ static void (*sscop_poll_tab[SOS_NUMSTATES]) /* STAT PDU */ static void (*sscop_stat_tab[SOS_NUMSTATES]) - __P((struct sscop *, KBuffer *, caddr_t)) = { + (struct sscop *, KBuffer *, caddr_t) = { NULL, /* SOS_INST */ sscop_stat_idle, /* SOS_IDLE */ sscop_noop, /* SOS_OUTCONN */ @@ -298,7 +298,7 @@ static void (*sscop_stat_tab[SOS_NUMSTATES]) /* USTAT PDU */ static void (*sscop_ustat_tab[SOS_NUMSTATES]) - __P((struct sscop *, KBuffer *, caddr_t)) = { + (struct sscop *, KBuffer *, caddr_t) = { NULL, /* SOS_INST */ sscop_ustat_idle, /* SOS_IDLE */ sscop_noop, /* SOS_OUTCONN */ @@ -315,7 +315,7 @@ static void (*sscop_ustat_tab[SOS_NUMSTATES]) /* UD PDU */ static void (*sscop_ud_tab[SOS_NUMSTATES]) - __P((struct sscop *, KBuffer *, caddr_t)) = { + (struct sscop *, KBuffer *, caddr_t) = { NULL, /* SOS_INST */ sscop_ud_all, /* SOS_IDLE */ sscop_ud_all, /* SOS_OUTCONN */ @@ -332,7 +332,7 @@ static void (*sscop_ud_tab[SOS_NUMSTATES]) /* MD PDU */ static void (*sscop_md_tab[SOS_NUMSTATES]) - __P((struct sscop *, KBuffer *, caddr_t)) = { + (struct sscop *, KBuffer *, caddr_t) = { NULL, /* SOS_INST */ sscop_md_all, /* SOS_IDLE */ sscop_md_all, /* SOS_OUTCONN */ @@ -352,7 +352,7 @@ static void (*sscop_md_tab[SOS_NUMSTATES]) * PDU type lookup table */ void (*(*sscop_q2110_pdutab[])) - __P((struct sscop *, KBuffer *, caddr_t)) = { + (struct sscop *, KBuffer *, caddr_t) = { NULL, sscop_bgn_tab, sscop_bgak_tab, diff --git a/sys/netatm/uni/qsaal1_sigaa.c b/sys/netatm/uni/qsaal1_sigaa.c index 183050d..64e6923 100644 --- a/sys/netatm/uni/qsaal1_sigaa.c +++ b/sys/netatm/uni/qsaal1_sigaa.c @@ -58,11 +58,11 @@ __RCSID("@(#) $FreeBSD$"); /* * Local functions */ -static void sscop_estreq_ready __P((struct sscop *, int, int)); -static void sscop_datreq_outconn __P((struct sscop *, int, int)); -static void sscop_resreq_ready __P((struct sscop *, int, int)); -static void sscop_resrsp_inresyn __P((struct sscop *, int, int)); -static void sscop_resrsp_conresyn __P((struct sscop *, int, int)); +static void sscop_estreq_ready(struct sscop *, int, int); +static void sscop_datreq_outconn(struct sscop *, int, int); +static void sscop_resreq_ready(struct sscop *, int, int); +static void sscop_resrsp_inresyn(struct sscop *, int, int); +static void sscop_resrsp_conresyn(struct sscop *, int, int); /* @@ -70,7 +70,7 @@ static void sscop_resrsp_conresyn __P((struct sscop *, int, int)); */ /* SSCOP_INIT */ static void (*sscop_init_tab[SOS_NUMSTATES]) - __P((struct sscop *, int, int)) = { + (struct sscop *, int, int) = { sscop_init_inst, /* SOS_INST */ NULL, /* SOS_IDLE */ NULL, /* SOS_OUTCONN */ @@ -87,7 +87,7 @@ static void (*sscop_init_tab[SOS_NUMSTATES]) /* SSCOP_TERM */ static void (*sscop_term_tab[SOS_NUMSTATES]) - __P((struct sscop *, int, int)) = { + (struct sscop *, int, int) = { sscop_term_all, /* SOS_INST */ sscop_term_all, /* SOS_IDLE */ sscop_term_all, /* SOS_OUTCONN */ @@ -104,7 +104,7 @@ static void (*sscop_term_tab[SOS_NUMSTATES]) /* SSCOP_ESTABLISH_REQ */ static void (*sscop_estreq_tab[SOS_NUMSTATES]) - __P((struct sscop *, int, int)) = { + (struct sscop *, int, int) = { NULL, /* SOS_INST */ sscop_estreq_idle, /* SOS_IDLE */ NULL, /* SOS_OUTCONN */ @@ -121,7 +121,7 @@ static void (*sscop_estreq_tab[SOS_NUMSTATES]) /* SSCOP_ESTABLISH_RSP */ static void (*sscop_estrsp_tab[SOS_NUMSTATES]) - __P((struct sscop *, int, int)) = { + (struct sscop *, int, int) = { NULL, /* SOS_INST */ NULL, /* SOS_IDLE */ NULL, /* SOS_OUTCONN */ @@ -138,7 +138,7 @@ static void (*sscop_estrsp_tab[SOS_NUMSTATES]) /* SSCOP_RELEASE_REQ */ static void (*sscop_relreq_tab[SOS_NUMSTATES]) - __P((struct sscop *, int, int)) = { + (struct sscop *, int, int) = { NULL, /* SOS_INST */ NULL, /* SOS_IDLE */ sscop_relreq_outconn, /* SOS_OUTCONN */ @@ -155,7 +155,7 @@ static void (*sscop_relreq_tab[SOS_NUMSTATES]) /* SSCOP_DATA_REQ */ static void (*sscop_datreq_tab[SOS_NUMSTATES]) - __P((struct sscop *, int, int)) = { + (struct sscop *, int, int) = { NULL, /* SOS_INST */ NULL, /* SOS_IDLE */ sscop_datreq_outconn, /* SOS_OUTCONN */ @@ -172,7 +172,7 @@ static void (*sscop_datreq_tab[SOS_NUMSTATES]) /* SSCOP_RESYNC_REQ */ static void (*sscop_resreq_tab[SOS_NUMSTATES]) - __P((struct sscop *, int, int)) = { + (struct sscop *, int, int) = { NULL, /* SOS_INST */ NULL, /* SOS_IDLE */ NULL, /* SOS_OUTCONN */ @@ -189,7 +189,7 @@ static void (*sscop_resreq_tab[SOS_NUMSTATES]) /* SSCOP_RESYNC_RSP */ static void (*sscop_resrsp_tab[SOS_NUMSTATES]) - __P((struct sscop *, int, int)) = { + (struct sscop *, int, int) = { NULL, /* SOS_INST */ NULL, /* SOS_IDLE */ NULL, /* SOS_OUTCONN */ @@ -206,7 +206,7 @@ static void (*sscop_resrsp_tab[SOS_NUMSTATES]) /* SSCOP_UNITDATA_REQ */ static void (*sscop_udtreq_tab[SOS_NUMSTATES]) - __P((struct sscop *, int, int)) = { + (struct sscop *, int, int) = { NULL, /* SOS_INST */ sscop_udtreq_all, /* SOS_IDLE */ sscop_udtreq_all, /* SOS_OUTCONN */ @@ -226,7 +226,7 @@ static void (*sscop_udtreq_tab[SOS_NUMSTATES]) * Stack command lookup table */ void (*(*sscop_qsaal_aatab[SSCOP_CMD_SIZE])) - __P((struct sscop *, int, int)) = { + (struct sscop *, int, int) = { NULL, sscop_init_tab, sscop_term_tab, diff --git a/sys/netatm/uni/qsaal1_sigcpcs.c b/sys/netatm/uni/qsaal1_sigcpcs.c index 20b5c85..ed61835 100644 --- a/sys/netatm/uni/qsaal1_sigcpcs.c +++ b/sys/netatm/uni/qsaal1_sigcpcs.c @@ -65,24 +65,24 @@ __RCSID("@(#) $FreeBSD$"); /* * Local functions */ -static void sscop_bgn_outconn __P((struct sscop *, KBuffer *, caddr_t)); -static void sscop_end_outresyn __P((struct sscop *, KBuffer *, caddr_t)); -static void sscop_end_conresyn __P((struct sscop *, KBuffer *, caddr_t)); -static void sscop_end_ready __P((struct sscop *, KBuffer *, caddr_t)); -static void sscop_endak_outresyn __P((struct sscop *, KBuffer *, caddr_t)); -static void sscop_rs_outresyn __P((struct sscop *, KBuffer *, caddr_t)); -static void sscop_rs_ready __P((struct sscop *, KBuffer *, caddr_t)); -static void sscop_rsak_conresyn __P((struct sscop *, KBuffer *, caddr_t)); -static void sscop_sd_inresyn __P((struct sscop *, KBuffer *, caddr_t)); -static void sscop_sd_conresyn __P((struct sscop *, KBuffer *, caddr_t)); -static void sscop_sd_process __P((struct sscop *, KBuffer *, caddr_t, int)); -static void sscop_sd_ready __P((struct sscop *, KBuffer *, caddr_t)); -static void sscop_sdp_ready __P((struct sscop *, KBuffer *, caddr_t)); -static void sscop_poll_inresyn __P((struct sscop *, KBuffer *, caddr_t)); -static void sscop_poll_conresyn __P((struct sscop *, KBuffer *, caddr_t)); -static void sscop_poll_ready __P((struct sscop *, KBuffer *, caddr_t)); -static void sscop_stat_conresyn __P((struct sscop *, KBuffer *, caddr_t)); -static void sscop_ustat_conresyn __P((struct sscop *, KBuffer *, caddr_t)); +static void sscop_bgn_outconn(struct sscop *, KBuffer *, caddr_t); +static void sscop_end_outresyn(struct sscop *, KBuffer *, caddr_t); +static void sscop_end_conresyn(struct sscop *, KBuffer *, caddr_t); +static void sscop_end_ready(struct sscop *, KBuffer *, caddr_t); +static void sscop_endak_outresyn(struct sscop *, KBuffer *, caddr_t); +static void sscop_rs_outresyn(struct sscop *, KBuffer *, caddr_t); +static void sscop_rs_ready(struct sscop *, KBuffer *, caddr_t); +static void sscop_rsak_conresyn(struct sscop *, KBuffer *, caddr_t); +static void sscop_sd_inresyn(struct sscop *, KBuffer *, caddr_t); +static void sscop_sd_conresyn(struct sscop *, KBuffer *, caddr_t); +static void sscop_sd_process(struct sscop *, KBuffer *, caddr_t, int); +static void sscop_sd_ready(struct sscop *, KBuffer *, caddr_t); +static void sscop_sdp_ready(struct sscop *, KBuffer *, caddr_t); +static void sscop_poll_inresyn(struct sscop *, KBuffer *, caddr_t); +static void sscop_poll_conresyn(struct sscop *, KBuffer *, caddr_t); +static void sscop_poll_ready(struct sscop *, KBuffer *, caddr_t); +static void sscop_stat_conresyn(struct sscop *, KBuffer *, caddr_t); +static void sscop_ustat_conresyn(struct sscop *, KBuffer *, caddr_t); /* @@ -90,7 +90,7 @@ static void sscop_ustat_conresyn __P((struct sscop *, KBuffer *, caddr_t)); */ /* BGN PDU */ static void (*sscop_bgn_tab[SOS_NUMSTATES]) - __P((struct sscop *, KBuffer *, caddr_t)) = { + (struct sscop *, KBuffer *, caddr_t) = { NULL, /* SOS_INST */ sscop_bgn_idle, /* SOS_IDLE */ sscop_bgn_outconn, /* SOS_OUTCONN */ @@ -107,7 +107,7 @@ static void (*sscop_bgn_tab[SOS_NUMSTATES]) /* BGAK PDU */ static void (*sscop_bgak_tab[SOS_NUMSTATES]) - __P((struct sscop *, KBuffer *, caddr_t)) = { + (struct sscop *, KBuffer *, caddr_t) = { NULL, /* SOS_INST */ sscop_bgak_idle, /* SOS_IDLE */ sscop_bgak_outconn, /* SOS_OUTCONN */ @@ -124,7 +124,7 @@ static void (*sscop_bgak_tab[SOS_NUMSTATES]) /* BGREJ PDU */ static void (*sscop_bgrej_tab[SOS_NUMSTATES]) - __P((struct sscop *, KBuffer *, caddr_t)) = { + (struct sscop *, KBuffer *, caddr_t) = { NULL, /* SOS_INST */ sscop_bgrej_error, /* SOS_IDLE */ sscop_bgrej_outconn, /* SOS_OUTCONN */ @@ -141,7 +141,7 @@ static void (*sscop_bgrej_tab[SOS_NUMSTATES]) /* END PDU */ static void (*sscop_end_tab[SOS_NUMSTATES]) - __P((struct sscop *, KBuffer *, caddr_t)) = { + (struct sscop *, KBuffer *, caddr_t) = { NULL, /* SOS_INST */ sscop_end_idle, /* SOS_IDLE */ sscop_noop, /* SOS_OUTCONN */ @@ -158,7 +158,7 @@ static void (*sscop_end_tab[SOS_NUMSTATES]) /* ENDAK PDU */ static void (*sscop_endak_tab[SOS_NUMSTATES]) - __P((struct sscop *, KBuffer *, caddr_t)) = { + (struct sscop *, KBuffer *, caddr_t) = { NULL, /* SOS_INST */ sscop_noop, /* SOS_IDLE */ sscop_noop, /* SOS_OUTCONN */ @@ -175,7 +175,7 @@ static void (*sscop_endak_tab[SOS_NUMSTATES]) /* RS PDU */ static void (*sscop_rs_tab[SOS_NUMSTATES]) - __P((struct sscop *, KBuffer *, caddr_t)) = { + (struct sscop *, KBuffer *, caddr_t) = { NULL, /* SOS_INST */ sscop_rs_idle, /* SOS_IDLE */ sscop_noop, /* SOS_OUTCONN */ @@ -192,7 +192,7 @@ static void (*sscop_rs_tab[SOS_NUMSTATES]) /* RSAK PDU */ static void (*sscop_rsak_tab[SOS_NUMSTATES]) - __P((struct sscop *, KBuffer *, caddr_t)) = { + (struct sscop *, KBuffer *, caddr_t) = { NULL, /* SOS_INST */ sscop_rsak_idle, /* SOS_IDLE */ sscop_noop, /* SOS_OUTCONN */ @@ -209,7 +209,7 @@ static void (*sscop_rsak_tab[SOS_NUMSTATES]) /* SD PDU */ static void (*sscop_sd_tab[SOS_NUMSTATES]) - __P((struct sscop *, KBuffer *, caddr_t)) = { + (struct sscop *, KBuffer *, caddr_t) = { NULL, /* SOS_INST */ sscop_sd_idle, /* SOS_IDLE */ sscop_noop, /* SOS_OUTCONN */ @@ -226,7 +226,7 @@ static void (*sscop_sd_tab[SOS_NUMSTATES]) /* SDP PDU */ static void (*sscop_sdp_tab[SOS_NUMSTATES]) - __P((struct sscop *, KBuffer *, caddr_t)) = { + (struct sscop *, KBuffer *, caddr_t) = { NULL, /* SOS_INST */ sscop_sd_idle, /* SOS_IDLE */ sscop_noop, /* SOS_OUTCONN */ @@ -243,7 +243,7 @@ static void (*sscop_sdp_tab[SOS_NUMSTATES]) /* POLL PDU */ static void (*sscop_poll_tab[SOS_NUMSTATES]) - __P((struct sscop *, KBuffer *, caddr_t)) = { + (struct sscop *, KBuffer *, caddr_t) = { NULL, /* SOS_INST */ sscop_poll_idle, /* SOS_IDLE */ sscop_noop, /* SOS_OUTCONN */ @@ -260,7 +260,7 @@ static void (*sscop_poll_tab[SOS_NUMSTATES]) /* STAT PDU */ static void (*sscop_stat_tab[SOS_NUMSTATES]) - __P((struct sscop *, KBuffer *, caddr_t)) = { + (struct sscop *, KBuffer *, caddr_t) = { NULL, /* SOS_INST */ sscop_stat_idle, /* SOS_IDLE */ sscop_noop, /* SOS_OUTCONN */ @@ -277,7 +277,7 @@ static void (*sscop_stat_tab[SOS_NUMSTATES]) /* USTAT PDU */ static void (*sscop_ustat_tab[SOS_NUMSTATES]) - __P((struct sscop *, KBuffer *, caddr_t)) = { + (struct sscop *, KBuffer *, caddr_t) = { NULL, /* SOS_INST */ sscop_ustat_idle, /* SOS_IDLE */ sscop_noop, /* SOS_OUTCONN */ @@ -294,7 +294,7 @@ static void (*sscop_ustat_tab[SOS_NUMSTATES]) /* UD PDU */ static void (*sscop_ud_tab[SOS_NUMSTATES]) - __P((struct sscop *, KBuffer *, caddr_t)) = { + (struct sscop *, KBuffer *, caddr_t) = { NULL, /* SOS_INST */ sscop_ud_all, /* SOS_IDLE */ sscop_ud_all, /* SOS_OUTCONN */ @@ -311,7 +311,7 @@ static void (*sscop_ud_tab[SOS_NUMSTATES]) /* MD PDU */ static void (*sscop_md_tab[SOS_NUMSTATES]) - __P((struct sscop *, KBuffer *, caddr_t)) = { + (struct sscop *, KBuffer *, caddr_t) = { NULL, /* SOS_INST */ sscop_md_all, /* SOS_IDLE */ sscop_md_all, /* SOS_OUTCONN */ @@ -331,7 +331,7 @@ static void (*sscop_md_tab[SOS_NUMSTATES]) * PDU type lookup table */ void (*(*sscop_qsaal_pdutab[])) - __P((struct sscop *, KBuffer *, caddr_t)) = { + (struct sscop *, KBuffer *, caddr_t) = { NULL, sscop_bgn_tab, sscop_bgak_tab, diff --git a/sys/netatm/uni/sscf_uni.c b/sys/netatm/uni/sscf_uni.c index 8ca343b..028a4dc 100644 --- a/sys/netatm/uni/sscf_uni.c +++ b/sys/netatm/uni/sscf_uni.c @@ -72,7 +72,7 @@ int sscf_uni_vccnt = 0; /* * Local functions */ -static int sscf_uni_inst __P((struct stack_defn **, Atm_connvc *)); +static int sscf_uni_inst(struct stack_defn **, Atm_connvc *); /* * Local variables diff --git a/sys/netatm/uni/sscf_uni_var.h b/sys/netatm/uni/sscf_uni_var.h index 4f4cea7..d3795fe 100644 --- a/sys/netatm/uni/sscf_uni_var.h +++ b/sys/netatm/uni/sscf_uni_var.h @@ -52,9 +52,9 @@ struct univcc { void *uv_toku; /* Stack upper layer's token */ void *uv_tokl; /* Stack lower layer's token */ void (*uv_upper) /* Stack upper layer's interface */ - __P((int, void *, int, int)); + (int, void *, int, int); void (*uv_lower) /* Stack lower layer's interface */ - __P((int, void *, int, int)); + (int, void *, int, int); }; /* @@ -92,17 +92,16 @@ struct univcc { * Global function declarations */ /* sscf_uni.c */ -int sscf_uni_start __P((void)); -int sscf_uni_stop __P((void)); -void sscf_uni_abort __P((struct univcc *, char *)); -void sscf_uni_pdu_print __P((struct univcc *, KBuffer *, - char *)); +int sscf_uni_start(void); +int sscf_uni_stop(void); +void sscf_uni_abort(struct univcc *, char *); +void sscf_uni_pdu_print(struct univcc *, KBuffer *, char *); /* sscf_uni_lower.c */ -void sscf_uni_lower __P((int, void *, int, int)); +void sscf_uni_lower(int, void *, int, int); /* sscf_uni_upper.c */ -void sscf_uni_upper __P((int, void *, int, int)); +void sscf_uni_upper(int, void *, int, int); /* diff --git a/sys/netatm/uni/sscop.c b/sys/netatm/uni/sscop.c index 3c893f1..b11e690 100644 --- a/sys/netatm/uni/sscop.c +++ b/sys/netatm/uni/sscop.c @@ -88,7 +88,7 @@ struct sp_info sscop_pool = { /* * Local functions */ -static int sscop_inst __P((struct stack_defn **, Atm_connvc *)); +static int sscop_inst(struct stack_defn **, Atm_connvc *); /* diff --git a/sys/netatm/uni/sscop_lower.c b/sys/netatm/uni/sscop_lower.c index bfb8eb7..615e5f1 100644 --- a/sys/netatm/uni/sscop_lower.c +++ b/sys/netatm/uni/sscop_lower.c @@ -135,8 +135,8 @@ sscop_lower(cmd, tok, arg1, arg2) int arg2; { struct sscop *sop = (struct sscop *)tok; - void (**stab) __P((struct sscop *, int, int)); - void (*func) __P((struct sscop *, int, int)); + void (**stab)(struct sscop *, int, int); + void (*func)(struct sscop *, int, int); int val; ATM_DEBUG5("sscop_lower: cmd=0x%x, sop=%p, state=%d, arg1=0x%x, arg2=0x%x\n", diff --git a/sys/netatm/uni/sscop_pdu.c b/sys/netatm/uni/sscop_pdu.c index 7b97343..f59f500 100644 --- a/sys/netatm/uni/sscop_pdu.c +++ b/sys/netatm/uni/sscop_pdu.c @@ -66,12 +66,12 @@ __RCSID("@(#) $FreeBSD$"); /* * Local functions */ -static KBuffer * sscop_stat_init __P((struct sscop *)); -static KBuffer * sscop_stat_add __P((sscop_seq, KBuffer *)); -static int sscop_stat_end __P((struct sscop *, sscop_seq, - KBuffer *, KBuffer *)); -static int sscop_recv_locate __P((struct sscop *, sscop_seq, - struct pdu_hdr **)); +static KBuffer * sscop_stat_init(struct sscop *); +static KBuffer * sscop_stat_add(sscop_seq, KBuffer *); +static int sscop_stat_end(struct sscop *, sscop_seq, + KBuffer *, KBuffer *); +static int sscop_recv_locate(struct sscop *, sscop_seq, + struct pdu_hdr **); /* diff --git a/sys/netatm/uni/sscop_subr.c b/sys/netatm/uni/sscop_subr.c index 7981813..915837f 100644 --- a/sys/netatm/uni/sscop_subr.c +++ b/sys/netatm/uni/sscop_subr.c @@ -67,7 +67,7 @@ __RCSID("@(#) $FreeBSD$"); /* * Local functions */ -static int sscop_proc_xmit __P((struct sscop *)); +static int sscop_proc_xmit(struct sscop *); /* diff --git a/sys/netatm/uni/sscop_timer.c b/sys/netatm/uni/sscop_timer.c index 1c0c03e..f0cc351 100644 --- a/sys/netatm/uni/sscop_timer.c +++ b/sys/netatm/uni/sscop_timer.c @@ -66,15 +66,15 @@ __RCSID("@(#) $FreeBSD$"); /* * Local functions */ -static void sscop_poll_expire __P((struct sscop *)); -static void sscop_noresponse_expire __P((struct sscop *)); -static void sscop_cc_expire __P((struct sscop *)); -static void sscop_idle_expire __P((struct sscop *)); +static void sscop_poll_expire(struct sscop *); +static void sscop_noresponse_expire(struct sscop *); +static void sscop_cc_expire(struct sscop *); +static void sscop_idle_expire(struct sscop *); /* * Local variables */ -static void (*sscop_expired[SSCOP_T_NUM]) __P((struct sscop *)) = { +static void (*sscop_expired[SSCOP_T_NUM])(struct sscop *) = { sscop_poll_expire, sscop_noresponse_expire, sscop_cc_expire, diff --git a/sys/netatm/uni/sscop_upper.c b/sys/netatm/uni/sscop_upper.c index 107c974..8d68903 100644 --- a/sys/netatm/uni/sscop_upper.c +++ b/sys/netatm/uni/sscop_upper.c @@ -67,7 +67,7 @@ __RCSID("@(#) $FreeBSD$"); /* * Local functions */ -static caddr_t sscop_pdu_receive __P((KBuffer *, struct sscop *, int *)); +static caddr_t sscop_pdu_receive(KBuffer *, struct sscop *, int *); /* @@ -210,8 +210,8 @@ sscop_upper(cmd, tok, arg1, arg2) int arg2; { struct sscop *sop = (struct sscop *)tok; - void (**ptab) __P((struct sscop *, KBuffer *, caddr_t)); - void (*func) __P((struct sscop *, KBuffer *, caddr_t)); + void (**ptab)(struct sscop *, KBuffer *, caddr_t); + void (*func)(struct sscop *, KBuffer *, caddr_t); caddr_t trlr; int type; diff --git a/sys/netatm/uni/sscop_var.h b/sys/netatm/uni/sscop_var.h index b063212..807b70a 100644 --- a/sys/netatm/uni/sscop_var.h +++ b/sys/netatm/uni/sscop_var.h @@ -84,9 +84,9 @@ struct sscop { void *so_toku; /* Stack upper layer's token */ void *so_tokl; /* Stack lower layer's token */ void (*so_upper) /* Stack upper layer's interface */ - __P((int, void *, int, int)); + (int, void *, int, int); void (*so_lower) /* Stack lower layer's interface */ - __P((int, void *, int, int)); + (int, void *, int, int); u_short so_headout; /* Output buffer headroom */ }; @@ -139,126 +139,126 @@ struct sscop_stat { * Global function declarations */ /* sscop.c */ -int sscop_start __P((void)); -int sscop_stop __P((void)); -void sscop_maa_error __P((struct sscop *, int)); -void sscop_abort __P((struct sscop *, char *)); +int sscop_start(void); +int sscop_stop(void); +void sscop_maa_error(struct sscop *, int); +void sscop_abort(struct sscop *, char *); /* sscop_lower.c */ -void sscop_lower __P((int, void *, int, int)); -void sscop_aa_noop_0 __P((struct sscop *, int, int)); -void sscop_aa_noop_1 __P((struct sscop *, int, int)); -void sscop_init_inst __P((struct sscop *, int, int)); -void sscop_term_all __P((struct sscop *, int, int)); +void sscop_lower(int, void *, int, int); +void sscop_aa_noop_0(struct sscop *, int, int); +void sscop_aa_noop_1(struct sscop *, int, int); +void sscop_init_inst(struct sscop *, int, int); +void sscop_term_all(struct sscop *, int, int); /* sscop_pdu.c */ -int sscop_send_bgn __P((struct sscop *, int)); -int sscop_send_bgak __P((struct sscop *)); -int sscop_send_bgrej __P((struct sscop *)); -int sscop_send_end __P((struct sscop *, int)); -int sscop_send_endak __P((struct sscop *)); -int sscop_send_rs __P((struct sscop *)); -int sscop_send_rsak __P((struct sscop *)); -int sscop_send_er __P((struct sscop *)); -int sscop_send_erak __P((struct sscop *)); -int sscop_send_poll __P((struct sscop *)); -int sscop_send_stat __P((struct sscop *, sscop_seq)); -int sscop_send_ustat __P((struct sscop *, sscop_seq)); -int sscop_send_ud __P((struct sscop *, KBuffer *)); -void sscop_pdu_print __P((struct sscop *, KBuffer *, char *)); +int sscop_send_bgn(struct sscop *, int); +int sscop_send_bgak(struct sscop *); +int sscop_send_bgrej(struct sscop *); +int sscop_send_end(struct sscop *, int); +int sscop_send_endak(struct sscop *); +int sscop_send_rs(struct sscop *); +int sscop_send_rsak(struct sscop *); +int sscop_send_er(struct sscop *); +int sscop_send_erak(struct sscop *); +int sscop_send_poll(struct sscop *); +int sscop_send_stat(struct sscop *, sscop_seq); +int sscop_send_ustat(struct sscop *, sscop_seq); +int sscop_send_ud(struct sscop *, KBuffer *); +void sscop_pdu_print(struct sscop *, KBuffer *, char *); /* sscop_sigaa.c */ -void sscop_estreq_idle __P((struct sscop *, int, int)); -void sscop_estrsp_inconn __P((struct sscop *, int, int)); -void sscop_relreq_outconn __P((struct sscop *, int, int)); -void sscop_relreq_inconn __P((struct sscop *, int, int)); -void sscop_relreq_ready __P((struct sscop *, int, int)); -void sscop_datreq_ready __P((struct sscop *, int, int)); -void sscop_udtreq_all __P((struct sscop *, int, int)); +void sscop_estreq_idle(struct sscop *, int, int); +void sscop_estrsp_inconn(struct sscop *, int, int); +void sscop_relreq_outconn(struct sscop *, int, int); +void sscop_relreq_inconn(struct sscop *, int, int); +void sscop_relreq_ready(struct sscop *, int, int); +void sscop_datreq_ready(struct sscop *, int, int); +void sscop_udtreq_all(struct sscop *, int, int); /* sscop_sigcpcs.c */ -void sscop_noop __P((struct sscop *, KBuffer *, caddr_t)); -void sscop_bgn_idle __P((struct sscop *, KBuffer *, caddr_t)); -void sscop_bgn_outdisc __P((struct sscop *, KBuffer *, caddr_t)); -void sscop_bgn_outresyn __P((struct sscop *, KBuffer *, caddr_t)); -void sscop_bgn_inresyn __P((struct sscop *, KBuffer *, caddr_t)); -void sscop_bgak_error __P((struct sscop *, KBuffer *, caddr_t)); -void sscop_bgak_idle __P((struct sscop *, KBuffer *, caddr_t)); -void sscop_bgak_outconn __P((struct sscop *, KBuffer *, caddr_t)); -void sscop_bgrej_error __P((struct sscop *, KBuffer *, caddr_t)); -void sscop_bgrej_outconn __P((struct sscop *, KBuffer *, caddr_t)); -void sscop_bgrej_inconn __P((struct sscop *, KBuffer *, caddr_t)); -void sscop_bgrej_outresyn __P((struct sscop *, KBuffer *, caddr_t)); -void sscop_bgrej_ready __P((struct sscop *, KBuffer *, caddr_t)); -void sscop_end_idle __P((struct sscop *, KBuffer *, caddr_t)); -void sscop_end_inconn __P((struct sscop *, KBuffer *, caddr_t)); -void sscop_end_outdisc __P((struct sscop *, KBuffer *, caddr_t)); -void sscop_endak_error __P((struct sscop *, KBuffer *, caddr_t)); -void sscop_endak_inconn __P((struct sscop *, KBuffer *, caddr_t)); -void sscop_endak_outdisc __P((struct sscop *, KBuffer *, caddr_t)); -void sscop_endak_ready __P((struct sscop *, KBuffer *, caddr_t)); -void sscop_rs_error __P((struct sscop *, KBuffer *, caddr_t)); -void sscop_rs_idle __P((struct sscop *, KBuffer *, caddr_t)); -void sscop_rsak_error __P((struct sscop *, KBuffer *, caddr_t)); -void sscop_rsak_idle __P((struct sscop *, KBuffer *, caddr_t)); -void sscop_rsak_outresyn __P((struct sscop *, KBuffer *, caddr_t)); -void sscop_sd_error __P((struct sscop *, KBuffer *, caddr_t)); -void sscop_sd_idle __P((struct sscop *, KBuffer *, caddr_t)); -void sscop_sd_inconn __P((struct sscop *, KBuffer *, caddr_t)); -void sscop_poll_error __P((struct sscop *, KBuffer *, caddr_t)); -void sscop_poll_idle __P((struct sscop *, KBuffer *, caddr_t)); -void sscop_poll_inconn __P((struct sscop *, KBuffer *, caddr_t)); -void sscop_stat_error __P((struct sscop *, KBuffer *, caddr_t)); -void sscop_stat_idle __P((struct sscop *, KBuffer *, caddr_t)); -void sscop_stat_inconn __P((struct sscop *, KBuffer *, caddr_t)); -void sscop_stat_ready __P((struct sscop *, KBuffer *, caddr_t)); -void sscop_ustat_error __P((struct sscop *, KBuffer *, caddr_t)); -void sscop_ustat_idle __P((struct sscop *, KBuffer *, caddr_t)); -void sscop_ustat_inconn __P((struct sscop *, KBuffer *, caddr_t)); -void sscop_ustat_ready __P((struct sscop *, KBuffer *, caddr_t)); -void sscop_ud_all __P((struct sscop *, KBuffer *, caddr_t)); -void sscop_md_all __P((struct sscop *, KBuffer *, caddr_t)); +void sscop_noop(struct sscop *, KBuffer *, caddr_t); +void sscop_bgn_idle(struct sscop *, KBuffer *, caddr_t); +void sscop_bgn_outdisc(struct sscop *, KBuffer *, caddr_t); +void sscop_bgn_outresyn(struct sscop *, KBuffer *, caddr_t); +void sscop_bgn_inresyn(struct sscop *, KBuffer *, caddr_t); +void sscop_bgak_error(struct sscop *, KBuffer *, caddr_t); +void sscop_bgak_idle(struct sscop *, KBuffer *, caddr_t); +void sscop_bgak_outconn(struct sscop *, KBuffer *, caddr_t); +void sscop_bgrej_error(struct sscop *, KBuffer *, caddr_t); +void sscop_bgrej_outconn(struct sscop *, KBuffer *, caddr_t); +void sscop_bgrej_inconn(struct sscop *, KBuffer *, caddr_t); +void sscop_bgrej_outresyn(struct sscop *, KBuffer *, caddr_t); +void sscop_bgrej_ready(struct sscop *, KBuffer *, caddr_t); +void sscop_end_idle(struct sscop *, KBuffer *, caddr_t); +void sscop_end_inconn(struct sscop *, KBuffer *, caddr_t); +void sscop_end_outdisc(struct sscop *, KBuffer *, caddr_t); +void sscop_endak_error(struct sscop *, KBuffer *, caddr_t); +void sscop_endak_inconn(struct sscop *, KBuffer *, caddr_t); +void sscop_endak_outdisc(struct sscop *, KBuffer *, caddr_t); +void sscop_endak_ready(struct sscop *, KBuffer *, caddr_t); +void sscop_rs_error(struct sscop *, KBuffer *, caddr_t); +void sscop_rs_idle(struct sscop *, KBuffer *, caddr_t); +void sscop_rsak_error(struct sscop *, KBuffer *, caddr_t); +void sscop_rsak_idle(struct sscop *, KBuffer *, caddr_t); +void sscop_rsak_outresyn(struct sscop *, KBuffer *, caddr_t); +void sscop_sd_error(struct sscop *, KBuffer *, caddr_t); +void sscop_sd_idle(struct sscop *, KBuffer *, caddr_t); +void sscop_sd_inconn(struct sscop *, KBuffer *, caddr_t); +void sscop_poll_error(struct sscop *, KBuffer *, caddr_t); +void sscop_poll_idle(struct sscop *, KBuffer *, caddr_t); +void sscop_poll_inconn(struct sscop *, KBuffer *, caddr_t); +void sscop_stat_error(struct sscop *, KBuffer *, caddr_t); +void sscop_stat_idle(struct sscop *, KBuffer *, caddr_t); +void sscop_stat_inconn(struct sscop *, KBuffer *, caddr_t); +void sscop_stat_ready(struct sscop *, KBuffer *, caddr_t); +void sscop_ustat_error(struct sscop *, KBuffer *, caddr_t); +void sscop_ustat_idle(struct sscop *, KBuffer *, caddr_t); +void sscop_ustat_inconn(struct sscop *, KBuffer *, caddr_t); +void sscop_ustat_ready(struct sscop *, KBuffer *, caddr_t); +void sscop_ud_all(struct sscop *, KBuffer *, caddr_t); +void sscop_md_all(struct sscop *, KBuffer *, caddr_t); /* sscop_subr.c */ -KBuffer * sscop_stat_getelem __P((KBuffer *, sscop_seq *)); -struct pdu_hdr *sscop_pack_locate __P((struct sscop *, sscop_seq)); -void sscop_pack_free __P((struct sscop *, sscop_seq)); -void sscop_rexmit_insert __P((struct sscop *, struct pdu_hdr *)); -void sscop_rexmit_unlink __P((struct sscop *, struct pdu_hdr *)); -void sscop_xmit_drain __P((struct sscop *)); -int sscop_recv_insert __P((struct sscop *, struct pdu_hdr *)); -void sscop_rcvr_drain __P((struct sscop *)); -void sscop_service_xmit __P((struct sscop *)); -int sscop_is_rexmit __P((struct sscop *, u_char)); -void sscop_set_poll __P((struct sscop *)); +KBuffer * sscop_stat_getelem(KBuffer *, sscop_seq *); +struct pdu_hdr *sscop_pack_locate(struct sscop *, sscop_seq); +void sscop_pack_free(struct sscop *, sscop_seq); +void sscop_rexmit_insert(struct sscop *, struct pdu_hdr *); +void sscop_rexmit_unlink(struct sscop *, struct pdu_hdr *); +void sscop_xmit_drain(struct sscop *); +int sscop_recv_insert(struct sscop *, struct pdu_hdr *); +void sscop_rcvr_drain(struct sscop *); +void sscop_service_xmit(struct sscop *); +int sscop_is_rexmit(struct sscop *, u_char); +void sscop_set_poll(struct sscop *); /* sscop_timer.c */ -void sscop_timeout __P((struct atm_time *)); +void sscop_timeout(struct atm_time *); /* sscop_upper.c */ -void sscop_upper __P((int, void *, int, int)); +void sscop_upper(int, void *, int, int); /* q2110_sigaa.c */ /* q2110_sigcpcs.c */ /* q2110_subr.c */ -void q2110_clear_xmit __P((struct sscop *)); -void q2110_init_state __P((struct sscop *)); -void q2110_prep_retrieve __P((struct sscop *)); -void q2110_prep_recovery __P((struct sscop *)); -void q2110_deliver_data __P((struct sscop *)); -void q2110_error_recovery __P((struct sscop *)); +void q2110_clear_xmit(struct sscop *); +void q2110_init_state(struct sscop *); +void q2110_prep_retrieve(struct sscop *); +void q2110_prep_recovery(struct sscop *); +void q2110_deliver_data(struct sscop *); +void q2110_error_recovery(struct sscop *); /* qsaal1_sigaa.c */ /* qsaal1_sigcpcs.c */ /* qsaal1_subr.c */ -void qsaal1_reestablish __P((struct sscop *)); -void qsaal1_reset_xmit __P((struct sscop *)); -void qsaal1_reset_rcvr __P((struct sscop *)); -void qsaal1_clear_connection __P((struct sscop *)); +void qsaal1_reestablish(struct sscop *); +void qsaal1_reset_xmit(struct sscop *); +void qsaal1_reset_rcvr(struct sscop *); +void qsaal1_clear_connection(struct sscop *); /* @@ -270,13 +270,13 @@ extern struct sscop *sscop_head; extern struct sscop_stat sscop_stat; extern struct atm_time sscop_timer; extern void (*(*sscop_qsaal_aatab[])) - __P((struct sscop *, int, int)); + (struct sscop *, int, int); extern void (*(*sscop_q2110_aatab[])) - __P((struct sscop *, int, int)); + (struct sscop *, int, int); extern void (*(*sscop_qsaal_pdutab[])) - __P((struct sscop *, KBuffer *, caddr_t)); + (struct sscop *, KBuffer *, caddr_t); extern void (*(*sscop_q2110_pdutab[])) - __P((struct sscop *, KBuffer *, caddr_t)); + (struct sscop *, KBuffer *, caddr_t); #endif /* _KERNEL */ diff --git a/sys/netatm/uni/uni_load.c b/sys/netatm/uni/uni_load.c index a035254..0caa883 100644 --- a/sys/netatm/uni/uni_load.c +++ b/sys/netatm/uni/uni_load.c @@ -67,20 +67,20 @@ __RCSID("@(#) $FreeBSD$"); /* * External functions */ -int sscop_start __P((void)); -int sscop_stop __P((void)); -int sscf_uni_start __P((void)); -int sscf_uni_stop __P((void)); -int uniip_start __P((void)); -int uniip_stop __P((void)); -int unisig_start __P((void)); -int unisig_stop __P((void)); +int sscop_start(void); +int sscop_stop(void); +int sscf_uni_start(void); +int sscf_uni_stop(void); +int uniip_start(void); +int uniip_stop(void); +int unisig_start(void); +int unisig_stop(void); /* * Local functions */ -static int uni_start __P((void)); -static int uni_stop __P((void)); +static int uni_start(void); +static int uni_stop(void); /* @@ -188,8 +188,8 @@ done: * ******************************************************************* */ -static int uni_doload __P((void)); -static int uni_dounload __P((void)); +static int uni_doload(void); +static int uni_dounload(void); /* * Generic module load processing @@ -348,7 +348,7 @@ uni_mod(lkmtp, cmd, ver) * ******************************************************************* */ -static void uni_doload __P((void *)); +static void uni_doload(void *); SYSINIT(atmuni, SI_SUB_PROTO_END, SI_ORDER_ANY, uni_doload, NULL) diff --git a/sys/netatm/uni/uniarp.c b/sys/netatm/uni/uniarp.c index 7e5c556..6654299 100644 --- a/sys/netatm/uni/uniarp.c +++ b/sys/netatm/uni/uniarp.c @@ -110,8 +110,8 @@ struct sp_info uniarp_pool = { /* * Local variables */ -static void uniarp_server_mode __P((struct uniip *)); -static void uniarp_client_mode __P((struct uniip *, Atm_addr *)); +static void uniarp_server_mode(struct uniip *); +static void uniarp_client_mode(struct uniip *, Atm_addr *); /* diff --git a/sys/netatm/uni/uniarp_input.c b/sys/netatm/uni/uniarp_input.c index 271fcfd..7e15778 100644 --- a/sys/netatm/uni/uniarp_input.c +++ b/sys/netatm/uni/uniarp_input.c @@ -72,11 +72,11 @@ __RCSID("@(#) $FreeBSD$"); /* * Local functions */ -static void proc_arp_req __P((struct ipvcc *, KBuffer *)); -static void proc_arp_rsp __P((struct ipvcc *, KBuffer *)); -static void proc_arp_nak __P((struct ipvcc *, KBuffer *)); -static void proc_inarp_req __P((struct ipvcc *, KBuffer *)); -static void proc_inarp_rsp __P((struct ipvcc *, KBuffer *)); +static void proc_arp_req(struct ipvcc *, KBuffer *); +static void proc_arp_rsp(struct ipvcc *, KBuffer *); +static void proc_arp_nak(struct ipvcc *, KBuffer *); +static void proc_inarp_req(struct ipvcc *, KBuffer *); +static void proc_inarp_rsp(struct ipvcc *, KBuffer *); /* diff --git a/sys/netatm/uni/uniarp_timer.c b/sys/netatm/uni/uniarp_timer.c index 2a33401..0138b5d 100644 --- a/sys/netatm/uni/uniarp_timer.c +++ b/sys/netatm/uni/uniarp_timer.c @@ -66,8 +66,8 @@ __RCSID("@(#) $FreeBSD$"); /* * Local functions */ -static void uniarp_svc_oldage __P((struct uniarp *)); -static void uniarp_pvc_oldage __P((struct uniarp *)); +static void uniarp_svc_oldage(struct uniarp *); +static void uniarp_pvc_oldage(struct uniarp *); /* diff --git a/sys/netatm/uni/uniip.c b/sys/netatm/uni/uniip.c index 7ee905a..e9d11c6 100644 --- a/sys/netatm/uni/uniip.c +++ b/sys/netatm/uni/uniip.c @@ -67,8 +67,8 @@ __RCSID("@(#) $FreeBSD$"); /* * Local functions */ -static int uniip_ipact __P((struct ip_nif *)); -static int uniip_ipdact __P((struct ip_nif *)); +static int uniip_ipact(struct ip_nif *); +static int uniip_ipdact(struct ip_nif *); /* diff --git a/sys/netatm/uni/uniip_var.h b/sys/netatm/uni/uniip_var.h index 343fd78..22ba48d 100644 --- a/sys/netatm/uni/uniip_var.h +++ b/sys/netatm/uni/uniip_var.h @@ -263,54 +263,53 @@ extern struct uniarp_stat uniarp_stat; * Global function declarations */ /* uniarp.c */ -int uniarp_start __P((void)); -void uniarp_stop __P((void)); -void uniarp_ipact __P((struct uniip *)); -void uniarp_ipdact __P((struct uniip *)); -void uniarp_ifaddr __P((struct siginst *)); -void uniarp_iftimeout __P((struct atm_time *)); -int uniarp_ioctl __P((int, caddr_t, caddr_t)); -caddr_t uniarp_getname __P((void *)); +int uniarp_start(void); +void uniarp_stop(void); +void uniarp_ipact(struct uniip *); +void uniarp_ipdact(struct uniip *); +void uniarp_ifaddr(struct siginst *); +void uniarp_iftimeout(struct atm_time *); +int uniarp_ioctl(int, caddr_t, caddr_t); +caddr_t uniarp_getname(void *); /* uniarp_cache.c */ -int uniarp_cache_svc __P((struct uniip *, struct in_addr *, - Atm_addr *, Atm_addr *, u_int)); -void uniarp_cache_pvc __P((struct ipvcc *, struct in_addr *, - Atm_addr *, Atm_addr *)); -int uniarp_validate_ip __P((struct uniip *, struct in_addr *, - u_int)); +int uniarp_cache_svc(struct uniip *, struct in_addr *, + Atm_addr *, Atm_addr *, u_int); +void uniarp_cache_pvc(struct ipvcc *, struct in_addr *, + Atm_addr *, Atm_addr *); +int uniarp_validate_ip(struct uniip *, struct in_addr *, u_int); /* uniarp_input.c */ -void uniarp_cpcs_data __P((void *, KBuffer *)); -void uniarp_pdu_print __P((struct ipvcc *, KBuffer *, char *)); +void uniarp_cpcs_data(void *, KBuffer *); +void uniarp_pdu_print(struct ipvcc *, KBuffer *, char *); /* uniarp_output.c */ -int uniarp_arp_req __P((struct uniip *, struct in_addr *)); -int uniarp_arp_rsp __P((struct uniip *, struct arpmap *, +int uniarp_arp_req(struct uniip *, struct in_addr *); +int uniarp_arp_rsp(struct uniip *, struct arpmap *, struct in_addr *, Atm_addr *, - Atm_addr *, struct ipvcc *)); -int uniarp_arp_nak __P((struct uniip *, KBuffer *, struct ipvcc *)); -int uniarp_inarp_req __P((struct uniip *, Atm_addr *, - Atm_addr *, struct ipvcc *)); -int uniarp_inarp_rsp __P((struct uniip *, struct in_addr *, - Atm_addr *, Atm_addr *, struct ipvcc *)); + Atm_addr *, struct ipvcc *); +int uniarp_arp_nak(struct uniip *, KBuffer *, struct ipvcc *); +int uniarp_inarp_req(struct uniip *, Atm_addr *, + Atm_addr *, struct ipvcc *); +int uniarp_inarp_rsp(struct uniip *, struct in_addr *, + Atm_addr *, Atm_addr *, struct ipvcc *); /* uniarp_timer.c */ -void uniarp_timeout __P((struct atm_time *)); -void uniarp_aging __P((struct atm_time *)); +void uniarp_timeout(struct atm_time *); +void uniarp_aging(struct atm_time *); /* uniarp_vcm.c */ -int uniarp_pvcopen __P((struct ipvcc *)); -int uniarp_svcout __P((struct ipvcc *, struct in_addr *)); -int uniarp_svcin __P((struct ipvcc *, Atm_addr *, Atm_addr *)); -int uniarp_svcactive __P((struct ipvcc *)); -void uniarp_vcclose __P((struct ipvcc *)); -void uniarp_connected __P((void *)); -void uniarp_cleared __P((void *, struct t_atm_cause *)); +int uniarp_pvcopen(struct ipvcc *); +int uniarp_svcout(struct ipvcc *, struct in_addr *); +int uniarp_svcin(struct ipvcc *, Atm_addr *, Atm_addr *); +int uniarp_svcactive(struct ipvcc *); +void uniarp_vcclose(struct ipvcc *); +void uniarp_connected(void *); +void uniarp_cleared(void *, struct t_atm_cause *); /* uniip.c */ -int uniip_start __P((void)); -int uniip_stop __P((void)); +int uniip_start(void); +int uniip_stop(void); #endif /* _KERNEL */ diff --git a/sys/netatm/uni/unisig_decode.c b/sys/netatm/uni/unisig_decode.c index 040ff71..1c4a55e 100644 --- a/sys/netatm/uni/unisig_decode.c +++ b/sys/netatm/uni/unisig_decode.c @@ -75,29 +75,29 @@ __RCSID("@(#) $FreeBSD$"); /* * Local functions */ -static int usf_dec_ie __P((struct usfmt *, struct unisig_msg *, struct ie_generic *)); -static int usf_dec_ie_hdr __P((struct usfmt *, struct ie_generic *)); -static int usf_dec_ie_aalp __P((struct usfmt *, struct ie_generic *)); -static int usf_dec_ie_clrt __P((struct usfmt *, struct ie_generic *)); -static int usf_dec_ie_bbcp __P((struct usfmt *, struct ie_generic *)); -static int usf_dec_ie_bhli __P((struct usfmt *, struct ie_generic *)); -static int usf_dec_ie_blli __P((struct usfmt *, struct ie_generic *)); -static int usf_dec_ie_clst __P((struct usfmt *, struct ie_generic *)); -static int usf_dec_ie_cdad __P((struct usfmt *, struct ie_generic *)); -static int usf_dec_ie_cdsa __P((struct usfmt *, struct ie_generic *)); -static int usf_dec_ie_cgad __P((struct usfmt *, struct ie_generic *)); -static int usf_dec_ie_cgsa __P((struct usfmt *, struct ie_generic *)); -static int usf_dec_ie_caus __P((struct usfmt *, struct ie_generic *)); -static int usf_dec_ie_cnid __P((struct usfmt *, struct ie_generic *)); -static int usf_dec_ie_qosp __P((struct usfmt *, struct ie_generic *)); -static int usf_dec_ie_brpi __P((struct usfmt *, struct ie_generic *)); -static int usf_dec_ie_rsti __P((struct usfmt *, struct ie_generic *)); -static int usf_dec_ie_bsdc __P((struct usfmt *, struct ie_generic *)); -static int usf_dec_ie_trnt __P((struct usfmt *, struct ie_generic *)); -static int usf_dec_ie_uimp __P((struct usfmt *, struct ie_generic *)); -static int usf_dec_ie_ident __P((struct usfmt *, struct ie_generic *, - struct ie_decode_tbl *)); -static int usf_dec_atm_addr __P((struct usfmt *, Atm_addr *, int)); +static int usf_dec_ie(struct usfmt *, struct unisig_msg *, struct ie_generic *); +static int usf_dec_ie_hdr(struct usfmt *, struct ie_generic *); +static int usf_dec_ie_aalp(struct usfmt *, struct ie_generic *); +static int usf_dec_ie_clrt(struct usfmt *, struct ie_generic *); +static int usf_dec_ie_bbcp(struct usfmt *, struct ie_generic *); +static int usf_dec_ie_bhli(struct usfmt *, struct ie_generic *); +static int usf_dec_ie_blli(struct usfmt *, struct ie_generic *); +static int usf_dec_ie_clst(struct usfmt *, struct ie_generic *); +static int usf_dec_ie_cdad(struct usfmt *, struct ie_generic *); +static int usf_dec_ie_cdsa(struct usfmt *, struct ie_generic *); +static int usf_dec_ie_cgad(struct usfmt *, struct ie_generic *); +static int usf_dec_ie_cgsa(struct usfmt *, struct ie_generic *); +static int usf_dec_ie_caus(struct usfmt *, struct ie_generic *); +static int usf_dec_ie_cnid(struct usfmt *, struct ie_generic *); +static int usf_dec_ie_qosp(struct usfmt *, struct ie_generic *); +static int usf_dec_ie_brpi(struct usfmt *, struct ie_generic *); +static int usf_dec_ie_rsti(struct usfmt *, struct ie_generic *); +static int usf_dec_ie_bsdc(struct usfmt *, struct ie_generic *); +static int usf_dec_ie_trnt(struct usfmt *, struct ie_generic *); +static int usf_dec_ie_uimp(struct usfmt *, struct ie_generic *); +static int usf_dec_ie_ident(struct usfmt *, struct ie_generic *, + struct ie_decode_tbl *); +static int usf_dec_atm_addr(struct usfmt *, Atm_addr *, int); /* diff --git a/sys/netatm/uni/unisig_decode.h b/sys/netatm/uni/unisig_decode.h index 3a181f0..1e9a986 100644 --- a/sys/netatm/uni/unisig_decode.h +++ b/sys/netatm/uni/unisig_decode.h @@ -55,7 +55,7 @@ struct ie_ent { int max_len; /* Max. length */ int p_idx; /* IE pointer index in msg */ int (*decode) /* Decoding function */ - __P((struct usfmt *, struct ie_generic *)); + (struct usfmt *, struct ie_generic *); }; /* diff --git a/sys/netatm/uni/unisig_encode.c b/sys/netatm/uni/unisig_encode.c index 2b369c4..c514b4c 100644 --- a/sys/netatm/uni/unisig_encode.c +++ b/sys/netatm/uni/unisig_encode.c @@ -70,28 +70,28 @@ __RCSID("@(#) $FreeBSD$"); /* * Local functions */ -static int usf_enc_ie __P((struct usfmt *, struct ie_generic *)); -static int usf_enc_ie_aalp __P((struct usfmt *, struct ie_generic *)); -static int usf_enc_ie_clrt __P((struct usfmt *, struct ie_generic *)); -static int usf_enc_ie_bbcp __P((struct usfmt *, struct ie_generic *)); -static int usf_enc_ie_bhli __P((struct usfmt *, struct ie_generic *)); -static int usf_enc_ie_blli __P((struct usfmt *, struct ie_generic *)); -static int usf_enc_ie_clst __P((struct usfmt *, struct ie_generic *)); -static int usf_enc_ie_cdad __P((struct usfmt *, struct ie_generic *)); -static int usf_enc_ie_cdsa __P((struct usfmt *, struct ie_generic *)); -static int usf_enc_ie_cgad __P((struct usfmt *, struct ie_generic *)); -static int usf_enc_ie_cgsa __P((struct usfmt *, struct ie_generic *)); -static int usf_enc_ie_caus __P((struct usfmt *, struct ie_generic *)); -static int usf_enc_ie_cnid __P((struct usfmt *, struct ie_generic *)); -static int usf_enc_ie_qosp __P((struct usfmt *, struct ie_generic *)); -static int usf_enc_ie_brpi __P((struct usfmt *, struct ie_generic *)); -static int usf_enc_ie_rsti __P((struct usfmt *, struct ie_generic *)); -static int usf_enc_ie_bsdc __P((struct usfmt *, struct ie_generic *)); -static int usf_enc_ie_trnt __P((struct usfmt *, struct ie_generic *)); -static int usf_enc_ie_uimp __P((struct usfmt *, struct ie_generic *)); -static int usf_enc_ie_ident __P((struct usfmt *, struct ie_generic *, - struct ie_decode_tbl *)); -static int usf_enc_atm_addr __P((struct usfmt *, Atm_addr *)); +static int usf_enc_ie(struct usfmt *, struct ie_generic *); +static int usf_enc_ie_aalp(struct usfmt *, struct ie_generic *); +static int usf_enc_ie_clrt(struct usfmt *, struct ie_generic *); +static int usf_enc_ie_bbcp(struct usfmt *, struct ie_generic *); +static int usf_enc_ie_bhli(struct usfmt *, struct ie_generic *); +static int usf_enc_ie_blli(struct usfmt *, struct ie_generic *); +static int usf_enc_ie_clst(struct usfmt *, struct ie_generic *); +static int usf_enc_ie_cdad(struct usfmt *, struct ie_generic *); +static int usf_enc_ie_cdsa(struct usfmt *, struct ie_generic *); +static int usf_enc_ie_cgad(struct usfmt *, struct ie_generic *); +static int usf_enc_ie_cgsa(struct usfmt *, struct ie_generic *); +static int usf_enc_ie_caus(struct usfmt *, struct ie_generic *); +static int usf_enc_ie_cnid(struct usfmt *, struct ie_generic *); +static int usf_enc_ie_qosp(struct usfmt *, struct ie_generic *); +static int usf_enc_ie_brpi(struct usfmt *, struct ie_generic *); +static int usf_enc_ie_rsti(struct usfmt *, struct ie_generic *); +static int usf_enc_ie_bsdc(struct usfmt *, struct ie_generic *); +static int usf_enc_ie_trnt(struct usfmt *, struct ie_generic *); +static int usf_enc_ie_uimp(struct usfmt *, struct ie_generic *); +static int usf_enc_ie_ident(struct usfmt *, struct ie_generic *, + struct ie_decode_tbl *); +static int usf_enc_atm_addr(struct usfmt *, Atm_addr *); /* @@ -99,7 +99,7 @@ static int usf_enc_atm_addr __P((struct usfmt *, Atm_addr *)); */ static struct { u_char ident; /* IE identifier */ - int (*encode) __P((struct usfmt *, struct ie_generic *)); + int (*encode)(struct usfmt *, struct ie_generic *); /* Encoding function */ } ie_table[] = { { UNI_IE_AALP, usf_enc_ie_aalp }, diff --git a/sys/netatm/uni/unisig_if.c b/sys/netatm/uni/unisig_if.c index 9da98c6..3bb0698 100644 --- a/sys/netatm/uni/unisig_if.c +++ b/sys/netatm/uni/unisig_if.c @@ -101,14 +101,14 @@ struct sp_info unisig_iepool = { /* * Local functions */ -static int unisig_attach __P((struct sigmgr *, struct atm_pif *)); -static int unisig_detach __P((struct atm_pif *)); -static int unisig_setup __P((Atm_connvc *, int *)); -static int unisig_release __P((struct vccb *, int *)); -static int unisig_accept __P((struct vccb *, int *)); -static int unisig_reject __P((struct vccb *, int *)); -static int unisig_abort __P((struct vccb *)); -static int unisig_ioctl __P((int, caddr_t, caddr_t)); +static int unisig_attach(struct sigmgr *, struct atm_pif *); +static int unisig_detach(struct atm_pif *); +static int unisig_setup(Atm_connvc *, int *); +static int unisig_release(struct vccb *, int *); +static int unisig_accept(struct vccb *, int *); +static int unisig_reject(struct vccb *, int *); +static int unisig_abort(struct vccb *); +static int unisig_ioctl(int, caddr_t, caddr_t); /* diff --git a/sys/netatm/uni/unisig_msg.c b/sys/netatm/uni/unisig_msg.c index 542ce18..28347c9 100644 --- a/sys/netatm/uni/unisig_msg.c +++ b/sys/netatm/uni/unisig_msg.c @@ -69,8 +69,8 @@ __RCSID("@(#) $FreeBSD$"); /* * Local functions */ -static void unisig_rcv_restart __P((struct unisig *, struct unisig_msg *)); -static void unisig_rcv_setup __P((struct unisig *, struct unisig_msg *)); +static void unisig_rcv_restart(struct unisig *, struct unisig_msg *); +static void unisig_rcv_setup(struct unisig *, struct unisig_msg *); /* diff --git a/sys/netatm/uni/unisig_print.c b/sys/netatm/uni/unisig_print.c index a429da2..8db5bd6 100644 --- a/sys/netatm/uni/unisig_print.c +++ b/sys/netatm/uni/unisig_print.c @@ -70,30 +70,30 @@ struct type_name { /* * Local functions */ -static char * find_type __P((struct type_name *, u_char)); -static void usp_print_atm_addr __P((Atm_addr *)); -static void usp_print_ie __P((struct ie_generic *)); -static void usp_print_ie_aalp __P((struct ie_generic *)); -static void usp_print_ie_clrt __P((struct ie_generic *)); -static void usp_print_ie_bbcp __P((struct ie_generic *)); -static void usp_print_ie_bhli __P((struct ie_generic *)); -static void usp_print_ie_blli __P((struct ie_generic *)); -static void usp_print_ie_clst __P((struct ie_generic *)); -static void usp_print_ie_cdad __P((struct ie_generic *)); -static void usp_print_ie_cdsa __P((struct ie_generic *)); -static void usp_print_ie_cgad __P((struct ie_generic *)); -static void usp_print_ie_cgsa __P((struct ie_generic *)); -static void usp_print_ie_caus __P((struct ie_generic *)); -static void usp_print_ie_cnid __P((struct ie_generic *)); -static void usp_print_ie_qosp __P((struct ie_generic *)); -static void usp_print_ie_brpi __P((struct ie_generic *)); -static void usp_print_ie_rsti __P((struct ie_generic *)); -static void usp_print_ie_blsh __P((struct ie_generic *)); -static void usp_print_ie_bnsh __P((struct ie_generic *)); -static void usp_print_ie_bsdc __P((struct ie_generic *)); -static void usp_print_ie_trnt __P((struct ie_generic *)); -static void usp_print_ie_eprf __P((struct ie_generic *)); -static void usp_print_ie_epst __P((struct ie_generic *)); +static char * find_type(struct type_name *, u_char); +static void usp_print_atm_addr(Atm_addr *); +static void usp_print_ie(struct ie_generic *); +static void usp_print_ie_aalp(struct ie_generic *); +static void usp_print_ie_clrt(struct ie_generic *); +static void usp_print_ie_bbcp(struct ie_generic *); +static void usp_print_ie_bhli(struct ie_generic *); +static void usp_print_ie_blli(struct ie_generic *); +static void usp_print_ie_clst(struct ie_generic *); +static void usp_print_ie_cdad(struct ie_generic *); +static void usp_print_ie_cdsa(struct ie_generic *); +static void usp_print_ie_cgad(struct ie_generic *); +static void usp_print_ie_cgsa(struct ie_generic *); +static void usp_print_ie_caus(struct ie_generic *); +static void usp_print_ie_cnid(struct ie_generic *); +static void usp_print_ie_qosp(struct ie_generic *); +static void usp_print_ie_brpi(struct ie_generic *); +static void usp_print_ie_rsti(struct ie_generic *); +static void usp_print_ie_blsh(struct ie_generic *); +static void usp_print_ie_bnsh(struct ie_generic *); +static void usp_print_ie_bsdc(struct ie_generic *); +static void usp_print_ie_trnt(struct ie_generic *); +static void usp_print_ie_eprf(struct ie_generic *); +static void usp_print_ie_epst(struct ie_generic *); /* diff --git a/sys/netatm/uni/unisig_sigmgr_state.c b/sys/netatm/uni/unisig_sigmgr_state.c index f1ada5a..e5f331d 100644 --- a/sys/netatm/uni/unisig_sigmgr_state.c +++ b/sys/netatm/uni/unisig_sigmgr_state.c @@ -69,21 +69,21 @@ __RCSID("@(#) $FreeBSD$"); /* * Local functions */ -static int unisig_sigmgr_invalid __P((struct unisig *, KBuffer *)); -static int unisig_sigmgr_act01 __P((struct unisig *, KBuffer *)); -static int unisig_sigmgr_act02 __P((struct unisig *, KBuffer *)); -static int unisig_sigmgr_act03 __P((struct unisig *, KBuffer *)); -static int unisig_sigmgr_act04 __P((struct unisig *, KBuffer *)); -static int unisig_sigmgr_act05 __P((struct unisig *, KBuffer *)); -static int unisig_sigmgr_act06 __P((struct unisig *, KBuffer *)); -static int unisig_sigmgr_act07 __P((struct unisig *, KBuffer *)); -static int unisig_sigmgr_act08 __P((struct unisig *, KBuffer *)); -static int unisig_sigmgr_act09 __P((struct unisig *, KBuffer *)); -static int unisig_sigmgr_act10 __P((struct unisig *, KBuffer *)); -static int unisig_sigmgr_act11 __P((struct unisig *, KBuffer *)); -static int unisig_sigmgr_act12 __P((struct unisig *, KBuffer *)); -static int unisig_sigmgr_act13 __P((struct unisig *, KBuffer *)); -static int unisig_sigmgr_act14 __P((struct unisig *, KBuffer *)); +static int unisig_sigmgr_invalid(struct unisig *, KBuffer *); +static int unisig_sigmgr_act01(struct unisig *, KBuffer *); +static int unisig_sigmgr_act02(struct unisig *, KBuffer *); +static int unisig_sigmgr_act03(struct unisig *, KBuffer *); +static int unisig_sigmgr_act04(struct unisig *, KBuffer *); +static int unisig_sigmgr_act05(struct unisig *, KBuffer *); +static int unisig_sigmgr_act06(struct unisig *, KBuffer *); +static int unisig_sigmgr_act07(struct unisig *, KBuffer *); +static int unisig_sigmgr_act08(struct unisig *, KBuffer *); +static int unisig_sigmgr_act09(struct unisig *, KBuffer *); +static int unisig_sigmgr_act10(struct unisig *, KBuffer *); +static int unisig_sigmgr_act11(struct unisig *, KBuffer *); +static int unisig_sigmgr_act12(struct unisig *, KBuffer *); +static int unisig_sigmgr_act13(struct unisig *, KBuffer *); +static int unisig_sigmgr_act14(struct unisig *, KBuffer *); /* @@ -108,7 +108,7 @@ static int sigmgr_state_table[10][7] = { */ #define MAX_ACTION 15 static int (*unisig_sigmgr_act_vec[MAX_ACTION]) - __P((struct unisig *, KBuffer *)) = { + (struct unisig *, KBuffer *) = { unisig_sigmgr_invalid, unisig_sigmgr_act01, unisig_sigmgr_act02, diff --git a/sys/netatm/uni/unisig_var.h b/sys/netatm/uni/unisig_var.h index 92e8362..2105b21 100644 --- a/sys/netatm/uni/unisig_var.h +++ b/sys/netatm/uni/unisig_var.h @@ -53,7 +53,7 @@ struct unisig { struct siginst us_inst; /* Header */ struct atm_time us_time; /* Timer controls */ void (*us_lower) /* Lower command handler */ - __P((int, void *, int, int)); + (int, void *, int, int); Atm_connection *us_conn; /* Signalling connection */ int us_cref; /* Call reference allocation */ u_int us_retry; /* Protocol retry count */ @@ -215,100 +215,100 @@ struct usfmt; struct unisig_msg; /* unisig_decode.c */ -int usf_dec_msg __P((struct usfmt *, struct unisig_msg *)); +int usf_dec_msg(struct usfmt *, struct unisig_msg *); /* unisig_encode.c */ -int usf_enc_msg __P((struct usfmt *, struct unisig_msg *)); +int usf_enc_msg(struct usfmt *, struct unisig_msg *); /* unisig_if.c */ -int unisig_start __P((void)); -int unisig_stop __P((void)); -int unisig_free __P((struct vccb *)); +int unisig_start(void); +int unisig_stop(void); +int unisig_free(struct vccb *); /* unisig_mbuf.c */ -int usf_init __P((struct usfmt *, struct unisig *, KBuffer *, int, int)); -int usf_byte __P((struct usfmt *, u_char *)); -int usf_short __P((struct usfmt *, u_short *)); -int usf_int3 __P((struct usfmt *, u_int *)); -int usf_int __P((struct usfmt *, u_int *)); -int usf_ext __P((struct usfmt *, u_int *)); -int usf_count __P((struct usfmt *)); -int usf_byte_mark __P((struct usfmt *, u_char *, u_char **)); +int usf_init(struct usfmt *, struct unisig *, KBuffer *, int, int); +int usf_byte(struct usfmt *, u_char *); +int usf_short(struct usfmt *, u_short *); +int usf_int3(struct usfmt *, u_int *); +int usf_int(struct usfmt *, u_int *); +int usf_ext(struct usfmt *, u_int *); +int usf_count(struct usfmt *); +int usf_byte_mark(struct usfmt *, u_char *, u_char **); /* unisig_msg.c */ struct ie_generic; -void unisig_cause_from_attr __P((struct ie_generic *, - Atm_attributes *)); -void unisig_cause_from_msg __P((struct ie_generic *, - struct unisig_msg *, int)); -int unisig_send_msg __P((struct unisig *, - struct unisig_msg *)); -int unisig_send_setup __P((struct unisig *, - struct unisig_vccb *)); -int unisig_send_release __P((struct unisig *, +void unisig_cause_from_attr(struct ie_generic *, + Atm_attributes *); +void unisig_cause_from_msg(struct ie_generic *, + struct unisig_msg *, int); +int unisig_send_msg(struct unisig *, + struct unisig_msg *); +int unisig_send_setup(struct unisig *, + struct unisig_vccb *); +int unisig_send_release(struct unisig *, struct unisig_vccb *, struct unisig_msg *, - int)); -int unisig_send_release_complete __P((struct unisig *, + int); +int unisig_send_release_complete(struct unisig *, struct unisig_vccb *, struct unisig_msg *, - int)); -int unisig_send_status __P((struct unisig *, + int); +int unisig_send_status(struct unisig *, struct unisig_vccb *, struct unisig_msg *, - int)); -int unisig_rcv_msg __P((struct unisig *, KBuffer *)); + int); +int unisig_rcv_msg(struct unisig *, KBuffer *); /* unisig_print.c */ -void usp_print_msg __P((struct unisig_msg *, int)); +void usp_print_msg(struct unisig_msg *, int); /* unisig_proto.c */ -void unisig_timer __P((struct atm_time *)); -void unisig_vctimer __P((struct atm_time *)); -void unisig_saal_ctl __P((int, void *, void *)); -void unisig_saal_data __P((void *, KBuffer *)); -caddr_t unisig_getname __P((void *)); -void unisig_connected __P((void *)); -void unisig_cleared __P((void *, struct t_atm_cause *)); +void unisig_timer(struct atm_time *); +void unisig_vctimer(struct atm_time *); +void unisig_saal_ctl(int, void *, void *); +void unisig_saal_data(void *, KBuffer *); +caddr_t unisig_getname(void *); +void unisig_connected(void *); +void unisig_cleared(void *, struct t_atm_cause *); /* unisig_sigmgr_state.c */ -int unisig_sigmgr_state __P((struct unisig *, int, - KBuffer *)); +int unisig_sigmgr_state(struct unisig *, int, + KBuffer *); /* unisig_subr.c */ -void unisig_cause_attr_from_user __P((Atm_attributes *, int)); -void unisig_cause_attr_from_ie __P((Atm_attributes *, - struct ie_generic *)); -int unisig_open_vcc __P((struct unisig *, Atm_connvc *)); -int unisig_close_vcc __P((struct unisig *, - struct unisig_vccb *)); -int unisig_clear_vcc __P((struct unisig *, - struct unisig_vccb *, int)); -void unisig_switch_reset __P((struct unisig *, int)); -void unisig_save_attrs __P((struct unisig *, struct unisig_msg *, - Atm_attributes *)); -int unisig_set_attrs __P((struct unisig *, struct unisig_msg *, - Atm_attributes *)); +void unisig_cause_attr_from_user(Atm_attributes *, int); +void unisig_cause_attr_from_ie(Atm_attributes *, + struct ie_generic *); +int unisig_open_vcc(struct unisig *, Atm_connvc *); +int unisig_close_vcc(struct unisig *, + struct unisig_vccb *); +int unisig_clear_vcc(struct unisig *, + struct unisig_vccb *, int); +void unisig_switch_reset(struct unisig *, int); +void unisig_save_attrs(struct unisig *, struct unisig_msg *, + Atm_attributes *); +int unisig_set_attrs(struct unisig *, struct unisig_msg *, + Atm_attributes *); /* unisig_util.c */ -void unisig_free_msg __P((struct unisig_msg *)); -int unisig_verify_vccb __P((struct unisig *, - struct unisig_vccb *)); +void unisig_free_msg(struct unisig_msg *); +int unisig_verify_vccb(struct unisig *, + struct unisig_vccb *); struct unisig_vccb * - unisig_find_conn __P((struct unisig *, u_int)); + unisig_find_conn(struct unisig *, u_int); struct unisig_vccb * - unisig_find_vpvc __P((struct unisig *, int, int, - u_char)); -int unisig_alloc_call_ref __P((struct unisig *)); -char * unisig_addr_print __P((Atm_addr *)); -void unisig_print_mbuf __P((KBuffer *)); -void unisig_print_buffer __P((KBuffer *)); + unisig_find_vpvc(struct unisig *, int, int, + u_char); +int unisig_alloc_call_ref(struct unisig *); +char * unisig_addr_print(Atm_addr *); +void unisig_print_mbuf(KBuffer *); +void unisig_print_buffer(KBuffer *); /* unisig_vc_state.c */ -int unisig_vc_state __P((struct unisig *, +int unisig_vc_state(struct unisig *, struct unisig_vccb *, int, - struct unisig_msg *)); + struct unisig_msg *); /* diff --git a/sys/netatm/uni/unisig_vc_state.c b/sys/netatm/uni/unisig_vc_state.c index 0c67bf6..b35eb47 100644 --- a/sys/netatm/uni/unisig_vc_state.c +++ b/sys/netatm/uni/unisig_vc_state.c @@ -68,74 +68,74 @@ __RCSID("@(#) $FreeBSD$"); /* * Local functions */ -static int unisig_vc_invalid __P((struct unisig *, struct unisig_vccb *, - struct unisig_msg *)); -static int unisig_vc_act01 __P((struct unisig *, struct unisig_vccb *, - struct unisig_msg *)); -static int unisig_vc_act02 __P((struct unisig *, struct unisig_vccb *, - struct unisig_msg *)); -static int unisig_vc_act03 __P((struct unisig *, struct unisig_vccb *, - struct unisig_msg *)); -static int unisig_vc_act04 __P((struct unisig *, struct unisig_vccb *, - struct unisig_msg *)); -static int unisig_vc_act05 __P((struct unisig *, struct unisig_vccb *, - struct unisig_msg *)); -static int unisig_vc_act06 __P((struct unisig *, struct unisig_vccb *, - struct unisig_msg *)); -static int unisig_vc_act07 __P((struct unisig *, struct unisig_vccb *, - struct unisig_msg *)); -static int unisig_vc_act08 __P((struct unisig *, struct unisig_vccb *, - struct unisig_msg *)); -static int unisig_vc_act09 __P((struct unisig *, struct unisig_vccb *, - struct unisig_msg *)); -static int unisig_vc_act10 __P((struct unisig *, struct unisig_vccb *, - struct unisig_msg *)); -static int unisig_vc_act11 __P((struct unisig *, struct unisig_vccb *, - struct unisig_msg *)); -static int unisig_vc_act12 __P((struct unisig *, struct unisig_vccb *, - struct unisig_msg *)); -static int unisig_vc_act13 __P((struct unisig *, struct unisig_vccb *, - struct unisig_msg *)); -static int unisig_vc_act14 __P((struct unisig *, struct unisig_vccb *, - struct unisig_msg *)); -static int unisig_vc_act15 __P((struct unisig *, struct unisig_vccb *, - struct unisig_msg *)); -static int unisig_vc_act16 __P((struct unisig *, struct unisig_vccb *, - struct unisig_msg *)); -static int unisig_vc_act17 __P((struct unisig *, struct unisig_vccb *, - struct unisig_msg *)); -static int unisig_vc_act18 __P((struct unisig *, struct unisig_vccb *, - struct unisig_msg *)); -static int unisig_vc_act19 __P((struct unisig *, struct unisig_vccb *, - struct unisig_msg *)); -static int unisig_vc_act20 __P((struct unisig *, struct unisig_vccb *, - struct unisig_msg *)); -static int unisig_vc_act21 __P((struct unisig *, struct unisig_vccb *, - struct unisig_msg *)); -static int unisig_vc_act22 __P((struct unisig *, struct unisig_vccb *, - struct unisig_msg *)); -static int unisig_vc_act23 __P((struct unisig *, struct unisig_vccb *, - struct unisig_msg *)); -static int unisig_vc_act24 __P((struct unisig *, struct unisig_vccb *, - struct unisig_msg *)); -static int unisig_vc_act25 __P((struct unisig *, struct unisig_vccb *, - struct unisig_msg *)); -static int unisig_vc_act26 __P((struct unisig *, struct unisig_vccb *, - struct unisig_msg *)); -static int unisig_vc_act27 __P((struct unisig *, struct unisig_vccb *, - struct unisig_msg *)); -static int unisig_vc_act28 __P((struct unisig *, struct unisig_vccb *, - struct unisig_msg *)); -static int unisig_vc_act29 __P((struct unisig *, struct unisig_vccb *, - struct unisig_msg *)); -static int unisig_vc_act30 __P((struct unisig *, struct unisig_vccb *, - struct unisig_msg *)); -static int unisig_vc_act31 __P((struct unisig *, struct unisig_vccb *, - struct unisig_msg *)); -static int unisig_vc_clear_call __P((struct unisig *, +static int unisig_vc_invalid(struct unisig *, struct unisig_vccb *, + struct unisig_msg *); +static int unisig_vc_act01(struct unisig *, struct unisig_vccb *, + struct unisig_msg *); +static int unisig_vc_act02(struct unisig *, struct unisig_vccb *, + struct unisig_msg *); +static int unisig_vc_act03(struct unisig *, struct unisig_vccb *, + struct unisig_msg *); +static int unisig_vc_act04(struct unisig *, struct unisig_vccb *, + struct unisig_msg *); +static int unisig_vc_act05(struct unisig *, struct unisig_vccb *, + struct unisig_msg *); +static int unisig_vc_act06(struct unisig *, struct unisig_vccb *, + struct unisig_msg *); +static int unisig_vc_act07(struct unisig *, struct unisig_vccb *, + struct unisig_msg *); +static int unisig_vc_act08(struct unisig *, struct unisig_vccb *, + struct unisig_msg *); +static int unisig_vc_act09(struct unisig *, struct unisig_vccb *, + struct unisig_msg *); +static int unisig_vc_act10(struct unisig *, struct unisig_vccb *, + struct unisig_msg *); +static int unisig_vc_act11(struct unisig *, struct unisig_vccb *, + struct unisig_msg *); +static int unisig_vc_act12(struct unisig *, struct unisig_vccb *, + struct unisig_msg *); +static int unisig_vc_act13(struct unisig *, struct unisig_vccb *, + struct unisig_msg *); +static int unisig_vc_act14(struct unisig *, struct unisig_vccb *, + struct unisig_msg *); +static int unisig_vc_act15(struct unisig *, struct unisig_vccb *, + struct unisig_msg *); +static int unisig_vc_act16(struct unisig *, struct unisig_vccb *, + struct unisig_msg *); +static int unisig_vc_act17(struct unisig *, struct unisig_vccb *, + struct unisig_msg *); +static int unisig_vc_act18(struct unisig *, struct unisig_vccb *, + struct unisig_msg *); +static int unisig_vc_act19(struct unisig *, struct unisig_vccb *, + struct unisig_msg *); +static int unisig_vc_act20(struct unisig *, struct unisig_vccb *, + struct unisig_msg *); +static int unisig_vc_act21(struct unisig *, struct unisig_vccb *, + struct unisig_msg *); +static int unisig_vc_act22(struct unisig *, struct unisig_vccb *, + struct unisig_msg *); +static int unisig_vc_act23(struct unisig *, struct unisig_vccb *, + struct unisig_msg *); +static int unisig_vc_act24(struct unisig *, struct unisig_vccb *, + struct unisig_msg *); +static int unisig_vc_act25(struct unisig *, struct unisig_vccb *, + struct unisig_msg *); +static int unisig_vc_act26(struct unisig *, struct unisig_vccb *, + struct unisig_msg *); +static int unisig_vc_act27(struct unisig *, struct unisig_vccb *, + struct unisig_msg *); +static int unisig_vc_act28(struct unisig *, struct unisig_vccb *, + struct unisig_msg *); +static int unisig_vc_act29(struct unisig *, struct unisig_vccb *, + struct unisig_msg *); +static int unisig_vc_act30(struct unisig *, struct unisig_vccb *, + struct unisig_msg *); +static int unisig_vc_act31(struct unisig *, struct unisig_vccb *, + struct unisig_msg *); +static int unisig_vc_clear_call(struct unisig *, struct unisig_vccb *, struct unisig_msg *, - int)); + int); /* @@ -176,8 +176,8 @@ static int unisig_vc_states[21][17] = { */ #define MAX_ACTION 32 static int (*unisig_vc_act_vec[MAX_ACTION]) - __P((struct unisig *, struct unisig_vccb *, - struct unisig_msg *)) = { + (struct unisig *, struct unisig_vccb *, + struct unisig_msg *) = { unisig_vc_invalid, unisig_vc_act01, unisig_vc_act02, |
