aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/fs_enet/mac-scc.c
diff options
context:
space:
mode:
authorVitaly Bordug <vitb@kernel.crashing.org>2007-09-18 12:05:35 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:51:55 -0400
commit9b8ee8e7d6b7f2270b19b3425a393d918fe497d3 (patch)
tree84c6f1bba3bb927385ab1b55b2f0caaf076bad4c /drivers/net/fs_enet/mac-scc.c
parentaa90f5032129b43569896c1c6c15a706c02c6abf (diff)
FS_ENET: Add polling support
Signed-off-by: Vitaly Bordug <vitb@kernel.crashing.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/fs_enet/mac-scc.c')
-rw-r--r--drivers/net/fs_enet/mac-scc.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/fs_enet/mac-scc.c b/drivers/net/fs_enet/mac-scc.c
index 7540966687ec..6f32674a78e9 100644
--- a/drivers/net/fs_enet/mac-scc.c
+++ b/drivers/net/fs_enet/mac-scc.c
@@ -1,14 +1,14 @@
1/* 1/*
2 * Ethernet on Serial Communications Controller (SCC) driver for Motorola MPC8xx and MPC82xx. 2 * Ethernet on Serial Communications Controller (SCC) driver for Motorola MPC8xx and MPC82xx.
3 * 3 *
4 * Copyright (c) 2003 Intracom S.A. 4 * Copyright (c) 2003 Intracom S.A.
5 * by Pantelis Antoniou <panto@intracom.gr> 5 * by Pantelis Antoniou <panto@intracom.gr>
6 * 6 *
7 * 2005 (c) MontaVista Software, Inc. 7 * 2005 (c) MontaVista Software, Inc.
8 * Vitaly Bordug <vbordug@ru.mvista.com> 8 * Vitaly Bordug <vbordug@ru.mvista.com>
9 * 9 *
10 * This file is licensed under the terms of the GNU General Public License 10 * This file is licensed under the terms of the GNU General Public License
11 * version 2. This program is licensed "as is" without any warranty of any 11 * version 2. This program is licensed "as is" without any warranty of any
12 * kind, whether express or implied. 12 * kind, whether express or implied.
13 */ 13 */
14 14
@@ -82,7 +82,7 @@
82#define SCC_MAX_MULTICAST_ADDRS 64 82#define SCC_MAX_MULTICAST_ADDRS 64
83 83
84/* 84/*
85 * Delay to wait for SCC reset command to complete (in us) 85 * Delay to wait for SCC reset command to complete (in us)
86 */ 86 */
87#define SCC_RESET_DELAY 50 87#define SCC_RESET_DELAY 50
88#define MAX_CR_CMD_LOOPS 10000 88#define MAX_CR_CMD_LOOPS 10000
@@ -189,7 +189,7 @@ static void cleanup_data(struct net_device *dev)
189} 189}
190 190
191static void set_promiscuous_mode(struct net_device *dev) 191static void set_promiscuous_mode(struct net_device *dev)
192{ 192{
193 struct fs_enet_private *fep = netdev_priv(dev); 193 struct fs_enet_private *fep = netdev_priv(dev);
194 scc_t *sccp = fep->scc.sccp; 194 scc_t *sccp = fep->scc.sccp;
195 195
@@ -323,7 +323,7 @@ static void restart(struct net_device *dev)
323 W16(ep, sen_iaddr3, 0); 323 W16(ep, sen_iaddr3, 0);
324 W16(ep, sen_iaddr4, 0); 324 W16(ep, sen_iaddr4, 0);
325 325
326 /* set address 326 /* set address
327 */ 327 */
328 mac = dev->dev_addr; 328 mac = dev->dev_addr;
329 paddrh = ((u16) mac[5] << 8) | mac[4]; 329 paddrh = ((u16) mac[5] << 8) | mac[4];
@@ -345,7 +345,7 @@ static void restart(struct net_device *dev)
345 345
346 W16(sccp, scc_scce, 0xffff); 346 W16(sccp, scc_scce, 0xffff);
347 347
348 /* Enable interrupts we wish to service. 348 /* Enable interrupts we wish to service.
349 */ 349 */
350 W16(sccp, scc_sccm, SCCE_ENET_TXE | SCCE_ENET_RXF | SCCE_ENET_TXB); 350 W16(sccp, scc_sccm, SCCE_ENET_TXE | SCCE_ENET_RXF | SCCE_ENET_TXB);
351 351
@@ -373,7 +373,7 @@ static void restart(struct net_device *dev)
373 S32(sccp, scc_gsmrl, SCC_GSMRL_ENR | SCC_GSMRL_ENT); 373 S32(sccp, scc_gsmrl, SCC_GSMRL_ENR | SCC_GSMRL_ENT);
374} 374}
375 375
376static void stop(struct net_device *dev) 376static void stop(struct net_device *dev)
377{ 377{
378 struct fs_enet_private *fep = netdev_priv(dev); 378 struct fs_enet_private *fep = netdev_priv(dev);
379 scc_t *sccp = fep->scc.sccp; 379 scc_t *sccp = fep->scc.sccp;