compatibility changes from KERNEL_2_4
This commit is contained in:
Kai Germaschewski
parent
331c629e51
commit
03c561f5cc
|
|
@ -166,7 +166,7 @@ if [ "$CONFIG_ISDN_CAPI" != "n" ]; then
|
|||
dep_mbool ' AVM B1 PCI V4 support' CONFIG_ISDN_DRV_AVMB1_B1PCIV4 $CONFIG_ISDN_DRV_AVMB1_B1PCI
|
||||
dep_tristate ' AVM T1/T1-B ISA support' CONFIG_ISDN_DRV_AVMB1_T1ISA $CONFIG_ISDN_CAPI
|
||||
dep_tristate ' AVM B1/M1/M2 PCMCIA support' CONFIG_ISDN_DRV_AVMB1_B1PCMCIA $CONFIG_ISDN_CAPI $CONFIG_PCMCIA
|
||||
dep_tristate ' AVM B1/M1/M2 PCMCIA cs module' CONFIG_ISDN_DRV_AVMB1_AVM_CS $CONFIG_ISDN_DRV_AVMB1_B1PCMCIA
|
||||
dep_tristate ' AVM B1/M1/M2 PCMCIA cs module' CONFIG_ISDN_DRV_AVMB1_AVM_CS $CONFIG_ISDN_DRV_AVMB1_B1PCMCIA $CONFIG_PCMCIA
|
||||
dep_tristate ' AVM T1/T1-B PCI support' CONFIG_ISDN_DRV_AVMB1_T1PCI $CONFIG_ISDN_CAPI $CONFIG_PCI
|
||||
dep_tristate ' AVM C4 support' CONFIG_ISDN_DRV_AVMB1_C4 $CONFIG_ISDN_CAPI $CONFIG_PCI
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -6,6 +6,10 @@
|
|||
* (c) Copyright 1999 by Carsten Paeth (calle@calle.in-berlin.de)
|
||||
*
|
||||
* $Log$
|
||||
* Revision 1.20 2000/11/23 20:45:14 kai
|
||||
* fixed module_init/exit stuff
|
||||
* Note: compiled-in kernel doesn't work pre 2.2.18 anymore.
|
||||
*
|
||||
* Revision 1.19 2000/11/19 17:02:47 kai
|
||||
* compatibility cleanup - part 3
|
||||
*
|
||||
|
|
@ -108,9 +112,7 @@
|
|||
#include <linux/init.h>
|
||||
#include <linux/isdn_compat.h>
|
||||
#include <asm/uaccess.h>
|
||||
#ifndef COMPAT_NO_SOFTNET
|
||||
#include <linux/netdevice.h>
|
||||
#endif
|
||||
#include "capilli.h"
|
||||
#include "avmcard.h"
|
||||
#include "capicmd.h"
|
||||
|
|
|
|||
|
|
@ -6,6 +6,9 @@
|
|||
* (c) Copyright 2000 by Carsten Paeth (calle@calle.in-berlin.de)
|
||||
*
|
||||
* $Log$
|
||||
* Revision 1.11 2000/11/19 17:02:47 kai
|
||||
* compatibility cleanup - part 3
|
||||
*
|
||||
* Revision 1.10 2000/11/19 17:01:53 kai
|
||||
* compatibility cleanup - part 2
|
||||
*
|
||||
|
|
@ -54,9 +57,7 @@
|
|||
#include <linux/init.h>
|
||||
#include <linux/isdn_compat.h>
|
||||
#include <asm/uaccess.h>
|
||||
#ifndef COMPAT_NO_SOFTNET
|
||||
#include <linux/netdevice.h>
|
||||
#endif
|
||||
#include "capilli.h"
|
||||
#include "avmcard.h"
|
||||
#include "capicmd.h"
|
||||
|
|
|
|||
|
|
@ -6,6 +6,11 @@
|
|||
* (c) Copyright 1999 by Carsten Paeth (calle@calle.in-berlin.de)
|
||||
*
|
||||
* $Log$
|
||||
* Revision 1.13 2001/03/15 09:03:32 kai
|
||||
* spelling fixes from KERNEL_2_4
|
||||
* compilation warning fixes from KERNEL_2_4
|
||||
* sedlbauer PCMCIA support module
|
||||
*
|
||||
* Revision 1.12 2000/11/23 20:45:14 kai
|
||||
* fixed module_init/exit stuff
|
||||
* Note: compiled-in kernel doesn't work pre 2.2.18 anymore.
|
||||
|
|
@ -88,7 +93,6 @@
|
|||
#include <asm/io.h>
|
||||
#include <linux/capi.h>
|
||||
#include <linux/b1pcmcia.h>
|
||||
#include <linux/isdn_compat.h>
|
||||
#include "capicmd.h"
|
||||
#include "capiutil.h"
|
||||
#include "capilli.h"
|
||||
|
|
|
|||
|
|
@ -6,6 +6,11 @@
|
|||
* (c) Copyright 1999 by Carsten Paeth (calle@calle.in-berlin.de)
|
||||
*
|
||||
* $Log$
|
||||
* Revision 1.29 2001/03/15 09:03:32 kai
|
||||
* spelling fixes from KERNEL_2_4
|
||||
* compilation warning fixes from KERNEL_2_4
|
||||
* sedlbauer PCMCIA support module
|
||||
*
|
||||
* Revision 1.28 2001/01/22 10:26:03 calle
|
||||
* - Didn't compile with 2.2.X (pci_resource_start not defined).
|
||||
*
|
||||
|
|
@ -122,14 +127,12 @@
|
|||
#include <linux/interrupt.h>
|
||||
#include <linux/ioport.h>
|
||||
#include <linux/pci.h>
|
||||
#include <linux/isdn_compat.h>
|
||||
#include <linux/capi.h>
|
||||
#include <linux/init.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/uaccess.h>
|
||||
#ifndef COMPAT_NO_SOFTNET
|
||||
#include <linux/netdevice.h>
|
||||
#endif
|
||||
#include <linux/isdn_compat.h>
|
||||
#include "capicmd.h"
|
||||
#include "capiutil.h"
|
||||
#include "capilli.h"
|
||||
|
|
|
|||
|
|
@ -6,6 +6,11 @@
|
|||
* Copyright 1996 by Carsten Paeth (calle@calle.in-berlin.de)
|
||||
*
|
||||
* $Log$
|
||||
* Revision 1.50 2001/03/15 09:03:32 kai
|
||||
* spelling fixes from KERNEL_2_4
|
||||
* compilation warning fixes from KERNEL_2_4
|
||||
* sedlbauer PCMCIA support module
|
||||
*
|
||||
* Revision 1.49 2001/01/29 13:13:44 calle
|
||||
* - added compile info to revision output.
|
||||
*
|
||||
|
|
@ -238,6 +243,7 @@
|
|||
#include <linux/smp_lock.h>
|
||||
#include <linux/timer.h>
|
||||
#include <linux/wait.h>
|
||||
#include <linux/isdn_compat.h>
|
||||
#ifdef CONFIG_ISDN_CAPI_MIDDLEWARE
|
||||
#include <linux/tty.h>
|
||||
#ifdef CONFIG_PPP
|
||||
|
|
@ -256,7 +262,6 @@
|
|||
#include <linux/capi.h>
|
||||
#include <linux/kernelcapi.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/isdn_compat.h>
|
||||
#ifdef HAVE_DEVFS_FS
|
||||
#include <linux/devfs_fs_kernel.h>
|
||||
#endif /* HAVE_DEVFS_FS */
|
||||
|
|
|
|||
|
|
@ -6,6 +6,11 @@
|
|||
* Copyright 1997 by Carsten Paeth (calle@calle.in-berlin.de)
|
||||
*
|
||||
* $Log$
|
||||
* Revision 1.40 2001/03/15 09:03:32 kai
|
||||
* spelling fixes from KERNEL_2_4
|
||||
* compilation warning fixes from KERNEL_2_4
|
||||
* sedlbauer PCMCIA support module
|
||||
*
|
||||
* Revision 1.39 2000/11/23 20:45:14 kai
|
||||
* fixed module_init/exit stuff
|
||||
* Note: compiled-in kernel doesn't work pre 2.2.18 anymore.
|
||||
|
|
@ -215,7 +220,6 @@
|
|||
#include <linux/init.h>
|
||||
#include <asm/segment.h>
|
||||
|
||||
#include <linux/isdn_compat.h>
|
||||
#include "capiutil.h"
|
||||
#include "capicmd.h"
|
||||
#include "capidrv.h"
|
||||
|
|
|
|||
|
|
@ -6,6 +6,11 @@
|
|||
* Heavily based on devpts filesystem from H. Peter Anvin
|
||||
*
|
||||
* $Log$
|
||||
* Revision 1.17 2001/03/15 09:03:33 kai
|
||||
* spelling fixes from KERNEL_2_4
|
||||
* compilation warning fixes from KERNEL_2_4
|
||||
* sedlbauer PCMCIA support module
|
||||
*
|
||||
* Revision 1.16 2000/11/28 11:42:19 kai
|
||||
* merged MODULE_DEV_TABLE changes
|
||||
*
|
||||
|
|
@ -88,9 +93,9 @@
|
|||
#include <linux/major.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/ctype.h>
|
||||
#include <linux/isdn_compat.h>
|
||||
#include <asm/bitops.h>
|
||||
#include <asm/uaccess.h>
|
||||
#include <linux/isdn_compat.h>
|
||||
|
||||
MODULE_AUTHOR("Carsten Paeth <calle@calle.de>");
|
||||
|
||||
|
|
|
|||
|
|
@ -7,6 +7,10 @@
|
|||
* Rewritten for Linux 1996 by Carsten Paeth (calle@calle.in-berlin.de)
|
||||
*
|
||||
* $Log$
|
||||
* Revision 1.13 2000/11/23 20:45:14 kai
|
||||
* fixed module_init/exit stuff
|
||||
* Note: compiled-in kernel doesn't work pre 2.2.18 anymore.
|
||||
*
|
||||
* Revision 1.12 2000/11/01 14:05:02 calle
|
||||
* - use module_init/module_exit from linux/init.h.
|
||||
* - all static struct variables are initialized with "membername:" now.
|
||||
|
|
@ -89,7 +93,6 @@
|
|||
#include <linux/init.h>
|
||||
#include <asm/segment.h>
|
||||
#include <linux/config.h>
|
||||
|
||||
#include <linux/isdn_compat.h>
|
||||
#include "capiutil.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -6,6 +6,11 @@
|
|||
* (c) Copyright 1999 by Carsten Paeth (calle@calle.in-berlin.de)
|
||||
*
|
||||
* $Log$
|
||||
* Revision 1.23 2001/03/15 09:03:33 kai
|
||||
* spelling fixes from KERNEL_2_4
|
||||
* compilation warning fixes from KERNEL_2_4
|
||||
* sedlbauer PCMCIA support module
|
||||
*
|
||||
* Revision 1.22 2000/12/11 00:10:33 kai
|
||||
* add the tq_scheduler -> schedule_task change from 2.4
|
||||
*
|
||||
|
|
@ -122,11 +127,11 @@
|
|||
#include <linux/proc_fs.h>
|
||||
#include <linux/skbuff.h>
|
||||
#include <linux/tqueue.h>
|
||||
#include <linux/isdn_compat.h>
|
||||
#include <linux/capi.h>
|
||||
#include <linux/kernelcapi.h>
|
||||
#include <linux/locks.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/isdn_compat.h>
|
||||
#include <asm/uaccess.h>
|
||||
#include "capicmd.h"
|
||||
#include "capiutil.h"
|
||||
|
|
|
|||
|
|
@ -6,6 +6,11 @@
|
|||
* (c) Copyright 1999 by Carsten Paeth (calle@calle.in-berlin.de)
|
||||
*
|
||||
* $Log$
|
||||
* Revision 1.17 2001/03/15 09:03:33 kai
|
||||
* spelling fixes from KERNEL_2_4
|
||||
* compilation warning fixes from KERNEL_2_4
|
||||
* sedlbauer PCMCIA support module
|
||||
*
|
||||
* Revision 1.16 2000/11/23 20:45:14 kai
|
||||
* fixed module_init/exit stuff
|
||||
* Note: compiled-in kernel doesn't work pre 2.2.18 anymore.
|
||||
|
|
@ -98,8 +103,8 @@
|
|||
#include <linux/ioport.h>
|
||||
#include <linux/capi.h>
|
||||
#include <linux/init.h>
|
||||
#include <asm/io.h>
|
||||
#include <linux/isdn_compat.h>
|
||||
#include <asm/io.h>
|
||||
#include "capicmd.h"
|
||||
#include "capiutil.h"
|
||||
#include "capilli.h"
|
||||
|
|
|
|||
|
|
@ -6,6 +6,11 @@
|
|||
* (c) Copyright 1999 by Carsten Paeth (calle@calle.in-berlin.de)
|
||||
*
|
||||
* $Log$
|
||||
* Revision 1.21 2001/03/15 09:03:33 kai
|
||||
* spelling fixes from KERNEL_2_4
|
||||
* compilation warning fixes from KERNEL_2_4
|
||||
* sedlbauer PCMCIA support module
|
||||
*
|
||||
* Revision 1.20 2001/01/22 10:26:03 calle
|
||||
* - Didn't compile with 2.2.X (pci_resource_start not defined).
|
||||
*
|
||||
|
|
@ -103,9 +108,9 @@
|
|||
#include <linux/interrupt.h>
|
||||
#include <linux/ioport.h>
|
||||
#include <linux/pci.h>
|
||||
#include <linux/isdn_compat.h>
|
||||
#include <linux/capi.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/isdn_compat.h>
|
||||
#include <asm/io.h>
|
||||
#include "capicmd.h"
|
||||
#include "capiutil.h"
|
||||
|
|
|
|||
|
|
@ -20,12 +20,14 @@
|
|||
#include "jade.h"
|
||||
#include "isdnl1.h"
|
||||
#include <linux/pci.h>
|
||||
#include <linux/isdn_compat.h>
|
||||
#include "bkm_ax.h"
|
||||
|
||||
extern const char *CardType[];
|
||||
|
||||
const char *bkm_a4t_revision = "$Revision$";
|
||||
|
||||
|
||||
static inline u_char
|
||||
readreg(unsigned int ale, unsigned int adr, u_char off)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@
|
|||
#include "hscx.h"
|
||||
#include "isdnl1.h"
|
||||
#include <linux/pci.h>
|
||||
#include <linux/isdn_compat.h>
|
||||
#include "bkm_ax.h"
|
||||
|
||||
#if CONFIG_PCI
|
||||
|
|
|
|||
|
|
@ -10,9 +10,7 @@
|
|||
#include <linux/stddef.h>
|
||||
#include <linux/timer.h>
|
||||
#include <linux/config.h>
|
||||
#include <linux/isdn_compat.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/pci.h>
|
||||
#include "hisax.h"
|
||||
#include <linux/module.h>
|
||||
#include <linux/kernel_stat.h>
|
||||
|
|
@ -1755,6 +1753,8 @@ int __devinit hisax_init_pcmcia(void *pcm_iob, int *busy_flag, struct IsdnCard *
|
|||
}
|
||||
|
||||
#ifndef COMPAT_HAS_2_2_PCI
|
||||
#include <linux/pci.h>
|
||||
|
||||
static struct pci_device_id hisax_pci_tbl[] __initdata = {
|
||||
#ifdef CONFIG_HISAX_FRITZPCI
|
||||
{PCI_VENDOR_ID_AVM, PCI_DEVICE_ID_AVM_A1, PCI_ANY_ID, PCI_ANY_ID},
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@
|
|||
#include "ipac.h"
|
||||
#include "isdnl1.h"
|
||||
#include <linux/pci.h>
|
||||
#include <linux/isdn_compat.h>
|
||||
|
||||
extern const char *CardType[];
|
||||
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@
|
|||
#include "hscx.h"
|
||||
#include "isdnl1.h"
|
||||
#include <linux/pci.h>
|
||||
#include <linux/isdn_compat.h>
|
||||
#include <linux/serial.h>
|
||||
#include <linux/serial_reg.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@
|
|||
#include "isdnl1.h"
|
||||
#include "ipac.h"
|
||||
#include <linux/pci.h>
|
||||
#include <linux/isdn_compat.h>
|
||||
|
||||
extern const char *CardType[];
|
||||
const char *gazel_revision = "$Revision$";
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@
|
|||
#include "hfc_pci.h"
|
||||
#include "isdnl1.h"
|
||||
#include <linux/pci.h>
|
||||
#include <linux/isdn_compat.h>
|
||||
#include <linux/interrupt.h>
|
||||
|
||||
extern const char *CardType[];
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@
|
|||
#include "hscx.h"
|
||||
#include "isdnl1.h"
|
||||
#include <linux/pci.h>
|
||||
#include <linux/isdn_compat.h>
|
||||
|
||||
extern const char *CardType[];
|
||||
const char *niccy_revision = "$Revision$";
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@
|
|||
#include "isac.h"
|
||||
#include "isdnl1.h"
|
||||
#include <linux/pci.h>
|
||||
#include <linux/isdn_compat.h>
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/ppp_defs.h>
|
||||
#include "netjet.h"
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@
|
|||
#include "icc.h"
|
||||
#include "isdnl1.h"
|
||||
#include <linux/pci.h>
|
||||
#include <linux/isdn_compat.h>
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/ppp_defs.h>
|
||||
#include "netjet.h"
|
||||
|
|
|
|||
|
|
@ -49,6 +49,7 @@
|
|||
#include "isar.h"
|
||||
#include "isdnl1.h"
|
||||
#include <linux/pci.h>
|
||||
#include <linux/isdn_compat.h>
|
||||
|
||||
extern const char *CardType[];
|
||||
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@
|
|||
#include "isdnl1.h"
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/pci.h>
|
||||
#include <linux/isdn_compat.h>
|
||||
|
||||
/* table entry in the PCI devices list */
|
||||
typedef struct {
|
||||
|
|
|
|||
|
|
@ -6,6 +6,22 @@
|
|||
* Copyright 1996 by Carsten Paeth (calle@calle.in-berlin.de)
|
||||
*
|
||||
* $Log$
|
||||
* Revision 1.8 1999/07/01 15:26:54 calle
|
||||
* complete new version (I love it):
|
||||
* + new hardware independed "capi_driver" interface that will make it easy to:
|
||||
* - support other controllers with CAPI-2.0 (i.e. USB Controller)
|
||||
* - write a CAPI-2.0 for the passive cards
|
||||
* - support serial link CAPI-2.0 boxes.
|
||||
* + wrote "capi_driver" for all supported cards.
|
||||
* + "capi_driver" (supported cards) now have to be configured with
|
||||
* make menuconfig, in the past all supported cards where included
|
||||
* at once.
|
||||
* + new and better informations in /proc/capi/
|
||||
* + new ioctl to switch trace of capi messages per controller
|
||||
* using "avmcapictrl trace [contr] on|off|...."
|
||||
* + complete testcircle with all supported cards and also the
|
||||
* PCMCIA cards (now patch for pcmcia-cs-3.0.13 needed) done.
|
||||
*
|
||||
* Revision 1.7 1999/06/21 15:24:25 calle
|
||||
* extend information in /proc.
|
||||
*
|
||||
|
|
@ -113,7 +129,7 @@ typedef struct avmb1_extcarddef {
|
|||
#define AVMB1_LOAD_AND_CONFIG 3 /* load image and config to card */
|
||||
#define AVMB1_ADDCARD_WITH_TYPE 4 /* add a new card, with cardtype */
|
||||
#define AVMB1_GET_CARDINFO 5 /* get cardtype */
|
||||
#define AVMB1_REMOVECARD 6 /* remove a card (usefull for T1) */
|
||||
#define AVMB1_REMOVECARD 6 /* remove a card (useful for T1) */
|
||||
|
||||
#define AVMB1_REGISTERCARD_IS_OBSOLETE
|
||||
|
||||
|
|
|
|||
|
|
@ -242,6 +242,9 @@ typedef struct wait_queue *wait_queue_head_t;
|
|||
#define PCI_SUBDEVICE_ID_HYPERCOPE_CHAMP2 0x0108
|
||||
#define PCI_SUBDEVICE_ID_HYPERCOPE_PLEXUS 0x0109
|
||||
|
||||
#define PCI_VENDOR_ID_ABOCOM 0x13D1
|
||||
#define PCI_DEVICE_ID_ABOCOM_2BD1 0x2BD1
|
||||
|
||||
#endif /* COMPAT_NEED_PCI_IDS */
|
||||
|
||||
#endif /* __KERNEL__ */
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@ struct isdn_ppp_comp_data {
|
|||
*
|
||||
* We use this same struct for the reset entry of the compressor to commu-
|
||||
* nicate to its caller how to deal with sending of a Reset Ack. In this
|
||||
* case, expra is not used, but other options still apply (supressing
|
||||
* case, expra is not used, but other options still apply (suppressing
|
||||
* sending with rsend, appending arbitrary data, etc).
|
||||
*/
|
||||
|
||||
|
|
|
|||
389
std2kern
389
std2kern
|
|
@ -1,118 +1,140 @@
|
|||
#!/bin/sh
|
||||
|
||||
KERNELDIR=/usr/src/linux
|
||||
DOCP=docpd
|
||||
PREPARSER="./preparser"
|
||||
UNIQUE=false
|
||||
VERBOSE=false
|
||||
NOTEST=true
|
||||
|
||||
docpd() {
|
||||
BASENAME=`basename $2`;
|
||||
if [ "$BASENAME" = "Makefile" ] ; then
|
||||
if [ $VERSION -gt 3 -o $PATCHLEVEL -gt 3 ]; then
|
||||
rm -f $2
|
||||
cat $1 | sed -e "s/drivers\/isdn\/Rules\.make/Rules\.make/" > $2
|
||||
fi
|
||||
else
|
||||
if ! cmp -s $1 $2 ; then
|
||||
if $NOTEST ; then
|
||||
echo Copying $1 ...
|
||||
mkdir -p `dirname $2`
|
||||
rm -f $2 # unlink first
|
||||
cp $1 $2
|
||||
else
|
||||
echo $1 was changed
|
||||
fi
|
||||
else
|
||||
if $VERBOSE ; then
|
||||
echo $2 is up to date, NOT converted
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
}
|
||||
DODIFF=false
|
||||
DIFFREV=false
|
||||
ALLOW_ANY_DIR=true
|
||||
|
||||
docp() {
|
||||
if [ $1 -nt $2 -o ! -f $2 ] ; then
|
||||
if $NOTEST ; then
|
||||
echo Copying $1 ...
|
||||
mkdir -p `dirname $2`
|
||||
rm -f $2 # unlink first
|
||||
cp $1 $2
|
||||
else
|
||||
echo $1 was changed
|
||||
fi
|
||||
else
|
||||
if $VERBOSE ; then
|
||||
echo $2 is up to date, NOT converted
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
docpuni() {
|
||||
if $VERBOSE ; then
|
||||
echo -n "Processing $1 ... "
|
||||
SRCNAME=$1;
|
||||
if $VERBOSE; then
|
||||
echo -n "$SRCNAME... "
|
||||
fi
|
||||
|
||||
# special cases
|
||||
|
||||
TMPNAME=/tmp/`basename $1`.$$
|
||||
$PREPARSER -c $CTRLNAME $1 $TMPNAME
|
||||
RES=$?
|
||||
if [ "$RES" -eq "0" ] ; then
|
||||
if ! cmp -s $1 $2 ; then
|
||||
if $NOTEST ; then
|
||||
if $VERBOSE ; then
|
||||
echo copying original
|
||||
else
|
||||
echo "Processing $1 ... copying original"
|
||||
fi
|
||||
mkdir -p `dirname $2`
|
||||
rm -rf $2 # unlink first
|
||||
cp $1 $2
|
||||
else
|
||||
if $VERBOSE ; then
|
||||
echo original was changed
|
||||
else
|
||||
echo "Processing $1 ... original was changed"
|
||||
fi
|
||||
fi
|
||||
else
|
||||
if $VERBOSE ; then
|
||||
echo original file is up to date
|
||||
fi
|
||||
|
||||
# Makefiles
|
||||
BASENAME=`basename $2`;
|
||||
if [ "$BASENAME" = "Makefile" ]; then
|
||||
if [ $VERSION -gt 3 -o \( $VERSION -eq 2 -a $PATCHLEVEL -gt 3 \) ]; then
|
||||
sed -e "s/drivers\/isdn\/Rules\.make/Rules\.make/" < $SRCNAME > $TMPNAME
|
||||
if $VERBOSE ; then
|
||||
echo -n "processing... modified..."
|
||||
fi
|
||||
SRCNAME=$TMPNAME
|
||||
fi
|
||||
rm $TMPNAME
|
||||
return 0
|
||||
fi
|
||||
if [ "$RES" -eq "2" ] ; then
|
||||
if ! cmp -s $TMPNAME $2 ; then
|
||||
if $NOTEST ; then
|
||||
if $VERBOSE ; then
|
||||
echo copying modified
|
||||
else
|
||||
echo "Processing $1 ... copying modified"
|
||||
fi
|
||||
mkdir -p `dirname $2`
|
||||
rm -rf $2 # unlink first
|
||||
cp $TMPNAME $2
|
||||
else
|
||||
if $VERBOSE ; then
|
||||
echo modified was changed
|
||||
else
|
||||
echo "Processing $1 ... modified was changed"
|
||||
fi
|
||||
fi
|
||||
else
|
||||
if $VERBOSE ; then
|
||||
echo modified file is up to date
|
||||
fi
|
||||
fi
|
||||
rm $TMPNAME
|
||||
return 0
|
||||
fi
|
||||
echo
|
||||
echo "problem with $PREPARSER retcode $RES"
|
||||
exit 1
|
||||
}
|
||||
|
||||
# Rules.make
|
||||
if [ "$BASENAME" = "Rules.make" ]; then
|
||||
if ! [ $VERSION -gt 3 -o \( $VERSION -eq 2 -a $PATCHLEVEL -gt 3 \) ]; then
|
||||
if $VERBOSE; then
|
||||
echo "skipped"
|
||||
fi
|
||||
return
|
||||
fi
|
||||
fi
|
||||
|
||||
# Config.in
|
||||
if [ "$1" = "drivers/isdn/Config.in" ]; then
|
||||
if ! [ $VERSION -gt 3 -o \( $VERSION -eq 2 -a $PATCHLEVEL -gt 3 \) ]; then
|
||||
grep -v "CONFIG_PCMCIA" < $SRCNAME > $TMPNAME
|
||||
if $VERBOSE ; then
|
||||
echo -n "processing... modified..."
|
||||
fi
|
||||
SRCNAME=$TMPNAME
|
||||
fi
|
||||
fi
|
||||
|
||||
# Configure.help bits // FIXME
|
||||
if echo $SRCNAME | grep -q "Configure.help"; then
|
||||
if $VERBOSE; then
|
||||
echo "skipped"
|
||||
fi
|
||||
return
|
||||
fi;
|
||||
|
||||
# MD5SUM
|
||||
if [ "SRCNAME" = "drivers/isdn/hisax/md5sums.asc" ] ; then
|
||||
if $UNIQUE; then
|
||||
if $VERBOSE; then
|
||||
echo "skipped"
|
||||
fi
|
||||
return
|
||||
fi
|
||||
fi
|
||||
|
||||
# *.[hc] : preparse if selected
|
||||
if $UNIQUE ; then
|
||||
if echo $SRCNAME | egrep -q '.[hc]$'; then
|
||||
# only copy isdn_compat.h if we don't have a
|
||||
# delete #include <linux/isdn_compat.h> in the ctrlfile
|
||||
if [ "$1" = "include/linux/isdn_compat.h" ]; then
|
||||
if grep -q isdn_compat.h $CTRLNAME; then
|
||||
if $VERBOSE; then
|
||||
echo "skipped"
|
||||
fi
|
||||
return
|
||||
fi;
|
||||
fi
|
||||
if $VERBOSE; then
|
||||
echo -n "processing... "
|
||||
fi
|
||||
$PREPARSER -c $CTRLNAME $SRCNAME $TMPNAME
|
||||
RETVAL=$?
|
||||
if [ $RETVAL -ne 2 -a $RETVAL -ne 0 ] ; then
|
||||
echo "Problem with preparser retval $RETVAL"
|
||||
exit 1
|
||||
fi
|
||||
if [ $RETVAL -eq 2 ] ; then
|
||||
if $VERBOSE; then
|
||||
echo -n "modified... "
|
||||
fi
|
||||
SRCNAME=$TMPNAME
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
if $DODIFF; then
|
||||
if $VERBOSE; then
|
||||
echo
|
||||
fi
|
||||
if $DIFFREV; then
|
||||
diff -u $2 $SRCNAME
|
||||
else
|
||||
diff -u $SRCNAME $2
|
||||
fi
|
||||
else
|
||||
# do the actual copy, if necessary
|
||||
if ! cmp -s $SRCNAME $2 ; then
|
||||
if $VERBOSE; then
|
||||
echo "copying"
|
||||
else
|
||||
echo "$1... copying"
|
||||
fi
|
||||
if $NOTEST ; then
|
||||
mkdir -p `dirname $2`
|
||||
rm -f $2 # unlink first
|
||||
cp $SRCNAME $2
|
||||
fi
|
||||
else
|
||||
if $VERBOSE; then
|
||||
echo "up to date"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ -f $TMPNAME ]; then
|
||||
rm -f $TMPNAME
|
||||
fi
|
||||
}
|
||||
|
||||
#
|
||||
# Print usage and exit
|
||||
|
|
@ -123,16 +145,16 @@ usage() {
|
|||
std2kern is used for updating your kernel-tree from within
|
||||
this directory.
|
||||
|
||||
std2kern [-d] [-h] [-k DIR] [-v] [-u] [-c FILE] [files ...]
|
||||
std2kern [-h] [-k DIR] [-v] [-u] [-c FILE] [files ...]
|
||||
|
||||
Options:
|
||||
|
||||
-h This Text.
|
||||
-d Copy depends on modification date instead of file-compare.
|
||||
-k DIR Kerneltree is in DIR instead of /usr/src/linux
|
||||
-v More mesages about processing
|
||||
-u Make a diff for a unique kernel-tree
|
||||
(preprocessing with $PREPARSER)
|
||||
-u preprocessing with $PREPARSER
|
||||
-d don't copy but do a unified diff instead
|
||||
-r reverse directions of diff
|
||||
-c FILE Use FILE as control file for $PREPARSER (only with -u)
|
||||
-t Test, don't really copy files
|
||||
|
||||
|
|
@ -154,15 +176,15 @@ checkkernel() {
|
|||
fi
|
||||
fi
|
||||
echo "The given argument does not look like a kernel dir"
|
||||
exit 1
|
||||
if ! $ALLOW_ANY_DIR; then
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
#
|
||||
# Determine a control file name
|
||||
#
|
||||
calc_ctrl_file() {
|
||||
eval `sed -n 's/^\([A-Z]*\) = \([0-9]*\)$/\1=\2/p' $KERNELDIR/Makefile`
|
||||
echo "Current kernel version is $VERSION.$PATCHLEVEL.$SUBLEVEL"
|
||||
if [ -z "$CTRLNAME" ] ; then
|
||||
CTRLNAME=v$VERSION.$PATCHLEVEL.$SUBLEVEL.ctrl
|
||||
if [ -f $CTRLNAME ] ; then
|
||||
|
|
@ -181,7 +203,7 @@ calc_ctrl_file() {
|
|||
exit 1
|
||||
}
|
||||
|
||||
while getopts :dhk:uc:vt a ; do
|
||||
while getopts :dhk:uc:vtidr a ; do
|
||||
case $a in
|
||||
\?) case $OPTARG in
|
||||
k) echo "-k requires Kernel directory parameter"
|
||||
|
|
@ -203,7 +225,11 @@ while getopts :dhk:uc:vt a ; do
|
|||
;;
|
||||
t) NOTEST=false
|
||||
;;
|
||||
d) DOCP=docp
|
||||
i) ALLOW_ANY_DIR=true;
|
||||
;;
|
||||
d) DODIFF=true;
|
||||
;;
|
||||
r) DIFFREV=true;
|
||||
;;
|
||||
h) usage
|
||||
;;
|
||||
|
|
@ -211,65 +237,37 @@ while getopts :dhk:uc:vt a ; do
|
|||
done
|
||||
shift `expr $OPTIND - 1`
|
||||
|
||||
calc_ctrl_file
|
||||
|
||||
if $UNIQUE ; then
|
||||
DOCP=docpuni
|
||||
if [ -z "$VERSION" -o -z "$PATCHLEVEL" ] ; then
|
||||
if ! [ -f $KERNELDIR/Makefile ] ; then
|
||||
echo "VERSION/PATCHLEVEL not set and no Makefile to read from"
|
||||
exit 1
|
||||
fi
|
||||
eval `sed -n 's/^\([A-Z]*\) = \([0-9]*\)$/\1=\2/p' $KERNELDIR/Makefile`
|
||||
fi
|
||||
|
||||
echo -n "Using $DOCP"
|
||||
echo "Current kernel version is $VERSION.$PATCHLEVEL.$SUBLEVEL"
|
||||
|
||||
if $UNIQUE ; then
|
||||
echo " with controlfile $CTRLNAME"
|
||||
else
|
||||
echo
|
||||
calc_ctrl_file
|
||||
echo "Controlfile $CTRLNAME"
|
||||
fi
|
||||
|
||||
if [ $# != 0 ]; then
|
||||
for i in $* ; do
|
||||
$DOCP $i $KERNELDIR/$i
|
||||
done
|
||||
for i in $* ; do
|
||||
docp $i $KERNELDIR/$i
|
||||
done
|
||||
else
|
||||
for i in drivers/isdn/isdn_*.[ch] ; do
|
||||
$DOCP $i $KERNELDIR/$i
|
||||
done
|
||||
for i in drivers/isdn/icn/icn.[ch] ; do
|
||||
$DOCP $i $KERNELDIR/$i
|
||||
done
|
||||
for i in drivers/isdn/pcbit/*.[ch] ; do
|
||||
$DOCP $i $KERNELDIR/$i
|
||||
done
|
||||
for i in drivers/isdn/hisax/*.[ch] drivers/isdn/hisax/md5sums.asc ; do
|
||||
if [ "$i" = "drivers/isdn/hisax/md5sums.asc" -a \
|
||||
"$UNIQUE" = "true" ] ; then
|
||||
if $VERBOSE ; then
|
||||
echo "$i skipped"
|
||||
fi
|
||||
else
|
||||
$DOCP $i $KERNELDIR/$i
|
||||
fi
|
||||
done
|
||||
for i in drivers/isdn/sc/*.[ch] ; do
|
||||
$DOCP $i $KERNELDIR/$i
|
||||
done
|
||||
for i in drivers/isdn/avmb1/*.[ch] ; do
|
||||
$DOCP $i $KERNELDIR/$i
|
||||
done
|
||||
for i in drivers/isdn/act2000/*.[ch] ; do
|
||||
$DOCP $i $KERNELDIR/$i
|
||||
done
|
||||
for i in drivers/isdn/isdnloop/*.[ch] ; do
|
||||
$DOCP $i $KERNELDIR/$i
|
||||
done
|
||||
for i in drivers/isdn/hysdn/*.[ch] ; do
|
||||
$DOCP $i $KERNELDIR/$i
|
||||
done
|
||||
if [ ! -d $KERNELDIR/drivers/isdn/divert ] ; then
|
||||
mkdir $KERNELDIR/drivers/isdn/divert
|
||||
fi
|
||||
for i in drivers/isdn/divert/*.[ch] ; do
|
||||
$DOCP $i $KERNELDIR/$i
|
||||
done
|
||||
for i in `find drivers -type f | grep -v CVS`; do
|
||||
docp $i $KERNELDIR/$i
|
||||
done
|
||||
for i in `find include -type f | grep -v CVS`; do
|
||||
docp $i $KERNELDIR/$i
|
||||
done
|
||||
for i in `find Documentation -type f | grep -v CVS`; do
|
||||
docp $i $KERNELDIR/$i
|
||||
done
|
||||
fi
|
||||
exit 0
|
||||
|
||||
if [ -f $KERNELDIR/Documentation/Configure.help ] ; then
|
||||
grep -q CONFIG_ISDN_DIVERSION $KERNELDIR/Documentation/Configure.help
|
||||
if [ $? != 0 ] ; then
|
||||
|
|
@ -292,70 +290,7 @@ else
|
|||
fi
|
||||
fi
|
||||
fi
|
||||
for i in drivers/isdn/eicon/*.[ch] ; do
|
||||
$DOCP $i $KERNELDIR/$i
|
||||
done
|
||||
COPY_COMPAT=false
|
||||
if [ -n "$CTRLNAME" ] ; then
|
||||
grep "linux/isdn_compat.h" $CTRLNAME >/dev/null || COPY_COMPAT=true;
|
||||
fi
|
||||
for i in include/linux/*.h ; do
|
||||
if [ "$i" = "include/linux/isdn_compat.h" -a \
|
||||
"$UNIQUE" = "true" -a "$COPY_COMPAT" = "false" ] ; then
|
||||
if $VERBOSE ; then
|
||||
echo "$i skipped"
|
||||
fi
|
||||
else
|
||||
$DOCP $i $KERNELDIR/$i
|
||||
fi
|
||||
done
|
||||
for i in Documentation/isdn/CREDITS Documentation/isdn/README* \
|
||||
Documentation/isdn/*.FAQ Documentation/isdn/INTERFACE* \
|
||||
Documentation/isdn/HiSax* Documentation/isdn/00-INDEX ; do
|
||||
if $UNIQUE ; then
|
||||
docpd $i $KERNELDIR/$i
|
||||
else
|
||||
$DOCP $i $KERNELDIR/$i
|
||||
fi
|
||||
done
|
||||
for i in drivers/isdn/Config.in ; do
|
||||
if $UNIQUE ; then
|
||||
docpd $i $KERNELDIR/$i
|
||||
else
|
||||
$DOCP $i $KERNELDIR/$i
|
||||
fi
|
||||
done
|
||||
for i in drivers/isdn/Makefile \
|
||||
drivers/isdn/icn/Makefile \
|
||||
drivers/isdn/hisax/Makefile \
|
||||
drivers/isdn/pcbit/Makefile \
|
||||
drivers/isdn/sc/Makefile \
|
||||
drivers/isdn/act2000/Makefile \
|
||||
drivers/isdn/isdnloop/Makefile \
|
||||
drivers/isdn/eicon/Makefile \
|
||||
drivers/isdn/divert/Makefile \
|
||||
drivers/isdn/avmb1/Makefile \
|
||||
drivers/isdn/hysdn/Makefile; do
|
||||
if [ -f $i.kernel ] ; then
|
||||
if $UNIQUE ; then
|
||||
docpd $i.kernel $KERNELDIR/$i
|
||||
else
|
||||
$DOCP $i.kernel $KERNELDIR/$i
|
||||
fi
|
||||
else
|
||||
if $UNIQUE ; then
|
||||
docpd $i $KERNELDIR/$i
|
||||
else
|
||||
$DOCP $i $KERNELDIR/$i
|
||||
fi
|
||||
fi
|
||||
done
|
||||
if [ $VERSION -le 2 -o $PATCHLEVEL -le 3 ]; then
|
||||
if $UNIQUE ; then
|
||||
docpd drivers/isdn/Rules.make $KERNELDIR/drivers/isdn/Rules.make
|
||||
else
|
||||
$DOCP drivers/isdn/Rules.make $KERNELDIR/drivers/isdn/Rules.make
|
||||
fi
|
||||
|
||||
fi
|
||||
if [ $VERSION -le 2 -o \( $VERSION -eq 2 -a $PATCHLEVEL -le 2 \) ]; then
|
||||
docp drivers/isdn/Rules.make $KERNELDIR/drivers/isdn/Rules.make
|
||||
fi
|
||||
fi
|
||||
|
|
|
|||
2
stddiff
2
stddiff
|
|
@ -183,7 +183,7 @@ else
|
|||
done
|
||||
for i in include/linux/*.h ; do
|
||||
if [ "$i" = "include/linux/isdn_compat.h" -a \
|
||||
"$UNIQUE" = "true" ] ; then
|
||||
"$UNIQUE" = "true" -a ! -f $KERNELDIR/$i ] ; then
|
||||
echo "$i skipped"
|
||||
else
|
||||
$DODIFF $i $KERNELDIR/$i
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@
|
|||
#undef BIG_PHONE_NUMBERS
|
||||
#undef COMPAT_HAS_ISA_IOREMAP
|
||||
#define net_device device
|
||||
#define set_current_state(sta) current->state = sta
|
||||
#undef COMPAT_HAS_kmem_cache
|
||||
#undef COMPAT_d_alloc_root_one_parameter
|
||||
#undef COMPAT_HAS_init_special_inode
|
||||
|
|
@ -60,7 +59,10 @@
|
|||
#define __devinit
|
||||
#define __devinitdata
|
||||
|
||||
#define COMPAT_NEED_PCI_IDS
|
||||
#undef COMPAT_NEED_PCI_IDS
|
||||
#undef COMPAT_HAS_SCHEDULE_TASK
|
||||
#undef COMPAT_HAVE_NEW_FILLDIR
|
||||
#define COMPAT_USE_MODCOUNT_LOCK
|
||||
#undef COMPAT_HAS_pci_find_subsys
|
||||
|
||||
#define in_irq(dummy) (local_irq_count[smp_processor_id()] != 0)
|
||||
|
|
|
|||
Loading…
Reference in New Issue