diff options
author | Andreas Mohr <andi@lisas.de> | 2010-01-30 21:58:33 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-02-03 21:28:58 -0500 |
commit | c774651a5ffc0250f82d72730753f196c86884c5 (patch) | |
tree | 45998355c8007ddbd397332aa20f38503993c907 /drivers/net/usb/mcs7830.c | |
parent | 00e499131e250324a89c93d5dd88c8f2b4bf6dbb (diff) |
MCS7830 USB-Ether: change register define
ChangeLog:
- rename register, add comment
Signed-off-by: Andreas Mohr <andi@lisas.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb/mcs7830.c')
-rw-r--r-- | drivers/net/usb/mcs7830.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/usb/mcs7830.c b/drivers/net/usb/mcs7830.c index cb164d6c9b51..36a029218e3d 100644 --- a/drivers/net/usb/mcs7830.c +++ b/drivers/net/usb/mcs7830.c | |||
@@ -85,6 +85,7 @@ enum { | |||
85 | HIF_REG_PHY_CMD2_PEND_FLAG_BIT = 0x80, | 85 | HIF_REG_PHY_CMD2_PEND_FLAG_BIT = 0x80, |
86 | HIF_REG_PHY_CMD2_READY_FLAG_BIT = 0x40, | 86 | HIF_REG_PHY_CMD2_READY_FLAG_BIT = 0x40, |
87 | HIF_REG_CONFIG = 0x0e, | 87 | HIF_REG_CONFIG = 0x0e, |
88 | /* hmm, spec sez: "R/W", "Except bit 3" (likely TXENABLE). */ | ||
88 | HIF_REG_CONFIG_CFG = 0x80, | 89 | HIF_REG_CONFIG_CFG = 0x80, |
89 | HIF_REG_CONFIG_SPEED100 = 0x40, | 90 | HIF_REG_CONFIG_SPEED100 = 0x40, |
90 | HIF_REG_CONFIG_FULLDUPLEX_ENABLE = 0x20, | 91 | HIF_REG_CONFIG_FULLDUPLEX_ENABLE = 0x20, |
@@ -94,7 +95,7 @@ enum { | |||
94 | HIF_REG_CONFIG_ALLMULTICAST = 0x02, | 95 | HIF_REG_CONFIG_ALLMULTICAST = 0x02, |
95 | HIF_REG_CONFIG_PROMISCUOUS = 0x01, | 96 | HIF_REG_CONFIG_PROMISCUOUS = 0x01, |
96 | HIF_REG_ETHERNET_ADDR = 0x0f, | 97 | HIF_REG_ETHERNET_ADDR = 0x0f, |
97 | HIF_REG_22 = 0x15, | 98 | HIF_REG_FRAME_DROP_COUNTER = 0x15, /* 0..ff; reset: 0 */ |
98 | HIF_REG_PAUSE_THRESHOLD = 0x16, | 99 | HIF_REG_PAUSE_THRESHOLD = 0x16, |
99 | HIF_REG_PAUSE_THRESHOLD_DEFAULT = 0, | 100 | HIF_REG_PAUSE_THRESHOLD_DEFAULT = 0, |
100 | }; | 101 | }; |
@@ -334,7 +335,7 @@ static int mcs7830_get_rev(struct usbnet *dev) | |||
334 | { | 335 | { |
335 | u8 dummy[2]; | 336 | u8 dummy[2]; |
336 | int ret; | 337 | int ret; |
337 | ret = mcs7830_get_reg(dev, HIF_REG_22, 2, dummy); | 338 | ret = mcs7830_get_reg(dev, HIF_REG_FRAME_DROP_COUNTER, 2, dummy); |
338 | if (ret > 0) | 339 | if (ret > 0) |
339 | return 2; /* Rev C or later */ | 340 | return 2; /* Rev C or later */ |
340 | return 1; /* earlier revision */ | 341 | return 1; /* earlier revision */ |