FGCOM/dahdi-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "dahdi: Use enumeration for maintenance modes."

Browse Source 
This reverts commit r9879. Asterisk commit r264249 [1], which was committed
after the switch to enumerations, requires the maintenance modes to be

Changing the test in configure.ac from:

AST_C_DEFINE_CHECK([DAHDI], [DAHDI_RESET_COUNTERS], [dahdi/user.h], [230])

to:

AST_C_COMPILE_CHECK([DAHDI], [int foo = DAHDI_RESET_COUNTERS], [dahdi/user.h])

Would allow the maintenance modes to stand as enumerations but the potential
for users to run incompatible versions does not seem worth it at this point.

[1] http://svnview.digium.com/svn/asterisk?view=revision&revision=264249

Signed-off-by: Shaun Ruffell <sruffell@digium.com>
Acked-by: Russ Meyerriecks <rmeyerriecks@digium.com>

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@10000 a0bf4364-ded3-4de4-8d8a-66a801d63aff
This commit is contained in:
AST_C_DEFINE_CHECK([DAHDI], [DAHDI_RESET_COUNTERS], [dahdi/user.h], [230]) 2011-06-29 15:32:40 +00:00 committed by Shaun Ruffell
parent f2c0bcd0f2
commit a28a982b75
2 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/dahdi/kernel.h
View File

@ -906,7 +906,7 @@ struct dahdi_span {
int syncsrc; /*!< current sync src (gets copied here) */ int syncsrc; /*!< current sync src (gets copied here) */
struct dahdi_count count; /*!< Performance and Error counters */ struct dahdi_count count; /*!< Performance and Error counters */
enum dahdi_maint_mode maintstat; /*!< Maintenance state */ int maintstat; /*!< Maintenance state */
int mainttimer; /*!< Maintenance timer */ int mainttimer; /*!< Maintenance timer */
int irqmisses; /*!< Interrupt misses */ int irqmisses; /*!< Interrupt misses */

35
include/dahdi/user.h
View File

@ -327,24 +327,23 @@ enum {
#define DAHDI_ALARM_LFA (1 << 9) /* Loss of Frame Alignment */ #define DAHDI_ALARM_LFA (1 << 9) /* Loss of Frame Alignment */
#define DAHDI_ALARM_LMFA (1 << 10)/* Loss of Multi-Frame Align */ #define DAHDI_ALARM_LMFA (1 << 10)/* Loss of Multi-Frame Align */
enum dahdi_maint_mode { /* Maintenance modes */
DAHDI_MAINT_NONE = 0, /* Normal Mode */ #define DAHDI_MAINT_NONE 0 /* Normal Mode */
DAHDI_MAINT_LOCALLOOP = 1, /* Local Loopback */ #define DAHDI_MAINT_LOCALLOOP 1 /* Local Loopback */
DAHDI_MAINT_REMOTELOOP = 2, /* Remote Loopback */ #define DAHDI_MAINT_REMOTELOOP 2 /* Remote Loopback */
DAHDI_MAINT_NETWORKLINELOOP = 2, /* Remote Loopback */ #define DAHDI_MAINT_NETWORKLINELOOP 2 /* Remote Loopback */
DAHDI_MAINT_LOOPUP = 3, /* send loopup code */ #define DAHDI_MAINT_LOOPUP 3 /* send loopup code */
DAHDI_MAINT_LOOPDOWN = 4, /* send loopdown code */ #define DAHDI_MAINT_LOOPDOWN 4 /* send loopdown code */
DAHDI_MAINT_FAS_DEFECT = 6, /* insert a FAS defect */ #define DAHDI_MAINT_FAS_DEFECT 6 /* insert a FAS defect */
DAHDI_MAINT_MULTI_DEFECT = 7, /* insert a Multiframe defect */ #define DAHDI_MAINT_MULTI_DEFECT 7 /* insert a Multiframe defect */
DAHDI_MAINT_CRC_DEFECT = 8, /* insert a FAS defect */ #define DAHDI_MAINT_CRC_DEFECT 8 /* insert a FAS defect */
DAHDI_MAINT_CAS_DEFECT = 9, /* insert a FAS defect */ #define DAHDI_MAINT_CAS_DEFECT 9 /* insert a FAS defect */
DAHDI_MAINT_PRBS_DEFECT = 10, /* insert a FAS defect */ #define DAHDI_MAINT_PRBS_DEFECT 10 /* insert a FAS defect */
DAHDI_MAINT_BIPOLAR_DEFECT = 11, /* insert a FAS defect */ #define DAHDI_MAINT_BIPOLAR_DEFECT 11 /* insert a FAS defect */
DAHDI_MAINT_PRBS = 12, /* enable the PRBS gen/mon */ #define DAHDI_MAINT_PRBS 12 /* enable the PRBS gen/mon */
DAHDI_MAINT_NETWORKPAYLOADLOOP = 13, /* Remote Loopback */ #define DAHDI_MAINT_NETWORKPAYLOADLOOP 13 /* Remote Loopback */
DAHDI_RESET_COUNTERS = 14, /* Clear the error counters */ #define DAHDI_RESET_COUNTERS 14 /* Clear the error counters */
DAHDI_MAINT_ALARM_SIM = 15, /* Simulate alarms */ #define DAHDI_MAINT_ALARM_SIM 15 /* Simulate alarms */
};
/* Flag Value for IOMUX, read avail */ /* Flag Value for IOMUX, read avail */
#define DAHDI_IOMUX_READ 1 #define DAHDI_IOMUX_READ 1