chacha/glide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

* 3dfx_driver.c (HAVE_DEVFS): Define to 1 if

Browse Source 
LINUX_VERSION_CODE >= 2.3.46 and LINUX_VERSION_CODE <= 2.6.17 or
	if DEVFS_SUPPORT is defined, define to 0 otherwise.
	(devfs_handle): Only use if HAVE_DEVFS.
	(init_module): Only use devfs_mk_cdev or devfs_register if HAVE_DEVFS.
	(cleanup_module): Only use devfs_remove or devfs_unregister if
	HAVE_DEVFS.
This commit is contained in:
guillemj
2007-02-06 04:32:58 +00:00
parent d919a05407
commit 6fccc2cbdb
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Device3Dfx/3dfx_driver.c
View File

@@ -68,8 +68,13 @@
#include <linux/mm.h>
#include <linux/errno.h>
#include <linux/pci.h>
#if KERNEL_MIN_VER(2,3,46) || defined(DEVFS_SUPPORT)
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,46) && \
LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17) || \
defined(DEVFS_SUPPORT)
#include <linux/devfs_fs_kernel.h>
#define HAVE_DEVFS 1
#else
#define HAVE_DEVFS 0
#endif
#include <asm/segment.h>
#include <asm/ioctl.h>
@@ -235,10 +240,12 @@ void cleanup_module(void);
static cardInfo cards[MAXCARDS];
static int numCards = 0;
#if HAVE_DEVFS
#if KERNEL_MIN_VER(2,3,46) && LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) \
|| defined(DEVFS_SUPPORT)
static devfs_handle_t devfs_handle;
#endif
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
static void findCardType(int vendor, int device)
@@ -807,6 +814,7 @@ int init_module(void)
return ret;
}
#if HAVE_DEVFS
#if KERNEL_MIN_VER(2,6,0)
devfs_mk_cdev(MKDEV(MAJOR_3DFX, DEVICE_VOODOO),
S_IFCHR | S_IROTH | S_IWOTH | S_IRGRP | S_IWGRP,
@@ -816,6 +824,7 @@ int init_module(void)
MAJOR_3DFX, DEVICE_VOODOO,
S_IFCHR | S_IROTH | S_IWOTH | S_IRGRP | S_IWGRP,
&fops_3dfx, NULL);
#endif
#endif
DEBUGMSG(("3dfx: Successfully registered device 3dfx\n"));
@@ -842,10 +851,12 @@ void cleanup_module(void)
#ifdef CONFIG_MTRR
resetmtrr_3dfx();
#endif
#if HAVE_DEVFS
#if KERNEL_MIN_VER(2,6,0)
devfs_remove("3dfx");
#elif KERNEL_MIN_VER(2,3,46) || defined(DEVFS_SUPPORT)
devfs_unregister(devfs_handle);
#endif
#endif
if (unregister_chrdev(MAJOR_3DFX, "3dfx")) {

10
Device3Dfx/ChangeLog
View File

@@ -1,3 +1,13 @@
2007-02-06 Guillem Jover <guillem@hadrons.org>
* 3dfx_driver.c (HAVE_DEVFS): Define to 1 if
LINUX_VERSION_CODE >= 2.3.46 and LINUX_VERSION_CODE <= 2.6.17 or
if DEVFS_SUPPORT is defined, define to 0 otherwise.
(devfs_handle): Only use if HAVE_DEVFS.
(init_module): Only use devfs_mk_cdev or devfs_register if HAVE_DEVFS.
(cleanup_module): Only use devfs_remove or devfs_unregister if
HAVE_DEVFS.
2007-02-06 Guillem Jover <guillem@hadrons.org>
* Makefile (CFLAGS): Use '-march' instead of the deprecated '-mcpu'.