summaryrefslogtreecommitdiff
path: root/sys/dev/raidframe
diff options
context:
space:
mode:
authoroster <oster@NetBSD.org>2001-01-27 20:42:20 +0000
committeroster <oster@NetBSD.org>2001-01-27 20:42:20 +0000
commitcc2a28f2c04445b0f1af1f44526e14d2f427889e (patch)
tree1d01da34dbe94e25121a55b880adb4ff8a167686 /sys/dev/raidframe
parent1949425ffc5c4665d9c40ff46986b31c8653295c (diff)
Un-'__P'ify.
Diffstat (limited to 'sys/dev/raidframe')
-rw-r--r--sys/dev/raidframe/rf_netbsdkintf.c77
-rw-r--r--sys/dev/raidframe/rf_threadstuff.h4
2 files changed, 40 insertions, 41 deletions
diff --git a/sys/dev/raidframe/rf_netbsdkintf.c b/sys/dev/raidframe/rf_netbsdkintf.c
index d557c0df31b..15e0ed956dd 100644
--- a/sys/dev/raidframe/rf_netbsdkintf.c
+++ b/sys/dev/raidframe/rf_netbsdkintf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_netbsdkintf.c,v 1.103 2001/01/08 02:03:47 fvdl Exp $ */
+/* $NetBSD: rf_netbsdkintf.c,v 1.104 2001/01/27 20:42:20 oster Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -180,17 +180,17 @@ static void InitBP(struct buf * bp, struct vnode *, unsigned rw_flag,
RF_SectorCount_t numSect, caddr_t buf,
void (*cbFunc) (struct buf *), void *cbArg,
int logBytesPerSector, struct proc * b_proc);
-static void raidinit __P((RF_Raid_t *));
-
-void raidattach __P((int));
-int raidsize __P((dev_t));
-int raidopen __P((dev_t, int, int, struct proc *));
-int raidclose __P((dev_t, int, int, struct proc *));
-int raidioctl __P((dev_t, u_long, caddr_t, int, struct proc *));
-int raidwrite __P((dev_t, struct uio *, int));
-int raidread __P((dev_t, struct uio *, int));
-void raidstrategy __P((struct buf *));
-int raiddump __P((dev_t, daddr_t, caddr_t, size_t));
+static void raidinit(RF_Raid_t *);
+
+void raidattach(int);
+int raidsize(dev_t);
+int raidopen(dev_t, int, int, struct proc *);
+int raidclose(dev_t, int, int, struct proc *);
+int raidioctl(dev_t, u_long, caddr_t, int, struct proc *);
+int raidwrite(dev_t, struct uio *, int);
+int raidread(dev_t, struct uio *, int);
+void raidstrategy(struct buf *);
+int raiddump(dev_t, daddr_t, caddr_t, size_t);
/*
* Pilfered from ccd.c
@@ -257,39 +257,38 @@ int numraid = 0;
/* declared here, and made public, for the benefit of KVM stuff.. */
struct raid_softc *raid_softc;
-static void raidgetdefaultlabel __P((RF_Raid_t *, struct raid_softc *,
- struct disklabel *));
-static void raidgetdisklabel __P((dev_t));
-static void raidmakedisklabel __P((struct raid_softc *));
+static void raidgetdefaultlabel(RF_Raid_t *, struct raid_softc *,
+ struct disklabel *);
+static void raidgetdisklabel(dev_t);
+static void raidmakedisklabel(struct raid_softc *);
-static int raidlock __P((struct raid_softc *));
-static void raidunlock __P((struct raid_softc *));
+static int raidlock(struct raid_softc *);
+static void raidunlock(struct raid_softc *);
-static void rf_markalldirty __P((RF_Raid_t *));
-void rf_mountroot_hook __P((struct device *));
+static void rf_markalldirty(RF_Raid_t *);
+void rf_mountroot_hook(struct device *);
struct device *raidrootdev;
-void rf_ReconThread __P((struct rf_recon_req *));
+void rf_ReconThread(struct rf_recon_req *);
/* XXX what I want is: */
-/*void rf_ReconThread __P((RF_Raid_t *raidPtr)); */
-void rf_RewriteParityThread __P((RF_Raid_t *raidPtr));
-void rf_CopybackThread __P((RF_Raid_t *raidPtr));
-void rf_ReconstructInPlaceThread __P((struct rf_recon_req *));
-void rf_buildroothack __P((void *));
-
-RF_AutoConfig_t *rf_find_raid_components __P((void));
-RF_ConfigSet_t *rf_create_auto_sets __P((RF_AutoConfig_t *));
-static int rf_does_it_fit __P((RF_ConfigSet_t *,RF_AutoConfig_t *));
-static int rf_reasonable_label __P((RF_ComponentLabel_t *));
-void rf_create_configuration __P((RF_AutoConfig_t *,RF_Config_t *,
- RF_Raid_t *));
-int rf_set_autoconfig __P((RF_Raid_t *, int));
-int rf_set_rootpartition __P((RF_Raid_t *, int));
-void rf_release_all_vps __P((RF_ConfigSet_t *));
-void rf_cleanup_config_set __P((RF_ConfigSet_t *));
-int rf_have_enough_components __P((RF_ConfigSet_t *));
-int rf_auto_config_set __P((RF_ConfigSet_t *, int *));
+/*void rf_ReconThread(RF_Raid_t *raidPtr); */
+void rf_RewriteParityThread(RF_Raid_t *raidPtr);
+void rf_CopybackThread(RF_Raid_t *raidPtr);
+void rf_ReconstructInPlaceThread(struct rf_recon_req *);
+void rf_buildroothack(void *);
+
+RF_AutoConfig_t *rf_find_raid_components(void);
+RF_ConfigSet_t *rf_create_auto_sets(RF_AutoConfig_t *);
+static int rf_does_it_fit(RF_ConfigSet_t *,RF_AutoConfig_t *);
+static int rf_reasonable_label(RF_ComponentLabel_t *);
+void rf_create_configuration(RF_AutoConfig_t *,RF_Config_t *, RF_Raid_t *);
+int rf_set_autoconfig(RF_Raid_t *, int);
+int rf_set_rootpartition(RF_Raid_t *, int);
+void rf_release_all_vps(RF_ConfigSet_t *);
+void rf_cleanup_config_set(RF_ConfigSet_t *);
+int rf_have_enough_components(RF_ConfigSet_t *);
+int rf_auto_config_set(RF_ConfigSet_t *, int *);
static int raidautoconfig = 0; /* Debugging, mostly. Set to 0 to not
allow autoconfig to take place.
diff --git a/sys/dev/raidframe/rf_threadstuff.h b/sys/dev/raidframe/rf_threadstuff.h
index 498ec699df9..9db723bc710 100644
--- a/sys/dev/raidframe/rf_threadstuff.h
+++ b/sys/dev/raidframe/rf_threadstuff.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_threadstuff.h,v 1.9 2000/08/20 16:15:31 thorpej Exp $ */
+/* $NetBSD: rf_threadstuff.h,v 1.10 2001/01/27 20:42:21 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -91,7 +91,7 @@ typedef void *RF_ThreadArg_t;
#define RF_SIGNAL_COND(_c_) wakeup_one(&(_c_))
#define RF_BROADCAST_COND(_c_) wakeup(&(_c_))
#define RF_CREATE_THREAD(_handle_, _func_, _arg_, _name_) \
- kthread_create1((void (*) __P((void *)))(_func_), (void *)(_arg_), \
+ kthread_create1((void (*)(void *))(_func_), (void *)(_arg_), \
(struct proc **)&(_handle_), _name_)
struct RF_ThreadGroup_s {