X-Git-Url: http://git.rot13.org/?p=bcm963xx.git;a=blobdiff_plain;f=bcmdrivers%2Fbroadcom%2Finclude%2Fbcm963xx%2FAdslMibDef.h;h=14e6db0b863230f5edc13b466ad14ab79cbcef5f;hp=46c63b992f16a3c7ee500847a52805cbd67f5b84;hb=6adeba4d92a546ebbadde2562283ee6b984b22c1;hpb=dacd86d83a9fb430cca42cb78a67f9d46e289f5c

diff --git a/bcmdrivers/broadcom/include/bcm963xx/AdslMibDef.h b/bcmdrivers/broadcom/include/bcm963xx/AdslMibDef.h
index 46c63b99..14e6db0b 100755
--- a/bcmdrivers/broadcom/include/bcm963xx/AdslMibDef.h
+++ b/bcmdrivers/broadcom/include/bcm963xx/AdslMibDef.h
@@ -23,11 +23,17 @@
  * Copyright (c) 1993-1998 AltoCom, Inc. All rights reserved.
  * Authors: Ilya Stomakhin
  *
- * $Revision: 1.19 $
+ * $Revision: 1.22 $
  *
- * $Id: AdslMibDef.h,v 1.19 2005/08/11 15:08:38 ilyas Exp $
+ * $Id: AdslMibDef.h,v 1.22 2006/04/03 15:30:27 ovandewi Exp $
  *
  * $Log: AdslMibDef.h,v $
+ * Revision 1.22  2006/04/03 15:30:27  ovandewi
+ * fix structure name and types
+ *
+ * Revision 1.20  2006/03/31 20:26:36  dadityan
+ * PLN and NL Data
+ *
  * Revision 1.19  2005/08/11 15:08:38  ilyas
  * Added string scrambling checking and AnnexL/M submodes display
  *
@@ -165,6 +171,10 @@ extern "C" {
 #define kAdslCfgPwmSyncClockOn              0x00080000
 #define kAdslCfgPwmSyncClockOff             0x00000000
 
+#define kAdslCfgDemodCap2Mask               0x00100000
+#define kAdslCfgDemodCap2On                 0x00100000
+#define kAdslCfgDemodCap2Off                0x00000000
+
 #define kAdslCfgDefaultTrainingMargin       -1
 #define kAdslCfgDefaultShowtimeMargin       -1
 #define kAdslCfgDefaultLOMTimeThld          -1
@@ -211,6 +221,8 @@ typedef struct _adslCfgProfile {
     long        adsl2Param;
     long        adslPwmSyncClockFreq;
     long        adslHsModeSwitchTime;
+    long        adslDemodCap2Mask;
+    long        adslDemodCap2Value;
 } adslCfgProfile;
 
 /* 
@@ -288,6 +300,15 @@ typedef struct _adslVersionInfo {
 #define kOidAdslPrivChanCharLin             5
 #define kOidAdslPrivChanCharLog             6
 #define kOidAdslPrivQuietLineNoise          7
+#ifdef ADSL_MIBOBJ_PLN
+#define kOidAdslPrivPLNDurationBins         8
+#define kOidAdslPrivPLNIntrArvlBins         9
+#define kOidAdslPrivPLNValueps              10
+#define kOidAdslPrivPLNThldCntps            11
+#define kOidAdslPrivPLNDurationHist         12
+#define kOidAdslPrivPLNIntrArvlHist         13
+#endif
+#define kOidAdslPrivNLDistNoise             14
 #define kOidAdslPrivExtraInfo               255
 
 #define kOidAdslLine                        1
@@ -410,6 +431,8 @@ typedef struct _adslVersionInfo {
 
 #define kAdslTrellisOff     0
 #define kAdslTrellisOn      1
+#define kAdsl2TrellisRxEnabled        0x1
+#define kAdsl2TrellisTxEnabled        0x2
 
 /* AnnexC modulation and bitmap types for the field (adslConnection.modType) */
 
@@ -568,6 +591,25 @@ typedef struct _adslChanPerfDataEntry {
     unsigned long               adslAturPerfPrev1DayMoniSecs;
 } adslChanPerfDataEntry;
 
+
+typedef struct _adslNonLinearityData{
+  unsigned short                maxCriticalDistNoise;
+  unsigned short                distAffectedBits;
+} adslNonLinearityData;
+
+#ifdef ADSL_MIBOBJ_PLN
+typedef struct _adslPLNDataEntry {
+    char PLNState;
+    unsigned long PLNThldBB;
+    unsigned long PLNThldPerTone;
+    char PLNNbDurBins;
+    char PLNNbIntArrBins;
+    unsigned long PLNPerToneCounter;
+    unsigned long PLNBBCounter;
+} adslPLNDataEntry;
+
+#endif
+
 #define kAdslMibChanPerfIntervals   4
 
 /* Adsl trap threshold definitions */
@@ -635,6 +677,7 @@ typedef struct _adslConnectionInfo {
     unsigned char           trellisCoding;      /* off(0) or on(1) */
     adslDataConnectionInfo  rcvInfo;
     adslDataConnectionInfo  xmtInfo;
+	unsigned char			trellisCoding2;
 } adslConnectionInfo;
 
 typedef struct _adsl2DataConnectionInfo {
@@ -786,6 +829,10 @@ typedef struct _adslMibInfo {
     adslPerfCounters        adslTxPerfTotal;
     adslPerfCounters        adslTxPerfLast15Min;
     adslPerfCounters        adslTxPerfLast1Day;
+    adslNonLinearityData    adslNonLinData;
+	#ifdef ADSL_MIBOBJ_PLN
+    adslPLNDataEntry        adslPLNData;
+	#endif
 } adslMibInfo;
 
 #if defined(__cplusplus)