Use CFATTACH_DECL().

This commit is contained in:
thorpej 2002-10-01 03:10:12 +00:00
parent d72e601340
commit d1c37db940
16 changed files with 54 additions and 73 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: beep.c,v 1.13 2002/09/27 20:30:39 thorpej Exp $ */
/* $NetBSD: beep.c,v 1.14 2002/10/01 03:10:12 thorpej Exp $ */
/*
* Copyright (c) 1995 Mark Brinicombe
@ -42,7 +42,7 @@
#include <sys/param.h>
__KERNEL_RCSID(0, "$NetBSD: beep.c,v 1.13 2002/09/27 20:30:39 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: beep.c,v 1.14 2002/10/01 03:10:12 thorpej Exp $");
#include <sys/systm.h>
#include <sys/conf.h>
@ -88,9 +88,8 @@ void beepdma (struct beep_softc *sc, int buf);
static int sdma_channel;
const struct cfattach beep_ca = {
sizeof(struct beep_softc), beepprobe, beepattach
};
CFATTACH_DECL(beep, sizeof(struct beep_softc),
beepprobe, beepattach, NULL, NULL)
extern struct cfdriver beep_cd;

View File

@ -1,4 +1,4 @@
/* $NetBSD: iic_iomd.c,v 1.3 2002/09/27 20:30:39 thorpej Exp $ */
/* $NetBSD: iic_iomd.c,v 1.4 2002/10/01 03:10:13 thorpej Exp $ */
/*
* Copyright (c) 1994-1996 Mark Brinicombe.
@ -58,9 +58,8 @@
static int iic_iomd_probe __P((struct device *, struct cfdata *, void *));
static void iic_iomd_attach __P((struct device *, struct device *, void *));
const struct cfattach iic_iomd_ca = {
sizeof(struct iic_softc), iic_iomd_probe, iic_iomd_attach
};
CFATTACH_DECL(iic_iomd, sizeof(struct iic_softc),
iic_iomd_probe, iic_iomd_attach, NULL, NULL)
/*
* iic device probe function

View File

@ -1,4 +1,4 @@
/* $NetBSD: iomd.c,v 1.6 2002/09/27 20:30:39 thorpej Exp $ */
/* $NetBSD: iomd.c,v 1.7 2002/10/01 03:10:13 thorpej Exp $ */
/*
* Copyright (c) 1996-1997 Mark Brinicombe.
@ -83,9 +83,8 @@ static void iomdattach __P((struct device *parent, struct device *self,
void *aux));
static int iomdprint __P((void *aux, const char *iomdbus));
const struct cfattach iomd_ca = {
sizeof(struct iomd_softc), iomdmatch, iomdattach
};
CFATTACH_DECL(iomd, sizeof(struct iomd_softc),
iomdmatch, iomdattach, NULL, NULL)
extern struct bus_space iomd_bs_tag;

View File

@ -1,4 +1,4 @@
/* $NetBSD: iomd_clock.c,v 1.8 2002/09/27 20:30:40 thorpej Exp $ */
/* $NetBSD: iomd_clock.c,v 1.9 2002/10/01 03:10:13 thorpej Exp $ */
/*
* Copyright (c) 1994-1997 Mark Brinicombe.
@ -84,9 +84,8 @@ static void checkdelay __P((void));
int clockhandler __P((void *));
int statclockhandler __P((void *));
const struct cfattach clock_ca = {
sizeof(struct clock_softc), clockmatch, clockattach
};
CFATTACH_DECL(clock, sizeof(struct clock_softc),
clockmatch, clockattach, NULL, NULL)
/*
* int clockmatch(struct device *parent, void *match, void *aux)

View File

@ -1,4 +1,4 @@
/* $NetBSD: kbd_iomd.c,v 1.4 2002/09/27 20:30:40 thorpej Exp $ */
/* $NetBSD: kbd_iomd.c,v 1.5 2002/10/01 03:10:13 thorpej Exp $ */
/*
* Copyright (c) 1994-1997 Mark Brinicombe.
@ -67,9 +67,8 @@ extern struct kbd_softc *console_kbd;
/* Device structures */
const struct cfattach kbd_iomd_ca = {
sizeof(struct kbd_softc), kbd_iomd_probe, kbd_iomd_attach
};
CFATTACH_DECL(kbd_iomd, sizeof(struct kbd_softc),
kbd_iomd_probe, kbd_iomd_attach, NULL, NULL)
static int
kbd_iomd_probe(parent, cf, aux)

View File

@ -1,4 +1,4 @@
/* $NetBSD: lmcaudio.c,v 1.8 2002/09/27 20:30:41 thorpej Exp $ */
/* $NetBSD: lmcaudio.c,v 1.9 2002/10/01 03:10:14 thorpej Exp $ */
/*
* Copyright (c) 1996, Danny C Tsen.
@ -108,9 +108,8 @@ int lmcaudio_rate __P((int rate));
void lmcaudio_shutdown __P((void));
const struct cfattach lmcaudio_ca = {
sizeof(struct lmcaudio_softc), lmcaudio_probe, lmcaudio_attach
};
CFATTACH_DECL(lmcaudio, sizeof(struct lmcaudio_softc),
lmcaudio_probe, lmcaudio_attach, NULL, NULL)
int curr_rate = 11;

View File

@ -1,4 +1,4 @@
/* $NetBSD: opms_iomd.c,v 1.3 2002/09/27 20:30:41 thorpej Exp $ */
/* $NetBSD: opms_iomd.c,v 1.4 2002/10/01 03:10:14 thorpej Exp $ */
/*-
* Copyright (c) 1996 D.C. Tsen
@ -58,9 +58,8 @@ static int opms_iomd_probe __P((struct device *, struct cfdata *, void *));
static void opms_iomd_attach __P((struct device *, struct device *, void *));
static void opms_iomd_intenable __P((struct opms_softc *sc, int enable));
const struct cfattach opms_iomd_ca = {
sizeof(struct opms_softc), opms_iomd_probe, opms_iomd_attach
};
CFATTACH_DECL(opms_iomd, sizeof(struct opms_softc),
opms_iomd_probe, opms_iomd_attach, NULL, NULL)
static int
opms_iomd_probe(parent, cf, aux)

View File

@ -1,4 +1,4 @@
/* $NetBSD: qms_iomd.c,v 1.5 2002/09/27 20:30:41 thorpej Exp $ */
/* $NetBSD: qms_iomd.c,v 1.6 2002/10/01 03:10:14 thorpej Exp $ */
/*
* Copyright (c) Scott Stevens 1995 All rights reserved
@ -57,9 +57,8 @@ static int qms_iomd_probe __P((struct device *, struct cfdata *, void *));
static void qms_iomd_attach __P((struct device *, struct device *, void *));
static void qms_iomd_intenable __P((struct qms_softc *sc, int enable));
const struct cfattach qms_iomd_ca = {
sizeof(struct qms_softc), qms_iomd_probe, qms_iomd_attach
};
CFATTACH_DECL(qms_iomd, sizeof(struct qms_softc),
qms_iomd_probe, qms_iomd_attach, NULL, NULL)
static int
qms_iomd_probe(parent, cf, aux)

View File

@ -1,4 +1,4 @@
/* $NetBSD: rpckbd_iomd.c,v 1.5 2002/09/27 20:30:42 thorpej Exp $ */
/* $NetBSD: rpckbd_iomd.c,v 1.6 2002/10/01 03:10:14 thorpej Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -66,9 +66,8 @@ extern struct rpckbd_softc console_kbd;
/* Device structures */
const struct cfattach rpckbd_iomd_ca = {
sizeof(struct rpckbd_softc), rpckbd_iomd_probe, rpckbd_iomd_attach
};
CFATTACH_DECL(rpckbd_iomd, sizeof(struct rpckbd_softc),
rpckbd_iomd_probe, rpckbd_iomd_attach, NULL, NULL)
static int
rpckbd_iomd_probe(parent, cf, aux)

View File

@ -1,4 +1,4 @@
/* $NetBSD: rtc.c,v 1.5 2002/09/27 20:30:42 thorpej Exp $ */
/* $NetBSD: rtc.c,v 1.6 2002/10/01 03:10:15 thorpej Exp $ */
/*
* Copyright (c) 1994-1996 Mark Brinicombe.
@ -248,9 +248,8 @@ rtc_read(arg, rtc)
/* device and attach structures */
const struct cfattach rtc_ca = {
sizeof(struct rtc_softc), rtcmatch, rtcattach
};
CFATTACH_DECL(rtc, sizeof(struct rtc_softc),]
rtcmatch, rtcattach, NULL, NULL)
extern struct cfdriver rtc_cd;

View File

@ -1,4 +1,4 @@
/* $NetBSD: sysbeep_vidc.c,v 1.5 2002/09/27 20:30:42 thorpej Exp $ */
/* $NetBSD: sysbeep_vidc.c,v 1.6 2002/10/01 03:10:15 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -38,7 +38,7 @@
#include <sys/param.h>
__KERNEL_RCSID(0, "$NetBSD: sysbeep_vidc.c,v 1.5 2002/09/27 20:30:42 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: sysbeep_vidc.c,v 1.6 2002/10/01 03:10:15 thorpej Exp $");
#include <sys/systm.h>
#include <sys/device.h>
@ -58,9 +58,8 @@ void sysbeep(int, int);
void lmcaudio_beep_generate(void);
/* device attach structure */
const struct cfattach sysbeep_vidc_ca = {
sizeof(struct device), sysbeep_vidc_match, sysbeep_vidc_attach
};
CFATTACH_DECL(sysbeep_vidc, sizeof(struct device),
sysbeep_vidc_match, sysbeep_vidc_attach, NULL, NULL)
int
sysbeep_vidc_match(struct device *parent, struct cfdata *match, void *aux)

View File

@ -1,4 +1,4 @@
/* $NetBSD: todclock.c,v 1.5 2002/09/27 20:30:42 thorpej Exp $ */
/* $NetBSD: todclock.c,v 1.6 2002/10/01 03:10:16 thorpej Exp $ */
/*
* Copyright (c) 1994-1997 Mark Brinicombe.
@ -47,7 +47,7 @@
#include <sys/param.h>
__KERNEL_RCSID(0, "$NetBSD: todclock.c,v 1.5 2002/09/27 20:30:42 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: todclock.c,v 1.6 2002/10/01 03:10:16 thorpej Exp $");
#include <sys/systm.h>
#include <sys/kernel.h>
@ -93,9 +93,8 @@ static struct todclock_softc *todclock_sc = NULL;
/* driver and attach structures */
const struct cfattach todclock_ca = {
sizeof(struct todclock_softc), todclockmatch, todclockattach
};
CFATTACH_DECL(todclock, sizeof(struct todclock_softc),
todclockmatch, todclockattach, NULL, NULL)
/*
* int todclockmatch(struct device *parent, struct cfdata *cf, void *aux)

View File

@ -1,4 +1,4 @@
/* $NetBSD: vidc20.c,v 1.6 2002/09/27 20:30:43 thorpej Exp $ */
/* $NetBSD: vidc20.c,v 1.7 2002/10/01 03:10:16 thorpej Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe
@ -81,9 +81,8 @@ int *vidc_base = (int *)VIDC_BASE;
int vidc_fref = 24000000;
const struct cfattach vidc_ca = {
sizeof (struct vidc20_softc), vidcmatch, vidcattach
};
CFATTACH_DECL(vidc, sizeof (struct vidc20_softc),
vidcmatch, vidcattach, NULL, NULL)
/*
* vidcmatch()

View File

@ -1,4 +1,4 @@
/* $NetBSD: vidcaudio.c,v 1.11 2002/09/27 20:30:43 thorpej Exp $ */
/* $NetBSD: vidcaudio.c,v 1.12 2002/10/01 03:10:17 thorpej Exp $ */
/*
* Copyright (c) 1995 Melvin Tang-Richardson
@ -38,7 +38,7 @@
#include <sys/param.h> /* proc.h */
__KERNEL_RCSID(0, "$NetBSD: vidcaudio.c,v 1.11 2002/09/27 20:30:43 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: vidcaudio.c,v 1.12 2002/10/01 03:10:17 thorpej Exp $");
#include <sys/conf.h> /* autoconfig functions */
#include <sys/device.h> /* device calls */
@ -104,9 +104,8 @@ void vidcaudio_shutdown __P((void));
static int sound_dma_intr;
const struct cfattach vidcaudio_ca = {
sizeof(struct vidcaudio_softc), vidcaudio_probe, vidcaudio_attach
};
CFATTACH_DECL(vidcaudio, sizeof(struct vidcaudio_softc),
vidcaudio_probe, vidcaudio_attach, NULL, NULL)
int vidcaudio_query_encoding __P((void *, struct audio_encoding *));
int vidcaudio_set_params __P((void *, int, int, struct audio_params *, struct audio_params *));

View File

@ -1,4 +1,4 @@
/* $NetBSD: vidcvideo.c,v 1.14 2002/08/06 22:46:11 itojun Exp $ */
/* $NetBSD: vidcvideo.c,v 1.15 2002/10/01 03:10:19 thorpej Exp $ */
/*
* Copyright (c) 2001 Reinoud Zandijk
@ -36,7 +36,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: vidcvideo.c,v 1.14 2002/08/06 22:46:11 itojun Exp $");
__KERNEL_RCSID(0, "$NetBSD: vidcvideo.c,v 1.15 2002/10/01 03:10:19 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -143,10 +143,8 @@ static void vidcvideo_attach __P((struct device *, struct device *, void *));
/* config glue */
const struct cfattach vidcvideo_ca = {
sizeof(struct vidcvideo_softc), vidcvideo_match, vidcvideo_attach,
};
CFATTACH_DECL(vidcvideo, sizeof(struct vidcvideo_softc),
vidcvideo_match, vidcvideo_attach, NULL, NULL)
static struct fb_devconfig vidcvideo_console_dc;
static int vidcvideo_is_console;

View File

@ -1,4 +1,4 @@
/* $NetBSD: wsqms_iomd.c,v 1.6 2002/09/27 20:30:43 thorpej Exp $ */
/* $NetBSD: wsqms_iomd.c,v 1.7 2002/10/01 03:10:19 thorpej Exp $ */
/*-
* Copyright (c) 2001 Reinoud Zandijk
@ -42,7 +42,7 @@
#include <sys/param.h>
__KERNEL_RCSID(0, "$NetBSD: wsqms_iomd.c,v 1.6 2002/09/27 20:30:43 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: wsqms_iomd.c,v 1.7 2002/10/01 03:10:19 thorpej Exp $");
#include <sys/systm.h>
#include <sys/kernel.h>
@ -60,11 +60,8 @@ __KERNEL_RCSID(0, "$NetBSD: wsqms_iomd.c,v 1.6 2002/09/27 20:30:43 thorpej Exp $
static int wsqms_iomd_probe(struct device *, struct cfdata *, void *);
static void wsqms_iomd_attach(struct device *, struct device *, void *);
const struct cfattach wsqms_iomd_ca = {
sizeof(struct wsqms_softc), wsqms_iomd_probe, wsqms_iomd_attach
};
CFATTACH_DECL(wsqms_iomd, sizeof(struct wsqms_softc),
wsqms_iomd_probe, wsqms_iomd_attach, NULL, NULL)
static int
wsqms_iomd_probe(struct device *parent, struct cfdata *cf, void *aux)