From c4beb9648d466004a5413cce893a7116cb3324e0 Mon Sep 17 00:00:00 2001
From: itojun <itojun@NetBSD.org>
Date: Fri, 3 Oct 2003 23:27:31 +0000
Subject: [PATCH] sync w/ header file changes

---
 usr.sbin/isdn/daicctl/main.c     | 4 ++--
 usr.sbin/isdn/isdnd/controller.c | 4 ++--
 usr.sbin/isdn/isdntrace/trace.c  | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/usr.sbin/isdn/daicctl/main.c b/usr.sbin/isdn/daicctl/main.c
index c5f09f6f3e29..6fdab59d1867 100644
--- a/usr.sbin/isdn/daicctl/main.c
+++ b/usr.sbin/isdn/daicctl/main.c
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.5 2002/04/14 11:41:43 martin Exp $ */
+/* $NetBSD: main.c,v 1.6 2003/10/03 23:27:31 itojun Exp $ */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -146,7 +146,7 @@ listall(int fd)
 
 	memset(&info, 0, sizeof info);
 	ioctl(fd, I4B_CTRL_INFO_REQ, &info);
-	num = info.maxbri;
+	num = info.max_isdnif;
 	printf("There are %d controllers available:\n", info.ncontroller);
 	for (i = 0; i <= num; i++) {
 		info.controller = i;
diff --git a/usr.sbin/isdn/isdnd/controller.c b/usr.sbin/isdn/isdnd/controller.c
index 23a0a770522d..d6b73d557bd9 100644
--- a/usr.sbin/isdn/isdnd/controller.c
+++ b/usr.sbin/isdn/isdnd/controller.c
@@ -27,7 +27,7 @@
  *	i4b daemon - controller state support routines
  *	----------------------------------------------
  *
- *	$Id: controller.c,v 1.6 2003/09/05 13:31:03 pooka Exp $
+ *	$Id: controller.c,v 1.7 2003/10/03 23:27:31 itojun Exp $
  *
  * $FreeBSD$
  *
@@ -84,7 +84,7 @@ init_controller(void)
 		if((ioctl(isdnfd, I4B_CTRL_INFO_REQ, &mcir)) < 0)
 			continue;
 
-		max = mcir.maxbri;
+		max = mcir.max_isdnif;
 
 		/* init controller tab */
 
diff --git a/usr.sbin/isdn/isdntrace/trace.c b/usr.sbin/isdn/isdntrace/trace.c
index 2c0eeefc8d6a..220e37a91b4e 100644
--- a/usr.sbin/isdn/isdntrace/trace.c
+++ b/usr.sbin/isdn/isdntrace/trace.c
@@ -35,7 +35,7 @@
  *	trace.c - print traces of D (B) channel activity for isdn4bsd
  *	-------------------------------------------------------------
  *
- *	$Id: trace.c,v 1.4 2003/05/08 08:32:39 martin Exp $ 
+ *	$Id: trace.c,v 1.5 2003/10/03 23:27:31 itojun Exp $ 
  *
  * $FreeBSD$
  *
@@ -481,7 +481,7 @@ fmt_hdr(struct i4b_trace_hdr *hdr, int frm_len)
 	{
 		sprintf(hbuf,"\n-- %s - bri:%d ---------------- time:%2.2d.%2.2d %2.2d:%2.2d:%2.2d.%06u ",
 			((hdr->dir) ? "NT->TE" : "TE->NT"),
-			hdr->bri,
+			hdr->isdnif,
 			s->tm_mday,
 			s->tm_mon + 1,
 			s->tm_hour,
@@ -495,7 +495,7 @@ fmt_hdr(struct i4b_trace_hdr *hdr, int frm_len)
 		{
 			sprintf(hbuf,"\n-- %s - bri:%d - frame:%6.6u - time:%2.2d.%2.2d %2.2d:%2.2d:%2.2d.%06u - length:%d (%d) ",
 				((hdr->dir) ? "NT->TE" : "TE->NT"),
-				hdr->bri,
+				hdr->isdnif,
 				hdr->count,
 				s->tm_mday,
 				s->tm_mon + 1,
@@ -510,7 +510,7 @@ fmt_hdr(struct i4b_trace_hdr *hdr, int frm_len)
 		{
 			sprintf(hbuf,"\n-- %s - bri:%d - frame:%6.6u - time:%2.2d.%2.2d %2.2d:%2.2d:%2.2d.%06u - length:%d ",
 				((hdr->dir) ? "NT->TE" : "TE->NT"),
-				hdr->bri,
+				hdr->isdnif,
 				hdr->count,
 				s->tm_mday,
 				s->tm_mon + 1,