New 2.4 stuff

This commit is contained in:
Karsten Keil 2000-06-18 16:06:23 +00:00
parent e36f65fb3c
commit fe43d8cb58
4 changed files with 92 additions and 2 deletions

View File

@ -118,6 +118,10 @@ static inline unsigned long copy_to_user(void *to, const void *from, unsigned lo
#define pci_resource_start_mem(pdev, nr) pci_resource_start(pdev, nr)
#define get_pcibase(ps, nr) ps->resource[nr].start
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
#define pci_get_sub_vendor(pdev, id) pci_read_config_word(pdev, PCI_SUBSYSTEM_VENDOR_ID, &id)
#define pci_get_sub_system(pdev, id) pci_read_config_word(pdev, PCI_SUBSYSTEM_ID, &id)
#endif
#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,118)
@ -174,5 +178,15 @@ static inline unsigned long copy_to_user(void *to, const void *from, unsigned lo
#define COMPAT_NEED_SPIN_LOCK_BH
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,99)
#define i_count_read(ic) ic
#define i_count_inc(ic) ic++
#else
#define i_count_read(ic) atomic_read(&ic)
#define i_count_inc(ic) atomic_inc(&ic)
#endif
#define COMPAT_PCI_COMMON_ID
#endif /* __KERNEL__ */
#endif /* _LINUX_ISDN_COMPAT_H */

View File

@ -17,8 +17,10 @@
#define COMPAT_HAS_NEW_PCI
#define COMPAT_HAS_2_2_PCI
#define get_pcibase(ps,nr) ps->base_address[nr]
#define pci_resource_start_io(pdev,nr) ((pdev)->base_address[nr] & PCI_BASE_ADDRESS_IO_MASK)
#define pci_resource_start_mem(pdev,nr) ((pdev)->base_address[nr] & PCI_BASE_ADDRESS_MEM_MASK)
#define pci_resource_start_io(pdev,nr) pdev->base_address[nr] & PCI_BASE_ADDRESS_IO_MASK
#define pci_resource_start_mem(pdev,nr) pdev->base_address[nr] & PCI_BASE_ADDRESS_MEM_MASK
#define pci_get_sub_vendor(pdev, id) pci_read_config_word(pdev, PCI_SUBSYSTEM_VENDOR_ID, &id)
#define pci_get_sub_system(pdev, id) pci_read_config_word(pdev, PCI_SUBSYSTEM_ID, &id)
#define FILEOP_HAS_FLUSH
#undef COMPAT_HAS_NEW_WAITQ
#undef COMPAT_HAS_NEW_SETUP
@ -64,3 +66,6 @@
#define COMPAT_HAVE_READ_LOCK_KERNEL
#define COMPAT_HAVE_WRITE_LOCK_KERNEL
#define COMPAT_HAVE_POLL_LOCK_KERNEL
#define COMPAT_PCI_COMMON_ID
#define i_count_read(ic) ic
#define i_count_inc(ic) ic++

View File

@ -18,6 +18,8 @@
#define get_pcibase(ps, nr) ps->resource[nr].start
#define pci_resource_start_io(pdev, nr) pci_resource_start(pdev, nr)
#define pci_resource_start_mem(pdev, nr) pci_resource_start(pdev, nr)
#define pci_get_sub_vendor(pdev, id) id = pdev->subsystem_vendor
#define pci_get_sub_system(pdev, id) id = pdev->subsystem_device
#define FILEOP_HAS_FLUSH
#define COMPAT_HAS_NEW_WAITQ
#define COMPAT_HAS_NEW_SETUP
@ -51,3 +53,10 @@
#define HAVE_DEVFS_FS
#undef COMPAT_NEED_MPPP_DEFS
#define COMPAT_HAVE_READ_LOCK_KERNEL
#define COMPAT_HAVE_WRITE_LOCK_KERNEL
#define COMPAT_HAVE_POLL_LOCK_KERNEL
#undef COMPAT_HAS_2_2_PCI
#define COMPAT_PCI_COMMON_ID
#define i_count_read(ic) atomic_read(&ic)
#define i_count_inc(ic) atomic_inc(&ic)

62
v2.4.ctrl Normal file
View File

@ -0,0 +1,62 @@
#delete #include <linux/isdn_compat.h>
#define GET_USER get_user
#define PUT_USER put_user
#define RWTYPE long
#define LSTYPE long long
#define RWARG unsigned long
#define LSARG long long
#define COMPAT_NEED_UACCESS
#define SET_SKB_FREE(x)
#define idev_kfree_skb(a,b) dev_kfree_skb(a)
#define idev_kfree_skb_irq(a,b) dev_kfree_skb_irq(a)
#define idev_kfree_skb_any(a,b) dev_kfree_skb_any(a)
#define COMPAT_HAS_NEW_SYMTAB
#define CLOSETYPE int
#define CLOSEVAL (0)
#define MINOR_PART(f) MINOR(f->f_dentry->d_inode->i_rdev)
#define COMPAT_HAS_NEW_PCI
#define get_pcibase(ps, nr) ps->resource[nr].start
#define pci_resource_start_io(pdev,nr) pci_resource_start(pdev,nr)
#define pci_resource_start_mem(pdev,nr) pci_resource_start(pdev,nr)
#define pci_get_sub_vendor(pdev, id) id = pdev->subsystem_vendor
#define pci_get_sub_system(pdev, id) id = pdev->subsystem_device
#define FILEOP_HAS_FLUSH
#define COMPAT_HAS_NEW_WAITQ
#define COMPAT_HAS_NEW_SETUP
#define COMPAT_HAS_ISA_IOREMAP
#define COMPAT_HAS_pci_find_subsys
#define COMPAT_HAS_kmem_cache
#define COMPAT_d_alloc_root_one_parameter
#define COMPAT_HAS_init_special_inode
#define COMPAT_has_fileops_in_inode
#define COMPAT_has_generic_read_dir
#define ISDN_TTY_FCLASS1
#undef CAPI_PPP_ON_RAW_DEVICE
#undef CONFIG_ISDN_WITH_ABC
#undef CONFIG_ISDN_WITH_ABC_CALLB
#undef CONFIG_ISDN_WITH_ABC_UDP_CHECK
#undef CONFIG_ISDN_WITH_ABC_UDP_CHECK_HANGUP
#undef CONFIG_ISDN_WITH_ABC_UDP_CHECK_DIAL
#undef CONFIG_ISDN_WITH_ABC_OUTGOING_EAZ
#undef CONFIG_ISDN_WITH_ABC_LCR_SUPPORT
#undef CONFIG_ISDN_WITH_ABC_IPV4_TCP_KEEPALIVE
#undef CONFIG_ISDN_WITH_ABC_IPV4_DYNADDR
#undef CONFIG_ISDN_WITH_ABC_RCV_NO_HUPTIMER
#undef CONFIG_ISDN_WITH_ABC_ICALL_BIND
#undef CONFIG_ISDN_WITH_ABC_CH_EXTINUSE
#undef CONFIG_ISDN_WITH_ABC_CONN_ERROR
#undef CONFIG_ISDN_WITH_ABC_RAWIPCOMPRESS
#undef CONFIG_ISDN_WITH_ABC_FRAME_LIMIT
#define BIG_PHONE_NUMBERS
#undef COMPAT_NO_SOFTNET
#define HAVE_DEVFS_FS
#undef COMPAT_NEED_MPPP_DEFS
#define COMPAT_HAVE_READ_LOCK_KERNEL
#define COMPAT_HAVE_WRITE_LOCK_KERNEL
#define COMPAT_HAVE_POLL_LOCK_KERNEL
#undef COMPAT_HAS_2_2_PCI
#define COMPAT_PCI_COMMON_ID
#define i_count_read(ic) atomic_read(&ic)
#define i_count_inc(ic) atomic_inc(&ic)