@@ -183,78 +183,25 @@ bool CARDbSetPhyParameter(struct vnt_private *priv, u8 bb_type)
183183 unsigned char bySlot = 0 ;
184184 unsigned char bySIFS = 0 ;
185185 unsigned char byDIFS = 0 ;
186- unsigned char data ;
187186 int i ;
188187
189188 /* Set SIFS, DIFS, EIFS, SlotTime, CwMin */
190189 if (bb_type == BB_TYPE_11A ) {
191- if (priv -> byRFType == RF_AIROHA7230 ) {
192- /* AL7230 use single PAPE and connect to PAPE_2.4G */
193- MACvSetBBType (priv -> port_offset , BB_TYPE_11G );
194- priv -> abyBBVGA [0 ] = 0x20 ;
195- priv -> abyBBVGA [2 ] = 0x10 ;
196- priv -> abyBBVGA [3 ] = 0x10 ;
197- bb_read_embedded (priv , 0xE7 , & data );
198- if (data == 0x1C )
199- bb_write_embedded (priv , 0xE7 , priv -> abyBBVGA [0 ]);
200-
201- } else if (priv -> byRFType == RF_UW2452 ) {
202- MACvSetBBType (priv -> port_offset , BB_TYPE_11A );
203- priv -> abyBBVGA [0 ] = 0x18 ;
204- bb_read_embedded (priv , 0xE7 , & data );
205- if (data == 0x14 ) {
206- bb_write_embedded (priv , 0xE7 , priv -> abyBBVGA [0 ]);
207- bb_write_embedded (priv , 0xE1 , 0x57 );
208- }
209- } else {
210- MACvSetBBType (priv -> port_offset , BB_TYPE_11A );
211- }
190+ MACvSetBBType (priv -> port_offset , BB_TYPE_11A );
212191 bb_write_embedded (priv , 0x88 , 0x03 );
213192 bySlot = C_SLOT_SHORT ;
214193 bySIFS = C_SIFS_A ;
215194 byDIFS = C_SIFS_A + 2 * C_SLOT_SHORT ;
216195 byCWMaxMin = 0xA4 ;
217196 } else if (bb_type == BB_TYPE_11B ) {
218197 MACvSetBBType (priv -> port_offset , BB_TYPE_11B );
219- if (priv -> byRFType == RF_AIROHA7230 ) {
220- priv -> abyBBVGA [0 ] = 0x1C ;
221- priv -> abyBBVGA [2 ] = 0x00 ;
222- priv -> abyBBVGA [3 ] = 0x00 ;
223- bb_read_embedded (priv , 0xE7 , & data );
224- if (data == 0x20 )
225- bb_write_embedded (priv , 0xE7 , priv -> abyBBVGA [0 ]);
226-
227- } else if (priv -> byRFType == RF_UW2452 ) {
228- priv -> abyBBVGA [0 ] = 0x14 ;
229- bb_read_embedded (priv , 0xE7 , & data );
230- if (data == 0x18 ) {
231- bb_write_embedded (priv , 0xE7 , priv -> abyBBVGA [0 ]);
232- bb_write_embedded (priv , 0xE1 , 0xD3 );
233- }
234- }
235198 bb_write_embedded (priv , 0x88 , 0x02 );
236199 bySlot = C_SLOT_LONG ;
237200 bySIFS = C_SIFS_BG ;
238201 byDIFS = C_SIFS_BG + 2 * C_SLOT_LONG ;
239202 byCWMaxMin = 0xA5 ;
240203 } else { /* PK_TYPE_11GA & PK_TYPE_11GB */
241204 MACvSetBBType (priv -> port_offset , BB_TYPE_11G );
242- if (priv -> byRFType == RF_AIROHA7230 ) {
243- priv -> abyBBVGA [0 ] = 0x1C ;
244- priv -> abyBBVGA [2 ] = 0x00 ;
245- priv -> abyBBVGA [3 ] = 0x00 ;
246- bb_read_embedded (priv , 0xE7 , & data );
247- if (data == 0x20 )
248- bb_write_embedded (priv , 0xE7 , priv -> abyBBVGA [0 ]);
249-
250- } else if (priv -> byRFType == RF_UW2452 ) {
251- priv -> abyBBVGA [0 ] = 0x14 ;
252- bb_read_embedded (priv , 0xE7 , & data );
253- if (data == 0x18 ) {
254- bb_write_embedded (priv , 0xE7 , priv -> abyBBVGA [0 ]);
255- bb_write_embedded (priv , 0xE1 , 0xD3 );
256- }
257- }
258205 bb_write_embedded (priv , 0x88 , 0x08 );
259206 bySIFS = C_SIFS_BG ;
260207
@@ -417,7 +364,6 @@ void CARDbRadioPowerOff(struct vnt_private *priv)
417364
418365 case RF_AIROHA :
419366 case RF_AL2230S :
420- case RF_AIROHA7230 :
421367 MACvWordRegBitsOff (priv -> port_offset , MAC_REG_SOFTPWRCTL ,
422368 SOFTPWRCTL_SWPE2 );
423369 MACvWordRegBitsOff (priv -> port_offset , MAC_REG_SOFTPWRCTL ,
0 commit comments