Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c08bf10 authored by Atsushi Nemoto's avatar Atsushi Nemoto Committed by Jeff Garzik
Browse files

ne: Add NEEDS_PORTLIST to control ISA auto-probe 



Add NEEDS_PORTLIST cpp macro to control ISA auto-probe.
(I'm not sure M32R needs auto-probe but it is current behavior)

Signed-off-by: default avatarAtsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent f0e93c10

drivers/net/ne.c

+8 −3
Original line number Original line Diff line number Diff line
@@ -78,8 +78,13 @@ static const char version2[] = 
/* Do we have a non std. amount of memory? (in units of 256 byte pages) */

/* Do we have a non std. amount of memory? (in units of 256 byte pages) */

/* #define PACKETBUF_MEMSIZE	0x40 */

/* #define PACKETBUF_MEMSIZE	0x40 */





#if !defined(MODULE) && (defined(CONFIG_ISA) || defined(CONFIG_M32R))

/* Do we need a portlist for the ISA auto-probe ? */

#define NEEDS_PORTLIST

#endif



/* A zero-terminated list of I/O addresses to be probed at boot. */

/* A zero-terminated list of I/O addresses to be probed at boot. */

#ifndef MODULE

#ifdef NEEDS_PORTLIST

static unsigned int netcard_portlist[] __initdata = {

static unsigned int netcard_portlist[] __initdata = {

	0x300, 0x280, 0x320, 0x340, 0x360, 0x380, 0

	0x300, 0x280, 0x320, 0x340, 0x360, 0x380, 0

};

};
@@ -186,7 +191,7 @@ static void ne_block_output(struct net_device *dev, const int count, 
static int __init do_ne_probe(struct net_device *dev)

static int __init do_ne_probe(struct net_device *dev)

{

{

	unsigned long base_addr = dev->base_addr;

	unsigned long base_addr = dev->base_addr;

#ifndef MODULE

#ifdef NEEDS_PORTLIST

	int orig_irq = dev->irq;

	int orig_irq = dev->irq;

#endif

#endif
@@ -202,7 +207,7 @@ static int __init do_ne_probe(struct net_device *dev) 
	if (isapnp_present() && (ne_probe_isapnp(dev) == 0))

	if (isapnp_present() && (ne_probe_isapnp(dev) == 0))

		return 0;

		return 0;





#ifndef MODULE

#ifdef NEEDS_PORTLIST

	/* Last resort. The semi-risky ISA auto-probe. */

	/* Last resort. The semi-risky ISA auto-probe. */

	for (base_addr = 0; netcard_portlist[base_addr] != 0; base_addr++) {

	for (base_addr = 0; netcard_portlist[base_addr] != 0; base_addr++) {

		int ioaddr = netcard_portlist[base_addr];

		int ioaddr = netcard_portlist[base_addr];