summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/pciide_common.c22
-rw-r--r--sys/dev/rasops/rasops_bitops.h14
2 files changed, 13 insertions, 23 deletions
diff --git a/sys/dev/pci/pciide_common.c b/sys/dev/pci/pciide_common.c
index 24f0709d500..a7a738528e9 100644
--- a/sys/dev/pci/pciide_common.c
+++ b/sys/dev/pci/pciide_common.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_common.c,v 1.40 2009/03/14 21:04:21 dsl Exp $ */
+/* $NetBSD: pciide_common.c,v 1.41 2009/03/15 21:28:09 cegger Exp $ */
/*
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pciide_common.c,v 1.40 2009/03/14 21:04:21 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciide_common.c,v 1.41 2009/03/15 21:28:09 cegger Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@@ -245,11 +245,9 @@ bad:
}
void
-pciide_mapregs_native(pa, cp, cmdsizep, ctlsizep, pci_intr)
- struct pci_attach_args * pa;
- struct pciide_channel *cp;
- bus_size_t *cmdsizep, *ctlsizep;
- int (*pci_intr)(void *);
+pciide_mapregs_native(struct pci_attach_args *pa,
+ struct pciide_channel *cp, bus_size_t *cmdsizep,
+ bus_size_t *ctlsizep, int (*pci_intr)(void *))
{
struct pciide_softc *sc = CHAN_TO_PCIIDE(&cp->ata_channel);
struct ata_channel *wdc_cp = &cp->ata_channel;
@@ -784,12 +782,10 @@ pciide_chansetup(struct pciide_softc *sc, int channel, pcireg_t interface)
/* some common code used by several chip channel_map */
void
-pciide_mapchan(pa, cp, interface, cmdsizep, ctlsizep, pci_intr)
- struct pci_attach_args *pa;
- struct pciide_channel *cp;
- pcireg_t interface;
- bus_size_t *cmdsizep, *ctlsizep;
- int (*pci_intr)(void *);
+pciide_mapchan(struct pci_attach_args *pa,
+ struct pciide_channel *cp,
+ pcireg_t interface, bus_size_t *cmdsizep,
+ bus_size_t *ctlsizep, int (*pci_intr)(void *))
{
struct ata_channel *wdc_cp = &cp->ata_channel;
diff --git a/sys/dev/rasops/rasops_bitops.h b/sys/dev/rasops/rasops_bitops.h
index e3046ae2a69..ccf3a5c0c89 100644
--- a/sys/dev/rasops/rasops_bitops.h
+++ b/sys/dev/rasops/rasops_bitops.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rasops_bitops.h,v 1.10 2008/04/28 20:23:56 martin Exp $ */
+/* $NetBSD: rasops_bitops.h,v 1.11 2009/03/15 21:29:15 cegger Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -36,10 +36,7 @@
* Erase columns.
*/
static void
-NAME(erasecols)(cookie, row, col, num, attr)
- void *cookie;
- int row, col, num;
- long attr;
+NAME(erasecols)(void *cookie, int row, int col, int num, long attr)
{
int lmask, rmask, lclr, rclr, clr;
struct rasops_info *ri;
@@ -113,8 +110,7 @@ NAME(erasecols)(cookie, row, col, num, attr)
* Actually paint the cursor.
*/
static void
-NAME(do_cursor)(ri)
- struct rasops_info *ri;
+NAME(do_cursor)(struct rasops_info *ri)
{
int lmask, rmask, height, row, col, num;
int32_t *dp, *rp;
@@ -154,9 +150,7 @@ NAME(do_cursor)(ri)
* Copy columns. Ick!
*/
static void
-NAME(copycols)(cookie, row, src, dst, num)
- void *cookie;
- int row, src, dst, num;
+NAME(copycols)(void *cookie, int row, int src, int dst, int num)
{
int tmp, lmask, rmask, height, lnum, rnum, sb, db, cnt, full;
int32_t *sp, *dp, *srp, *drp;