Module Name: src
Committed By: christos
Date: Fri Feb 3 23:40:00 UTC 2012
Modified Files:
src/sys/compat/ndis: subr_ntoskrnl.c subr_pe.c
src/sys/dev/pci: isic_pci.c
src/sys/dev/scsipi: if_se.c
Log Message:
ansi prototypes
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/compat/ndis/subr_ntoskrnl.c
cvs rdiff -u -r1.6 -r1.7 src/sys/compat/ndis/subr_pe.c
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/pci/isic_pci.c
cvs rdiff -u -r1.83 -r1.84 src/sys/dev/scsipi/if_se.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/compat/ndis/subr_ntoskrnl.c
diff -u src/sys/compat/ndis/subr_ntoskrnl.c:1.21 src/sys/compat/ndis/subr_ntoskrnl.c:1.22
--- src/sys/compat/ndis/subr_ntoskrnl.c:1.21 Wed Aug 31 14:31:02 2011
+++ src/sys/compat/ndis/subr_ntoskrnl.c Fri Feb 3 18:39:59 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_ntoskrnl.c,v 1.21 2011/08/31 18:31:02 plunky Exp $ */
+/* $NetBSD: subr_ntoskrnl.c,v 1.22 2012/02/03 23:39:59 christos Exp $ */
/*-
* Copyright (c) 2003
@@ -37,7 +37,7 @@
__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.43.2.5 2005/03/31 04:24:36 wpaul Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: subr_ntoskrnl.c,v 1.21 2011/08/31 18:31:02 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_ntoskrnl.c,v 1.22 2012/02/03 23:39:59 christos Exp $");
#endif
#ifdef __FreeBSD__
@@ -661,17 +661,17 @@ IoBuildAsynchronousFsdRequest(uint32_t f
}
__stdcall static irp *
-IoBuildDeviceIoControlRequest(iocode, dobj, ibuf, ilen, obuf, olen,
- isinternal, event, status)
- uint32_t iocode;
- device_object *dobj;
- void *ibuf;
- uint32_t ilen;
- void *obuf;
- uint32_t olen;
- uint8_t isinternal;
- nt_kevent *event;
- io_status_block *status;
+IoBuildDeviceIoControlRequest(
+ uint32_t iocode,
+ device_object *dobj,
+ void *ibuf,
+ uint32_t ilen,
+ void *obuf,
+ uint32_t olen,
+ uint8_t isinternal,
+ nt_kevent *event,
+ io_status_block *status
+)
{
irp *ip;
io_stack_location *sl;
Index: src/sys/compat/ndis/subr_pe.c
diff -u src/sys/compat/ndis/subr_pe.c:1.6 src/sys/compat/ndis/subr_pe.c:1.7
--- src/sys/compat/ndis/subr_pe.c:1.6 Wed Mar 18 13:06:48 2009
+++ src/sys/compat/ndis/subr_pe.c Fri Feb 3 18:39:59 2012
@@ -35,7 +35,7 @@
__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_pe.c,v 1.7.2.3 2005/03/31 04:24:36 wpaul Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: subr_pe.c,v 1.6 2009/03/18 17:06:48 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_pe.c,v 1.7 2012/02/03 23:39:59 christos Exp $");
#endif
@@ -426,10 +426,11 @@ pe_relocate(vm_offset_t imgbase)
*/
int
-pe_get_import_descriptor(imgbase, desc, module)
- vm_offset_t imgbase;
- image_import_descriptor *desc;
- const char *module;
+pe_get_import_descriptor(
+ vm_offset_t imgbase,
+ image_import_descriptor *desc,
+ const char *module
+)
{
vm_offset_t offset;
image_import_descriptor *imp_desc;
Index: src/sys/dev/pci/isic_pci.c
diff -u src/sys/dev/pci/isic_pci.c:1.37 src/sys/dev/pci/isic_pci.c:1.38
--- src/sys/dev/pci/isic_pci.c:1.37 Sun Dec 6 18:14:05 2009
+++ src/sys/dev/pci/isic_pci.c Fri Feb 3 18:39:59 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: isic_pci.c,v 1.37 2009/12/06 23:14:05 dyoung Exp $ */
+/* $NetBSD: isic_pci.c,v 1.38 2012/02/03 23:39:59 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_pci.c,v 1.37 2009/12/06 23:14:05 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_pci.c,v 1.38 2012/02/03 23:39:59 christos Exp $");
#include <sys/param.h>
#include <sys/errno.h>
@@ -96,8 +96,8 @@ static const struct isic_pci_product {
{ 0, 0, 0, NULL, NULL, NULL },
};
-static const struct isic_pci_product * find_matching_card(pa)
- struct pci_attach_args *pa;
+static const struct isic_pci_product * find_matching_card(
+ struct pci_attach_args *pa)
{
const struct isic_pci_product * pp = NULL;
Index: src/sys/dev/scsipi/if_se.c
diff -u src/sys/dev/scsipi/if_se.c:1.83 src/sys/dev/scsipi/if_se.c:1.84
--- src/sys/dev/scsipi/if_se.c:1.83 Sat Apr 2 04:11:32 2011
+++ src/sys/dev/scsipi/if_se.c Fri Feb 3 18:39:59 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_se.c,v 1.83 2011/04/02 08:11:32 mbalmer Exp $ */
+/* $NetBSD: if_se.c,v 1.84 2012/02/03 23:39:59 christos Exp $ */
/*
* Copyright (c) 1997 Ian W. Dall <ian.d...@dsto.defence.gov.au>
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_se.c,v 1.83 2011/04/02 08:11:32 mbalmer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_se.c,v 1.84 2012/02/03 23:39:59 christos Exp $");
#include "opt_inet.h"
#include "opt_atalk.h"
@@ -351,17 +351,9 @@ seattach(device_t parent, device_t self,
static inline int
-se_scsipi_cmd(periph, cmd, cmdlen, data_addr, datalen,
- retries, timeout, bp, flags)
- struct scsipi_periph *periph;
- struct scsipi_generic *cmd;
- int cmdlen;
- u_char *data_addr;
- int datalen;
- int retries;
- int timeout;
- struct buf *bp;
- int flags;
+se_scsipi_cmd(struct scsipi_periph *periph, struct scsipi_generic *cmd,
+ int cmdlen, u_char *data_addr, int datalen, int retries, int timeout,
+ struct buf *bp, int flags)
{
int error;
int s = splbio();
