Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/compat/ndis/Attic/subr_hal.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/compat/ndis/Attic/subr_hal.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.4
retrieving revision 1.4.28.2
diff -u -p -r1.4 -r1.4.28.2
--- src/sys/compat/ndis/Attic/subr_hal.c	2007/10/19 12:16:39	1.4
+++ src/sys/compat/ndis/Attic/subr_hal.c	2009/04/28 07:35:07	1.4.28.2
@@ -35,7 +35,7 @@
 __FBSDID("$FreeBSD: src/sys/compat/ndis/subr_hal.c,v 1.13.2.3 2005/03/31 04:24:35 wpaul Exp $");
 #endif
 #ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: subr_hal.c,v 1.4 2007/10/19 12:16:39 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_hal.c,v 1.4.28.2 2009/04/28 07:35:07 skrll Exp $");
 #endif
 
 #include <sys/param.h>
@@ -55,9 +55,6 @@ __KERNEL_RCSID(0, "$NetBSD: subr_hal.c,v
 #endif
 
 #include <sys/systm.h>
-#ifdef __NetBSD__
-#include <sys/lkm.h>
-#endif
 #ifdef __FreeBSD__
 #include <machine/clock.h>
 #include <machine/bus_memio.h>
@@ -99,7 +96,7 @@ __stdcall static void dummy (void);
 extern struct mtx_pool *ndis_mtxpool;
 
 int
-hal_libinit()
+hal_libinit(void)
 {
 	image_patch_table	*patch;
 
@@ -114,7 +111,7 @@ hal_libinit()
 }
 
 int
-hal_libfini()
+hal_libfini(void)
 {
 	image_patch_table	*patch;
 
@@ -128,45 +125,35 @@ hal_libfini()
 }
 
 __stdcall static void
-KeStallExecutionProcessor(usecs)
-	uint32_t		usecs;
+KeStallExecutionProcessor(uint32_t usecs)
 {
 	DELAY(usecs);
 	return;
 }
 
 __stdcall static void
-WRITE_PORT_ULONG(port, val)
-	uint32_t		*port;
-	uint32_t		val;
+WRITE_PORT_ULONG(uint32_t *port, uint32_t val)
 {
 	bus_space_write_4(NDIS_BUS_SPACE_IO, 0x0, (bus_size_t)port, val);
 	return;
 }
 
 __stdcall static void
-WRITE_PORT_USHORT(port, val)
-	uint16_t		*port;
-	uint16_t		val;
+WRITE_PORT_USHORT(uint16_t *port, uint16_t val)
 {
 	bus_space_write_2(NDIS_BUS_SPACE_IO, 0x0, (bus_size_t)port, val);
 	return;
 }
 
 __stdcall static void
-WRITE_PORT_UCHAR(port, val)
-	uint8_t			*port;
-	uint8_t			val;
+WRITE_PORT_UCHAR(uint8_t *port, uint8_t val)
 {
 	bus_space_write_1(NDIS_BUS_SPACE_IO, 0x0, (bus_size_t)port, val);
 	return;
 }
 
 __stdcall static void
-WRITE_PORT_BUFFER_ULONG(port, val, cnt)
-	uint32_t		*port;
-	uint32_t		*val;
-	uint32_t		cnt;
+WRITE_PORT_BUFFER_ULONG(uint32_t *port, uint32_t *val, uint32_t cnt)
 {
 	bus_space_write_multi_4(NDIS_BUS_SPACE_IO, 0x0,
 	    (bus_size_t)port, val, cnt);
@@ -174,10 +161,7 @@ WRITE_PORT_BUFFER_ULONG(port, val, cnt)
 }
 
 __stdcall static void
-WRITE_PORT_BUFFER_USHORT(port, val, cnt)
-	uint16_t		*port;
-	uint16_t		*val;
-	uint32_t		cnt;
+WRITE_PORT_BUFFER_USHORT(uint16_t *port, uint16_t *val, uint32_t cnt)
 {
 	bus_space_write_multi_2(NDIS_BUS_SPACE_IO, 0x0,
 	    (bus_size_t)port, val, cnt);
@@ -185,10 +169,7 @@ WRITE_PORT_BUFFER_USHORT(port, val, cnt)
 }
 
 __stdcall static void
-WRITE_PORT_BUFFER_UCHAR(port, val, cnt)
-	uint8_t			*port;
-	uint8_t			*val;
-	uint32_t		cnt;
+WRITE_PORT_BUFFER_UCHAR(uint8_t *port, uint8_t *val, uint32_t cnt)
 {
 	bus_space_write_multi_1(NDIS_BUS_SPACE_IO, 0x0,
 	    (bus_size_t)port, val, cnt);
@@ -196,31 +177,25 @@ WRITE_PORT_BUFFER_UCHAR(port, val, cnt)
 }
 
 __stdcall static uint16_t
-READ_PORT_USHORT(port)
-	uint16_t		*port;
+READ_PORT_USHORT(uint16_t *port)
 {
 	return(bus_space_read_2(NDIS_BUS_SPACE_IO, 0x0, (bus_size_t)port));
 }
 
 __stdcall static uint32_t
-READ_PORT_ULONG(port)
-	uint32_t		*port;
+READ_PORT_ULONG(uint32_t *port)
 {
 	return(bus_space_read_4(NDIS_BUS_SPACE_IO, 0x0, (bus_size_t)port));
 }
 
 __stdcall static uint8_t
-READ_PORT_UCHAR(port)
-	uint8_t			*port;
+READ_PORT_UCHAR(uint8_t *port)
 {
 	return(bus_space_read_1(NDIS_BUS_SPACE_IO, 0x0, (bus_size_t)port));
 }
 
 __stdcall static void
-READ_PORT_BUFFER_ULONG(port, val, cnt)
-	uint32_t		*port;
-	uint32_t		*val;
-	uint32_t		cnt;
+READ_PORT_BUFFER_ULONG(uint32_t *port, uint32_t *val, uint32_t cnt)
 {
 	bus_space_read_multi_4(NDIS_BUS_SPACE_IO, 0x0,
 	    (bus_size_t)port, val, cnt);
@@ -228,10 +203,7 @@ READ_PORT_BUFFER_ULONG(port, val, cnt)
 }
 
 __stdcall static void
-READ_PORT_BUFFER_USHORT(port, val, cnt)
-	uint16_t		*port;
-	uint16_t		*val;
-	uint32_t		cnt;
+READ_PORT_BUFFER_USHORT(uint16_t *port, uint16_t *val, uint32_t cnt)
 {
 	bus_space_read_multi_2(NDIS_BUS_SPACE_IO, 0x0,
 	    (bus_size_t)port, val, cnt);
@@ -239,10 +211,7 @@ READ_PORT_BUFFER_USHORT(port, val, cnt)
 }
 
 __stdcall static void
-READ_PORT_BUFFER_UCHAR(port, val, cnt)
-	uint8_t			*port;
-	uint8_t			*val;
-	uint32_t		cnt;
+READ_PORT_BUFFER_UCHAR(uint8_t *port, uint8_t *val, uint32_t cnt)
 {
 	bus_space_read_multi_1(NDIS_BUS_SPACE_IO, 0x0,
 	    (bus_size_t)port, val, cnt);
@@ -335,8 +304,7 @@ KeGetCurrentIrql(void)
 }
 
 __stdcall static uint64_t
-KeQueryPerformanceCounter(freq)
-	uint64_t		*freq;
+KeQueryPerformanceCounter(uint64_t *freq)
 {
 	if (freq != NULL)
 		*freq = hz;
@@ -418,7 +386,7 @@ KfLowerIrql(REGARGS1(uint8_t oldirql))
 }
 
 __stdcall
-static void dummy()
+static void dummy(void)
 {
 	printf ("hal dummy called...\n");
 	return;