diff options
| author | twinterg <twinterg@FreeBSD.org> | 2006-07-09 21:16:06 +0000 |
|---|---|---|
| committer | twinterg <twinterg@FreeBSD.org> | 2006-07-09 21:16:06 +0000 |
| commit | 3e2c62d3198b032c952fbda0c36b0eb1cbe1b74d (patch) | |
| tree | f1e2ba5979c1f2497f0adf05c561ac6c95668e30 /sys/i4b | |
| parent | 8edb3edf3ac746ae6d840c4416bef97a7cf74a71 (diff) | |
| download | FreeBSD-src-3e2c62d3198b032c952fbda0c36b0eb1cbe1b74d.zip FreeBSD-src-3e2c62d3198b032c952fbda0c36b0eb1cbe1b74d.tar.gz | |
Extend i4b to support CAPI manager based ISDN controllers (CAPI manager is part of
c4b, CAPI for BSD). This is a preparation to add CAPI for BSD to the source tree.
Approved by: hm (mentor)
MFC after: 2 weeks
Diffstat (limited to 'sys/i4b')
| -rw-r--r-- | sys/i4b/include/i4b_ioctl.h | 5 | ||||
| -rw-r--r-- | sys/i4b/layer4/i4b_l4mgmt.c | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/sys/i4b/include/i4b_ioctl.h b/sys/i4b/include/i4b_ioctl.h index bcf131a..5c8e4fe 100644 --- a/sys/i4b/include/i4b_ioctl.h +++ b/sys/i4b/include/i4b_ioctl.h @@ -42,7 +42,7 @@ *---------------------------------------------------------------------------*/ #define VERSION 1 /* version number */ #define REL 4 /* release number */ -#define STEP 0 /* release step */ +#define STEP 1 /* release step */ /*---------------------------------------------------------------------------* * date/time format in i4b log messages @@ -78,7 +78,8 @@ #define CTRL_TINADD 3 /* Stollmann Tina-dd active card*/ #define CTRL_AVMB1 4 /* AVM B1 active card */ #define CTRL_CAPI 5 /* cards seen via the CAPI layer*/ -#define CTRL_NUMTYPES 6 /* number of controller types */ +#define CTRL_CAPIMGR 6 /* boards accessed through the CAPI manager */ +#define CTRL_NUMTYPES 7 /* number of controller types */ /*---------------------------------------------------------------------------* * CTRL_PASSIVE: driver types diff --git a/sys/i4b/layer4/i4b_l4mgmt.c b/sys/i4b/layer4/i4b_l4mgmt.c index a5cf26b..031a606 100644 --- a/sys/i4b/layer4/i4b_l4mgmt.c +++ b/sys/i4b/layer4/i4b_l4mgmt.c @@ -301,7 +301,9 @@ i4b_l4_daemon_attached(void) for(i=0; i < nctrl; i++) { -/*XXX*/ if(ctrl_desc[i].ctrl_type == CTRL_PASSIVE) +/*XXX*/ if(*ctrl_desc[i].N_MGMT_COMMAND && + (ctrl_desc[i].ctrl_type == CTRL_PASSIVE || + ctrl_desc[i].ctrl_type == CTRL_CAPIMGR)) { NDBGL4(L4_MSG, "CMR_DOPEN sent to unit %d", ctrl_desc[i].unit); (*ctrl_desc[i].N_MGMT_COMMAND)(ctrl_desc[i].unit, CMR_DOPEN, 0); @@ -322,7 +324,9 @@ i4b_l4_daemon_detached(void) for(i=0; i < nctrl; i++) { -/*XXX*/ if(ctrl_desc[i].ctrl_type == CTRL_PASSIVE) +/*XXX*/ if(*ctrl_desc[i].N_MGMT_COMMAND && + (ctrl_desc[i].ctrl_type == CTRL_PASSIVE || + ctrl_desc[i].ctrl_type == CTRL_CAPIMGR)) { NDBGL4(L4_MSG, "CMR_DCLOSE sent to unit %d", ctrl_desc[i].unit); (*ctrl_desc[i].N_MGMT_COMMAND)(ctrl_desc[i].unit, CMR_DCLOSE, 0); |
