123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727728729730731732733734735736737738739740741742743744745746747748749750751752753754755756757758759760761762763764765766767768769770771772773774775776777778779780781782783784785786787788789790791792793794795796797798799800801802803804805806807808809810811812813814815816817818819820821822823824825826827828829830831832833834835836837838839840841842843844845846847848849850851852853854855856857858859860861862863864865866867868869870871872873874875876877878879880881882883884885886887888889890891892893894895896897898899900901902903904905906907908909910911912913914915916917918919920921922923924925926927928929930931932933934935936937938939940941942943944945946947948949950951952953954955956957958959960961962963964965966967968969970971972973974975976977978979980981982983984985986987988989990991992993994995996997998999100010011002100310041005100610071008100910101011101210131014101510161017101810191020102110221023102410251026102710281029103010311032103310341035103610371038103910401041104210431044104510461047104810491050105110521053105410551056105710581059106010611062106310641065106610671068106910701071107210731074107510761077107810791080108110821083108410851086108710881089109010911092109310941095109610971098109911001101110211031104110511061107110811091110111111121113111411151116111711181119112011211122112311241125112611271128112911301131113211331134113511361137113811391140114111421143114411451146114711481149115011511152115311541155115611571158115911601161116211631164116511661167116811691170117111721173117411751176117711781179118011811182118311841185118611871188118911901191119211931194119511961197119811991200120112021203120412051206120712081209121012111212121312141215121612171218121912201221122212231224122512261227122812291230123112321233123412351236123712381239124012411242124312441245124612471248124912501251125212531254125512561257125812591260126112621263126412651266126712681269127012711272127312741275127612771278127912801281128212831284128512861287128812891290129112921293129412951296129712981299130013011302130313041305130613071308130913101311131213131314131513161317131813191320132113221323132413251326132713281329133013311332133313341335133613371338133913401341134213431344134513461347134813491350135113521353135413551356135713581359136013611362136313641365136613671368136913701371137213731374137513761377137813791380138113821383138413851386138713881389139013911392139313941395139613971398139914001401140214031404140514061407140814091410141114121413141414151416141714181419142014211422142314241425142614271428142914301431143214331434143514361437143814391440144114421443144414451446144714481449145014511452145314541455145614571458145914601461146214631464146514661467146814691470147114721473147414751476147714781479148014811482148314841485148614871488148914901491149214931494149514961497149814991500150115021503150415051506150715081509151015111512151315141515151615171518151915201521152215231524152515261527152815291530153115321533153415351536153715381539154015411542154315441545154615471548154915501551155215531554155515561557155815591560156115621563156415651566156715681569157015711572157315741575157615771578157915801581158215831584158515861587158815891590159115921593159415951596159715981599160016011602160316041605160616071608160916101611161216131614161516161617161816191620162116221623162416251626162716281629163016311632163316341635163616371638163916401641164216431644164516461647164816491650165116521653165416551656165716581659166016611662166316641665166616671668166916701671167216731674167516761677167816791680168116821683168416851686168716881689169016911692169316941695169616971698169917001701170217031704170517061707170817091710171117121713171417151716171717181719172017211722172317241725172617271728172917301731173217331734173517361737173817391740174117421743174417451746174717481749175017511752175317541755175617571758175917601761176217631764176517661767176817691770177117721773177417751776177717781779178017811782178317841785178617871788178917901791179217931794179517961797179817991800180118021803180418051806180718081809181018111812181318141815181618171818181918201821182218231824182518261827182818291830183118321833183418351836183718381839184018411842184318441845184618471848184918501851185218531854185518561857185818591860186118621863186418651866186718681869187018711872187318741875187618771878187918801881188218831884188518861887188818891890189118921893189418951896189718981899190019011902190319041905190619071908190919101911191219131914191519161917191819191920192119221923192419251926192719281929193019311932193319341935193619371938193919401941194219431944194519461947194819491950195119521953195419551956195719581959196019611962196319641965196619671968196919701971197219731974197519761977197819791980198119821983198419851986198719881989199019911992199319941995199619971998199920002001200220032004200520062007200820092010201120122013201420152016201720182019202020212022202320242025202620272028202920302031203220332034203520362037203820392040204120422043204420452046204720482049205020512052205320542055205620572058205920602061206220632064206520662067206820692070207120722073207420752076207720782079208020812082208320842085208620872088208920902091209220932094209520962097209820992100210121022103210421052106210721082109211021112112211321142115211621172118211921202121212221232124212521262127212821292130213121322133213421352136213721382139214021412142214321442145214621472148214921502151215221532154215521562157215821592160216121622163216421652166216721682169217021712172217321742175217621772178217921802181218221832184218521862187218821892190219121922193219421952196219721982199220022012202220322042205220622072208220922102211221222132214221522162217221822192220222122222223222422252226222722282229223022312232223322342235223622372238223922402241224222432244224522462247224822492250225122522253225422552256225722582259226022612262226322642265226622672268226922702271227222732274227522762277227822792280228122822283228422852286228722882289229022912292229322942295229622972298229923002301230223032304230523062307230823092310231123122313231423152316231723182319232023212322232323242325232623272328232923302331233223332334233523362337233823392340234123422343234423452346234723482349235023512352235323542355235623572358235923602361236223632364236523662367236823692370237123722373237423752376237723782379238023812382238323842385238623872388238923902391239223932394239523962397239823992400240124022403240424052406240724082409241024112412241324142415241624172418241924202421242224232424242524262427242824292430243124322433243424352436243724382439244024412442244324442445244624472448244924502451245224532454245524562457245824592460246124622463246424652466246724682469247024712472247324742475247624772478247924802481248224832484248524862487248824892490249124922493249424952496249724982499250025012502250325042505250625072508250925102511251225132514251525162517251825192520252125222523252425252526252725282529253025312532253325342535253625372538253925402541254225432544254525462547254825492550255125522553255425552556255725582559256025612562256325642565256625672568256925702571257225732574257525762577257825792580258125822583258425852586258725882589259025912592259325942595259625972598259926002601260226032604260526062607260826092610261126122613261426152616261726182619262026212622262326242625262626272628262926302631263226332634263526362637263826392640264126422643264426452646264726482649265026512652265326542655265626572658265926602661266226632664266526662667266826692670267126722673267426752676267726782679268026812682268326842685268626872688268926902691269226932694269526962697269826992700270127022703270427052706270727082709271027112712271327142715271627172718271927202721272227232724272527262727272827292730273127322733273427352736273727382739274027412742274327442745274627472748274927502751275227532754275527562757275827592760276127622763276427652766276727682769277027712772277327742775277627772778277927802781278227832784278527862787278827892790279127922793279427952796279727982799280028012802280328042805280628072808280928102811281228132814281528162817281828192820282128222823282428252826282728282829283028312832283328342835283628372838283928402841284228432844284528462847284828492850285128522853285428552856285728582859286028612862286328642865286628672868286928702871287228732874287528762877287828792880288128822883288428852886288728882889289028912892289328942895289628972898289929002901290229032904290529062907290829092910291129122913291429152916291729182919292029212922292329242925292629272928292929302931293229332934293529362937293829392940294129422943294429452946294729482949295029512952295329542955295629572958295929602961296229632964296529662967296829692970297129722973297429752976297729782979298029812982298329842985298629872988298929902991299229932994299529962997299829993000300130023003300430053006300730083009301030113012301330143015301630173018301930203021302230233024302530263027302830293030303130323033303430353036303730383039304030413042304330443045304630473048304930503051305230533054305530563057305830593060306130623063306430653066306730683069307030713072307330743075307630773078307930803081308230833084308530863087308830893090309130923093309430953096309730983099310031013102 |
- From 42d0f4c2f5cf0f73edd827263dc65aefc8f82192 Mon Sep 17 00:00:00 2001
- From: Jonas Gorski <jogo@openwrt.org>
- Date: Thu, 26 Sep 2013 12:28:35 +0200
- Subject: [PATCH] update proc code to fix compilation for 3.10
- Signed-off-by: Jonas Gorski <jogo@openwrt.org>
- ---
- tn7api.h | 66 ++-
- tn7atm.c | 395 ++++++++---------
- tn7dsl.c | 1439 ++++++++++++++++++++++++++++++--------------------------------
- tn7sar.c | 91 ++--
- 4 files changed, 951 insertions(+), 1040 deletions(-)
- --- a/tn7api.h
- +++ b/tn7api.h
- @@ -91,31 +91,29 @@ void * tn7atm_memcpy(void * dst, void co
- /* tn7dsl.h */
- void tn7dsl_exit(void);
- int tn7dsl_init(void *priv);
- -int tn7dsl_proc_eoc(char* buf, char **start, off_t offset, int count,int *eof, void *data);
- -int tn7dsl_proc_stats(char* buf, char **start, off_t offset, int count,int *eof, void *data);
- +extern struct file_operations tn7dsl_proc_eoc_fops;
- +extern struct file_operations tn7dsl_proc_stats_fops;
-
- //#define ADV_DIAG_STATS 1 //CQ10275 To enable Adv Stats
-
- #ifdef ADV_DIAG_STATS
- -int tn7dsl_proc_adv_stats(char* buf, char **start, off_t offset, int count,int *eof, void *data);
- -int tn7dsl_proc_adv_stats1(char* buf, char **start, off_t offset, int count,int *eof, void *data);
- -int tn7dsl_proc_adv_stats2(char* buf, char **start, off_t offset, int count,int *eof, void *data);
- -int tn7dsl_proc_adv_stats3(char* buf, char **start, off_t offset, int count,int *eof, void *data);
- +extern struct file_operations tn7dsl_proc_adv_stats_fops;
- +extern struct file_operations tn7dsl_proc_adv1_stats_fops;
- +extern struct file_operations tn7dsl_proc_adv2_stats_fops;
- +extern struct file_operations tn7dsl_proc_adv3_stats_fops;
- //UR8_MERGE_START CQ10682 Jack Zhang
- -int tn7dsl_proc_dbg_cmsgs(char* buf, char **start, off_t offset, int count,int *eof, void *data);
- -int tn7dsl_proc_dbg_rmsgs1(char* buf, char **start, off_t offset, int count,int *eof, void *data);
- -int tn7dsl_proc_dbg_rmsgs2(char* buf, char **start, off_t offset, int count,int *eof, void *data);
- -int tn7dsl_proc_dbg_rmsgs3(char* buf, char **start, off_t offset, int count,int *eof, void *data);
- -int tn7dsl_proc_dbg_rmsgs4(char* buf, char **start, off_t offset, int count,int *eof, void *data);
- +extern struct file_operations tn7dsl_proc_dbg_cmsgs_fops;
- +extern struct file_operations tn7dsl_proc_dbg_cmsgs1_fops;
- +extern struct file_operations tn7dsl_proc_dbg_cmsgs2_fops;
- +extern struct file_operations tn7dsl_proc_dbg_cmsgs3_fops;
- +extern struct file_operations tn7dsl_proc_dbg_cmsgs4_fops;
- //UR8_MERGE_END CQ10682*
- #endif //ADV_DIAG_STATS
-
- -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);
- +extern struct file_operations tn7dsl_proc_modem_fops;
- //UR8_MERGE_START CQ11813 Hao-Ting
- #ifdef LINUX_CLI_SUPPORT
- -int tn7dsl_proc_dbgmsg_write(struct file *fp, const char *buf, unsigned long count, void *data);
- -int tn7dsl_proc_dbgmsg_read(char* buf, char **start, off_t offset, int count,int *eof, void *data);
- +extern struct file_operations tn7dsl_proc_dbgmsg_fops;
- #endif
- //UR8_MERGE_END CQ11813
- int tn7dsl_handle_interrupt(void);
- @@ -142,31 +140,31 @@ int os_atoih(const char *pStr);
- #endif
-
- unsigned long os_atoul(const char *pStr);
- -int tn7dsl_proc_snr0(char* buf, char **start, off_t offset, int count, int *eof, void *data);
- -int tn7dsl_proc_snr1(char* buf, char **start, off_t offset, int count, int *eof, void *data);
- -int tn7dsl_proc_snr2(char* buf, char **start, off_t offset, int count, int *eof, void *data);
- -int tn7dsl_proc_bit_allocation(char* buf, char **start, off_t offset, int count, int *eof, void *data);
- -int tn7dsl_proc_ds_noise(char* buf, char **start, off_t offset, int count, int *eof, void *data);
- -int tn7dsl_proc_generic_read_result(char* buf, char **start, off_t offset, int count, int *eof, void *data);
- -int tn7dsl_proc_train_mode_export(char* buf, char **start, off_t offset, int count,int *eof, void *data);
- +extern struct file_operations tn7dsl_proc_snr0_fops;
- +extern struct file_operations tn7dsl_proc_snr1_fops;
- +extern struct file_operations tn7dsl_proc_snr2_fops;
- +extern struct file_operations tn7dsl_proc_bit_allocation_fops;
- +extern struct file_operations tn7dsl_proc_ds_noise_fops;
- +extern struct file_operations tn7dsl_proc_generic_read_result_fops;
- +extern struct file_operations tn7dsl_proc_train_mode_export_fops;
-
- #ifndef NO_ADV_STATS
- -int tn7dsl_proc_SNRpsds(char* buf, char **start, off_t offset, int count,int *eof, void *data);
- -int tn7dsl_proc_QLNpsds(char* buf, char **start, off_t offset, int count,int *eof, void *data);
- +extern struct file_operations tn7dsl_proc_SNRpsds_fops;
- +extern struct file_operations tn7dsl_proc_QLNpsds_fops;
- // * UR8_MERGE_START CQ10979 Jack Zhang
- #ifdef TR69_HLIN_IN
- -//int tn7dsl_proc_HLINpsds(char* buf, char **start, off_t offset, int count,int *eof, void *data);
- -int tn7dsl_proc_HLINpsds1(char* buf, char **start, off_t offset, int count,int *eof, void *data);
- -int tn7dsl_proc_HLINpsds2(char* buf, char **start, off_t offset, int count,int *eof, void *data);
- -int tn7dsl_proc_HLINpsds3(char* buf, char **start, off_t offset, int count,int *eof, void *data);
- -int tn7dsl_proc_HLINpsds4(char* buf, char **start, off_t offset, int count,int *eof, void *data);
- +//extern struct file_operations tn7dsl_proc_HLINpsds_fops;
- +extern struct file_operations tn7dsl_proc_HLINpsds1_fops;
- +extern struct file_operations tn7dsl_proc_HLINpsds2_fops;
- +extern struct file_operations tn7dsl_proc_HLINpsds3_fops;
- +extern struct file_operations tn7dsl_proc_HLINpsds4_fops;
- #endif //TR69_HLIN_IN
- // * UR8_MERGE_END CQ10979*
- // * UR8_MERGE_START CQ11057 Jack Zhang
- #define TR69_PMD_IN
- #ifdef TR69_PMD_IN
- -//int tn7dsl_proc_PMDus(char* buf, char **start, off_t offset, int count,int *eof, void *data);
- -int tn7dsl_proc_PMDus(char* buf, char **start, off_t offset, int count,int *eof, void *data);
- +//extern struct file_operations tn7dsl_proc_PMDus_fops;
- +extern struct file_operations tn7dsl_proc_PMDus_fops;
- #endif //TR69_PMD_IN
- // * UR8_MERGE_END CQ11057 *
- #endif
- @@ -183,12 +181,12 @@ void tn7sar_get_sar_version(Tn7AtmPrivat
- int tn7sar_get_near_end_loopback_count(unsigned int *pF4count, unsigned int *pF5count);
- int tn7sar_oam_generation(void *privContext, int chan, int type, int vpi, int vci, int timeout);
- int tn7sar_get_stats(void *priv1);
- -int tn7sar_proc_sar_stat(char* buf, char **start, off_t offset, int count,int *eof, void *data);
- +extern struct file_operations tn7sar_proc_sar_stat_fops;
- #ifdef AR7_EFM
- void tn7sar_get_EFM_firmware_version(unsigned int *pdsp_version_ms, unsigned int *pdsp_version_ls);
- #endif
- void tn7sar_get_sar_firmware_version(unsigned int *pdsp_version_ms, unsigned int *pdsp_version_ls);
- -int tn7sar_proc_oam_ping(char* buf, char **start, off_t offset, int count,int *eof, void *data);
- -int tn7sar_proc_pvc_table(char* buf, char **start, off_t offset, int count,int *eof, void *data);
- +extern struct file_operations tn7sar_proc_oam_ping_fops;
- +extern struct file_operations tn7sar_proc_pvc_table_fops;
- int tn7sar_tx_flush(void *privContext, int chan, int queue, int skip);
- #endif __SGAPI_H
- --- a/tn7atm.c
- +++ b/tn7atm.c
- @@ -265,11 +265,9 @@ MODULE_PARM_DESC(oam_lb_timeout, "OAM LB
-
- #ifdef AR7_EFM
- extern void tn7dsl_disable_alarm(void);
- -extern int tn7efm_proc_channels (char *buf, char **start,
- - off_t offset, int count, int *eof, void *data);
- -extern int tn7efm_proc_ctrl_read (char *buf, char **start, off_t offset, int count, int *eof, void *data);
- -extern int tn7efm_proc_ctrl_write (struct file *fp, const char *buf, unsigned long count, void *data);
- -extern int tn7efm_proc_info (char *buf, char **start, off_t offset, int count, int *eof, void *data);
- +extern struct file_operations tn7efm_proc_channels_fops;
- +extern struct file_operations tn7efm_proc_ctrl_fops;
- +extern struct file_operations tn7efm_proc_info_fops;
- extern unsigned int g_efm_proc_ctl;
- extern struct net_device *mydev_efm;
- extern Tn7AtmPrivate *mypriv;
- @@ -305,31 +303,17 @@ extern int tn7efm_register (Tn7AtmPrivat
- static int tn7atm_irq_request (struct atm_dev *dev);
- #endif
-
- -static int tn7atm_proc_version (char *buf, char **start, off_t offset,
- - int count, int *eof, void *data);
- +static struct file_operations tn7atm_proc_version_fops;
- static void tn7atm_exit (void);
- -static int tn7atm_proc_channels (char *buf, char **start, off_t offset,
- - int count, int *eof, void *data);
- -static int tn7atm_proc_private (char *buf, char **start, off_t offset,
- - int count, int *eof, void *data);
- +static struct file_operations tn7atm_proc_channels_fops;
- +static struct file_operations tn7atm_proc_private_fops;
- inline static int tn7atm_queue_packet_to_sar (void *vcc1, void *skb1,
- int chan);
-
- -static int tn7atm_xlate_proc_name (const char *name,
- - struct proc_dir_entry **ret,
- - const char **residual);
- -static int tn7atm_proc_match (int len, const char *name,
- - struct proc_dir_entry *de);
- -static int tn7atm_proc_qos_read (char *buf, char **start, off_t offset,
- - int count, int *eof, void *data);
- -static int tn7atm_proc_qos_write (struct file *fp, const char *buf,
- - unsigned long count, void *data);
- +static struct file_operations tn7atm_proc_qos_fops;
-
- // [KT]
- -static int tn7atm_proc_turbodsl_read (char *buf, char **start, off_t offset,
- - int count, int *eof, void *data);
- -static int tn7atm_proc_turbodsl_write (struct file *fp, const char *buf,
- - unsigned long count, void *data);
- +static struct file_operations tn7atm_proc_turbodsl_fops;
-
- //CT - Added function to return chipset Id
- void tn7atm_get_chipsetId (char *pVerId);
- @@ -456,78 +440,83 @@ const char drv_proc_root_folder[] = "ava
- static struct proc_dir_entry *root_proc_dir_entry = NULL;
- #define DRV_PROC_MODE 0644
- static int proc_root_already_exists = TRUE;
- +
- +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- +#define PDE_DATA(inode) PDE(inode)->data
- +#endif
- +
- static struct
- {
- const unsigned char name[32];
- - int (*read_func) (char* , char **, off_t , int ,int *, void *);
- - int (*write_func) (struct file *, const char * , unsigned long , void *);
- + struct file_operations *fops;
-
- } proc_if[] = {
- #ifdef AR7_EFM
- #ifdef EFM_DEBUG
- - {"avsar_efm_channel", tn7efm_proc_channels, NULL},
- + {"avsar_efm_channel", &tn7efm_proc_channels_fops},
- #endif
- - {"avsar_efm_info", tn7efm_proc_info, NULL},
- - {"avsar_efm_ctl", tn7efm_proc_ctrl_read, tn7efm_proc_ctrl_write},
- + {"avsar_efm_info", &tn7efm_proc_info_fops},
- + {"avsar_efm_ctl", &tn7efm_proc_ctrl_fops},
- #endif
- - {"avsar_ver", tn7atm_proc_version, NULL},
- - {"avsar_channels", tn7atm_proc_channels, NULL},
- - {"avsar_sarhal_stats", tn7sar_proc_sar_stat, NULL},
- - {"avsar_oam_ping", tn7sar_proc_oam_ping, NULL},
- - {"avsar_pvc_table", tn7sar_proc_pvc_table, NULL},
- - {"avsar_rxsnr0", tn7dsl_proc_snr0, NULL},
- - {"avsar_rxsnr1", tn7dsl_proc_snr1, NULL},
- - {"avsar_rxsnr2", tn7dsl_proc_snr2, NULL},
- - {"clear_eoc_stats", tn7dsl_proc_eoc, NULL},
- - {"avsar_bit_allocation_table", tn7dsl_proc_bit_allocation, NULL},
- - {"avsar_dsl_modulation_schemes",tn7dsl_proc_train_mode_export, NULL},
- + {"avsar_ver", &tn7atm_proc_version_fops},
- + {"avsar_channels", &tn7atm_proc_channels_fops},
- + {"avsar_sarhal_stats", &tn7sar_proc_sar_stat_fops},
- + {"avsar_oam_ping", &tn7sar_proc_oam_ping_fops},
- + {"avsar_pvc_table", &tn7sar_proc_pvc_table_fops},
- + {"avsar_rxsnr0", &tn7dsl_proc_snr0_fops},
- + {"avsar_rxsnr1", &tn7dsl_proc_snr1_fops},
- + {"avsar_rxsnr2", &tn7dsl_proc_snr2_fops},
- + {"clear_eoc_stats", &tn7dsl_proc_eoc_fops},
- + {"avsar_bit_allocation_table", &tn7dsl_proc_bit_allocation_fops},
- + {"avsar_dsl_modulation_schemes",&tn7dsl_proc_train_mode_export_fops},
- #ifndef NO_ADV_STATS
- - {"avsar_SNRpsds", tn7dsl_proc_SNRpsds, NULL},
- - {"avsar_QLNpsds", tn7dsl_proc_QLNpsds, NULL},
- + {"avsar_SNRpsds", &tn7dsl_proc_SNRpsds_fops},
- + {"avsar_QLNpsds", &tn7dsl_proc_QLNpsds_fops},
- // * UR8_MERGE_START CQ10979 Jack Zhang
- #ifdef TR69_HLIN_IN
- -// {"avsar_HLINpsds", tn7dsl_proc_HLINpsds, NULL},
- - {"avsar_HLINpsds1", tn7dsl_proc_HLINpsds1, NULL},
- - {"avsar_HLINpsds2", tn7dsl_proc_HLINpsds2, NULL},
- - {"avsar_HLINpsds3", tn7dsl_proc_HLINpsds3, NULL},
- - {"avsar_HLINpsds4", tn7dsl_proc_HLINpsds4, NULL},
- +// {"avsar_HLINpsds", &tn7dsl_proc_HLINpsds_fops},
- + {"avsar_HLINpsds1", &tn7dsl_proc_HLINpsds1_fops},
- + {"avsar_HLINpsds2", &tn7dsl_proc_HLINpsds2_fops},
- + {"avsar_HLINpsds3", &tn7dsl_proc_HLINpsds3_fops},
- + {"avsar_HLINpsds4", &tn7dsl_proc_HLINpsds4_fops},
- #endif //TR69_HLIN_IN
- // * UR8_MERGE_END CQ10979*
- // * UR8_MERGE_START CQ11057 Jack Zhang
- #define TR69_PMD_IN
- #ifdef TR69_PMD_IN
- - {"avsar_PMDTestus", tn7dsl_proc_PMDus, NULL},
- -// {"avsar_PMDTestus1", tn7dsl_proc_PMDus1, NULL},
- + {"avsar_PMDTestus", &tn7dsl_proc_PMDus_fops},
- +// {"avsar_PMDTestus1", &tn7dsl_proc_PMDus1_fops},
- #endif //TR69_PMD_IN
- // * UR8_MERGE_END CQ11057 *
- #endif
- - {"avsar_private", tn7atm_proc_private, NULL},
- - {"avsar_modem_training", tn7dsl_proc_modem, NULL},
- - {"avsar_modem_stats", tn7dsl_proc_stats, tn7dsl_proc_write_stats},
- + {"avsar_private", &tn7atm_proc_private_fops},
- + {"avsar_modem_training", &tn7dsl_proc_modem_fops},
- + {"avsar_modem_stats", &tn7dsl_proc_stats_fops},
-
- #ifdef ADV_DIAG_STATS //CQ10275
- -//for 2.6 {"avsar_modem_adv_stats", tn7dsl_proc_adv_stats, NULL},
- +//for 2.6 {"avsar_modem_adv_stats", &tn7dsl_proc_adv_stats_fops},
- //For 2.4 kernel, due to proc file system size limitation
- - {"avsar_modem_adv_stats1", tn7dsl_proc_adv_stats1, NULL},
- - {"avsar_modem_adv_stats2", tn7dsl_proc_adv_stats2, NULL},
- - {"avsar_modem_adv_stats3", tn7dsl_proc_adv_stats3, NULL},
- + {"avsar_modem_adv_stats1", &tn7dsl_proc_adv_stats1_fops},
- + {"avsar_modem_adv_stats2", &tn7dsl_proc_adv_stats2_fops},
- + {"avsar_modem_adv_stats3", &tn7dsl_proc_adv_stats3_fops},
- //UR8_MERGE_START CQ10682 Jack Zhang
- - {"avsar_modem_dbg_cmsgs", tn7dsl_proc_dbg_cmsgs, NULL},
- - {"avsar_modem_dbg_rmsgs1", tn7dsl_proc_dbg_rmsgs1, NULL},
- - {"avsar_modem_dbg_rmsgs2", tn7dsl_proc_dbg_rmsgs2, NULL},
- - {"avsar_modem_dbg_rmsgs3", tn7dsl_proc_dbg_rmsgs3, NULL},
- - {"avsar_modem_dbg_rmsgs4", tn7dsl_proc_dbg_rmsgs4, NULL},
- + {"avsar_modem_dbg_cmsgs", &tn7dsl_proc_dbg_cmsgs_fops},
- + {"avsar_modem_dbg_rmsgs1", &tn7dsl_proc_dbg_rmsgs1_fops},
- + {"avsar_modem_dbg_rmsgs2", &tn7dsl_proc_dbg_rmsgs2_fops},
- + {"avsar_modem_dbg_rmsgs3", &tn7dsl_proc_dbg_rmsgs3_fops},
- + {"avsar_modem_dbg_rmsgs4", &tn7dsl_proc_dbg_rmsgs4_fops},
- // UR8_MERGE_END CQ10682*
- #endif //ADV_DIAG_STATS
- //UR8_MERGE_START CQ11813 Hao-Ting
- #ifdef LINUX_CLI_SUPPORT
- - {"avsar_dbg_enable", tn7dsl_proc_dbgmsg_read, tn7dsl_proc_dbgmsg_write},
- + {"avsar_dbg_enable", &tn7dsl_proc_dbgmsg_fops},
- #endif
- //UR8_MERGE_END CQ11813
- - {"avsar_qos_enable", tn7atm_proc_qos_read, tn7atm_proc_qos_write},
- + {"avsar_qos_enable", &tn7atm_proc_qos_fops},
- #if 1 /* [MS] */
- - {"avsar_turbodsl", tn7atm_proc_turbodsl_read, tn7atm_proc_turbodsl_write}
- + {"avsar_turbodsl", &tn7atm_proc_turbodsl_fops}
- #endif
- +
- };
-
- /* *INDENT-ON* */
- @@ -1811,76 +1800,81 @@ int tn7atm_receive (void *os_dev, int ch
- return 0;
- }
-
- -
- -static int tn7atm_proc_channels (char *buf, char **start, off_t offset,
- - int count, int *eof, void *data)
- +static int tn7atm_proc_channels (struct seq_file *m, void *data)
- {
- - int len = 0;
- - int limit = count - 80;
- int i;
-
- struct atm_dev *dev;
- Tn7AtmPrivate *priv;
-
- - dev = (struct atm_dev *) data;
- + dev = (struct atm_dev *) m->private;
- priv = (Tn7AtmPrivate *) dev->dev_data;
-
- - if (len <= limit)
- - len += sprintf (buf + len, "Chan Inuse ChanID VPI VCI \n");
- - if (len <= limit)
- - len +=
- - sprintf (buf + len,
- + seq_printf (m, "Chan Inuse ChanID VPI VCI \n");
- + seq_printf (m,
- "------------------------------------------------------------------\n");
-
- for (i = 0; i <= MAX_DMA_CHAN; i++)
- {
- - if (len <= limit)
- - {
- - len += sprintf (buf + len,
- - " %02d %05d %05d %05d %05d \n",
- - i, priv->lut[i].inuse, priv->lut[i].chanid,
- - priv->lut[i].vpi, priv->lut[i].vci);
- - }
- + seq_printf (m,
- + " %02d %05d %05d %05d %05d \n",
- + i, priv->lut[i].inuse, priv->lut[i].chanid,
- + priv->lut[i].vpi, priv->lut[i].vci);
- }
-
- - if (len <= limit)
- - len +=
- - sprintf (buf + len,
- + seq_printf (m,
- "------------------------------------------------------------------\n");
-
- - return len;
- + return 0;
- +}
- +
- +static int tn7atm_proc_channels_open(struct inode *inode, struct file *file)
- +{
- + return single_open(file, tn7atm_proc_channels, PDE_DATA(inode));
- }
-
- -static int tn7atm_proc_private (char *buf, char **start, off_t offset,
- - int count, int *eof, void *data)
- +static struct file_operations tn7atm_proc_channels_fops = {
- + .owner = THIS_MODULE,
- + .open = tn7atm_proc_channels_open,
- + .read = seq_read,
- + .llseek = seq_lseek,
- + .release = single_release,
- +};
- +
- +
- +static int tn7atm_proc_private (struct seq_file *m, void *data)
- {
- - int len = 0;
- - int limit = count - 80;
- struct atm_dev *dev;
- Tn7AtmPrivate *priv;
-
- - dev = (struct atm_dev *) data;
- + dev = (struct atm_dev *) m->private;
- priv = (Tn7AtmPrivate *) dev->dev_data;
-
- - if (len <= limit)
- - len += sprintf (buf + len, "\nPrivate Data Structure(%s):\n", priv->name);
- - if (len <= limit)
- - len += sprintf (buf + len, "----------------------------------------\n");
- - if (len <= limit)
- - len += sprintf (buf + len, "priv: 0x%p\n", priv);
- - if (len <= limit)
- - len += sprintf (buf + len, "next: 0x%p", priv->next);
- - if (len <= limit)
- - len += sprintf (buf + len, "\tdev: 0x%p\n", priv->dev);
- -
- - if (len <= limit)
- - len += sprintf (buf + len, "tx_irq: %02d", priv->sar_irq);
- - if (len <= limit)
- - len += sprintf (buf + len, "rx_irq: %02d", priv->dsl_irq);
- + seq_printf (m, "\nPrivate Data Structure(%s):\n", priv->name);
- + seq_printf (m, "----------------------------------------\n");
- + seq_printf (m, "priv: 0x%p\n", priv);
- + seq_printf (m, "next: 0x%p", priv->next);
- + seq_printf (m, "\tdev: 0x%p\n", priv->dev);
- +
- + seq_printf (m, "tx_irq: %02d", priv->sar_irq);
- + seq_printf (m, "rx_irq: %02d", priv->dsl_irq);
- +
- + return 0;
- +}
-
- - return len;
- +static int tn7atm_proc_private_open(struct inode *inode, struct file *file)
- +{
- + return single_open(file, tn7atm_proc_private, PDE_DATA(inode));
- }
-
- +static struct file_operations tn7atm_proc_private_fops = {
- + .owner = THIS_MODULE,
- + .open = tn7atm_proc_private_open,
- + .read = seq_read,
- + .llseek = seq_lseek,
- + .release = single_release,
- +};
- +
- void tn7atm_sarhal_isr_register (void *os_dev, void *hal_isr,
- int interrupt_num)
- {
- @@ -2033,10 +2027,8 @@ static int __init tn7atm_register (Tn7At
- return ATM_REG_OK;
- }
-
- -static int tn7atm_proc_version (char *buf, char **start, off_t offset,
- - int count, int *eof, void *data)
- +static int tn7atm_proc_version (struct seq_file *m, void *data)
- {
- - int len = 0;
- char dslVer[8];
- char dspVer[10];
- char chipsetID[32]; //CT CQ10076 - Added temporary buffer to store chipset Id
- @@ -2051,58 +2043,52 @@ static int tn7atm_proc_version (char *bu
- priv = mydev->dev_data;
-
- #ifdef AR7_EFM
- - len +=
- - sprintf (buf + len, "ATM/EFM Driver version:[%d.%02d.%02d.%02d]\n",
- - LINUXATM_VERSION_MAJOR, LINUXATM_VERSION_MINOR,
- - LINUXATM_VERSION_BUGFIX, LINUXATM_VERSION_BUILDNUM);
- -
- + seq_printf (m, "ATM/EFM Driver version:[%d.%02d.%02d.%02d]\n",
- + LINUXATM_VERSION_MAJOR, LINUXATM_VERSION_MINOR,
- + LINUXATM_VERSION_BUGFIX, LINUXATM_VERSION_BUILDNUM);
- #else
- - len +=
- - sprintf (buf + len, "ATM Driver version:[%d.%02d.%02d.%02d]\n",
- - LINUXATM_VERSION_MAJOR, LINUXATM_VERSION_MINOR,
- - LINUXATM_VERSION_BUGFIX, LINUXATM_VERSION_BUILDNUM);
- + seq_printf (m, "ATM Driver version:[%d.%02d.%02d.%02d]\n",
- + LINUXATM_VERSION_MAJOR, LINUXATM_VERSION_MINOR,
- + LINUXATM_VERSION_BUGFIX, LINUXATM_VERSION_BUILDNUM);
- #endif
-
- tn7dsl_get_dslhal_version (dslVer);
-
- - len +=
- - sprintf (buf + len, "DSL HAL version: [%d.%02d.%02d.%02d]\n", dslVer[0],
- - dslVer[1], dslVer[2], dslVer[3]);
- + seq_printf (m, "DSL HAL version: [%d.%02d.%02d.%02d]\n", dslVer[0],
- + dslVer[1], dslVer[2], dslVer[3]);
- tn7dsl_get_dsp_version (dspVer);
-
- #ifdef EFM_DEBUG
- - len +=
- - sprintf (buf + len, "DSP Datapump version: [%d.%02d.%02d.%02d(%u)] ",
- - dspVer[4], dspVer[5], dspVer[6], dspVer[7], (unsigned char) dspVer[7]);
- + seq_printf (m, "DSP Datapump version: [%d.%02d.%02d.%02d(%u)] ",
- + dspVer[4], dspVer[5], dspVer[6], dspVer[7], (unsigned char) dspVer[7]);
- #else
- - len +=
- - sprintf (buf + len, "DSP Datapump version: [%d.%02d.%02d.%02d] ",
- - dspVer[4], dspVer[5], dspVer[6], dspVer[7]);
- + seq_printf (m, "DSP Datapump version: [%d.%02d.%02d.%02d] ",
- + dspVer[4], dspVer[5], dspVer[6], dspVer[7]);
- #endif
- if (dspVer[8] == 2) // annex B
- - len += sprintf (buf + len, "Annex B\n");
- + seq_printf (m, "Annex B\n");
- else if (dspVer[8] == 3) // annex c
- - len += sprintf (buf + len, "Annex c\n");
- + seq_printf (m, "Annex c\n");
- else
- - len += sprintf (buf + len, "Annex A\n");
- + seq_printf (m, "Annex A\n");
-
- tn7sar_get_sar_version (priv, &pSarVer);
-
- - len += sprintf (buf + len, "SAR HAL version: [");
- + seq_printf (m, "SAR HAL version: [");
- for (i = 0; i < 8; i++)
- {
- - len += sprintf (buf + len, "%c", pSarVer[i + 7]);
- + seq_printf (m, "%c", pSarVer[i + 7]);
- }
- - len += sprintf (buf + len, "]\n");
- + seq_printf (m, "]\n");
-
- tn7sar_get_sar_firmware_version (&pdspV1, &pdspV2);
-
- #ifndef AR7_EFM
- - len += sprintf (buf + len, "PDSP Firmware version:[%01x.%02x]\n",
- + seq_printf (m, "PDSP Firmware version:[%01x.%02x]\n",
- pdspV1, pdspV2);
- #else
-
- - len += sprintf (buf + len, "PDSP Firmware version:[%01x.%02x](ATM)%c\n",
- + seq_printf (m, "PDSP Firmware version:[%01x.%02x](ATM)%c\n",
- pdspV1, pdspV2, (priv->curr_TC_mode== TC_MODE_ATM) ? '*' : ' ');
-
- tn7sar_get_EFM_firmware_version (&pdspV1, &pdspV2);
- @@ -2114,26 +2100,37 @@ static int tn7atm_proc_version (char *bu
- #endif
- str = "EFM";
-
- - len += sprintf (buf + len, "PDSP Firmware version:[%01x.%02x](%s)%c\n",
- + seq_printf (m, "PDSP Firmware version:[%01x.%02x](%s)%c\n",
- pdspV1, pdspV2, str, (priv->curr_TC_mode== TC_MODE_PTM) ? '*' : ' ');
-
- #endif
-
- //CT CQ10076 - Added code to report chipset ID using proc file system
- tn7atm_get_chipsetId(chipsetID);
- - len += sprintf (buf + len, "Chipset ID: [%s]\n",chipsetID);
- + seq_printf (m, "Chipset ID: [%s]\n",chipsetID);
- +
- + return 0;
- +}
-
- - return len;
- +static int tn7atm_proc_version_open(struct inode *inode, struct file *file)
- +{
- + return single_open(file, tn7atm_proc_version, PDE_DATA(inode));
- }
-
- +static struct file_operations tn7atm_proc_version_fops = {
- + .owner = THIS_MODULE,
- + .open = tn7atm_proc_version_open,
- + .read = seq_read,
- + .llseek = seq_lseek,
- + .release = single_release,
- +};
- +
-
- /* Device detection */
-
- static int __init tn7atm_detect (void)
- {
- Tn7AtmPrivate *priv;
- - struct proc_dir_entry *dsl_wr_file = NULL; /* Only for ones with a write
- - * function. */
- int ctr;
- const char *residual;
-
- @@ -2214,24 +2211,7 @@ static int __init tn7atm_detect (void)
- */
- for (ctr = 0; ctr < (NUM_ELEMS (proc_if)); ctr++)
- {
- - /* Only if we have a write function, we create a normal proc file. */
- - if(proc_if[ctr].write_func)
- - {
- - dsl_wr_file = create_proc_entry (proc_if[ctr].name, DRV_PROC_MODE, root_proc_dir_entry);
- - if (dsl_wr_file)
- - {
- - dsl_wr_file->read_proc = proc_if[ctr].read_func;
- - dsl_wr_file->write_proc = proc_if[ctr].write_func;
- - dsl_wr_file->data = (void *)mydev; //UR8_MERGE_START_END CQ10700 Manjula K
- - }
- - dsl_wr_file = NULL;
- - }
- - else
- - {
- - /* Create a read-only entry. */
- - create_proc_read_entry (proc_if[ctr].name, 0, root_proc_dir_entry,
- - proc_if[ctr].read_func, mydev);
- - }
- + proc_create_data(proc_if[ctr].name, DRV_PROC_MODE, root_proc_dir_entry, proc_if[ctr].fops, (void *)mydev);
- }
-
- tn7dsl_dslmod_sysctl_register ();
- @@ -2711,73 +2691,18 @@ static int tn7atm_set_can_support_adsl2
- return TRUE;
- }
-
- -/*
- - * This function matches a name such as "serial", and that specified by the
- - * proc_dir_entry
- - */
- -static int tn7atm_proc_match (int len, const char *name,
- - struct proc_dir_entry *de)
- +static int tn7atm_proc_qos_read(struct seq_file *m, void *data)
- {
- - if (!de || !de->low_ino)
- + seq_printf (m, "\nEnableQoS = %d\n", EnableQoS);
- return 0;
- - if (de->namelen != len)
- - return 0;
- - return !strncmp (name, de->name, len);
- -}
- -
- -/*
- - * This function parses a name such as "tty/driver/serial", and
- - * returns the struct proc_dir_entry for "/proc/tty/driver", and
- - * returns "serial" in residual.
- - */
- -static int tn7atm_xlate_proc_name (const char *name,
- - struct proc_dir_entry **ret,
- - const char **residual)
- -{
- - const char *cp = name, *next;
- - struct proc_dir_entry *de;
- - int len;
- - extern struct proc_dir_entry proc_root;
- -
- - de = &proc_root;
- - while (1)
- - {
- - next = strchr (cp, '/');
- - if (!next)
- - break;
- -
- - len = next - cp;
- - for (de = de->subdir; de; de = de->next)
- - {
- - if (tn7atm_proc_match (len, cp, de))
- - break;
- - }
- - if (!de)
- - return -ENOENT;
- - cp += len + 1;
- - }
- - *residual = cp;
- - *ret = de;
- -
- - return 0;
- -}
- -
- -static int tn7atm_proc_qos_read(char *buf, char **start, off_t offset, int count, int *eof, void *data)
- -{
- - int len = 0;
- -
- - len += sprintf (buf + len, "\nEnableQoS = %d\n", EnableQoS);
- - return len;
-
- }
-
- // [KT]
- -static int tn7atm_proc_turbodsl_read(char *buf, char **start, off_t offset, int count, int *eof, void *data)
- +static int tn7atm_proc_turbodsl_read(struct seq_file *m, void *data)
- {
- - int len = 0;
- -
- - len += sprintf (buf + len, "%d\n", bTurboDsl);
- - return len;
- + seq_printf (m, "%d\n", bTurboDsl);
- + return 0;
- }
-
- static int tn7atm_proc_qos_write(struct file *fp, const char *buf, unsigned long count, void *data)
- @@ -2812,7 +2737,7 @@ static int tn7atm_proc_qos_write(struct
- }
-
- // [KT]
- -int tn7atm_proc_turbodsl_write(struct file *fp, const char *buf, unsigned long count, void *data)
- +static int tn7atm_proc_turbodsl_write(struct file *fp, const char *buf, unsigned long count, void *data)
- {
- char local_buf[10];
-
- @@ -2843,5 +2768,33 @@ int tn7atm_proc_turbodsl_write(struct fi
- return count;
- }
-
- +static int tn7atm_proc_qos_open(struct inode *inode, struct file *file)
- +{
- + return single_open(file, tn7atm_proc_qos_read, PDE_DATA(inode));
- +}
- +
- +static struct file_operations tn7atm_proc_qos_fops = {
- + .owner = THIS_MODULE,
- + .open = tn7atm_proc_qos_open,
- + .read = seq_read,
- + .llseek = seq_lseek,
- + .release = single_release,
- + .write = tn7atm_proc_qos_write,
- +};
- +
- +static int tn7atm_proc_turbodsl_open(struct inode *inode, struct file *file)
- +{
- + return single_open(file, tn7atm_proc_turbodsl_read, PDE_DATA(inode));
- +}
- +
- +static struct file_operations tn7atm_proc_turbodsl_fops = {
- + .owner = THIS_MODULE,
- + .open = tn7atm_proc_turbodsl_open,
- + .read = seq_read,
- + .llseek = seq_lseek,
- + .release = single_release,
- + .write = tn7atm_proc_turbodsl_write,
- +};
- +
- module_init (tn7atm_detect);
- module_exit (tn7atm_exit);
- --- a/tn7dsl.c
- +++ b/tn7dsl.c
- @@ -233,6 +233,9 @@ static struct led_funcs ledreg[2];
-
- #define tn7dsl_kfree_skb(x) dev_kfree_skb(x)
-
- +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- +#define PDE_DATA(inode) PDE(inode)->data
- +#endif
-
- //---------------------------------------------
- // Begin Clear EOC definitions
- @@ -366,7 +369,7 @@ static void tn7dsl_register_dslss_led(vo
- void tn7dsl_dslmod_sysctl_register(void);
- void tn7dsl_dslmod_sysctl_unregister(void);
- static int tn7dsl_clear_eoc_receive(void);
- -static int tn7dsl_proc_snr_print (char *buf, int count, int *eof, int data);
- +static int tn7dsl_proc_snr_print (struct seq_file *m, int data);
- /* end of internal functions */
-
- // UR8_MERGE_START CQ11054 Jack Zhang
- @@ -698,11 +701,9 @@ void shim_osCriticalExit(void)
- spin_unlock_irqrestore(&shimLock, flags);
- }
-
- -static int tn7dsl_proc_snr_print (char *buf, int count, int *eof, int data)
- +static int tn7dsl_proc_snr_print (struct seq_file *m, int data)
- {
-
- - int len = 0;
- - int limit = count - 80;
- int i, j;
- int bin = (int) data;
- unsigned short *rxSnrPerBin;
- @@ -723,95 +724,128 @@ static int tn7dsl_proc_snr_print (char *
- break;
-
- default:
- - if(len<=limit)
- - len += sprintf (buf + len, "\nInvalid bin selected Bin%d :\n", bin);
- - return len;
- -}
- + seq_printf (m, "\nInvalid bin selected Bin%d :\n", bin);
- + return 0;
- + }
-
- - if(len<=limit)
- - len += sprintf (buf + len, "\nAR7 DSL Modem Rx SNR Per Bin for Bin%d :\n", bin);
- + seq_printf (m, "\nAR7 DSL Modem Rx SNR Per Bin for Bin%d :\n", bin);
-
- for (i=0; i<pIhw->AppData.max_ds_tones/16; i++)
- {
- for(j=0;j<16;j++)
- {
- - if(len <=limit)
- - len +=
- - sprintf (buf + len, "%04x ",
- + seq_printf (m, "%04x ",
- (unsigned short) rxSnrPerBin[i * 16 + j]);
- - }
- - if(len <=limit)
- - len += sprintf(buf+len, "\n");
- }
- + seq_printf(m, "\n");
- + }
-
- - return len;
- + return 0;
- }
-
-
- //@Added SNR per bin info per customer request. 05-14-2004
- -int tn7dsl_proc_snr0 (char *buf, char **start, off_t offset, int count,
- - int *eof, void *data)
- +static int tn7dsl_proc_snr0 (struct seq_file *m, void *data)
- {
- - return tn7dsl_proc_snr_print(buf, count, eof, 0);
- + return tn7dsl_proc_snr_print(m, 0);
- }
-
- -int tn7dsl_proc_snr1 (char *buf, char **start, off_t offset, int count,
- - int *eof, void *data)
- +static int tn7dsl_proc_snr0_open(struct inode *inode, struct file *file)
- {
- - return tn7dsl_proc_snr_print(buf, count, eof, 1);
- + return single_open(file, tn7dsl_proc_snr0, PDE_DATA(inode));
- +}
- +
- +struct file_operations tn7dsl_proc_snr0_fops = {
- + .owner = THIS_MODULE,
- + .open = tn7dsl_proc_snr0_open,
- + .read = seq_read,
- + .llseek = seq_lseek,
- + .release = single_release,
- +};
- +
- +static int tn7dsl_proc_snr1 (struct seq_file *m, void *data)
- +{
- + return tn7dsl_proc_snr_print(m, 1);
- }
-
- -int tn7dsl_proc_snr2 (char *buf, char **start, off_t offset, int count,
- - int *eof, void *data)
- +static int tn7dsl_proc_snr1_open(struct inode *inode, struct file *file)
- {
- - return tn7dsl_proc_snr_print(buf, count, eof, 2);
- + return single_open(file, tn7dsl_proc_snr1, PDE_DATA(inode));
- }
-
- +struct file_operations tn7dsl_proc_snr1_fops = {
- + .owner = THIS_MODULE,
- + .open = tn7dsl_proc_snr1_open,
- + .read = seq_read,
- + .llseek = seq_lseek,
- + .release = single_release,
- +};
- +
- +static int tn7dsl_proc_snr2 (struct seq_file *m, void *data)
- +{
- + return tn7dsl_proc_snr_print(m, 2);
- +}
- +
- +static int tn7dsl_proc_snr2_open(struct inode *inode, struct file *file)
- +{
- + return single_open(file, tn7dsl_proc_snr2, PDE_DATA(inode));
- +}
- +
- +struct file_operations tn7dsl_proc_snr2_fops = {
- + .owner = THIS_MODULE,
- + .open = tn7dsl_proc_snr2_open,
- + .read = seq_read,
- + .llseek = seq_lseek,
- + .release = single_release,
- +};
- +
- //@Added bit allocation table per customer request. 05-14-2004
- -int tn7dsl_proc_bit_allocation (char *buf, char **start, off_t offset,
- - int count, int *eof, void *data)
- +static int tn7dsl_proc_bit_allocation (struct seq_file *m, void *data)
- {
-
- - int len = 0;
- - int limit = count - 80;
- int i, j;
-
- - if(len<=limit)
- - len += sprintf(buf+len, "\nAR7 DSL Modem US Bit Allocation:");
- + seq_printf(m, "\nAR7 DSL Modem US Bit Allocation:");
-
- for(i=0; i<pIhw->AppData.max_us_tones; i++)
- {
- if (!(i%16))
- {
- - if(len <=limit)
- - len += sprintf(buf+len, "\n");
- + seq_printf(m, "\n");
- }
- - if(len <=limit)
- - len +=
- - sprintf (buf + len, "%02x ",
- - (unsigned char) pIhw->AppData.BitAllocTblUstrm[i]);
- + seq_printf (m, "%02x ",
- + (unsigned char) pIhw->AppData.BitAllocTblUstrm[i]);
- }
-
- - if(len<=limit)
- - len += sprintf(buf+len, "\n\nAR7 DSL Modem DS Bit Allocation:\n");
- + seq_printf(m, "\n\nAR7 DSL Modem DS Bit Allocation:\n");
-
- for (i=0; i<pIhw->AppData.max_ds_tones/16; i++)
- {
- for(j=0;j<16;j++)
- {
- - if(len <=limit)
- - len +=
- - sprintf (buf + len, "%02x ",
- - (unsigned char) pIhw->AppData.BitAllocTblDstrm[i * 16 +
- - j]);
- + seq_printf (m, "%02x ",
- + (unsigned char) pIhw->AppData.BitAllocTblDstrm[i * 16 +
- + j]);
- }
- - if(len <=limit)
- - len += sprintf(buf+len, "\n");
- + seq_printf(m, "\n");
- }
-
- - return len;
- + return 0;
- +}
- +
- +int tn7dsl_proc_bit_allocation_open(struct inode *inode, struct file *file)
- +{
- + return single_open(file, tn7dsl_proc_bit_allocation, PDE_DATA(inode));
- }
-
- +struct file_operations tn7dsl_proc_bit_allocation_fops = {
- + .owner = THIS_MODULE,
- + .open = tn7dsl_proc_bit_allocation_open,
- + .read = seq_read,
- + .llseek = seq_lseek,
- + .release = single_release,
- +};
- +
- #ifndef NO_ACT
- int tn7dsl_proc_ds_noise(char* buf, char **start, off_t offset, int count,
- int *eof, void *data)
- @@ -874,59 +908,48 @@ static char *pUnknown= "Unknown";
- #ifdef ADV_DIAG_STATS //CQ10275, CQ10449
- //UR8_MERGE_START CQ10449 Jack Zhang
-
- -static int proc_adv_stats_header(char* buf, int limit);
- +static int proc_adv_stats_header(struct seq_file *m);
-
- -int tn7dsl_proc_adv_stats(char* buf, char **start, off_t offset, int count,
- - int *eof, void *data)
- +static int tn7dsl_proc_adv_stats(struct seq_file *m, void *data)
- {
-
- - int len = 0;
- - int limit = count - 80;
- //char *cp = buf + offset;
- char *cp = buf;
- int i = 0;
- int strt = 32;
- - static int ctr = 0;
-
- // printk("proc_adv_stats: buf=0x%X, ctr=%d, offset=%d, count=%d, eof=%d\n",
- // (unsigned int)buf, ctr, offset, count, *eof);
- - if( ctr == 0)
- - {
- - len = proc_adv_stats_header( cp, limit);
- + proc_adv_stats_header(m);
-
- - if( len<=limit)
- - len += sprintf(cp+len, "\n\tBin No.\tBits:\tMargin:\tSNR\n");
- - }
- - else
- - {
- - strt = ctr;
- - }
- + seq_printf(m, "\n\tBin No.\tBits:\tMargin:\tSNR\n");
-
- for( i =strt; i<512; i++)
- {
- - if(len<=limit)
- - {
- - len += sprintf(cp+len, "\t%u\t%u\t%u\t%d\n", i,
- + seq_printf(m, "\t%u\t%u\t%u\t%d\n", i,
- (unsigned int)pIhw->AppData.BitAllocTblDstrm[i],
- (unsigned int)pIhw->AppData.marginTblDstrm[i],
- (int)pIhw->AppData.rxSnrPerBin0[i]);
- - }
- - else
- - {
- - ctr = i;
- - //*eof = 0;
- - *(cp + len) = '\0';
- - printk("proc_adv_stats - return: ctr=%d, len=%d\n", ctr, len);
- - return len;
- - }
- }
- - ctr = 0;
- - *eof = 1;
- printk("proc_adv_stats - return: ctr=%d, len=%d\n", ctr, len);
- - return len;
- + return 0;
- }
-
- -static int proc_adv_stats_header(char* buf, int limit)
- +
- +static int tn7dsl_proc_adv_stats_open(struct inode *inode, struct file *file)
- +{
- + return single_open(file, tn7dsl_proc_adv_stats, PDE_DATA(inode));
- +}
- +
- +struct file_operations tn7dsl_proc_adv_stats_fops = {
- + .owner = THIS_MODULE,
- + .open = tn7dsl_proc_adv_stats_open,
- + .read = seq_read,
- + .llseek = seq_lseek,
- + .release = single_release,
- +};
- +
- +static int proc_adv_stats_header(struct seq_file *m)
- {
- int len = 0;
- int i = 0;
- @@ -935,66 +958,53 @@ static int proc_adv_stats_header(char* b
- */
-
- dslhal_api_gatherStatistics(pIhw);
- - if(len<=limit)
- - len += sprintf(buf+len, "\nAR7 DSL Modem Advanced Statistics:\n");
- + seq_printf(m, "\nAR7 DSL Modem Advanced Statistics:\n");
-
- - if(len<=limit)
- + if(pIhw->lConnected != 1)
- {
- - if(pIhw->lConnected != 1)
- - {
- - pIhw->AppData.USConRate = 0;
- - pIhw->AppData.DSConRate = 0;
- - }
- - len +=
- - sprintf (buf + len,
- + pIhw->AppData.USConRate = 0;
- + pIhw->AppData.DSConRate = 0;
- + }
- + seq_printf (m,
- "\t[Connection Rate]\tUS:\t%u\tDS:\t%u\n",
- (unsigned int)pIhw->AppData.USConRate,
- (unsigned int)pIhw->AppData.DSConRate );
- }
- - if(len<=limit)
- // UR8_MERGE_START CQ11054 Jack Zhang
- + if (dslhal_api_getHighPrecision())
- {
- - if (dslhal_api_getHighPrecision())
- - {
- - len +=
- - sprintf (buf + len, "\t[Margin]\tUS:\t%d.%u\tDS:\t\t%d.%u\n",
- - gInt(pIhw->AppData.usMargin), gDot1(pIhw->AppData.usMargin),
- - gInt(pIhw->AppData.dsMargin), gDot1(pIhw->AppData.dsMargin));
- - }
- - else
- - {
- - len +=
- - sprintf (buf + len, "\t[Margin]\tUS:\t%u\tDS:\t\t%u\n",
- - (unsigned int)pIhw->AppData.usMargin,
- - (unsigned int)pIhw->AppData.dsMargin/2 );
- - }
- + seq_printf (m, "\t[Margin]\tUS:\t%d.%u\tDS:\t\t%d.%u\n",
- + gInt(pIhw->AppData.usMargin), gDot1(pIhw->AppData.usMargin),
- + gInt(pIhw->AppData.dsMargin), gDot1(pIhw->AppData.dsMargin));
- + }
- + else
- + {
- + seq_printf (m, "\t[Margin]\tUS:\t%u\tDS:\t\t%u\n",
- + (unsigned int)pIhw->AppData.usMargin,
- + (unsigned int)pIhw->AppData.dsMargin/2 );
- }
- // UR8_MERGE_END CQ11054*
-
- /*
- * Downstream/Upstream Interleaved Errors
- */
- - if(len<=limit)
- - len += sprintf(buf+len, "\t[Interleave path] US (TX):\tCRC: \t%u\tFEC: \t%u\n",
- + seq_printf(m, "\t[Interleave path] US (TX):\tCRC: \t%u\tFEC: \t%u\n",
- (unsigned int)pIhw->AppData.usICRC_errors,
- (unsigned int)pIhw->AppData.usIFEC_errors);
- - if(len<=limit)
- - len += sprintf(buf+len, "\t[Interleave path] DS (RX):\tCRC: \t%u\tFEC: \t%u\n",
- + seq_printf(m, "\t[Interleave path] DS (RX):\tCRC: \t%u\tFEC: \t%u\n",
- (unsigned int)pIhw->AppData.dsICRC_errors,
- (unsigned int)pIhw->AppData.dsIFEC_errors);
- /*
- * Upstream/Downstream Fast Errors
- */
- - if(len<=limit)
- - len += sprintf(buf+len, "\t[Fast path] US (TX): \tCRC: \t%u\tFEC: \t%u\n",
- + seq_printf(m, "\t[Fast path] US (TX): \tCRC: \t%u\tFEC: \t%u\n",
- (unsigned int)pIhw->AppData.usFCRC_errors,
- (unsigned int)pIhw->AppData.usFFEC_errors);
- - if(len<=limit)
- - len += sprintf(buf+len, "\t[Fast path] DS (RX):\tCRC: \t%u\tFEC: \t%u\n",
- + seq_printf(m, "\t[Fast path] DS (RX):\tCRC: \t%u\tFEC: \t%u\n",
- (unsigned int)pIhw->AppData.dsFCRC_errors,
- (unsigned int)pIhw->AppData.dsFFEC_errors);
-
- - return len;
- + return 0;
- }
-
- static int getDiagDisplayMode()
- @@ -1017,29 +1027,24 @@ static int getDiagDisplayMode()
- ret = 2;
- return ret;
- }
- -int tn7dsl_proc_adv_stats1(char* buf, char **start, off_t offset, int count,
- - int *eof, void *data)
- +int tn7dsl_proc_adv_stats1(struct seq_file *m, void *data)
- {
-
- - int len = 0;
- - int limit = count - 80;
- int i;
- int mode = 0; //mode = 0 => ADSL1 or ADSL2 & 2+
- unsigned char SNRpsds[512];
- int n;
-
- - len = proc_adv_stats_header( buf+len, limit);
- + proc_adv_stats_header( m);
- mode = getDiagDisplayMode();
-
- - if(len<=limit)
- - len += sprintf(buf+len, "\tBin No.\tBits:\tMargin:\tSNR (Part 1 of 3)\n");
- + seq_printf(m, "\tBin No.\tBits:\tMargin:\tSNR (Part 1 of 3)\n");
-
- if(mode==1) //ADSL1
- {
- for( i =32; i<128; i++)
- {
- - if(len<=limit)
- - len += sprintf(buf+len, "\t%u\t%u\t%u\t%d\n", i,
- + seq_printf(m, "\t%u\t%u\t%u\t%d\n", i,
- (unsigned int)pIhw->AppData.BitAllocTblDstrm[i],
- (unsigned int)pIhw->AppData.marginTblDstrm[i],
- (int)pIhw->AppData.rxSnrPerBin0[i]);
- @@ -1050,26 +1055,34 @@ int tn7dsl_proc_adv_stats1(char* buf, ch
- if (dslhal_api_getSNRpsds(pIhw, SNRpsds, 1))
- {
- dgprintf(4, "dslhal_api_getSNRpsds failed!\n");
- - return len;
- + return -EIO;
- }
- for( i =32; i<128; i++)
- {
- - if(len<=limit)
- - len += sprintf(buf+len, "\t%u\t%u\t%u\t%d\n", i,
- + seq_printf(m, "\t%u\t%u\t%u\t%d\n", i,
- (unsigned int)pIhw->AppData.BitAllocTblDstrm[i],
- (unsigned int)pIhw->AppData.marginTblDstrm[i],
- (i<pIhw->AppData.max_ds_tones)?(unsigned char)SNRpsds[i]:0);
- }
- }
- - return len;
- + return 0;
- }
-
- -int tn7dsl_proc_adv_stats2(char* buf, char **start, off_t offset, int count,
- - int *eof, void *data)
- +static int tn7dsl_proc_adv_stats1_open(struct inode *inode, struct file *file)
- {
- + return single_open(file, tn7dsl_proc_adv_stats1, PDE_DATA(inode));
- +}
-
- - int len = 0;
- - int limit = count - 80;
- +struct file_operations tn7dsl_proc_adv_stats1_fops = {
- + .owner = THIS_MODULE,
- + .open = tn7dsl_proc_adv_stats1_open,
- + .read = seq_read,
- + .llseek = seq_lseek,
- + .release = single_release,
- +};
- +
- +int tn7dsl_proc_adv_stats2(struct seq_file *m, void *data)
- +{
- int i;
- int mode = 0; //mode = 0 => ADSL1 or ADSL2 & 2+
- unsigned char SNRpsds[512];
- @@ -1079,12 +1092,10 @@ int tn7dsl_proc_adv_stats2(char* buf, ch
- if( mode==1) //ADSL1
- {
- dslhal_api_gatherStatistics(pIhw);
- - if(len<=limit)
- - len += sprintf(buf+len, "\tBin No.\tBits:\tMargin:\tSNR (Part 2 of 3):\n");
- + seq_printf(m, "\tBin No.\tBits:\tMargin:\tSNR (Part 2 of 3):\n");
- for( i =128; i<320; i++)
- {
- - if(len<=limit)
- - len += sprintf(buf+len, "\t%u\t%u\t%u\t%d\n", i,
- + seq_printf(m, "\t%u\t%u\t%u\t%d\n", i,
- (unsigned int)pIhw->AppData.BitAllocTblDstrm[i],
- (unsigned int)pIhw->AppData.marginTblDstrm[i],
- (int)pIhw->AppData.rxSnrPerBin0[i]);
- @@ -1095,26 +1106,35 @@ int tn7dsl_proc_adv_stats2(char* buf, ch
- if (dslhal_api_getSNRpsds(pIhw, SNRpsds, 1))
- {
- dgprintf(4, "dslhal_api_getSNRpsds failed!\n");
- - return len;
- + return -EIO;
- }
- for( i =128; i<320; i++)
- {
- - if(len<=limit)
- - len += sprintf(buf+len, "\t%u\t%u\t%u\t%d\n", i,
- + seq_printf(m, "\t%u\t%u\t%u\t%d\n", i,
- (unsigned int)pIhw->AppData.BitAllocTblDstrm[i],
- (unsigned int)pIhw->AppData.marginTblDstrm[i],
- (i<pIhw->AppData.max_ds_tones)?(unsigned char)SNRpsds[i]:0);
- }
- }
- - return len;
- + return 0;
- }
-
- -int tn7dsl_proc_adv_stats3(char* buf, char **start, off_t offset, int count,
- - int *eof, void *data)
- +static int tn7dsl_proc_adv_stats2_open(struct inode *inode, struct file *file)
- +{
- + return single_open(file, tn7dsl_proc_adv_stats2, PDE_DATA(inode));
- +}
- +
- +struct file_operations tn7dsl_proc_adv_stats2_fops = {
- + .owner = THIS_MODULE,
- + .open = tn7dsl_proc_adv_stats2_open,
- + .read = seq_read,
- + .llseek = seq_lseek,
- + .release = single_release,
- +};
- +
- +int tn7dsl_proc_adv_stats3(struct seq_file *m, void *data)
- {
-
- - int len = 0;
- - int limit = count - 80;
- int i;
- int mode = 0; //mode = 0 => ADSL1 or ADSL2 & 2+
- unsigned char SNRpsds[512];
- @@ -1124,12 +1144,10 @@ int tn7dsl_proc_adv_stats3(char* buf, ch
- if( mode==1) //ADSL1
- {
- dslhal_api_gatherStatistics(pIhw);
- - if(len<=limit)
- - len += sprintf(buf+len, "\tBin No.\tBits:\tMargin:\tSNR (Part 3 of 3):\n");
- + seq_printf(m, "\tBin No.\tBits:\tMargin:\tSNR (Part 3 of 3):\n");
- for( i =320; i<512; i++)
- {
- - if(len<=limit)
- - len += sprintf(buf+len, "\t%u\t%u\t%u\t%d\n", i,
- + seq_printf(m, "\t%u\t%u\t%u\t%d\n", i,
- (unsigned int)pIhw->AppData.BitAllocTblDstrm[i],
- (unsigned int)pIhw->AppData.marginTblDstrm[i],
- (int)pIhw->AppData.rxSnrPerBin0[i]);
- @@ -1140,283 +1158,287 @@ int tn7dsl_proc_adv_stats3(char* buf, ch
- if (dslhal_api_getSNRpsds(pIhw, SNRpsds, 1))
- {
- dgprintf(4, "dslhal_api_getSNRpsds failed!\n");
- - return len;
- + return -EIO;
- }
- for( i =320; i<512; i++)
- {
- - if(len<=limit)
- - len += sprintf(buf+len, "\t%u\t%u\t%u\t%d\n", i,
- + seq_printf(m, "\t%u\t%u\t%u\t%d\n", i,
- (unsigned int)pIhw->AppData.BitAllocTblDstrm[i],
- (unsigned int)pIhw->AppData.marginTblDstrm[i],
- (i<pIhw->AppData.max_ds_tones)?(unsigned char)SNRpsds[i]:0);
- }
- }
- - if(len<=limit)
- - len += sprintf(buf+len, "[End of Stats]\n");
- - return len;
- + seq_printf(m, "[End of Stats]\n");
- + return 0;
- }
- -//UR8_MERGE_END CQ10449
- -//UR8_MERGE_START CQ10682 Jack Zhang
- -int tn7dsl_proc_dbg_cmsgs(char* buf, char **start, off_t offset, int count,
- - int *eof, void *data)
- +
- +static int tn7dsl_proc_adv_stats3_open(struct inode *inode, struct file *file)
- {
- + return single_open(file, tn7dsl_proc_adv_stats3, PDE_DATA(inode));
- +}
-
- - int len = 0;
- - int limit = count - 80;
- +struct file_operations tn7dsl_proc_adv_stats3_fops = {
- + .owner = THIS_MODULE,
- + .open = tn7dsl_proc_adv_stats3_open,
- + .read = seq_read,
- + .llseek = seq_lseek,
- + .release = single_release,
- +};
-
- +//UR8_MERGE_END CQ10449
- +//UR8_MERGE_START CQ10682 Jack Zhang
- +int tn7dsl_proc_dbg_cmsgs(struct seq_file *m, void *data)
- +{
- int rc=0;
-
- dslhal_api_gatherStatistics(pIhw);
-
- - if(len<=limit)
- - len += sprintf(buf+len, "Training Messages (C-Msgs 1-5)..\n");
- + seq_printf(m, "Training Messages (C-Msgs 1-5)..\n");
-
- - if(len<=limit)
- - len += sprintf(buf+len, "ADSL2 DELT C-Msg1Ld \t Message Length:%d\n",
- + seq_printf(m, "ADSL2 DELT C-Msg1Ld \t Message Length:%d\n",
- pIhw->adsl2DiagnosticMessages.cMsg1LdLen);
- for(rc=0;rc<pIhw->adsl2DiagnosticMessages.cMsg1LdLen;rc++)
- {
- - if(len<=limit)
- - len += sprintf(buf+len, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.cMsg1Ld[rc]);
- + seq_printf(m, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.cMsg1Ld[rc]);
- if(rc!=0 && (rc%16==0))
- - if(len<=limit)
- - len += sprintf(buf+len, "\n");
- + seq_printf(m, "\n");
- }
- - if(len<=limit)
- - len += sprintf(buf+len, "\nADSL2 DELT C-Msg2Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.cMsg2LdLen);
- + seq_printf(m, "\nADSL2 DELT C-Msg2Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.cMsg2LdLen);
-
- for(rc=0;rc<pIhw->adsl2DiagnosticMessages.cMsg2LdLen;rc++)
- {
- - if(len<=limit)
- - len += sprintf(buf+len, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.cMsg2Ld[rc]);
- + seq_printf(m, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.cMsg2Ld[rc]);
- if(rc!=0 && (rc%16==0))
- - if(len<=limit)
- - len += sprintf(buf+len, "\n");
- + seq_printf(m, "\n");
- }
-
- - if(len<=limit)
- - len += sprintf(buf+len, "\nADSL2 DELT C-Msg3Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.cMsg3LdLen);
- + seq_printf(m, "\nADSL2 DELT C-Msg3Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.cMsg3LdLen);
-
- for(rc=0;rc<pIhw->adsl2DiagnosticMessages.cMsg3LdLen;rc++)
- {
- - if(len<=limit)
- - len += sprintf(buf+len, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.cMsg3Ld[rc]);
- + seq_printf(m, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.cMsg3Ld[rc]);
- if(rc!=0 && (rc%16==0))
- - if(len<=limit)
- - len += sprintf(buf+len, "\n");
- + seq_printf(m, "\n");
- }
-
- - if(len<=limit)
- - len += sprintf(buf+len, "\nADSL2 DELT C-Msg4Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.cMsg4LdLen);
- + seq_printf(m, "\nADSL2 DELT C-Msg4Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.cMsg4LdLen);
-
- for(rc=0;rc<pIhw->adsl2DiagnosticMessages.cMsg4LdLen;rc++)
- {
- - if(len<=limit)
- - len += sprintf(buf+len, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.cMsg4Ld[rc]);
- + seq_printf(m, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.cMsg4Ld[rc]);
- if(rc!=0 && (rc%16==0))
- - if(len<=limit)
- - len += sprintf(buf+len, "\n");
- + seq_printf(m, "\n");
- }
-
- - if(len<=limit)
- - len += sprintf(buf+len, "\nADSL2 DELT C-Msg5Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.cMsg5LdLen);
- + seq_printf(m, "\nADSL2 DELT C-Msg5Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.cMsg5LdLen);
-
- for(rc=0;rc<pIhw->adsl2DiagnosticMessages.cMsg5LdLen;rc++)
- {
- - if(len<=limit)
- - len += sprintf(buf+len, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.cMsg5Ld[rc]);
- + seq_printf(m, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.cMsg5Ld[rc]);
- if(rc!=0 && (rc%16==0))
- - if(len<=limit)
- - len += sprintf(buf+len, "\n");
- + seq_printf(m, "\n");
- }
- - if(len<=limit)
- - len += sprintf(buf+len, "\n");
- - return len;
- + seq_printf(m, "\n");
- + return 0;
- }
-
- -int tn7dsl_proc_dbg_rmsgs1(char* buf, char **start, off_t offset, int count,
- - int *eof, void *data)
- +static int tn7dsl_proc_dbg_cmsgs_open(struct inode *inode, struct file *file)
- {
- + return single_open(file, tn7dsl_proc_dbg_cmsgs, PDE_DATA(inode));
- +}
-
- - int len = 0;
- - int limit = count - 80;
- +struct file_operations tn7dsl_proc_dbg_cmsgs_fops = {
- + .owner = THIS_MODULE,
- + .open = tn7dsl_proc_dbg_cmsgs_open,
- + .read = seq_read,
- + .llseek = seq_lseek,
- + .release = single_release,
- +};
- +
- +
- +int tn7dsl_proc_dbg_rmsgs1(struct seq_file *m, void *data)
- +{
-
- int rc=0;
-
- dslhal_api_gatherStatistics(pIhw);
-
- - if(len<=limit)
- - len += sprintf(buf+len, "Training Messages (R-Msgs 1-3)..\n");
- + seq_printf(m, "Training Messages (R-Msgs 1-3)..\n");
-
- - if(len<=limit)
- - len += sprintf(buf+len, "\nADSL2 DELT R-Msg1Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.rMsg1LdLen);
- + seq_printf(m, "\nADSL2 DELT R-Msg1Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.rMsg1LdLen);
-
- for(rc=0;rc<pIhw->adsl2DiagnosticMessages.rMsg1LdLen;rc++)
- {
- - if(len<=limit)
- - len += sprintf(buf+len, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.rMsg1Ld[rc]);
- + seq_printf(m, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.rMsg1Ld[rc]);
- if(rc!=0 && (rc%16==0))
- - if(len<=limit)
- - len += sprintf(buf+len, "\n");
- + seq_printf(m, "\n");
- }
-
- - if(len<=limit)
- - len += sprintf(buf+len, "\nADSL2 DELT R-Msg2Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.rMsgxLdLen);
- + seq_printf(m, "\nADSL2 DELT R-Msg2Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.rMsgxLdLen);
-
- for(rc=0;rc<pIhw->adsl2DiagnosticMessages.rMsgxLdLen;rc++)
- {
- - if(len<=limit)
- - len += sprintf(buf+len, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.rMsg2Ld[rc]);
- + seq_printf(m, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.rMsg2Ld[rc]);
- if(rc!=0 && (rc%16==0))
- - if(len<=limit)
- - len += sprintf(buf+len, "\n");
- + seq_printf(m, "\n");
- }
-
- - if(len<=limit)
- - len += sprintf(buf+len, "\nADSL2 DELT R-Msg3Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.rMsgxLdLen);
- + seq_printf(m, "\nADSL2 DELT R-Msg3Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.rMsgxLdLen);
- for(rc=0;rc<pIhw->adsl2DiagnosticMessages.rMsgxLdLen;rc++)
- {
- - if(len<=limit)
- - len += sprintf(buf+len, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.rMsg3Ld[rc]);
- + seq_printf(m, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.rMsg3Ld[rc]);
- if(rc!=0 && (rc%16==0))
- - if(len<=limit)
- - len += sprintf(buf+len, "\n");
- + seq_printf(m, "\n");
- }
- - if(len<=limit)
- - len += sprintf(buf+len, "\n");
- - return len;
- + seq_printf(m, "\n");
- + return 0;
- }
-
- -int tn7dsl_proc_dbg_rmsgs2(char* buf, char **start, off_t offset, int count,
- - int *eof, void *data)
- +static int tn7dsl_proc_dbg_rmsgs1_open(struct inode *inode, struct file *file)
- {
- + return single_open(file, tn7dsl_proc_dbg_rmsgs1, PDE_DATA(inode));
- +}
-
- - int len = 0;
- - int limit = count - 80;
- +struct file_operations tn7dsl_proc_dbg_rmsgs1_fops = {
- + .owner = THIS_MODULE,
- + .open = tn7dsl_proc_dbg_rmsgs1_open,
- + .read = seq_read,
- + .llseek = seq_lseek,
- + .release = single_release,
- +};
- +
- +
- +int tn7dsl_proc_dbg_rmsgs2(struct seq_file *m, void *data)
- +{
-
- int rc=0;
-
- dslhal_api_gatherStatistics(pIhw);
-
- - if(len<=limit)
- - len += sprintf(buf+len, "Training Messages (R-Msgs 4-5)..\n");
- + seq_printf(m, "Training Messages (R-Msgs 4-5)..\n");
-
- - if(len<=limit)
- - len += sprintf(buf+len, "\nADSL2 DELT R-Msg4Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.rMsgxLdLen);
- + seq_printf(m, "\nADSL2 DELT R-Msg4Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.rMsgxLdLen);
- for(rc=0;rc<pIhw->adsl2DiagnosticMessages.rMsgxLdLen;rc++)
- {
- - if(len<=limit)
- - len += sprintf(buf+len, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.rMsg4Ld[rc]);
- + seq_printf(m, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.rMsg4Ld[rc]);
- if(rc!=0 && (rc%16==0))
- - if(len<=limit)
- - len += sprintf(buf+len, "\n");
- + len += sprintf(m, "\n");
- }
-
- - if(len<=limit)
- - len += sprintf(buf+len, "\nADSL2 DELT R-Msg5Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.rMsgxLdLen);
- + seq_printf(m, "\nADSL2 DELT R-Msg5Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.rMsgxLdLen);
- for(rc=0;rc<pIhw->adsl2DiagnosticMessages.rMsgxLdLen;rc++)
- {
- - if(len<=limit)
- - len += sprintf(buf+len, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.rMsg5Ld[rc]);
- + seq_printf(m, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.rMsg5Ld[rc]);
- if(rc!=0 && (rc%16==0))
- - if(len<=limit)
- - len += sprintf(buf+len, "\n");
- + seq_printf(m, "\n");
- }
-
- - if(len<=limit)
- - len += sprintf(buf+len, "\n");
- - return len;
- + seq_printf(m, "\n");
- + return 0;
- }
-
- -int tn7dsl_proc_dbg_rmsgs3(char* buf, char **start, off_t offset, int count,
- - int *eof, void *data)
- +static int tn7dsl_proc_dbg_rmsgs2_open(struct inode *inode, struct file *file)
- {
- + return single_open(file, tn7dsl_proc_dbg_rmsgs2, PDE_DATA(inode));
- +}
-
- - int len = 0;
- - int limit = count - 80;
- +struct file_operations _fops = {
- + .owner = THIS_MODULE,
- + .open = tn7dsl_proc_dbg_rmsgs2_open,
- + .read = seq_read,
- + .llseek = seq_lseek,
- + .release = single_release,
- +};
- +
- +int tn7dsl_proc_dbg_rmsgs3(struct seq_file *m, void *data)
- +{
-
- int rc=0;
-
- dslhal_api_gatherStatistics(pIhw);
-
- - if(len<=limit)
- - len += sprintf(buf+len, "Training Messages (R-Msgs 6-7)..\n");
- + seq_printf(m, "Training Messages (R-Msgs 6-7)..\n");
-
- - if(len<=limit)
- - len += sprintf(buf+len, "\nADSL2 DELT R-Msg6Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.rMsgxLdLen);
- + seq_printf(m, "\nADSL2 DELT R-Msg6Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.rMsgxLdLen);
- for(rc=0;rc<pIhw->adsl2DiagnosticMessages.rMsgxLdLen;rc++)
- {
- - if(len<=limit)
- - len += sprintf(buf+len, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.rMsg6Ld[rc]);
- + seq_printf(m, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.rMsg6Ld[rc]);
- if(rc!=0 && (rc%16==0))
- - if(len<=limit)
- - len += sprintf(buf+len, "\n");
- + seq_printf(m, "\n");
- }
- - if(len<=limit)
- - len += sprintf(buf+len, "\nADSL2 DELT R-Msg7Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.rMsgxLdLen);
- + seq_printf(m, "\nADSL2 DELT R-Msg7Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.rMsgxLdLen);
- for(rc=0;rc<pIhw->adsl2DiagnosticMessages.rMsgxLdLen;rc++)
- {
- - if(len<=limit)
- - len += sprintf(buf+len, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.rMsg7Ld[rc]);
- + seq_printf(m, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.rMsg7Ld[rc]);
- if(rc!=0 && (rc%16==0))
- - if(len<=limit)
- - len += sprintf(buf+len, "\n");
- + seq_printf(m, "\n");
- }
- - if(len<=limit)
- - len += sprintf(buf+len, "\n");
- + seq_printf(m, "\n");
-
- - return len;
- + return 0;
- }
-
- -int tn7dsl_proc_dbg_rmsgs4(char* buf, char **start, off_t offset, int count,
- - int *eof, void *data)
- +static int tn7dsl_proc_dbg_rmsgs3_open(struct inode *inode, struct file *file)
- {
- + return single_open(file, tn7dsl_proc_dbg_rmsgs3, PDE_DATA(inode));
- +}
-
- - int len = 0;
- - int limit = count - 80;
- +struct file_operations tn7dsl_proc_dbg_rmsgs3_fops = {
- + .owner = THIS_MODULE,
- + .open = tn7dsl_proc_dbg_rmsgs3_open,
- + .read = seq_read,
- + .llseek = seq_lseek,
- + .release = single_release,
- +};
- +
- +int tn7dsl_proc_dbg_rmsgs4(struct seq_file *m, void *data)
- +{
-
- int rc=0;
-
- dslhal_api_gatherStatistics(pIhw);
-
- - if(len<=limit)
- - len += sprintf(buf+len, "Training Messages (R-Msgs 8-9)..\n");
- + seq_printf(m, "Training Messages (R-Msgs 8-9)..\n");
-
- - if(len<=limit)
- - len += sprintf(buf+len, "\nADSL2 DELT R-Msg8Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.rMsgxLdLen);
- + seq_printf(m, "\nADSL2 DELT R-Msg8Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.rMsgxLdLen);
- for(rc=0;rc<pIhw->adsl2DiagnosticMessages.rMsgxLdLen;rc++)
- {
- - if(len<=limit)
- - len += sprintf(buf+len, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.rMsg8Ld[rc]);
- + seq_printf(m, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.rMsg8Ld[rc]);
- if(rc!=0 && (rc%16==0))
- - if(len<=limit)
- - len += sprintf(buf+len, "\n");
- + seq_printf(m, "\n");
- }
-
- - if(len<=limit)
- - len += sprintf(buf+len, "\nADSL2 DELT R-Msg9Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.rMsgxLdLen);
- + seq_printf(m, "\nADSL2 DELT R-Msg9Ld \t Message Length:%d\n",pIhw->adsl2DiagnosticMessages.rMsgxLdLen);
- for(rc=0;rc<pIhw->adsl2DiagnosticMessages.rMsgxLdLen;rc++)
- {
- - if(len<=limit)
- - len += sprintf(buf+len, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.rMsg9Ld[rc]);
- + seq_printf(m, " %02x",(unsigned char)pIhw->adsl2DiagnosticMessages.rMsg9Ld[rc]);
- if(rc!=0 && (rc%16==0))
- - if(len<=limit)
- - len += sprintf(buf+len, "\n");
- + seq_printf(m, "\n");
- }
- - if(len<=limit)
- - len += sprintf(buf+len, "\n");
- + seq_printf(m, "\n");
-
- - return len;
- + return 0;
- }
- +
- +static int tn7dsl_proc_dbg_rmsgs4_open(struct inode *inode, struct file *file)
- +{
- + return single_open(file, tn7dsl_proc_dbg_rmsgs4, PDE_DATA(inode));
- +}
- +
- +struct file_operations tn7dsl_proc_dbg_rmsgs4_fops = {
- + .owner = THIS_MODULE,
- + .open = tn7dsl_proc_dbg_rmsgs4_open,
- + .read = seq_read,
- + .llseek = seq_lseek,
- + .release = single_release,
- +};
- +
- //UR8_MERGE_END CQ10682*
- #endif //ADV_DIAG_STATS
-
- -int tn7dsl_proc_stats(char* buf, char **start, off_t offset, int count,
- - int *eof, void *data)
- +static int tn7dsl_proc_stats(struct seq_file *m, void *data)
- {
-
- - int len = 0;
- - int limit = count - 80;
- int F4count, F5count;
- unsigned int maxRate=0;
- unsigned int us_maxRate=0;
- @@ -1424,80 +1446,58 @@ int tn7dsl_proc_stats(char* buf, char **
- //UR8_MERGE_START CQ10700 Manjula K
- struct atm_dev *dev;
- Tn7AtmPrivate *priv;
- - dev = (struct atm_dev *)data;
- + int offset[2] = { 32, 0 };
- + unsigned int usBitswap, dsBitswap;
- + dev = (struct atm_dev *)m->private;
- priv = (Tn7AtmPrivate *)dev->dev_data;
- //UR8_MERGE_END CQ10700
-
- +
- /*
- * Read Ax5 Stats
- */
-
- dslhal_api_gatherStatistics(pIhw);
- - if(len<=limit)
- - len += sprintf(buf+len, "\nAR7 DSL Modem Statistics:\n");
- - if(len<=limit)
- - len += sprintf(buf+len, "--------------------------------\n");
- + seq_printf(m, "\nAR7 DSL Modem Statistics:\n");
- + seq_printf(m, "--------------------------------\n");
- /*
- * us and ds Connection Rates
- */
- - if(len<=limit)
- - len += sprintf(buf+len, "[DSL Modem Stats]\n");
- + seq_printf(m, "[DSL Modem Stats]\n");
-
-
- - if(len<=limit)
- + if(pIhw->lConnected != 1)
- {
- - if(pIhw->lConnected != 1)
- - {
- - pIhw->AppData.USConRate = 0;
- - pIhw->AppData.DSConRate = 0;
- - }
- - len +=
- - sprintf (buf + len,
- - "\tUS Connection Rate:\t%u\tDS Connection Rate:\t%u\n",
- - (unsigned int)pIhw->AppData.USConRate,
- - (unsigned int)pIhw->AppData.DSConRate );
- + pIhw->AppData.USConRate = 0;
- + pIhw->AppData.DSConRate = 0;
- }
- - if(len<=limit)
- + seq_printf (m,
- + "\tUS Connection Rate:\t%u\tDS Connection Rate:\t%u\n",
- + (unsigned int)pIhw->AppData.USConRate,
- + (unsigned int)pIhw->AppData.DSConRate );
- // UR8_MERGE_START CQ11054 Jack Zhang
- - {
- - if (dslhal_api_getHighPrecision())
- - {
- - len +=
- - sprintf (buf + len, "\tDS Line Attenuation:\t%u.%u\tDS Margin:\t\t%d.%u\n",
- + if (dslhal_api_getHighPrecision())
- + seq_printf (m, "\tDS Line Attenuation:\t%u.%u\tDS Margin:\t\t%d.%u\n",
- gInt(pIhw->AppData.dsLineAttn), gDot1(pIhw->AppData.dsLineAttn),
- gInt(pIhw->AppData.dsMargin), gDot1(pIhw->AppData.dsMargin));
- - }
- - else{
- - len +=
- - sprintf (buf + len, "\tDS Line Attenuation:\t%u\tDS Margin:\t\t%u\n",
- + else
- + seq_printf (m, "\tDS Line Attenuation:\t%u\tDS Margin:\t\t%u\n",
- (unsigned int)pIhw->AppData.dsLineAttn/2,
- (unsigned int)pIhw->AppData.dsMargin/2 );
- - }
- - }
- // UR8_MERGE_END CQ11054*
-
- - if(len<=limit)
- // UR8_MERGE_START CQ11054 Jack Zhang
- - {
- - if (dslhal_api_getHighPrecision())
- - {
- - len +=
- - sprintf (buf + len, "\tUS Line Attenuation:\t%u.%u\tUS Margin:\t\t%d.%u\n",
- + if (dslhal_api_getHighPrecision())
- + seq_printf (m, "\tUS Line Attenuation:\t%u.%u\tUS Margin:\t\t%d.%u\n",
- gInt(pIhw->AppData.usLineAttn), gDot1(pIhw->AppData.usLineAttn),
- gInt(pIhw->AppData.usMargin), gDot1(pIhw->AppData.usMargin));
- - }
- - else
- - {
- - len +=
- - sprintf (buf + len, "\tUS Line Attenuation:\t%u\tUS Margin:\t\t%u\n",
- + else
- + seq_printf (m, "\tUS Line Attenuation:\t%u\tUS Margin:\t\t%u\n",
- (unsigned int)pIhw->AppData.usLineAttn/2,
- (unsigned int)pIhw->AppData.usMargin );
- - }
- - }
- // UR8_MERGE_END CQ11054*
-
- - if(len<=limit)
- - len += sprintf(buf+len, "\tUS Payload :\t\t%u\tDS Payload:\t\t%u\n",
- + seq_printf(m, "\tUS Payload :\t\t%u\tDS Payload:\t\t%u\n",
- ((unsigned int) pIhw->AppData.usAtm_count[0] +
- (unsigned int) pIhw->AppData.usAtm_count[1]) * 48,
- ((unsigned int) pIhw->AppData.dsGood_count[0] +
- @@ -1505,9 +1505,7 @@ int tn7dsl_proc_stats(char* buf, char **
- /*
- * Superframe Count
- */
- - if(len<=limit)
- - len +=
- - sprintf (buf + len,
- + seq_printf (m,
- "\tUS Superframe Cnt :\t%u\tDS Superframe Cnt:\t%u\n",
- (unsigned int)pIhw->AppData.usSuperFrmCnt,
- (unsigned int)pIhw->AppData.dsSuperFrmCnt );
- @@ -1515,59 +1513,45 @@ int tn7dsl_proc_stats(char* buf, char **
- /*
- * US and DS power
- */
- - if(len<=limit)
- + if(pIhw->AppData.bState < 5)
- {
- - if(pIhw->AppData.bState < 5)
- - {
- - pIhw->AppData.usTxPower = 0;
- - pIhw->AppData.dsTxPower = 0;
- - }
- - len +=
- - sprintf (buf + len,
- + pIhw->AppData.usTxPower = 0;
- + pIhw->AppData.dsTxPower = 0;
- + }
- + seq_printf (m,
- // UR8_MERGE_START - CQ11579 - Jeremy #1
- "\tUS Transmit Power :\t%d\tDS Transmit Power:\t%d\n",
- pIhw->AppData.usTxPower/256,
- pIhw->AppData.dsTxPower/256 );
- // UR8_MERGE_END - CQ11579
- - }
- /*
- * DSL Stats Errors
- */
- - if(len<=limit)
- - len += sprintf(buf+len, "\tLOS errors:\t\t%u\tSEF errors:\t\t%u\n",
- + seq_printf(m, "\tLOS errors:\t\t%u\tSEF errors:\t\t%u\n",
- (unsigned int)pIhw->AppData.LOS_errors,
- (unsigned int)pIhw->AppData.SEF_errors );
-
- //UR8_MERGE_START Report_SES Manjula K
- //CQ10369
- - if(len<=limit)
- - len += sprintf(buf+len, "\tErrored Seconds:\t%u\tSeverely Err Secs:\t%u\n",
- + seq_printf(m, "\tErrored Seconds:\t%u\tSeverely Err Secs:\t%u\n",
- (unsigned int)pIhw->AppData.erroredSeconds,
- (unsigned int)pIhw->AppData.severelyerrsecs );
- //UR8_MERGE_END Report_SES
-
- - if(len<=limit)
- - len += sprintf(buf+len, "\tFrame mode:\t\t%u\tMax Frame mode:\t\t%u\n",
- + seq_printf(m, "\tFrame mode:\t\t%u\tMax Frame mode:\t\t%u\n",
- (unsigned int)pIhw->AppData.FrmMode,
- (unsigned int)pIhw->AppData.MaxFrmMode );
- - if(len<=limit)
- - len +=
- - sprintf (buf + len, "\tTrained Path:\t\t%u\tUS Peak Cell Rate:\t%u\n",
- + seq_printf (m, "\tTrained Path:\t\t%u\tUS Peak Cell Rate:\t%u\n",
- (unsigned int)pIhw->AppData.TrainedPath,
- (unsigned int)pIhw->AppData.USConRate*1000/8/53 );
- - if(len<=limit)
- - len +=
- - sprintf (buf + len, "\tTrained Mode:\t\t%u\tSelected Mode:\t\t%u\n",
- + seq_printf (m, "\tTrained Mode:\t\t%u\tSelected Mode:\t\t%u\n",
- (unsigned int) pIhw->AppData.TrainedMode,
- (unsigned int) pIhw->AppData.StdMode);
-
- - if(len<=limit)
- - len +=
- - sprintf (buf + len, "\tATUC Vendor Code:\t%X\tATUC Revision:\t%u\n",
- + seq_printf (m, "\tATUC Vendor Code:\t%X\tATUC Revision:\t%u\n",
- (unsigned int) pIhw->AppData.atucVendorId,
- pIhw->AppData.atucRevisionNum);
- - if(len<=limit)
- - len += sprintf(buf+len, "\tHybrid Selected:\t%u\tTrellis:\t\t%u\n",
- + seq_printf(m, "\tHybrid Selected:\t%u\tTrellis:\t\t%u\n",
- (unsigned int)pIhw->AppData.currentHybridNum, trellis);
-
- //@Added Maximum attainable bit rate information. 05-14-2004
- @@ -1581,12 +1565,12 @@ int tn7dsl_proc_stats(char* buf, char **
- }
- else
- {
- - int offset[2] = {5, 1};
- + int dspOffset[2] = { 5, 1 };
- unsigned char rMsgsRA[12];
- int numPayloadBytes = 0;
-
- dslhal_api_dspInterfaceRead (pIhw, (unsigned int) pIhw->pmainAddr, 2,
- - (unsigned int *) &offset,
- + (unsigned int *) &dspOffset,
- (unsigned char *) &rMsgsRA[0], 12);
-
- maxRate = (unsigned int)pIhw->AppData.DSConRate;
- @@ -1602,294 +1586,223 @@ int tn7dsl_proc_stats(char* buf, char **
- }
- }
-
- - if(len<=limit)
- - len +=
- - sprintf (buf + len,
- + seq_printf (m,
- "\tShowtime Count:\t\t%u\tDS Max Attainable Bit Rate: %u kbps\n",
- (unsigned int)pIhw->AppData.showtimeCount, maxRate);
-
- - if(len<=limit)
- - {
- - int offset[2] = {32, 0};
- - unsigned int usBitswap, dsBitswap;
- -
- - tn7dsl_generic_read(2, (unsigned int *)&offset);
- - dsBitswap = dslReg & dslhal_support_byteSwap32(0x000000ff);
- + tn7dsl_generic_read(2, (unsigned int *)&offset);
- + dsBitswap = dslReg & dslhal_support_byteSwap32(0x000000ff);
-
- - offset[0] = 33;
- - tn7dsl_generic_read(2, (unsigned int *)&offset);
- - usBitswap = dslReg & dslhal_support_byteSwap32(0x000000ff);
- + offset[0] = 33;
- + tn7dsl_generic_read(2, (unsigned int *)&offset);
- + usBitswap = dslReg & dslhal_support_byteSwap32(0x000000ff);
-
- // UR8_MERGE_START - CQ11579 - Jeremy
- - if((pIhw->AppData.dsl_modulation > 5) && (pIhw->AppData.dsl_modulation != 128))
- + if((pIhw->AppData.dsl_modulation > 5) && (pIhw->AppData.dsl_modulation != 128))
- // UR8_MERGE_END - CQ11579 - Jeremy
- - len +=
- - sprintf (buf + len,
- + seq_printf (m,
- "\tBitSwap:\t\t%u\tUS Max Attainable Bit Rate: %u bps\n",
- (unsigned int)(usBitswap && dsBitswap), us_maxRate);
- - else
- - len +=
- - sprintf (buf + len,
- + else
- + seq_printf (m,
- "\tBitSwap:\t\t%u\tUS Max Attainable Bit Rate:\tn/a\n",
- (unsigned int)(usBitswap && dsBitswap));
- - }
-
- #if 1 // TR69
- - if(len<=limit)
- - len +=
- - sprintf (buf + len, "\tAnnex: \t\t\t%s\tpsd_mask_qualifier: 0x%04x\n",
- + seq_printf (m, "\tAnnex: \t\t\t%s\tpsd_mask_qualifier: 0x%04x\n",
- tn7dsl_AnnexFromNum(pIhw->AppData.annex_selected),
- pIhw->AppData.psd_mask_qualifier);
-
- // UR8_MERGE_START CQ10979 Jack Zhang
- // UR8_MERGE_START CQ10978 Jack Zhang
- - if(len<=limit)
- - len +=
- - sprintf (buf + len, "\tPower Management Status: L%d\tDS HLINSC: %d\n",
- + seq_printf (m, "\tPower Management Status: L%d\tDS HLINSC: %d\n",
- pIhw->AppData.pwrStatus, pIhw->AppData.dsHLINSC);
- // UR8_MERGE_END CQ10978*
-
- - if(len<=limit)
- - len +=
- - sprintf (buf + len, "\tUS ACTPSD: \t\t%d\tDS ACTPSD: %d\n",
- + seq_printf (m, "\tUS ACTPSD: \t\t%d\tDS ACTPSD: %d\n",
- pIhw->AppData.usACTPSD, pIhw->AppData.dsACTPSD);
-
- - if(len<=limit)
- - len +=
- - sprintf (buf + len, "\tTotal init. errors: \t%d\tTotal init. timeouts: %d\n",
- + seq_printf (m, "\tTotal init. errors: \t%d\tTotal init. timeouts: %d\n",
- pIhw->AppData.totalInitErrs, pIhw->AppData.totalInitTOs);
-
- - if(len<=limit)
- - len +=
- - sprintf (buf + len, "\tShowtime init. errors: \t%d\tShowtime init. timeouts: %d\n",
- + seq_printf (m, "\tShowtime init. errors: \t%d\tShowtime init. timeouts: %d\n",
- pIhw->AppData.showtimeInitErrs, pIhw->AppData.showtimeInitTOs);
-
- - if(len<=limit)
- - len +=
- - sprintf (buf + len, "\tLast showtime init. errors: %d\tLast showtime init. timeouts: %d\n",
- + seq_printf (m, "\tLast showtime init. errors: %d\tLast showtime init. timeouts: %d\n",
- pIhw->AppData.lastshowInitErrs, pIhw->AppData.lastshowInitTOs);
- // UR8_MERGE_END CQ10979*
-
- - if (len<=limit)
- - {
- - len += sprintf(buf+len,"\tATUC ghsVid: ");
- - for (i=0; i<8; i++)
- - len+= sprintf(buf+len, " %02x", pIhw->AppData.ghsATUCVendorId[i]);
- - }
- + seq_printf(m,"\tATUC ghsVid: ");
- + for (i=0; i<8; i++)
- + seq_printf(m, " %02x", pIhw->AppData.ghsATUCVendorId[i]);
-
- - if (len<=limit)
- - {
- - len += sprintf (buf + len, "\n");
- - }
- + seq_printf (m, "\n");
-
- - if (len <= limit)
- - {
- - len +=
- - sprintf (buf + len,
- + seq_printf (m,
- "\tT1413Vid: %02x %02x\t\tT1413Rev: %02x\t\tVendorRev: %02x\n",
- pIhw->AppData.t1413ATUC.VendorId[0],
- pIhw->AppData.t1413ATUC.VendorId[1],
- pIhw->AppData.t1413ATUC.t1413Revision,
- pIhw->AppData.t1413ATUC.VendorRevision);
- - }
-
- - if (len<=limit)
- - {
- - len += sprintf(buf+len,"\tATUR ghsVid: ");
- - for (i=0; i<8; i++)
- - len+= sprintf(buf+len, " %02x", pIhw->AppData.ghsATURVendorId[i]);
- - }
- + seq_printf(m,"\tATUR ghsVid: ");
- + for (i=0; i<8; i++)
- + seq_printf(m, " %02x", pIhw->AppData.ghsATURVendorId[i]);
-
- - if (len<=limit)
- - {
- - len += sprintf (buf + len, "\n");
- - }
- + seq_printf (m, "\n");
-
- - if (len <= limit)
- - {
- - len +=
- - sprintf (buf + len,
- + seq_printf (m,
- "\tT1413Vid: %02x %02x\tT1413Rev: %02x\tVendorRev: %02x\n",
- pIhw->AppData.t1413ATUR.VendorId[0],
- pIhw->AppData.t1413ATUR.VendorId[1],
- pIhw->AppData.t1413ATUR.t1413Revision,
- pIhw->AppData.t1413ATUR.VendorRevision);
- - }
-
- #ifdef AR7_EFM
- - if (len <= limit)
- - {
- - len += sprintf(buf + len, "\tTC Mode: %s\n",
- + seq_printf(m, "\tTC Mode: %s\n",
- (priv->curr_TC_mode == TC_MODE_PTM) ? "PTM" : "ATM");
- - }
- #endif
-
- #endif
- /*
- * Upstream Interleaved Errors
- */
- - if(len<=limit)
- - len += sprintf(buf+len, "\n\t[Upstream (TX) Interleave path]\n");
- - if(len<=limit)
- - len += sprintf(buf+len, "\tCRC: \t%u\tFEC: \t%u\tNCD: \t%u\n",
- + seq_printf(m, "\n\t[Upstream (TX) Interleave path]\n");
- + seq_printf(m, "\tCRC: \t%u\tFEC: \t%u\tNCD: \t%u\n",
- (unsigned int)pIhw->AppData.usICRC_errors,
- (unsigned int)pIhw->AppData.usIFEC_errors,
- (unsigned int)pIhw->AppData.usINCD_error);
- - if(len<=limit)
- - len += sprintf(buf+len, "\tLCD: \t%u\tHEC: \t%u\n",
- + seq_printf(m, "\tLCD: \t%u\tHEC: \t%u\n",
- (unsigned int)pIhw->AppData.usILCD_errors,
- (unsigned int)pIhw->AppData.usIHEC_errors);
- /*
- * Downstream Interleaved Errors
- */
- - if(len<=limit)
- - len += sprintf(buf+len, "\n\t[Downstream (RX) Interleave path]\n");
- - if(len<=limit)
- - len += sprintf(buf+len, "\tCRC: \t%u\tFEC: \t%u\tNCD: \t%u\n",
- + seq_printf(m, "\n\t[Downstream (RX) Interleave path]\n");
- + seq_printf(m, "\tCRC: \t%u\tFEC: \t%u\tNCD: \t%u\n",
- (unsigned int)pIhw->AppData.dsICRC_errors,
- (unsigned int)pIhw->AppData.dsIFEC_errors,
- (unsigned int)pIhw->AppData.dsINCD_error);
- - if(len<=limit)
- - len += sprintf(buf+len, "\tLCD: \t%u\tHEC: \t%u\n",
- + seq_printf(m, "\tLCD: \t%u\tHEC: \t%u\n",
- (unsigned int)pIhw->AppData.dsILCD_errors,
- (unsigned int)pIhw->AppData.dsIHEC_errors);
- /*
- * Upstream Fast Errors
- */
- - if(len<=limit)
- - len += sprintf(buf+len, "\n\t[Upstream (TX) Fast path]\n");
- - if(len<=limit)
- - len += sprintf(buf+len, "\tCRC: \t%u\tFEC: \t%u\tNCD: \t%u\n",
- + seq_printf(m, "\n\t[Upstream (TX) Fast path]\n");
- + seq_printf(m, "\tCRC: \t%u\tFEC: \t%u\tNCD: \t%u\n",
- (unsigned int)pIhw->AppData.usFCRC_errors,
- (unsigned int)pIhw->AppData.usFFEC_errors,
- (unsigned int)pIhw->AppData.usFNCD_error);
- - if(len<=limit)
- - len += sprintf(buf+len, "\tLCD: \t%u\tHEC: \t%u\n",
- + seq_printf(m, "\tLCD: \t%u\tHEC: \t%u\n",
- (unsigned int)pIhw->AppData.usFLCD_errors,
- (unsigned int)pIhw->AppData.usFHEC_errors);
- /*
- * Downstream Fast Errors
- */
- - if(len<=limit)
- - len += sprintf(buf+len, "\n\t[Downstream (RX) Fast path]\n");
- - if(len<=limit)
- - len += sprintf(buf+len, "\tCRC: \t%u\tFEC: \t%u\tNCD: \t%u\n",
- + seq_printf(m, "\n\t[Downstream (RX) Fast path]\n");
- + seq_printf(m, "\tCRC: \t%u\tFEC: \t%u\tNCD: \t%u\n",
- (unsigned int)pIhw->AppData.dsFCRC_errors,
- (unsigned int)pIhw->AppData.dsFFEC_errors,
- (unsigned int)pIhw->AppData.dsFNCD_error);
- - if(len<=limit)
- - len += sprintf(buf+len, "\tLCD: \t%u\tHEC: \t%u\n",
- - (unsigned int)pIhw->AppData.dsFLCD_errors,
- - (unsigned int)pIhw->AppData.dsFHEC_errors);
- + seq_printf(m, "\tLCD: \t%u\tHEC: \t%u\n",
- + (unsigned int)pIhw->AppData.dsFLCD_errors,
- + (unsigned int)pIhw->AppData.dsFHEC_errors);
-
- /*
- * ATM stats upstream
- */
- - if(len<=limit)
- - len += sprintf(buf+len, "\n[ATM Stats]");
- - if(len<=limit)
- - len += sprintf(buf+len, "\n\t[Upstream/TX]\n");
- - if(len<=limit)
- - len +=
- - sprintf (buf + len, "\tGood Cell Cnt:\t%u\n\tIdle Cell Cnt:\t%u\n\n",
- - (unsigned int) pIhw->AppData.usAtm_count[0] +
- - (unsigned int) pIhw->AppData.usAtm_count[1],
- - (unsigned int) pIhw->AppData.usIdle_count[0] +
- - (unsigned int) pIhw->AppData.usIdle_count[1]);
- + seq_printf(m, "\n[ATM Stats]");
- + seq_printf(m, "\n\t[Upstream/TX]\n");
- + seq_printf (m, "\tGood Cell Cnt:\t%u\n\tIdle Cell Cnt:\t%u\n\n",
- + (unsigned int) pIhw->AppData.usAtm_count[0] +
- + (unsigned int) pIhw->AppData.usAtm_count[1],
- + (unsigned int) pIhw->AppData.usIdle_count[0] +
- + (unsigned int) pIhw->AppData.usIdle_count[1]);
- //UR8_MERGE_START CQ10700 Manjula K
- - if (len <= limit)
- - len +=
- - sprintf (buf + len,
- + seq_printf (m,
- "\tTx Packets Dropped Count:\t%lu\n\tTx Bad Packets Count:\t%lu\n",
- priv->stats.tx_dropped, priv->stats.tx_errors);
- //UR8_MERGE_END CQ10700
- /*
- * ATM stats downstream
- */
- - if(len<=limit)
- - len += sprintf(buf+len, "\n\t[Downstream/RX)]\n");
- - if(len<=limit)
- - len +=
- - sprintf (buf + len,
- - "\tGood Cell Cnt:\t%u\n\tIdle Cell Cnt:\t%u\n\tBad Hec Cell Cnt:\t%u\n",
- - (unsigned int) pIhw->AppData.dsGood_count[0] +
- - (unsigned int) pIhw->AppData.dsGood_count[1],
- - (unsigned int) pIhw->AppData.dsIdle_count[0] +
- - (unsigned int) pIhw->AppData.dsIdle_count[1],
- - (unsigned int) pIhw->AppData.dsBadHec_count[0] +
- - (unsigned int) pIhw->AppData.dsBadHec_count[1]);
- - if(len<=limit)
- - len += sprintf(buf+len, "\tOverflow Dropped Cell Cnt:\t%u\n",
- - (unsigned int) pIhw->AppData.dsOVFDrop_count[0] +
- - (unsigned int) pIhw->AppData.dsOVFDrop_count[1]);
- + seq_printf(m, "\n\t[Downstream/RX)]\n");
- + seq_printf (m,
- + "\tGood Cell Cnt:\t%u\n\tIdle Cell Cnt:\t%u\n\tBad Hec Cell Cnt:\t%u\n",
- + (unsigned int) pIhw->AppData.dsGood_count[0] +
- + (unsigned int) pIhw->AppData.dsGood_count[1],
- + (unsigned int) pIhw->AppData.dsIdle_count[0] +
- + (unsigned int) pIhw->AppData.dsIdle_count[1],
- + (unsigned int) pIhw->AppData.dsBadHec_count[0] +
- + (unsigned int) pIhw->AppData.dsBadHec_count[1]);
- + seq_printf(m, "\tOverflow Dropped Cell Cnt:\t%u\n",
- + (unsigned int) pIhw->AppData.dsOVFDrop_count[0] +
- + (unsigned int) pIhw->AppData.dsOVFDrop_count[1]);
-
- //UR8_MERGE_START CQ10700 Manjula K
- - if (len <= limit)
- - len +=
- - sprintf (buf + len,
- - "\tRx Packets Dropped Count:\t%lu\n\tRx Bad Packets Count:\t%lu\n\n",
- - priv->stats.rx_dropped, priv->stats.rx_errors);
- + seq_printf (m,
- + "\tRx Packets Dropped Count:\t%lu\n\tRx Bad Packets Count:\t%lu\n\n",
- + priv->stats.rx_dropped, priv->stats.rx_errors);
- //UR8_MERGE_END CQ10700
-
- tn7sar_get_stats(pIhw->pOsContext);
- - if(len<=limit)
- - len += sprintf(buf+len, "\n[SAR AAL5 Stats]\n");
- - if(len<=limit)
- - len += sprintf(buf+len, "\tTx PDU's:\t%u\n\tRx PDU's:\t%u\n",
- - sarStat.txPktCnt, sarStat.rxPktCnt);
- - if(len<=limit)
- - len +=
- - sprintf (buf + len, "\tTx Total Bytes:\t%u\n\tRx Total Bytes:\t%u\n",
- - sarStat.txBytes, sarStat.rxBytes);
- - if (len <= limit)
- - len +=
- - sprintf (buf + len,
- - "\tTx Total Error Counts:\t%u\n\tRx Total Error Counts:\t%u\n\n",
- - sarStat.txErrors, sarStat.rxErrors);
- + seq_printf(m, "\n[SAR AAL5 Stats]\n");
- + seq_printf(m, "\tTx PDU's:\t%u\n\tRx PDU's:\t%u\n",
- + sarStat.txPktCnt, sarStat.rxPktCnt);
- + seq_printf (m, "\tTx Total Bytes:\t%u\n\tRx Total Bytes:\t%u\n",
- + sarStat.txBytes, sarStat.rxBytes);
- + seq_printf (m,
- + "\tTx Total Error Counts:\t%u\n\tRx Total Error Counts:\t%u\n\n",
- + sarStat.txErrors, sarStat.rxErrors);
-
- /*
- * oam loopback info
- */
- - if(len<=limit)
- - len += sprintf(buf+len, "\n[OAM Stats]\n");
- + seq_printf(m, "\n[OAM Stats]\n");
-
- tn7sar_get_near_end_loopback_count(&F4count, &F5count);
-
- - if(len<=limit)
- - {
- - len +=
- - sprintf (buf + len,
- - "\tNear End F5 Loop Back Count:\t%u\n\tNear End F4 Loop Back Count:\t%u\n\tFar End F5 Loop Back Count:\t%u\n\tFar End F4 Loop Back Count:\t%u\n",
- + seq_printf (m,
- + "\tNear End F5 Loop Back Count:\t%u\n\tNear End F4 Loop Back Count:\t%u\n\tFar End F5 Loop Back Count:\t%u\n\tFar End F4 Loop Back Count:\t%u\n",
- F5count, F4count, oamFarLBCount[0] + oamFarLBCount[2],
- oamFarLBCount[1] + oamFarLBCount[3]);
- - }
-
- #define USE_OAM_DROP_COUNT //CQ10273
- //Read OAM ping responses count:
- #ifdef USE_OAM_DROP_COUNT
- - if(len<=limit)
- - {
- - /* len +=
- - sprintf (buf + len,
- - "\tSAR OAM Retry in 0x%X cycles, Drop Count=%d\n",
- - tn7dsl_get_memory(0xa30085cc), tn7dsl_get_memory(0xa30085c4)); */
- +/* seq_printf (m,
- + "\tSAR OAM Retry in 0x%X cycles, Drop Count=%d\n",
- + tn7dsl_get_memory(0xa30085cc), tn7dsl_get_memory(0xa30085c4)); */
-
- - len += sprintf (buf + len, "\tSAR OAM Ping Response Drop Count=%d\n",
- - tn7dsl_get_memory(0xa30085b0));
- - }
- + seq_printf (m, "\tSAR OAM Ping Response Drop Count=%d\n",
- + tn7dsl_get_memory(0xa30085b0));
- #endif // USE_OAM_DROP_COUNT
-
- - return len;
- + return 0;
- }
-
- -int tn7dsl_proc_modem(char* buf, char **start, off_t offset, int count,
- - int *eof, void *data)
- +static int tn7dsl_proc_stats_open(struct inode *inode, struct file *file)
- +{
- + return single_open(file, tn7dsl_proc_stats, PDE_DATA(inode));
- +}
- +
- +int tn7dsl_proc_write_stats(struct file *fp, const char * buf, unsigned long count, void * data);
- +
- +struct file_operations tn7dsl_proc_stats_fops = {
- + .owner = THIS_MODULE,
- + .open = tn7dsl_proc_stats_open,
- + .read = seq_read,
- + .llseek = seq_lseek,
- + .release = single_release,
- + .write = tn7dsl_proc_write_stats,
- +};
- +
- +static int tn7dsl_proc_modem(struct seq_file *m, void *data)
- {
- #ifdef AR7_EFM
- extern int tn7efm_get_currTCmode(void);
- #endif
- - int len = 0;
- - int limit = count - 80;
- char *state;
- int tag;
-
- @@ -1923,22 +1836,31 @@ extern int tn7efm_get_currTCmode(void);
-
- if(pIhw->lConnected == 1)
- state = "SHOWTIME";
- - if(len<=limit)
- - len += sprintf(buf+len,"%s\n",state);
- - if(len<=limit)
- - len += sprintf(buf+len, "%d\n", dslReg);
- - if(len<=limit)
- - len += sprintf(buf+len, "failTrains=%d\n", pIhw->AppData.trainFails);
- + seq_printf(m,"%s\n",state);
- + seq_printf(m, "%d\n", dslReg);
- + seq_printf(m, "failTrains=%d\n", pIhw->AppData.trainFails);
-
- #ifdef AR7_EFM
- - if (len<=limit)
- - len += sprintf(buf+len, "TCMODE=%s\n",
- - tn7efm_get_currTCmode()== TC_MODE_PTM ? "EFM" : "ATM");
- + seq_printf(m, "TCMODE=%s\n",
- + tn7efm_get_currTCmode()== TC_MODE_PTM ? "EFM" : "ATM");
- #endif
-
- - return len;
- + return 0;
- +}
- +
- +static int tn7dsl_proc_modem_open(struct inode *inode, struct file *file)
- +{
- + return single_open(file, tn7dsl_proc_modem, PDE_DATA(inode));
- }
-
- +struct file_operations tn7dsl_proc_modem_fops = {
- + .owner = THIS_MODULE,
- + .open = tn7dsl_proc_modem_open,
- + .read = seq_read,
- + .llseek = seq_lseek,
- + .release = single_release,
- +};
- +
- /**********************************************************************
- ** *
- ** tn7dsl_hdlc_update_crc() -- Calculate CRC *
- @@ -2203,11 +2125,8 @@ static int tn7dsl_hdlc_rx_process(unsign
- return(ret);
- }
-
- -int tn7dsl_proc_eoc (char *buf, char **start, off_t OffSet, int count,
- - int *eof, void *data)
- +static int tn7dsl_proc_eoc (struct seq_file *m, void *data)
- {
- - int len = 0;
- - int limit = count - 80;
- int offset[2] = {34, 0}; // point to buffer parameter data structure
- clearEocParm_t peoc;
-
- @@ -2216,62 +2135,49 @@ int tn7dsl_proc_eoc (char *buf, char **s
- (unsigned char *) &peoc,
- sizeof (clearEocParm_t));
-
- - if (len <= limit)
- - len += sprintf(buf+len, "\nClear EOC Channel:\n\n");
- - if (len <= limit)
- - len += sprintf(buf+len, " Enabled:\t%d\n", dslhal_support_byteSwap32(peoc.clearEocEnabled));
- - if (len <= limit)
- - len += sprintf(buf+len, " TxBuf[0]:\t0x%08x\n", dslhal_support_byteSwap32((unsigned int)peoc.pTxBufDesc[0]));
- - if (len <= limit)
- - len += sprintf(buf+len, " TxBuf[1]:\t0x%08x\n", dslhal_support_byteSwap32((unsigned int)peoc.pTxBufDesc[1]));
- - if (len <= limit)
- - len += sprintf(buf+len, " TxBuf[2]:\t0x%08x\n", dslhal_support_byteSwap32((unsigned int)peoc.pTxBufDesc[2]));
- - if (len <= limit)
- - len += sprintf(buf+len, " TxBuf[3]:\t0x%08x\n", dslhal_support_byteSwap32((unsigned int)peoc.pTxBufDesc[3]));
- - if (len <= limit)
- - len += sprintf(buf+len, " RxBuf[0]:\t0x%08x\n", dslhal_support_byteSwap32((unsigned int)peoc.pRxBufDesc[0]));
- - if (len <= limit)
- - len += sprintf(buf+len, " RxBuf[1]:\t0x%08x\n", dslhal_support_byteSwap32((unsigned int)peoc.pRxBufDesc[1]));
- - if (len <= limit)
- - len += sprintf(buf+len, " RxBuf[2]:\t0x%08x\n", dslhal_support_byteSwap32((unsigned int)peoc.pRxBufDesc[2]));
- - if (len <= limit)
- - len += sprintf(buf+len, " RxBuf[3]:\t0x%08x\n", dslhal_support_byteSwap32((unsigned int)peoc.pRxBufDesc[3]));
- - if (len <= limit)
- - len += sprintf(buf+len, " txRdIndex:\t%d\n", dslhal_support_byteSwap32(peoc.txRdIndex));
- - if (len <= limit)
- - len += sprintf(buf+len, " txWrIndex:\t%d\n", dslhal_support_byteSwap32(peoc.txWrIndex));
- - if (len <= limit)
- - len += sprintf(buf+len, " rxRdIndex:\t%d\n", dslhal_support_byteSwap32(peoc.rxRdIndex));
- - if (len <= limit)
- - len += sprintf(buf+len, " rxWrIndex:\t%d\n\n", dslhal_support_byteSwap32(peoc.rxWrIndex));
- - if (len <= limit)
- - len += sprintf(buf+len, " TotalTxPkts:\t%d\n", EocTxTotalPackets);
- - if (len <= limit)
- - len += sprintf(buf+len, " TotalRxPkts:\t%d\n", EocRxTotalPackets);
- - if (len <= limit)
- - len += sprintf(buf+len, " TotalTxBytes:\t%d\n", EocTxTotalBytes);
- - if (len <= limit)
- - len += sprintf(buf+len, " TotalRxBytes:\t%d\n\n", EocRxTotalBytes);
- - if (len <= limit)
- - len += sprintf(buf+len, " ErrBufFull:\t%d\n", ErrEocBufFull);
- - if (len <= limit)
- - len += sprintf(buf+len, " ErrBufIndx:\t%d\n", ErrEocBufIndex);
- - if (len <= limit)
- - len += sprintf(buf+len, " ErrBufMax:\t%d\n", ErrEocBufMax);
- - if (len <= limit)
- - len += sprintf(buf+len, " ErrMsgMax:\t%d\n", ErrEocMsgOversized);
- - if (len <= limit)
- - len += sprintf(buf+len, " ErrTxHDLC:\t%d\n", ErrEocTxHdlcCRC);
- - if (len <= limit)
- - len += sprintf(buf+len, " ErrRxHDLC:\t%d\n", ErrEocRxHdlcCRC);
- - if (len <= limit)
- - len += sprintf(buf+len, " ErrRxSnmp:\t%d\n", ErrEocRxHdlcFraming);
- - if (len <= limit)
- - len += sprintf(buf+len, " ErrRxPush:\t%d\n\n", ErrEocRxPush);
- + seq_printf(m, "\nClear EOC Channel:\n\n");
- + seq_printf(m, " Enabled:\t%d\n", dslhal_support_byteSwap32(peoc.clearEocEnabled));
- + seq_printf(m, " TxBuf[0]:\t0x%08x\n", dslhal_support_byteSwap32((unsigned int)peoc.pTxBufDesc[0]));
- + seq_printf(m, " TxBuf[1]:\t0x%08x\n", dslhal_support_byteSwap32((unsigned int)peoc.pTxBufDesc[1]));
- + seq_printf(m, " TxBuf[2]:\t0x%08x\n", dslhal_support_byteSwap32((unsigned int)peoc.pTxBufDesc[2]));
- + seq_printf(m, " TxBuf[3]:\t0x%08x\n", dslhal_support_byteSwap32((unsigned int)peoc.pTxBufDesc[3]));
- + seq_printf(m, " RxBuf[0]:\t0x%08x\n", dslhal_support_byteSwap32((unsigned int)peoc.pRxBufDesc[0]));
- + seq_printf(m, " RxBuf[1]:\t0x%08x\n", dslhal_support_byteSwap32((unsigned int)peoc.pRxBufDesc[1]));
- + seq_printf(m, " RxBuf[2]:\t0x%08x\n", dslhal_support_byteSwap32((unsigned int)peoc.pRxBufDesc[2]));
- + seq_printf(m, " RxBuf[3]:\t0x%08x\n", dslhal_support_byteSwap32((unsigned int)peoc.pRxBufDesc[3]));
- + seq_printf(m, " txRdIndex:\t%d\n", dslhal_support_byteSwap32(peoc.txRdIndex));
- + seq_printf(m, " txWrIndex:\t%d\n", dslhal_support_byteSwap32(peoc.txWrIndex));
- + seq_printf(m, " rxRdIndex:\t%d\n", dslhal_support_byteSwap32(peoc.rxRdIndex));
- + seq_printf(m, " rxWrIndex:\t%d\n\n", dslhal_support_byteSwap32(peoc.rxWrIndex));
- + seq_printf(m, " TotalTxPkts:\t%d\n", EocTxTotalPackets);
- + seq_printf(m, " TotalRxPkts:\t%d\n", EocRxTotalPackets);
- + seq_printf(m, " TotalTxBytes:\t%d\n", EocTxTotalBytes);
- + seq_printf(m, " TotalRxBytes:\t%d\n\n", EocRxTotalBytes);
- + seq_printf(m, " ErrBufFull:\t%d\n", ErrEocBufFull);
- + seq_printf(m, " ErrBufIndx:\t%d\n", ErrEocBufIndex);
- + seq_printf(m, " ErrBufMax:\t%d\n", ErrEocBufMax);
- + seq_printf(m, " ErrMsgMax:\t%d\n", ErrEocMsgOversized);
- + seq_printf(m, " ErrTxHDLC:\t%d\n", ErrEocTxHdlcCRC);
- + seq_printf(m, " ErrRxHDLC:\t%d\n", ErrEocRxHdlcCRC);
- + seq_printf(m, " ErrRxSnmp:\t%d\n", ErrEocRxHdlcFraming);
- + seq_printf(m, " ErrRxPush:\t%d\n\n", ErrEocRxPush);
-
- - return len;
- + return 0;
- +}
- +
- +static int tn7dsl_proc_eoc_open(struct inode *inode, struct file *file)
- +{
- + return single_open(file, tn7dsl_proc_eoc, PDE_DATA(inode));
- }
-
- +struct file_operations tn7dsl_proc_eoc_fops = {
- + .owner = THIS_MODULE,
- + .open = tn7dsl_proc_eoc_open,
- + .read = seq_read,
- + .llseek = seq_lseek,
- + .release = single_release,
- +};
- +
- int tn7dsl_clear_eoc_setup(void)
- {
- int i;
- @@ -4624,14 +4530,10 @@ int tn7dsl_proc_write_stats (struct file
- }
-
-
- -int tn7dsl_proc_train_mode_export (char *buf, char **start, off_t offset,
- - int count, int *eof, void *data)
- +static int tn7dsl_proc_train_mode_export (struct seq_file *m, void *data)
- {
-
- - int len = 0;
- - char *cp = buf + offset;
- int i = 0;
- - static int ctr = 0;
-
- typedef struct
- {
- @@ -4712,197 +4614,185 @@ int tn7dsl_proc_train_mode_export (char
- }
-
-
- - if(len <= count)
- + for (i = 0; (i < num_entries) ; i++)
- {
- - for (i = ctr; ((i < num_entries)&& (len <= count)) ; i++)
- - {
- - /*
- - * Write the current string only if we can fit it into the buffer
- - */
- - if((strlen(dsl_modes[i].mode_name) + 6 + len) <= count)
- - {
- - len += snprintf(cp+len, (count - len), "%s\t\t\t%#x\n",
- - dsl_modes[i].mode_name, dsl_modes[i].mode_value);
- - }
- - else
- - break;
- - }
- + seq_printf(m, "%s\t\t\t%#x\n",
- + dsl_modes[i].mode_name, dsl_modes[i].mode_value);
- }
-
- - /*
- - * Data was completely written
- - */
- - if (i >= num_entries)
- - {
- - /*
- - * We are done with this
- - */
- - *eof = 1;
- - ctr = 0;
- - }
- - else
- - {
- - /*
- - * We have not been able to write the complete data, and we have to nul
- - * terminate the buffer.
- - */
- - *(cp + len) = '\0';
- -
- - /*
- - * Save the value of the counter for the next read for the rest of the
- - * data.
- - */
- - ctr = i;
- - }
- -
- - return len;
- + return 0;
- }
-
- -#ifndef NO_ADV_STATS
- -int tn7dsl_proc_SNRpsds(char* buf, char **start, off_t offset, int count,int *eof, void *data)
- +static int tn7dsl_proc_train_mode_export_open(struct inode *inode, struct file *file)
- {
- - int len = 0;
- -
- + return single_open(file, tn7dsl_proc_train_mode_export, PDE_DATA(inode));
- +}
-
- +struct file_operations tn7dsl_proc_train_mode_export_fops = {
- + .owner = THIS_MODULE,
- + .open = tn7dsl_proc_train_mode_export_open,
- + .read = seq_read,
- + .llseek = seq_lseek,
- + .release = single_release,
- +};
-
- - int limit = count - 80;
- +#ifndef NO_ADV_STATS
- +int tn7dsl_proc_SNRpsds(struct seq_file *m, void *data)
- +{
- int i;
- unsigned char SNRpsds[512];
-
- - if(len<=limit)
- - len += sprintf(buf+len, "\nAR7 SNRpsds:");
- + seq_printf(m, "\nAR7 SNRpsds:");
-
- if (dslhal_api_getSNRpsds(pIhw, SNRpsds, 1))
- {
- dgprintf(4, "dslhal_api_getSNRpsds failed!\n");
- - return len;
- + return -EIO;
- }
-
- for (i=0; i<pIhw->AppData.max_ds_tones; i++)
- {
- if (!(i%16))
- {
- - if(len <=limit)
- - len += sprintf(buf+len, "\n");
- + seq_printf(m, "\n");
- }
-
- - if(len <=limit)
- - len += sprintf(buf+len, "%d ", (unsigned char)SNRpsds[i]);
- + seq_printf(m, "%d ", (unsigned char)SNRpsds[i]);
- }
-
- - if(len <=limit)
- - len += sprintf(buf+len, "\n");
- + seq_printf(m, "\n");
-
-
-
- - return len;
- + return 0;
- +}
- +
- +static int tn7dsl_proc_SNRpsds_open(struct inode *inode, struct file *file)
- +{
- + return single_open(file, tn7dsl_proc_SNRpsds, PDE_DATA(inode));
- }
-
- +struct file_operations tn7dsl_proc_SNRpsds_fops = {
- + .owner = THIS_MODULE,
- + .open = tn7dsl_proc_SNRpsds_open,
- + .read = seq_read,
- + .llseek = seq_lseek,
- + .release = single_release,
- +};
- +
- #endif
-
- #ifndef NO_ADV_STATS
- -int tn7dsl_proc_QLNpsds(char* buf, char **start, off_t offset, int count,int *eof, void *data)
- +static int tn7dsl_proc_QLNpsds(struct seq_file *m, void *data)
- {
- - int len = 0;
- -
- - int limit = count - 80;
- unsigned char QLNpsds[512];
- int i;
-
- - if(len<=limit)
- - len += sprintf(buf+len, "\nAR7 QLNpsds:");
- + seq_printf(m, "\nAR7 QLNpsds:");
-
- // call API instead of access internal buf directly
- if (dslhal_api_getQLNpsds(pIhw, QLNpsds, 0))
- {
- dgprintf(4, "dslhal_api_getQLNpsds failed!\n");
- - return len;
- + return -EIO;
- }
-
- for (i=0; i<pIhw->AppData.max_ds_tones; i++)
- {
- if (!(i%16))
- {
- - if(len <=limit)
- - len += sprintf(buf+len, "\n");
- + seq_printf(m, "\n");
- }
-
- - if(len <=limit)
- - len += sprintf(buf+len, "%d ", (unsigned char)QLNpsds[i]);
- + seq_printf(m, "%d ", (unsigned char)QLNpsds[i]);
- }
-
- - if(len <=limit)
- - len += sprintf(buf+len, "\n");
- + seq_printf(m, "\n");
-
-
- - return len;
- + return 0;
- }
- +
- +static int tn7dsl_proc_QLNpsds_open(struct inode *inode, struct file *file)
- +{
- + return single_open(file, tn7dsl_proc_QLNpsds, PDE_DATA(inode));
- +}
- +
- +struct file_operations tn7dsl_proc_QLNpsds_fops = {
- + .owner = THIS_MODULE,
- + .open = tn7dsl_proc_QLNpsds_open,
- + .read = seq_read,
- + .llseek = seq_lseek,
- + .release = single_release,
- +};
- +
- #endif
-
- // UR8_MERGE_START CQ10979 Jack Zhang
- #ifdef TR69_HLIN_IN
- #ifndef NO_ADV_STATS
- -int tn7dsl_proc_HLINpsds(char* buf, char **start, off_t offset, int count,int *eof, void *data)
- +static int tn7dsl_proc_HLINpsds(struct seq_file *m, void *data)
- {
- - int len = 0;
- -
- - int limit = count - 80;
- short HLINpsds[2*512];
- int i;
-
- - if(len<=limit)
- - len += sprintf(buf+len, "\nAR7 HLINpsds:");
- + seq_printf(m, "\nAR7 HLINpsds:");
-
- // call API instead of access internal buf directly
- if (dslhal_api_getHLINpsds(pIhw, (unsigned char *)HLINpsds, 1))
- {
- dgprintf(4, "dslhal_api_getHLINpsds failed!\n");
- - return len;
- + return -EIO;
- }
-
- for (i=0; i<pIhw->AppData.max_ds_tones; i++)
- {
- if (!(i%8))
- {
- - if(len <=limit)
- - len += sprintf(buf+len, "\n");
- + seq_printf(m, "\n");
- }
-
- - if(len <=limit)
- - len += sprintf(buf+len, "(%d,%d) ", HLINpsds[2*i], HLINpsds[2*i+1]);
- + seq_printf(m, "(%d,%d) ", HLINpsds[2*i], HLINpsds[2*i+1]);
- }
-
- - if(len <=limit)
- - len += sprintf(buf+len, "\n");
- + seq_printf(m, "\n");
-
-
- - return len;
- + return 0;
- }
-
- -static int tn7dsl_proc_HLINpsdsIndx(char* buf, char **start, off_t offset, int count,int *eof, void *data, int indx)
- +static int tn7dsl_proc_HLINpsds_open(struct inode *inode, struct file *file)
- {
- - int len = 0;
- + return single_open(file, tn7dsl_proc_HLINpsds, PDE_DATA(inode));
- +}
-
- - int limit = count - 80;
- +struct file_operations tn7dsl_proc_HLINpsds_fops = {
- + .owner = THIS_MODULE,
- + .open = tn7dsl_proc_HLINpsds_open,
- + .read = seq_read,
- + .llseek = seq_lseek,
- + .release = single_release,
- +};
- +
- +static int tn7dsl_proc_HLINpsdsIndx(struct seq_file *m, void *data, int indx)
- +{
- short HLINpsds[2*512];
- int i;
- int start=0, dim=128;
-
- - if(len<=limit)
- - len += sprintf(buf+len, "\nAR7 HLINpsds: (section %d)", indx);
- + seq_printf(m, "\nAR7 HLINpsds: (section %d)", indx);
-
- if((indx > 2) && (pIhw->AppData.max_ds_tones <= 256))
- {
- - if(len <=limit)
- - len += sprintf(buf+len, "\n[End of data]");
- - return len;
- + seq_printf(m, "\n[End of data]");
- + return 0;
- }
-
- // call API instead of access internal buf directly
- if (dslhal_api_getHLINpsds(pIhw, (unsigned char *)HLINpsds, 1))
- {
- dgprintf(4, "dslhal_api_getHLINpsds failed!\n");
- - return len;
- + return -1;
- }
-
- start = (indx -1) * 128;
- @@ -4911,39 +4801,89 @@ static int tn7dsl_proc_HLINpsdsIndx(char
- {
- if (!(i%8))
- {
- - if(len <=limit)
- - len += sprintf(buf+len, "\n%d: ", i);
- + seq_printf(m, "\n%d: ", i);
- }
-
- - if(len <=limit)
- - len += sprintf(buf+len, "(%d,%d) ", HLINpsds[2*i], HLINpsds[2*i+1]);
- + seq_printf(m, "(%d,%d) ", HLINpsds[2*i], HLINpsds[2*i+1]);
- }
-
- - if(len <=limit)
- - len += sprintf(buf+len, "\n");
- + seq_printf(m, "\n");
-
- - return len;
- + return 0;
- +}
- +
- +static int tn7dsl_proc_HLINpsds1(struct seq_file *m, void *data)
- +{
- + return tn7dsl_proc_HLINpsdsIndx(m, data, 1);
- +}
- +
- +static int tn7dsl_proc_HLINpsds2(struct seq_file *m, void *data)
- +{
- + return tn7dsl_proc_HLINpsdsIndx(m, data, 2);
- +}
- +
- +static int tn7dsl_proc_HLINpsds3(struct seq_file *m, void *data)
- +{
- + return tn7dsl_proc_HLINpsdsIndx(m, data, 3);
- +}
- +
- +static int tn7dsl_proc_HLINpsds4(struct seq_file *m, void *data)
- +{
- + return tn7dsl_proc_HLINpsdsIndx(m, data, 4);
- }
-
- -int tn7dsl_proc_HLINpsds1(char* buf, char **start, off_t offset, int count,int *eof, void *data)
- +static int tn7dsl_proc_HLINpsds1_open(struct inode *inode, struct file *file)
- {
- - return tn7dsl_proc_HLINpsdsIndx(buf, start, offset, count,eof, data, 1);
- + return single_open(file, tn7dsl_proc_HLINpsds1, PDE_DATA(inode));
- }
-
- -int tn7dsl_proc_HLINpsds2(char* buf, char **start, off_t offset, int count,int *eof, void *data)
- +static int tn7dsl_proc_HLINpsds2_open(struct inode *inode, struct file *file)
- {
- - return tn7dsl_proc_HLINpsdsIndx(buf, start, offset, count,eof, data, 2);
- + return single_open(file, tn7dsl_proc_HLINpsds2, PDE_DATA(inode));
- }
-
- -int tn7dsl_proc_HLINpsds3(char* buf, char **start, off_t offset, int count,int *eof, void *data)
- +static int tn7dsl_proc_HLINpsds3_open(struct inode *inode, struct file *file)
- {
- - return tn7dsl_proc_HLINpsdsIndx(buf, start, offset, count,eof, data, 3);
- + return single_open(file, tn7dsl_proc_HLINpsds3, PDE_DATA(inode));
- }
-
- -int tn7dsl_proc_HLINpsds4(char* buf, char **start, off_t offset, int count,int *eof, void *data)
- +static int tn7dsl_proc_HLINpsds4_open(struct inode *inode, struct file *file)
- {
- - return tn7dsl_proc_HLINpsdsIndx(buf, start, offset, count,eof, data, 4);
- + return single_open(file, tn7dsl_proc_HLINpsds4, PDE_DATA(inode));
- }
- +
- +struct file_operations tn7dsl_proc_HLINpsds1_fops = {
- + .owner = THIS_MODULE,
- + .open = tn7dsl_proc_HLINpsds1_open,
- + .read = seq_read,
- + .llseek = seq_lseek,
- + .release = single_release,
- +};
- +
- +struct file_operations tn7dsl_proc_HLINpsds2_fops = {
- + .owner = THIS_MODULE,
- + .open = tn7dsl_proc_HLINpsds2_open,
- + .read = seq_read,
- + .llseek = seq_lseek,
- + .release = single_release,
- +};
- +
- +struct file_operations tn7dsl_proc_HLINpsds3_fops = {
- + .owner = THIS_MODULE,
- + .open = tn7dsl_proc_HLINpsds3_open,
- + .read = seq_read,
- + .llseek = seq_lseek,
- + .release = single_release,
- +};
- +
- +struct file_operations tn7dsl_proc_HLINpsds4_fops = {
- + .owner = THIS_MODULE,
- + .open = tn7dsl_proc_HLINpsds4_open,
- + .read = seq_read,
- + .llseek = seq_lseek,
- + .release = single_release,
- +};
- +
- #endif
- #endif //TR69_HLIN_IN
- // UR8_MERGE_END CQ10979*
- @@ -4951,64 +4891,48 @@ int tn7dsl_proc_HLINpsds4(char* buf, cha
- // * UR8_MERGE_START CQ11057 Jack Zhang
- #ifdef TR69_PMD_IN
- #ifndef NO_ADV_STATS
- -int tn7dsl_proc_PMDus(char* buf, char **start, off_t offset, int count,int *eof, void *data)
- +static int tn7dsl_proc_PMDus(struct seq_file *m, void *data)
- {
- - int len = 0;
- -
- - int limit = count - 80;
- int i;
- CoPMDTestParams_t co_pmdtest_params;
-
- - if(len<=limit)
- - len += sprintf(buf+len, "\nAR7 US PMD Test:\n");
- + seq_printf(m, "\nAR7 US PMD Test:\n");
-
- // call API instead of access internal buf directly
- if (dslhal_api_getPMDTestus(pIhw, &co_pmdtest_params, 0) != DSLHAL_ERROR_NO_ERRORS)
- {
- dgprintf(4, "dslhal_api_getPMDTestus failed!\n");
- - return len;
- + return -EIO;
- }
-
- - if(len<=limit)
- - len += sprintf(buf+len, "LATN=%d\n", co_pmdtest_params.co_latn);
- + seq_printf(m, "LATN=%d\n", co_pmdtest_params.co_latn);
-
- - if(len<=limit)
- - len += sprintf(buf+len, "SATN=%d\n", co_pmdtest_params.co_satn);
- + seq_printf(m, "SATN=%d\n", co_pmdtest_params.co_satn);
-
- - if(len<=limit)
- - len += sprintf(buf+len, "SNRM=%d\n", co_pmdtest_params.usMargin);
- + seq_printf(m, "SNRM=%d\n", co_pmdtest_params.usMargin);
-
- - if(len<=limit)
- - len += sprintf(buf+len, "attndr=%ld\n", co_pmdtest_params.co_attndr);
- + seq_printf(m, "attndr=%ld\n", co_pmdtest_params.co_attndr);
-
- - if(len<=limit)
- - len += sprintf(buf+len, "NearActatp=%d\n", co_pmdtest_params.co_near_actatp);
- + seq_printf(m, "NearActatp=%d\n", co_pmdtest_params.co_near_actatp);
-
- - if(len<=limit)
- - len += sprintf(buf+len, "FarActatp=%d\n", co_pmdtest_params.co_far_actatp);
- + seq_printf(m, "FarActatp=%d\n", co_pmdtest_params.co_far_actatp);
-
- //HLOG
- for (i=0; i<pIhw->AppData.max_us_tones; i++)
- {
- if (!(i%16))
- - {
- - if(len <=limit)
- - len += sprintf(buf+len, "\nHLOG(%3d):", i);
- - }
- - if(len <=limit)
- - len += sprintf(buf+len, " %d", co_pmdtest_params.TestParmCOHlogfMsg[i]);
- + seq_printf(m, "\nHLOG(%3d):", i);
- +
- + seq_printf(m, " %d", co_pmdtest_params.TestParmCOHlogfMsg[i]);
- }
-
- //QLN
- for (i=0; i<pIhw->AppData.max_us_tones; i++)
- {
- if (!(i%16))
- - {
- - if(len <=limit)
- - len += sprintf(buf+len, "\nQLN(%3d):", i);
- - }
- - if(len <=limit)
- - len += sprintf(buf+len, " %d", co_pmdtest_params.TestParmCOQLNfMsg[i]);
- + seq_printf(m, "\nQLN(%3d):", i);
- +
- + seq_printf(m, " %d", co_pmdtest_params.TestParmCOQLNfMsg[i]);
-
- }
-
- @@ -5016,19 +4940,28 @@ int tn7dsl_proc_PMDus(char* buf, char **
- for (i=0; i<pIhw->AppData.max_us_tones; i++)
- {
- if (!(i%16))
- - {
- - if(len <=limit)
- - len += sprintf(buf+len, "\nSNR(%3d):", i);
- - }
- - if(len <=limit)
- - len += sprintf(buf+len, " %d", co_pmdtest_params.TestParmCOSNRfMsg[i]);
- + seq_printf(m, "\nSNR(%3d):", i);
- + seq_printf(m, " %d", co_pmdtest_params.TestParmCOSNRfMsg[i]);
- }
-
- - if(len <=limit)
- - len += sprintf(buf+len, "\n");
- + seq_printf(m, "\n");
-
- - return len;
- + return 0;
- +}
- +
- +static int tn7dsl_proc_PMDus_open(struct inode *inode, struct file *file)
- +{
- + return single_open(file, tn7dsl_proc_PMDus, PDE_DATA(inode));
- }
- +
- +struct file_operations tn7dsl_proc_PMDus_fops = {
- + .owner = THIS_MODULE,
- + .open = tn7dsl_proc_PMDus_open,
- + .read = seq_read,
- + .llseek = seq_lseek,
- + .release = single_release,
- +};
- +
- #endif //NO_ADV_STATS
- #endif //TR69_PMD_IN
- // * UR8_MERGE_END CQ11057 *
- --- a/tn7sar.c
- +++ b/tn7sar.c
- @@ -1553,44 +1553,70 @@ int tn7sar_oam_generation(void *privCont
- return 0;
- }
-
- -int tn7sar_proc_oam_ping(char* buf, char **start, off_t offset, int count,int *eof, void *data)
- +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
- +#define PDE_DATA(inode) PDE(inode)->data
- +#endif
- +
- +static int tn7sar_proc_oam_ping(struct seq_file *m, void *data)
- {
- - int len = 0;
- unsigned int oam_ps = oamPingStatus;
-
- if( oam_ps == OAM_PING_PENDING_RECVD )
- oam_ps = OAM_PING_PENDING; //jz CQ9861: Only export the PENDING status, not internal state
-
- - len += sprintf(buf+len, "%d\n", oam_ps); //oamPingStatus);
- + seq_printf(m, "%d\n", oam_ps); //oamPingStatus);
-
- - return len;
- + return 0;
- }
-
- -int tn7sar_proc_pvc_table(char* buf, char **start, off_t offset, int count,int *eof, void *data)
- +static int tn7sar_proc_oam_ping_open(struct inode *inode, struct file *file)
- +{
- + return single_open(file, tn7sar_proc_oam_ping, PDE_DATA(inode));
- +}
- +
- +struct file_operations tn7sar_proc_oam_ping_fops = {
- + .owner = THIS_MODULE,
- + .open = tn7sar_proc_oam_ping_open,
- + .read = seq_read,
- + .llseek = seq_lseek,
- + .release = single_release,
- +};
- +
- +
- +static int tn7sar_proc_pvc_table(struct seq_file *m, void *data)
- {
- - int len = 0;
- int i;
-
- for(i=0;i<16;i++)
- {
- if(pvc_result[i].bInUse)
- {
- - len += sprintf(buf+len, "%d,%d\n", pvc_result[i].vpi,pvc_result[i].vci);
- + seq_printf(m, "%d,%d\n", pvc_result[i].vpi,pvc_result[i].vci);
- }
- else
- {
- - len += sprintf(buf+len, "0,0\n");
- + seq_printf(m, "0,0\n");
- }
- }
- - return len;
- + return 0;
- +}
- +
- +static int tn7sar_proc_pvc_table_open(struct inode *inode, struct file *file)
- +{
- + return single_open(file, tn7sar_proc_pvc_table, PDE_DATA(inode));
- }
-
- +struct file_operations tn7sar_proc_pvc_table_fops = {
- + .owner = THIS_MODULE,
- + .open = tn7sar_proc_pvc_table_open,
- + .read = seq_read,
- + .llseek = seq_lseek,
- + .release = single_release,
- +};
-
-
- -int tn7sar_proc_sar_stat(char* buf, char **start, off_t offset, int count,int *eof, void *data)
- +static int tn7sar_proc_sar_stat(struct seq_file *m, void *data)
- {
- - int len = 0;
- - int limit = count - 80;
- struct atm_dev *dev;
- Tn7AtmPrivate *priv;
- int i, j, k;
- @@ -1599,21 +1625,19 @@ int tn7sar_proc_sar_stat(char* buf, char
- unsigned int *pStateBase, *pSarStat;
- HAL_FUNCTIONS *pHalFunc;
- HAL_DEVICE *pHalDev;
- - int dBytes;
-
- - dev = (struct atm_dev *)data;
- + dev = (struct atm_dev *)m->private;
- priv = (Tn7AtmPrivate *)dev->dev_data;
-
- pHalFunc = (HAL_FUNCTIONS *)priv->pSarHalFunc;
- pHalDev = (HAL_DEVICE *)priv->pSarHalDev;
-
- - len += sprintf(buf+len, "SAR HAL Statistics");
- + seq_printf(m, "SAR HAL Statistics");
- for(i=0;i<MAX_DMA_CHAN;i++)
- {
- if(priv->lut[i].inuse)
- {
- - if(len<=limit)
- - len += sprintf(buf+len, "\nChannel %d:\n",priv->lut[i].chanid);
- + seq_printf(m, "\nChannel %d:\n",priv->lut[i].chanid);
- k=0;
- for(j=0;j<4;j++)
- {
- @@ -1626,26 +1650,16 @@ int tn7sar_proc_sar_stat(char* buf, char
- {
- if((char *)*pSarStat == NULL)
- break;
- - if(len<=limit)
- - {
- - dBytes = sprintf(buf+len, "%s: ",(char *) *pSarStat);
- - len += dBytes;
- - k += dBytes;
- - }
- +
- + k += seq_printf(m, "%s: ",(char *) *pSarStat);
- pSarStat++;
- - if(len<=limit)
- - {
- - dBytes = sprintf(buf+len, "%s; \n",(char *) *pSarStat);
- - len += dBytes;
- - k += dBytes;
- - }
- + k += seq_printf(m, "%s; \n",(char *) *pSarStat);
- pSarStat++;
-
- if(k > 60)
- {
- k=0;
- - if(len<=limit)
- - len += sprintf(buf+len, "\n");
- + seq_printf(m, "\n");
- }
- }
-
- @@ -1654,9 +1668,22 @@ int tn7sar_proc_sar_stat(char* buf, char
- }
- }
-
- - return len;
- + return 0;
- }
-
- +static int tn7sar_proc_sar_stat_open(struct inode *inode, struct file *file)
- +{
- + return single_open(file, tn7sar_proc_sar_stat, PDE_DATA(inode));
- +}
- +
- +struct file_operations tn7sar_proc_sar_stat_fops = {
- + .owner = THIS_MODULE,
- + .open = tn7sar_proc_sar_stat_open,
- + .read = seq_read,
- + .llseek = seq_lseek,
- + .release = single_release,
- +};
- +
- #ifdef AR7_EFM
- void tn7sar_get_EFM_firmware_version(unsigned int *pdsp_version_ms, unsigned int *pdsp_version_ls)
- {
|