patch-dsl_hal_support_c 2.3 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152
  1. --- sangam-atm-1.0.orig/dsl_hal_support.c 2007-05-18 09:47:33.000000000 +0200
  2. +++ sangam-atm-1.0/dsl_hal_support.c 2009-12-17 19:40:14.924421047 +0100
  3. @@ -140,9 +140,9 @@
  4. * oamFeature are overriden
  5. // UR8_MERGE_END CQ10774 Ram
  6. *******************************************************************************/
  7. -#include <dev_host_interface.h>
  8. -#include <dsl_hal_register.h>
  9. -#include <dsl_hal_support.h>
  10. +#include "dev_host_interface.h"
  11. +#include "dsl_hal_register.h"
  12. +#include "dsl_hal_support.h"
  13. #define NUM_READ_RETRIES 3
  14. static unsigned int dslhal_support_adsl2ByteSwap32(unsigned int in32Bits);
  15. @@ -1665,9 +1665,6 @@ int dslhal_support_hostDspCodeDownload(t
  16. unsigned char * image;
  17. char *tmp = (char *)DEV_HOST_DSP_OAM_POINTER_LOCATION;
  18. DEV_HOST_dspVersionDef_t dspVersion;
  19. -#if SWTC
  20. - DEV_HOST_tcHostCommDef_t TCHostCommDef;
  21. -#endif
  22. DEV_HOST_oamWrNegoParaDef_t OamWrNegoParaDef;
  23. DEV_HOST_dspOamSharedInterface_t dspOamSharedInterface, *pdspOamSharedInterface;
  24. DEV_HOST_olayDpDef_t olayDpParms;
  25. @@ -2152,26 +2149,6 @@ int dslhal_support_hostDspCodeDownload(t
  26. }
  27. /* table_dsp info */
  28. -#if SWTC
  29. - dspOamSharedInterface.tcHostComm_p = (DEV_HOST_tcHostCommDef_t *)dslhal_support_byteSwap32((unsigned int)dspOamSharedInterface.tcHostComm_p);
  30. - rc = dslhal_support_blockRead(&pdspOamSharedInterface->tcHostComm_p,
  31. - &pTCHostCommDef, 4);
  32. - if (rc)
  33. - {
  34. - dgprintf(1,"dslhal_support_blockRead failed\n");
  35. - return DSLHAL_ERROR_BLOCK_READ;
  36. - }
  37. -
  38. - pTCHostCommDef=(DEV_HOST_tcHostCommDef_t *) dslhal_support_byteSwap32((unsigned int)pTCHostCommDef);
  39. -
  40. - rc = dslhal_support_blockRead((PVOID)dspOamSharedInterface.tcHostComm_p,
  41. - &TCHostCommDef, sizeof(DEV_HOST_tcHostCommDef_t));
  42. - if (rc)
  43. - {
  44. - dgprintf(1,"dslhal_support_blockRead failed\n");
  45. - return DSLHAL_ERROR_BLOCK_READ;
  46. - }
  47. -#endif
  48. /* Select the Multimode Training */
  49. dspOamSharedInterface.oamWriteNegoParams_p = (DEV_HOST_oamWrNegoParaDef_t *)dslhal_support_byteSwap32((unsigned int)dspOamSharedInterface.oamWriteNegoParams_p);
  50. rc = dslhal_support_blockRead((PVOID)dspOamSharedInterface.oamWriteNegoParams_p, &OamWrNegoParaDef, sizeof(DEV_HOST_oamWrNegoParaDef_t));