* [PATCH 3/4] MCS7830 USB-Ether: change register define
@ 2010-01-31 12:58 Andreas Mohr
2010-02-04 2:29 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Andreas Mohr @ 2010-01-31 12:58 UTC (permalink / raw)
To: David Miller, Arnd Bergmann, David Hollis, Phil Chang; +Cc: netdev, linux-usb
ChangeLog:
- rename register, add comment
Signed-off-by: Andreas Mohr <andi@lisas.de>
Index: linux-2.6.33-rc4/drivers/net/usb/mcs7830.c
===================================================================
--- linux-2.6.33-rc4.orig/drivers/net/usb/mcs7830.c 2010-01-31 12:34:45.000000000 +0100
+++ linux-2.6.33-rc4/drivers/net/usb/mcs7830.c 2010-01-31 12:34:51.000000000 +0100
@@ -85,6 +85,7 @@
HIF_REG_PHY_CMD2_PEND_FLAG_BIT = 0x80,
HIF_REG_PHY_CMD2_READY_FLAG_BIT = 0x40,
HIF_REG_CONFIG = 0x0e,
+ /* hmm, spec sez: "R/W", "Except bit 3" (likely TXENABLE). */
HIF_REG_CONFIG_CFG = 0x80,
HIF_REG_CONFIG_SPEED100 = 0x40,
HIF_REG_CONFIG_FULLDUPLEX_ENABLE = 0x20,
@@ -94,7 +95,7 @@
HIF_REG_CONFIG_ALLMULTICAST = 0x02,
HIF_REG_CONFIG_PROMISCUOUS = 0x01,
HIF_REG_ETHERNET_ADDR = 0x0f,
- HIF_REG_22 = 0x15,
+ HIF_REG_FRAME_DROP_COUNTER = 0x15, /* 0..ff; reset: 0 */
HIF_REG_PAUSE_THRESHOLD = 0x16,
HIF_REG_PAUSE_THRESHOLD_DEFAULT = 0,
};
@@ -334,7 +335,7 @@
{
u8 dummy[2];
int ret;
- ret = mcs7830_get_reg(dev, HIF_REG_22, 2, dummy);
+ ret = mcs7830_get_reg(dev, HIF_REG_FRAME_DROP_COUNTER, 2, dummy);
if (ret > 0)
return 2; /* Rev C or later */
return 1; /* earlier revision */
--
GNU/Linux. It's not the software that's free, it's you.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-02-04 2:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-01-31 12:58 [PATCH 3/4] MCS7830 USB-Ether: change register define Andreas Mohr
2010-02-04 2:29 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox