summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMateusz Guzik <mjg@FreeBSD.org>2020-09-01 21:51:10 +0000
committerMateusz Guzik <mjg@FreeBSD.org>2020-09-01 21:51:10 +0000
commit1dbbeb200fd60e8c9c7afae15ef06c33ca650a3c (patch)
treebecd3ed7f9b7f94178c5ca6987747c4195308434
parent4740159adaaa836738ad07389541f8c0632f6c79 (diff)
Notes
-rw-r--r--sys/dev/tdfx/tdfx_linux.h1
-rw-r--r--sys/dev/tdfx/tdfx_pci.c22
2 files changed, 9 insertions, 14 deletions
diff --git a/sys/dev/tdfx/tdfx_linux.h b/sys/dev/tdfx/tdfx_linux.h
index 4a29e5a8dc11..954a24d91972 100644
--- a/sys/dev/tdfx/tdfx_linux.h
+++ b/sys/dev/tdfx/tdfx_linux.h
@@ -33,7 +33,6 @@
* $FreeBSD$
*/
-
#include <machine/../linux/linux.h>
#include <machine/../linux/linux_proto.h>
#include <compat/linux/linux_ioctl.h>
diff --git a/sys/dev/tdfx/tdfx_pci.c b/sys/dev/tdfx/tdfx_pci.c
index 4156e23b88d6..92640c54e665 100644
--- a/sys/dev/tdfx/tdfx_pci.c
+++ b/sys/dev/tdfx/tdfx_pci.c
@@ -75,13 +75,10 @@ __FBSDID("$FreeBSD$");
#include <dev/tdfx/tdfx_vars.h>
#include <dev/tdfx/tdfx_pci.h>
-
static devclass_t tdfx_devclass;
-
static int tdfx_count = 0;
-
/* Set up the boot probe/attach routines */
static device_method_t tdfx_methods[] = {
DEVMETHOD(device_probe, tdfx_probe),
@@ -250,7 +247,7 @@ tdfx_attach(device_t dev) {
tdfx_info->devt = make_dev(&tdfx_cdev, device_get_unit(dev),
UID_ROOT, GID_WHEEL, 0600, "3dfx%x", device_get_unit(dev));
tdfx_info->devt->si_drv1 = tdfx_info;
-
+
return 0;
}
@@ -259,7 +256,7 @@ tdfx_detach(device_t dev) {
struct tdfx_softc* tdfx_info;
int retval;
tdfx_info = device_get_softc(dev);
-
+
/* Delete allocated resource, of course */
bus_release_resource(dev, SYS_RES_MEMORY, tdfx_info->memrid,
tdfx_info->memrange);
@@ -303,12 +300,12 @@ tdfx_clrmtrr(device_t dev) {
*/
int retval, act;
struct tdfx_softc *tdfx_info = device_get_softc(dev);
-
+
act = MEMRANGE_SET_REMOVE;
retval = mem_range_attr_set(&tdfx_info->mrdesc, &act);
return retval;
}
-
+
static int
tdfx_setmtrr(device_t dev) {
/*
@@ -426,13 +423,13 @@ tdfx_mmap(struct cdev *dev, vm_ooffset_t offset, vm_paddr_t *paddr,
/**** OLD GET CONFIG ****/
/* struct tdfx_softc* tdfx_info; */
-
+
/* Get the configuration for our card XXX*/
/*tdfx_info = dev->si_drv1; */
/************************/
struct tdfx_softc* tdfx_info[2];
-
+
tdfx_info[0] = (struct tdfx_softc*)devclass_get_softc(tdfx_devclass, 0);
/* If, for some reason, its not configured, we bail out */
@@ -449,7 +446,7 @@ tdfx_mmap(struct cdev *dev, vm_ooffset_t offset, vm_paddr_t *paddr,
*paddr = rman_get_start(tdfx_info[0]->memrange) + offset;
return 0;
}
-
+
if(tdfx_count > 1) {
tdfx_info[1] = (struct tdfx_softc*)devclass_get_softc(tdfx_devclass, 1);
if((offset & 0xff000000) == tdfx_info[1]->addr0) {
@@ -552,7 +549,6 @@ tdfx_query_fetch(u_int cmd, struct tdfx_pio_data *piod)
return -EINVAL;
}
-
/* Read the value and return */
switch(piod->size) {
case 1:
@@ -675,7 +671,7 @@ tdfx_do_pio_rd(struct tdfx_pio_data *piod)
(piod->port != SC_DATA) || (piod->port != VGA_MISC_OUTPUT_READ)) &&
(piod->port < tdfx_info->pio0) && (piod->port > tdfx_info->pio0max))
return -EPERM;
-
+
/* All VGA STATUS REGS are byte registers, size should never be > 1 */
if(piod->size != 1) {
return -EINVAL;
@@ -702,7 +698,7 @@ tdfx_do_pio_wt(struct tdfx_pio_data *piod)
(piod->port != VGA_MISC_OUTPUT_READ)) /* Can't write VGA_ST_1C */ &&
(piod->port < tdfx_info->pio0) && (piod->port > tdfx_info->pio0max))
return -EPERM;
-
+
/* All VGA STATUS REGS are byte registers, size should never be > 1 */
if(piod->size != 1) {
return -EINVAL;