Module Name: src
Committed By: msaitoh
Date: Thu Jun 13 07:22:45 UTC 2013
Modified Files:
src/sys/dev/ic [netbsd-6]: iavc.c
src/sys/netisdn [netbsd-6]: i4b_capi.h i4b_capi_llif.c
Log Message:
Pull up following revision(s) (requested by martin in ticket #896):
sys/dev/ic/iavc.c: revision 1.10
sys/netisdn/i4b_capi_llif.c: revision 1.6
sys/netisdn/i4b_capi.h: revision 1.6
Fix signature of capi_ll_control.
>From Wolfgang Stukenbrock in PR kern/47863.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.20.1 src/sys/dev/ic/iavc.c
cvs rdiff -u -r1.5 -r1.5.94.1 src/sys/netisdn/i4b_capi.h
cvs rdiff -u -r1.5 -r1.5.18.1 src/sys/netisdn/i4b_capi_llif.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/iavc.c
diff -u src/sys/dev/ic/iavc.c:1.8 src/sys/dev/ic/iavc.c:1.8.20.1
--- src/sys/dev/ic/iavc.c:1.8 Fri Jan 23 19:49:16 2009
+++ src/sys/dev/ic/iavc.c Thu Jun 13 07:22:44 2013
@@ -1,4 +1,4 @@
-/* $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.
@@ -30,7 +30,7 @@
*/
#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>
@@ -621,7 +621,7 @@ static int iavc_receive_init(iavc_softc_
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));
Index: src/sys/netisdn/i4b_capi.h
diff -u src/sys/netisdn/i4b_capi.h:1.5 src/sys/netisdn/i4b_capi.h:1.5.94.1
--- src/sys/netisdn/i4b_capi.h:1.5 Mon Oct 16 13:03:03 2006
+++ src/sys/netisdn/i4b_capi.h Thu Jun 13 07:22:44 2013
@@ -1,4 +1,4 @@
-/* $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.
@@ -119,7 +119,7 @@ typedef struct capi_softc {
#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 */
Index: src/sys/netisdn/i4b_capi_llif.c
diff -u src/sys/netisdn/i4b_capi_llif.c:1.5 src/sys/netisdn/i4b_capi_llif.c:1.5.18.1
--- src/sys/netisdn/i4b_capi_llif.c:1.5 Sat Apr 18 14:58:06 2009
+++ src/sys/netisdn/i4b_capi_llif.c Thu Jun 13 07:22:44 2013
@@ -1,4 +1,4 @@
-/* $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.
@@ -30,7 +30,7 @@
*/
#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>
@@ -57,7 +57,7 @@ __KERNEL_RCSID(0, "$NetBSD: i4b_capi_lli
*/
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:
