Remove support for FreeBSD < 4.recent from this driver.

7 files changed, 1 insertions, 35 deletions

diff --git a/sys/dev/bktr/bktr_audio.c b/sys/dev/bktr/bktr_audio.c
index 234b37a..7c6965d 100644
--- a/sys/dev/bktr/bktr_audio.c
+++ b/sys/dev/bktr/bktr_audio.c
@@ -66,12 +66,10 @@ __FBSDID("$FreeBSD$");
 #include <dev/pci/pcivar.h>
 #endif
 
-#if (__FreeBSD_version >=300000)
 #include <machine/bus_memio.h>		/* for bus space */
 #include <machine/bus.h>
 #include <sys/bus.h>
 #endif
-#endif
 
 #ifdef __NetBSD__
 #include <sys/proc.h>
diff --git a/sys/dev/bktr/bktr_card.c b/sys/dev/bktr/bktr_card.c
index f991e3a..79f142d 100644
--- a/sys/dev/bktr/bktr_card.c
+++ b/sys/dev/bktr/bktr_card.c
@@ -64,12 +64,10 @@ __FBSDID("$FreeBSD$");
 #include <dev/pci/pcivar.h>
 #endif
 
-#if (__FreeBSD_version >=300000)
 #include <machine/bus_memio.h>	/* for bus space */
 #include <machine/bus.h>
 #include <sys/bus.h>
 #endif
-#endif
 
 #ifdef __NetBSD__
 #include <dev/ic/bt8xx.h>	/* NetBSD location for .h files */
diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c
index 276d225..795cd70 100644
--- a/sys/dev/bktr/bktr_core.c
+++ b/sys/dev/bktr/bktr_core.c
@@ -120,9 +120,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/pmap.h>
 #include <vm/vm_extern.h>
 
-#if (__FreeBSD_version >=400000) || (NSMBUS > 0)
 #include <sys/bus.h>		/* used by smbus and newbus */
-#endif
 
 #if (__FreeBSD_version < 500000)
 #include <machine/clock.h>              /* for DELAY */
@@ -133,12 +131,9 @@ __FBSDID("$FreeBSD$");
 #include <dev/pci/pcivar.h>
 #endif
 
-
-#if (__FreeBSD_version >=300000)
 #include <machine/bus_memio.h>	/* for bus space */
 #include <machine/bus.h>
 #include <sys/bus.h>
-#endif
 
 #include <dev/bktr/ioctl_meteor.h>
 #include <dev/bktr/ioctl_bt848.h>	/* extensions to ioctl_meteor.h */
diff --git a/sys/dev/bktr/bktr_i2c.c b/sys/dev/bktr/bktr_i2c.c
index 1941098..807144d 100644
--- a/sys/dev/bktr/bktr_i2c.c
+++ b/sys/dev/bktr/bktr_i2c.c
@@ -58,11 +58,9 @@ __FBSDID("$FreeBSD$");
 #include <dev/pci/pcireg.h>
 #endif
 
-#if (__FreeBSD_version >= 300000)
 #include <machine/bus_memio.h>          /* for bus space */
 #include <machine/bus.h>
 #include <sys/bus.h>
-#endif
 
 #include <dev/bktr/ioctl_meteor.h>
 #include <dev/bktr/ioctl_bt848.h>	/* extensions to ioctl_meteor.h */
diff --git a/sys/dev/bktr/bktr_os.c b/sys/dev/bktr/bktr_os.c
index 5dfcd01..aed1942 100644
--- a/sys/dev/bktr/bktr_os.c
+++ b/sys/dev/bktr/bktr_os.c
@@ -78,20 +78,14 @@ __FBSDID("$FreeBSD$");
 #include <vm/pmap.h>
 #include <vm/vm_extern.h>
 
-#if (__FreeBSD_version >=400000)
 #include <sys/bus.h>		/* used by smbus and newbus */
-#endif
 
-#if (__FreeBSD_version >=300000)
 #include <machine/bus_memio.h>	/* used by bus space */
 #include <machine/bus.h>	/* used by bus space and newbus */
 #include <sys/bus.h>
-#endif
 
-#if (__FreeBSD_version >=400000)
 #include <sys/rman.h>		/* used by newbus */
 #include <machine/resource.h>	/* used by newbus */
-#endif
 
 #if (__FreeBSD_version < 500000)
 #include <machine/clock.h>              /* for DELAY */
@@ -207,7 +201,6 @@ int bktr_debug = 0;
 /****************************/
 /* *** FreeBSD 4.x code *** */
 /****************************/
-#if (__FreeBSD_version >= 400000)
 
 static int	bktr_probe( device_t dev );
 static int	bktr_attach( device_t dev );
@@ -271,10 +264,8 @@ static struct cdevsw bktr_cdevsw = {
 };
 
 DRIVER_MODULE(bktr, pci, bktr_driver, bktr_devclass, 0, 0);
-#if (__FreeBSD_version > 410000)
 MODULE_DEPEND(bktr, bktr_mem, 1,1,1);
 MODULE_VERSION(bktr, 1);
-#endif
 
 
 /*
@@ -856,8 +847,6 @@ bktr_poll( struct cdev *dev, int events, struct thread *td)
 	return (revents);
 }
 
-#endif		/* FreeBSD 4.x specific kernel interface routines */
-
 /*****************/
 /* *** BSDI  *** */
 /*****************/
diff --git a/sys/dev/bktr/bktr_reg.h b/sys/dev/bktr/bktr_reg.h
index e03b99a..db1341c 100644
--- a/sys/dev/bktr/bktr_reg.h
+++ b/sys/dev/bktr/bktr_reg.h
@@ -461,7 +461,7 @@ struct bktr_i2c_softc {
  * memory mapped structure method only works on 32 bit processors
  * with the right type of endianness.
  */
-#if defined(__NetBSD__) || ( defined(__FreeBSD__) && (__FreeBSD_version >=300000) )
+#if defined(__NetBSD__) || defined(__FreeBSD__)
 #define INB(bktr,offset)	bus_space_read_1((bktr)->memt,(bktr)->memh,(offset))
 #define INW(bktr,offset)	bus_space_read_2((bktr)->memt,(bktr)->memh,(offset))
 #define INL(bktr,offset)	bus_space_read_4((bktr)->memt,(bktr)->memh,(offset))
@@ -525,11 +525,6 @@ struct bktr_softc {
 #endif
 
 #if defined (__FreeBSD__)
-    #if (__FreeBSD_version < 400000)
-    vm_offset_t     phys_base;	/* 2.x Bt848 register physical address */
-    pcici_t         tag;	/* 2.x PCI tag, for doing PCI commands */
-    #endif
-    #if (__FreeBSD_version >= 400000)
     int             mem_rid;	/* 4.x resource id */
     struct resource *res_mem;	/* 4.x resource descriptor for registers */
     int             irq_rid;	/* 4.x resource id */
@@ -541,15 +536,12 @@ struct bktr_softc {
     struct cdev     *bktrdev_alias;	/* alias /dev/bktr to /dev/bktr0 */
     struct cdev     *tunerdev_alias;	/* alias /dev/tuner to /dev/tuner0 */
     struct cdev     *vbidev_alias;	/* alias /dev/vbi to /dev/vbi0 */
-    #endif
     #if (__FreeBSD_version >= 500000)
     struct mtx      vbimutex;  /* Mutex protecting vbi buffer */
     #endif
-    #if (__FreeBSD_version >= 310000)
     bus_space_tag_t	memt;	/* Bus space register access functions */
     bus_space_handle_t	memh;	/* Bus space register access functions */
     bus_size_t		obmemsz;/* Size of card (bytes) */
-    #endif
 #if defined(BKTR_USE_FREEBSD_SMBUS)
       struct bktr_i2c_softc i2c_sc;	/* bt848_i2c device */
 #endif
@@ -730,10 +722,8 @@ typedef int ioctl_cmd_t;
 #endif
 
 #if defined(__FreeBSD__)
-#if (__FreeBSD_version >= 300000)
 typedef u_long ioctl_cmd_t;
 #endif
-#endif
 
 #if defined(__NetBSD__) || defined(__OpenBSD__)
 typedef u_long ioctl_cmd_t;
diff --git a/sys/dev/bktr/bktr_tuner.c b/sys/dev/bktr/bktr_tuner.c
index 8b92828..d149db1 100644
--- a/sys/dev/bktr/bktr_tuner.c
+++ b/sys/dev/bktr/bktr_tuner.c
@@ -61,12 +61,10 @@ __FBSDID("$FreeBSD$");
 #include <dev/pci/pcivar.h>
 #endif
 
-#if (__FreeBSD_version >=300000)
 #include <machine/bus_memio.h>          /* for bus space */
 #include <machine/bus.h>
 #include <sys/bus.h>
 #endif
-#endif
 
 #ifdef __NetBSD__
 #include <dev/ic/bt8xx.h>	/* NetBSD .h file location */