From: Jeff Muizelaar <muizelaar@rogers.com>
To: Jeff Garzik <jgarzik@pobox.com>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: [PATCH 4/4] NE2000 driver updates
Date: Thu, 01 May 2003 13:47:43 -0400 [thread overview]
Message-ID: <3EB15DBF.3060608@rogers.com> (raw)
In-Reply-To: <3EB15127.2060409@rogers.com>
[-- Attachment #1: Type: text/plain, Size: 1 bytes --]
[-- Attachment #2: ne-bad.patch --]
[-- Type: text/plain, Size: 2667 bytes --]
--- linux-2.5.66-nelist/drivers/net/ne.c 2003-05-01 11:05:56.000000000 -0400
+++ linux-2.5.66-nebad/drivers/net/ne.c 2003-05-01 11:18:19.000000000 -0400
@@ -145,10 +145,10 @@
static int ne_legacy_probe(unsigned long base_addr, unsigned long irq, unsigned long bad);
-static int ne_probe1(struct net_device *dev, int ioaddr);
+static int ne_probe1(struct net_device *dev, int ioaddr, int bad);
static int ne_create(struct net_device **ndev, unsigned long base_addr,
- unsigned long irq, unsigned long bad);
+ unsigned long irq, int bad);
static void ne_remove(struct net_device *dev);
static int ne_open(struct net_device *dev);
@@ -223,7 +223,7 @@
return err;
}
-static int ne_create(struct net_device **ndev, unsigned long base_addr, unsigned long irq, unsigned long bad)
+static int ne_create(struct net_device **ndev, unsigned long base_addr, unsigned long irq, int bad)
{
int err;
@@ -237,7 +237,7 @@
(*ndev)->mem_end = bad;
SET_MODULE_OWNER(*ndev);
- if (ne_probe1(*ndev, (*ndev)->base_addr) != 0) { /* Shouldn't happen. */
+ if (ne_probe1(*ndev, (*ndev)->base_addr, bad) != 0) { /* Shouldn't happen. */
printk(KERN_ERR "ne.c: Probe at %#lx failed\n", (*ndev)->base_addr);
err = -ENXIO;
goto probe_fail;
@@ -268,14 +268,14 @@
}
}
-static int __init ne_probe1(struct net_device *dev, int ioaddr)
+static int __init ne_probe1(struct net_device *dev, int ioaddr, int bad_card)
{
int i;
unsigned char SA_prom[32];
int wordlength = 2;
const char *name = NULL;
int start_page, stop_page;
- int neX000, ctron, copam, bad_card;
+ int neX000, ctron, copam;
int reg0, ret;
static unsigned version_printed;
@@ -311,11 +311,8 @@
/* A user with a poor card that fails to ack the reset, or that
does not have a valid 0x57,0x57 signature can still use this
- without having to recompile. Specifying an i/o address along
- with an otherwise unused dev->mem_end value of "0xBAD" will
- cause the driver to skip these parts of the probe. */
-
- bad_card = ((dev->base_addr != 0) && (dev->mem_end == 0xbad));
+ without having to recompile. Specifying a bad card will cause
+ the driver to skip these parts of the probe. */
/* Reset card. Who knows what dain-bramaged state it was left in. */
@@ -766,7 +763,7 @@
#define MAX_NE_CARDS 4 /* Max number of NE cards per module */
static int io[MAX_NE_CARDS];
static int irq[MAX_NE_CARDS];
-static int bad[MAX_NE_CARDS]; /* 0xbad = bad sig or no reset ack */
+static int bad[MAX_NE_CARDS]; /* bad sig or no reset ack */
MODULE_PARM(io, "1-" __MODULE_STRING(MAX_NE_CARDS) "i");
MODULE_PARM(irq, "1-" __MODULE_STRING(MAX_NE_CARDS) "i");
next prev parent reply other threads:[~2003-05-01 17:35 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-05-01 16:53 [PATCH 0/4] NE2000 driver updates Jeff Muizelaar
2003-05-01 16:58 ` [PATCH 1/4] " Jeff Muizelaar
2003-05-01 16:59 ` [PATCH 2/4] " Jeff Muizelaar
2003-05-01 16:59 ` [PATCH 3/4] " Jeff Muizelaar
2003-05-01 17:08 ` Jeff Muizelaar
2003-05-01 17:47 ` Jeff Muizelaar [this message]
2003-05-01 19:23 ` [PATCH 0/4] " Alan Cox
2003-05-01 23:29 ` Jeff Muizelaar
2003-05-02 14:01 ` Alan Cox
2003-05-02 15:57 ` Jeff Garzik
2003-05-02 15:24 ` Alan Cox
2003-05-02 16:29 ` Riley Williams
2003-05-14 2:01 ` Jeff Muizelaar
2003-05-14 21:51 ` Adam Belay
2003-05-15 3:01 ` Jeff Muizelaar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3EB15DBF.3060608@rogers.com \
--to=muizelaar@rogers.com \
--cc=jgarzik@pobox.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox