aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/rtl8187se
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-06-28 10:19:45 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-09-15 15:01:31 -0400
commite99b82d558b1fcc61a029d8e7b3f2a970371ca24 (patch)
treefa19c8d31320653471ee68425cf0aaba2ae3c2d9 /drivers/staging/rtl8187se
parentff9548530572ba272d913d0a7e0147a9f674e373 (diff)
Staging: rtl8187se: remove unused rtl8225_rf_* functions
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8187se')
-rw-r--r--drivers/staging/rtl8187se/r8180_core.c4
-rw-r--r--drivers/staging/rtl8187se/r8180_rtl8225.c369
-rw-r--r--drivers/staging/rtl8187se/r8180_rtl8225.h4
3 files changed, 0 insertions, 377 deletions
diff --git a/drivers/staging/rtl8187se/r8180_core.c b/drivers/staging/rtl8187se/r8180_core.c
index 08960f8e55a..18646827c8f 100644
--- a/drivers/staging/rtl8187se/r8180_core.c
+++ b/drivers/staging/rtl8187se/r8180_core.c
@@ -3613,10 +3613,6 @@ DMESG output to andreamrl@tiscali.it THANKS");
3613 priv->rf_init = rtl8225z2_rf_init; 3613 priv->rf_init = rtl8225z2_rf_init;
3614 priv->rf_set_chan = rtl8225z2_rf_set_chan; 3614 priv->rf_set_chan = rtl8225z2_rf_set_chan;
3615 priv->rf_set_sens = NULL; 3615 priv->rf_set_sens = NULL;
3616 //priv->rf_sleep = rtl8225_rf_sleep;
3617 //priv->rf_wakeup = rtl8225_rf_wakeup;
3618
3619
3620 3616
3621 if(!priv->card_8185){ 3617 if(!priv->card_8185){
3622 if(priv->antb) 3618 if(priv->antb)
diff --git a/drivers/staging/rtl8187se/r8180_rtl8225.c b/drivers/staging/rtl8187se/r8180_rtl8225.c
index 81c4620685a..a132f6a36a6 100644
--- a/drivers/staging/rtl8187se/r8180_rtl8225.c
+++ b/drivers/staging/rtl8187se/r8180_rtl8225.c
@@ -178,17 +178,6 @@ void write_rtl8225(struct net_device *dev, u8 adr, u16 data)
178 rtl8185_rf_pins_enable(dev); 178 rtl8185_rf_pins_enable(dev);
179} 179}
180 180
181void rtl8225_rf_close(struct net_device *dev)
182{
183 write_rtl8225(dev, 0x4, 0x1f);
184
185 force_pci_posting(dev);
186 mdelay(1);
187
188 rtl8180_set_anaparam(dev, RTL8225_ANAPARAM_OFF);
189 rtl8185_set_anaparam2(dev, RTL8225_ANAPARAM2_OFF);
190}
191
192void rtl8225_SetTXPowerLevel(struct net_device *dev, short ch) 181void rtl8225_SetTXPowerLevel(struct net_device *dev, short ch)
193{ 182{
194 struct r8180_priv *priv = ieee80211_priv(dev); 183 struct r8180_priv *priv = ieee80211_priv(dev);
@@ -354,361 +343,3 @@ void rtl8225_host_pci_init(struct net_device *dev)
354void rtl8225_host_usb_init(struct net_device *dev) 343void rtl8225_host_usb_init(struct net_device *dev)
355{ 344{
356} 345}
357
358void rtl8225_rf_sleep(struct net_device *dev)
359{
360 write_rtl8225(dev,0x4,0xdff);
361 force_pci_posting(dev);
362 mdelay(1);
363 rtl8180_set_anaparam(dev, RTL8225_ANAPARAM_SLEEP);
364 rtl8185_set_anaparam2(dev, RTL8225_ANAPARAM2_SLEEP);
365 force_pci_posting(dev);
366}
367
368void rtl8225_rf_wakeup(struct net_device *dev)
369{
370 write_rtl8225(dev,0x4,0x9ff);
371 rtl8180_set_anaparam(dev, RTL8225_ANAPARAM_ON);
372 rtl8185_set_anaparam2(dev, RTL8225_ANAPARAM2_ON);
373 force_pci_posting(dev);
374}
375
376void rtl8225_rf_init(struct net_device *dev)
377{
378 struct r8180_priv *priv = ieee80211_priv(dev);
379 int i;
380 short channel = 1;
381 u16 brsr;
382
383 priv->chan = channel;
384
385 rtl8180_set_anaparam(dev, RTL8225_ANAPARAM_ON);
386
387
388 if(priv->card_type == USB)
389 rtl8225_host_usb_init(dev);
390 else
391 rtl8225_host_pci_init(dev);
392
393 write_nic_dword(dev, RF_TIMING, 0x000a8008);
394
395 brsr = read_nic_word(dev, BRSR);
396
397 write_nic_word(dev, BRSR, 0xffff);
398
399 write_nic_dword(dev, RF_PARA, 0x100044);
400
401 #if 1 //0->1
402 rtl8180_set_mode(dev, EPROM_CMD_CONFIG);
403 write_nic_byte(dev, CONFIG3, 0x44);
404 rtl8180_set_mode(dev, EPROM_CMD_NORMAL);
405 #endif
406
407 if(priv->card_type == USB){
408 rtl8185_rf_pins_enable(dev);
409
410 mdelay(1000);
411 }
412
413 write_rtl8225(dev, 0x0, 0x67); mdelay(1);
414
415
416 write_rtl8225(dev, 0x1, 0xfe0); mdelay(1);
417
418 write_rtl8225(dev, 0x2, 0x44d); mdelay(1);
419
420 write_rtl8225(dev, 0x3, 0x441); mdelay(1);
421
422 if(priv->card_type == USB)
423 write_rtl8225(dev, 0x4, 0x486);
424 else
425 write_rtl8225(dev, 0x4, 0x8be);
426
427 mdelay(1);
428
429 /* version B & C */
430
431 if(priv->card_type == USB)
432 write_rtl8225(dev, 0x5, 0xbc0);
433 else if(priv->card_type == MINIPCI)
434 write_rtl8225(dev, 0x5, 0xbc0 + 3 +(6<<3));
435 else
436 write_rtl8225(dev, 0x5, 0xbc0 + (6<<3));
437
438 mdelay(1);
439// }
440
441 write_rtl8225(dev, 0x6, 0xae6); mdelay(1);
442
443 write_rtl8225(dev, 0x7, ((priv->card_type == USB)? 0x82a : rtl8225_chan[channel])); mdelay(1);
444
445 write_rtl8225(dev, 0x8, 0x1f); mdelay(1);
446
447 write_rtl8225(dev, 0x9, 0x334); mdelay(1);
448
449 write_rtl8225(dev, 0xa, 0xfd4); mdelay(1);
450
451 write_rtl8225(dev, 0xb, 0x391); mdelay(1);
452
453 write_rtl8225(dev, 0xc, 0x50); mdelay(1);
454
455
456 write_rtl8225(dev, 0xd, 0x6db); mdelay(1);
457
458 write_rtl8225(dev, 0xe, 0x29); mdelay(1);
459
460 write_rtl8225(dev, 0xf, 0x914);
461
462 if(priv->card_type == USB){
463 //force_pci_posting(dev);
464 mdelay(100);
465 }
466
467 write_rtl8225(dev, 0x2, 0xc4d);
468
469 if(priv->card_type == USB){
470 // force_pci_posting(dev);
471 mdelay(200);
472
473 write_rtl8225(dev, 0x2, 0x44d);
474
475 // force_pci_posting(dev);
476 mdelay(100);
477
478 }//End of if(priv->card_type == USB)
479 /* FIXME!! rtl8187 we have to check if calibrarion
480 * is successful and eventually cal. again (repeat
481 * the two write on reg 2)
482 */
483 force_pci_posting(dev);
484
485 mdelay(100); //200 for 8187
486
487 //if(priv->card_type != USB) /* maybe not needed even for 8185 */
488// write_rtl8225(dev, 0x7, rtl8225_chan[channel]);
489
490 write_rtl8225(dev, 0x0, 0x127);
491
492 for(i=0;i<95;i++){
493 write_rtl8225(dev, 0x1, (u8)(i+1));
494
495 /* version B & C & D*/
496
497 write_rtl8225(dev, 0x2, rtl8225bcd_rxgain[i]);
498 }
499
500 write_rtl8225(dev, 0x0, 0x27);
501
502
503// //if(priv->card_type != USB){
504// write_rtl8225(dev, 0x2, 0x44d);
505// write_rtl8225(dev, 0x7, rtl8225_chan[channel]);
506// write_rtl8225(dev, 0x2, 0x47d);
507//
508// force_pci_posting(dev);
509// mdelay(100);
510//
511// write_rtl8225(dev, 0x2, 0x44d);
512// //}
513
514 write_rtl8225(dev, 0x0, 0x22f);
515
516 if(priv->card_type != USB)
517 rtl8185_rf_pins_enable(dev);
518
519 for(i=0;i<128;i++){
520 write_phy_ofdm(dev, 0xb, rtl8225_agc[i]);
521
522 mdelay(1);
523 write_phy_ofdm(dev, 0xa, (u8)i+ 0x80);
524
525 mdelay(1);
526 }
527
528 force_pci_posting(dev);
529 mdelay(1);
530
531 write_phy_ofdm(dev, 0x0, 0x1); mdelay(1);
532 write_phy_ofdm(dev, 0x1, 0x2); mdelay(1);
533 write_phy_ofdm(dev, 0x2, ((priv->card_type == USB)? 0x42 : 0x62)); mdelay(1);
534 write_phy_ofdm(dev, 0x3, 0x0); mdelay(1);
535 write_phy_ofdm(dev, 0x4, 0x0); mdelay(1);
536 write_phy_ofdm(dev, 0x5, 0x0); mdelay(1);
537 write_phy_ofdm(dev, 0x6, 0x40); mdelay(1);
538 write_phy_ofdm(dev, 0x7, 0x0); mdelay(1);
539 write_phy_ofdm(dev, 0x8, 0x40); mdelay(1);
540 write_phy_ofdm(dev, 0x9, 0xfe); mdelay(1);
541
542 /* ver C & D */
543 write_phy_ofdm(dev, 0xa, 0x9); mdelay(1);
544
545 //write_phy_ofdm(dev, 0x18, 0xef);
546 // }
547 //}
548 write_phy_ofdm(dev, 0xb, 0x80); mdelay(1);
549
550 write_phy_ofdm(dev, 0xc, 0x1);mdelay(1);
551
552
553 //if(priv->card_type != USB)
554 //write_phy_ofdm(dev, 0xd, 0x33); // <>
555
556 write_phy_ofdm(dev, 0xe, 0xd3);mdelay(1);
557
558
559 write_phy_ofdm(dev, 0xf, 0x38);mdelay(1);
560/*ver D & 8187*/
561// }
562
563// if(priv->card_8185 == 1 && priv->card_8185_Bversion)
564// write_phy_ofdm(dev, 0x10, 0x04);/*ver B*/
565// else
566 write_phy_ofdm(dev, 0x10, 0x84);mdelay(1);
567/*ver C & D & 8187*/
568
569 write_phy_ofdm(dev, 0x11, 0x06);mdelay(1);
570/*agc resp time 700*/
571
572
573// if(priv->card_8185 == 2){
574 /* Ver D & 8187*/
575 write_phy_ofdm(dev, 0x12, 0x20);mdelay(1);
576
577 write_phy_ofdm(dev, 0x13, 0x20);mdelay(1);
578
579 write_phy_ofdm(dev, 0x14, 0x0); mdelay(1);
580 write_phy_ofdm(dev, 0x15, 0x40); mdelay(1);
581 write_phy_ofdm(dev, 0x16, 0x0); mdelay(1);
582 write_phy_ofdm(dev, 0x17, 0x40); mdelay(1);
583
584// if (priv->card_type == USB)
585// write_phy_ofdm(dev, 0x18, 0xef);
586
587 write_phy_ofdm(dev, 0x18, 0xef);mdelay(1);
588
589
590 write_phy_ofdm(dev, 0x19, 0x19); mdelay(1);
591 write_phy_ofdm(dev, 0x1a, 0x20); mdelay(1);
592
593// if (priv->card_type != USB){
594// if(priv->card_8185 == 1 && priv->card_8185_Bversion)
595// write_phy_ofdm(dev, 0x1b, 0x66); /* Ver B */
596// else
597 write_phy_ofdm(dev, 0x1b, 0x76);mdelay(1);
598 /* Ver C & D */ //FIXME:MAYBE not needed
599// }
600
601 write_phy_ofdm(dev, 0x1c, 0x4);mdelay(1);
602
603 /*ver D & 8187*/
604 write_phy_ofdm(dev, 0x1e, 0x95);mdelay(1);
605
606 write_phy_ofdm(dev, 0x1f, 0x75); mdelay(1);
607
608// }
609
610 write_phy_ofdm(dev, 0x20, 0x1f);mdelay(1);
611
612 write_phy_ofdm(dev, 0x21, 0x27);mdelay(1);
613
614 write_phy_ofdm(dev, 0x22, 0x16);mdelay(1);
615
616// if(priv->card_type != USB)
617 //write_phy_ofdm(dev, 0x23, 0x43); //FIXME maybe not needed // <>
618
619 write_phy_ofdm(dev, 0x24, 0x46); mdelay(1);
620 write_phy_ofdm(dev, 0x25, 0x20); mdelay(1);
621 write_phy_ofdm(dev, 0x26, 0x90); mdelay(1);
622 write_phy_ofdm(dev, 0x27, 0x88); mdelay(1);
623/* Ver C & D & 8187*/
624
625 // <> Set init. gain to m74dBm.
626 write_phy_ofdm(dev, 0x0d, 0x43); mdelay(1);
627 write_phy_ofdm(dev, 0x1b, 0x76); mdelay(1);
628 write_phy_ofdm(dev, 0x1d, 0xc5); mdelay(1);
629 write_phy_ofdm(dev, 0x23, 0x78); mdelay(1);
630
631 //if(priv->card_type == USB);
632 // rtl8225_set_gain_usb(dev, 1); /* FIXME this '2' is random */
633
634 write_phy_cck(dev, 0x0, 0x98); mdelay(1);
635 write_phy_cck(dev, 0x3, 0x20); mdelay(1);
636 write_phy_cck(dev, 0x4, 0x7e); mdelay(1);
637 write_phy_cck(dev, 0x5, 0x12); mdelay(1);
638 write_phy_cck(dev, 0x6, 0xfc); mdelay(1);
639 write_phy_cck(dev, 0x7, 0x78);mdelay(1);
640 /* Ver C & D & 8187*/
641
642 write_phy_cck(dev, 0x8, 0x2e);mdelay(1);
643
644 write_phy_cck(dev, 0x10, ((priv->card_type == USB) ? 0x9b: 0x93)); mdelay(1);
645 write_phy_cck(dev, 0x11, 0x88); mdelay(1);
646 write_phy_cck(dev, 0x12, 0x47); mdelay(1);
647 write_phy_cck(dev, 0x13, 0xd0); /* Ver C & D & 8187*/
648
649 write_phy_cck(dev, 0x19, 0x0);
650 write_phy_cck(dev, 0x1a, 0xa0);
651 write_phy_cck(dev, 0x1b, 0x8);
652 write_phy_cck(dev, 0x40, 0x86); /* CCK Carrier Sense Threshold */
653
654 write_phy_cck(dev, 0x41, 0x8d);mdelay(1);
655
656
657 write_phy_cck(dev, 0x42, 0x15); mdelay(1);
658 write_phy_cck(dev, 0x43, 0x18); mdelay(1);
659 write_phy_cck(dev, 0x44, 0x1f); mdelay(1);
660 write_phy_cck(dev, 0x45, 0x1e); mdelay(1);
661 write_phy_cck(dev, 0x46, 0x1a); mdelay(1);
662 write_phy_cck(dev, 0x47, 0x15); mdelay(1);
663 write_phy_cck(dev, 0x48, 0x10); mdelay(1);
664 write_phy_cck(dev, 0x49, 0xa); mdelay(1);
665 write_phy_cck(dev, 0x4a, 0x5); mdelay(1);
666 write_phy_cck(dev, 0x4b, 0x2); mdelay(1);
667 write_phy_cck(dev, 0x4c, 0x5);mdelay(1);
668
669
670 write_nic_byte(dev, 0x5b, 0x0d); mdelay(1);
671
672
673
674// <>
675// // TESTR 0xb 8187
676// write_phy_cck(dev, 0x10, 0x93);// & 0xfb);
677//
678// //if(priv->card_type != USB){
679// write_phy_ofdm(dev, 0x2, 0x62);
680// write_phy_ofdm(dev, 0x6, 0x0);
681// write_phy_ofdm(dev, 0x8, 0x0);
682// //}
683
684 rtl8225_SetTXPowerLevel(dev, channel);
685
686 write_phy_cck(dev, 0x10, 0x9b); mdelay(1); /* Rx ant A, 0xdb for B */
687 write_phy_ofdm(dev, 0x26, 0x90); mdelay(1); /* Rx ant A, 0x10 for B */
688
689 rtl8185_tx_antenna(dev, 0x3); /* TX ant A, 0x0 for B */
690
691 /* switch to high-speed 3-wire
692 * last digit. 2 for both cck and ofdm
693 */
694 if(priv->card_type == USB)
695 write_nic_dword(dev, 0x94, 0x3dc00002);
696 else{
697 write_nic_dword(dev, 0x94, 0x15c00002);
698 rtl8185_rf_pins_enable(dev);
699 }
700
701// if(priv->card_type != USB)
702// rtl8225_set_gain(dev, 4); /* FIXME this '1' is random */ // <>
703// rtl8225_set_mode(dev, 1); /* FIXME start in B mode */ // <>
704//
705// /* make sure is waken up! */
706// write_rtl8225(dev,0x4, 0x9ff);
707// rtl8180_set_anaparam(dev, RTL8225_ANAPARAM_ON);
708// rtl8185_set_anaparam2(dev, RTL8225_ANAPARAM2_ON);
709
710 rtl8225_rf_set_chan(dev, priv->chan);
711
712 write_nic_word(dev,BRSR,brsr);
713
714}
diff --git a/drivers/staging/rtl8187se/r8180_rtl8225.h b/drivers/staging/rtl8187se/r8180_rtl8225.h
index 3c4da282e4f..cb2773b2659 100644
--- a/drivers/staging/rtl8187se/r8180_rtl8225.h
+++ b/drivers/staging/rtl8187se/r8180_rtl8225.h
@@ -29,11 +29,7 @@ void rtl8225_host_usb_init(struct net_device *dev);
29void write_rtl8225(struct net_device *dev, u8 adr, u16 data); 29void write_rtl8225(struct net_device *dev, u8 adr, u16 data);
30void RF_WriteReg(struct net_device *dev, u8 offset, u32 data); 30void RF_WriteReg(struct net_device *dev, u8 offset, u32 data);
31u32 RF_ReadReg(struct net_device *dev, u8 offset); 31u32 RF_ReadReg(struct net_device *dev, u8 offset);
32void rtl8225_rf_init(struct net_device *dev);
33void rtl8225_rf_set_chan(struct net_device *dev,short ch); 32void rtl8225_rf_set_chan(struct net_device *dev,short ch);
34void rtl8225_rf_close(struct net_device *dev);
35void rtl8225_rf_sleep(struct net_device *dev);
36void rtl8225_rf_wakeup(struct net_device *dev);
37void rtl8180_set_mode(struct net_device *dev,int mode); 33void rtl8180_set_mode(struct net_device *dev,int mode);
38void rtl8180_set_mode(struct net_device *dev,int mode); 34void rtl8180_set_mode(struct net_device *dev,int mode);
39bool SetZebraRFPowerState8185(struct net_device *dev,RT_RF_POWER_STATE eRFPowerState); 35bool SetZebraRFPowerState8185(struct net_device *dev,RT_RF_POWER_STATE eRFPowerState);
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-22 09:42:44 -0400