upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Warner Losh 2005-01-08 22:52:00 +00:00
parent 7cde7ca209
commit e36e54501e
7 changed files with 1 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sys/dev/bktr/bktr_audio.c
View file

@ -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>

2
sys/dev/bktr/bktr_card.c
View file

@ -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 */

5
sys/dev/bktr/bktr_core.c
View file

@ -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 */

2
sys/dev/bktr/bktr_i2c.c
View file

@ -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 */

11
sys/dev/bktr/bktr_os.c
View file

@ -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 *** */
/*****************/

12
sys/dev/bktr/bktr_reg.h
View file

@ -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;

2
sys/dev/bktr/bktr_tuner.c
View file

@ -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 */