Skip to content

L
linux
Commit cb334648 authored by Joe Perches's avatar Joe Perches Committed by Michael Grzeschik
Browse files
Options

arcnet: Use normal kernel spacing style 

Standardized spacing is easier to read.

git diff -w shows no differences.
objdiff shows no differences.
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarMichael Grzeschik <m.grzeschik@pengutronix.de>
parent 37587fad
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 394 additions and 394 deletions
drivers/net/arcnet/arc-rawmode.c
View file @ cb334648
/* /*
* Linux ARCnet driver - "raw mode" packet encapsulation (no soft headers) * Linux ARCnet driver - "raw mode" packet encapsulation (no soft headers)
* *
* Written 1994-1999 by Avery Pennarun. * Written 1994-1999 by Avery Pennarun.
* Derived from skeleton.c by Donald Becker. * Derived from skeleton.c by Donald Becker.
* *
...@@ -109,7 +109,7 @@ static void rx(struct net_device *dev, int bufnum, ...@@ -109,7 +109,7 @@ static void rx(struct net_device *dev, int bufnum,
skb_put(skb, length + ARC_HDR_SIZE); skb_put(skb, length + ARC_HDR_SIZE);
skb->dev = dev; skb->dev = dev;
pkt = (struct archdr *) skb->data; pkt = (struct archdr *)skb->data;
skb_reset_mac_header(skb); skb_reset_mac_header(skb);
skb_pull(skb, ARC_HDR_SIZE); skb_pull(skb, ARC_HDR_SIZE);
...@@ -136,7 +136,7 @@ static int build_header(struct sk_buff *skb, struct net_device *dev, ...@@ -136,7 +136,7 @@ static int build_header(struct sk_buff *skb, struct net_device *dev,
unsigned short type, uint8_t daddr) unsigned short type, uint8_t daddr)
{ {
int hdr_size = ARC_HDR_SIZE; int hdr_size = ARC_HDR_SIZE;
struct archdr *pkt = (struct archdr *) skb_push(skb, hdr_size); struct archdr *pkt = (struct archdr *)skb_push(skb, hdr_size);
/* /*
* Set the source hardware address. * Set the source hardware address.
...@@ -150,7 +150,7 @@ static int build_header(struct sk_buff *skb, struct net_device *dev, ...@@ -150,7 +150,7 @@ static int build_header(struct sk_buff *skb, struct net_device *dev,
/* see linux/net/ethernet/eth.c to see where I got the following */ /* see linux/net/ethernet/eth.c to see where I got the following */
if (dev->flags & (IFF_LOOPBACK | IFF_NOARP)) { if (dev->flags & (IFF_LOOPBACK | IFF_NOARP)) {
/* /*
* FIXME: fill in the last byte of the dest ipaddr here to better * FIXME: fill in the last byte of the dest ipaddr here to better
* comply with RFC1051 in "noarp" mode. * comply with RFC1051 in "noarp" mode.
*/ */
...@@ -192,7 +192,7 @@ static int prepare_tx(struct net_device *dev, struct archdr *pkt, int length, ...@@ -192,7 +192,7 @@ static int prepare_tx(struct net_device *dev, struct archdr *pkt, int length,
hard->offset[0] = ofs = 256 - length; hard->offset[0] = ofs = 256 - length;
BUGMSG(D_DURING, "prepare_tx: length=%d ofs=%d\n", BUGMSG(D_DURING, "prepare_tx: length=%d ofs=%d\n",
length,ofs); length, ofs);
lp->hw.copy_to_card(dev, bufnum, 0, hard, ARC_HDR_SIZE); lp->hw.copy_to_card(dev, bufnum, 0, hard, ARC_HDR_SIZE);
lp->hw.copy_to_card(dev, bufnum, ofs, &pkt->soft, length); lp->hw.copy_to_card(dev, bufnum, ofs, &pkt->soft, length);
......
drivers/net/arcnet/arc-rimi.c
View file @ cb334648
/* /*
* Linux ARCnet driver - "RIM I" (entirely mem-mapped) cards * Linux ARCnet driver - "RIM I" (entirely mem-mapped) cards
* *
* Written 1994-1999 by Avery Pennarun. * Written 1994-1999 by Avery Pennarun.
* Written 1999-2000 by Martin Mares <mj@ucw.cz>. * Written 1999-2000 by Martin Mares <mj@ucw.cz>.
* Derived from skeleton.c by Donald Becker. * Derived from skeleton.c by Donald Becker.
...@@ -56,27 +56,27 @@ static void arcrimi_copy_from_card(struct net_device *dev, int bufnum, int offse ...@@ -56,27 +56,27 @@ static void arcrimi_copy_from_card(struct net_device *dev, int bufnum, int offse
/* Handy defines for ARCnet specific stuff */ /* Handy defines for ARCnet specific stuff */
/* Amount of I/O memory used by the card */ /* Amount of I/O memory used by the card */
#define BUFFER_SIZE (512) #define BUFFER_SIZE (512)
#define MIRROR_SIZE (BUFFER_SIZE*4) #define MIRROR_SIZE (BUFFER_SIZE * 4)
/* COM 9026 controller chip --> ARCnet register addresses */ /* COM 9026 controller chip --> ARCnet register addresses */
#define _INTMASK (ioaddr+0) /* writable */ #define _INTMASK (ioaddr + 0) /* writable */
#define _STATUS (ioaddr+0) /* readable */ #define _STATUS (ioaddr + 0) /* readable */
#define _COMMAND (ioaddr+1) /* writable, returns random vals on read (?) */ #define _COMMAND (ioaddr + 1) /* writable, returns random vals on read (?) */
#define _RESET (ioaddr+8) /* software reset (on read) */ #define _RESET (ioaddr + 8) /* software reset (on read) */
#define _MEMDATA (ioaddr+12) /* Data port for IO-mapped memory */ #define _MEMDATA (ioaddr + 12) /* Data port for IO-mapped memory */
#define _ADDR_HI (ioaddr+15) /* Control registers for said */ #define _ADDR_HI (ioaddr + 15) /* Control registers for said */
#define _ADDR_LO (ioaddr+14) #define _ADDR_LO (ioaddr + 14)
#define _CONFIG (ioaddr+2) /* Configuration register */ #define _CONFIG (ioaddr + 2) /* Configuration register */
#undef ASTATUS #undef ASTATUS
#undef ACOMMAND #undef ACOMMAND
#undef AINTMASK #undef AINTMASK
#define ASTATUS() readb(_STATUS) #define ASTATUS() readb(_STATUS)
#define ACOMMAND(cmd) writeb((cmd),_COMMAND) #define ACOMMAND(cmd) writeb((cmd), _COMMAND)
#define AINTMASK(msk) writeb((msk),_INTMASK) #define AINTMASK(msk) writeb((msk), _INTMASK)
#define SETCONF() writeb(lp->config,_CONFIG) #define SETCONF() writeb(lp->config, _CONFIG)
/* /*
...@@ -90,7 +90,7 @@ static int __init arcrimi_probe(struct net_device *dev) ...@@ -90,7 +90,7 @@ static int __init arcrimi_probe(struct net_device *dev)
BUGLVL(D_NORMAL) printk("E-mail me if you actually test the RIM I driver, please!\n"); BUGLVL(D_NORMAL) printk("E-mail me if you actually test the RIM I driver, please!\n");
BUGLVL(D_NORMAL) printk("Given: node %02Xh, shmem %lXh, irq %d\n", BUGLVL(D_NORMAL) printk("Given: node %02Xh, shmem %lXh, irq %d\n",
dev->dev_addr[0], dev->mem_start, dev->irq); dev->dev_addr[0], dev->mem_start, dev->irq);
if (dev->mem_start <= 0 || dev->irq <= 0) { if (dev->mem_start <= 0 || dev->irq <= 0) {
BUGLVL(D_NORMAL) printk("No autoprobe for RIM I; you " BUGLVL(D_NORMAL) printk("No autoprobe for RIM I; you "
......
drivers/net/arcnet/arcnet.c
View file @ cb334648
This diff is collapsed.
drivers/net/arcnet/capmode.c
View file @ cb334648
...@@ -71,12 +71,12 @@ static void rx(struct net_device *dev, int bufnum, ...@@ -71,12 +71,12 @@ static void rx(struct net_device *dev, int bufnum,
/* use these variables to be sure we count in bytes, not in /* use these variables to be sure we count in bytes, not in
sizeof(struct archdr) */ sizeof(struct archdr) */
pktbuf=(char*)pkt; pktbuf = (char *)pkt;
pkthdrbuf=(char*)pkthdr; pkthdrbuf = (char *)pkthdr;
memcpy(pktbuf, pkthdrbuf, ARC_HDR_SIZE+sizeof(pkt->soft.cap.proto)); memcpy(pktbuf, pkthdrbuf, ARC_HDR_SIZE + sizeof(pkt->soft.cap.proto));
memcpy(pktbuf+ARC_HDR_SIZE+sizeof(pkt->soft.cap.proto)+sizeof(int), memcpy(pktbuf + ARC_HDR_SIZE + sizeof(pkt->soft.cap.proto) + sizeof(int),
pkthdrbuf+ARC_HDR_SIZE+sizeof(pkt->soft.cap.proto), pkthdrbuf + ARC_HDR_SIZE + sizeof(pkt->soft.cap.proto),
sizeof(struct archdr)-ARC_HDR_SIZE-sizeof(pkt->soft.cap.proto)); sizeof(struct archdr) - ARC_HDR_SIZE - sizeof(pkt->soft.cap.proto));
if (length > sizeof(pkt->soft)) if (length > sizeof(pkt->soft))
lp->hw.copy_from_card(dev, bufnum, ofs + sizeof(pkt->soft), lp->hw.copy_from_card(dev, bufnum, ofs + sizeof(pkt->soft),
...@@ -101,10 +101,10 @@ static int build_header(struct sk_buff *skb, ...@@ -101,10 +101,10 @@ static int build_header(struct sk_buff *skb,
uint8_t daddr) uint8_t daddr)
{ {
int hdr_size = ARC_HDR_SIZE; int hdr_size = ARC_HDR_SIZE;
struct archdr *pkt = (struct archdr *) skb_push(skb, hdr_size); struct archdr *pkt = (struct archdr *)skb_push(skb, hdr_size);
BUGMSG(D_PROTO, "Preparing header for cap packet %x.\n", BUGMSG(D_PROTO, "Preparing header for cap packet %x.\n",
*((int*)&pkt->soft.cap.cookie[0])); *((int *)&pkt->soft.cap.cookie[0]));
/* /*
* Set the source hardware address. * Set the source hardware address.
* *
...@@ -148,7 +148,7 @@ static int prepare_tx(struct net_device *dev, struct archdr *pkt, int length, ...@@ -148,7 +148,7 @@ static int prepare_tx(struct net_device *dev, struct archdr *pkt, int length,
lp->next_tx, lp->cur_tx, bufnum); lp->next_tx, lp->cur_tx, bufnum);
BUGMSG(D_PROTO, "Sending for cap packet %x.\n", BUGMSG(D_PROTO, "Sending for cap packet %x.\n",
*((int*)&pkt->soft.cap.cookie[0])); *((int *)&pkt->soft.cap.cookie[0]));
if (length > XMTU) { if (length > XMTU) {
/* should never happen! other people already check for this. */ /* should never happen! other people already check for this. */
...@@ -166,7 +166,7 @@ static int prepare_tx(struct net_device *dev, struct archdr *pkt, int length, ...@@ -166,7 +166,7 @@ static int prepare_tx(struct net_device *dev, struct archdr *pkt, int length,
hard->offset[0] = ofs = 256 - length; hard->offset[0] = ofs = 256 - length;
BUGMSG(D_DURING, "prepare_tx: length=%d ofs=%d\n", BUGMSG(D_DURING, "prepare_tx: length=%d ofs=%d\n",
length,ofs); length, ofs);
/* Copy the arcnet-header + the protocol byte down: */ /* Copy the arcnet-header + the protocol byte down: */
lp->hw.copy_to_card(dev, bufnum, 0, hard, ARC_HDR_SIZE); lp->hw.copy_to_card(dev, bufnum, 0, hard, ARC_HDR_SIZE);
...@@ -175,8 +175,8 @@ static int prepare_tx(struct net_device *dev, struct archdr *pkt, int length, ...@@ -175,8 +175,8 @@ static int prepare_tx(struct net_device *dev, struct archdr *pkt, int length,
/* Skip the extra integer we have written into it as a cookie /* Skip the extra integer we have written into it as a cookie
but write the rest of the message: */ but write the rest of the message: */
lp->hw.copy_to_card(dev, bufnum, ofs+1, lp->hw.copy_to_card(dev, bufnum, ofs + 1,
((unsigned char*)&pkt->soft.cap.mes),length-1); ((unsigned char *)&pkt->soft.cap.mes), length - 1);
lp->lastload_dest = hard->dest; lp->lastload_dest = hard->dest;
...@@ -188,21 +188,21 @@ static int ack_tx(struct net_device *dev, int acked) ...@@ -188,21 +188,21 @@ static int ack_tx(struct net_device *dev, int acked)
struct arcnet_local *lp = netdev_priv(dev); struct arcnet_local *lp = netdev_priv(dev);
struct sk_buff *ackskb; struct sk_buff *ackskb;
struct archdr *ackpkt; struct archdr *ackpkt;
int length=sizeof(struct arc_cap); int length = sizeof(struct arc_cap);
BUGMSG(D_DURING, "capmode: ack_tx: protocol: %x: result: %d\n", BUGMSG(D_DURING, "capmode: ack_tx: protocol: %x: result: %d\n",
lp->outgoing.skb->protocol, acked); lp->outgoing.skb->protocol, acked);
BUGLVL(D_SKB) arcnet_dump_skb(dev, lp->outgoing.skb, "ack_tx"); BUGLVL(D_SKB) arcnet_dump_skb(dev, lp->outgoing.skb, "ack_tx");
/* Now alloc a skb to send back up through the layers: */ /* Now alloc a skb to send back up through the layers: */
ackskb = alloc_skb(length + ARC_HDR_SIZE , GFP_ATOMIC); ackskb = alloc_skb(length + ARC_HDR_SIZE, GFP_ATOMIC);
if (ackskb == NULL) { if (ackskb == NULL) {
BUGMSG(D_NORMAL, "Memory squeeze, can't acknowledge.\n"); BUGMSG(D_NORMAL, "Memory squeeze, can't acknowledge.\n");
goto free_outskb; goto free_outskb;
} }
skb_put(ackskb, length + ARC_HDR_SIZE ); skb_put(ackskb, length + ARC_HDR_SIZE);
ackskb->dev = dev; ackskb->dev = dev;
skb_reset_mac_header(ackskb); skb_reset_mac_header(ackskb);
...@@ -212,10 +212,10 @@ static int ack_tx(struct net_device *dev, int acked) ...@@ -212,10 +212,10 @@ static int ack_tx(struct net_device *dev, int acked)
skb_copy_from_linear_data(lp->outgoing.skb, ackpkt, skb_copy_from_linear_data(lp->outgoing.skb, ackpkt,
ARC_HDR_SIZE + sizeof(struct arc_cap)); ARC_HDR_SIZE + sizeof(struct arc_cap));
ackpkt->soft.cap.proto = 0; /* using protocol 0 for acknowledge */ ackpkt->soft.cap.proto = 0; /* using protocol 0 for acknowledge */
ackpkt->soft.cap.mes.ack=acked; ackpkt->soft.cap.mes.ack = acked;
BUGMSG(D_PROTO, "Ackknowledge for cap packet %x.\n", BUGMSG(D_PROTO, "Ackknowledge for cap packet %x.\n",
*((int*)&ackpkt->soft.cap.cookie[0])); *((int *)&ackpkt->soft.cap.cookie[0]));
ackskb->protocol = cpu_to_be16(ETH_P_ARCNET); ackskb->protocol = cpu_to_be16(ETH_P_ARCNET);
......
drivers/net/arcnet/com20020-isa.c
View file @ cb334648
/* /*
* Linux ARCnet driver - COM20020 chipset support * Linux ARCnet driver - COM20020 chipset support
* *
* Written 1997 by David Woodhouse. * Written 1997 by David Woodhouse.
* Written 1994-1999 by Avery Pennarun. * Written 1994-1999 by Avery Pennarun.
* Written 1999-2000 by Martin Mares <mj@ucw.cz>. * Written 1999-2000 by Martin Mares <mj@ucw.cz>.
......
drivers/net/arcnet/com20020-pci.c
View file @ cb334648
/* /*
* Linux ARCnet driver - COM20020 PCI support * Linux ARCnet driver - COM20020 PCI support
* Contemporary Controls PCI20 and SOHARD SH-ARC PCI * Contemporary Controls PCI20 and SOHARD SH-ARC PCI
* *
* Written 1994-1999 by Avery Pennarun, * Written 1994-1999 by Avery Pennarun,
* based on an ISA version by David Woodhouse. * based on an ISA version by David Woodhouse.
* Written 1999-2000 by Martin Mares <mj@ucw.cz>. * Written 1999-2000 by Martin Mares <mj@ucw.cz>.
......
drivers/net/arcnet/com20020.c
View file @ cb334648
/* /*
* Linux ARCnet driver - COM20020 chipset support * Linux ARCnet driver - COM20020 chipset support
* *
* Written 1997 by David Woodhouse. * Written 1997 by David Woodhouse.
* Written 1994-1999 by Avery Pennarun. * Written 1994-1999 by Avery Pennarun.
* Written 1999 by Martin Mares <mj@ucw.cz>. * Written 1999 by Martin Mares <mj@ucw.cz>.
...@@ -108,7 +108,7 @@ int com20020_check(struct net_device *dev) ...@@ -108,7 +108,7 @@ int com20020_check(struct net_device *dev)
{ {
SET_SUBADR(SUB_SETUP2); SET_SUBADR(SUB_SETUP2);
outb(lp->setup2, _XREG); outb(lp->setup2, _XREG);
/* must now write the magic "restart operation" command */ /* must now write the magic "restart operation" command */
mdelay(1); mdelay(1);
outb(0x18, _COMMAND); outb(0x18, _COMMAND);
...@@ -117,7 +117,7 @@ int com20020_check(struct net_device *dev) ...@@ -117,7 +117,7 @@ int com20020_check(struct net_device *dev)
lp->config = 0x21 | (lp->timeout << 3) | (lp->backplane << 2); lp->config = 0x21 | (lp->timeout << 3) | (lp->backplane << 2);
/* set node ID to 0x42 (but transmitter is disabled, so it's okay) */ /* set node ID to 0x42 (but transmitter is disabled, so it's okay) */
SETCONF; SETCONF;
outb(0x42, ioaddr + BUS_ALIGN*7); outb(0x42, ioaddr + BUS_ALIGN * 7);
status = ASTATUS(); status = ASTATUS();
...@@ -129,7 +129,7 @@ int com20020_check(struct net_device *dev) ...@@ -129,7 +129,7 @@ int com20020_check(struct net_device *dev)
/* Enable TX */ /* Enable TX */
outb(0x39, _CONFIG); outb(0x39, _CONFIG);
outb(inb(ioaddr + BUS_ALIGN*8), ioaddr + BUS_ALIGN*7); outb(inb(ioaddr + BUS_ALIGN * 8), ioaddr + BUS_ALIGN * 7);
ACOMMAND(CFLAGScmd | RESETclear | CONFIGclear); ACOMMAND(CFLAGScmd | RESETclear | CONFIGclear);
...@@ -193,7 +193,7 @@ int com20020_found(struct net_device *dev, int shared) ...@@ -193,7 +193,7 @@ int com20020_found(struct net_device *dev, int shared)
lp->hw.close = com20020_close; lp->hw.close = com20020_close;
if (!dev->dev_addr[0]) if (!dev->dev_addr[0])
dev->dev_addr[0] = inb(ioaddr + BUS_ALIGN*8); /* FIXME: do this some other way! */ dev->dev_addr[0] = inb(ioaddr + BUS_ALIGN * 8); /* FIXME: do this some other way! */
SET_SUBADR(SUB_SETUP1); SET_SUBADR(SUB_SETUP1);
outb(lp->setup, _XREG); outb(lp->setup, _XREG);
...@@ -202,7 +202,7 @@ int com20020_found(struct net_device *dev, int shared) ...@@ -202,7 +202,7 @@ int com20020_found(struct net_device *dev, int shared)
{ {
SET_SUBADR(SUB_SETUP2); SET_SUBADR(SUB_SETUP2);
outb(lp->setup2, _XREG); outb(lp->setup2, _XREG);
/* must now write the magic "restart operation" command */ /* must now write the magic "restart operation" command */
mdelay(1); mdelay(1);
outb(0x18, _COMMAND); outb(0x18, _COMMAND);
...@@ -232,7 +232,7 @@ int com20020_found(struct net_device *dev, int shared) ...@@ -232,7 +232,7 @@ int com20020_found(struct net_device *dev, int shared)
BUGMSG(D_NORMAL, "Using extended timeout value of %d.\n", lp->timeout); BUGMSG(D_NORMAL, "Using extended timeout value of %d.\n", lp->timeout);
BUGMSG(D_NORMAL, "Using CKP %d - data rate %s.\n", BUGMSG(D_NORMAL, "Using CKP %d - data rate %s.\n",
lp->setup >> 1, lp->setup >> 1,
clockrates[3 - ((lp->setup2 & 0xF0) >> 4) + ((lp->setup & 0x0F) >> 1)]); clockrates[3 - ((lp->setup2 & 0xF0) >> 4) + ((lp->setup & 0x0F) >> 1)]);
if (register_netdev(dev)) { if (register_netdev(dev)) {
...@@ -243,9 +243,9 @@ int com20020_found(struct net_device *dev, int shared) ...@@ -243,9 +243,9 @@ int com20020_found(struct net_device *dev, int shared)
} }
/* /*
* Do a hardware reset on the card, and set up necessary registers. * Do a hardware reset on the card, and set up necessary registers.
* *
* This should be called as little as possible, because it disrupts the * This should be called as little as possible, because it disrupts the
* token on the network (causes a RECON) and requires a significant delay. * token on the network (causes a RECON) and requires a significant delay.
* *
...@@ -258,15 +258,15 @@ static int com20020_reset(struct net_device *dev, int really_reset) ...@@ -258,15 +258,15 @@ static int com20020_reset(struct net_device *dev, int really_reset)
u_char inbyte; u_char inbyte;
BUGMSG(D_DEBUG, "%s: %d: %s: dev: %p, lp: %p, dev->name: %s\n", BUGMSG(D_DEBUG, "%s: %d: %s: dev: %p, lp: %p, dev->name: %s\n",
__FILE__,__LINE__,__func__,dev,lp,dev->name); __FILE__, __LINE__, __func__, dev, lp, dev->name);
BUGMSG(D_INIT, "Resetting %s (status=%02Xh)\n", BUGMSG(D_INIT, "Resetting %s (status=%02Xh)\n",
dev->name, ASTATUS()); dev->name, ASTATUS());
BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__); BUGMSG(D_DEBUG, "%s: %d: %s\n", __FILE__, __LINE__, __func__);
lp->config = TXENcfg | (lp->timeout << 3) | (lp->backplane << 2); lp->config = TXENcfg | (lp->timeout << 3) | (lp->backplane << 2);
/* power-up defaults */ /* power-up defaults */
SETCONF; SETCONF;
BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__); BUGMSG(D_DEBUG, "%s: %d: %s\n", __FILE__, __LINE__, __func__);
if (really_reset) { if (really_reset) {
/* reset the card */ /* reset the card */
...@@ -274,22 +274,22 @@ static int com20020_reset(struct net_device *dev, int really_reset) ...@@ -274,22 +274,22 @@ static int com20020_reset(struct net_device *dev, int really_reset)
mdelay(RESETtime * 2); /* COM20020 seems to be slower sometimes */ mdelay(RESETtime * 2); /* COM20020 seems to be slower sometimes */
} }
/* clear flags & end reset */ /* clear flags & end reset */
BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__); BUGMSG(D_DEBUG, "%s: %d: %s\n", __FILE__, __LINE__, __func__);
ACOMMAND(CFLAGScmd | RESETclear | CONFIGclear); ACOMMAND(CFLAGScmd | RESETclear | CONFIGclear);
/* verify that the ARCnet signature byte is present */ /* verify that the ARCnet signature byte is present */
BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__); BUGMSG(D_DEBUG, "%s: %d: %s\n", __FILE__, __LINE__, __func__);
com20020_copy_from_card(dev, 0, 0, &inbyte, 1); com20020_copy_from_card(dev, 0, 0, &inbyte, 1);
BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__); BUGMSG(D_DEBUG, "%s: %d: %s\n", __FILE__, __LINE__, __func__);
if (inbyte != TESTvalue) { if (inbyte != TESTvalue) {
BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__); BUGMSG(D_DEBUG, "%s: %d: %s\n", __FILE__, __LINE__, __func__);
BUGMSG(D_NORMAL, "reset failed: TESTvalue not present.\n"); BUGMSG(D_NORMAL, "reset failed: TESTvalue not present.\n");
return 1; return 1;
} }
/* enable extended (512-byte) packets */ /* enable extended (512-byte) packets */
ACOMMAND(CONFIGcmd | EXTconf); ACOMMAND(CONFIGcmd | EXTconf);
BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__); BUGMSG(D_DEBUG, "%s: %d: %s\n", __FILE__, __LINE__, __func__);
/* done! return success. */ /* done! return success. */
return 0; return 0;
...@@ -299,7 +299,7 @@ static int com20020_reset(struct net_device *dev, int really_reset) ...@@ -299,7 +299,7 @@ static int com20020_reset(struct net_device *dev, int really_reset)
static void com20020_setmask(struct net_device *dev, int mask) static void com20020_setmask(struct net_device *dev, int mask)
{ {
u_int ioaddr = dev->base_addr; u_int ioaddr = dev->base_addr;
BUGMSG(D_DURING, "Setting mask to %x at %x\n",mask,ioaddr); BUGMSG(D_DURING, "Setting mask to %x at %x\n", mask, ioaddr);
AINTMASK(mask); AINTMASK(mask);
} }
...@@ -315,7 +315,7 @@ static int com20020_status(struct net_device *dev) ...@@ -315,7 +315,7 @@ static int com20020_status(struct net_device *dev)
{ {
u_int ioaddr = dev->base_addr; u_int ioaddr = dev->base_addr;
return ASTATUS() + (ADIAGSTATUS()<<8); return ASTATUS() + (ADIAGSTATUS() << 8);
} }
static void com20020_close(struct net_device *dev) static void com20020_close(struct net_device *dev)
......
drivers/net/arcnet/com20020_cs.c
View file @ cb334648
/* /*
* Linux ARCnet driver - COM20020 PCMCIA support * Linux ARCnet driver - COM20020 PCMCIA support
* *
* Written 1994-1999 by Avery Pennarun, * Written 1994-1999 by Avery Pennarun,
* based on an ISA version by David Woodhouse. * based on an ISA version by David Woodhouse.
* Derived from ibmtr_cs.c by Steve Kipisz (pcmcia-cs 3.1.4) * Derived from ibmtr_cs.c by Steve Kipisz (pcmcia-cs 3.1.4)
...@@ -19,14 +19,14 @@ ...@@ -19,14 +19,14 @@
* Director, National Security Agency. This software may only be used * Director, National Security Agency. This software may only be used
* and distributed according to the terms of the GNU General Public License as * and distributed according to the terms of the GNU General Public License as
* modified by SRC, incorporated herein by reference. * modified by SRC, incorporated herein by reference.
* *
* ********************** * **********************
* Changes: * Changes:
* Arnaldo Carvalho de Melo <acme@conectiva.com.br> - 08/08/2000 * Arnaldo Carvalho de Melo <acme@conectiva.com.br> - 08/08/2000
* - reorganize kmallocs in com20020_attach, checking all for failure * - reorganize kmallocs in com20020_attach, checking all for failure
* and releasing the previous allocations if one fails * and releasing the previous allocations if one fails
* ********************** * **********************
* *
* For more details, see drivers/net/arcnet.c * For more details, see drivers/net/arcnet.c
* *
* ********************** * **********************
...@@ -53,33 +53,33 @@ ...@@ -53,33 +53,33 @@
static void regdump(struct net_device *dev) static void regdump(struct net_device *dev)
{ {
#ifdef DEBUG #ifdef DEBUG
int ioaddr = dev->base_addr; int ioaddr = dev->base_addr;
int count; int count;
netdev_dbg(dev, "register dump:\n"); netdev_dbg(dev, "register dump:\n");
for (count = ioaddr; count < ioaddr + 16; count++) for (count = ioaddr; count < ioaddr + 16; count++)
{ {
if (!(count % 16)) if (!(count % 16))
pr_cont("%04X:", count); pr_cont("%04X:", count);
pr_cont(" %02X", inb(count)); pr_cont(" %02X", inb(count));
} }
pr_cont("\n"); pr_cont("\n");
netdev_dbg(dev, "buffer0 dump:\n"); netdev_dbg(dev, "buffer0 dump:\n");
/* set up the address register */ /* set up the address register */
count = 0; count = 0;
outb((count >> 8) | RDDATAflag | AUTOINCflag, _ADDR_HI); outb((count >> 8) | RDDATAflag | AUTOINCflag, _ADDR_HI);
outb(count & 0xff, _ADDR_LO); outb(count & 0xff, _ADDR_LO);
for (count = 0; count < 256+32; count++) for (count = 0; count < 256 + 32; count++)
{ {
if (!(count % 16)) if (!(count % 16))
pr_cont("%04X:", count); pr_cont("%04X:", count);
/* copy the data */ /* copy the data */
pr_cont(" %02X", inb(_MEMDATA)); pr_cont(" %02X", inb(_MEMDATA));
} }
pr_cont("\n"); pr_cont("\n");
#endif #endif
} }
...@@ -114,169 +114,169 @@ static void com20020_detach(struct pcmcia_device *p_dev); ...@@ -114,169 +114,169 @@ static void com20020_detach(struct pcmcia_device *p_dev);
static int com20020_probe(struct pcmcia_device *p_dev) static int com20020_probe(struct pcmcia_device *p_dev)
{ {
struct com20020_dev *info; struct com20020_dev *info;
struct net_device *dev; struct net_device *dev;
struct arcnet_local *lp; struct arcnet_local *lp;
dev_dbg(&p_dev->dev, "com20020_attach()\n"); dev_dbg(&p_dev->dev, "com20020_attach()\n");
/* Create new network device */ /* Create new network device */
info = kzalloc(sizeof(*info), GFP_KERNEL); info = kzalloc(sizeof(*info), GFP_KERNEL);
if (!info) if (!info)
goto fail_alloc_info; goto fail_alloc_info;
dev = alloc_arcdev(""); dev = alloc_arcdev("");
if (!dev) if (!dev)
goto fail_alloc_dev; goto fail_alloc_dev;
lp = netdev_priv(dev); lp = netdev_priv(dev);
lp->timeout = timeout; lp->timeout = timeout;
lp->backplane = backplane; lp->backplane = backplane;
lp->clockp = clockp; lp->clockp = clockp;
lp->clockm = clockm & 3; lp->clockm = clockm & 3;
lp->hw.owner = THIS_MODULE; lp->hw.owner = THIS_MODULE;
/* fill in our module parameters as defaults */ /* fill in our module parameters as defaults */
dev->dev_addr[0] = node; dev->dev_addr[0] = node;
p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_8; p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
p_dev->resource[0]->end = 16; p_dev->resource[0]->end = 16;
p_dev->config_flags |= CONF_ENABLE_IRQ; p_dev->config_flags |= CONF_ENABLE_IRQ;
info->dev = dev; info->dev = dev;
p_dev->priv = info; p_dev->priv = info;
return com20020_config(p_dev); return com20020_config(p_dev);
fail_alloc_dev: fail_alloc_dev:
kfree(info); kfree(info);
fail_alloc_info: fail_alloc_info:
return -ENOMEM; return -ENOMEM;
} /* com20020_attach */ } /* com20020_attach */
static void com20020_detach(struct pcmcia_device *link) static void com20020_detach(struct pcmcia_device *link)
{ {
struct com20020_dev *info = link->priv; struct com20020_dev *info = link->priv;
struct net_device *dev = info->dev; struct net_device *dev = info->dev;
dev_dbg(&link->dev, "detach...\n"); dev_dbg(&link->dev, "detach...\n");
dev_dbg(&link->dev, "com20020_detach\n"); dev_dbg(&link->dev, "com20020_detach\n");
dev_dbg(&link->dev, "unregister...\n"); dev_dbg(&link->dev, "unregister...\n");
unregister_netdev(dev); unregister_netdev(dev);
/* /*
* this is necessary because we register our IRQ separately * this is necessary because we register our IRQ separately
* from card services. * from card services.
*/ */
if (dev->irq) if (dev->irq)
free_irq(dev->irq, dev); free_irq(dev->irq, dev);
com20020_release(link); com20020_release(link);
/* Unlink device structure, free bits */ /* Unlink device structure, free bits */
dev_dbg(&link->dev, "unlinking...\n"); dev_dbg(&link->dev, "unlinking...\n");
if (link->priv) if (link->priv)
{
dev = info->dev;
if (dev)
{ {
dev_dbg(&link->dev, "kfree...\n"); dev = info->dev;
free_netdev(dev); if (dev)
{
dev_dbg(&link->dev, "kfree...\n");
free_netdev(dev);
}
dev_dbg(&link->dev, "kfree2...\n");
kfree(info);
} }
dev_dbg(&link->dev, "kfree2...\n");
kfree(info);
}
} /* com20020_detach */ } /* com20020_detach */
static int com20020_config(struct pcmcia_device *link) static int com20020_config(struct pcmcia_device *link)
{ {
struct arcnet_local *lp; struct arcnet_local *lp;
struct com20020_dev *info; struct com20020_dev *info;
struct net_device *dev; struct net_device *dev;
int i, ret; int i, ret;
int ioaddr; int ioaddr;
info = link->priv;
dev = info->dev;
info = link->priv; dev_dbg(&link->dev, "config...\n");
dev = info->dev;
dev_dbg(&link->dev, "config...\n"); dev_dbg(&link->dev, "com20020_config\n");
dev_dbg(&link->dev, "com20020_config\n"); dev_dbg(&link->dev, "baseport1 is %Xh\n",
(unsigned int)link->resource[0]->start);
dev_dbg(&link->dev, "baseport1 is %Xh\n", i = -ENODEV;
(unsigned int) link->resource[0]->start); link->io_lines = 16;
i = -ENODEV; if (!link->resource[0]->start)
link->io_lines = 16; {
for (ioaddr = 0x100; ioaddr < 0x400; ioaddr += 0x10)
{
link->resource[0]->start = ioaddr;
i = pcmcia_request_io(link);
if (i == 0)
break;
}
}
else
i = pcmcia_request_io(link);
if (i != 0)
{
dev_dbg(&link->dev, "requestIO failed totally!\n");
goto failed;
}
ioaddr = dev->base_addr = link->resource[0]->start;
dev_dbg(&link->dev, "got ioaddr %Xh\n", ioaddr);
dev_dbg(&link->dev, "request IRQ %d\n",
link->irq);
if (!link->irq)
{
dev_dbg(&link->dev, "requestIRQ failed totally!\n");
goto failed;
}
if (!link->resource[0]->start) dev->irq = link->irq;
{
for (ioaddr = 0x100; ioaddr < 0x400; ioaddr += 0x10) ret = pcmcia_enable_device(link);
if (ret)
goto failed;
if (com20020_check(dev))
{ {
link->resource[0]->start = ioaddr; regdump(dev);
i = pcmcia_request_io(link); goto failed;
if (i == 0)
break;
} }
}
else lp = netdev_priv(dev);
i = pcmcia_request_io(link); lp->card_name = "PCMCIA COM20020";
lp->card_flags = ARC_CAN_10MBIT; /* pretend all of them can 10Mbit */
if (i != 0)
{ SET_NETDEV_DEV(dev, &link->dev);
dev_dbg(&link->dev, "requestIO failed totally!\n");
goto failed; i = com20020_found(dev, 0); /* calls register_netdev */
}
if (i != 0) {
ioaddr = dev->base_addr = link->resource[0]->start; dev_notice(&link->dev,
dev_dbg(&link->dev, "got ioaddr %Xh\n", ioaddr); "com20020_found() failed\n");
goto failed;
dev_dbg(&link->dev, "request IRQ %d\n", }
link->irq);
if (!link->irq) netdev_dbg(dev, "port %#3lx, irq %d\n",
{ dev->base_addr, dev->irq);
dev_dbg(&link->dev, "requestIRQ failed totally!\n"); return 0;
goto failed;
}
dev->irq = link->irq;
ret = pcmcia_enable_device(link);
if (ret)
goto failed;
if (com20020_check(dev))
{
regdump(dev);
goto failed;
}
lp = netdev_priv(dev);
lp->card_name = "PCMCIA COM20020";
lp->card_flags = ARC_CAN_10MBIT; /* pretend all of them can 10Mbit */
SET_NETDEV_DEV(dev, &link->dev);
i = com20020_found(dev, 0); /* calls register_netdev */
if (i != 0) {
dev_notice(&link->dev,
"com20020_found() failed\n");
goto failed;
}
netdev_dbg(dev, "port %#3lx, irq %d\n",
dev->base_addr, dev->irq);
return 0;
failed: failed:
dev_dbg(&link->dev, "com20020_config failed...\n"); dev_dbg(&link->dev, "com20020_config failed...\n");
com20020_release(link); com20020_release(link);
return -ENODEV; return -ENODEV;
} /* com20020_config */ } /* com20020_config */
static void com20020_release(struct pcmcia_device *link) static void com20020_release(struct pcmcia_device *link)
...@@ -312,9 +312,9 @@ static int com20020_resume(struct pcmcia_device *link) ...@@ -312,9 +312,9 @@ static int com20020_resume(struct pcmcia_device *link)
static const struct pcmcia_device_id com20020_ids[] = { static const struct pcmcia_device_id com20020_ids[] = {
PCMCIA_DEVICE_PROD_ID12("Contemporary Control Systems, Inc.", PCMCIA_DEVICE_PROD_ID12("Contemporary Control Systems, Inc.",
"PCM20 Arcnet Adapter", 0x59991666, 0x95dfffaf), "PCM20 Arcnet Adapter", 0x59991666, 0x95dfffaf),
PCMCIA_DEVICE_PROD_ID12("SoHard AG", PCMCIA_DEVICE_PROD_ID12("SoHard AG",
"SH ARC PCMCIA", 0xf8991729, 0x69dff0c7), "SH ARC PCMCIA", 0xf8991729, 0x69dff0c7),
PCMCIA_DEVICE_NULL PCMCIA_DEVICE_NULL
}; };
MODULE_DEVICE_TABLE(pcmcia, com20020_ids); MODULE_DEVICE_TABLE(pcmcia, com20020_ids);
......
drivers/net/arcnet/com90io.c
View file @ cb334648
/* /*
* Linux ARCnet driver - COM90xx chipset (IO-mapped buffers) * Linux ARCnet driver - COM90xx chipset (IO-mapped buffers)
* *
* Written 1997 by David Woodhouse. * Written 1997 by David Woodhouse.
* Written 1994-1999 by Avery Pennarun. * Written 1994-1999 by Avery Pennarun.
* Written 1999-2000 by Martin Mares <mj@ucw.cz>. * Written 1999-2000 by Martin Mares <mj@ucw.cz>.
...@@ -60,23 +60,23 @@ static void com90io_copy_from_card(struct net_device *dev, int bufnum, int offse ...@@ -60,23 +60,23 @@ static void com90io_copy_from_card(struct net_device *dev, int bufnum, int offse
#define ARCNET_TOTAL_SIZE 16 #define ARCNET_TOTAL_SIZE 16
/* COM 9026 controller chip --> ARCnet register addresses */ /* COM 9026 controller chip --> ARCnet register addresses */
#define _INTMASK (ioaddr+0) /* writable */ #define _INTMASK (ioaddr + 0) /* writable */
#define _STATUS (ioaddr+0) /* readable */ #define _STATUS (ioaddr + 0) /* readable */
#define _COMMAND (ioaddr+1) /* writable, returns random vals on read (?) */ #define _COMMAND (ioaddr + 1) /* writable, returns random vals on read (?) */
#define _RESET (ioaddr+8) /* software reset (on read) */ #define _RESET (ioaddr + 8) /* software reset (on read) */
#define _MEMDATA (ioaddr+12) /* Data port for IO-mapped memory */ #define _MEMDATA (ioaddr + 12) /* Data port for IO-mapped memory */
#define _ADDR_HI (ioaddr+15) /* Control registers for said */ #define _ADDR_HI (ioaddr + 15) /* Control registers for said */
#define _ADDR_LO (ioaddr+14) #define _ADDR_LO (ioaddr + 14)
#define _CONFIG (ioaddr+2) /* Configuration register */ #define _CONFIG (ioaddr + 2) /* Configuration register */
#undef ASTATUS #undef ASTATUS
#undef ACOMMAND #undef ACOMMAND
#undef AINTMASK #undef AINTMASK
#define ASTATUS() inb(_STATUS) #define ASTATUS() inb(_STATUS)
#define ACOMMAND(cmd) outb((cmd),_COMMAND) #define ACOMMAND(cmd) outb((cmd), _COMMAND)
#define AINTMASK(msk) outb((msk),_INTMASK) #define AINTMASK(msk) outb((msk), _INTMASK)
#define SETCONF() outb((lp->config),_CONFIG) #define SETCONF() outb((lp->config), _CONFIG)
/**************************************************************************** /****************************************************************************
......
drivers/net/arcnet/com90xx.c
View file @ cb334648
/* /*
* Linux ARCnet driver - COM90xx chipset (memory-mapped buffers) * Linux ARCnet driver - COM90xx chipset (memory-mapped buffers)
* *
* Written 1994-1999 by Avery Pennarun. * Written 1994-1999 by Avery Pennarun.
* Written 1999 by Martin Mares <mj@ucw.cz>. * Written 1999 by Martin Mares <mj@ucw.cz>.
* Derived from skeleton.c by Donald Becker. * Derived from skeleton.c by Donald Becker.
...@@ -77,25 +77,25 @@ static int numcards; ...@@ -77,25 +77,25 @@ static int numcards;
/* Amount of I/O memory used by the card */ /* Amount of I/O memory used by the card */
#define BUFFER_SIZE (512) #define BUFFER_SIZE (512)
#define MIRROR_SIZE (BUFFER_SIZE*4) #define MIRROR_SIZE (BUFFER_SIZE * 4)
/* COM 9026 controller chip --> ARCnet register addresses */ /* COM 9026 controller chip --> ARCnet register addresses */
#define _INTMASK (ioaddr+0) /* writable */ #define _INTMASK (ioaddr + 0) /* writable */
#define _STATUS (ioaddr+0) /* readable */ #define _STATUS (ioaddr + 0) /* readable */
#define _COMMAND (ioaddr+1) /* writable, returns random vals on read (?) */ #define _COMMAND (ioaddr + 1) /* writable, returns random vals on read (?) */
#define _CONFIG (ioaddr+2) /* Configuration register */ #define _CONFIG (ioaddr + 2) /* Configuration register */
#define _RESET (ioaddr+8) /* software reset (on read) */ #define _RESET (ioaddr + 8) /* software reset (on read) */
#define _MEMDATA (ioaddr+12) /* Data port for IO-mapped memory */ #define _MEMDATA (ioaddr + 12) /* Data port for IO-mapped memory */
#define _ADDR_HI (ioaddr+15) /* Control registers for said */ #define _ADDR_HI (ioaddr + 15) /* Control registers for said */
#define _ADDR_LO (ioaddr+14) #define _ADDR_LO (ioaddr + 14)
#undef ASTATUS #undef ASTATUS
#undef ACOMMAND #undef ACOMMAND
#undef AINTMASK #undef AINTMASK
#define ASTATUS() inb(_STATUS) #define ASTATUS() inb(_STATUS)
#define ACOMMAND(cmd) outb((cmd),_COMMAND) #define ACOMMAND(cmd) outb((cmd), _COMMAND)
#define AINTMASK(msk) outb((msk),_INTMASK) #define AINTMASK(msk) outb((msk), _INTMASK)
static int com90xx_skip_probe __initdata = 0; static int com90xx_skip_probe __initdata = 0;
...@@ -127,12 +127,12 @@ static void __init com90xx_probe(void) ...@@ -127,12 +127,12 @@ static void __init com90xx_probe(void)
if (!io && !irq && !shmem && !*device && com90xx_skip_probe) if (!io && !irq && !shmem && !*device && com90xx_skip_probe)
return; return;
shmems = kzalloc(((0x100000-0xa0000) / 0x800) * sizeof(unsigned long), shmems = kzalloc(((0x100000 - 0xa0000) / 0x800) * sizeof(unsigned long),
GFP_KERNEL); GFP_KERNEL);
if (!shmems) if (!shmems)
return; return;
iomem = kzalloc(((0x100000-0xa0000) / 0x800) * sizeof(void __iomem *), iomem = kzalloc(((0x100000 - 0xa0000) / 0x800) * sizeof(void __iomem *),
GFP_KERNEL); GFP_KERNEL);
if (!iomem) { if (!iomem) {
kfree(shmems); kfree(shmems);
return; return;
...@@ -579,7 +579,7 @@ static void com90xx_setmask(struct net_device *dev, int mask) ...@@ -579,7 +579,7 @@ static void com90xx_setmask(struct net_device *dev, int mask)
/* /*
* Do a hardware reset on the card, and set up necessary registers. * Do a hardware reset on the card, and set up necessary registers.
* *
* This should be called as little as possible, because it disrupts the * This should be called as little as possible, because it disrupts the
* token on the network (causes a RECON) and requires a significant delay. * token on the network (causes a RECON) and requires a significant delay.
* *
......
drivers/net/arcnet/rfc1051.c
View file @ cb334648
/* /*
* Linux ARCnet driver - RFC1051 ("simple" standard) packet encapsulation * Linux ARCnet driver - RFC1051 ("simple" standard) packet encapsulation
* *
* Written 1994-1999 by Avery Pennarun. * Written 1994-1999 by Avery Pennarun.
* Derived from skeleton.c by Donald Becker. * Derived from skeleton.c by Donald Becker.
* *
...@@ -84,12 +84,12 @@ MODULE_LICENSE("GPL"); ...@@ -84,12 +84,12 @@ MODULE_LICENSE("GPL");
/* /*
* Determine a packet's protocol ID. * Determine a packet's protocol ID.
* *
* With ARCnet we have to convert everything to Ethernet-style stuff. * With ARCnet we have to convert everything to Ethernet-style stuff.
*/ */
static __be16 type_trans(struct sk_buff *skb, struct net_device *dev) static __be16 type_trans(struct sk_buff *skb, struct net_device *dev)
{ {
struct archdr *pkt = (struct archdr *) skb->data; struct archdr *pkt = (struct archdr *)skb->data;
struct arc_rfc1051 *soft = &pkt->soft.rfc1051; struct arc_rfc1051 *soft = &pkt->soft.rfc1051;
int hdr_size = ARC_HDR_SIZE + RFC1051_HDR_SIZE; int hdr_size = ARC_HDR_SIZE + RFC1051_HDR_SIZE;
...@@ -146,7 +146,7 @@ static void rx(struct net_device *dev, int bufnum, ...@@ -146,7 +146,7 @@ static void rx(struct net_device *dev, int bufnum,
skb_put(skb, length + ARC_HDR_SIZE); skb_put(skb, length + ARC_HDR_SIZE);
skb->dev = dev; skb->dev = dev;
pkt = (struct archdr *) skb->data; pkt = (struct archdr *)skb->data;
/* up to sizeof(pkt->soft) has already been copied from the card */ /* up to sizeof(pkt->soft) has already been copied from the card */
memcpy(pkt, pkthdr, sizeof(struct archdr)); memcpy(pkt, pkthdr, sizeof(struct archdr));
...@@ -169,7 +169,7 @@ static int build_header(struct sk_buff *skb, struct net_device *dev, ...@@ -169,7 +169,7 @@ static int build_header(struct sk_buff *skb, struct net_device *dev,
unsigned short type, uint8_t daddr) unsigned short type, uint8_t daddr)
{ {
int hdr_size = ARC_HDR_SIZE + RFC1051_HDR_SIZE; int hdr_size = ARC_HDR_SIZE + RFC1051_HDR_SIZE;
struct archdr *pkt = (struct archdr *) skb_push(skb, hdr_size); struct archdr *pkt = (struct archdr *)skb_push(skb, hdr_size);
struct arc_rfc1051 *soft = &pkt->soft.rfc1051; struct arc_rfc1051 *soft = &pkt->soft.rfc1051;
/* set the protocol ID according to RFC1051 */ /* set the protocol ID according to RFC1051 */
...@@ -201,7 +201,7 @@ static int build_header(struct sk_buff *skb, struct net_device *dev, ...@@ -201,7 +201,7 @@ static int build_header(struct sk_buff *skb, struct net_device *dev,
/* see linux/net/ethernet/eth.c to see where I got the following */ /* see linux/net/ethernet/eth.c to see where I got the following */
if (dev->flags & (IFF_LOOPBACK | IFF_NOARP)) { if (dev->flags & (IFF_LOOPBACK | IFF_NOARP)) {
/* /*
* FIXME: fill in the last byte of the dest ipaddr here to better * FIXME: fill in the last byte of the dest ipaddr here to better
* comply with RFC1051 in "noarp" mode. * comply with RFC1051 in "noarp" mode.
*/ */
......
drivers/net/arcnet/rfc1201.c
View file @ cb334648
/* /*
* Linux ARCnet driver - RFC1201 (standard) packet encapsulation * Linux ARCnet driver - RFC1201 (standard) packet encapsulation
* *
* Written 1994-1999 by Avery Pennarun. * Written 1994-1999 by Avery Pennarun.
* Derived from skeleton.c by Donald Becker. * Derived from skeleton.c by Donald Becker.
* *
...@@ -86,12 +86,12 @@ module_exit(arcnet_rfc1201_exit); ...@@ -86,12 +86,12 @@ module_exit(arcnet_rfc1201_exit);
/* /*
* Determine a packet's protocol ID. * Determine a packet's protocol ID.
* *
* With ARCnet we have to convert everything to Ethernet-style stuff. * With ARCnet we have to convert everything to Ethernet-style stuff.
*/ */
static __be16 type_trans(struct sk_buff *skb, struct net_device *dev) static __be16 type_trans(struct sk_buff *skb, struct net_device *dev)
{ {
struct archdr *pkt = (struct archdr *) skb->data; struct archdr *pkt = (struct archdr *)skb->data;
struct arc_rfc1201 *soft = &pkt->soft.rfc1201; struct arc_rfc1201 *soft = &pkt->soft.rfc1201;
int hdr_size = ARC_HDR_SIZE + RFC1201_HDR_SIZE; int hdr_size = ARC_HDR_SIZE + RFC1201_HDR_SIZE;
...@@ -169,7 +169,7 @@ static void rx(struct net_device *dev, int bufnum, ...@@ -169,7 +169,7 @@ static void rx(struct net_device *dev, int bufnum,
if (in->skb) { /* already assembling one! */ if (in->skb) { /* already assembling one! */
BUGMSG(D_EXTRA, "aborting assembly (seq=%d) for unsplit packet (splitflag=%d, seq=%d)\n", BUGMSG(D_EXTRA, "aborting assembly (seq=%d) for unsplit packet (splitflag=%d, seq=%d)\n",
in->sequence, soft->split_flag, soft->sequence); in->sequence, soft->split_flag, soft->sequence);
lp->rfc1201.aborted_seq = soft->sequence; lp->rfc1201.aborted_seq = soft->sequence;
dev_kfree_skb_irq(in->skb); dev_kfree_skb_irq(in->skb);
dev->stats.rx_errors++; dev->stats.rx_errors++;
...@@ -187,7 +187,7 @@ static void rx(struct net_device *dev, int bufnum, ...@@ -187,7 +187,7 @@ static void rx(struct net_device *dev, int bufnum,
skb_put(skb, length + ARC_HDR_SIZE); skb_put(skb, length + ARC_HDR_SIZE);
skb->dev = dev; skb->dev = dev;
pkt = (struct archdr *) skb->data; pkt = (struct archdr *)skb->data;
soft = &pkt->soft.rfc1201; soft = &pkt->soft.rfc1201;
/* up to sizeof(pkt->soft) has already been copied from the card */ /* up to sizeof(pkt->soft) has already been copied from the card */
...@@ -203,11 +203,11 @@ static void rx(struct net_device *dev, int bufnum, ...@@ -203,11 +203,11 @@ static void rx(struct net_device *dev, int bufnum,
* (which is impossible to fumble) and insert it ourselves. * (which is impossible to fumble) and insert it ourselves.
*/ */
if (soft->proto == ARC_P_ARP) { if (soft->proto == ARC_P_ARP) {
struct arphdr *arp = (struct arphdr *) soft->payload; struct arphdr *arp = (struct arphdr *)soft->payload;
/* make sure addresses are the right length */ /* make sure addresses are the right length */
if (arp->ar_hln == 1 && arp->ar_pln == 4) { if (arp->ar_hln == 1 && arp->ar_pln == 4) {
uint8_t *cptr = (uint8_t *) arp + sizeof(struct arphdr); uint8_t *cptr = (uint8_t *)arp + sizeof(struct arphdr);
if (!*cptr) { /* is saddr = 00? */ if (!*cptr) { /* is saddr = 00? */
BUGMSG(D_EXTRA, BUGMSG(D_EXTRA,
...@@ -274,7 +274,7 @@ static void rx(struct net_device *dev, int bufnum, ...@@ -274,7 +274,7 @@ static void rx(struct net_device *dev, int bufnum,
dev_kfree_skb_irq(in->skb); dev_kfree_skb_irq(in->skb);
} }
in->sequence = soft->sequence; in->sequence = soft->sequence;
in->numpackets = ((unsigned) soft->split_flag >> 1) + 2; in->numpackets = ((unsigned)soft->split_flag >> 1) + 2;
in->lastpacket = 1; in->lastpacket = 1;
if (in->numpackets > 16) { if (in->numpackets > 16) {
...@@ -294,7 +294,7 @@ static void rx(struct net_device *dev, int bufnum, ...@@ -294,7 +294,7 @@ static void rx(struct net_device *dev, int bufnum,
return; return;
} }
skb->dev = dev; skb->dev = dev;
pkt = (struct archdr *) skb->data; pkt = (struct archdr *)skb->data;
soft = &pkt->soft.rfc1201; soft = &pkt->soft.rfc1201;
memcpy(pkt, pkthdr, ARC_HDR_SIZE + RFC1201_HDR_SIZE); memcpy(pkt, pkthdr, ARC_HDR_SIZE + RFC1201_HDR_SIZE);
...@@ -302,7 +302,7 @@ static void rx(struct net_device *dev, int bufnum, ...@@ -302,7 +302,7 @@ static void rx(struct net_device *dev, int bufnum,
soft->split_flag = 0; /* end result won't be split */ soft->split_flag = 0; /* end result won't be split */
} else { /* not first packet */ } else { /* not first packet */
int packetnum = ((unsigned) soft->split_flag >> 1) + 1; int packetnum = ((unsigned)soft->split_flag >> 1) + 1;
/* /*
* if we're not assembling, there's no point trying to * if we're not assembling, there's no point trying to
...@@ -341,7 +341,7 @@ static void rx(struct net_device *dev, int bufnum, ...@@ -341,7 +341,7 @@ static void rx(struct net_device *dev, int bufnum,
in->lastpacket = in->numpackets = 0; in->lastpacket = in->numpackets = 0;
return; return;
} }
pkt = (struct archdr *) in->skb->data; pkt = (struct archdr *)in->skb->data;
soft = &pkt->soft.rfc1201; soft = &pkt->soft.rfc1201;
} }
...@@ -357,10 +357,10 @@ static void rx(struct net_device *dev, int bufnum, ...@@ -357,10 +357,10 @@ static void rx(struct net_device *dev, int bufnum,
in->skb = NULL; in->skb = NULL;
in->lastpacket = in->numpackets = 0; in->lastpacket = in->numpackets = 0;
BUGMSG(D_SKB_SIZE, "skb: received %d bytes from %02X (unsplit)\n", BUGMSG(D_SKB_SIZE, "skb: received %d bytes from %02X (unsplit)\n",
skb->len, pkt->hard.source); skb->len, pkt->hard.source);
BUGMSG(D_SKB_SIZE, "skb: received %d bytes from %02X (split)\n", BUGMSG(D_SKB_SIZE, "skb: received %d bytes from %02X (split)\n",
skb->len, pkt->hard.source); skb->len, pkt->hard.source);
BUGLVL(D_SKB) arcnet_dump_skb(dev, skb, "rx"); BUGLVL(D_SKB) arcnet_dump_skb(dev, skb, "rx");
skb->protocol = type_trans(skb, dev); skb->protocol = type_trans(skb, dev);
...@@ -376,7 +376,7 @@ static int build_header(struct sk_buff *skb, struct net_device *dev, ...@@ -376,7 +376,7 @@ static int build_header(struct sk_buff *skb, struct net_device *dev,
{ {
struct arcnet_local *lp = netdev_priv(dev); struct arcnet_local *lp = netdev_priv(dev);
int hdr_size = ARC_HDR_SIZE + RFC1201_HDR_SIZE; int hdr_size = ARC_HDR_SIZE + RFC1201_HDR_SIZE;
struct archdr *pkt = (struct archdr *) skb_push(skb, hdr_size); struct archdr *pkt = (struct archdr *)skb_push(skb, hdr_size);
struct arc_rfc1201 *soft = &pkt->soft.rfc1201; struct arc_rfc1201 *soft = &pkt->soft.rfc1201;
/* set the protocol ID according to RFC1201 */ /* set the protocol ID according to RFC1201 */
...@@ -424,7 +424,7 @@ static int build_header(struct sk_buff *skb, struct net_device *dev, ...@@ -424,7 +424,7 @@ static int build_header(struct sk_buff *skb, struct net_device *dev,
/* see linux/net/ethernet/eth.c to see where I got the following */ /* see linux/net/ethernet/eth.c to see where I got the following */
if (dev->flags & (IFF_LOOPBACK | IFF_NOARP)) { if (dev->flags & (IFF_LOOPBACK | IFF_NOARP)) {
/* /*
* FIXME: fill in the last byte of the dest ipaddr here to better * FIXME: fill in the last byte of the dest ipaddr here to better
* comply with RFC1051 in "noarp" mode. For now, always broadcasting * comply with RFC1051 in "noarp" mode. For now, always broadcasting
* will probably at least get packets sent out :) * will probably at least get packets sent out :)
...@@ -517,7 +517,7 @@ static int continue_tx(struct net_device *dev, int bufnum) ...@@ -517,7 +517,7 @@ static int continue_tx(struct net_device *dev, int bufnum)
int seglen; int seglen;
BUGMSG(D_DURING, BUGMSG(D_DURING,
"rfc1201 continue_tx: loading segment %d(+1) of %d (seq=%d)\n", "rfc1201 continue_tx: loading segment %d(+1) of %d (seq=%d)\n",
out->segnum, out->numsegs, soft->sequence); out->segnum, out->numsegs, soft->sequence);
/* the "new" soft header comes right before the data chunk */ /* the "new" soft header comes right before the data chunk */
......
include/linux/arcdevice.h
View file @ cb334648
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
/* /*
* Debugging bitflags: each option can be enabled individually. * Debugging bitflags: each option can be enabled individually.
* *
* Note: only debug flags included in the ARCNET_DEBUG_MAX define will * Note: only debug flags included in the ARCNET_DEBUG_MAX define will
* actually be available. GCC will (at least, GCC 2.7.0 will) notice * actually be available. GCC will (at least, GCC 2.7.0 will) notice
* lines using a BUGLVL not in ARCNET_DEBUG_MAX and automatically optimize * lines using a BUGLVL not in ARCNET_DEBUG_MAX and automatically optimize
...@@ -77,33 +77,33 @@ ...@@ -77,33 +77,33 @@
#endif #endif
#ifndef ARCNET_DEBUG #ifndef ARCNET_DEBUG
#define ARCNET_DEBUG (D_NORMAL|D_EXTRA) #define ARCNET_DEBUG (D_NORMAL | D_EXTRA)
#endif #endif
extern int arcnet_debug; extern int arcnet_debug;
/* macros to simplify debug checking */ /* macros to simplify debug checking */
#define BUGLVL(x) if ((ARCNET_DEBUG_MAX)&arcnet_debug&(x)) #define BUGLVL(x) if ((ARCNET_DEBUG_MAX) & arcnet_debug & (x))
#define BUGMSG2(x,msg,args...) do { BUGLVL(x) printk(msg, ## args); } while (0) #define BUGMSG2(x, msg, args...) do { BUGLVL(x) printk(msg, ## args); } while (0)
#define BUGMSG(x,msg,args...) \ #define BUGMSG(x, msg, args...) \
BUGMSG2(x, "%s%6s: " msg, \ BUGMSG2(x, "%s%6s: " msg, \
x==D_NORMAL ? KERN_WARNING \ x == D_NORMAL ? KERN_WARNING \
: x < D_DURING ? KERN_INFO : KERN_DEBUG, \ : x < D_DURING ? KERN_INFO : KERN_DEBUG, \
dev->name , ## args) dev->name, ## args)
/* see how long a function call takes to run, expressed in CPU cycles */ /* see how long a function call takes to run, expressed in CPU cycles */
#define TIME(name, bytes, call) BUGLVL(D_TIMING) { \ #define TIME(name, bytes, call) BUGLVL(D_TIMING) { \
unsigned long _x, _y; \ unsigned long _x, _y; \
_x = get_cycles(); \ _x = get_cycles(); \
call; \ call; \
_y = get_cycles(); \ _y = get_cycles(); \
BUGMSG(D_TIMING, \ BUGMSG(D_TIMING, \
"%s: %d bytes in %lu cycles == " \ "%s: %d bytes in %lu cycles == " \
"%lu Kbytes/100Mcycle\n",\ "%lu Kbytes/100Mcycle\n", \
name, bytes, _y - _x, \ name, bytes, _y - _x, \
100000000 / 1024 * bytes / (_y - _x + 1));\ 100000000 / 1024 * bytes / (_y - _x + 1)); \
} \ } \
else { \ else { \
call;\ call; \
} }
...@@ -189,16 +189,16 @@ struct ArcProto { ...@@ -189,16 +189,16 @@ struct ArcProto {
int mtu; /* largest possible packet */ int mtu; /* largest possible packet */
int is_ip; /* This is a ip plugin - not a raw thing */ int is_ip; /* This is a ip plugin - not a raw thing */
void (*rx) (struct net_device * dev, int bufnum, void (*rx)(struct net_device *dev, int bufnum,
struct archdr * pkthdr, int length); struct archdr *pkthdr, int length);
int (*build_header) (struct sk_buff * skb, struct net_device *dev, int (*build_header)(struct sk_buff *skb, struct net_device *dev,
unsigned short ethproto, uint8_t daddr); unsigned short ethproto, uint8_t daddr);
/* these functions return '1' if the skb can now be freed */ /* these functions return '1' if the skb can now be freed */
int (*prepare_tx) (struct net_device * dev, struct archdr * pkt, int length, int (*prepare_tx)(struct net_device *dev, struct archdr *pkt, int length,
int bufnum); int bufnum);
int (*continue_tx) (struct net_device * dev, int bufnum); int (*continue_tx)(struct net_device *dev, int bufnum);
int (*ack_tx) (struct net_device * dev, int acked); int (*ack_tx)(struct net_device *dev, int acked);
}; };
extern struct ArcProto *arc_proto_map[256], *arc_proto_default, extern struct ArcProto *arc_proto_map[256], *arc_proto_default,
...@@ -263,13 +263,13 @@ struct arcnet_local { ...@@ -263,13 +263,13 @@ struct arcnet_local {
* situations in which we (for example) want to pre-load a transmit * situations in which we (for example) want to pre-load a transmit
* buffer, or start receiving while we copy a received packet to * buffer, or start receiving while we copy a received packet to
* memory. * memory.
* *
* The rules: only the interrupt handler is allowed to _add_ buffers to * The rules: only the interrupt handler is allowed to _add_ buffers to
* the queue; thus, this doesn't require a lock. Both the interrupt * the queue; thus, this doesn't require a lock. Both the interrupt
* handler and the transmit function will want to _remove_ buffers, so * handler and the transmit function will want to _remove_ buffers, so
* we need to handle the situation where they try to do it at the same * we need to handle the situation where they try to do it at the same
* time. * time.
* *
* If next_buf == first_free_buf, the queue is empty. Since there are * If next_buf == first_free_buf, the queue is empty. Since there are
* only four possible buffers, the queue should never be full. * only four possible buffers, the queue should never be full.
*/ */
...@@ -298,17 +298,17 @@ struct arcnet_local { ...@@ -298,17 +298,17 @@ struct arcnet_local {
/* hardware-specific functions */ /* hardware-specific functions */
struct { struct {
struct module *owner; struct module *owner;
void (*command) (struct net_device * dev, int cmd); void (*command)(struct net_device *dev, int cmd);
int (*status) (struct net_device * dev); int (*status)(struct net_device *dev);
void (*intmask) (struct net_device * dev, int mask); void (*intmask)(struct net_device *dev, int mask);
int (*reset) (struct net_device * dev, int really_reset); int (*reset)(struct net_device *dev, int really_reset);
void (*open) (struct net_device * dev); void (*open)(struct net_device *dev);
void (*close) (struct net_device * dev); void (*close)(struct net_device *dev);
void (*copy_to_card) (struct net_device * dev, int bufnum, int offset, void (*copy_to_card)(struct net_device *dev, int bufnum, int offset,
void *buf, int count); void *buf, int count);
void (*copy_from_card) (struct net_device * dev, int bufnum, int offset, void (*copy_from_card)(struct net_device *dev, int bufnum, int offset,
void *buf, int count); void *buf, int count);
} hw; } hw;
void __iomem *mem_start; /* pointer to ioremap'ed MMIO */ void __iomem *mem_start; /* pointer to ioremap'ed MMIO */
...@@ -325,7 +325,7 @@ struct arcnet_local { ...@@ -325,7 +325,7 @@ struct arcnet_local {
#if ARCNET_DEBUG_MAX & D_SKB #if ARCNET_DEBUG_MAX & D_SKB
void arcnet_dump_skb(struct net_device *dev, struct sk_buff *skb, char *desc); void arcnet_dump_skb(struct net_device *dev, struct sk_buff *skb, char *desc);
#else #else
#define arcnet_dump_skb(dev,skb,desc) ; #define arcnet_dump_skb(dev, skb, desc) ;
#endif #endif
void arcnet_unregister_proto(struct ArcProto *proto); void arcnet_unregister_proto(struct ArcProto *proto);
...@@ -335,7 +335,7 @@ struct net_device *alloc_arcdev(const char *name); ...@@ -335,7 +335,7 @@ struct net_device *alloc_arcdev(const char *name);
int arcnet_open(struct net_device *dev); int arcnet_open(struct net_device *dev);
int arcnet_close(struct net_device *dev); int arcnet_close(struct net_device *dev);
netdev_tx_t arcnet_send_packet(struct sk_buff *skb, netdev_tx_t arcnet_send_packet(struct sk_buff *skb,
struct net_device *dev); struct net_device *dev);
void arcnet_timeout(struct net_device *dev); void arcnet_timeout(struct net_device *dev);
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7