[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: NIC problem
|
From: |
Michael Banck |
|
Subject: |
Re: NIC problem |
|
Date: |
Mon, 2 Feb 2004 23:10:27 +0100 |
|
User-agent: |
Mutt/1.5.4i |
On Mon, Feb 02, 2004 at 09:56:17PM +0100, Michael Banck wrote:
> The latest vortex driver seems to have changed quite a bit, it can be
> found at ftp://ftp.scyld.com/pub/network/3c59x.c, I haven't looked
> closely at intermediate version yet.
This seems to be the patch for the 3c556 (I still don't know what kind
of NIC the original poster has, but I will try to test this for my
notebook soon and else I might forget). It applies to the gnumach-1.x
version with a bit of offset, except for hunk 1 (the changelog and
version string):
--- 3c59x.c.old 2004-02-02 23:03:18.000000000 +0100
+++ 3c59x.c.new 2004-02-02 23:02:58.000000000 +0100
@@ -51,11 +51,14 @@
- Fixed crash under OOM during vortex_open() (Mark Hemment)
- Fix Rx cessation problem during OOM (help from Mark Hemment)
+ 01Aug00 <2.2.17-pre14> andrewm
+ - Added 3c556 support (Fred Maciel)
+
- See http://www.uow.edu.au/~andrewm/linux/#3c59x-2.2 for more details.
*/
static char *version =
-"3c59x.c:v0.99H 24Jun00 Donald Becker and others
http://www.scyld.com/network/vortex.html\n";;
+"3c59x.c:v0.99H 01Aug00 Donald Becker and others
http://www.scyld.com/network/vortex.html\n";;
/* "Knobs" that adjust features and parameters. */
/* Set the copy breakpoint for the copy-only-tiny-frames scheme.
@@ -325,6 +328,8 @@
PCI_USES_IO|PCI_USES_MASTER, IS_CYCLONE, 128, vortex_probe1},
{"3c555 Laptop Hurricane", 0x10B7, 0x5055, 0xffff,
PCI_USES_IO|PCI_USES_MASTER, IS_CYCLONE, 128, vortex_probe1},
+ {"3c556 10/100 Mini PCI Adapter", 0x10B7, 0x6055, 0xffff,
+ PCI_USES_IO|PCI_USES_MASTER, IS_CYCLONE|HAS_CB_FNS, 128,
vortex_probe1},
{"3c575 Boomerang CardBus", 0x10B7, 0x5057, 0xffff,
PCI_USES_IO|PCI_USES_MASTER, IS_BOOMERANG|HAS_MII, 64, vortex_probe1},
{"3CCFE575 Cyclone CardBus", 0x10B7, 0x5157, 0xffff,
@@ -915,7 +920,11 @@
#ifdef CARDBUS
outw(0x230 + i, ioaddr + Wn0EepromCmd);
#else
- outw(EEPROM_Read + i, ioaddr + Wn0EepromCmd);
+ if (pci_tbl[chip_idx].device_id == 0x6055) {
+ outw(0x230 + i, ioaddr + Wn0EepromCmd);
+ } else {
+ outw(EEPROM_Read + i, ioaddr + Wn0EepromCmd);
+ }
#endif
/* Pause for at least 162 us. for the read to take place. */
for (timer = 10; timer >= 0; timer--) {
@@ -959,7 +968,11 @@
printk("%s: CardBus functions mapped %8.8x->%p (PCMCIA
committee"
" brain-damage).\n", dev->name, fn_st_addr,
vp->cb_fn_base);
EL3WINDOW(2);
- outw(0x10 | inw(ioaddr + Wn2_ResetOptions), ioaddr +
Wn2_ResetOptions);
+ if (pci_tbl[chip_idx].device_id == 0x6055) {
+ outw(0x4010 | inw(ioaddr + Wn2_ResetOptions), ioaddr +
Wn2_ResetOptions);
+ } else {
+ outw(0x10 | inw(ioaddr + Wn2_ResetOptions), ioaddr +
Wn2_ResetOptions);
+ }
}
/* Extract our information from the EEPROM data. */
Michael