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: Joe Perches <joe@perches.com> Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
This commit is contained in:
Joe Perches
committed by
Michael Grzeschik
Michael Grzeschik
parent
37587fadff
commit
cb334648a1
@ -109,7 +109,7 @@ static void rx(struct net_device *dev, int bufnum,
|
||||
skb_put(skb, length + ARC_HDR_SIZE);
|
||||
skb->dev = dev;
|
||||
|
||||
pkt = (struct archdr *) skb->data;
|
||||
pkt = (struct archdr *)skb->data;
|
||||
|
||||
skb_reset_mac_header(skb);
|
||||
skb_pull(skb, ARC_HDR_SIZE);
|
||||
@ -136,7 +136,7 @@ static int build_header(struct sk_buff *skb, struct net_device *dev,
|
||||
unsigned short type, uint8_t daddr)
|
||||
{
|
||||
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.
|
||||
@ -192,7 +192,7 @@ static int prepare_tx(struct net_device *dev, struct archdr *pkt, int length,
|
||||
hard->offset[0] = ofs = 256 - length;
|
||||
|
||||
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, ofs, &pkt->soft, length);
|
||||
|
||||
@ -57,26 +57,26 @@ static void arcrimi_copy_from_card(struct net_device *dev, int bufnum, int offse
|
||||
|
||||
/* Amount of I/O memory used by the card */
|
||||
#define BUFFER_SIZE (512)
|
||||
#define MIRROR_SIZE (BUFFER_SIZE*4)
|
||||
#define MIRROR_SIZE (BUFFER_SIZE * 4)
|
||||
|
||||
/* COM 9026 controller chip --> ARCnet register addresses */
|
||||
#define _INTMASK (ioaddr+0) /* writable */
|
||||
#define _STATUS (ioaddr+0) /* readable */
|
||||
#define _COMMAND (ioaddr+1) /* writable, returns random vals on read (?) */
|
||||
#define _RESET (ioaddr+8) /* software reset (on read) */
|
||||
#define _MEMDATA (ioaddr+12) /* Data port for IO-mapped memory */
|
||||
#define _ADDR_HI (ioaddr+15) /* Control registers for said */
|
||||
#define _ADDR_LO (ioaddr+14)
|
||||
#define _CONFIG (ioaddr+2) /* Configuration register */
|
||||
#define _INTMASK (ioaddr + 0) /* writable */
|
||||
#define _STATUS (ioaddr + 0) /* readable */
|
||||
#define _COMMAND (ioaddr + 1) /* writable, returns random vals on read (?) */
|
||||
#define _RESET (ioaddr + 8) /* software reset (on read) */
|
||||
#define _MEMDATA (ioaddr + 12) /* Data port for IO-mapped memory */
|
||||
#define _ADDR_HI (ioaddr + 15) /* Control registers for said */
|
||||
#define _ADDR_LO (ioaddr + 14)
|
||||
#define _CONFIG (ioaddr + 2) /* Configuration register */
|
||||
|
||||
#undef ASTATUS
|
||||
#undef ACOMMAND
|
||||
#undef AINTMASK
|
||||
|
||||
#define ASTATUS() readb(_STATUS)
|
||||
#define ACOMMAND(cmd) writeb((cmd),_COMMAND)
|
||||
#define AINTMASK(msk) writeb((msk),_INTMASK)
|
||||
#define SETCONF() writeb(lp->config,_CONFIG)
|
||||
#define ACOMMAND(cmd) writeb((cmd), _COMMAND)
|
||||
#define AINTMASK(msk) writeb((msk), _INTMASK)
|
||||
#define SETCONF() writeb(lp->config, _CONFIG)
|
||||
|
||||
|
||||
/*
|
||||
|
||||
@ -69,7 +69,7 @@ static void arcnet_rx(struct net_device *dev, int bufnum);
|
||||
* arc_proto_default instead. It also must not be NULL; if you would like
|
||||
* to set it to NULL, set it to &arc_proto_null instead.
|
||||
*/
|
||||
struct ArcProto *arc_proto_map[256], *arc_proto_default,
|
||||
struct ArcProto *arc_proto_map[256], *arc_proto_default,
|
||||
*arc_bcast_proto, *arc_raw_proto;
|
||||
|
||||
static struct ArcProto arc_proto_null =
|
||||
@ -184,11 +184,11 @@ static void arcnet_dump_packet(struct net_device *dev, int bufnum,
|
||||
|
||||
/* hw.copy_from_card expects IRQ context so take the IRQ lock
|
||||
to keep it single threaded */
|
||||
if(take_arcnet_lock)
|
||||
if (take_arcnet_lock)
|
||||
spin_lock_irqsave(&lp->lock, flags);
|
||||
|
||||
lp->hw.copy_from_card(dev, bufnum, 0, buf, 512);
|
||||
if(take_arcnet_lock)
|
||||
if (take_arcnet_lock)
|
||||
spin_unlock_irqrestore(&lp->lock, flags);
|
||||
|
||||
/* if the offset[0] byte is nonzero, this is a 256-byte packet */
|
||||
@ -202,7 +202,7 @@ static void arcnet_dump_packet(struct net_device *dev, int bufnum,
|
||||
|
||||
#else
|
||||
|
||||
#define arcnet_dump_packet(dev, bufnum, desc,take_arcnet_lock) do { } while (0)
|
||||
#define arcnet_dump_packet(dev, bufnum, desc, take_arcnet_lock) do { } while (0)
|
||||
|
||||
#endif
|
||||
|
||||
@ -248,7 +248,7 @@ static void release_arcbuf(struct net_device *dev, int bufnum)
|
||||
BUGLVL(D_DURING) {
|
||||
BUGMSG(D_DURING, "release_arcbuf: freed #%d; buffer queue is now: ",
|
||||
bufnum);
|
||||
for (i = lp->next_buf; i != lp->first_free_buf; i = (i+1) % 5)
|
||||
for (i = lp->next_buf; i != lp->first_free_buf; i = (i + 1) % 5)
|
||||
BUGMSG2(D_DURING, "#%d ", lp->buf_queue[i]);
|
||||
BUGMSG2(D_DURING, "\n");
|
||||
}
|
||||
@ -284,7 +284,7 @@ static int get_arcbuf(struct net_device *dev)
|
||||
|
||||
BUGLVL(D_DURING) {
|
||||
BUGMSG(D_DURING, "get_arcbuf: got #%d; buffer queue is now: ", buf);
|
||||
for (i = lp->next_buf; i != lp->first_free_buf; i = (i+1) % 5)
|
||||
for (i = lp->next_buf; i != lp->first_free_buf; i = (i + 1) % 5)
|
||||
BUGMSG2(D_DURING, "#%d ", lp->buf_queue[i]);
|
||||
BUGMSG2(D_DURING, "\n");
|
||||
}
|
||||
@ -346,7 +346,7 @@ struct net_device *alloc_arcdev(const char *name)
|
||||
dev = alloc_netdev(sizeof(struct arcnet_local),
|
||||
name && *name ? name : "arc%d", NET_NAME_UNKNOWN,
|
||||
arcdev_setup);
|
||||
if(dev) {
|
||||
if (dev) {
|
||||
struct arcnet_local *lp = netdev_priv(dev);
|
||||
spin_lock_init(&lp->lock);
|
||||
}
|
||||
@ -367,7 +367,7 @@ int arcnet_open(struct net_device *dev)
|
||||
struct arcnet_local *lp = netdev_priv(dev);
|
||||
int count, newmtu, error;
|
||||
|
||||
BUGMSG(D_INIT,"opened.");
|
||||
BUGMSG(D_INIT, "opened.");
|
||||
|
||||
if (!try_module_get(lp->hw.owner))
|
||||
return -ENODEV;
|
||||
@ -431,24 +431,24 @@ int arcnet_open(struct net_device *dev)
|
||||
BUGMSG(D_NORMAL, "WARNING! Station address FF may confuse "
|
||||
"DOS networking programs!\n");
|
||||
|
||||
BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__);
|
||||
BUGMSG(D_DEBUG, "%s: %d: %s\n", __FILE__, __LINE__, __func__);
|
||||
if (ASTATUS() & RESETflag) {
|
||||
BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__);
|
||||
BUGMSG(D_DEBUG, "%s: %d: %s\n", __FILE__, __LINE__, __func__);
|
||||
ACOMMAND(CFLAGScmd | RESETclear);
|
||||
}
|
||||
|
||||
|
||||
BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__);
|
||||
BUGMSG(D_DEBUG, "%s: %d: %s\n", __FILE__, __LINE__, __func__);
|
||||
/* make sure we're ready to receive IRQ's. */
|
||||
AINTMASK(0);
|
||||
udelay(1); /* give it time to set the mask before
|
||||
* we reset it again. (may not even be
|
||||
* necessary)
|
||||
*/
|
||||
BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__);
|
||||
BUGMSG(D_DEBUG, "%s: %d: %s\n", __FILE__, __LINE__, __func__);
|
||||
lp->intmask = NORXflag | RECONflag;
|
||||
AINTMASK(lp->intmask);
|
||||
BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__);
|
||||
BUGMSG(D_DEBUG, "%s: %d: %s\n", __FILE__, __LINE__, __func__);
|
||||
|
||||
netif_start_queue(dev);
|
||||
|
||||
@ -490,20 +490,20 @@ static int arcnet_header(struct sk_buff *skb, struct net_device *dev,
|
||||
|
||||
BUGMSG(D_DURING,
|
||||
"create header from %d to %d; protocol %d (%Xh); size %u.\n",
|
||||
saddr ? *(uint8_t *) saddr : -1,
|
||||
daddr ? *(uint8_t *) daddr : -1,
|
||||
saddr ? *(uint8_t *)saddr : -1,
|
||||
daddr ? *(uint8_t *)daddr : -1,
|
||||
type, type, len);
|
||||
|
||||
if (skb->len!=0 && len != skb->len)
|
||||
if (skb->len != 0 && len != skb->len)
|
||||
BUGMSG(D_NORMAL, "arcnet_header: Yikes! skb->len(%d) != len(%d)!\n",
|
||||
skb->len, len);
|
||||
|
||||
|
||||
/* Type is host order - ? */
|
||||
if(type == ETH_P_ARCNET) {
|
||||
if (type == ETH_P_ARCNET) {
|
||||
proto = arc_raw_proto;
|
||||
BUGMSG(D_DEBUG, "arc_raw_proto used. proto='%c'\n",proto->suffix);
|
||||
_daddr = daddr ? *(uint8_t *) daddr : 0;
|
||||
BUGMSG(D_DEBUG, "arc_raw_proto used. proto='%c'\n", proto->suffix);
|
||||
_daddr = daddr ? *(uint8_t *)daddr : 0;
|
||||
}
|
||||
else if (!daddr) {
|
||||
/*
|
||||
@ -511,7 +511,7 @@ static int arcnet_header(struct sk_buff *skb, struct net_device *dev,
|
||||
* Store the packet type (eg. ETH_P_IP) for now, and we'll push on a
|
||||
* real header when we do rebuild_header.
|
||||
*/
|
||||
*(uint16_t *) skb_push(skb, 2) = type;
|
||||
*(uint16_t *)skb_push(skb, 2) = type;
|
||||
/*
|
||||
* XXX: Why not use skb->mac_len?
|
||||
*/
|
||||
@ -522,7 +522,7 @@ static int arcnet_header(struct sk_buff *skb, struct net_device *dev,
|
||||
}
|
||||
else {
|
||||
/* otherwise, we can just add the header as usual. */
|
||||
_daddr = *(uint8_t *) daddr;
|
||||
_daddr = *(uint8_t *)daddr;
|
||||
proto_num = lp->default_proto[_daddr];
|
||||
proto = arc_proto_map[proto_num];
|
||||
BUGMSG(D_DURING, "building header for %02Xh using protocol '%c'\n",
|
||||
@ -550,9 +550,9 @@ netdev_tx_t arcnet_send_packet(struct sk_buff *skb,
|
||||
|
||||
BUGMSG(D_DURING,
|
||||
"transmit requested (status=%Xh, txbufs=%d/%d, len=%d, protocol %x)\n",
|
||||
ASTATUS(), lp->cur_tx, lp->next_tx, skb->len,skb->protocol);
|
||||
ASTATUS(), lp->cur_tx, lp->next_tx, skb->len, skb->protocol);
|
||||
|
||||
pkt = (struct archdr *) skb->data;
|
||||
pkt = (struct archdr *)skb->data;
|
||||
soft = &pkt->soft.rfc1201;
|
||||
proto = arc_proto_map[soft->proto];
|
||||
|
||||
@ -572,7 +572,7 @@ netdev_tx_t arcnet_send_packet(struct sk_buff *skb,
|
||||
|
||||
spin_lock_irqsave(&lp->lock, flags);
|
||||
AINTMASK(0);
|
||||
if(lp->next_tx == -1)
|
||||
if (lp->next_tx == -1)
|
||||
txbuf = get_arcbuf(dev);
|
||||
else {
|
||||
txbuf = -1;
|
||||
@ -606,14 +606,14 @@ netdev_tx_t arcnet_send_packet(struct sk_buff *skb,
|
||||
freeskb = 0;
|
||||
}
|
||||
|
||||
BUGMSG(D_DEBUG, "%s: %d: %s, status: %x\n",__FILE__,__LINE__,__func__,ASTATUS());
|
||||
BUGMSG(D_DEBUG, "%s: %d: %s, status: %x\n", __FILE__, __LINE__, __func__, ASTATUS());
|
||||
/* make sure we didn't ignore a TX IRQ while we were in here */
|
||||
AINTMASK(0);
|
||||
|
||||
BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__);
|
||||
lp->intmask |= TXFREEflag|EXCNAKflag;
|
||||
BUGMSG(D_DEBUG, "%s: %d: %s\n", __FILE__, __LINE__, __func__);
|
||||
lp->intmask |= TXFREEflag | EXCNAKflag;
|
||||
AINTMASK(lp->intmask);
|
||||
BUGMSG(D_DEBUG, "%s: %d: %s, status: %x\n",__FILE__,__LINE__,__func__,ASTATUS());
|
||||
BUGMSG(D_DEBUG, "%s: %d: %s, status: %x\n", __FILE__, __LINE__, __func__, ASTATUS());
|
||||
|
||||
spin_unlock_irqrestore(&lp->lock, flags);
|
||||
if (freeskb) {
|
||||
@ -649,7 +649,7 @@ static int go_tx(struct net_device *dev)
|
||||
lp->lasttrans_dest = lp->lastload_dest;
|
||||
lp->lastload_dest = 0;
|
||||
lp->excnak_pending = 0;
|
||||
lp->intmask |= TXFREEflag|EXCNAKflag;
|
||||
lp->intmask |= TXFREEflag | EXCNAKflag;
|
||||
|
||||
return 1;
|
||||
}
|
||||
@ -676,12 +676,12 @@ void arcnet_timeout(struct net_device *dev)
|
||||
|
||||
/* make sure we didn't miss a TX or a EXC NAK IRQ */
|
||||
AINTMASK(0);
|
||||
lp->intmask |= TXFREEflag|EXCNAKflag;
|
||||
lp->intmask |= TXFREEflag | EXCNAKflag;
|
||||
AINTMASK(lp->intmask);
|
||||
|
||||
spin_unlock_irqrestore(&lp->lock, flags);
|
||||
|
||||
if (time_after(jiffies, lp->last_timeout + 10*HZ)) {
|
||||
if (time_after(jiffies, lp->last_timeout + 10 * HZ)) {
|
||||
BUGMSG(D_EXTRA, "tx timed out%s (status=%Xh, intmask=%Xh, dest=%02Xh)\n",
|
||||
msg, status, lp->intmask, lp->lasttrans_dest);
|
||||
lp->last_timeout = jiffies;
|
||||
@ -734,7 +734,7 @@ irqreturn_t arcnet_interrupt(int irq, void *dev_id)
|
||||
diagstatus = (status >> 8) & 0xFF;
|
||||
|
||||
BUGMSG(D_DEBUG, "%s: %d: %s: status=%x\n",
|
||||
__FILE__,__LINE__,__func__,status);
|
||||
__FILE__, __LINE__, __func__, status);
|
||||
didsomething = 0;
|
||||
|
||||
/*
|
||||
@ -775,7 +775,7 @@ irqreturn_t arcnet_interrupt(int irq, void *dev_id)
|
||||
didsomething++;
|
||||
}
|
||||
|
||||
if((diagstatus & EXCNAKflag)) {
|
||||
if ((diagstatus & EXCNAKflag)) {
|
||||
BUGMSG(D_DURING, "EXCNAK IRQ (diagstat=%Xh)\n",
|
||||
diagstatus);
|
||||
|
||||
@ -790,12 +790,12 @@ irqreturn_t arcnet_interrupt(int irq, void *dev_id)
|
||||
|
||||
/* a transmit finished, and we're interested in it. */
|
||||
if ((status & lp->intmask & TXFREEflag) || lp->timed_out) {
|
||||
lp->intmask &= ~(TXFREEflag|EXCNAKflag);
|
||||
lp->intmask &= ~(TXFREEflag | EXCNAKflag);
|
||||
|
||||
BUGMSG(D_DURING, "TX IRQ (stat=%Xh)\n", status);
|
||||
|
||||
if (lp->cur_tx != -1 && !lp->timed_out) {
|
||||
if(!(status & TXACKflag)) {
|
||||
if (!(status & TXACKflag)) {
|
||||
if (lp->lasttrans_dest != 0) {
|
||||
BUGMSG(D_EXTRA,
|
||||
"transmit was not acknowledged! "
|
||||
@ -814,12 +814,12 @@ irqreturn_t arcnet_interrupt(int irq, void *dev_id)
|
||||
if (lp->outgoing.proto &&
|
||||
lp->outgoing.proto->ack_tx) {
|
||||
int ackstatus;
|
||||
if(status & TXACKflag)
|
||||
ackstatus=2;
|
||||
else if(lp->excnak_pending)
|
||||
ackstatus=1;
|
||||
if (status & TXACKflag)
|
||||
ackstatus = 2;
|
||||
else if (lp->excnak_pending)
|
||||
ackstatus = 1;
|
||||
else
|
||||
ackstatus=0;
|
||||
ackstatus = 0;
|
||||
|
||||
lp->outgoing.proto
|
||||
->ack_tx(dev, ackstatus);
|
||||
@ -842,7 +842,7 @@ irqreturn_t arcnet_interrupt(int irq, void *dev_id)
|
||||
if (lp->outgoing.proto->continue_tx(dev, txbuf)) {
|
||||
/* that was the last segment */
|
||||
dev->stats.tx_bytes += lp->outgoing.skb->len;
|
||||
if(!lp->outgoing.proto->ack_tx)
|
||||
if (!lp->outgoing.proto->ack_tx)
|
||||
{
|
||||
dev_kfree_skb_irq(lp->outgoing.skb);
|
||||
lp->outgoing.proto = NULL;
|
||||
@ -871,8 +871,8 @@ irqreturn_t arcnet_interrupt(int irq, void *dev_id)
|
||||
BUGMSG(D_RECON, "Network reconfiguration detected (status=%Xh)\n",
|
||||
status);
|
||||
/* MYRECON bit is at bit 7 of diagstatus */
|
||||
if(diagstatus & 0x80)
|
||||
BUGMSG(D_RECON,"Put out that recon myself\n");
|
||||
if (diagstatus & 0x80)
|
||||
BUGMSG(D_RECON, "Put out that recon myself\n");
|
||||
|
||||
/* is the RECON info empty or old? */
|
||||
if (!lp->first_recon || !lp->last_recon ||
|
||||
@ -920,7 +920,7 @@ irqreturn_t arcnet_interrupt(int irq, void *dev_id)
|
||||
BUGMSG(D_DURING, "not recon: clearing counters anyway.\n");
|
||||
}
|
||||
|
||||
if(didsomething) {
|
||||
if (didsomething) {
|
||||
retval |= IRQ_HANDLED;
|
||||
}
|
||||
}
|
||||
|
||||
@ -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
|
||||
sizeof(struct archdr) */
|
||||
pktbuf=(char*)pkt;
|
||||
pkthdrbuf=(char*)pkthdr;
|
||||
memcpy(pktbuf, pkthdrbuf, ARC_HDR_SIZE+sizeof(pkt->soft.cap.proto));
|
||||
memcpy(pktbuf+ARC_HDR_SIZE+sizeof(pkt->soft.cap.proto)+sizeof(int),
|
||||
pkthdrbuf+ARC_HDR_SIZE+sizeof(pkt->soft.cap.proto),
|
||||
sizeof(struct archdr)-ARC_HDR_SIZE-sizeof(pkt->soft.cap.proto));
|
||||
pktbuf = (char *)pkt;
|
||||
pkthdrbuf = (char *)pkthdr;
|
||||
memcpy(pktbuf, pkthdrbuf, ARC_HDR_SIZE + sizeof(pkt->soft.cap.proto));
|
||||
memcpy(pktbuf + ARC_HDR_SIZE + sizeof(pkt->soft.cap.proto) + sizeof(int),
|
||||
pkthdrbuf + ARC_HDR_SIZE + sizeof(pkt->soft.cap.proto),
|
||||
sizeof(struct archdr) - ARC_HDR_SIZE - sizeof(pkt->soft.cap.proto));
|
||||
|
||||
if (length > 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,
|
||||
uint8_t daddr)
|
||||
{
|
||||
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",
|
||||
*((int*)&pkt->soft.cap.cookie[0]));
|
||||
*((int *)&pkt->soft.cap.cookie[0]));
|
||||
/*
|
||||
* Set the source hardware address.
|
||||
*
|
||||
@ -148,7 +148,7 @@ static int prepare_tx(struct net_device *dev, struct archdr *pkt, int length,
|
||||
lp->next_tx, lp->cur_tx, bufnum);
|
||||
|
||||
BUGMSG(D_PROTO, "Sending for cap packet %x.\n",
|
||||
*((int*)&pkt->soft.cap.cookie[0]));
|
||||
*((int *)&pkt->soft.cap.cookie[0]));
|
||||
|
||||
if (length > XMTU) {
|
||||
/* 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,
|
||||
hard->offset[0] = ofs = 256 - length;
|
||||
|
||||
BUGMSG(D_DURING, "prepare_tx: length=%d ofs=%d\n",
|
||||
length,ofs);
|
||||
length, ofs);
|
||||
|
||||
/* Copy the arcnet-header + the protocol byte down: */
|
||||
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,
|
||||
|
||||
/* Skip the extra integer we have written into it as a cookie
|
||||
but write the rest of the message: */
|
||||
lp->hw.copy_to_card(dev, bufnum, ofs+1,
|
||||
((unsigned char*)&pkt->soft.cap.mes),length-1);
|
||||
lp->hw.copy_to_card(dev, bufnum, ofs + 1,
|
||||
((unsigned char *)&pkt->soft.cap.mes), length - 1);
|
||||
|
||||
lp->lastload_dest = hard->dest;
|
||||
|
||||
@ -188,7 +188,7 @@ static int ack_tx(struct net_device *dev, int acked)
|
||||
struct arcnet_local *lp = netdev_priv(dev);
|
||||
struct sk_buff *ackskb;
|
||||
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",
|
||||
lp->outgoing.skb->protocol, acked);
|
||||
@ -196,13 +196,13 @@ static int ack_tx(struct net_device *dev, int acked)
|
||||
BUGLVL(D_SKB) arcnet_dump_skb(dev, lp->outgoing.skb, "ack_tx");
|
||||
|
||||
/* 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) {
|
||||
BUGMSG(D_NORMAL, "Memory squeeze, can't acknowledge.\n");
|
||||
goto free_outskb;
|
||||
}
|
||||
|
||||
skb_put(ackskb, length + ARC_HDR_SIZE );
|
||||
skb_put(ackskb, length + ARC_HDR_SIZE);
|
||||
ackskb->dev = dev;
|
||||
|
||||
skb_reset_mac_header(ackskb);
|
||||
@ -212,10 +212,10 @@ static int ack_tx(struct net_device *dev, int acked)
|
||||
skb_copy_from_linear_data(lp->outgoing.skb, ackpkt,
|
||||
ARC_HDR_SIZE + sizeof(struct arc_cap));
|
||||
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",
|
||||
*((int*)&ackpkt->soft.cap.cookie[0]));
|
||||
*((int *)&ackpkt->soft.cap.cookie[0]));
|
||||
|
||||
ackskb->protocol = cpu_to_be16(ETH_P_ARCNET);
|
||||
|
||||
|
||||
@ -117,7 +117,7 @@ int com20020_check(struct net_device *dev)
|
||||
lp->config = 0x21 | (lp->timeout << 3) | (lp->backplane << 2);
|
||||
/* set node ID to 0x42 (but transmitter is disabled, so it's okay) */
|
||||
SETCONF;
|
||||
outb(0x42, ioaddr + BUS_ALIGN*7);
|
||||
outb(0x42, ioaddr + BUS_ALIGN * 7);
|
||||
|
||||
status = ASTATUS();
|
||||
|
||||
@ -129,7 +129,7 @@ int com20020_check(struct net_device *dev)
|
||||
|
||||
/* Enable TX */
|
||||
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);
|
||||
|
||||
@ -193,7 +193,7 @@ int com20020_found(struct net_device *dev, int shared)
|
||||
lp->hw.close = com20020_close;
|
||||
|
||||
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);
|
||||
outb(lp->setup, _XREG);
|
||||
@ -258,15 +258,15 @@ static int com20020_reset(struct net_device *dev, int really_reset)
|
||||
u_char inbyte;
|
||||
|
||||
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",
|
||||
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);
|
||||
/* power-up defaults */
|
||||
SETCONF;
|
||||
BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__);
|
||||
BUGMSG(D_DEBUG, "%s: %d: %s\n", __FILE__, __LINE__, __func__);
|
||||
|
||||
if (really_reset) {
|
||||
/* reset the card */
|
||||
@ -274,22 +274,22 @@ static int com20020_reset(struct net_device *dev, int really_reset)
|
||||
mdelay(RESETtime * 2); /* COM20020 seems to be slower sometimes */
|
||||
}
|
||||
/* 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);
|
||||
|
||||
/* 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);
|
||||
BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__);
|
||||
BUGMSG(D_DEBUG, "%s: %d: %s\n", __FILE__, __LINE__, __func__);
|
||||
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");
|
||||
return 1;
|
||||
}
|
||||
/* enable extended (512-byte) packets */
|
||||
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. */
|
||||
return 0;
|
||||
@ -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)
|
||||
{
|
||||
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);
|
||||
}
|
||||
|
||||
@ -315,7 +315,7 @@ static int com20020_status(struct net_device *dev)
|
||||
{
|
||||
u_int ioaddr = dev->base_addr;
|
||||
|
||||
return ASTATUS() + (ADIAGSTATUS()<<8);
|
||||
return ASTATUS() + (ADIAGSTATUS() << 8);
|
||||
}
|
||||
|
||||
static void com20020_close(struct net_device *dev)
|
||||
|
||||
@ -71,7 +71,7 @@ static void regdump(struct net_device *dev)
|
||||
outb((count >> 8) | RDDATAflag | AUTOINCflag, _ADDR_HI);
|
||||
outb(count & 0xff, _ADDR_LO);
|
||||
|
||||
for (count = 0; count < 256+32; count++)
|
||||
for (count = 0; count < 256 + 32; count++)
|
||||
{
|
||||
if (!(count % 16))
|
||||
pr_cont("%04X:", count);
|
||||
@ -208,7 +208,7 @@ static int com20020_config(struct pcmcia_device *link)
|
||||
dev_dbg(&link->dev, "com20020_config\n");
|
||||
|
||||
dev_dbg(&link->dev, "baseport1 is %Xh\n",
|
||||
(unsigned int) link->resource[0]->start);
|
||||
(unsigned int)link->resource[0]->start);
|
||||
|
||||
i = -ENODEV;
|
||||
link->io_lines = 16;
|
||||
|
||||
@ -60,23 +60,23 @@ static void com90io_copy_from_card(struct net_device *dev, int bufnum, int offse
|
||||
#define ARCNET_TOTAL_SIZE 16
|
||||
|
||||
/* COM 9026 controller chip --> ARCnet register addresses */
|
||||
#define _INTMASK (ioaddr+0) /* writable */
|
||||
#define _STATUS (ioaddr+0) /* readable */
|
||||
#define _COMMAND (ioaddr+1) /* writable, returns random vals on read (?) */
|
||||
#define _RESET (ioaddr+8) /* software reset (on read) */
|
||||
#define _MEMDATA (ioaddr+12) /* Data port for IO-mapped memory */
|
||||
#define _ADDR_HI (ioaddr+15) /* Control registers for said */
|
||||
#define _ADDR_LO (ioaddr+14)
|
||||
#define _CONFIG (ioaddr+2) /* Configuration register */
|
||||
#define _INTMASK (ioaddr + 0) /* writable */
|
||||
#define _STATUS (ioaddr + 0) /* readable */
|
||||
#define _COMMAND (ioaddr + 1) /* writable, returns random vals on read (?) */
|
||||
#define _RESET (ioaddr + 8) /* software reset (on read) */
|
||||
#define _MEMDATA (ioaddr + 12) /* Data port for IO-mapped memory */
|
||||
#define _ADDR_HI (ioaddr + 15) /* Control registers for said */
|
||||
#define _ADDR_LO (ioaddr + 14)
|
||||
#define _CONFIG (ioaddr + 2) /* Configuration register */
|
||||
|
||||
#undef ASTATUS
|
||||
#undef ACOMMAND
|
||||
#undef AINTMASK
|
||||
|
||||
#define ASTATUS() inb(_STATUS)
|
||||
#define ACOMMAND(cmd) outb((cmd),_COMMAND)
|
||||
#define AINTMASK(msk) outb((msk),_INTMASK)
|
||||
#define SETCONF() outb((lp->config),_CONFIG)
|
||||
#define ACOMMAND(cmd) outb((cmd), _COMMAND)
|
||||
#define AINTMASK(msk) outb((msk), _INTMASK)
|
||||
#define SETCONF() outb((lp->config), _CONFIG)
|
||||
|
||||
|
||||
/****************************************************************************
|
||||
|
||||
@ -77,25 +77,25 @@ static int numcards;
|
||||
|
||||
/* Amount of I/O memory used by the card */
|
||||
#define BUFFER_SIZE (512)
|
||||
#define MIRROR_SIZE (BUFFER_SIZE*4)
|
||||
#define MIRROR_SIZE (BUFFER_SIZE * 4)
|
||||
|
||||
/* COM 9026 controller chip --> ARCnet register addresses */
|
||||
#define _INTMASK (ioaddr+0) /* writable */
|
||||
#define _STATUS (ioaddr+0) /* readable */
|
||||
#define _COMMAND (ioaddr+1) /* writable, returns random vals on read (?) */
|
||||
#define _CONFIG (ioaddr+2) /* Configuration register */
|
||||
#define _RESET (ioaddr+8) /* software reset (on read) */
|
||||
#define _MEMDATA (ioaddr+12) /* Data port for IO-mapped memory */
|
||||
#define _ADDR_HI (ioaddr+15) /* Control registers for said */
|
||||
#define _ADDR_LO (ioaddr+14)
|
||||
#define _INTMASK (ioaddr + 0) /* writable */
|
||||
#define _STATUS (ioaddr + 0) /* readable */
|
||||
#define _COMMAND (ioaddr + 1) /* writable, returns random vals on read (?) */
|
||||
#define _CONFIG (ioaddr + 2) /* Configuration register */
|
||||
#define _RESET (ioaddr + 8) /* software reset (on read) */
|
||||
#define _MEMDATA (ioaddr + 12) /* Data port for IO-mapped memory */
|
||||
#define _ADDR_HI (ioaddr + 15) /* Control registers for said */
|
||||
#define _ADDR_LO (ioaddr + 14)
|
||||
|
||||
#undef ASTATUS
|
||||
#undef ACOMMAND
|
||||
#undef AINTMASK
|
||||
|
||||
#define ASTATUS() inb(_STATUS)
|
||||
#define ACOMMAND(cmd) outb((cmd),_COMMAND)
|
||||
#define AINTMASK(msk) outb((msk),_INTMASK)
|
||||
#define ACOMMAND(cmd) outb((cmd), _COMMAND)
|
||||
#define AINTMASK(msk) outb((msk), _INTMASK)
|
||||
|
||||
|
||||
static int com90xx_skip_probe __initdata = 0;
|
||||
@ -127,11 +127,11 @@ static void __init com90xx_probe(void)
|
||||
if (!io && !irq && !shmem && !*device && com90xx_skip_probe)
|
||||
return;
|
||||
|
||||
shmems = kzalloc(((0x100000-0xa0000) / 0x800) * sizeof(unsigned long),
|
||||
shmems = kzalloc(((0x100000 - 0xa0000) / 0x800) * sizeof(unsigned long),
|
||||
GFP_KERNEL);
|
||||
if (!shmems)
|
||||
return;
|
||||
iomem = kzalloc(((0x100000-0xa0000) / 0x800) * sizeof(void __iomem *),
|
||||
iomem = kzalloc(((0x100000 - 0xa0000) / 0x800) * sizeof(void __iomem *),
|
||||
GFP_KERNEL);
|
||||
if (!iomem) {
|
||||
kfree(shmems);
|
||||
|
||||
@ -89,7 +89,7 @@ MODULE_LICENSE("GPL");
|
||||
*/
|
||||
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;
|
||||
int hdr_size = ARC_HDR_SIZE + RFC1051_HDR_SIZE;
|
||||
|
||||
@ -146,7 +146,7 @@ static void rx(struct net_device *dev, int bufnum,
|
||||
skb_put(skb, length + ARC_HDR_SIZE);
|
||||
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 */
|
||||
memcpy(pkt, pkthdr, sizeof(struct archdr));
|
||||
@ -169,7 +169,7 @@ static int build_header(struct sk_buff *skb, struct net_device *dev,
|
||||
unsigned short type, uint8_t daddr)
|
||||
{
|
||||
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;
|
||||
|
||||
/* set the protocol ID according to RFC1051 */
|
||||
|
||||
@ -91,7 +91,7 @@ module_exit(arcnet_rfc1201_exit);
|
||||
*/
|
||||
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;
|
||||
int hdr_size = ARC_HDR_SIZE + RFC1201_HDR_SIZE;
|
||||
|
||||
@ -187,7 +187,7 @@ static void rx(struct net_device *dev, int bufnum,
|
||||
skb_put(skb, length + ARC_HDR_SIZE);
|
||||
skb->dev = dev;
|
||||
|
||||
pkt = (struct archdr *) skb->data;
|
||||
pkt = (struct archdr *)skb->data;
|
||||
soft = &pkt->soft.rfc1201;
|
||||
|
||||
/* 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,
|
||||
* (which is impossible to fumble) and insert it ourselves.
|
||||
*/
|
||||
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 */
|
||||
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? */
|
||||
BUGMSG(D_EXTRA,
|
||||
@ -274,7 +274,7 @@ static void rx(struct net_device *dev, int bufnum,
|
||||
dev_kfree_skb_irq(in->skb);
|
||||
}
|
||||
in->sequence = soft->sequence;
|
||||
in->numpackets = ((unsigned) soft->split_flag >> 1) + 2;
|
||||
in->numpackets = ((unsigned)soft->split_flag >> 1) + 2;
|
||||
in->lastpacket = 1;
|
||||
|
||||
if (in->numpackets > 16) {
|
||||
@ -294,7 +294,7 @@ static void rx(struct net_device *dev, int bufnum,
|
||||
return;
|
||||
}
|
||||
skb->dev = dev;
|
||||
pkt = (struct archdr *) skb->data;
|
||||
pkt = (struct archdr *)skb->data;
|
||||
soft = &pkt->soft.rfc1201;
|
||||
|
||||
memcpy(pkt, pkthdr, ARC_HDR_SIZE + RFC1201_HDR_SIZE);
|
||||
@ -302,7 +302,7 @@ static void rx(struct net_device *dev, int bufnum,
|
||||
|
||||
soft->split_flag = 0; /* end result won't be split */
|
||||
} 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
|
||||
@ -341,7 +341,7 @@ static void rx(struct net_device *dev, int bufnum,
|
||||
in->lastpacket = in->numpackets = 0;
|
||||
return;
|
||||
}
|
||||
pkt = (struct archdr *) in->skb->data;
|
||||
pkt = (struct archdr *)in->skb->data;
|
||||
soft = &pkt->soft.rfc1201;
|
||||
}
|
||||
|
||||
@ -376,7 +376,7 @@ static int build_header(struct sk_buff *skb, struct net_device *dev,
|
||||
{
|
||||
struct arcnet_local *lp = netdev_priv(dev);
|
||||
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;
|
||||
|
||||
/* set the protocol ID according to RFC1201 */
|
||||
|
||||
@ -77,18 +77,18 @@
|
||||
#endif
|
||||
|
||||
#ifndef ARCNET_DEBUG
|
||||
#define ARCNET_DEBUG (D_NORMAL|D_EXTRA)
|
||||
#define ARCNET_DEBUG (D_NORMAL | D_EXTRA)
|
||||
#endif
|
||||
extern int arcnet_debug;
|
||||
|
||||
/* macros to simplify debug checking */
|
||||
#define BUGLVL(x) if ((ARCNET_DEBUG_MAX)&arcnet_debug&(x))
|
||||
#define BUGMSG2(x,msg,args...) do { BUGLVL(x) printk(msg, ## args); } while (0)
|
||||
#define BUGMSG(x,msg,args...) \
|
||||
#define BUGLVL(x) if ((ARCNET_DEBUG_MAX) & arcnet_debug & (x))
|
||||
#define BUGMSG2(x, msg, args...) do { BUGLVL(x) printk(msg, ## args); } while (0)
|
||||
#define BUGMSG(x, msg, args...) \
|
||||
BUGMSG2(x, "%s%6s: " msg, \
|
||||
x==D_NORMAL ? KERN_WARNING \
|
||||
x == D_NORMAL ? KERN_WARNING \
|
||||
: 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 */
|
||||
#define TIME(name, bytes, call) BUGLVL(D_TIMING) { \
|
||||
@ -98,12 +98,12 @@ extern int arcnet_debug;
|
||||
_y = get_cycles(); \
|
||||
BUGMSG(D_TIMING, \
|
||||
"%s: %d bytes in %lu cycles == " \
|
||||
"%lu Kbytes/100Mcycle\n",\
|
||||
"%lu Kbytes/100Mcycle\n", \
|
||||
name, bytes, _y - _x, \
|
||||
100000000 / 1024 * bytes / (_y - _x + 1));\
|
||||
100000000 / 1024 * bytes / (_y - _x + 1)); \
|
||||
} \
|
||||
else { \
|
||||
call;\
|
||||
call; \
|
||||
}
|
||||
|
||||
|
||||
@ -189,16 +189,16 @@ struct ArcProto {
|
||||
int mtu; /* largest possible packet */
|
||||
int is_ip; /* This is a ip plugin - not a raw thing */
|
||||
|
||||
void (*rx) (struct net_device * dev, int bufnum,
|
||||
struct archdr * pkthdr, int length);
|
||||
int (*build_header) (struct sk_buff * skb, struct net_device *dev,
|
||||
void (*rx)(struct net_device *dev, int bufnum,
|
||||
struct archdr *pkthdr, int length);
|
||||
int (*build_header)(struct sk_buff *skb, struct net_device *dev,
|
||||
unsigned short ethproto, uint8_t daddr);
|
||||
|
||||
/* 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 (*continue_tx) (struct net_device * dev, int bufnum);
|
||||
int (*ack_tx) (struct net_device * dev, int acked);
|
||||
int (*continue_tx)(struct net_device *dev, int bufnum);
|
||||
int (*ack_tx)(struct net_device *dev, int acked);
|
||||
};
|
||||
|
||||
extern struct ArcProto *arc_proto_map[256], *arc_proto_default,
|
||||
@ -298,16 +298,16 @@ struct arcnet_local {
|
||||
/* hardware-specific functions */
|
||||
struct {
|
||||
struct module *owner;
|
||||
void (*command) (struct net_device * dev, int cmd);
|
||||
int (*status) (struct net_device * dev);
|
||||
void (*intmask) (struct net_device * dev, int mask);
|
||||
int (*reset) (struct net_device * dev, int really_reset);
|
||||
void (*open) (struct net_device * dev);
|
||||
void (*close) (struct net_device * dev);
|
||||
void (*command)(struct net_device *dev, int cmd);
|
||||
int (*status)(struct net_device *dev);
|
||||
void (*intmask)(struct net_device *dev, int mask);
|
||||
int (*reset)(struct net_device *dev, int really_reset);
|
||||
void (*open)(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 (*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);
|
||||
} hw;
|
||||
|
||||
@ -325,7 +325,7 @@ struct arcnet_local {
|
||||
#if ARCNET_DEBUG_MAX & D_SKB
|
||||
void arcnet_dump_skb(struct net_device *dev, struct sk_buff *skb, char *desc);
|
||||
#else
|
||||
#define arcnet_dump_skb(dev,skb,desc) ;
|
||||
#define arcnet_dump_skb(dev, skb, desc) ;
|
||||
#endif
|
||||
|
||||
void arcnet_unregister_proto(struct ArcProto *proto);
|
||||
|
||||
Reference in New Issue
Block a user