31ba8ed44602f51830392dd5a866af981c69bd69
[openwrt/svn-archive/archive.git] / package / ar7-atm / patches / 100-compile_fix.patch
1 diff -urN sangam_atm-07.02.01.00/cppi_cpaal5.c sangam_atm-07.02.01.00/cppi_cpaal5.c
2 --- sangam_atm-07.02.01.00/cppi_cpaal5.c 2007-08-06 18:15:52.000000000 +0200
3 +++ sangam_atm-07.02.01.00/cppi_cpaal5.c 2007-08-06 18:58:42.000000000 +0200
4 @@ -352,7 +352,7 @@
5 {
6 /* malloc failed, add this RCB to Needs Buffer List */
7 TempRcb->FragCount = 1; /*MJH+030417*/
8 - (HAL_RCB *)TempRcb->Eop = TempRcb; /* GSG +030430 */
9 + TempRcb->Eop = TempRcb; /* GSG +030430 */
10
11 if(HalDev->NeedsCount < MAX_NEEDS) /* +MJH 030410 */
12 { /* +MJH 030410 */
13 diff -urN sangam_atm-07.02.01.00/dsl_hal_api.c sangam_atm-07.02.01.00/dsl_hal_api.c
14 --- sangam_atm-07.02.01.00/dsl_hal_api.c 2007-08-06 18:15:52.000000000 +0200
15 +++ sangam_atm-07.02.01.00/dsl_hal_api.c 2007-08-06 18:58:42.000000000 +0200
16 @@ -241,15 +241,15 @@
17 * UR8_MERGE_START_END CQ11247_TR69_DS_LATN_SATN YW
18 * 12/18/06 Yan Wang CQ11247: TR069 range and precision changes for LATNds, SATNds
19 ******************************************************************************/
20 -#include <dev_host_interface.h>
21 -#include <dsl_hal_register.h>
22 -#include <dsl_hal_support.h>
23 +#include "dev_host_interface.h"
24 +#include "dsl_hal_register.h"
25 +#include "dsl_hal_support.h"
26
27 #ifndef NO_ADV_STATS
28 -#include <dsl_hal_logtable.h>
29 +#include "dsl_hal_logtable.h"
30 #endif
31
32 -#include <dsl_hal_version.h>
33 +#include "dsl_hal_version.h"
34
35 // UR8_MERGE_START CQ11054 Jack Zhang
36 static unsigned int highprecision_selected = 0; //By default we use low precision for backward compt.
37 diff -urN sangam_atm-07.02.01.00/dsl_hal_support.c sangam_atm-07.02.01.00/dsl_hal_support.c
38 --- sangam_atm-07.02.01.00/dsl_hal_support.c 2007-08-06 18:15:52.000000000 +0200
39 +++ sangam_atm-07.02.01.00/dsl_hal_support.c 2007-08-06 18:58:42.000000000 +0200
40 @@ -140,9 +140,9 @@
41 * oamFeature are overriden
42 // UR8_MERGE_END CQ10774 Ram
43 *******************************************************************************/
44 -#include <dev_host_interface.h>
45 -#include <dsl_hal_register.h>
46 -#include <dsl_hal_support.h>
47 +#include "dev_host_interface.h"
48 +#include "dsl_hal_register.h"
49 +#include "dsl_hal_support.h"
50
51 #define NUM_READ_RETRIES 3
52 static unsigned int dslhal_support_adsl2ByteSwap32(unsigned int in32Bits);
53 diff -urN sangam_atm-07.02.01.00/dsl_hal_support.h sangam_atm-07.02.01.00/dsl_hal_support.h
54 --- sangam_atm-07.02.01.00/dsl_hal_support.h 2007-08-06 18:15:52.000000000 +0200
55 +++ sangam_atm-07.02.01.00/dsl_hal_support.h 2007-08-06 18:58:42.000000000 +0200
56 @@ -49,7 +49,7 @@
57 * 04Nov05 0.11.00 CPH Fixed T1413 mode got Zero DS/US rate when DSL_BIT_TMODE is set.
58 *******************************************************************************/
59
60 -#include <dsl_hal_api.h>
61 +#include "dsl_hal_api.h"
62
63 #define virtual2Physical(a) (((int)a)&~0xe0000000)
64 /* External Function Prototype Declarations */
65 diff -urN sangam_atm-07.02.01.00/Makefile sangam_atm-07.02.01.00/Makefile
66 --- sangam_atm-07.02.01.00/Makefile 2007-08-06 18:15:52.000000000 +0200
67 +++ sangam_atm-07.02.01.00/Makefile 2007-08-06 18:58:42.000000000 +0200
68 @@ -1,18 +1,9 @@
69 -# File: drivers/atm/ti_evm3/Makefile
70 #
71 -# Makefile for the Texas Instruments EVM3 ADSL/ATM driver.
72 +# Makefile for the TIATM device driver.
73 #
74 -#
75 -# Copyright (c) 2000 Texas Instruments Incorporated.
76 -# Jeff Harrell (jharrell@telogy.com)
77 -# Viren Balar (vbalar@ti.com)
78 -# Victor Wells (vwells@telogy.com)
79 -#
80 -include $(TOPDIR)/Rules.make
81 -
82 -
83 -
84 -
85 -
86 -
87
88 +CONFIG_SANGAM_ATM=m
89 +#EXTRA_CFLAGS += -DEL -I. -DPOST_SILICON -DCOMMON_NSP -DCONFIG_LED_MODULE -DDEREGISTER_LED -DNO_ACT
90 +EXTRA_CFLAGS += -DEL -I$(PWD) -DPOST_SILICON -DCOMMON_NSP -DNO_ACT -D__NO__VOICE_PATCH__ -DEL
91 +obj-$(CONFIG_SANGAM_ATM) := tiatm.o
92 +tiatm-objs += cpsar.o aal5sar.o tn7sar.o tn7atm.o tn7dsl.o dsl_hal_api.o dsl_hal_support.o
93 diff -urN sangam_atm-07.02.01.00/tn7atm.c sangam_atm-07.02.01.00/tn7atm.c
94 --- sangam_atm-07.02.01.00/tn7atm.c 2007-08-06 18:15:52.000000000 +0200
95 +++ sangam_atm-07.02.01.00/tn7atm.c 2007-08-06 18:58:42.000000000 +0200
96 @@ -61,7 +61,6 @@
97 * UR8_MERGE_END CQ11057*
98 *********************************************************************************************/
99
100 -#include <linux/config.h>
101 #include <linux/kernel.h>
102 #include <linux/module.h>
103 #include <linux/init.h>
104 @@ -70,7 +69,7 @@
105 #include <linux/spinlock.h>
106 #include <linux/smp_lock.h>
107 #include <asm/io.h>
108 -#include <asm/mips-boards/prom.h>
109 +#include <asm/ar7/ar7.h>
110 #include <linux/proc_fs.h>
111 #include <linux/string.h>
112 #include <linux/ctype.h>
113 @@ -82,6 +81,7 @@
114 #include "dsl_hal_register.h"
115
116 #ifdef MODULE
117 +MODULE_LICENSE("GPL");
118 MODULE_DESCRIPTION ("Tnetd73xx ATM Device Driver");
119 MODULE_AUTHOR ("Zhicheng Tang");
120 #endif
121 @@ -100,9 +100,9 @@
122
123 /*end of externs */
124
125 -#ifndef TI_STATIC_ALLOCATIONS
126 -#define TI_STATIC_ALLOCATIONS
127 -#endif
128 +//#ifndef TI_STATIC_ALLOCATIONS
129 +//#define TI_STATIC_ALLOCATIONS
130 +//#endif
131
132 #define tn7atm_kfree_skb(x) dev_kfree_skb(x)
133
134 @@ -114,7 +114,7 @@
135 /* prototypes */
136 static int tn7atm_set_can_support_adsl2 (int can);
137
138 -static int tn7atm_open (struct atm_vcc *vcc, short vpi, int vci);
139 +static int tn7atm_open (struct atm_vcc *vcc);
140
141 static void tn7atm_close (struct atm_vcc *vcc);
142
143 @@ -257,13 +257,12 @@
144 getsockopt: NULL,
145 setsockopt: NULL,
146 send: tn7atm_send,
147 - sg_send: NULL,
148 phy_put: NULL,
149 phy_get: NULL,
150 change_qos: tn7atm_change_qos,
151 };
152
153 -const char drv_proc_root_folder[] = "avalanche/";
154 +const char drv_proc_root_folder[] = "avalanche";
155 static struct proc_dir_entry *root_proc_dir_entry = NULL;
156 #define DRV_PROC_MODE 0644
157 static int proc_root_already_exists = TRUE;
158 @@ -564,56 +563,6 @@
159
160 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
161 *
162 - * Function: int tn7atm_walk_vccs(struct atm_dev *dev, short *vcc, int *vci)
163 - *
164 - * Description: retrieve VPI/VCI for connection
165 - *
166 - *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
167 -static int tn7atm_walk_vccs (struct atm_vcc *vcc, short *vpi, int *vci)
168 -{
169 - struct atm_vcc *walk;
170 -
171 - /*
172 - * find a free VPI
173 - */
174 - if (*vpi == ATM_VPI_ANY)
175 - {
176 -
177 - for (*vpi = 0, walk = vcc->dev->vccs; walk; walk = walk->next)
178 - {
179 -
180 - if ((walk->vci == *vci) && (walk->vpi == *vpi))
181 - {
182 - (*vpi)++;
183 - walk = vcc->dev->vccs;
184 - }
185 - }
186 - }
187 -
188 - /*
189 - * find a free VCI
190 - */
191 - if (*vci == ATM_VCI_ANY)
192 - {
193 -
194 - for (*vci = ATM_NOT_RSV_VCI, walk = vcc->dev->vccs; walk;
195 - walk = walk->next)
196 - {
197 -
198 - if ((walk->vpi = *vpi) && (walk->vci == *vci))
199 - {
200 - *vci = walk->vci + 1;
201 - walk = vcc->dev->vccs;
202 - }
203 - }
204 - }
205 -
206 - return 0;
207 -}
208 -
209 -
210 -/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
211 - *
212 * Function: int tn7atm_sar_irq(void)
213 *
214 * Description: tnetd73xx SAR interrupt.
215 @@ -709,8 +658,8 @@
216 {
217 def_sar_inter_pace = os_atoi (ptr);
218 }
219 - avalanche_request_pacing (priv->sar_irq, ATM_SAR_INT_PACING_BLOCK_NUM,
220 - def_sar_inter_pace);
221 +/* avalanche_request_pacing (priv->sar_irq, ATM_SAR_INT_PACING_BLOCK_NUM,
222 + def_sar_inter_pace);*/
223
224 /*
225 * Reigster Receive interrupt A
226 @@ -880,11 +829,15 @@
227 #define ATM_VBR_RT 5
228 #endif
229
230 -int tn7atm_open (struct atm_vcc *vcc, short vpi, int vci)
231 +int tn7atm_open (struct atm_vcc *vcc)
232 {
233 tn7atm_activate_vc_parm_t tn7atm_activate_vc_parm;
234 int rc;
235 //int flags;
236 + tn7atm_activate_vc_parm.pcr = 0x20000;
237 + tn7atm_activate_vc_parm.scr = 0x20000;
238 + tn7atm_activate_vc_parm.mbs = 0x20000;
239 + tn7atm_activate_vc_parm.cdvt = 10000;
240
241 dgprintf(1, "tn7atm_open()\n");
242
243 @@ -896,24 +849,18 @@
244 return -1;
245 }
246
247 - MOD_INC_USE_COUNT;
248 -
249 - /* find a free VPI/VCI */
250 - tn7atm_walk_vccs(vcc, &vpi, &vci);
251 +// MOD_INC_USE_COUNT;
252
253 - vcc->vpi = vpi;
254 - vcc->vci = vci;
255 -
256 - if ((vci == ATM_VCI_UNSPEC) || (vpi == ATM_VCI_UNSPEC))
257 + if ((vcc->vci == ATM_VCI_UNSPEC) || (vcc->vpi == ATM_VCI_UNSPEC))
258 {
259 - MOD_DEC_USE_COUNT;
260 +// MOD_DEC_USE_COUNT;
261 return -EBUSY;
262 }
263
264 - tn7atm_activate_vc_parm.vpi = vpi;
265 - tn7atm_activate_vc_parm.vci = vci;
266 + tn7atm_activate_vc_parm.vpi = vcc->vpi;
267 + tn7atm_activate_vc_parm.vci = vcc->vci;
268
269 - if ((vpi == CLEAR_EOC_VPI) && (vci == CLEAR_EOC_VCI))
270 + if ((vcc->vpi == CLEAR_EOC_VPI) && (vcc->vci == CLEAR_EOC_VCI))
271 {
272 /* always use (max_dma_chan+1) for clear eoc */
273 tn7atm_activate_vc_parm.chan = EOC_DMA_CHAN;
274 @@ -921,7 +868,7 @@
275 /* check to see whether clear eoc is opened or not */
276 if (tn7atm_activate_vc_parm.priv->lut[tn7atm_activate_vc_parm.chan].inuse)
277 {
278 - MOD_DEC_USE_COUNT;
279 +// MOD_DEC_USE_COUNT;
280 printk("tn7atm_open: Clear EOC channel (dmachan=%d) already in use.\n", tn7atm_activate_vc_parm.chan);
281 return -EBUSY;
282 }
283 @@ -930,7 +877,7 @@
284 if (rc)
285 {
286 printk("tn7atm_open: failed to setup clear_eoc\n");
287 - MOD_DEC_USE_COUNT;
288 +// MOD_DEC_USE_COUNT;
289 return -EBUSY;
290 }
291 tn7atm_set_lut(tn7atm_activate_vc_parm.priv,vcc, tn7atm_activate_vc_parm.chan);
292 @@ -939,17 +886,17 @@
293 }
294 else /* PVC channel setup */
295 {
296 - if ((vpi==REMOTE_MGMT_VPI) && (vci==REMOTE_MGMT_VCI))
297 + if ((vcc->vpi==REMOTE_MGMT_VPI) && (vcc->vci==REMOTE_MGMT_VCI))
298 {
299 tn7atm_activate_vc_parm.chan = 14; /* always use chan 14 for MII PVC-base romote mgmt */
300 }
301 else
302 {
303 - rc = tn7atm_lut_find(vpi, vci);
304 + rc = tn7atm_lut_find(vcc->vpi, vcc->vci);
305 /* check to see whether PVC is opened or not */
306 if(ATM_NO_DMA_CHAN != rc)
307 {
308 - MOD_DEC_USE_COUNT;
309 +// MOD_DEC_USE_COUNT;
310 printk("PVC already opened. dmachan = %d\n", rc);
311 return -EBUSY;
312 }
313 @@ -981,6 +928,7 @@
314 tn7atm_activate_vc_parm.priority = 2;
315 break;
316
317 +#if 0
318 case ATM_VBR: /* Variable Bit Rate-Non RealTime*/
319 tn7atm_activate_vc_parm.qos = 1;
320 tn7atm_activate_vc_parm.priority = 1;
321 @@ -1002,6 +950,7 @@
322 tn7atm_activate_vc_parm.mbs = vcc->qos.txtp.max_pcr;
323 tn7atm_activate_vc_parm.cdvt = vcc->qos.txtp.max_cdv;
324 break;
325 +#endif
326
327 default:
328 tn7atm_activate_vc_parm.qos = 2;
329 @@ -1029,7 +978,7 @@
330 if (rc < 0)
331 {
332 printk("failed to activate hw channel\n");
333 - MOD_DEC_USE_COUNT;
334 +// MOD_DEC_USE_COUNT;
335 tn7atm_lut_clear(vcc, tn7atm_activate_vc_parm.chan);
336 //spin_unlock_irqrestore(&chan_init_lock, flags);
337 return -EBUSY;
338 @@ -1119,7 +1068,7 @@
339 tn7atm_lut_clear (vcc, dmachan);
340 //spin_unlock_irqrestore (&closeLock, closeFlag);
341
342 - MOD_DEC_USE_COUNT;
343 +// MOD_DEC_USE_COUNT;
344
345 dgprintf (1, "Leave tn7atm_close\n");
346 }
347 @@ -1533,8 +1482,7 @@
348 * firewall is on */
349
350 dgprintf (3, "pushing the skb...\n");
351 -
352 - skb->stamp = vcc->timestamp = xtime;
353 + __net_timestamp(skb);
354
355 xdump ((unsigned char *) skb->data, skb->len, 5);
356
357 @@ -1730,8 +1678,7 @@
358
359 kfree (dev->dev_data);
360
361 - // atm_dev_deregister (dev);
362 - shutdown_atm_dev (dev);
363 + atm_dev_deregister (dev);
364
365 /*
366 * remove proc entries
367 @@ -1890,9 +1837,6 @@
368 /*
369 * Set up proc entry for atm stats
370 */
371 - if (tn7atm_xlate_proc_name
372 - (drv_proc_root_folder, &root_proc_dir_entry, &residual))
373 - {
374 printk ("Creating new root folder %s in the proc for the driver stats \n",
375 drv_proc_root_folder);
376 root_proc_dir_entry = proc_mkdir (drv_proc_root_folder, NULL);
377 @@ -1902,7 +1846,6 @@
378 return -ENOMEM;
379 }
380 proc_root_already_exists = FALSE;
381 - }
382
383 /*
384 * AV: Clean-up. Moved all the definitions to the data structure.
385 @@ -2484,7 +2427,5 @@
386 return count;
387 }
388
389 -#ifdef MODULE
390 module_init (tn7atm_detect);
391 module_exit (tn7atm_exit);
392 -#endif /* MODULE */
393 diff -urN sangam_atm-07.02.01.00/tn7atm.h sangam_atm-07.02.01.00/tn7atm.h
394 --- sangam_atm-07.02.01.00/tn7atm.h 2007-08-06 18:15:52.000000000 +0200
395 +++ sangam_atm-07.02.01.00/tn7atm.h 2007-08-06 18:58:42.000000000 +0200
396 @@ -19,7 +19,8 @@
397 //#include "mips_support.h"
398 #include <linux/list.h>
399
400 -#include <linux/config.h>
401 +#define MIPS_EXCEPTION_OFFSET 8
402 +#define LNXINTNUM(x)((x) + MIPS_EXCEPTION_OFFSET)
403
404 #ifdef CONFIG_MODVERSIONS
405 #include <linux/modversions.h>
406 diff -urN sangam_atm-07.02.01.00/tn7dsl.c sangam_atm-07.02.01.00/tn7dsl.c
407 --- sangam_atm-07.02.01.00/tn7dsl.c 2007-08-06 18:15:52.000000000 +0200
408 +++ sangam_atm-07.02.01.00/tn7dsl.c 2007-08-06 18:58:42.000000000 +0200
409 @@ -94,7 +94,6 @@
410 * 1/02/07 JZ CQ11054: Data Precision and Range Changes for TR-069 Conformance
411 * UR8_MERGE_END CQ11054*
412 *********************************************************************************************/
413 -#include <linux/config.h>
414 #include <linux/kernel.h>
415 #include <linux/module.h>
416 #include <linux/init.h>
417 @@ -103,7 +102,7 @@
418 #include <linux/spinlock.h>
419 #include <linux/smp_lock.h>
420 #include <asm/io.h>
421 -#include <asm/mips-boards/prom.h>
422 +#include <asm/ar7/ar7.h>
423 #include <linux/proc_fs.h>
424 #include <linux/string.h>
425 #include <linux/ctype.h>
426 @@ -111,6 +110,8 @@
427 #include <linux/timer.h>
428 #include <linux/vmalloc.h>
429 #include <linux/file.h>
430 +#include <linux/firmware.h>
431 +
432 /* Modules specific header files */
433 #include "tn7atm.h"
434 #include "tn7api.h"
435 @@ -323,6 +324,14 @@
436 #define gDot1(a) ((a>0)?(a%10):((-a)%10))
437 // UR8_MERGE_END CQ11054*
438
439 +int avalanche_request_intr_pacing(int irq_nr, unsigned int blk_num,
440 + unsigned int pace_value)
441 +{
442 + printk("avalanche_request_pacing(%d, %u, %u); // not implemented\n", irq_nr, blk_num, pace_value);
443 + return 0;
444 +}
445 +
446 +
447 int os_atoi(const char *pStr)
448 {
449 int MulNeg = (*pStr == '-' ? -1 : 1);
450 @@ -359,39 +368,6 @@
451 #endif
452 }
453
454 -int strcmp(const char *s1, const char *s2)
455 -{
456 -
457 - int size = strlen(s1);
458 -
459 - return(strncmp(s1, s2, size));
460 -}
461 -
462 -int strncmp(const char *s1, const char *s2, size_t size)
463 -{
464 - int i = 0;
465 - int max_size = (int)size;
466 -
467 - while((s1[i] != 0) && i < max_size)
468 - {
469 - if(s2[i] == 0)
470 - {
471 - return -1;
472 - }
473 - if(s1[i] != s2[i])
474 - {
475 - return 1;
476 - }
477 - i++;
478 - }
479 - if(s2[i] != 0)
480 - {
481 - return 1;
482 - }
483 -
484 - return 0;
485 -}
486 -
487 // * UR8_MERGE_START CQ10640 Jack Zhang
488 int tn7dsl_dump_dsp_memory(char *input_str) //cph99
489 {
490 @@ -441,101 +417,74 @@
491 return CpuFrequency;
492 }
493
494 -int shim_osLoadFWImage(unsigned char *ptr)
495 +static void avsar_release(struct device *dev)
496 {
497 - unsigned int bytesRead;
498 - mm_segment_t oldfs;
499 - static struct file *filp;
500 - unsigned int imageLength=0x5ffff;
501 -
502 -
503 - dgprintf(4, "tn7dsl_read_dsp()\n");
504 -
505 - dgprintf(4,"open file %s\n", DSP_FIRMWARE_PATH);
506 -
507 - filp=filp_open(DSP_FIRMWARE_PATH,00,O_RDONLY);
508 - if(filp ==NULL)
509 - {
510 - printk("Failed: Could not open DSP binary file\n");
511 - return -1;
512 - }
513 -
514 - if (filp->f_dentry != NULL)
515 - {
516 - if (filp->f_dentry->d_inode != NULL)
517 - {
518 - printk ("DSP binary filesize = %d bytes\n",
519 - (int) filp->f_dentry->d_inode->i_size);
520 - imageLength = (unsigned int)filp->f_dentry->d_inode->i_size + 0x200;
521 - }
522 - }
523 -
524 - if (filp->f_op->read==NULL)
525 - return -1; /* File(system) doesn't allow reads */
526 -
527 - /*
528 - * Disable parameter checking
529 - */
530 - oldfs = get_fs();
531 - set_fs(KERNEL_DS);
532 -
533 - /*
534 - * Now read bytes from postion "StartPos"
535 - */
536 - filp->f_pos = 0;
537 -
538 - bytesRead = filp->f_op->read(filp,ptr,imageLength,&filp->f_pos);
539 -
540 - dgprintf(4,"file length = %d\n", bytesRead);
541 -
542 - set_fs(oldfs);
543 -
544 - /*
545 - * Close the file
546 - */
547 - fput(filp);
548 -
549 - return bytesRead;
550 + printk(KERN_DEBUG "avsar firmware released\n");
551 }
552
553 +static struct device avsar = {
554 + .bus_id = "vlynq",
555 + .release = avsar_release,
556 +};
557
558 -unsigned int shim_read_overlay_page (void *ptr, unsigned int secOffset,
559 - unsigned int secLength)
560 +int shim_osLoadFWImage(unsigned char *ptr)
561 {
562 - unsigned int bytesRead;
563 - mm_segment_t oldfs;
564 - struct file *filp;
565 -
566 - dgprintf(4,"shim_read_overlay_page\n");
567 - //dgprintf(4,"sec offset=%d, sec length =%d\n", secOffset, secLength);
568 -
569 - filp=filp_open(DSP_FIRMWARE_PATH,00,O_RDONLY);
570 - if(filp ==NULL)
571 - {
572 - printk("Failed: Could not open DSP binary file\n");
573 - return -1;
574 - }
575 -
576 - if (filp->f_op->read==NULL)
577 - return -1; /* File(system) doesn't allow reads */
578 -
579 - /*
580 - * Now read bytes from postion "StartPos"
581 - */
582 -
583 - if(filp->f_op->llseek)
584 - filp->f_op->llseek(filp,secOffset, 0);
585 - oldfs = get_fs();
586 - set_fs(KERNEL_DS);
587 - filp->f_pos = secOffset;
588 - bytesRead = filp->f_op->read(filp,ptr,secLength,&filp->f_pos);
589 + const struct firmware *fw_entry;
590 + size_t size;
591
592 - set_fs(oldfs);
593 - /*
594 - * Close the file
595 - */
596 - fput(filp);
597 - return bytesRead;
598 + printk("requesting firmware image \"ar0700xx.bin\"\n");
599 + if(device_register(&avsar) < 0) {
600 + printk(KERN_ERR
601 + "avsar: device_register fails\n");
602 + return -1;
603 + }
604 +
605 + if(request_firmware(&fw_entry, "ar0700xx.bin", &avsar)) {
606 + printk(KERN_ERR
607 + "avsar: Firmware not available\n");
608 + device_unregister(&avsar);
609 + return -1;
610 + }
611 + size = fw_entry->size;
612 + device_unregister(&avsar);
613 + if(size > 0x5ffff) {
614 + printk(KERN_ERR
615 + "avsar: Firmware too big (%d bytes)\n", size);
616 + release_firmware(fw_entry);
617 + return -1;
618 + }
619 + memcpy(ptr, fw_entry->data, size);
620 + release_firmware(fw_entry);
621 + return size;
622 +}
623 +
624 +unsigned int shim_read_overlay_page(void *ptr, unsigned int secOffset, unsigned int secLength)
625 +{
626 + const struct firmware *fw_entry;
627 +
628 + printk("requesting firmware image \"ar0700xx.bin\"\n");
629 + if(device_register(&avsar) < 0) {
630 + printk(KERN_ERR
631 + "avsar: device_register fails\n");
632 + return -1;
633 + }
634 +
635 + if(request_firmware(&fw_entry, "ar0700xx.bin", &avsar)) {
636 + printk(KERN_ERR
637 + "avsar: Firmware not available\n");
638 + device_unregister(&avsar);
639 + return -1;
640 + }
641 + device_unregister(&avsar);
642 + if(fw_entry->size > secLength) {
643 + printk(KERN_ERR
644 + "avsar: Firmware too big (%d bytes)\n", fw_entry->size);
645 + release_firmware(fw_entry);
646 + return -1;
647 + }
648 + memcpy(ptr + secOffset, fw_entry->data, secLength);
649 + release_firmware(fw_entry);
650 + return secLength;
651 }
652
653 int shim_osLoadDebugFWImage(unsigned char *ptr)
654 @@ -3442,7 +3391,7 @@
655 */
656 if(write)
657 {
658 - ret = proc_dostring(ctl, write, filp, buffer, lenp);
659 + ret = proc_dostring(ctl, write, filp, buffer, lenp, 0);
660
661 switch (ctl->ctl_name)
662 {
663 @@ -3528,7 +3477,7 @@
664 else
665 {
666 len += sprintf(info+len, mod_req);
667 - ret = proc_dostring(ctl, write, filp, buffer, lenp);
668 + ret = proc_dostring(ctl, write, filp, buffer, lenp, 0);
669 }
670 return ret;
671 }
672 @@ -3558,8 +3507,7 @@
673 if (initialized == 1)
674 return;
675
676 - dslmod_sysctl_header = register_sysctl_table(dslmod_root_table, 1);
677 - dslmod_root_table->child->de->owner = THIS_MODULE;
678 + dslmod_sysctl_header = register_sysctl_table(dslmod_root_table);
679
680 /*
681 * set the defaults
682 diff -urN sangam_atm-07.02.01.00/tn7sar.c sangam_atm-07.02.01.00/tn7sar.c
683 --- sangam_atm-07.02.01.00/tn7sar.c 2007-08-06 18:15:52.000000000 +0200
684 +++ sangam_atm-07.02.01.00/tn7sar.c 2007-08-06 18:58:42.000000000 +0200
685 @@ -42,7 +42,6 @@
686 * UR8_MERGE_END CQ10700
687 *******************************************************************************/
688
689 -#include <linux/config.h>
690 #include <linux/kernel.h>
691 #include <linux/module.h>
692 #include <linux/init.h>
693 @@ -51,7 +50,7 @@
694 #include <linux/spinlock.h>
695 #include <linux/smp_lock.h>
696 #include <asm/io.h>
697 -#include <asm/mips-boards/prom.h>
698 +#include <asm/ar7/ar7.h>
699 #include <linux/proc_fs.h>
700 #include <linux/string.h>
701 #include <linux/ctype.h>