ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-21 22:47:56 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

refresh ar7-atm patches

Browse Source 
SVN-Revision: 16158
This commit is contained in:
Florian Fainelli 2009-05-28 19:04:54 +00:00
parent 16ad5caa22
commit 92f26dfbef
7 changed files with 96 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
package/ar7-atm/patches/100-compile_fix.patch
View File

@ -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 --- a/cppi_cpaal5.c
--- sangam_atm-D7.03.01.00.orig/cppi_cpaal5.c 2008-03-11 02:11:02.000000000 +0100 +++ b/cppi_cpaal5.c
+++ sangam_atm-D7.03.01.00/cppi_cpaal5.c 2008-03-11 02:12:00.000000000 +0100 @@ -352,7 +352,7 @@ static int halRxReturn(HAL_RECEIVEINFO *
@@ -352,7 +352,7 @@
{ {
/* malloc failed, add this RCB to Needs Buffer List */ /* malloc failed, add this RCB to Needs Buffer List */
TempRcb->FragCount = 1; /*MJH+030417*/ 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 */ if(HalDev->NeedsCount < MAX_NEEDS) /* +MJH 030410 */
{ /* +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 --- a/dsl_hal_api.c
--- sangam_atm-D7.03.01.00.orig/dsl_hal_api.c 2008-03-11 02:11:02.000000000 +0100 +++ b/dsl_hal_api.c
+++ sangam_atm-D7.03.01.00/dsl_hal_api.c 2008-03-11 02:12:00.000000000 +0100
@@ -254,15 +254,15 @@ @@ -254,15 +254,15 @@
* of phyEnableDisableWord & phyControlWord to avoid changing API struct * of phyEnableDisableWord & phyControlWord to avoid changing API struct
* which may cause change required to application data structure. * 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 // UR8_MERGE_START CQ11054 Jack Zhang
static unsigned int highprecision_selected = 0; //By default we use low precision for backward compt. 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 --- a/dsl_hal_support.c
--- sangam_atm-D7.03.01.00.orig/dsl_hal_support.c 2008-03-11 02:11:02.000000000 +0100 +++ b/dsl_hal_support.c
+++ sangam_atm-D7.03.01.00/dsl_hal_support.c 2008-03-11 02:12:00.000000000 +0100
@@ -140,9 +140,9 @@ @@ -140,9 +140,9 @@
* oamFeature are overriden * oamFeature are overriden
// UR8_MERGE_END CQ10774 Ram // 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 #define NUM_READ_RETRIES 3
static unsigned int dslhal_support_adsl2ByteSwap32(unsigned int in32Bits); 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 --- a/dsl_hal_support.h
--- sangam_atm-D7.03.01.00.orig/dsl_hal_support.h 2008-03-11 02:11:02.000000000 +0100 +++ b/dsl_hal_support.h
+++ sangam_atm-D7.03.01.00/dsl_hal_support.h 2008-03-11 02:12:00.000000000 +0100
@@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
* 04Nov05 0.11.00 CPH Fixed T1413 mode got Zero DS/US rate when DSL_BIT_TMODE is set. * 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) #define virtual2Physical(a) (((int)a)&~0xe0000000)
/* External Function Prototype Declarations */ /* External Function Prototype Declarations */
diff -urN sangam_atm-D7.03.01.00.orig/Makefile sangam_atm-D7.03.01.00/Makefile --- a/Makefile
--- sangam_atm-D7.03.01.00.orig/Makefile 2008-03-11 02:11:02.000000000 +0100 +++ b/Makefile
+++ sangam_atm-D7.03.01.00/Makefile 2008-03-11 02:12:00.000000000 +0100
@@ -1,18 +1,9 @@ @@ -1,18 +1,9 @@
-# File: drivers/atm/ti_evm3/Makefile -# 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 +EXTRA_CFLAGS += -DEL -I$(PWD) -DPOST_SILICON -DCOMMON_NSP -DNO_ACT -D__NO__VOICE_PATCH__ -DEL
+obj-$(CONFIG_SANGAM_ATM) := tiatm.o +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 +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 --- a/tn7atm.c
--- sangam_atm-D7.03.01.00.orig/tn7atm.c 2008-03-11 02:11:02.000000000 +0100 +++ b/tn7atm.c
+++ sangam_atm-D7.03.01.00/tn7atm.c 2008-03-11 02:12:00.000000000 +0100
@@ -61,7 +61,6 @@ @@ -61,7 +61,6 @@
* UR8_MERGE_END CQ11057* * 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_DESCRIPTION ("Tnetd73xx ATM Device Driver");
MODULE_AUTHOR ("Zhicheng Tang"); MODULE_AUTHOR ("Zhicheng Tang");
#endif #endif
@@ -100,9 +103,9 @@ @@ -100,9 +103,9 @@ MODULE_AUTHOR ("Zhicheng Tang");
/*end of externs */ /*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) #define tn7atm_kfree_skb(x) dev_kfree_skb(x)
@@ -114,7 +117,7 @@ @@ -114,7 +117,7 @@ static int EnableQoS = FALSE;
/* prototypes */ /* prototypes */
static int tn7atm_set_can_support_adsl2 (int can); 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); 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, getsockopt: NULL,
setsockopt: NULL, setsockopt: NULL,
send: tn7atm_send, 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; static struct proc_dir_entry *root_proc_dir_entry = NULL;
#define DRV_PROC_MODE 0644 #define DRV_PROC_MODE 0644
static int proc_root_already_exists = TRUE; 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) * Function: int tn7atm_sar_irq(void)
* *
* Description: tnetd73xx SAR interrupt. * Description: tnetd73xx SAR interrupt.
@@ -693,7 +645,7 @@ @@ -693,7 +645,7 @@ static int __init tn7atm_irq_request (st
* Register SAR interrupt * Register SAR interrupt
*/ */
priv->sar_irq = LNXINTNUM (ATM_SAR_INT); /* Interrupt line # */ 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"); 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); 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"); printk ("Could not register tn7atm_dsl_irq\n");
/***** VRB Tasklet Mode ****/ /***** VRB Tasklet Mode ****/
@@ -875,11 +827,15 @@ @@ -875,11 +827,15 @@ static int __init tn7atm_get_ESI (struct
#define ATM_VBR_RT 5 #define ATM_VBR_RT 5
#endif #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"); dgprintf(1, "tn7atm_open()\n");
@@ -891,24 +847,18 @@ @@ -891,24 +847,18 @@ int tn7atm_open (struct atm_vcc *vcc, sh
return -1; 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 */ /* always use (max_dma_chan+1) for clear eoc */
tn7atm_activate_vc_parm.chan = EOC_DMA_CHAN; 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 */ /* check to see whether clear eoc is opened or not */
if (tn7atm_activate_vc_parm.priv->lut[tn7atm_activate_vc_parm.chan].inuse) 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); printk("tn7atm_open: Clear EOC channel (dmachan=%d) already in use.\n", tn7atm_activate_vc_parm.chan);
return -EBUSY; return -EBUSY;
} }
@@ -925,7 +875,7 @@ @@ -925,7 +875,7 @@ int tn7atm_open (struct atm_vcc *vcc, sh
if (rc) if (rc)
{ {
printk("tn7atm_open: failed to setup clear_eoc\n"); 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; return -EBUSY;
} }
tn7atm_set_lut(tn7atm_activate_vc_parm.priv,vcc, tn7atm_activate_vc_parm.chan); 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 */ 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); printk("PVC already opened. dmachan = %d\n", rc);
return -EBUSY; return -EBUSY;
} }
@@ -976,6 +926,7 @@ @@ -976,6 +926,7 @@ int tn7atm_open (struct atm_vcc *vcc, sh
tn7atm_activate_vc_parm.priority = 2; tn7atm_activate_vc_parm.priority = 2;
break; 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*/ case ATM_VBR: /* Variable Bit Rate-Non RealTime*/
tn7atm_activate_vc_parm.qos = 1; tn7atm_activate_vc_parm.qos = 1;
tn7atm_activate_vc_parm.priority = 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.mbs = vcc->qos.txtp.max_pcr;
tn7atm_activate_vc_parm.cdvt = vcc->qos.txtp.max_cdv; tn7atm_activate_vc_parm.cdvt = vcc->qos.txtp.max_cdv;
break; 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: default:
tn7atm_activate_vc_parm.qos = 2; 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) if (rc < 0)
{ {
printk("failed to activate hw channel\n"); 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); tn7atm_lut_clear(vcc, tn7atm_activate_vc_parm.chan);
//spin_unlock_irqrestore(&chan_init_lock, flags); //spin_unlock_irqrestore(&chan_init_lock, flags);
return -EBUSY; return -EBUSY;
@@ -1114,7 +1066,7 @@ @@ -1114,7 +1066,7 @@ void tn7atm_close (struct atm_vcc *vcc)
tn7atm_lut_clear (vcc, dmachan); tn7atm_lut_clear (vcc, dmachan);
//spin_unlock_irqrestore (&closeLock, closeFlag); //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"); 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 */ * firewall is on */
dgprintf (3, "pushing the skb...\n"); 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); 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); 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 * remove proc entries
@@ -1885,9 +1835,6 @@ @@ -1885,9 +1835,6 @@ static int __init tn7atm_detect (void)
/* /*
* Set up proc entry for atm stats * 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", printk ("Creating new root folder %s in the proc for the driver stats \n",
drv_proc_root_folder); drv_proc_root_folder);
root_proc_dir_entry = proc_mkdir (drv_proc_root_folder, NULL); 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; return -ENOMEM;
} }
proc_root_already_exists = FALSE; 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. * 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; 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_init (tn7atm_detect);
module_exit (tn7atm_exit); module_exit (tn7atm_exit);
-#endif /* MODULE */ -#endif /* MODULE */
diff -urN sangam_atm-D7.03.01.00.orig/tn7atm.h sangam_atm-D7.03.01.00/tn7atm.h --- a/tn7atm.h
--- sangam_atm-D7.03.01.00.orig/tn7atm.h 2008-03-11 02:11:02.000000000 +0100 +++ b/tn7atm.h
+++ sangam_atm-D7.03.01.00/tn7atm.h 2008-03-11 02:12:00.000000000 +0100
@@ -19,7 +19,8 @@ @@ -19,7 +19,8 @@
//#include "mips_support.h" //#include "mips_support.h"
#include <linux/list.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 #ifdef CONFIG_MODVERSIONS
#include <linux/modversions.h> #include <linux/modversions.h>
diff -urN sangam_atm-D7.03.01.00.orig/tn7dsl.c sangam_atm-D7.03.01.00/tn7dsl.c --- a/tn7dsl.c
--- sangam_atm-D7.03.01.00.orig/tn7dsl.c 2008-03-11 02:11:02.000000000 +0100 +++ b/tn7dsl.c
+++ sangam_atm-D7.03.01.00/tn7dsl.c 2008-03-11 02:12:41.000000000 +0100
@@ -94,7 +94,6 @@ @@ -94,7 +94,6 @@
* 1/02/07 JZ CQ11054: Data Precision and Range Changes for TR-069 Conformance * 1/02/07 JZ CQ11054: Data Precision and Range Changes for TR-069 Conformance
* UR8_MERGE_END CQ11054* * 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 */ /* Modules specific header files */
#include "tn7atm.h" #include "tn7atm.h"
#include "tn7api.h" #include "tn7api.h"
@@ -173,7 +176,7 @@ @@ -173,7 +176,7 @@ led_reg_t ledreg[2];
static struct led_funcs ledreg[2]; static struct led_funcs ledreg[2];
#endif #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 MAX_STR_SIZE 256
#define DSL_MOD_SIZE 256 #define DSL_MOD_SIZE 256
@@ -299,7 +302,7 @@ @@ -299,7 +302,7 @@ static PITIDSLHW_T pIhw;
static volatile int bshutdown; static volatile int bshutdown;
static char info[MAX_STR_SIZE]; static char info[MAX_STR_SIZE];
/* Used for DSL Polling enable */ /* 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; //kthread_t overlay_thread;
/* end of module wide declars */ /* 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)) #define gDot1(a) ((a>0)?(a%10):((-a)%10))
// UR8_MERGE_END CQ11054* // 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 os_atoi(const char *pStr)
{ {
int MulNeg = (*pStr == '-' ? -1 : 1); int MulNeg = (*pStr == '-' ? -1 : 1);
@@ -359,39 +370,6 @@ @@ -359,39 +370,6 @@ void dprintf (int uDbgLevel, char *szFmt
#endif #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 // * UR8_MERGE_START CQ10640 Jack Zhang
int tn7dsl_dump_dsp_memory(char *input_str) //cph99 int tn7dsl_dump_dsp_memory(char *input_str) //cph99
{ {
@@ -441,101 +419,74 @@ @@ -441,101 +419,74 @@ unsigned int shim_osGetCpuFrequency(void
return CpuFrequency; 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) int shim_osLoadDebugFWImage(unsigned char *ptr)
@@ -3064,6 +3015,7 @@ @@ -3064,6 +3015,7 @@ int tn7dsl_init(void *priv)
int high_precision_selected = 0; int high_precision_selected = 0;
// UR8_MERGE_END CQ11054* // 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 * start dsl
*/ */
@@ -3442,7 +3394,7 @@ @@ -3442,7 +3394,7 @@ static int dslmod_sysctl(ctl_table *ctl,
*/ */
if(write) 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) switch (ctl->ctl_name)
{ {
@@ -3528,14 +3480,14 @@ @@ -3528,14 +3480,14 @@ static int dslmod_sysctl(ctl_table *ctl,
else else
{ {
len += sprintf(info+len, mod_req); 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} {0}
}; };
@@ -3558,8 +3510,7 @@ @@ -3558,8 +3510,7 @@ void tn7dsl_dslmod_sysctl_register(void)
if (initialized == 1) if (initialized == 1)
return; 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 * set the defaults
@@ -4821,4 +4772,4 @@ @@ -4821,4 +4772,4 @@ int tn7dsl_proc_PMDus(char* buf, char **
} }
#endif //NO_ADV_STATS #endif //NO_ADV_STATS
#endif //TR69_PMD_IN #endif //TR69_PMD_IN
-// * UR8_MERGE_END CQ11057 * -// * UR8_MERGE_END CQ11057 *
\ Nessun a capo alla fine del file \ No newline at end of file
+// * UR8_MERGE_END CQ11057 * +// * UR8_MERGE_END CQ11057 *
diff -urN sangam_atm-D7.03.01.00.orig/tn7sar.c sangam_atm-D7.03.01.00/tn7sar.c --- a/tn7sar.c
--- sangam_atm-D7.03.01.00.orig/tn7sar.c 2008-03-11 02:11:02.000000000 +0100 +++ b/tn7sar.c
+++ sangam_atm-D7.03.01.00/tn7sar.c 2008-03-11 02:12:00.000000000 +0100
@@ -42,7 +42,6 @@ @@ -42,7 +42,6 @@
* UR8_MERGE_END CQ10700 * UR8_MERGE_END CQ10700
*******************************************************************************/ *******************************************************************************/

13
package/ar7-atm/patches/110-interrupt_fix.patch
View File

@ -1,7 +1,6 @@
diff -urN sangam_atm-D7.03.01.00.orig/tn7atm.c sangam_atm-D7.03.01.00/tn7atm.c --- a/tn7atm.c
--- sangam_atm-D7.03.01.00.orig/tn7atm.c 2008-01-05 03:11:23.000000000 +0100 +++ b/tn7atm.c
+++ sangam_atm-D7.03.01.00/tn7atm.c 2008-01-05 03:11:34.000000000 +0100 @@ -566,7 +566,7 @@ static int turbodsl_check_priority_type(
@@ -566,7 +566,7 @@
* Description: tnetd73xx SAR interrupt. * Description: tnetd73xx SAR interrupt.
* *
*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/ *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
@ -10,7 +9,7 @@ diff -urN sangam_atm-D7.03.01.00.orig/tn7atm.c sangam_atm-D7.03.01.00/tn7atm.c
{ {
struct atm_dev *atmdev; struct atm_dev *atmdev;
Tn7AtmPrivate *priv; Tn7AtmPrivate *priv;
@@ -593,6 +593,7 @@ @@ -593,6 +593,7 @@ static void tn7atm_sar_irq (int irq, voi
#ifdef TIATM_INST_SUPP #ifdef TIATM_INST_SUPP
psp_trace_par (ATM_DRV_SAR_ISR_EXIT, retval); psp_trace_par (ATM_DRV_SAR_ISR_EXIT, retval);
#endif #endif
@ -18,7 +17,7 @@ diff -urN sangam_atm-D7.03.01.00.orig/tn7atm.c sangam_atm-D7.03.01.00/tn7atm.c
} }
/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -602,7 +603,7 @@ @@ -602,7 +603,7 @@ static void tn7atm_sar_irq (int irq, voi
* Description: tnetd73xx DSL interrupt. * Description: tnetd73xx DSL interrupt.
* *
*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/ *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
@ -27,7 +26,7 @@ diff -urN sangam_atm-D7.03.01.00.orig/tn7atm.c sangam_atm-D7.03.01.00/tn7atm.c
{ {
struct atm_dev *atmdev; struct atm_dev *atmdev;
Tn7AtmPrivate *priv; Tn7AtmPrivate *priv;
@@ -624,6 +625,8 @@ @@ -624,6 +625,8 @@ static void tn7atm_dsl_irq (int irq, voi
#ifdef TIATM_INST_SUPP #ifdef TIATM_INST_SUPP
psp_trace_par (ATM_DRV_DSL_ISR_EXIT, retval); psp_trace_par (ATM_DRV_DSL_ISR_EXIT, retval);
#endif #endif

7
package/ar7-atm/patches/120-no_dumb_inline.patch
View File

@ -1,7 +1,6 @@
diff -urN sangam_atm-D7.03.01.00.orig/tn7api.h sangam_atm-D7.03.01.00/tn7api.h --- a/tn7api.h
--- sangam_atm-D7.03.01.00.orig/tn7api.h 2006-12-11 15:36:54.000000000 +0100 +++ b/tn7api.h
+++ sangam_atm-D7.03.01.00/tn7api.h 2008-01-05 03:12:15.000000000 +0100 @@ -107,7 +107,7 @@ int tn7dsl_proc_dbg_rmsgs4(char* buf, ch
@@ -107,7 +107,7 @@
int tn7dsl_proc_write_stats(struct file *fp, const char * buf, unsigned long count, void * data); int tn7dsl_proc_write_stats(struct file *fp, const char * buf, unsigned long count, void * data);
int tn7dsl_proc_modem(char* buf, char **start, off_t offset, int count,int *eof, void *data); int tn7dsl_proc_modem(char* buf, char **start, off_t offset, int count,int *eof, void *data);

17
package/ar7-atm/patches/130-powercutback.patch
View File

@ -1,6 +1,5 @@
diff -urN sangam_atm-D7.03.01.00.orig/dsl_hal_advcfg.c sangam_atm-D7.03.01.00/dsl_hal_advcfg.c --- a/dsl_hal_advcfg.c
--- sangam_atm-D7.03.01.00.orig/dsl_hal_advcfg.c 2005-08-09 09:20:46.000000000 +0200 +++ b/dsl_hal_advcfg.c
+++ sangam_atm-D7.03.01.00/dsl_hal_advcfg.c 2008-01-05 03:12:50.000000000 +0100
@@ -36,9 +36,9 @@ @@ -36,9 +36,9 @@
* 05Jul05 0.00.09 CPH CQ9775: Change dslhal_advcfg_configDsTones input parameters & support for ADSL2+ * 05Jul05 0.00.09 CPH CQ9775: Change dslhal_advcfg_configDsTones input parameters & support for ADSL2+
* 24Jul05 0.00.10 CPH Fixed comments in dslhal_advcfg_configDsTones function header * 24Jul05 0.00.10 CPH Fixed comments in dslhal_advcfg_configDsTones function header
@ -14,9 +13,8 @@ diff -urN sangam_atm-D7.03.01.00.orig/dsl_hal_advcfg.c sangam_atm-D7.03.01.00/ds
/*****************************************************************************/ /*****************************************************************************/
/* ACT API functions -- To be moved into their own independent module --RamP */ /* ACT API functions -- To be moved into their own independent module --RamP */
diff -urN sangam_atm-D7.03.01.00.orig/Makefile sangam_atm-D7.03.01.00/Makefile --- a/Makefile
--- sangam_atm-D7.03.01.00.orig/Makefile 2008-01-05 03:11:23.000000000 +0100 +++ b/Makefile
+++ sangam_atm-D7.03.01.00/Makefile 2008-01-05 03:12:50.000000000 +0100
@@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
CONFIG_SANGAM_ATM=m CONFIG_SANGAM_ATM=m
@ -27,10 +25,9 @@ diff -urN sangam_atm-D7.03.01.00.orig/Makefile sangam_atm-D7.03.01.00/Makefile
obj-$(CONFIG_SANGAM_ATM) := tiatm.o 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 -tiatm-objs += cpsar.o aal5sar.o tn7sar.o tn7atm.o tn7dsl.o dsl_hal_api.o dsl_hal_support.o
+tiatm-objs += cpsar.o aal5sar.o tn7sar.o tn7atm.o tn7dsl.o dsl_hal_api.o dsl_hal_support.o dsl_hal_advcfg.o +tiatm-objs += cpsar.o aal5sar.o tn7sar.o tn7atm.o tn7dsl.o dsl_hal_api.o dsl_hal_support.o dsl_hal_advcfg.o
diff -urN sangam_atm-D7.03.01.00.orig/tn7dsl.c sangam_atm-D7.03.01.00/tn7dsl.c --- a/tn7dsl.c
--- sangam_atm-D7.03.01.00.orig/tn7dsl.c 2008-01-05 03:11:23.000000000 +0100 +++ b/tn7dsl.c
+++ sangam_atm-D7.03.01.00/tn7dsl.c 2008-01-05 03:12:50.000000000 +0100 @@ -2869,6 +2869,14 @@ static int tn7dsl_set_dsl(void)
@@ -2869,6 +2869,14 @@
dslhal_api_setRateAdaptFlag(pIhw, os_atoi(ptr)); dslhal_api_setRateAdaptFlag(pIhw, os_atoi(ptr));
} }

7
package/ar7-atm/patches/140-debug_mode.patch
View File

@ -1,7 +1,6 @@
diff -urN sangam_atm-D7.03.01.00.orig/tn7sar.c sangam_atm-D7.03.01.00/tn7sar.c --- a/tn7sar.c
--- sangam_atm-D7.03.01.00.orig/tn7sar.c 2008-01-05 03:11:23.000000000 +0100 +++ b/tn7sar.c
+++ sangam_atm-D7.03.01.00/tn7sar.c 2008-01-05 03:13:22.000000000 +0100 @@ -103,10 +103,10 @@ enum
@@ -103,10 +103,10 @@
#define RESERVED_OAM_CHANNEL 15 #define RESERVED_OAM_CHANNEL 15

5
package/ar7-atm/patches/150-tasklet_mode.patch
View File

@ -1,6 +1,5 @@
diff -Naur sangam_atm-D7.03.01.00.orig/Makefile sangam_atm-D7.03.01.00/Makefile --- a/Makefile
--- sangam_atm-D7.03.01.00.orig/Makefile 2008-01-07 10:30:34.000000000 +0100 +++ b/Makefile
+++ sangam_atm-D7.03.01.00/Makefile 2008-01-07 10:31:40.000000000 +0100
@@ -5,6 +5,7 @@ @@ -5,6 +5,7 @@
CONFIG_SANGAM_ATM=m CONFIG_SANGAM_ATM=m
#EXTRA_CFLAGS += -DEL -I. -DPOST_SILICON -DCOMMON_NSP -DCONFIG_LED_MODULE -DDEREGISTER_LED -DNO_ACT #EXTRA_CFLAGS += -DEL -I. -DPOST_SILICON -DCOMMON_NSP -DCONFIG_LED_MODULE -DDEREGISTER_LED -DNO_ACT

53
package/ar7-atm/patches/160-module-params.patch
View File

@ -1,7 +1,6 @@
diff -urN sangam_atm-07.02.01.00/tn7atm.c sangam_atm-07.02.01.00.mod/tn7atm.c --- a/tn7atm.c
--- sangam_atm-07.02.01.00/tn7atm.c 2007-09-19 04:12:20.000000000 +0200 +++ b/tn7atm.c
+++ sangam_atm-07.02.01.00.mod/tn7atm.c 2007-09-20 14:45:19.280250000 +0200 @@ -87,6 +87,146 @@
@@ -84,6 +84,146 @@
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION ("Tnetd73xx ATM Device Driver"); MODULE_DESCRIPTION ("Tnetd73xx ATM Device Driver");
MODULE_AUTHOR ("Zhicheng Tang"); MODULE_AUTHOR ("Zhicheng Tang");
@ -148,7 +147,7 @@ diff -urN sangam_atm-07.02.01.00/tn7atm.c sangam_atm-07.02.01.00.mod/tn7atm.c
#endif #endif
#ifndef TRUE #ifndef TRUE
@@ -657,9 +797,9 @@ @@ -655,9 +795,9 @@ static int __init tn7atm_irq_request (st
* interrupt pacing * interrupt pacing
*/ */
ptr = prom_getenv ("sar_ipacemax"); ptr = prom_getenv ("sar_ipacemax");
@ -160,7 +159,7 @@ diff -urN sangam_atm-07.02.01.00/tn7atm.c sangam_atm-07.02.01.00.mod/tn7atm.c
} }
/* avalanche_request_pacing (priv->sar_irq, ATM_SAR_INT_PACING_BLOCK_NUM, /* avalanche_request_pacing (priv->sar_irq, ATM_SAR_INT_PACING_BLOCK_NUM,
def_sar_inter_pace);*/ def_sar_inter_pace);*/
@@ -799,7 +939,7 @@ @@ -797,7 +937,7 @@ static int __init tn7atm_get_ESI (struct
char esi_addr[ESI_LEN] = { 0x00, 0x00, 0x11, 0x22, 0x33, 0x44 }; char esi_addr[ESI_LEN] = { 0x00, 0x00, 0x11, 0x22, 0x33, 0x44 };
char *esiaddr_str = NULL; char *esiaddr_str = NULL;
@ -169,7 +168,7 @@ diff -urN sangam_atm-07.02.01.00/tn7atm.c sangam_atm-07.02.01.00.mod/tn7atm.c
if (!esiaddr_str) if (!esiaddr_str)
{ {
@@ -1932,15 +2072,15 @@ @@ -1930,15 +2070,15 @@ static int tn7atm_autoDetectDspBoost (vo
//UR8_MERGE_END CQ10450* //UR8_MERGE_END CQ10450*
cp = prom_getenv ("dsp_noboost"); cp = prom_getenv ("dsp_noboost");
@ -189,7 +188,7 @@ diff -urN sangam_atm-07.02.01.00/tn7atm.c sangam_atm-07.02.01.00.mod/tn7atm.c
if (dspfreq == 250) if (dspfreq == 250)
{ {
boostDsp = 1; boostDsp = 1;
@@ -2189,8 +2329,9 @@ @@ -2187,8 +2327,9 @@ static int __init tn7atm_init (struct at
// Inter-Op DSL phy Control // Inter-Op DSL phy Control
// Note the setting of _dsl_Feature_0 and _dsl_Feature_1 must before // Note the setting of _dsl_Feature_0 and _dsl_Feature_1 must before
// dslhal_api_dslStartup (in tn7dsl_init()). // dslhal_api_dslStartup (in tn7dsl_init()).
@ -200,7 +199,7 @@ diff -urN sangam_atm-07.02.01.00/tn7atm.c sangam_atm-07.02.01.00.mod/tn7atm.c
if ((ptr[0] == '0') && (ptr[1] == 'x')) // skip 0x before pass to if ((ptr[0] == '0') && (ptr[1] == 'x')) // skip 0x before pass to
// os_atoh // os_atoh
ptr += 2; ptr += 2;
@@ -2198,8 +2339,9 @@ @@ -2196,8 +2337,9 @@ static int __init tn7atm_init (struct at
_dsl_Feature_0_defined = 1; _dsl_Feature_0_defined = 1;
} }
@ -211,7 +210,7 @@ diff -urN sangam_atm-07.02.01.00/tn7atm.c sangam_atm-07.02.01.00.mod/tn7atm.c
if ((ptr[0] == '0') && (ptr[1] == 'x')) // skip 0x before pass to if ((ptr[0] == '0') && (ptr[1] == 'x')) // skip 0x before pass to
// os_atoh // os_atoh
ptr += 2; ptr += 2;
@@ -2211,8 +2353,9 @@ @@ -2209,8 +2351,9 @@ static int __init tn7atm_init (struct at
// DSL phy Feature Control // DSL phy Feature Control
// Note the setting of _dsl_PhyControl_0 and _dsl_PhyControl_1 must before // Note the setting of _dsl_PhyControl_0 and _dsl_PhyControl_1 must before
// dslhal_api_dslStartup (in tn7dsl_init()). // dslhal_api_dslStartup (in tn7dsl_init()).
@ -222,7 +221,7 @@ diff -urN sangam_atm-07.02.01.00/tn7atm.c sangam_atm-07.02.01.00.mod/tn7atm.c
if ((ptr[0] == '0') && (ptr[1] == 'x')) // skip 0x before pass to if ((ptr[0] == '0') && (ptr[1] == 'x')) // skip 0x before pass to
// os_atoh // os_atoh
ptr += 2; ptr += 2;
@@ -2220,8 +2363,9 @@ @@ -2218,8 +2361,9 @@ static int __init tn7atm_init (struct at
_dsl_PhyControl_0_defined = 1; _dsl_PhyControl_0_defined = 1;
} }
@ -233,7 +232,7 @@ diff -urN sangam_atm-07.02.01.00/tn7atm.c sangam_atm-07.02.01.00.mod/tn7atm.c
if ((ptr[0] == '0') && (ptr[1] == 'x')) // skip 0x before pass to if ((ptr[0] == '0') && (ptr[1] == 'x')) // skip 0x before pass to
// os_atoh // os_atoh
ptr += 2; ptr += 2;
@@ -2249,9 +2393,9 @@ @@ -2247,9 +2391,9 @@ static int __init tn7atm_init (struct at
priv->bTurboDsl = 1; priv->bTurboDsl = 1;
// read config for turbo dsl // read config for turbo dsl
ptr = prom_getenv ("TurboDSL"); ptr = prom_getenv ("TurboDSL");
@ -245,7 +244,7 @@ diff -urN sangam_atm-07.02.01.00/tn7atm.c sangam_atm-07.02.01.00.mod/tn7atm.c
} }
// @Added to make Rx buffer number & Service max configurable through // @Added to make Rx buffer number & Service max configurable through
@@ -2259,30 +2403,30 @@ @@ -2257,30 +2401,30 @@ static int __init tn7atm_init (struct at
priv->sarRxBuf = RX_BUFFER_NUM; priv->sarRxBuf = RX_BUFFER_NUM;
ptr = NULL; ptr = NULL;
ptr = prom_getenv ("SarRxBuf"); ptr = prom_getenv ("SarRxBuf");
@ -284,10 +283,9 @@ diff -urN sangam_atm-07.02.01.00/tn7atm.c sangam_atm-07.02.01.00.mod/tn7atm.c
} }
return 0; return 0;
diff -urN sangam_atm-07.02.01.00/tn7dsl.c sangam_atm-07.02.01.00.mod/tn7dsl.c --- a/tn7dsl.c
--- sangam_atm-07.02.01.00/tn7dsl.c 2007-09-19 04:12:20.000000000 +0200 +++ b/tn7dsl.c
+++ sangam_atm-07.02.01.00.mod/tn7dsl.c 2007-09-20 14:55:46.608375000 +0200 @@ -136,6 +136,27 @@
@@ -134,6 +134,27 @@
#define NEW_TRAINING_VAL_T1413 128 #define NEW_TRAINING_VAL_T1413 128
#define NEW_TRAINING_VAL_MMODE 255 #define NEW_TRAINING_VAL_MMODE 255
@ -315,7 +313,7 @@ diff -urN sangam_atm-07.02.01.00/tn7dsl.c sangam_atm-07.02.01.00.mod/tn7dsl.c
int testflag1 = 0; int testflag1 = 0;
extern int __guDbgLevel; extern int __guDbgLevel;
extern sar_stat_t sarStat; extern sar_stat_t sarStat;
@@ -2816,84 +2837,80 @@ @@ -2818,84 +2839,80 @@ static int tn7dsl_set_dsl(void)
// modulation // modulation
ptr = prom_getenv("modulation"); ptr = prom_getenv("modulation");
@ -429,7 +427,7 @@ diff -urN sangam_atm-07.02.01.00/tn7dsl.c sangam_atm-07.02.01.00.mod/tn7dsl.c
tn7dsl_generic_read(2, offset); tn7dsl_generic_read(2, offset);
dslReg &= dslhal_support_byteSwap32(0xFFFFFF00); dslReg &= dslhal_support_byteSwap32(0xFFFFFF00);
@@ -2911,46 +2928,47 @@ @@ -2913,46 +2930,47 @@ static int tn7dsl_set_dsl(void)
// maximum bits per carrier // maximum bits per carrier
ptr = NULL; ptr = NULL;
ptr = prom_getenv("maximum_bits_per_carrier"); ptr = prom_getenv("maximum_bits_per_carrier");
@ -488,7 +486,7 @@ diff -urN sangam_atm-07.02.01.00/tn7dsl.c sangam_atm-07.02.01.00.mod/tn7dsl.c
for(i=0;i<8;i++) for(i=0;i<8;i++)
{ {
tmp[0]=ptr[i*2]; tmp[0]=ptr[i*2];
@@ -2975,26 +2993,26 @@ @@ -2977,26 +2995,26 @@ static int tn7dsl_set_dsl(void)
} }
ptr = NULL; ptr = NULL;
ptr = prom_getenv("eoc_vendor_revision"); ptr = prom_getenv("eoc_vendor_revision");
@ -521,7 +519,7 @@ diff -urN sangam_atm-07.02.01.00/tn7dsl.c sangam_atm-07.02.01.00.mod/tn7dsl.c
} }
return 0; return 0;
@@ -3038,7 +3056,7 @@ @@ -3041,7 +3059,7 @@ int tn7dsl_init(void *priv)
* backward compatibility. * backward compatibility.
*/ */
cp = prom_getenv("DSL_BIT_TMODE"); cp = prom_getenv("DSL_BIT_TMODE");
@ -530,7 +528,7 @@ diff -urN sangam_atm-07.02.01.00/tn7dsl.c sangam_atm-07.02.01.00.mod/tn7dsl.c
{ {
printk("%s : env var DSL_BIT_TMODE is set\n", __FUNCTION__); printk("%s : env var DSL_BIT_TMODE is set\n", __FUNCTION__);
/* /*
@@ -3067,9 +3085,9 @@ @@ -3070,9 +3088,9 @@ int tn7dsl_init(void *priv)
// UR8_MERGE_START CQ11054 Jack Zhang // UR8_MERGE_START CQ11054 Jack Zhang
cp = prom_getenv("high_precision"); cp = prom_getenv("high_precision");
@ -542,10 +540,9 @@ diff -urN sangam_atm-07.02.01.00/tn7dsl.c sangam_atm-07.02.01.00.mod/tn7dsl.c
} }
if ( high_precision_selected) if ( high_precision_selected)
{ {
diff -urN sangam_atm-07.02.01.00/tn7sar.c sangam_atm-07.02.01.00.mod/tn7sar.c --- a/tn7sar.c
--- sangam_atm-07.02.01.00/tn7sar.c 2007-09-19 04:12:20.000000000 +0200 +++ b/tn7sar.c
+++ sangam_atm-07.02.01.00.mod/tn7sar.c 2007-09-20 14:23:50.436500000 +0200 @@ -74,6 +74,8 @@ typedef void OS_SETUP;
@@ -73,6 +73,8 @@
/* PDSP Firmware files */ /* PDSP Firmware files */
#include "tnetd7300_sar_firm.h" #include "tnetd7300_sar_firm.h"
@ -554,7 +551,7 @@ diff -urN sangam_atm-07.02.01.00/tn7sar.c sangam_atm-07.02.01.00.mod/tn7sar.c
enum enum
{ {
@@ -816,9 +818,9 @@ @@ -817,9 +819,9 @@ int tn7sar_setup_oam_channel(Tn7AtmPriva
pHalDev = (HAL_DEVICE *)priv->pSarHalDev; pHalDev = (HAL_DEVICE *)priv->pSarHalDev;
pauto_pvc = prom_getenv("autopvc_enable"); pauto_pvc = prom_getenv("autopvc_enable");
@ -566,7 +563,7 @@ diff -urN sangam_atm-07.02.01.00/tn7sar.c sangam_atm-07.02.01.00.mod/tn7sar.c
} }
memset(&chInfo, 0xff, sizeof(chInfo)); memset(&chInfo, 0xff, sizeof(chInfo));
@@ -984,9 +986,9 @@ @@ -985,9 +987,9 @@ int tn7sar_init(struct atm_dev *dev, Tn7
/* read in oam lb timeout value */ /* read in oam lb timeout value */
pLbTimeout = prom_getenv("oam_lb_timeout"); pLbTimeout = prom_getenv("oam_lb_timeout");