From 6c0f392d36475b879c60f56cc719690f32b713e2 Mon Sep 17 00:00:00 2001 From: Chrisian Richter Date: Thu, 23 Mar 2006 12:31:17 +0000 Subject: [PATCH] added ctrl.h for central managing the global mISDN_ctrl function --- drivers/isdn/hardware/mISDN/app_plci.c | 1 + drivers/isdn/hardware/mISDN/avm_fritz.c | 1 + drivers/isdn/hardware/mISDN/capi.c | 1 + drivers/isdn/hardware/mISDN/contr.c | 1 + drivers/isdn/hardware/mISDN/core.c | 3 +++ drivers/isdn/hardware/mISDN/core.h | 1 + drivers/isdn/hardware/mISDN/ctrl.h | 8 ++++++++ drivers/isdn/hardware/mISDN/debug.c | 1 + drivers/isdn/hardware/mISDN/dsp_core.c | 1 + drivers/isdn/hardware/mISDN/dtmf.c | 1 + drivers/isdn/hardware/mISDN/faxl3.c | 1 + drivers/isdn/hardware/mISDN/hfc_multi.c | 2 ++ drivers/isdn/hardware/mISDN/hfc_pci.c | 2 ++ drivers/isdn/hardware/mISDN/hfcs_mini.c | 1 + drivers/isdn/hardware/mISDN/hfcs_usb.c | 1 + drivers/isdn/hardware/mISDN/i4l_mISDN.c | 1 + drivers/isdn/hardware/mISDN/l1oip.c | 2 ++ drivers/isdn/hardware/mISDN/l3_udss1.c | 1 + drivers/isdn/hardware/mISDN/layer1.c | 1 + drivers/isdn/hardware/mISDN/layer2.c | 1 + drivers/isdn/hardware/mISDN/layer3.c | 1 + drivers/isdn/hardware/mISDN/loop.c | 1 + drivers/isdn/hardware/mISDN/sedl_fax.c | 1 + drivers/isdn/hardware/mISDN/stack.c | 1 + drivers/isdn/hardware/mISDN/tei.c | 1 + drivers/isdn/hardware/mISDN/udevice.c | 1 + drivers/isdn/hardware/mISDN/w6692.c | 1 + drivers/isdn/hardware/mISDN/x25_l3.c | 1 + drivers/isdn/hardware/mISDN/xhfc_su.c | 2 ++ 29 files changed, 42 insertions(+) create mode 100644 drivers/isdn/hardware/mISDN/ctrl.h diff --git a/drivers/isdn/hardware/mISDN/app_plci.c b/drivers/isdn/hardware/mISDN/app_plci.c index 7d6c239..584bacf 100644 --- a/drivers/isdn/hardware/mISDN/app_plci.c +++ b/drivers/isdn/hardware/mISDN/app_plci.c @@ -6,6 +6,7 @@ #include "helper.h" #include "debug.h" #include "dss1.h" +#include "ctrl.h" #define AppPlciDebug(aplci, lev, fmt, args...) \ capidebug(lev, fmt, ## args) diff --git a/drivers/isdn/hardware/mISDN/avm_fritz.c b/drivers/isdn/hardware/mISDN/avm_fritz.c index 8b6abce..98482e6 100644 --- a/drivers/isdn/hardware/mISDN/avm_fritz.c +++ b/drivers/isdn/hardware/mISDN/avm_fritz.c @@ -21,6 +21,7 @@ #include "isac.h" #include "layer1.h" #include "debug.h" +#include "ctrl.h" static const char *avm_fritz_rev = "$Revision$"; diff --git a/drivers/isdn/hardware/mISDN/capi.c b/drivers/isdn/hardware/mISDN/capi.c index 67683ac..d256d98 100644 --- a/drivers/isdn/hardware/mISDN/capi.c +++ b/drivers/isdn/hardware/mISDN/capi.c @@ -6,6 +6,7 @@ #include "m_capi.h" #include "helper.h" #include "debug.h" +#include "ctrl.h" static char *capi_revision = "$Revision$"; diff --git a/drivers/isdn/hardware/mISDN/contr.c b/drivers/isdn/hardware/mISDN/contr.c index c447afd..e807903 100644 --- a/drivers/isdn/hardware/mISDN/contr.c +++ b/drivers/isdn/hardware/mISDN/contr.c @@ -7,6 +7,7 @@ #include "m_capi.h" #include "helper.h" #include "debug.h" +#include "ctrl.h" #define contrDebug(contr, lev, fmt, args...) \ if (contr->debug & lev) capidebug(lev, fmt, ## args) diff --git a/drivers/isdn/hardware/mISDN/core.c b/drivers/isdn/hardware/mISDN/core.c index 9fa5768..fd3dc61 100644 --- a/drivers/isdn/hardware/mISDN/core.c +++ b/drivers/isdn/hardware/mISDN/core.c @@ -12,6 +12,7 @@ #include #include #include "core.h" +#include "ctrl.h" #ifdef CONFIG_KMOD #include #endif @@ -714,3 +715,5 @@ module_exit(mISDN_cleanup); EXPORT_SYMBOL(mISDN_register); EXPORT_SYMBOL(mISDN_unregister); + +EXPORT_SYMBOL(mISDN_ctrl); diff --git a/drivers/isdn/hardware/mISDN/core.h b/drivers/isdn/hardware/mISDN/core.h index 9349c8d..2a2c20e 100644 --- a/drivers/isdn/hardware/mISDN/core.h +++ b/drivers/isdn/hardware/mISDN/core.h @@ -84,3 +84,4 @@ extern mISDNobject_t *get_object(int); extern mISDNinstance_t *get_instance4id(u_int); extern int mISDN_alloc_entity(int *); extern int mISDN_delete_entity(int); + diff --git a/drivers/isdn/hardware/mISDN/ctrl.h b/drivers/isdn/hardware/mISDN/ctrl.h new file mode 100644 index 0000000..f57af0b --- /dev/null +++ b/drivers/isdn/hardware/mISDN/ctrl.h @@ -0,0 +1,8 @@ + +#ifndef MISDN_CTRL_H +#define MISDN_CTRL_H + +extern int mISDN_ctrl(void *data, u_int prim, void *arg); + +#endif + diff --git a/drivers/isdn/hardware/mISDN/debug.c b/drivers/isdn/hardware/mISDN/debug.c index 172cae6..8ce1e65 100644 --- a/drivers/isdn/hardware/mISDN/debug.c +++ b/drivers/isdn/hardware/mISDN/debug.c @@ -11,6 +11,7 @@ #include #include #include "debug.h" +#include "ctrl.h" #define mISDN_STATUS_BUFSIZE 4096 diff --git a/drivers/isdn/hardware/mISDN/dsp_core.c b/drivers/isdn/hardware/mISDN/dsp_core.c index 3100809..7ef282e 100644 --- a/drivers/isdn/hardware/mISDN/dsp_core.c +++ b/drivers/isdn/hardware/mISDN/dsp_core.c @@ -179,6 +179,7 @@ const char *dsp_revision = "$Revision$"; #include "helper.h" #include "debug.h" #include "dsp.h" +#include "ctrl.h" static char DSPName[] = "DSP"; mISDNobject_t dsp_obj; diff --git a/drivers/isdn/hardware/mISDN/dtmf.c b/drivers/isdn/hardware/mISDN/dtmf.c index 73cedfe..085ccb7 100644 --- a/drivers/isdn/hardware/mISDN/dtmf.c +++ b/drivers/isdn/hardware/mISDN/dtmf.c @@ -20,6 +20,7 @@ #include "layer1.h" #include "helper.h" #include "debug.h" +#include "ctrl.h" #define DTMF_NPOINTS 205 /* Number of samples for DTMF recognition */ diff --git a/drivers/isdn/hardware/mISDN/faxl3.c b/drivers/isdn/hardware/mISDN/faxl3.c index 1fdf9c5..9855c4d 100644 --- a/drivers/isdn/hardware/mISDN/faxl3.c +++ b/drivers/isdn/hardware/mISDN/faxl3.c @@ -17,6 +17,7 @@ #include "m_capi.h" #include "helper.h" #include "debug.h" +#include "ctrl.h" static int ttt=180; diff --git a/drivers/isdn/hardware/mISDN/hfc_multi.c b/drivers/isdn/hardware/mISDN/hfc_multi.c index dc76b84..600da88 100644 --- a/drivers/isdn/hardware/mISDN/hfc_multi.c +++ b/drivers/isdn/hardware/mISDN/hfc_multi.c @@ -101,6 +101,8 @@ #include "layer1.h" #include "dsp.h" #include "debug.h" +#include "ctrl.h" + #include #warning diff --git a/drivers/isdn/hardware/mISDN/hfc_pci.c b/drivers/isdn/hardware/mISDN/hfc_pci.c index 1b865d6..58e9254 100644 --- a/drivers/isdn/hardware/mISDN/hfc_pci.c +++ b/drivers/isdn/hardware/mISDN/hfc_pci.c @@ -34,6 +34,8 @@ #include "hfc_pci.h" #include "layer1.h" #include "debug.h" +#include "ctrl.h" + #include #define HFC_INFO(txt) printk(KERN_DEBUG txt) diff --git a/drivers/isdn/hardware/mISDN/hfcs_mini.c b/drivers/isdn/hardware/mISDN/hfcs_mini.c index 22db693..c2e2ee1 100755 --- a/drivers/isdn/hardware/mISDN/hfcs_mini.c +++ b/drivers/isdn/hardware/mISDN/hfcs_mini.c @@ -55,6 +55,7 @@ #include #include "layer1.h" #include "debug.h" +#include "ctrl.h" #include "hfcs_mini.h" #include "hfcsmcc.h" diff --git a/drivers/isdn/hardware/mISDN/hfcs_usb.c b/drivers/isdn/hardware/mISDN/hfcs_usb.c index 9214f0c..5691a5a 100644 --- a/drivers/isdn/hardware/mISDN/hfcs_usb.c +++ b/drivers/isdn/hardware/mISDN/hfcs_usb.c @@ -35,6 +35,7 @@ #include "channel.h" #include "layer1.h" #include "debug.h" +#include "ctrl.h" #include "hfcs_usb.h" diff --git a/drivers/isdn/hardware/mISDN/i4l_mISDN.c b/drivers/isdn/hardware/mISDN/i4l_mISDN.c index 1d8b3f6..eaeb31d 100644 --- a/drivers/isdn/hardware/mISDN/i4l_mISDN.c +++ b/drivers/isdn/hardware/mISDN/i4l_mISDN.c @@ -20,6 +20,7 @@ #include "helper.h" #include "dss1.h" #include "debug.h" +#include "ctrl.h" static char *i4lcapi_revision = "$Revision$"; diff --git a/drivers/isdn/hardware/mISDN/l1oip.c b/drivers/isdn/hardware/mISDN/l1oip.c index e9ca644..1785b35 100644 --- a/drivers/isdn/hardware/mISDN/l1oip.c +++ b/drivers/isdn/hardware/mISDN/l1oip.c @@ -216,6 +216,8 @@ announced. #include "layer1.h" #include "dsp.h" #include "debug.h" +#include "ctrl.h" + #include #include "l1oip.h" diff --git a/drivers/isdn/hardware/mISDN/l3_udss1.c b/drivers/isdn/hardware/mISDN/l3_udss1.c index 6a5ed9a..6cb2add 100644 --- a/drivers/isdn/hardware/mISDN/l3_udss1.c +++ b/drivers/isdn/hardware/mISDN/l3_udss1.c @@ -19,6 +19,7 @@ #include "helper.h" #include "debug.h" #include "dss1.h" +#include "ctrl.h" static int debug = 0; static mISDNobject_t u_dss1; diff --git a/drivers/isdn/hardware/mISDN/layer1.c b/drivers/isdn/hardware/mISDN/layer1.c index 9520534..87a836e 100644 --- a/drivers/isdn/hardware/mISDN/layer1.c +++ b/drivers/isdn/hardware/mISDN/layer1.c @@ -15,6 +15,7 @@ static char *l1_revision = "$Revision$"; #include "layer1.h" #include "helper.h" #include "debug.h" +#include "ctrl.h" typedef struct _layer1 { struct list_head list; diff --git a/drivers/isdn/hardware/mISDN/layer2.c b/drivers/isdn/hardware/mISDN/layer2.c index 020903f..88c5702 100644 --- a/drivers/isdn/hardware/mISDN/layer2.c +++ b/drivers/isdn/hardware/mISDN/layer2.c @@ -9,6 +9,7 @@ #include "layer2.h" #include "helper.h" #include "debug.h" +#include "ctrl.h" static char *l2_revision = "$Revision$"; diff --git a/drivers/isdn/hardware/mISDN/layer3.c b/drivers/isdn/hardware/mISDN/layer3.c index 5e52248..17e66ff 100644 --- a/drivers/isdn/hardware/mISDN/layer3.c +++ b/drivers/isdn/hardware/mISDN/layer3.c @@ -12,6 +12,7 @@ */ #include "layer3.h" #include "helper.h" +#include "ctrl.h" const char *l3_revision = "$Revision$"; diff --git a/drivers/isdn/hardware/mISDN/loop.c b/drivers/isdn/hardware/mISDN/loop.c index 90d4ef1..4ab44b9 100644 --- a/drivers/isdn/hardware/mISDN/loop.c +++ b/drivers/isdn/hardware/mISDN/loop.c @@ -32,6 +32,7 @@ #include "channel.h" #include "layer1.h" #include "debug.h" +#include "ctrl.h" #include #include "loop.h" diff --git a/drivers/isdn/hardware/mISDN/sedl_fax.c b/drivers/isdn/hardware/mISDN/sedl_fax.c index 6588be0..38d510e 100644 --- a/drivers/isdn/hardware/mISDN/sedl_fax.c +++ b/drivers/isdn/hardware/mISDN/sedl_fax.c @@ -42,6 +42,7 @@ #include "layer1.h" #include "helper.h" #include "debug.h" +#include "ctrl.h" extern const char *CardType[]; diff --git a/drivers/isdn/hardware/mISDN/stack.c b/drivers/isdn/hardware/mISDN/stack.c index 199b745..cbf053c 100644 --- a/drivers/isdn/hardware/mISDN/stack.c +++ b/drivers/isdn/hardware/mISDN/stack.c @@ -7,6 +7,7 @@ */ #include "core.h" +#include "ctrl.h" static LIST_HEAD(mISDN_stacklist); static rwlock_t stacklist_lock = RW_LOCK_UNLOCKED; diff --git a/drivers/isdn/hardware/mISDN/tei.c b/drivers/isdn/hardware/mISDN/tei.c index 46b9b93..08aee10 100644 --- a/drivers/isdn/hardware/mISDN/tei.c +++ b/drivers/isdn/hardware/mISDN/tei.c @@ -10,6 +10,7 @@ #include "layer2.h" #include "helper.h" #include "debug.h" +#include "ctrl.h" #include const char *tei_revision = "$Revision$"; diff --git a/drivers/isdn/hardware/mISDN/udevice.c b/drivers/isdn/hardware/mISDN/udevice.c index fbe81d1..68b660c 100644 --- a/drivers/isdn/hardware/mISDN/udevice.c +++ b/drivers/isdn/hardware/mISDN/udevice.c @@ -12,6 +12,7 @@ #include #include #include "core.h" +#include "ctrl.h" #define MAX_HEADER_LEN 4 diff --git a/drivers/isdn/hardware/mISDN/w6692.c b/drivers/isdn/hardware/mISDN/w6692.c index 10d310c..097ab98 100755 --- a/drivers/isdn/hardware/mISDN/w6692.c +++ b/drivers/isdn/hardware/mISDN/w6692.c @@ -31,6 +31,7 @@ #include "helper.h" #include "debug.h" #include "w6692.h" +#include "ctrl.h" #include diff --git a/drivers/isdn/hardware/mISDN/x25_l3.c b/drivers/isdn/hardware/mISDN/x25_l3.c index d5dfc20..42b9e8a 100644 --- a/drivers/isdn/hardware/mISDN/x25_l3.c +++ b/drivers/isdn/hardware/mISDN/x25_l3.c @@ -17,6 +17,7 @@ #include "x25_l3.h" #include "helper.h" #include "debug.h" +#include "ctrl.h" /* LinkLayer (L2) maintained by L3 statemachine */ diff --git a/drivers/isdn/hardware/mISDN/xhfc_su.c b/drivers/isdn/hardware/mISDN/xhfc_su.c index abeb6e8..2fa4f62 100644 --- a/drivers/isdn/hardware/mISDN/xhfc_su.c +++ b/drivers/isdn/hardware/mISDN/xhfc_su.c @@ -58,6 +58,8 @@ #include #include "helper.h" #include "debug.h" +#include "ctrl.h" + #include "xhfc_su.h" #include "xhfc24succ.h"