Browse Source

Coerced into compiling

tags/v0.9.3
Michael Brown 20 years ago
parent
commit
49fe02e501
3 changed files with 9 additions and 11 deletions
  1. 4
    4
      src/drivers/net/eepro.c
  2. 2
    2
      src/drivers/net/epic100.c
  3. 3
    5
      src/drivers/net/forcedeth.c

+ 4
- 4
src/drivers/net/eepro.c View File

567
 	station_addr.saddr[1] = read_eeprom(nic->ioaddr,3);
567
 	station_addr.saddr[1] = read_eeprom(nic->ioaddr,3);
568
 	station_addr.saddr[0] = read_eeprom(nic->ioaddr,4);
568
 	station_addr.saddr[0] = read_eeprom(nic->ioaddr,4);
569
 	if (l_eepro)
569
 	if (l_eepro)
570
-		dev->name = "Intel EtherExpress 10 ISA";
570
+		isa->name = "Intel EtherExpress 10 ISA";
571
 	else if (read_eeprom(nic->ioaddr,7) == ee_FX_INT2IRQ) {
571
 	else if (read_eeprom(nic->ioaddr,7) == ee_FX_INT2IRQ) {
572
-		dev->name = "Intel EtherExpress Pro/10+ ISA";
572
+		isa->name = "Intel EtherExpress Pro/10+ ISA";
573
 		l_eepro = 2;
573
 		l_eepro = 2;
574
 	} else if (station_addr.saddr[0] == SA_ADDR1) {
574
 	} else if (station_addr.saddr[0] == SA_ADDR1) {
575
-		dev->name = "Intel EtherExpress Pro/10 ISA";
575
+		isa->name = "Intel EtherExpress Pro/10 ISA";
576
 		l_eepro = 1;
576
 		l_eepro = 1;
577
 	} else {
577
 	} else {
578
 		l_eepro = 0;
578
 		l_eepro = 0;
579
-		dev->name = "Intel 82595-based LAN card";
579
+		isa->name = "Intel 82595-based LAN card";
580
 	}
580
 	}
581
 	station_addr.saddr[0] = swap16(station_addr.saddr[0]);
581
 	station_addr.saddr[0] = swap16(station_addr.saddr[0]);
582
 	station_addr.saddr[1] = swap16(station_addr.saddr[1]);
582
 	station_addr.saddr[1] = swap16(station_addr.saddr[1]);

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

412
 }
412
 }
413
 
413
 
414
 
414
 
415
-    static void
416
-epic100_disable ( struct nic *nic __unused ) {
415
+static void epic100_disable ( struct nic *nic __unused,
416
+			      struct pci_device *pci __unused ) {
417
 	/* Soft reset the chip. */
417
 	/* Soft reset the chip. */
418
 	outl(GC_SOFT_RESET, genctl);
418
 	outl(GC_SOFT_RESET, genctl);
419
 }
419
 }

+ 3
- 5
src/drivers/net/forcedeth.c View File

951
 		return 0;
951
 		return 0;
952
 
952
 
953
 	printf("forcedeth.c: Found %s, vendor=0x%hX, device=0x%hX\n",
953
 	printf("forcedeth.c: Found %s, vendor=0x%hX, device=0x%hX\n",
954
-	       dev->name, pci->vendor, pci->dev_id);
954
+	       pci->name, pci->vendor_id, pci->device_id);
955
 
955
 
956
-	nic->irqno  = 0;
957
 	pci_fill_nic ( nic, pci );
956
 	pci_fill_nic ( nic, pci );
958
-	nic->ioaddr = pci->ioaddr;
959
 
957
 
960
 	/* point to private storage */
958
 	/* point to private storage */
961
 	np = &npx;
959
 	np = &npx;
1003
 		get_random_bytes(&dev->dev_addr[3], 3);
1001
 		get_random_bytes(&dev->dev_addr[3], 3);
1004
 	}
1002
 	}
1005
 #endif
1003
 #endif
1006
-	printf("%s: MAC Address %!, ", dev->name, nic->node_addr);
1004
+	printf("%s: MAC Address %!, ", pci->name, nic->node_addr);
1007
 
1005
 
1008
 	np->tx_flags =
1006
 	np->tx_flags =
1009
 	    cpu_to_le16(NV_TX_LASTPACKET | NV_TX_LASTPACKET1 |
1007
 	    cpu_to_le16(NV_TX_LASTPACKET | NV_TX_LASTPACKET1 |
1010
 			NV_TX_VALID);
1008
 			NV_TX_VALID);
1011
-	switch (pci->dev_id) {
1009
+	switch (pci->device_id) {
1012
 	case 0x01C3:		// nforce
1010
 	case 0x01C3:		// nforce
1013
 		np->irqmask = NVREG_IRQMASK_WANTED_2;
1011
 		np->irqmask = NVREG_IRQMASK_WANTED_2;
1014
 		np->irqmask |= NVREG_IRQ_TIMER;
1012
 		np->irqmask |= NVREG_IRQ_TIMER;

Loading…
Cancel
Save