 @@ -1,14 +1,14 @@
-/*	$NetBSD: iavc.c,v 1.8 2009/01/23 19:49:16 christos Exp $	*/
+/*	$NetBSD: iavc.c,v 1.8.20.1 2013/06/13 07:22:44 msaitoh Exp $	*/
 /*
  * Copyright (c) 2001-2003 Cubical Solutions Ltd. All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -20,27 +20,27 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	The AVM ISDN controllers' card specific support routines.
+ *
  * $FreeBSD: src/sys/i4b/capi/iavc/iavc_card.c,v 1.1.2.1 2001/08/10 14:08:34 obrien Exp $
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iavc.c,v 1.8 2009/01/23 19:49:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iavc.c,v 1.8.20.1 2013/06/13 07:22:44 msaitoh Exp $");
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/device.h>
 #include <sys/callout.h>
 #include <sys/reboot.h>
 #include <net/if.h>
 #include <sys/bus.h>
 @@ -611,27 +611,27 @@ static int iavc_receive_init(iavc_softc_
     caps = (p + 1);
     p += (*p + 1); /* supported options */
     prot = (p + 1);
     p += (*p + 1); /* supported protocols */
     profile = (p + 1);
     if (cardtype && serial && profile) {
 	int nbch = ((profile[3]<<8) | profile[2]);
 	aprint_normal_dev(&sc->sc_dev, "AVM %s, s/n %s, %d chans, f/w rev %s, prot %s\n",
 		cardtype, serial, nbch, vers, prot);
 	aprint_verbose_dev(&sc->sc_dev, "%s\n", caps);
-        capi_ll_control(&sc->sc_capi, CAPI_CTRL_PROFILE, (int) profile);
+        capi_ll_control(&sc->sc_capi, CAPI_CTRL_PROFILE, (intptr_t) profile);
     } else {
 	printf("%s: no profile data in info response?\n", device_xname(&sc->sc_dev));
+    }
     sc->sc_blocked = 1; /* controller will send START when ready */
     return 0;
+}
 static int iavc_receive_start(iavc_softc_t *sc)
+{
     struct mbuf *m = i4b_Dgetmbuf(3);
     u_int8_t *p;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: i4b_capi.h,v 1.5 2006/10/16 13:03:03 pooka Exp $	*/
+/*	$NetBSD: i4b_capi.h,v 1.5.94.1 2013/06/13 07:22:44 msaitoh Exp $	*/
 /*
  * Copyright (c) 2001-2003 Cubical Solutions Ltd. All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -109,26 +109,26 @@ typedef struct capi_softc {
 #define CARD_TYPEC_CAPI_UNK	0
 #define CARD_TYPEC_AVM_T1_PCI	1
 #define CARD_TYPEC_AVM_B1_PCI	2
 #define CARD_TYPEC_AVM_B1_ISA	3
 /*
 //  CAPI upcalls for the link layer.
 */
 #define I4BCAPI_APPLID 1
 extern int capi_ll_attach(capi_softc_t *, const char *, const char *);
-extern int capi_ll_control(capi_softc_t *, int op, int arg);
+extern int capi_ll_control(capi_softc_t *, int op, intptr_t arg);
 extern int capi_ll_detach(capi_softc_t *);
 #define CAPI_CTRL_READY     0 /* ctrl ready, value=TRUE/FALSE */
 #define CAPI_CTRL_PROFILE   1 /* set CAPI profile             */
 #define CAPI_CTRL_NEW_NCCI  2 /* new ncci value, assign bchan */
 #define CAPI_CTRL_FREE_NCCI 3 /* free ncci value, clear bchan */
 extern int capi_ll_receive(capi_softc_t *, struct mbuf *);
 extern int capi_start_tx(void *, int bchan);
 #endif /* !_NETISDN_I4B_CAPI_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: i4b_capi_llif.c,v 1.5 2009/04/18 14:58:06 tsutsui Exp $	*/
+/*	$NetBSD: i4b_capi_llif.c,v 1.5.18.1 2013/06/13 07:22:44 msaitoh Exp $	*/
 /*
  * Copyright (c) 2001 Cubical Solutions Ltd. All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -20,54 +20,54 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  * capi/capi_llif.c	The i4b CAPI link layer interface.
+ *
  * $FreeBSD: src/sys/i4b/capi/capi_llif.c,v 1.1 2001/05/25 08:39:31 hm Exp $
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i4b_capi_llif.c,v 1.5 2009/04/18 14:58:06 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i4b_capi_llif.c,v 1.5.18.1 2013/06/13 07:22:44 msaitoh Exp $");
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/callout.h>
 #include <net/if.h>
 #include <netisdn/i4b_debug.h>
 #include <netisdn/i4b_ioctl.h>
 #include <netisdn/i4b_cause.h>
 #include <netisdn/i4b_l3l4.h>
 #include <netisdn/i4b_mbuf.h>
 #include <netisdn/i4b_global.h>
 #include <netisdn/i4b_l4.h>
 #include <netisdn/i4b_capi.h>
 #include <netisdn/i4b_capi_msgs.h>
 /*
 //  capi_ll_control
 //      CAPI link layer control routine. Called by a link layer
 //      driver when its state changes.
 */
 int
-capi_ll_control(capi_softc_t *sc, int op, int arg)
+capi_ll_control(capi_softc_t *sc, int op, intptr_t arg)
+{
     switch (op) {
     case CAPI_CTRL_READY:
 	if (arg) {
 	    sc->sc_state = C_READY;
 	    /*
 	     *  Register our CAPI ApplId and send CAPI_LISTEN_REQ
 	     *  with CIP Mask value 1 (match all).
 	     */
 	    sc->reg_appl(sc, I4BCAPI_APPLID, sc->sc_nbch);
 	    capi_listen_req(sc, 0x10007);