projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
revert some breakage
[openwrt.git] / package / ar7-atm / patches / 100-compile_fix.patch
diff --git a/package/ar7-atm/patches/100-compile_fix.patch b/package/ar7-atm/patches/100-compile_fix.patch
index bd081c4..614faf8 100644 (file)
--- a/package/ar7-atm/patches/100-compile_fix.patch
+++ b/package/ar7-atm/patches/100-compile_fix.patch
@@ -1,6 +1,6 @@
-diff -urN sangam_atm-07.01.00.10/cppi_cpaal5.c sangam-atm-0.3/cppi_cpaal5.c
---- sangam_atm-07.01.00.10/cppi_cpaal5.c       2005-04-08 14:22:04.000000000 +0200
-+++ sangam-atm-0.3/cppi_cpaal5.c       2007-04-17 13:45:11.000000000 +0200
+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  2005-04-08 10:22:04.000000000 +0200
++++ sangam_atm-D7.03.01.00/cppi_cpaal5.c       2008-01-05 03:11:03.000000000 +0100
 @@ -352,7 +352,7 @@
             {
              /* malloc failed, add this RCB to Needs Buffer List */
 @@ -352,7 +352,7 @@
             {
              /* malloc failed, add this RCB to Needs Buffer List */
@@ -10,12 +10,12 @@ diff -urN sangam_atm-07.01.00.10/cppi_cpaal5.c sangam-atm-0.3/cppi_cpaal5.c
  
              if(HalDev->NeedsCount < MAX_NEEDS)                                  /* +MJH 030410 */
                {                                                                 /* +MJH 030410 */
  
              if(HalDev->NeedsCount < MAX_NEEDS)                                  /* +MJH 030410 */
                {                                                                 /* +MJH 030410 */
-diff -urN sangam_atm-07.01.00.10/dsl_hal_api.c sangam-atm-0.3/dsl_hal_api.c
---- sangam_atm-07.01.00.10/dsl_hal_api.c       2006-10-26 16:46:54.000000000 +0200
-+++ sangam-atm-0.3/dsl_hal_api.c       2007-04-19 01:12:40.000000000 +0200
-@@ -229,15 +229,15 @@
- *  10/4/06  JZ     CQ10979: Request for TR-069 Support for RP7.1
- *  UR8_MERGE_END   CQ10979*
+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  2007-03-07 04:13:06.000000000 +0100
++++ sangam_atm-D7.03.01.00/dsl_hal_api.c       2008-01-05 03:11:03.000000000 +0100
+@@ -254,15 +254,15 @@
+ *                            of phyEnableDisableWord & phyControlWord to avoid changing API struct
+ *                            which may cause change required to application data structure.
  ******************************************************************************/
 -#include <dev_host_interface.h>
 -#include <dsl_hal_register.h>
  ******************************************************************************/
 -#include <dev_host_interface.h>
 -#include <dsl_hal_register.h>
@@ -32,11 +32,11 @@ diff -urN sangam_atm-07.01.00.10/dsl_hal_api.c sangam-atm-0.3/dsl_hal_api.c
 -#include <dsl_hal_version.h>
 +#include "dsl_hal_version.h"
  
 -#include <dsl_hal_version.h>
 +#include "dsl_hal_version.h"
  
- static unsigned int hybrid_selected;
- static unsigned int showtimeFlag = FALSE;
-diff -urN sangam_atm-07.01.00.10/dsl_hal_support.c sangam-atm-0.3/dsl_hal_support.c
---- sangam_atm-07.01.00.10/dsl_hal_support.c   2006-08-11 21:17:38.000000000 +0200
-+++ sangam-atm-0.3/dsl_hal_support.c   2007-04-19 01:13:30.000000000 +0200
+ //  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      2007-05-18 09:47:33.000000000 +0200
++++ sangam_atm-D7.03.01.00/dsl_hal_support.c   2008-01-05 03:11:03.000000000 +0100
 @@ -140,9 +140,9 @@
  *                                          oamFeature are overriden
  // UR8_MERGE_END CQ10774 Ram
 @@ -140,9 +140,9 @@
  *                                          oamFeature are overriden
  // UR8_MERGE_END CQ10774 Ram
@@ -50,9 +50,9 @@ diff -urN sangam_atm-07.01.00.10/dsl_hal_support.c sangam-atm-0.3/dsl_hal_suppor
  
  #define NUM_READ_RETRIES 3
  static unsigned int dslhal_support_adsl2ByteSwap32(unsigned int in32Bits);
  
  #define NUM_READ_RETRIES 3
  static unsigned int dslhal_support_adsl2ByteSwap32(unsigned int in32Bits);
-diff -urN sangam_atm-07.01.00.10/dsl_hal_support.h sangam-atm-0.3/dsl_hal_support.h
---- sangam_atm-07.01.00.10/dsl_hal_support.h   2005-11-11 13:07:04.000000000 +0100
-+++ sangam-atm-0.3/dsl_hal_support.h   2007-04-19 01:12:01.000000000 +0200
+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      2005-11-11 09:07:04.000000000 +0100
++++ sangam_atm-D7.03.01.00/dsl_hal_support.h   2008-01-05 03:11:03.000000000 +0100
 @@ -49,7 +49,7 @@
  *    04Nov05     0.11.00            CPH    Fixed T1413 mode got Zero DS/US rate when DSL_BIT_TMODE is set.
  *******************************************************************************/
 @@ -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 +62,9 @@ diff -urN sangam_atm-07.01.00.10/dsl_hal_support.h sangam-atm-0.3/dsl_hal_suppor
  
  #define virtual2Physical(a)    (((int)a)&~0xe0000000)
  /* External Function Prototype Declarations */
  
  #define virtual2Physical(a)    (((int)a)&~0xe0000000)
  /* External Function Prototype Declarations */
-diff -urN sangam_atm-07.01.00.10/Makefile sangam-atm-0.3/Makefile
---- sangam_atm-07.01.00.10/Makefile    2005-06-01 09:46:28.000000000 +0200
-+++ sangam-atm-0.3/Makefile    2007-04-19 01:09:02.000000000 +0200
+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       2005-06-01 05:46:28.000000000 +0200
++++ sangam_atm-D7.03.01.00/Makefile    2008-01-05 03:11:03.000000000 +0100
 @@ -1,18 +1,9 @@
 -# File: drivers/atm/ti_evm3/Makefile
  #
 @@ -1,18 +1,9 @@
 -# File: drivers/atm/ti_evm3/Makefile
  #
@@ -90,27 +90,35 @@ diff -urN sangam_atm-07.01.00.10/Makefile sangam-atm-0.3/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
 +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-07.01.00.10/tn7atm.c sangam-atm-0.3/tn7atm.c
---- sangam_atm-07.01.00.10/tn7atm.c    2006-10-26 16:48:52.000000000 +0200
-+++ sangam-atm-0.3/tn7atm.c    2007-04-18 15:34:05.000000000 +0200
-@@ -58,7 +58,6 @@
-  *    UR8_MERGE_END   CQ10979*
+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       2007-05-18 09:45:50.000000000 +0200
++++ sangam_atm-D7.03.01.00/tn7atm.c    2008-01-05 03:11:03.000000000 +0100
+@@ -61,7 +61,6 @@
+  *    UR8_MERGE_END   CQ11057*
  *********************************************************************************************/
  
 -#include <linux/config.h>
  #include <linux/kernel.h>
  #include <linux/module.h>
  #include <linux/init.h>
  *********************************************************************************************/
  
 -#include <linux/config.h>
  #include <linux/kernel.h>
  #include <linux/module.h>
  #include <linux/init.h>
-@@ -67,7 +66,7 @@
+@@ -69,11 +68,14 @@
+ #include <linux/delay.h>
  #include <linux/spinlock.h>
  #include <linux/smp_lock.h>
  #include <linux/spinlock.h>
  #include <linux/smp_lock.h>
- #include <asm/io.h>
+-#include <asm/io.h>
 -#include <asm/mips-boards/prom.h>
 -#include <asm/mips-boards/prom.h>
-+#include <asm/ar7/ar7.h>
  #include <linux/proc_fs.h>
  #include <linux/string.h>
  #include <linux/ctype.h>
  #include <linux/proc_fs.h>
  #include <linux/string.h>
  #include <linux/ctype.h>
-@@ -79,6 +78,7 @@
++
++#include <asm/io.h>
++#include <asm/ar7/ar7.h>
++#include <asm/ar7/prom.h>
++
+ #include "dsl_hal_api.h"
+ #include "tn7atm.h"
+ #include "tn7api.h"
+@@ -82,6 +84,7 @@
  #include "dsl_hal_register.h"
  
  #ifdef MODULE
  #include "dsl_hal_register.h"
  
  #ifdef MODULE
@@ -118,7 +126,7 @@ diff -urN sangam_atm-07.01.00.10/tn7atm.c sangam-atm-0.3/tn7atm.c
  MODULE_DESCRIPTION ("Tnetd73xx ATM Device Driver");
  MODULE_AUTHOR ("Zhicheng Tang");
  #endif
  MODULE_DESCRIPTION ("Tnetd73xx ATM Device Driver");
  MODULE_AUTHOR ("Zhicheng Tang");
  #endif
-@@ -97,9 +97,9 @@
+@@ -100,9 +103,9 @@
  
  /*end of externs */
  
  
  /*end of externs */
  
@@ -131,7 +139,7 @@ diff -urN sangam_atm-07.01.00.10/tn7atm.c sangam-atm-0.3/tn7atm.c
  
  #define tn7atm_kfree_skb(x)     dev_kfree_skb(x)
  
  
  #define tn7atm_kfree_skb(x)     dev_kfree_skb(x)
  
-@@ -111,7 +111,7 @@
+@@ -114,7 +117,7 @@
  /* prototypes */
  static int tn7atm_set_can_support_adsl2 (int can);
  
  /* prototypes */
  static int tn7atm_set_can_support_adsl2 (int can);
  
@@ -140,7 +148,7 @@ diff -urN sangam_atm-07.01.00.10/tn7atm.c sangam-atm-0.3/tn7atm.c
  
  static void tn7atm_close (struct atm_vcc *vcc);
  
  
  static void tn7atm_close (struct atm_vcc *vcc);
  
-@@ -254,13 +254,12 @@
+@@ -257,13 +260,12 @@
          getsockopt:     NULL,
          setsockopt:     NULL,
          send:           tn7atm_send,
          getsockopt:     NULL,
          setsockopt:     NULL,
          send:           tn7atm_send,
@@ -155,7 +163,7 @@ diff -urN sangam_atm-07.01.00.10/tn7atm.c sangam-atm-0.3/tn7atm.c
  static struct proc_dir_entry *root_proc_dir_entry = NULL;
  #define DRV_PROC_MODE 0644
  static int proc_root_already_exists = TRUE;
  static struct proc_dir_entry *root_proc_dir_entry = NULL;
  #define DRV_PROC_MODE 0644
  static int proc_root_already_exists = TRUE;
-@@ -549,56 +548,6 @@
+@@ -559,56 +561,6 @@
  
  /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   *
  
  /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   *
@@ -212,7 +220,7 @@ diff -urN sangam_atm-07.01.00.10/tn7atm.c sangam-atm-0.3/tn7atm.c
   *  Function: int tn7atm_sar_irq(void)
   *
   *  Description: tnetd73xx SAR interrupt.
   *  Function: int tn7atm_sar_irq(void)
   *
   *  Description: tnetd73xx SAR interrupt.
-@@ -694,8 +643,8 @@
+@@ -704,8 +656,8 @@
    {
      def_sar_inter_pace = os_atoi (ptr);
    }
    {
      def_sar_inter_pace = os_atoi (ptr);
    }
@@ -223,7 +231,7 @@ diff -urN sangam_atm-07.01.00.10/tn7atm.c sangam-atm-0.3/tn7atm.c
  
    /*
     * Reigster Receive interrupt A
  
    /*
     * Reigster Receive interrupt A
-@@ -865,11 +814,15 @@
+@@ -875,11 +827,15 @@
  #define ATM_VBR_RT     5
  #endif
  
  #define ATM_VBR_RT     5
  #endif
  
@@ -240,19 +248,19 @@ diff -urN sangam_atm-07.01.00.10/tn7atm.c sangam-atm-0.3/tn7atm.c
  
    dgprintf(1, "tn7atm_open()\n");
  
  
    dgprintf(1, "tn7atm_open()\n");
  
-@@ -881,24 +834,18 @@
+@@ -891,24 +847,18 @@
      return -1;
    }
  
 -  MOD_INC_USE_COUNT;
      return -1;
    }
  
 -  MOD_INC_USE_COUNT;
--
++//  MOD_INC_USE_COUNT;
+ 
 -  /* find a free VPI/VCI */
 -  tn7atm_walk_vccs(vcc, &vpi, &vci);
 -
 -  vcc->vpi = vpi;
 -  vcc->vci = vci;
 -  /* find a free VPI/VCI */
 -  tn7atm_walk_vccs(vcc, &vpi, &vci);
 -
 -  vcc->vpi = vpi;
 -  vcc->vci = vci;
-+//  MOD_INC_USE_COUNT;
- 
+-
 -  if ((vci == ATM_VCI_UNSPEC) || (vpi == ATM_VCI_UNSPEC))
 +  if ((vcc->vci == ATM_VCI_UNSPEC) || (vcc->vpi == ATM_VCI_UNSPEC))
    {
 -  if ((vci == ATM_VCI_UNSPEC) || (vpi == ATM_VCI_UNSPEC))
 +  if ((vcc->vci == ATM_VCI_UNSPEC) || (vcc->vpi == ATM_VCI_UNSPEC))
    {
@@ -271,7 +279,7 @@ diff -urN sangam_atm-07.01.00.10/tn7atm.c sangam-atm-0.3/tn7atm.c
    {
      /* always use (max_dma_chan+1) for clear eoc */
      tn7atm_activate_vc_parm.chan = EOC_DMA_CHAN;
    {
      /* always use (max_dma_chan+1) for clear eoc */
      tn7atm_activate_vc_parm.chan = EOC_DMA_CHAN;
-@@ -906,7 +853,7 @@
+@@ -916,7 +866,7 @@
      /* check to see whether clear eoc is opened or not */
      if (tn7atm_activate_vc_parm.priv->lut[tn7atm_activate_vc_parm.chan].inuse)
      {
      /* check to see whether clear eoc is opened or not */
      if (tn7atm_activate_vc_parm.priv->lut[tn7atm_activate_vc_parm.chan].inuse)
      {
@@ -280,7 +288,7 @@ diff -urN sangam_atm-07.01.00.10/tn7atm.c sangam-atm-0.3/tn7atm.c
        printk("tn7atm_open: Clear EOC channel (dmachan=%d) already in use.\n", tn7atm_activate_vc_parm.chan);
        return -EBUSY;
      }
        printk("tn7atm_open: Clear EOC channel (dmachan=%d) already in use.\n", tn7atm_activate_vc_parm.chan);
        return -EBUSY;
      }
-@@ -915,7 +862,7 @@
+@@ -925,7 +875,7 @@
      if (rc)
      {
        printk("tn7atm_open: failed to setup clear_eoc\n");
      if (rc)
      {
        printk("tn7atm_open: failed to setup clear_eoc\n");
@@ -289,7 +297,7 @@ diff -urN sangam_atm-07.01.00.10/tn7atm.c sangam-atm-0.3/tn7atm.c
        return -EBUSY;
      }
      tn7atm_set_lut(tn7atm_activate_vc_parm.priv,vcc, tn7atm_activate_vc_parm.chan);
        return -EBUSY;
      }
      tn7atm_set_lut(tn7atm_activate_vc_parm.priv,vcc, tn7atm_activate_vc_parm.chan);
-@@ -924,17 +871,17 @@
+@@ -934,17 +884,17 @@
    }
    else  /* PVC channel setup */
    {
    }
    else  /* PVC channel setup */
    {
@@ -310,7 +318,7 @@ diff -urN sangam_atm-07.01.00.10/tn7atm.c sangam-atm-0.3/tn7atm.c
          printk("PVC already opened. dmachan = %d\n", rc);
          return -EBUSY;
        }
          printk("PVC already opened. dmachan = %d\n", rc);
          return -EBUSY;
        }
-@@ -966,6 +913,7 @@
+@@ -976,6 +926,7 @@
         tn7atm_activate_vc_parm.priority = 2;
         break;
  
         tn7atm_activate_vc_parm.priority = 2;
         break;
  
@@ -318,7 +326,7 @@ diff -urN sangam_atm-07.01.00.10/tn7atm.c sangam-atm-0.3/tn7atm.c
       case ATM_VBR: /* Variable Bit Rate-Non RealTime*/
         tn7atm_activate_vc_parm.qos = 1;
         tn7atm_activate_vc_parm.priority = 1;
       case ATM_VBR: /* Variable Bit Rate-Non RealTime*/
         tn7atm_activate_vc_parm.qos = 1;
         tn7atm_activate_vc_parm.priority = 1;
-@@ -987,6 +935,7 @@
+@@ -997,6 +948,7 @@
             tn7atm_activate_vc_parm.mbs = vcc->qos.txtp.max_pcr;
         tn7atm_activate_vc_parm.cdvt = vcc->qos.txtp.max_cdv;
         break;
             tn7atm_activate_vc_parm.mbs = vcc->qos.txtp.max_pcr;
         tn7atm_activate_vc_parm.cdvt = vcc->qos.txtp.max_cdv;
         break;
@@ -326,7 +334,7 @@ diff -urN sangam_atm-07.01.00.10/tn7atm.c sangam-atm-0.3/tn7atm.c
  
       default:
           tn7atm_activate_vc_parm.qos = 2;
  
       default:
           tn7atm_activate_vc_parm.qos = 2;
-@@ -1014,7 +963,7 @@
+@@ -1024,7 +976,7 @@
     if (rc < 0)
     {
        printk("failed to activate hw channel\n");
     if (rc < 0)
     {
        printk("failed to activate hw channel\n");
@@ -335,7 +343,7 @@ diff -urN sangam_atm-07.01.00.10/tn7atm.c sangam-atm-0.3/tn7atm.c
        tn7atm_lut_clear(vcc, tn7atm_activate_vc_parm.chan);
        //spin_unlock_irqrestore(&chan_init_lock, flags);
        return -EBUSY;
        tn7atm_lut_clear(vcc, tn7atm_activate_vc_parm.chan);
        //spin_unlock_irqrestore(&chan_init_lock, flags);
        return -EBUSY;
-@@ -1104,7 +1053,7 @@
+@@ -1114,7 +1066,7 @@
    tn7atm_lut_clear (vcc, dmachan);
    //spin_unlock_irqrestore (&closeLock, closeFlag);
  
    tn7atm_lut_clear (vcc, dmachan);
    //spin_unlock_irqrestore (&closeLock, closeFlag);
  
@@ -344,21 +352,17 @@ diff -urN sangam_atm-07.01.00.10/tn7atm.c sangam-atm-0.3/tn7atm.c
  
    dgprintf (1, "Leave tn7atm_close\n");
  }
  
    dgprintf (1, "Leave tn7atm_close\n");
  }
-@@ -1518,8 +1467,11 @@
+@@ -1528,8 +1480,7 @@
                                   * firewall is on */
  
    dgprintf (3, "pushing the skb...\n");
 -
 -  skb->stamp = vcc->timestamp = xtime;
                                   * firewall is on */
  
    dgprintf (3, "pushing the skb...\n");
 -
 -  skb->stamp = vcc->timestamp = xtime;
-+  {
-+    struct timeval tv;
-+    do_gettimeofday(&tv);
-+    skb_set_timestamp(skb, &tv);
-+  }
++  __net_timestamp(skb);
  
    xdump ((unsigned char *) skb->data, skb->len, 5);
  
  
    xdump ((unsigned char *) skb->data, skb->len, 5);
  
-@@ -1715,8 +1667,7 @@
+@@ -1725,8 +1676,7 @@
  
    kfree (dev->dev_data);
  
  
    kfree (dev->dev_data);
  
@@ -368,7 +372,7 @@ diff -urN sangam_atm-07.01.00.10/tn7atm.c sangam-atm-0.3/tn7atm.c
  
    /*
     * remove proc entries
  
    /*
     * remove proc entries
-@@ -1875,9 +1826,6 @@
+@@ -1885,9 +1835,6 @@
    /*
     * Set up proc entry for atm stats
     */
    /*
     * Set up proc entry for atm stats
     */
@@ -378,7 +382,7 @@ diff -urN sangam_atm-07.01.00.10/tn7atm.c sangam-atm-0.3/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);
      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);
-@@ -1887,7 +1835,6 @@
+@@ -1897,7 +1844,6 @@
        return -ENOMEM;
      }
      proc_root_already_exists = FALSE;
        return -ENOMEM;
      }
      proc_root_already_exists = FALSE;
@@ -386,7 +390,7 @@ diff -urN sangam_atm-07.01.00.10/tn7atm.c sangam-atm-0.3/tn7atm.c
  
    /*
     * AV: Clean-up. Moved all the definitions to the data structure.
  
    /*
     * AV: Clean-up. Moved all the definitions to the data structure.
-@@ -2469,7 +2416,5 @@
+@@ -2479,7 +2425,5 @@
      return count;
  }
  
      return count;
  }
  
@@ -394,9 +398,9 @@ diff -urN sangam_atm-07.01.00.10/tn7atm.c sangam-atm-0.3/tn7atm.c
  module_init (tn7atm_detect);
  module_exit (tn7atm_exit);
 -#endif /* MODULE */
  module_init (tn7atm_detect);
  module_exit (tn7atm_exit);
 -#endif /* MODULE */
-diff -urN sangam_atm-07.01.00.10/tn7atm.h sangam-atm-0.3/tn7atm.h
---- sangam_atm-07.01.00.10/tn7atm.h    2006-04-05 11:33:06.000000000 +0200
-+++ sangam-atm-0.3/tn7atm.h    2007-04-18 03:45:08.000000000 +0200
+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       2006-04-05 07:33:06.000000000 +0200
++++ sangam_atm-D7.03.01.00/tn7atm.h    2008-01-05 03:11:03.000000000 +0100
 @@ -19,7 +19,8 @@
  //#include  "mips_support.h"
  #include  <linux/list.h>
 @@ -19,7 +19,8 @@
  //#include  "mips_support.h"
  #include  <linux/list.h>
@@ -407,38 +411,42 @@ diff -urN sangam_atm-07.01.00.10/tn7atm.h sangam-atm-0.3/tn7atm.h
  
  #ifdef CONFIG_MODVERSIONS
  #include <linux/modversions.h>
  
  #ifdef CONFIG_MODVERSIONS
  #include <linux/modversions.h>
-diff -urN sangam_atm-07.01.00.10/tn7dsl.c sangam-atm-0.3/tn7dsl.c
---- sangam_atm-07.01.00.10/tn7dsl.c    2006-10-26 16:48:44.000000000 +0200
-+++ sangam-atm-0.3/tn7dsl.c    2007-04-18 15:45:58.000000000 +0200
-@@ -88,7 +88,6 @@
- *  10/4/06  JZ     CQ10979: Request for TR-069 Support for RP7.1
- *  UR8_MERGE_END   CQ10979*
+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       2007-01-04 09:04:14.000000000 +0100
++++ sangam_atm-D7.03.01.00/tn7dsl.c    2008-01-05 03:11:03.000000000 +0100
+@@ -94,7 +94,6 @@
+ *  1/02/07  JZ     CQ11054: Data Precision and Range Changes for TR-069 Conformance
+ *  UR8_MERGE_END   CQ11054*
   *********************************************************************************************/
 -#include <linux/config.h>
  #include <linux/kernel.h>
  #include <linux/module.h>
  #include <linux/init.h>
   *********************************************************************************************/
 -#include <linux/config.h>
  #include <linux/kernel.h>
  #include <linux/module.h>
  #include <linux/init.h>
-@@ -97,7 +96,7 @@
+@@ -102,8 +101,6 @@
+ #include <linux/delay.h>
  #include <linux/spinlock.h>
  #include <linux/smp_lock.h>
  #include <linux/spinlock.h>
  #include <linux/smp_lock.h>
- #include <asm/io.h>
+-#include <asm/io.h>
 -#include <asm/mips-boards/prom.h>
 -#include <asm/mips-boards/prom.h>
-+#include <asm/ar7/ar7.h>
  #include <linux/proc_fs.h>
  #include <linux/string.h>
  #include <linux/ctype.h>
  #include <linux/proc_fs.h>
  #include <linux/string.h>
  #include <linux/ctype.h>
-@@ -105,6 +104,8 @@
+@@ -111,6 +108,12 @@
  #include <linux/timer.h>
  #include <linux/vmalloc.h>
  #include <linux/file.h>
 +#include <linux/firmware.h>
  #include <linux/timer.h>
  #include <linux/vmalloc.h>
  #include <linux/file.h>
 +#include <linux/firmware.h>
++
++#include <asm/io.h>
++#include <asm/ar7/ar7.h>
++#include <asm/ar7/prom.h>
 +
  /* Modules specific header files */
  #include "tn7atm.h"
  #include "tn7api.h"
 +
  /* Modules specific header files */
  #include "tn7atm.h"
  #include "tn7api.h"
-@@ -312,6 +313,14 @@
- static int tn7dsl_proc_snr_print (char *buf, int count, int *eof, int data);
- /* end of internal functions */
+@@ -323,6 +326,14 @@
+ #define gDot1(a) ((a>0)?(a%10):((-a)%10))
+ //  UR8_MERGE_END   CQ11054*
  
 +int avalanche_request_intr_pacing(int irq_nr, unsigned int blk_num,
 +                            unsigned int pace_value)
  
 +int avalanche_request_intr_pacing(int irq_nr, unsigned int blk_num,
 +                            unsigned int pace_value)
@@ -451,7 +459,7 @@ diff -urN sangam_atm-07.01.00.10/tn7dsl.c sangam-atm-0.3/tn7dsl.c
  int os_atoi(const char *pStr)
  {
    int MulNeg = (*pStr == '-' ? -1 : 1);
  int os_atoi(const char *pStr)
  {
    int MulNeg = (*pStr == '-' ? -1 : 1);
-@@ -348,39 +357,6 @@
+@@ -359,39 +370,6 @@
  #endif
  }
  
  #endif
  }
  
@@ -491,7 +499,7 @@ diff -urN sangam_atm-07.01.00.10/tn7dsl.c sangam-atm-0.3/tn7dsl.c
  // * UR8_MERGE_START CQ10640   Jack Zhang
  int tn7dsl_dump_dsp_memory(char *input_str) //cph99
    {
  // * UR8_MERGE_START CQ10640   Jack Zhang
  int tn7dsl_dump_dsp_memory(char *input_str) //cph99
    {
-@@ -430,101 +406,72 @@
+@@ -441,101 +419,74 @@
    return CpuFrequency;
  }
  
    return CpuFrequency;
  }
  
@@ -569,7 +577,9 @@ diff -urN sangam_atm-07.01.00.10/tn7dsl.c sangam-atm-0.3/tn7dsl.c
 -
 -  dgprintf(4,"shim_read_overlay_page\n");
 -  //dgprintf(4,"sec offset=%d, sec length =%d\n", secOffset, secLength);
 -
 -  dgprintf(4,"shim_read_overlay_page\n");
 -  //dgprintf(4,"sec offset=%d, sec length =%d\n", secOffset, secLength);
--
++      const struct firmware *fw_entry;
++      size_t size;
+ 
 -  filp=filp_open(DSP_FIRMWARE_PATH,00,O_RDONLY);
 -  if(filp ==NULL)
 -  {
 -  filp=filp_open(DSP_FIRMWARE_PATH,00,O_RDONLY);
 -  if(filp ==NULL)
 -  {
@@ -590,8 +600,7 @@ diff -urN sangam_atm-07.01.00.10/tn7dsl.c sangam-atm-0.3/tn7dsl.c
 -  set_fs(KERNEL_DS);
 -  filp->f_pos = secOffset;
 -  bytesRead = filp->f_op->read(filp,ptr,secLength,&filp->f_pos);
 -  set_fs(KERNEL_DS);
 -  filp->f_pos = secOffset;
 -  bytesRead = filp->f_op->read(filp,ptr,secLength,&filp->f_pos);
-+      const struct firmware *fw_entry;
- 
+-
 -  set_fs(oldfs);
 -  /*
 -   * Close the file
 -  set_fs(oldfs);
 -  /*
 -   * Close the file
@@ -611,16 +620,17 @@ diff -urN sangam_atm-07.01.00.10/tn7dsl.c sangam-atm-0.3/tn7dsl.c
 +              device_unregister(&avsar);
 +              return -1;
 +      }
 +              device_unregister(&avsar);
 +              return -1;
 +      }
++      size = fw_entry->size;
 +      device_unregister(&avsar);
 +      device_unregister(&avsar);
-+      if(fw_entry->size > 0x5ffff) {
++      if(size > 0x5ffff) {
 +                      printk(KERN_ERR
 +                      printk(KERN_ERR
-+                      "avsar: Firmware too big (%d bytes)\n", fw_entry->size);
++                      "avsar: Firmware too big (%d bytes)\n", size);
 +                      release_firmware(fw_entry);
 +                      return -1;
 +              }
 +                      release_firmware(fw_entry);
 +                      return -1;
 +              }
-+      memcpy(ptr, fw_entry->data, fw_entry->size);
++      memcpy(ptr, fw_entry->data, size);
 +      release_firmware(fw_entry);
 +      release_firmware(fw_entry);
-+      return fw_entry->size;
++      return size;
 +}
 +
 +unsigned int shim_read_overlay_page(void *ptr, unsigned int secOffset, unsigned int secLength)
 +}
 +
 +unsigned int shim_read_overlay_page(void *ptr, unsigned int secOffset, unsigned int secLength)
@@ -649,11 +659,11 @@ diff -urN sangam_atm-07.01.00.10/tn7dsl.c sangam-atm-0.3/tn7dsl.c
 +      }
 +      memcpy(ptr + secOffset, fw_entry->data, secLength);
 +      release_firmware(fw_entry);
 +      }
 +      memcpy(ptr + secOffset, fw_entry->data, secLength);
 +      release_firmware(fw_entry);
-+      return fw_entry->size;
++      return secLength;
  }
  
  int shim_osLoadDebugFWImage(unsigned char *ptr)
  }
  
  int shim_osLoadDebugFWImage(unsigned char *ptr)
-@@ -3367,7 +3314,7 @@
+@@ -3442,7 +3393,7 @@
     */
    if(write)
      {
     */
    if(write)
      {
@@ -662,7 +672,7 @@ diff -urN sangam_atm-07.01.00.10/tn7dsl.c sangam-atm-0.3/tn7dsl.c
  
      switch (ctl->ctl_name)
        {
  
      switch (ctl->ctl_name)
        {
-@@ -3453,7 +3400,7 @@
+@@ -3528,7 +3479,7 @@
    else
      {
      len += sprintf(info+len, mod_req);
    else
      {
      len += sprintf(info+len, mod_req);
@@ -671,9 +681,19 @@ diff -urN sangam_atm-07.01.00.10/tn7dsl.c sangam-atm-0.3/tn7dsl.c
      }
    return ret;
  }
      }
    return ret;
  }
-diff -urN sangam_atm-07.01.00.10/tn7sar.c sangam-atm-0.3/tn7sar.c
---- sangam_atm-07.01.00.10/tn7sar.c    2006-07-27 10:34:42.000000000 +0200
-+++ sangam-atm-0.3/tn7sar.c    2007-04-18 03:47:39.000000000 +0200
+@@ -3558,8 +3509,7 @@
+   if (initialized == 1)
+     return;
+ 
+-  dslmod_sysctl_header = register_sysctl_table(dslmod_root_table, 1);
+-  dslmod_root_table->child->de->owner = THIS_MODULE;
++  dslmod_sysctl_header = register_sysctl_table(dslmod_root_table);
+ 
+   /*
+    * set the defaults
+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       2007-05-18 09:46:30.000000000 +0200
++++ sangam_atm-D7.03.01.00/tn7sar.c    2008-01-05 03:11:03.000000000 +0100
 @@ -42,7 +42,6 @@
   * UR8_MERGE_END CQ10700
   *******************************************************************************/
 @@ -42,7 +42,6 @@
   * UR8_MERGE_END CQ10700
   *******************************************************************************/
@@ -682,26 +702,19 @@ diff -urN sangam_atm-07.01.00.10/tn7sar.c sangam-atm-0.3/tn7sar.c
  #include <linux/kernel.h>
  #include <linux/module.h>
  #include <linux/init.h>
  #include <linux/kernel.h>
  #include <linux/module.h>
  #include <linux/init.h>
-@@ -51,7 +50,7 @@
+@@ -50,12 +49,13 @@
+ #include <linux/delay.h>
  #include <linux/spinlock.h>
  #include <linux/smp_lock.h>
  #include <linux/spinlock.h>
  #include <linux/smp_lock.h>
- #include <asm/io.h>
+-#include <asm/io.h>
 -#include <asm/mips-boards/prom.h>
 -#include <asm/mips-boards/prom.h>
-+#include <asm/ar7/ar7.h>
  #include <linux/proc_fs.h>
  #include <linux/string.h>
  #include <linux/ctype.h>
  #include <linux/proc_fs.h>
  #include <linux/string.h>
  #include <linux/ctype.h>
-
-diff -ur atm.old/tn7dsl.c atm.dev/tn7dsl.c
---- atm.old/tn7dsl.c   2007-05-24 17:36:33.865636000 +0200
-+++ atm.dev/tn7dsl.c   2007-05-24 17:41:32.094298496 +0200
-@@ -3430,8 +3430,7 @@
-   if (initialized == 1)
-     return;
  
  
--  dslmod_sysctl_header = register_sysctl_table(dslmod_root_table, 1);
--  dslmod_root_table->child->de->owner = THIS_MODULE;
-+  dslmod_sysctl_header = register_sysctl_table(dslmod_root_table);
++#include <asm/io.h>
++#include <asm/ar7/ar7.h>
++#include <asm/ar7/prom.h>
  
  
-   /*
-    * set the defaults
+ #define _CPHAL_AAL5
+ #define _CPHAL_SAR
Personal OpenWRT clone
This page took 0.043786 seconds and 4 git commands to generate.