NI6510 driver merged with generic LANCE - lance users please try

Derek Fawcus (df@eyrie.demon.co.uk)
Fri, 4 Aug 1995 07:18:59 +0100 (BST)


I tried sending this on Monday, but It doesn't seem to have appeared. So I've
resent it. Appologies if anyone sees this twice...

--------

Due to poor performance from the ni6510 driver, and the need to keep it
up to date with the (main line) lance driver I've merged the ni6510 driver
into the lance driver.

I don't think they should break anything for other lance chip users, but
since I don't have any other cards I can't test this. I'd therefore
appreciate it if some people with lance chips could test this. At worst,
it'll cause your cards to not be recognised (though I doubt this will happen).

The change consisted of altering the detection code for the lance driver,
and making the dev->base_addr variable point to the NIC base address. This
is because the ni6510 has the lance at offset 0 and the station address prom
at offset 8, whereas the other lance drivers have the station address
prom at offset 0 and the lance at offset 16.

I've also adjusted the IO port reseration for the lance to be 0x20 bytes
as the PCnet-ISA tech manual mentions a vendor specific word that may be
based at offset 0x18. If this causes problems then change it back to 0x18.

I've reserved 0x10 bytes for the ni6510 IO port range as that is what
the original ni6510 driver did (and what the manual says).

My performance with the ni6510 has definitly improved, with the previous
driver, there was a marked delay in either the transmission or reception
of packets, a round trip tx/response was taking upto minutes for the ni6510
whereas a wd8003 was almost instaneous. I'm not sure which end the delay
was os as I didn't investigate much after determining that a merge of the
two drivers was possible.

These changes have been done on the 1.3.11 kernel, but since the lance
driver hasn't changed between 1.3.11 and 1.3.13 they will patch straight in.

If there are no problems with this then I'll submit it to Linus at the end
of the week.

DF

-- 
Derek Fawcus (G7FVS)                                df@eyrie.demon.co.uk

begin 644 lance.diff.gz M'XL("/>='#`"`VQA;F-E+F1I9F8`G5AK<QK'$OV,?D7'*=M@EF67AQ#2M2-% M2#%))-E(N;<JCHM:=@>8JV47[P-)-^7\]GMZ9I:G_%1)@)CNGGZ<[CFSM5J- M;D42B;#FVDW;=>M!(A<B2>N1R.JA%_G"]FMQ(B>EBSBB7_.0W`XYSF';/73: MY':[[;UJM?IE&TOUIDNN<\B_#:U^?$PUMVGM4Q6O;I>.C_>H=#,5Y.79-$YH MYCW02%`B/'\J`O)2_.=CO^/3L^M>_]J>I&/?CKS4LR?QPB)HG-:O8.)41)E( M*![3V;TOPE#`#Y(17<\]?.AYF4=>%%`_&L?)S,LD_+OV)4NET":BTS@0U&TZ M=MNB7^(@\)+`*)^'<C+-2.^`Q42(:"3"C"YZU'`Z'7>ONE>%@:D734083P[U M_SV1B%LZ]^[\/"V5@_&Q>$BDL`,QBR/;C^W\ME)JNG6G4]=Y+96TA8#2F&1& M=W$>!A2(3/B9\CU/!67(5"3WVZY#/CRTBVU3NL-V;&3DI3"1SQ$@"\NU@*7^ M*I11?J^LV._\Z7L:/="%]*>>".FUG,_92'DVQ:?C-,L#1&WGD:QEN1A)[!0A M@@KV?2WH0QYGV'DJTXUMTCA/.*VP@_)EO*PAHJ)@#Y[K$&I([ZW(:F85%BB( M4_9GD*<I78HPC:/G-AM:3P];Z%\!(JE(%GK+A%>4`5Z,\9+0[R>7IV<J2W`B M9E`Y]PU'I>B!W0[C:$+E>2(6,L[3\`'+[D&%"I?Q.T/LL(XM3>;>G`+CM?[U M"5NY$?X4<(UR+V0ECQ8B"N!!.A>^'$L?!42!@`5Z4=^C/4HS^.H3$IW0"VX8 M=OPE/3$M<[AP;>>`6G77J7?;%,Q#+\N.FT$,K,S^BIX<J=8Y:%D=JG8[EMM6 MK7-V]F9P=5%+148++\P15I$$QH%%_<%;2Z6]=W&"HI6OQN2C/$#20YS3+$\! MK1#-%CSLT?`VBN^&2V7R@@`Y3@E#(YMZ&8VE`""EWN(ND1G@H*2U$W8%45:Y ME2_["J"CF'L(\@^"`:RK(M"=<\[J(2F$8EG+F:JFJN4DT!-'NB8PI.HEHS2# MH]SB7$B+Z$YF4Z5WV3]509[T>@-B7TAW@9?!S'B,[*1:S7&4'#X<,'Y0J0S0 MPSYKQE6+,9A#O;M1<%#*/F<+W3E5]?;C:"PGL#.1*<\>I$AOQN)MNINBJ2`? MQG<I>I<QR(EF^WM54RRS'8JCI]/@+?TWG\T!#@6<?K]O4T]W1XQO%=CWJKU< ML+5LE>I`CL?H?YYYWBA>"$Z.(':%A0*QJ+WBC`RYI`14)P\PL%>=QS+*5J9. MER5'L58X,$X6<2*O19ULQC6<]&P:,!A&.;N!@<HHT/V'H952LK;(YF[N5;B# M>[B6^HF<9S$B)CK#T#?NZ841QH@Z,=H'ENOBS.AT"^3_&(BQC-"3O]T,?_[C M?'C]9ZGDMELM=JG^@JY,V<=)/--A].M717PVMV2ML*`<'?9.;DY4P;<7%*BP MT-A>&)Q=G]WP2FM[Y><_KH?]<U[:WUZZN;HY^7UXW?_S3,V;O>KF,HHPO#H_ M-X:=[67CI+.S8)QT&ML+A9-.:[6B03,\O;H\[_^BP+JMM0S`V=]1.^D-5(MQ M$VWK;437<'9T-Z-W3*U6:!EH8``?"C(;Z.`IFF9)CM-0C<QA<C^<<D/]K2#2 M;+@*(LW6OM5P-:_@056>QTF&.:MU^)\0,#ZB%_SQB/BU6JW`")5*W`TR5DWR MT@C`Q1H6QE0&1P`E\6^'W`AQ5-:"UD[D%7KYDAS6*CU[AL$R,I)4);>E%^_; MG<?7V\MU]@B'#&<'W6#:7!]SG*&9-\%9,I8)!G@9TTAFSU.SC(F:8GB%F!E( M654[_ZCG.T6IT`_8O<)*)4PW#/A<'#&;T48>CP4S]=-QM$UF2S,Q&^($7"]% M$H^$NW1F*5`YVMH?ZA^U$\C&97RW/J%7A[R./EW+SF6,G'PA!;O%^XX,M#OT MN4HJ8]\4/R%@M$8I$5F>1*LES0&:S2Z3@&:G91UHG"O<6HH194,<+9;9PK`, M-JAIAP]:%WDSE50D\SST)OHX7Y(6EDB95JM3V4S*4AZE<L)$2)F9SG]MM)SV M"4)QCDKJ!\9>OR$P(XQ8CQM6)YX=,W1U0];@>4?^\_L\NHF.?CH?CG(9HEZK MC;1X'-4TP1#,/\#?]"0I&3K&RH$,ABM"5FQUHGD1S3&*,KA42##5U39T-=K[ M5A?5Z#:LAJ/+H1M;U768>:-0O&-LP$6>*!5Z1LWW#`XM45$*&_X;28V#*OO2 MT[>`M1,?L0B^&GE\*[@3S\,0K&2A>(&O>+)F_[$Z^E!AV,$`PU@HCG-%QYAF ME'3JEV7ZKC;'FH)Y:4-@Z\2HHK.,L<97*KB%0N<K%1J%@ELQ(/^/T*0M$7X\ MB>3_=&:`C'\CI8FW`@BGU`)-R?2<1W9!W4P#K$%Q+3_%7@>;J:DNO=;'P.:< MKRY=[*I1MV;Z!U.$(M1OVHH^MXN&D4D;:#XIZI>N<S_=L!ARQ@LUMXI$O]SA M)T=J0L'H0!0\4XG8)=U?RV&$N&1T5[BUQDHJ1[2KSLK<5BW'8:97;;4Z5J-= M]!7G<F-0JLFF9QKVX8^FXS8&X'M;#[U:237S;?G)T_20GJ9,V9_^V+RWGEB: M)+.8185%JVA1+M,G-3E-CRJ;8OY4I/VP^%#;269%\PS-A1)UAGOD[JN;C[XX M8O`4Y%PAW<MV+FHV+*#'F4UI8I#*>W-W\A*-^BU3MBXZGP3FUFA\SE9>/+K[ M06%WS!<?=:/AK;>N$;B%L"+/''7W,W=QOO,I*W@W,?)3'@RIQ\W8^ML=%]?, M%/[PG=[:?`Z@N9$VL=R-Y8S9;TF7&9:&6$IU6)"D?]$^WL`BN=L+G-#3AMVX M+X"%%W7Y>B??JWY8&V&RHAG/5RBJJ;"IC+_R$FA;T_"0:CM`JYBNV;H3%J<1 M]T@B/N!NFGV)*EE?:#<5%<^3M7'R"=,[1/2K;(LP%9\T^DB3?5<(9LA=>+>" M?)%DGGD4%/`317T=R8$-ON<&_.1J-<@81%ZHZ(RA'"KG*/."3Y%%+`-Z42F7 M,>2SRFJI2AVF"/]T*IKMM5H./RUM\3.?IJ%[2.K<ET.9?!B&N%T9CJWQ,O-@ MO64XS*7'SS=PIJ6UF9>JQY=1K!XW,$F(1$B1$,'206T"9F%B?0/.]D?B?--: M0?4-I7BL%4=IIFD;7!AFH_!=BZ'^MV-1TZ*V1?L?CQZ7YUU6\EV+W`;^H-'6 M&DM2R*1HYT19D0!]G]7-M):+PIVE-O.OE9".MO"AO)1Z]8JYQ%)VV9U]?@H, MK"PY[.`M/57/U_!F_Q45C0N+10O//,WI5QE<T3U3NR]ET:30(N?CT>/RFUF$ /?$NI="'_?]ZDVJCW%P`` ` end