Module Name: src
Committed By: cegger
Date: Tue May 12 12:10:46 UTC 2009
Modified Files:
src/sys/dev/bluetooth: bcsp.c bthidev.c bthub.c btkbd.c btms.c btsco.c
btuart.c
Log Message:
struct cfdata * -> cfdata_t, no functional changes intended.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/bluetooth/bcsp.c
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/bluetooth/bthidev.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/bluetooth/bthub.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/bluetooth/btkbd.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/bluetooth/btms.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/bluetooth/btsco.c \
src/sys/dev/bluetooth/btuart.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/bluetooth/bcsp.c
diff -u src/sys/dev/bluetooth/bcsp.c:1.17 src/sys/dev/bluetooth/bcsp.c:1.18
--- src/sys/dev/bluetooth/bcsp.c:1.17 Thu May 7 18:01:57 2009
+++ src/sys/dev/bluetooth/bcsp.c Tue May 12 12:10:46 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: bcsp.c,v 1.17 2009/05/07 18:01:57 elad Exp $ */
+/* $NetBSD: bcsp.c,v 1.18 2009/05/12 12:10:46 cegger Exp $ */
/*
* Copyright (c) 2007 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcsp.c,v 1.17 2009/05/07 18:01:57 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcsp.c,v 1.18 2009/05/12 12:10:46 cegger Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -132,7 +132,7 @@
#define BCSP_ENABLED (1 << 1) /* is enabled */
void bcspattach(int);
-static int bcsp_match(device_t, struct cfdata *, void *);
+static int bcsp_match(device_t, cfdata_t, void *);
static void bcsp_attach(device_t, device_t, void *);
static int bcsp_detach(device_t, int);
@@ -246,7 +246,7 @@
*/
/* ARGSUSED */
static int
-bcsp_match(device_t self __unused, struct cfdata *cfdata __unused,
+bcsp_match(device_t self __unused, cfdata_t cfdata __unused,
void *arg __unused)
{
@@ -373,7 +373,7 @@
{
struct bcsp_softc *sc;
device_t dev;
- struct cfdata *cfdata;
+ cfdata_t cfdata;
struct lwp *l = curlwp; /* XXX */
int error, unit, s;
static char name[] = "bcsp";
@@ -436,7 +436,7 @@
bcspclose(struct tty *tp, int flag __unused)
{
struct bcsp_softc *sc = tp->t_sc;
- struct cfdata *cfdata;
+ cfdata_t cfdata;
int s;
/* terminate link-establishment */
Index: src/sys/dev/bluetooth/bthidev.c
diff -u src/sys/dev/bluetooth/bthidev.c:1.16 src/sys/dev/bluetooth/bthidev.c:1.17
--- src/sys/dev/bluetooth/bthidev.c:1.16 Wed Aug 6 15:01:23 2008
+++ src/sys/dev/bluetooth/bthidev.c Tue May 12 12:10:46 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: bthidev.c,v 1.16 2008/08/06 15:01:23 plunky Exp $ */
+/* $NetBSD: bthidev.c,v 1.17 2009/05/12 12:10:46 cegger Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bthidev.c,v 1.16 2008/08/06 15:01:23 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bthidev.c,v 1.17 2009/05/12 12:10:46 cegger Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -109,7 +109,7 @@
static void bthidev_null(struct bthidev *, uint8_t *, int);
/* autoconf(9) glue */
-static int bthidev_match(device_t, struct cfdata *, void *);
+static int bthidev_match(device_t, cfdata_t, void *);
static void bthidev_attach(device_t, device_t, void *);
static int bthidev_detach(device_t, int);
static int bthidev_print(void *, const char *);
@@ -155,7 +155,7 @@
*/
static int
-bthidev_match(device_t self, struct cfdata *cfdata, void *aux)
+bthidev_match(device_t self, cfdata_t cfdata, void *aux)
{
prop_dictionary_t dict = aux;
prop_object_t obj;
Index: src/sys/dev/bluetooth/bthub.c
diff -u src/sys/dev/bluetooth/bthub.c:1.14 src/sys/dev/bluetooth/bthub.c:1.15
--- src/sys/dev/bluetooth/bthub.c:1.14 Thu Jun 12 21:47:11 2008
+++ src/sys/dev/bluetooth/bthub.c Tue May 12 12:10:46 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: bthub.c,v 1.14 2008/06/12 21:47:11 cegger Exp $ */
+/* $NetBSD: bthub.c,v 1.15 2009/05/12 12:10:46 cegger Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bthub.c,v 1.14 2008/06/12 21:47:11 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bthub.c,v 1.15 2009/05/12 12:10:46 cegger Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -59,7 +59,7 @@
*/
/* autoconf(9) glue */
-static int bthub_match(device_t, struct cfdata *, void *);
+static int bthub_match(device_t, cfdata_t, void *);
static void bthub_attach(device_t, device_t, void *);
static int bthub_detach(device_t, int);
@@ -86,7 +86,7 @@
*/
static int
-bthub_match(device_t self, struct cfdata *cfdata, void *arg)
+bthub_match(device_t self, cfdata_t cfdata, void *arg)
{
return 1;
Index: src/sys/dev/bluetooth/btkbd.c
diff -u src/sys/dev/bluetooth/btkbd.c:1.10 src/sys/dev/bluetooth/btkbd.c:1.11
--- src/sys/dev/bluetooth/btkbd.c:1.10 Tue Sep 9 03:54:56 2008
+++ src/sys/dev/bluetooth/btkbd.c Tue May 12 12:10:46 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: btkbd.c,v 1.10 2008/09/09 03:54:56 cube Exp $ */
+/* $NetBSD: btkbd.c,v 1.11 2009/05/12 12:10:46 cegger Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btkbd.c,v 1.10 2008/09/09 03:54:56 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btkbd.c,v 1.11 2009/05/12 12:10:46 cegger Exp $");
#include <sys/param.h>
#include <sys/callout.h>
@@ -144,7 +144,7 @@
};
/* autoconf(9) methods */
-static int btkbd_match(device_t, struct cfdata *, void *);
+static int btkbd_match(device_t, cfdata_t, void *);
static void btkbd_attach(device_t, device_t, void *);
static int btkbd_detach(device_t, int);
@@ -194,7 +194,7 @@
*/
static int
-btkbd_match(device_t self, struct cfdata *cfdata, void *aux)
+btkbd_match(device_t self, cfdata_t cfdata, void *aux)
{
struct bthidev_attach_args *ba = aux;
Index: src/sys/dev/bluetooth/btms.c
diff -u src/sys/dev/bluetooth/btms.c:1.8 src/sys/dev/bluetooth/btms.c:1.9
--- src/sys/dev/bluetooth/btms.c:1.8 Tue Sep 9 03:54:56 2008
+++ src/sys/dev/bluetooth/btms.c Tue May 12 12:10:46 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: btms.c,v 1.8 2008/09/09 03:54:56 cube Exp $ */
+/* $NetBSD: btms.c,v 1.9 2009/05/12 12:10:46 cegger Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btms.c,v 1.8 2008/09/09 03:54:56 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btms.c,v 1.9 2009/05/12 12:10:46 cegger Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -114,7 +114,7 @@
#define BTMS_HASW (1 << 2) /* has W direction */
/* autoconf(9) methods */
-static int btms_match(device_t, struct cfdata *, void *);
+static int btms_match(device_t, cfdata_t, void *);
static void btms_attach(device_t, device_t, void *);
static int btms_detach(device_t, int);
@@ -141,7 +141,7 @@
*/
static int
-btms_match(device_t parent, struct cfdata *match, void *aux)
+btms_match(device_t parent, cfdata_t match, void *aux)
{
struct bthidev_attach_args *ba = aux;
Index: src/sys/dev/bluetooth/btsco.c
diff -u src/sys/dev/bluetooth/btsco.c:1.22 src/sys/dev/bluetooth/btsco.c:1.23
--- src/sys/dev/bluetooth/btsco.c:1.22 Wed Aug 6 15:01:23 2008
+++ src/sys/dev/bluetooth/btsco.c Tue May 12 12:10:46 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: btsco.c,v 1.22 2008/08/06 15:01:23 plunky Exp $ */
+/* $NetBSD: btsco.c,v 1.23 2009/05/12 12:10:46 cegger Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btsco.c,v 1.22 2008/08/06 15:01:23 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btsco.c,v 1.23 2009/05/12 12:10:46 cegger Exp $");
#include <sys/param.h>
#include <sys/audioio.h>
@@ -134,7 +134,7 @@
#define BTSCO_LISTEN (1 << 1)
/* autoconf(9) glue */
-static int btsco_match(device_t, struct cfdata *, void *);
+static int btsco_match(device_t, cfdata_t, void *);
static void btsco_attach(device_t, device_t, void *);
static int btsco_detach(device_t, int);
@@ -259,7 +259,7 @@
*/
static int
-btsco_match(device_t self, struct cfdata *cfdata, void *aux)
+btsco_match(device_t self, cfdata_t cfdata, void *aux)
{
prop_dictionary_t dict = aux;
prop_object_t obj;
Index: src/sys/dev/bluetooth/btuart.c
diff -u src/sys/dev/bluetooth/btuart.c:1.22 src/sys/dev/bluetooth/btuart.c:1.23
--- src/sys/dev/bluetooth/btuart.c:1.22 Thu May 7 18:01:57 2009
+++ src/sys/dev/bluetooth/btuart.c Tue May 12 12:10:46 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: btuart.c,v 1.22 2009/05/07 18:01:57 elad Exp $ */
+/* $NetBSD: btuart.c,v 1.23 2009/05/12 12:10:46 cegger Exp $ */
/*-
* Copyright (c) 2006, 2007 KIYOHARA Takashi
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btuart.c,v 1.22 2009/05/07 18:01:57 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btuart.c,v 1.23 2009/05/12 12:10:46 cegger Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -82,7 +82,7 @@
#define BTUART_RECV_EVENT_DATA 6 /* event packet data */
void btuartattach(int);
-static int btuart_match(device_t, struct cfdata *, void *);
+static int btuart_match(device_t, cfdata_t, void *);
static void btuart_attach(device_t, device_t, void *);
static int btuart_detach(device_t, int);
@@ -164,7 +164,7 @@
* Autoconf match routine.
*/
static int
-btuart_match(device_t self __unused, struct cfdata *cfdata __unused,
+btuart_match(device_t self __unused, cfdata_t cfdata __unused,
void *arg __unused)
{
@@ -222,7 +222,7 @@
{
struct btuart_softc *sc;
device_t dev;
- struct cfdata *cfdata;
+ cfdata_t cfdata;
struct lwp *l = curlwp; /* XXX */
int error, unit, s;
@@ -281,7 +281,7 @@
btuartclose(struct tty *tp, int flag __unused)
{
struct btuart_softc *sc = tp->t_sc;
- struct cfdata *cfdata;
+ cfdata_t cfdata;
int s;
s = spltty();
