Commit 3bcaef6a authored by Stephen Hemminger's avatar Stephen Hemminger

[PATCH] (09/12) Probe2 -- arlan

Convert arlan driver to new probing.  This meant a rather large
rework of the probing code for this driver since it did a lot ofnon
standard things.
parent fd60992e
...@@ -59,7 +59,7 @@ extern int i82596_probe(struct net_device *); ...@@ -59,7 +59,7 @@ extern int i82596_probe(struct net_device *);
extern int ewrk3_probe(struct net_device *); extern int ewrk3_probe(struct net_device *);
extern int el1_probe(struct net_device *); extern int el1_probe(struct net_device *);
extern int wavelan_probe(struct net_device *); extern int wavelan_probe(struct net_device *);
extern int arlan_probe(struct net_device *); extern struct net_device *arlan_probe(int unit);
extern struct net_device *el16_probe(int unit); extern struct net_device *el16_probe(int unit);
extern int elmc_probe(struct net_device *); extern int elmc_probe(struct net_device *);
extern int skmca_probe(struct net_device *); extern int skmca_probe(struct net_device *);
...@@ -267,14 +267,14 @@ static struct devprobe isa_probes[] __initdata = { ...@@ -267,14 +267,14 @@ static struct devprobe isa_probes[] __initdata = {
#endif #endif
#ifdef CONFIG_WAVELAN /* WaveLAN */ #ifdef CONFIG_WAVELAN /* WaveLAN */
{wavelan_probe, 0}, {wavelan_probe, 0},
#endif
#ifdef CONFIG_ARLAN /* Aironet */
{arlan_probe, 0},
#endif #endif
{NULL, 0}, {NULL, 0},
}; };
static struct devprobe2 isa_probes2[] __initdata = { static struct devprobe2 isa_probes2[] __initdata = {
#ifdef CONFIG_ARLAN /* Aironet */
{arlan_probe, 0},
#endif
#ifdef CONFIG_EL16 /* 3c507 */ #ifdef CONFIG_EL16 /* 3c507 */
{el16_probe, 0}, {el16_probe, 0},
#endif #endif
......
This diff is collapsed.
...@@ -57,12 +57,8 @@ extern int arlan_command(struct net_device * dev, int command); ...@@ -57,12 +57,8 @@ extern int arlan_command(struct net_device * dev, int command);
#define SIDUNKNOWN -1 #define SIDUNKNOWN -1
#define radioNodeIdUNKNOWN -1 #define radioNodeIdUNKNOWN -1
#define encryptionKeyUNKNOWN '\0';
#define irqUNKNOWN 0 #define irqUNKNOWN 0
#define memUNKNOWN 0
#define debugUNKNOWN 0 #define debugUNKNOWN 0
#define probeUNKNOWN 1
#define numDevicesUNKNOWN 1
#define testMemoryUNKNOWN 1 #define testMemoryUNKNOWN 1
#define spreadingCodeUNKNOWN 0 #define spreadingCodeUNKNOWN 0
#define channelNumberUNKNOWN 0 #define channelNumberUNKNOWN 0
...@@ -82,6 +78,8 @@ extern int arlan_command(struct net_device * dev, int command); ...@@ -82,6 +78,8 @@ extern int arlan_command(struct net_device * dev, int command);
#define ARLAN_DEBUG(a,b) #define ARLAN_DEBUG(a,b)
#endif #endif
#define ARLAN_SHMEM_SIZE 0x2000
struct arlan_shmem struct arlan_shmem
{ {
/* Header Signature */ /* Header Signature */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment