Stupid me, I put the opt_tdfx.h underneath a test for TDFX_LINUX, which

resides in opt_tdfx. I also cleand up that large define. Compile, tell me
if it does, and I'll re-enable the tdfx entry in the makefile.

2 files changed, 9 insertions, 4 deletions

diff --git a/sys/dev/tdfx/tdfx_linux.h b/sys/dev/tdfx/tdfx_linux.h
index f8ea75d..3684db0 100644
--- a/sys/dev/tdfx/tdfx_linux.h
+++ b/sys/dev/tdfx/tdfx_linux.h
@@ -42,12 +42,15 @@
  */
 #define LINUX_IOCTL_SET(n,low,high) \
 static linux_ioctl_function_t linux_ioctl_##n; \
-static struct linux_ioctl_handler n##_handler = {linux_ioctl_##n,low, high}; \
-SYSINIT(n##register, SI_SUB_KLD, SI_ORDER_MIDDLE, \
+static struct linux_ioctl_handler n##_handler = {linux_ioctl_##n, low, high}; \
+SYSINIT(n##register, SI_SUB_KLD, SI_ORDER_MIDDLE,\
 linux_ioctl_register_handler, &n##_handler); \
-SYSUNINIT(n##unregister, SI_SUB_KLD, SI_ORDER_MIDDLE, \
+SYSUNINIT(n##unregister, SI_SUB_KLD, SI_ORDER_MIDDLE,\
 linux_ioctl_unregister_handler, &n##_handler);
 
+/* Prototype for ioctl wrapper */
+static int linux_ioctl_tdfx(struct proc* p, struct linux_ioctl_args* args);
+
 /* Values for /dev/3dfx */
 /* Query IOCTLs */
 #define LINUX_IOCTL_TDFX_QUERY_BOARDS  0x3302
diff --git a/sys/dev/tdfx/tdfx_pci.c b/sys/dev/tdfx/tdfx_pci.c
index 9709fd5..d1ac656 100644
--- a/sys/dev/tdfx/tdfx_pci.c
+++ b/sys/dev/tdfx/tdfx_pci.c
@@ -74,6 +74,9 @@
 #include <machine/resource.h>
 #include <machine/bus.h>
 #include <sys/rman.h>
+
+/* This must come first */
+#include "opt_tdfx.h"
 #ifdef TDFX_LINUX
 #include <dev/tdfx/tdfx_linux.h>
 #endif
@@ -82,7 +85,6 @@
 #include <dev/tdfx/tdfx_vars.h>
 #include <dev/tdfx/tdfx_pci.h>
 
-#include "opt_tdfx.h"
 
 static devclass_t tdfx_devclass;