Browse Source

Automatically updated using

perl -pi -0777 -e 's/_disable\s*\(\s*struct dev \*dev\s*\)\s*{\s*struct nic \*nic.*?$/_disable ( struct nic *nic ) {/ms' *.c

perl -pi -0777 -e 's/_disable\s*\(\s*struct dev \*dev(\s*__unused)?\)\s*{/_disable ( struct nic *nic$1 ) {/ms' *.c
tags/v0.9.3
Michael Brown 19 years ago
parent
commit
c87ba23399

+ 1
- 3
src/drivers/net/3c509.c View File

379
 	outb(0xc0, EP_ID_PORT);
379
 	outb(0xc0, EP_ID_PORT);
380
 }
380
 }
381
 
381
 
382
-static void t509_disable(struct dev *dev)
383
-{
384
-	struct nic *nic = (struct nic *)dev;
382
+static void t509_disable ( struct nic *nic ) {
385
 	/* reset and disable merge */
383
 	/* reset and disable merge */
386
 	t509_reset(nic);
384
 	t509_reset(nic);
387
 	__t509_disable();
385
 	__t509_disable();

+ 1
- 3
src/drivers/net/3c515.c View File

592
 /**************************************************************************
592
 /**************************************************************************
593
 DISABLE - Turn off ethernet interface
593
 DISABLE - Turn off ethernet interface
594
 ***************************************************************************/
594
 ***************************************************************************/
595
-static void t515_disable(struct dev *dev)
596
-{
597
-	struct nic *nic = (struct nic *) dev;
595
+static void t515_disable ( struct nic *nic ) {
598
 
596
 
599
 	/* merge reset an disable */
597
 	/* merge reset an disable */
600
 	t515_reset(nic);
598
 	t515_reset(nic);

+ 1
- 3
src/drivers/net/3c595.c View File

440
     GO_WINDOW(1); 
440
     GO_WINDOW(1); 
441
 }
441
 }
442
 
442
 
443
-static void t595_disable(struct dev *dev)
444
-{
445
-	struct nic *nic = (struct nic *)dev;
443
+static void t595_disable ( struct nic *nic ) {
446
 	t595_reset(nic);
444
 	t595_reset(nic);
447
 
445
 
448
 	outw(STOP_TRANSCEIVER, BASE + VX_COMMAND);
446
 	outw(STOP_TRANSCEIVER, BASE + VX_COMMAND);

+ 1
- 2
src/drivers/net/3c90x.c View File

663
  *** [Ken]
663
  *** [Ken]
664
  ***/
664
  ***/
665
 static void
665
 static void
666
-a3c90x_disable(struct dev *dev __unused)
667
-{
666
+a3c90x_disable ( struct nic *nic __unused ) {
668
 	/* reset and disable merge */
667
 	/* reset and disable merge */
669
 	a3c90x_reset();
668
 	a3c90x_reset();
670
 	/* Disable the receiver and transmitter. */
669
 	/* Disable the receiver and transmitter. */

+ 1
- 3
src/drivers/net/cs89x0.c View File

438
 	return 1;
438
 	return 1;
439
 }
439
 }
440
 
440
 
441
-static void cs89x0_disable(struct dev *dev)
442
-{
443
-	struct nic *nic = (struct nic *)dev;
441
+static void cs89x0_disable ( struct nic *nic ) {
444
 	cs89x0_reset(nic);
442
 	cs89x0_reset(nic);
445
 }
443
 }
446
 
444
 

+ 1
- 3
src/drivers/net/davicom.c View File

617
 /*********************************************************************/
617
 /*********************************************************************/
618
 /* eth_disable - Disable the interface                               */
618
 /* eth_disable - Disable the interface                               */
619
 /*********************************************************************/
619
 /*********************************************************************/
620
-static void davicom_disable(struct dev *dev)
621
-{
622
-  struct nic *nic = (struct nic *)dev;
620
+static void davicom_disable ( struct nic *nic ) {
623
   whereami("davicom_disable\n");
621
   whereami("davicom_disable\n");
624
 
622
 
625
   davicom_reset(nic);
623
   davicom_reset(nic);

+ 1
- 3
src/drivers/net/depca.c View File

648
 /**************************************************************************
648
 /**************************************************************************
649
 DISABLE - Turn off ethernet interface
649
 DISABLE - Turn off ethernet interface
650
 ***************************************************************************/
650
 ***************************************************************************/
651
-static void depca_disable(struct dev *dev)
652
-{
653
-	struct nic *nic = (struct nic *)dev;
651
+static void depca_disable ( struct nic *nic ) {
654
 	/* reset and disable merge */
652
 	/* reset and disable merge */
655
 	depca_reset(nic);
653
 	depca_reset(nic);
656
 
654
 

+ 1
- 2
src/drivers/net/dmfe.c View File

446
 /**************************************************************************
446
 /**************************************************************************
447
 DISABLE - Turn off ethernet interface
447
 DISABLE - Turn off ethernet interface
448
 ***************************************************************************/
448
 ***************************************************************************/
449
-static void dmfe_disable(struct dev *dev __unused)
450
-{
449
+static void dmfe_disable ( struct nic *nic __unused ) {
451
 	/* Reset & stop DM910X board */
450
 	/* Reset & stop DM910X board */
452
 	outl(DM910X_RESET, BASE + DCR0);
451
 	outl(DM910X_RESET, BASE + DCR0);
453
 	udelay(5);
452
 	udelay(5);

+ 1
- 2
src/drivers/net/e1000.c View File

3509
 /**************************************************************************
3509
 /**************************************************************************
3510
 DISABLE - Turn off ethernet interface
3510
 DISABLE - Turn off ethernet interface
3511
 ***************************************************************************/
3511
 ***************************************************************************/
3512
-static void e1000_disable (struct dev *dev __unused)
3513
-{
3512
+static void e1000_disable ( struct nic *nic __unused ) {
3514
 	/* Clear the transmit ring */
3513
 	/* Clear the transmit ring */
3515
 	E1000_WRITE_REG (&hw, TDH, 0);
3514
 	E1000_WRITE_REG (&hw, TDH, 0);
3516
 	E1000_WRITE_REG (&hw, TDT, 0);
3515
 	E1000_WRITE_REG (&hw, TDT, 0);

+ 1
- 2
src/drivers/net/eepro.c View File

456
 /**************************************************************************
456
 /**************************************************************************
457
 DISABLE - Turn off ethernet interface
457
 DISABLE - Turn off ethernet interface
458
 ***************************************************************************/
458
 ***************************************************************************/
459
-static void eepro_disable(struct dev *dev __unused)
460
-{
459
+static void eepro_disable ( struct nic *nic __unused ) {
461
 	eepro_sw2bank0(ioaddr);	/* Switch to bank 0 */
460
 	eepro_sw2bank0(ioaddr);	/* Switch to bank 0 */
462
 	/* Flush the Tx and disable Rx */
461
 	/* Flush the Tx and disable Rx */
463
 	outb(STOP_RCV_CMD, ioaddr);
462
 	outb(STOP_RCV_CMD, ioaddr);

+ 1
- 2
src/drivers/net/eepro100.c View File

566
  *
566
  *
567
  * returns:   void.
567
  * returns:   void.
568
  */
568
  */
569
-static void eepro100_disable(struct dev *dev __unused)
570
-{
569
+static void eepro100_disable ( struct nic *nic __unused ) {
571
 /* from eepro100_reset */
570
 /* from eepro100_reset */
572
 	outl(0, ioaddr + SCBPort);
571
 	outl(0, ioaddr + SCBPort);
573
 /* from eepro100_disable */
572
 /* from eepro100_disable */

+ 1
- 2
src/drivers/net/epic100.c View File

415
 
415
 
416
 
416
 
417
     static void
417
     static void
418
-epic100_disable(struct dev *dev __unused)
419
-{
418
+epic100_disable ( struct nic *nic __unused ) {
420
 	/* Soft reset the chip. */
419
 	/* Soft reset the chip. */
421
 	outl(GC_SOFT_RESET, genctl);
420
 	outl(GC_SOFT_RESET, genctl);
422
 }
421
 }

+ 1
- 2
src/drivers/net/forcedeth.c View File

875
 /**************************************************************************
875
 /**************************************************************************
876
 DISABLE - Turn off ethernet interface
876
 DISABLE - Turn off ethernet interface
877
 ***************************************************************************/
877
 ***************************************************************************/
878
-static void forcedeth_disable(struct dev *dev __unused)
879
-{
878
+static void forcedeth_disable ( struct nic *nic __unused ) {
880
 	/* put the card in its initial state */
879
 	/* put the card in its initial state */
881
 	/* This function serves 3 purposes.
880
 	/* This function serves 3 purposes.
882
 	 * This disables DMA and interrupts so we don't receive
881
 	 * This disables DMA and interrupts so we don't receive

+ 1
- 2
src/drivers/net/mtd80x.c View File

649
 /**************************************************************************
649
 /**************************************************************************
650
 DISABLE - Turn off ethernet interface
650
 DISABLE - Turn off ethernet interface
651
 ***************************************************************************/
651
 ***************************************************************************/
652
-static void mtd_disable(struct dev *dev)
653
-{
652
+static void mtd_disable ( struct nic *nic ) {
654
     /* put the card in its initial state */
653
     /* put the card in its initial state */
655
     /* Disable Tx Rx*/
654
     /* Disable Tx Rx*/
656
     outl( mtdx.crvalue & (~TxEnable) & (~RxEnable), mtdx.ioaddr + TCRRCR);
655
     outl( mtdx.crvalue & (~TxEnable) & (~RxEnable), mtdx.ioaddr + TCRRCR);

+ 1
- 3
src/drivers/net/natsemi.c View File

728
  */
728
  */
729
 
729
 
730
 static void
730
 static void
731
-natsemi_disable(struct dev *dev)
732
-{
733
-    struct nic *nic = (struct nic *)dev;
731
+natsemi_disable ( struct nic *nic ) {
734
     /* merge reset and disable */
732
     /* merge reset and disable */
735
     natsemi_init(nic);
733
     natsemi_init(nic);
736
 
734
 

+ 1
- 2
src/drivers/net/ns83820.c View File

756
 /**************************************************************************
756
 /**************************************************************************
757
 DISABLE - Turn off ethernet interface
757
 DISABLE - Turn off ethernet interface
758
 ***************************************************************************/
758
 ***************************************************************************/
759
-static void ns83820_disable(struct dev *dev)
760
-{
759
+static void ns83820_disable ( struct nic *nic ) {
761
 	/* put the card in its initial state */
760
 	/* put the card in its initial state */
762
 	/* This function serves 3 purposes.
761
 	/* This function serves 3 purposes.
763
 	 * This disables DMA and interrupts so we don't receive
762
 	 * This disables DMA and interrupts so we don't receive

+ 1
- 3
src/drivers/net/ns8390.c View File

583
 /**************************************************************************
583
 /**************************************************************************
584
 NS8390_DISABLE - Turn off adapter
584
 NS8390_DISABLE - Turn off adapter
585
 **************************************************************************/
585
 **************************************************************************/
586
-static void ns8390_disable(struct dev *dev)
587
-{
588
-	struct nic *nic = (struct nic *)dev;
586
+static void ns8390_disable ( struct nic *nic ) {
589
 	/* reset and disable merge */
587
 	/* reset and disable merge */
590
 	ns8390_reset(nic);
588
 	ns8390_reset(nic);
591
 }
589
 }

+ 1
- 2
src/drivers/net/pcnet32.c View File

634
 /**************************************************************************
634
 /**************************************************************************
635
 DISABLE - Turn off ethernet interface
635
 DISABLE - Turn off ethernet interface
636
 ***************************************************************************/
636
 ***************************************************************************/
637
-static void pcnet32_disable(struct dev *dev __unused)
638
-{
637
+static void pcnet32_disable ( struct nic *nic __unused ) {
639
 	/* Stop the PCNET32 here -- it ocassionally polls memory if we don't */
638
 	/* Stop the PCNET32 here -- it ocassionally polls memory if we don't */
640
 	lp->a.write_csr(ioaddr, 0, 0x0004);
639
 	lp->a.write_csr(ioaddr, 0, 0x0004);
641
 
640
 

+ 1
- 2
src/drivers/net/prism2.c View File

727
 /**************************************************************************
727
 /**************************************************************************
728
 DISABLE - Turn off ethernet interface
728
 DISABLE - Turn off ethernet interface
729
 ***************************************************************************/
729
 ***************************************************************************/
730
-static void prism2_disable(struct dev *dev __unused)
731
-{
730
+static void prism2_disable ( struct nic *nic __unused ) {
732
   /* put the card in its initial state */
731
   /* put the card in its initial state */
733
 }
732
 }
734
 
733
 

+ 1
- 2
src/drivers/net/r8169.c View File

683
 /**************************************************************************
683
 /**************************************************************************
684
 DISABLE - Turn off ethernet interface
684
 DISABLE - Turn off ethernet interface
685
 ***************************************************************************/
685
 ***************************************************************************/
686
-static void r8169_disable(struct dev *dev __unused)
687
-{
686
+static void r8169_disable ( struct nic *nic __unused ) {
688
 	int i;
687
 	int i;
689
 	/* Stop the chip's Tx and Rx DMA processes. */
688
 	/* Stop the chip's Tx and Rx DMA processes. */
690
 	RTL_W8(ChipCmd, 0x00);
689
 	RTL_W8(ChipCmd, 0x00);

+ 1
- 3
src/drivers/net/rtl8139.c View File

511
 	}
511
 	}
512
 }
512
 }
513
 
513
 
514
-static void rtl_disable(struct dev *dev)
515
-{
516
-	struct nic *nic = (struct nic *)dev;
514
+static void rtl_disable ( struct nic *nic ) {
517
 	/* merge reset and disable */
515
 	/* merge reset and disable */
518
 	rtl_reset(nic);
516
 	rtl_reset(nic);
519
 
517
 

+ 1
- 3
src/drivers/net/sis900.c View File

1213
  */
1213
  */
1214
 
1214
 
1215
 static void
1215
 static void
1216
-sis900_disable(struct dev *dev)
1217
-{
1218
-    struct nic *nic = (struct nic *)dev;
1216
+sis900_disable ( struct nic *nic ) {
1219
     /* merge reset and disable */
1217
     /* merge reset and disable */
1220
     sis900_init(nic);
1218
     sis900_init(nic);
1221
 
1219
 

+ 1
- 3
src/drivers/net/sk_g16.c View File

728
 /**************************************************************************
728
 /**************************************************************************
729
 DISABLE - Turn off ethernet interface
729
 DISABLE - Turn off ethernet interface
730
 ***************************************************************************/
730
 ***************************************************************************/
731
-static void SK_disable(struct dev *dev)
732
-{
733
-	struct nic *nic = (struct nic *)dev;
731
+static void SK_disable ( struct nic *nic ) {
734
 
732
 
735
 	/* put the card in its initial state */
733
 	/* put the card in its initial state */
736
 	SK_lance_init(nic, MODE_NORMAL);	/* reset and disable merge */
734
 	SK_lance_init(nic, MODE_NORMAL);	/* reset and disable merge */

+ 1
- 2
src/drivers/net/skel.c View File

81
 /**************************************************************************
81
 /**************************************************************************
82
 DISABLE - Turn off ethernet interface
82
 DISABLE - Turn off ethernet interface
83
 ***************************************************************************/
83
 ***************************************************************************/
84
-static void skel_disable(struct dev *dev)
85
-{
84
+static void skel_disable ( struct nic *nic ) {
86
 	/* put the card in its initial state */
85
 	/* put the card in its initial state */
87
 	/* This function serves 3 purposes.
86
 	/* This function serves 3 purposes.
88
 	 * This disables DMA and interrupts so we don't receive
87
 	 * This disables DMA and interrupts so we don't receive

+ 1
- 2
src/drivers/net/smc9000.c View File

359
    return 0;
359
    return 0;
360
 }
360
 }
361
 
361
 
362
-static void smc9000_disable(struct dev *dev __unused)
363
-{
362
+static void smc9000_disable ( struct nic *nic __unused ) {
364
    if(!smc9000_base)
363
    if(!smc9000_base)
365
      return;
364
      return;
366
 
365
 

+ 1
- 2
src/drivers/net/sundance.c View File

555
 /**************************************************************************
555
 /**************************************************************************
556
 DISABLE - Turn off ethernet interface
556
 DISABLE - Turn off ethernet interface
557
 ***************************************************************************/
557
 ***************************************************************************/
558
-static void sundance_disable(struct dev *dev __unused)
559
-{
558
+static void sundance_disable ( struct nic *nic __unused ) {
560
 	/* put the card in its initial state */
559
 	/* put the card in its initial state */
561
 	/* This function serves 3 purposes.
560
 	/* This function serves 3 purposes.
562
 	 * This disables DMA and interrupts so we don't receive
561
 	 * This disables DMA and interrupts so we don't receive

+ 1
- 2
src/drivers/net/tg3.c View File

3186
 /**************************************************************************
3186
 /**************************************************************************
3187
 DISABLE - Turn off ethernet interface
3187
 DISABLE - Turn off ethernet interface
3188
 ***************************************************************************/
3188
 ***************************************************************************/
3189
-static void tg3_disable(struct dev *dev __unused)
3190
-{
3189
+static void tg3_disable ( struct nic *nic __unused ) {
3191
 	struct tg3 *tp = &tg3;
3190
 	struct tg3 *tp = &tg3;
3192
 	/* put the card in its initial state */
3191
 	/* put the card in its initial state */
3193
 	/* This function serves 3 purposes.
3192
 	/* This function serves 3 purposes.

+ 1
- 2
src/drivers/net/tlan.c View File

718
 /**************************************************************************
718
 /**************************************************************************
719
 DISABLE - Turn off ethernet interface
719
 DISABLE - Turn off ethernet interface
720
 ***************************************************************************/
720
 ***************************************************************************/
721
-static void tlan_disable(struct dev *dev __unused)
722
-{
721
+static void tlan_disable ( struct nic *nic __unused ) {
723
 	/* put the card in its initial state */
722
 	/* put the card in its initial state */
724
 	/* This function serves 3 purposes.
723
 	/* This function serves 3 purposes.
725
 	 * This disables DMA and interrupts so we don't receive
724
 	 * This disables DMA and interrupts so we don't receive

+ 1
- 3
src/drivers/net/tulip.c View File

1180
 /*********************************************************************/
1180
 /*********************************************************************/
1181
 /* eth_disable - Disable the interface                               */
1181
 /* eth_disable - Disable the interface                               */
1182
 /*********************************************************************/
1182
 /*********************************************************************/
1183
-static void tulip_disable(struct dev *dev)
1184
-{
1185
-    struct nic *nic = (struct nic *)dev;
1183
+static void tulip_disable ( struct nic *nic ) {
1186
 #ifdef TULIP_DEBUG_WHERE
1184
 #ifdef TULIP_DEBUG_WHERE
1187
     whereami("tulip_disable\n");
1185
     whereami("tulip_disable\n");
1188
 #endif
1186
 #endif

+ 1
- 3
src/drivers/net/via-rhine.c View File

1162
 }
1162
 }
1163
 
1163
 
1164
 static void 
1164
 static void 
1165
-rhine_disable (struct dev *dev)
1166
-{
1167
-    struct nic *nic = (struct nic *)dev;
1165
+rhine_disable ( struct nic *nic ) {
1168
     struct rhine_private *tp = (struct rhine_private *) nic->priv_data;
1166
     struct rhine_private *tp = (struct rhine_private *) nic->priv_data;
1169
     int ioaddr = tp->ioaddr;
1167
     int ioaddr = tp->ioaddr;
1170
 
1168
 

+ 1
- 3
src/drivers/net/w89c840.c View File

579
 /**************************************************************************
579
 /**************************************************************************
580
 w89c840_disable - Turn off ethernet interface
580
 w89c840_disable - Turn off ethernet interface
581
 ***************************************************************************/
581
 ***************************************************************************/
582
-static void w89c840_disable(struct dev *dev)
583
-{
584
-    struct nic *nic = (struct nic *)dev;
582
+static void w89c840_disable ( struct nic *nic ) {
585
     /* merge reset and disable */
583
     /* merge reset and disable */
586
     w89c840_reset(nic);
584
     w89c840_reset(nic);
587
 
585
 

Loading…
Cancel
Save