refresh ar7-atm patches

SVN-Revision: 16158

1 files changed, 50 insertions, 59 deletions

diff --git a/package/ar7-atm/patches/100-compile_fix.patch b/package/ar7-atm/patches/100-compile_fix.patch
index bb845f0c1d..83271ca484 100644
--- a/package/ar7-atm/patches/100-compile_fix.patch
+++ b/package/ar7-atm/patches/100-compile_fix.patch
@@ -1,7 +1,6 @@
-diff -urN sangam_atm-D7.03.01.00.orig/cppi_cpaal5.c sangam_atm-D7.03.01.00/cppi_cpaal5.c
---- sangam_atm-D7.03.01.00.orig/cppi_cpaal5.c	2008-03-11 02:11:02.000000000 +0100
-+++ sangam_atm-D7.03.01.00/cppi_cpaal5.c	2008-03-11 02:12:00.000000000 +0100
-@@ -352,7 +352,7 @@
+--- a/cppi_cpaal5.c
++++ b/cppi_cpaal5.c
+@@ -352,7 +352,7 @@ static int halRxReturn(HAL_RECEIVEINFO *
             {
              /* malloc failed, add this RCB to Needs Buffer List */
              TempRcb->FragCount = 1;                                             /*MJH+030417*/
@@ -10,9 +9,8 @@ diff -urN sangam_atm-D7.03.01.00.orig/cppi_cpaal5.c sangam_atm-D7.03.01.00/cppi_
  
              if(HalDev->NeedsCount < MAX_NEEDS)                                  /* +MJH 030410 */
                {                                                                 /* +MJH 030410 */
-diff -urN sangam_atm-D7.03.01.00.orig/dsl_hal_api.c sangam_atm-D7.03.01.00/dsl_hal_api.c
---- sangam_atm-D7.03.01.00.orig/dsl_hal_api.c	2008-03-11 02:11:02.000000000 +0100
-+++ sangam_atm-D7.03.01.00/dsl_hal_api.c	2008-03-11 02:12:00.000000000 +0100
+--- a/dsl_hal_api.c
++++ b/dsl_hal_api.c
 @@ -254,15 +254,15 @@
  *                            of phyEnableDisableWord & phyControlWord to avoid changing API struct
  *                            which may cause change required to application data structure.
@@ -34,9 +32,8 @@ diff -urN sangam_atm-D7.03.01.00.orig/dsl_hal_api.c sangam_atm-D7.03.01.00/dsl_h
  
  //  UR8_MERGE_START CQ11054   Jack Zhang
  static unsigned int highprecision_selected = 0;  //By default we use low precision for backward compt.
-diff -urN sangam_atm-D7.03.01.00.orig/dsl_hal_support.c sangam_atm-D7.03.01.00/dsl_hal_support.c
---- sangam_atm-D7.03.01.00.orig/dsl_hal_support.c	2008-03-11 02:11:02.000000000 +0100
-+++ sangam_atm-D7.03.01.00/dsl_hal_support.c	2008-03-11 02:12:00.000000000 +0100
+--- a/dsl_hal_support.c
++++ b/dsl_hal_support.c
 @@ -140,9 +140,9 @@
  *                                          oamFeature are overriden
  // UR8_MERGE_END CQ10774 Ram
@@ -50,9 +47,8 @@ diff -urN sangam_atm-D7.03.01.00.orig/dsl_hal_support.c sangam_atm-D7.03.01.00/d
  
  #define NUM_READ_RETRIES 3
  static unsigned int dslhal_support_adsl2ByteSwap32(unsigned int in32Bits);
-diff -urN sangam_atm-D7.03.01.00.orig/dsl_hal_support.h sangam_atm-D7.03.01.00/dsl_hal_support.h
---- sangam_atm-D7.03.01.00.orig/dsl_hal_support.h	2008-03-11 02:11:02.000000000 +0100
-+++ sangam_atm-D7.03.01.00/dsl_hal_support.h	2008-03-11 02:12:00.000000000 +0100
+--- a/dsl_hal_support.h
++++ b/dsl_hal_support.h
 @@ -49,7 +49,7 @@
  *    04Nov05     0.11.00            CPH    Fixed T1413 mode got Zero DS/US rate when DSL_BIT_TMODE is set.
  *******************************************************************************/
@@ -62,9 +58,8 @@ diff -urN sangam_atm-D7.03.01.00.orig/dsl_hal_support.h sangam_atm-D7.03.01.00/d
  
  #define virtual2Physical(a)    (((int)a)&~0xe0000000)
  /* External Function Prototype Declarations */
-diff -urN sangam_atm-D7.03.01.00.orig/Makefile sangam_atm-D7.03.01.00/Makefile
---- sangam_atm-D7.03.01.00.orig/Makefile	2008-03-11 02:11:02.000000000 +0100
-+++ sangam_atm-D7.03.01.00/Makefile	2008-03-11 02:12:00.000000000 +0100
+--- a/Makefile
++++ b/Makefile
 @@ -1,18 +1,9 @@
 -# File: drivers/atm/ti_evm3/Makefile
  #
@@ -90,9 +85,8 @@ diff -urN sangam_atm-D7.03.01.00.orig/Makefile sangam_atm-D7.03.01.00/Makefile
 +EXTRA_CFLAGS += -DEL -I$(PWD) -DPOST_SILICON -DCOMMON_NSP -DNO_ACT -D__NO__VOICE_PATCH__ -DEL
 +obj-$(CONFIG_SANGAM_ATM) := tiatm.o
 +tiatm-objs += cpsar.o aal5sar.o tn7sar.o tn7atm.o tn7dsl.o dsl_hal_api.o dsl_hal_support.o
-diff -urN sangam_atm-D7.03.01.00.orig/tn7atm.c sangam_atm-D7.03.01.00/tn7atm.c
---- sangam_atm-D7.03.01.00.orig/tn7atm.c	2008-03-11 02:11:02.000000000 +0100
-+++ sangam_atm-D7.03.01.00/tn7atm.c	2008-03-11 02:12:00.000000000 +0100
+--- a/tn7atm.c
++++ b/tn7atm.c
 @@ -61,7 +61,6 @@
   *    UR8_MERGE_END   CQ11057*
  *********************************************************************************************/
@@ -126,7 +120,7 @@ diff -urN sangam_atm-D7.03.01.00.orig/tn7atm.c sangam_atm-D7.03.01.00/tn7atm.c
  MODULE_DESCRIPTION ("Tnetd73xx ATM Device Driver");
  MODULE_AUTHOR ("Zhicheng Tang");
  #endif
-@@ -100,9 +103,9 @@
+@@ -100,9 +103,9 @@ MODULE_AUTHOR ("Zhicheng Tang");
  
  /*end of externs */
  
@@ -139,7 +133,7 @@ diff -urN sangam_atm-D7.03.01.00.orig/tn7atm.c sangam_atm-D7.03.01.00/tn7atm.c
  
  #define tn7atm_kfree_skb(x)     dev_kfree_skb(x)
  
-@@ -114,7 +117,7 @@
+@@ -114,7 +117,7 @@ static int EnableQoS = FALSE;
  /* prototypes */
  static int tn7atm_set_can_support_adsl2 (int can);
  
@@ -148,7 +142,7 @@ diff -urN sangam_atm-D7.03.01.00.orig/tn7atm.c sangam_atm-D7.03.01.00/tn7atm.c
  
  static void tn7atm_close (struct atm_vcc *vcc);
  
-@@ -257,13 +260,12 @@
+@@ -257,13 +260,12 @@ static const struct atmdev_ops tn7atm_op
          getsockopt:     NULL,
          setsockopt:     NULL,
          send:           tn7atm_send,
@@ -163,7 +157,7 @@ diff -urN sangam_atm-D7.03.01.00.orig/tn7atm.c sangam_atm-D7.03.01.00/tn7atm.c
  static struct proc_dir_entry *root_proc_dir_entry = NULL;
  #define DRV_PROC_MODE 0644
  static int proc_root_already_exists = TRUE;
-@@ -559,56 +561,6 @@
+@@ -559,56 +561,6 @@ static int turbodsl_check_priority_type(
  
  /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   *
@@ -220,7 +214,7 @@ diff -urN sangam_atm-D7.03.01.00.orig/tn7atm.c sangam_atm-D7.03.01.00/tn7atm.c
   *  Function: int tn7atm_sar_irq(void)
   *
   *  Description: tnetd73xx SAR interrupt.
-@@ -693,7 +645,7 @@
+@@ -693,7 +645,7 @@ static int __init tn7atm_irq_request (st
     * Register SAR interrupt
     */
    priv->sar_irq = LNXINTNUM (ATM_SAR_INT);      /* Interrupt line # */
@@ -229,7 +223,7 @@ diff -urN sangam_atm-D7.03.01.00.orig/tn7atm.c sangam_atm-D7.03.01.00/tn7atm.c
      printk ("Could not register tn7atm_sar_irq\n");
  
    /*
-@@ -704,14 +656,14 @@
+@@ -704,14 +656,14 @@ static int __init tn7atm_irq_request (st
    {
      def_sar_inter_pace = os_atoi (ptr);
    }
@@ -247,7 +241,7 @@ diff -urN sangam_atm-D7.03.01.00.orig/tn7atm.c sangam_atm-D7.03.01.00/tn7atm.c
      printk ("Could not register tn7atm_dsl_irq\n");
  
  /***** VRB Tasklet Mode ****/
-@@ -875,11 +827,15 @@
+@@ -875,11 +827,15 @@ static int __init tn7atm_get_ESI (struct
  #define ATM_VBR_RT     5
  #endif
  
@@ -264,7 +258,7 @@ diff -urN sangam_atm-D7.03.01.00.orig/tn7atm.c sangam_atm-D7.03.01.00/tn7atm.c
  
    dgprintf(1, "tn7atm_open()\n");
  
-@@ -891,24 +847,18 @@
+@@ -891,24 +847,18 @@ int tn7atm_open (struct atm_vcc *vcc, sh
      return -1;
    }
  
@@ -295,7 +289,7 @@ diff -urN sangam_atm-D7.03.01.00.orig/tn7atm.c sangam_atm-D7.03.01.00/tn7atm.c
    {
      /* always use (max_dma_chan+1) for clear eoc */
      tn7atm_activate_vc_parm.chan = EOC_DMA_CHAN;
-@@ -916,7 +866,7 @@
+@@ -916,7 +866,7 @@ int tn7atm_open (struct atm_vcc *vcc, sh
      /* check to see whether clear eoc is opened or not */
      if (tn7atm_activate_vc_parm.priv->lut[tn7atm_activate_vc_parm.chan].inuse)
      {
@@ -304,7 +298,7 @@ diff -urN sangam_atm-D7.03.01.00.orig/tn7atm.c sangam_atm-D7.03.01.00/tn7atm.c
        printk("tn7atm_open: Clear EOC channel (dmachan=%d) already in use.\n", tn7atm_activate_vc_parm.chan);
        return -EBUSY;
      }
-@@ -925,7 +875,7 @@
+@@ -925,7 +875,7 @@ int tn7atm_open (struct atm_vcc *vcc, sh
      if (rc)
      {
        printk("tn7atm_open: failed to setup clear_eoc\n");
@@ -313,7 +307,7 @@ diff -urN sangam_atm-D7.03.01.00.orig/tn7atm.c sangam_atm-D7.03.01.00/tn7atm.c
        return -EBUSY;
      }
      tn7atm_set_lut(tn7atm_activate_vc_parm.priv,vcc, tn7atm_activate_vc_parm.chan);
-@@ -934,17 +884,17 @@
+@@ -934,17 +884,17 @@ int tn7atm_open (struct atm_vcc *vcc, sh
    }
    else  /* PVC channel setup */
    {
@@ -334,7 +328,7 @@ diff -urN sangam_atm-D7.03.01.00.orig/tn7atm.c sangam_atm-D7.03.01.00/tn7atm.c
          printk("PVC already opened. dmachan = %d\n", rc);
          return -EBUSY;
        }
-@@ -976,6 +926,7 @@
+@@ -976,6 +926,7 @@ int tn7atm_open (struct atm_vcc *vcc, sh
         tn7atm_activate_vc_parm.priority = 2;
         break;
  
@@ -342,7 +336,7 @@ diff -urN sangam_atm-D7.03.01.00.orig/tn7atm.c sangam_atm-D7.03.01.00/tn7atm.c
       case ATM_VBR: /* Variable Bit Rate-Non RealTime*/
         tn7atm_activate_vc_parm.qos = 1;
         tn7atm_activate_vc_parm.priority = 1;
-@@ -997,6 +948,7 @@
+@@ -997,6 +948,7 @@ int tn7atm_open (struct atm_vcc *vcc, sh
             tn7atm_activate_vc_parm.mbs = vcc->qos.txtp.max_pcr;
         tn7atm_activate_vc_parm.cdvt = vcc->qos.txtp.max_cdv;
         break;
@@ -350,7 +344,7 @@ diff -urN sangam_atm-D7.03.01.00.orig/tn7atm.c sangam_atm-D7.03.01.00/tn7atm.c
  
       default:
           tn7atm_activate_vc_parm.qos = 2;
-@@ -1024,7 +976,7 @@
+@@ -1024,7 +976,7 @@ int tn7atm_open (struct atm_vcc *vcc, sh
     if (rc < 0)
     {
        printk("failed to activate hw channel\n");
@@ -359,7 +353,7 @@ diff -urN sangam_atm-D7.03.01.00.orig/tn7atm.c sangam_atm-D7.03.01.00/tn7atm.c
        tn7atm_lut_clear(vcc, tn7atm_activate_vc_parm.chan);
        //spin_unlock_irqrestore(&chan_init_lock, flags);
        return -EBUSY;
-@@ -1114,7 +1066,7 @@
+@@ -1114,7 +1066,7 @@ void tn7atm_close (struct atm_vcc *vcc)
    tn7atm_lut_clear (vcc, dmachan);
    //spin_unlock_irqrestore (&closeLock, closeFlag);
  
@@ -368,7 +362,7 @@ diff -urN sangam_atm-D7.03.01.00.orig/tn7atm.c sangam_atm-D7.03.01.00/tn7atm.c
  
    dgprintf (1, "Leave tn7atm_close\n");
  }
-@@ -1528,8 +1480,7 @@
+@@ -1528,8 +1480,7 @@ int tn7atm_receive (void *os_dev, int ch
                                   * firewall is on */
  
    dgprintf (3, "pushing the skb...\n");
@@ -378,7 +372,7 @@ diff -urN sangam_atm-D7.03.01.00.orig/tn7atm.c sangam_atm-D7.03.01.00/tn7atm.c
  
    xdump ((unsigned char *) skb->data, skb->len, 5);
  
-@@ -1725,8 +1676,7 @@
+@@ -1725,8 +1676,7 @@ static void tn7atm_exit (void)
  
    kfree (dev->dev_data);
  
@@ -388,7 +382,7 @@ diff -urN sangam_atm-D7.03.01.00.orig/tn7atm.c sangam_atm-D7.03.01.00/tn7atm.c
  
    /*
     * remove proc entries
-@@ -1885,9 +1835,6 @@
+@@ -1885,9 +1835,6 @@ static int __init tn7atm_detect (void)
    /*
     * Set up proc entry for atm stats
     */
@@ -398,7 +392,7 @@ diff -urN sangam_atm-D7.03.01.00.orig/tn7atm.c sangam_atm-D7.03.01.00/tn7atm.c
      printk ("Creating new root folder %s in the proc for the driver stats \n",
              drv_proc_root_folder);
      root_proc_dir_entry = proc_mkdir (drv_proc_root_folder, NULL);
-@@ -1897,7 +1844,6 @@
+@@ -1897,7 +1844,6 @@ static int __init tn7atm_detect (void)
        return -ENOMEM;
      }
      proc_root_already_exists = FALSE;
@@ -406,7 +400,7 @@ diff -urN sangam_atm-D7.03.01.00.orig/tn7atm.c sangam_atm-D7.03.01.00/tn7atm.c
  
    /*
     * AV: Clean-up. Moved all the definitions to the data structure.
-@@ -2479,7 +2425,5 @@
+@@ -2479,7 +2425,5 @@ static int tn7atm_proc_qos_write(struct 
      return count;
  }
  
@@ -414,9 +408,8 @@ diff -urN sangam_atm-D7.03.01.00.orig/tn7atm.c sangam_atm-D7.03.01.00/tn7atm.c
  module_init (tn7atm_detect);
  module_exit (tn7atm_exit);
 -#endif /* MODULE */
-diff -urN sangam_atm-D7.03.01.00.orig/tn7atm.h sangam_atm-D7.03.01.00/tn7atm.h
---- sangam_atm-D7.03.01.00.orig/tn7atm.h	2008-03-11 02:11:02.000000000 +0100
-+++ sangam_atm-D7.03.01.00/tn7atm.h	2008-03-11 02:12:00.000000000 +0100
+--- a/tn7atm.h
++++ b/tn7atm.h
 @@ -19,7 +19,8 @@
  //#include  "mips_support.h"
  #include  <linux/list.h>
@@ -427,9 +420,8 @@ diff -urN sangam_atm-D7.03.01.00.orig/tn7atm.h sangam_atm-D7.03.01.00/tn7atm.h
  
  #ifdef CONFIG_MODVERSIONS
  #include <linux/modversions.h>
-diff -urN sangam_atm-D7.03.01.00.orig/tn7dsl.c sangam_atm-D7.03.01.00/tn7dsl.c
---- sangam_atm-D7.03.01.00.orig/tn7dsl.c	2008-03-11 02:11:02.000000000 +0100
-+++ sangam_atm-D7.03.01.00/tn7dsl.c	2008-03-11 02:12:41.000000000 +0100
+--- a/tn7dsl.c
++++ b/tn7dsl.c
 @@ -94,7 +94,6 @@
  *  1/02/07  JZ     CQ11054: Data Precision and Range Changes for TR-069 Conformance
  *  UR8_MERGE_END   CQ11054*
@@ -460,7 +452,7 @@ diff -urN sangam_atm-D7.03.01.00.orig/tn7dsl.c sangam_atm-D7.03.01.00/tn7dsl.c
  /* Modules specific header files */
  #include "tn7atm.h"
  #include "tn7api.h"
-@@ -173,7 +176,7 @@
+@@ -173,7 +176,7 @@ led_reg_t ledreg[2];
  static struct led_funcs ledreg[2];
  #endif
  
@@ -469,7 +461,7 @@ diff -urN sangam_atm-D7.03.01.00.orig/tn7dsl.c sangam_atm-D7.03.01.00/tn7dsl.c
  #define MAX_STR_SIZE     256
  #define DSL_MOD_SIZE     256
  
-@@ -299,7 +302,7 @@
+@@ -299,7 +302,7 @@ static PITIDSLHW_T    pIhw;
  static volatile int bshutdown;
  static char info[MAX_STR_SIZE];
  /* Used for DSL Polling enable */
@@ -478,7 +470,7 @@ diff -urN sangam_atm-D7.03.01.00.orig/tn7dsl.c sangam_atm-D7.03.01.00/tn7dsl.c
  
  //kthread_t overlay_thread;
  /* end of module wide declars */
-@@ -323,6 +326,14 @@
+@@ -323,6 +326,14 @@ static int tn7dsl_proc_snr_print (char *
  #define gDot1(a) ((a>0)?(a%10):((-a)%10))
  //  UR8_MERGE_END   CQ11054*
  
@@ -493,7 +485,7 @@ diff -urN sangam_atm-D7.03.01.00.orig/tn7dsl.c sangam_atm-D7.03.01.00/tn7dsl.c
  int os_atoi(const char *pStr)
  {
    int MulNeg = (*pStr == '-' ? -1 : 1);
-@@ -359,39 +370,6 @@
+@@ -359,39 +370,6 @@ void dprintf (int uDbgLevel, char *szFmt
  #endif
  }
  
@@ -533,7 +525,7 @@ diff -urN sangam_atm-D7.03.01.00.orig/tn7dsl.c sangam_atm-D7.03.01.00/tn7dsl.c
  // * UR8_MERGE_START CQ10640   Jack Zhang
  int tn7dsl_dump_dsp_memory(char *input_str) //cph99
    {
-@@ -441,101 +419,74 @@
+@@ -441,101 +419,74 @@ unsigned int shim_osGetCpuFrequency(void
    return CpuFrequency;
  }
  
@@ -697,7 +689,7 @@ diff -urN sangam_atm-D7.03.01.00.orig/tn7dsl.c sangam_atm-D7.03.01.00/tn7dsl.c
  }
  
  int shim_osLoadDebugFWImage(unsigned char *ptr)
-@@ -3064,6 +3015,7 @@
+@@ -3064,6 +3015,7 @@ int tn7dsl_init(void *priv)
    int high_precision_selected = 0;  
  //  UR8_MERGE_END   CQ11054*
  
@@ -705,7 +697,7 @@ diff -urN sangam_atm-D7.03.01.00.orig/tn7dsl.c sangam_atm-D7.03.01.00/tn7dsl.c
    /*
     * start dsl
     */
-@@ -3442,7 +3394,7 @@
+@@ -3442,7 +3394,7 @@ static int dslmod_sysctl(ctl_table *ctl,
     */
    if(write)
      {
@@ -714,7 +706,7 @@ diff -urN sangam_atm-D7.03.01.00.orig/tn7dsl.c sangam_atm-D7.03.01.00/tn7dsl.c
  
      switch (ctl->ctl_name)
        {
-@@ -3528,14 +3480,14 @@
+@@ -3528,14 +3480,14 @@ static int dslmod_sysctl(ctl_table *ctl,
    else
      {
      len += sprintf(info+len, mod_req);
@@ -731,7 +723,7 @@ diff -urN sangam_atm-D7.03.01.00.orig/tn7dsl.c sangam_atm-D7.03.01.00/tn7dsl.c
    ,
    {0}
    };
-@@ -3558,8 +3510,7 @@
+@@ -3558,8 +3510,7 @@ void tn7dsl_dslmod_sysctl_register(void)
    if (initialized == 1)
      return;
  
@@ -741,16 +733,15 @@ diff -urN sangam_atm-D7.03.01.00.orig/tn7dsl.c sangam_atm-D7.03.01.00/tn7dsl.c
  
    /*
     * set the defaults
-@@ -4821,4 +4772,4 @@
+@@ -4821,4 +4772,4 @@ int tn7dsl_proc_PMDus(char* buf, char **
  }
  #endif //NO_ADV_STATS
  #endif //TR69_PMD_IN
 -// *    UR8_MERGE_END   CQ11057 *
-\ Nessun a capo alla fine del file
+\ No newline at end of file
 +// *    UR8_MERGE_END   CQ11057 *
-diff -urN sangam_atm-D7.03.01.00.orig/tn7sar.c sangam_atm-D7.03.01.00/tn7sar.c
---- sangam_atm-D7.03.01.00.orig/tn7sar.c	2008-03-11 02:11:02.000000000 +0100
-+++ sangam_atm-D7.03.01.00/tn7sar.c	2008-03-11 02:12:00.000000000 +0100
+--- a/tn7sar.c
++++ b/tn7sar.c
 @@ -42,7 +42,6 @@
   * UR8_MERGE_END CQ10700
   *******************************************************************************/