|
|
@@ -0,0 +1,132 @@
|
|
|
+--- a/src/common/drv_dsl_cpe_os_linux.c
|
|
|
++++ b/src/common/drv_dsl_cpe_os_linux.c
|
|
|
+@@ -54,7 +54,7 @@ static int DSL_DRV_Release(DSL_DRV_inode_t * ino, DSL_DRV_file_t * fil);
|
|
|
+
|
|
|
+ static DSL_uint_t DSL_DRV_Poll(DSL_DRV_file_t *pFile, DSL_DRV_Poll_Table_t *wait);
|
|
|
+
|
|
|
+-#ifdef INCLUDE_DSL_CPE_DEBUG_LOGGER_SUPPORT
|
|
|
++#if defined(INCLUDE_DSL_CPE_DEBUG_LOGGER_SUPPORT) && !defined(DSL_DEBUG_DISABLE)
|
|
|
+ static void DSL_DRV_NlSendMsg(DSL_char_t* pMsg);
|
|
|
+ #endif
|
|
|
+
|
|
|
+@@ -368,10 +368,10 @@ int DSL_DRV_debug_printf(DSL_Context_t const *pContext, DSL_char_t const *fmt, .
|
|
|
+ {
|
|
|
+ DSL_int_t nRet = 0;
|
|
|
+ #ifndef _lint
|
|
|
+- DSL_int_t nLength = 0;
|
|
|
+- DSL_boolean_t bPrint = DSL_FALSE;
|
|
|
+ #ifdef INCLUDE_DSL_CPE_DEBUG_LOGGER_SUPPORT
|
|
|
+ #ifndef DSL_DEBUG_DISABLE
|
|
|
++ DSL_int_t nLength = 0;
|
|
|
++ DSL_boolean_t bPrint = DSL_FALSE;
|
|
|
+ DSL_char_t debugString[DSL_DBG_MAX_DEBUG_PRINT_CHAR + 1] = {0};
|
|
|
+ va_list ap; /* points to each unnamed arg in turn */
|
|
|
+
|
|
|
+@@ -406,6 +406,8 @@ int DSL_DRV_debug_printf(DSL_Context_t const *pContext, DSL_char_t const *fmt, .
|
|
|
+ #endif /* DSL_DEBUG_DISABLE */
|
|
|
+ return nRet;
|
|
|
+ #else
|
|
|
++ DSL_int_t nLength = 0;
|
|
|
++ DSL_boolean_t bPrint = DSL_FALSE;
|
|
|
+ DSL_char_t msg[DSL_DBG_MAX_DEBUG_PRINT_CHAR + 1] = "\0";
|
|
|
+ va_list ap; /* points to each unnamed arg in turn */
|
|
|
+
|
|
|
+@@ -1172,7 +1174,7 @@ static void DSL_DRV_DebugInit(void)
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
+-#ifdef INCLUDE_DSL_CPE_DEBUG_LOGGER_SUPPORT
|
|
|
++#if defined(INCLUDE_DSL_CPE_DEBUG_LOGGER_SUPPORT) && !defined(DSL_DEBUG_DISABLE)
|
|
|
+ static void DSL_DRV_NlSendMsg(DSL_char_t* pMsg)
|
|
|
+ {
|
|
|
+ struct nlmsghdr *pNlMsgHdr;
|
|
|
+@@ -1261,7 +1263,7 @@ void __exit DSL_ModuleCleanup(void)
|
|
|
+ printk("Module will be unloaded"DSL_DRV_CRLF);
|
|
|
+
|
|
|
+ device_destroy(dsl_class, dsl_devt);
|
|
|
+- dsl_devt = NULL;
|
|
|
++ dsl_devt = 0;
|
|
|
+ class_destroy(dsl_class);
|
|
|
+ dsl_class = NULL;
|
|
|
+
|
|
|
+--- a/src/device/drv_dsl_cpe_msg_vrx.c
|
|
|
++++ b/src/device/drv_dsl_cpe_msg_vrx.c
|
|
|
+@@ -2456,32 +2456,32 @@ DSL_Error_t DSL_DRV_VRX_SendMsgSnrPerGroupesGet(
|
|
|
+ #endif /* defined(INCLUDE_DSL_G997_PER_TONE) || defined(INCLUDE_DSL_DELT)*/
|
|
|
+
|
|
|
+ #ifdef INCLUDE_DSL_DELT
|
|
|
+-static DSL_Error_t DSL_DRV_VRX_SpreadArray(
|
|
|
+- DSL_void_t* pArray,
|
|
|
+- DSL_uint16_t valueSize,
|
|
|
+- DSL_uint16_t valueCount,
|
|
|
+- DSL_uint16_t multiplier)
|
|
|
+-{
|
|
|
+- DSL_void_t* pSrc = pArray + valueSize * (valueCount - 1);
|
|
|
+- DSL_void_t* pDst = pArray + valueSize * (valueCount*multiplier - 1);
|
|
|
+-
|
|
|
+- if (pArray == DSL_NULL)
|
|
|
+- {
|
|
|
+- return DSL_ERROR;
|
|
|
+- }
|
|
|
+-
|
|
|
+- for (; valueCount; --valueCount, pSrc -= valueSize)
|
|
|
+- {
|
|
|
+- DSL_uint16_t i;
|
|
|
+-
|
|
|
+- for ( i = multiplier; i; --i, pDst -= valueSize)
|
|
|
+- {
|
|
|
+- memcpy(pDst,pSrc,valueSize);
|
|
|
+- }
|
|
|
+- }
|
|
|
+-
|
|
|
+- return DSL_SUCCESS;
|
|
|
+-}
|
|
|
++// static DSL_Error_t DSL_DRV_VRX_SpreadArray(
|
|
|
++// DSL_void_t* pArray,
|
|
|
++// DSL_uint16_t valueSize,
|
|
|
++// DSL_uint16_t valueCount,
|
|
|
++// DSL_uint16_t multiplier)
|
|
|
++// {
|
|
|
++// DSL_void_t* pSrc = pArray + valueSize * (valueCount - 1);
|
|
|
++// DSL_void_t* pDst = pArray + valueSize * (valueCount*multiplier - 1);
|
|
|
++
|
|
|
++// if (pArray == DSL_NULL)
|
|
|
++// {
|
|
|
++// return DSL_ERROR;
|
|
|
++// }
|
|
|
++
|
|
|
++// for (; valueCount; --valueCount, pSrc -= valueSize)
|
|
|
++// {
|
|
|
++// DSL_uint16_t i;
|
|
|
++
|
|
|
++// for ( i = multiplier; i; --i, pDst -= valueSize)
|
|
|
++// {
|
|
|
++// memcpy(pDst,pSrc,valueSize);
|
|
|
++// }
|
|
|
++// }
|
|
|
++
|
|
|
++// return DSL_SUCCESS;
|
|
|
++// }
|
|
|
+
|
|
|
+ /**
|
|
|
+ This function requests a set of up to 60 entries of the DELT data.
|
|
|
+--- a/src/device/drv_dsl_cpe_device_vrx.c
|
|
|
++++ b/src/device/drv_dsl_cpe_device_vrx.c
|
|
|
+@@ -3356,7 +3356,9 @@ static DSL_Error_t DSL_DRV_VRX_TestParametersFeUpdate(
|
|
|
+ DSL_Error_t nErrCode = DSL_SUCCESS;
|
|
|
+ DSL_uint16_t i = 0;
|
|
|
+ DSL_uint16_t nDataLen = 0;
|
|
|
++#ifndef DSL_DEBUG_DISABLE
|
|
|
+ DSL_uint16_t nMsgId = EVT_PMD_TESTPARAMSGET;
|
|
|
++#endif /* DSL_DEBUG_DISABLE */
|
|
|
+
|
|
|
+ DSL_DEBUG( DSL_DBG_MSG,
|
|
|
+ (pContext, SYS_DBG_MSG"DSL[%02d]: IN - DSL_DRV_VRX_TestParametersFeUpdate"
|
|
|
+@@ -8312,6 +8314,7 @@ DSL_Error_t DSL_DRV_DEV_AutobootHandleTraining(
|
|
|
+ (pContext, SYS_DBG_MSG"DSL[%02d]: ORDERLY_SHUTDOWN state reached"
|
|
|
+ DSL_DRV_CRLF, DSL_DEV_NUM(pContext)));
|
|
|
+ /* do not use break here, continue handling */
|
|
|
++ fallthrough;
|
|
|
+ #endif /* INCLUDE_DSL_CPE_API_VRX */
|
|
|
+ case DSL_LINESTATE_EXCEPTION:
|
|
|
+ if (!bPreFail)
|