1 files changed, 51 insertions, 36 deletions

diff --git a/sys/dev/bktr/bktr_os.c b/sys/dev/bktr/bktr_os.c
index 7ca82a12133b..060e996abbe5 100644
--- a/sys/dev/bktr/bktr_os.c
+++ b/sys/dev/bktr/bktr_os.c
@@ -58,6 +58,12 @@
 #define FIFO_RISC_DISABLED      0
 #define ALL_INTS_DISABLED       0
 
+
+/*******************/
+/* *** FreeBSD *** */
+/*******************/
+#ifdef __FreeBSD__
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
@@ -74,11 +80,6 @@
 #include <vm/pmap.h>
 #include <vm/vm_extern.h>
 
-/*******************/
-/* *** FreeBSD *** */
-/*******************/
-#ifdef __FreeBSD__
-
 #if (__FreeBSD_version < 400000)
 #ifdef DEVFS
 #include <sys/devfsext.h>
@@ -104,28 +105,7 @@
 #include <machine/clock.h>      /* for DELAY */
 #include <pci/pcivar.h>
 #include <pci/pcireg.h>
-#endif
-
-#ifdef __NetBSD__
-#include <dev/ic/bt8xx.h>	/* NetBSD location for .h files */
-#include <dev/pci/bktr/bktr_reg.h>
-#include <dev/pci/bktr/bktr_tuner.h>
-#include <dev/pci/bktr/bktr_card.h>
-#include <dev/pci/bktr/bktr_audio.h>
-#include <dev/pci/bktr/bktr_core.h>
-#include <dev/pci/bktr/bktr_os.h>
-#else					/* Traditional location for .h files */
-#include <machine/ioctl_meteor.h>
-#include <machine/ioctl_bt848.h>	/* extensions to ioctl_meteor.h */
-#include <dev/bktr/bktr_reg.h>
-#include <dev/bktr/bktr_tuner.h>
-#include <dev/bktr/bktr_card.h>
-#include <dev/bktr/bktr_audio.h>
-#include <dev/bktr/bktr_core.h>
-#include <dev/bktr/bktr_os.h>
-#endif
 
-#if defined(__FreeBSD__)
 #if (NSMBUS > 0)
 #include <dev/bktr/bktr_i2c.h>
 #endif
@@ -143,12 +123,14 @@ SYSCTL_INT(_hw_bt848, OID_AUTO, tuner, CTLFLAG_RW, &bt848_tuner, -1, "");
 SYSCTL_INT(_hw_bt848, OID_AUTO, reverse_mute, CTLFLAG_RW, &bt848_reverse_mute, -1, "");
 SYSCTL_INT(_hw_bt848, OID_AUTO, format, CTLFLAG_RW, &bt848_format, -1, "");
 SYSCTL_INT(_hw_bt848, OID_AUTO, slow_msp_audio, CTLFLAG_RW, &bt848_slow_msp_audio, -1, "");
-#endif
 
 #if (__FreeBSD__ == 2)
 #define PCIR_REVID     PCI_CLASS_REG
 #endif
 
+#endif /* end freebsd section */
+
+
 
 /****************/
 /* *** BSDI *** */
@@ -161,6 +143,26 @@ SYSCTL_INT(_hw_bt848, OID_AUTO, slow_msp_audio, CTLFLAG_RW, &bt848_slow_msp_audi
 /* *** OpenBSD/NetBSD *** */
 /**************************/
 #if defined(__NetBSD__) || defined(__OpenBSD__)
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/conf.h>
+#include <sys/uio.h>
+#include <sys/kernel.h>
+#include <sys/signalvar.h>
+#include <sys/mman.h>
+#include <sys/poll.h>
+#include <sys/select.h>
+#include <sys/vnode.h>
+
+#include <vm/vm.h>
+
+#ifndef __NetBSD__
+#include <vm/vm_kern.h>
+#include <vm/pmap.h>
+#include <vm/vm_extern.h>
+#endif
+
 #include <sys/device.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
@@ -176,6 +178,26 @@ int bktr_debug = 0;
 #endif /* __NetBSD__ || __OpenBSD__ */
 
 
+#ifdef __NetBSD__
+#include <dev/ic/bt8xx.h>	/* NetBSD location for .h files */
+#include <dev/pci/bktr/bktr_reg.h>
+#include <dev/pci/bktr/bktr_tuner.h>
+#include <dev/pci/bktr/bktr_card.h>
+#include <dev/pci/bktr/bktr_audio.h>
+#include <dev/pci/bktr/bktr_core.h>
+#include <dev/pci/bktr/bktr_os.h>
+#else					/* Traditional location for .h files */
+#include <machine/ioctl_meteor.h>
+#include <machine/ioctl_bt848.h>	/* extensions to ioctl_meteor.h */
+#include <dev/bktr/bktr_reg.h>
+#include <dev/bktr/bktr_tuner.h>
+#include <dev/bktr/bktr_card.h>
+#include <dev/bktr/bktr_audio.h>
+#include <dev/bktr/bktr_core.h>
+#include <dev/bktr/bktr_os.h>
+#endif
+
+
 
 /****************************/
 /* *** FreeBSD 4.x code *** */
@@ -1240,13 +1262,6 @@ static	int		bktr_intr(void *arg) { return common_bktr_intr(arg); }
 #define bktr_ioctl      bktrioctl
 #define bktr_mmap       bktrmmap
 
-int bktr_open __P((dev_t, int, int, struct proc *));
-int bktr_close __P((dev_t, int, int, struct proc *));
-int bktr_read __P((dev_t, struct uio *, int));
-int bktr_write __P((dev_t, struct uio *, int));
-int bktr_ioctl __P((dev_t, ioctl_cmd_t, caddr_t, int, struct proc*));
-int bktr_mmap __P((dev_t, int, int));
-
 vm_offset_t vm_page_alloc_contig(vm_offset_t, vm_offset_t,
                                  vm_offset_t, vm_offset_t);
 
@@ -1667,8 +1682,8 @@ bktr_ioctl(dev_t dev, ioctl_cmd_t cmd, caddr_t arg, int flag, struct proc* pr)
 /*
  * 
  */
-int
-bktr_mmap(dev_t dev, int offset, int nprot)
+paddr_t
+bktr_mmap(dev_t dev, off_t offset, int nprot)
 {
 	int		unit;
 	bktr_ptr_t	bktr;