leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

consolidate mdelay by providing a common function for all users

Browse Source 
There are several mdelay() definitions in the driver and
board code. Remove them all and provide a common mdelay()
in lib/time.c.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Acked-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Anatolij Gustschin 2011-10-12 02:31:39 +00:00 committed by Wolfgang Denk
parent 712fbcf384
commit c4c9fbebae
20 changed files with 7 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/cpu/arm920t/s3c24x0/usb_ohci.c
View File

@ -1540,7 +1540,6 @@ static int hc_start(struct ohci *ohci)
writel(RH_HS_LPSC, &ohci->regs->roothub.status);
#endif /* OHCI_USE_NPS */
#define mdelay(n) ({unsigned long msec=(n); while (msec--) udelay(1000);})
/* POTPGT delay is bits 24-31, in 2 ms units. */
mdelay((roothub_a(ohci) >> 23) & 0x1fe);

1
arch/mips/cpu/mips32/au1x00/au1x00_usb_ohci.c
View File

@ -1448,7 +1448,6 @@ static int hc_start (ohci_t * ohci)
writel (RH_HS_LPSC, &ohci->regs->roothub.status);
#endif /* OHCI_USE_NPS */
#define mdelay(n) ({unsigned long msec=(n); while (msec--) udelay(1000);})
/* POTPGT delay is bits 24-31, in 2 ms units. */
mdelay ((roothub_a (ohci) >> 23) & 0x1fe);

1
arch/powerpc/cpu/mpc5xxx/usb_ohci.c
View File

@ -1455,7 +1455,6 @@ static int hc_start (ohci_t * ohci)
writel (RH_HS_LPSC, &ohci->regs->roothub.status);
#endif /* OHCI_USE_NPS */
#define mdelay(n) ({unsigned long msec=(n); while (msec--) udelay(1000);})
/* POTPGT delay is bits 24-31, in 2 ms units. */
mdelay ((roothub_a (ohci) >> 23) & 0x1fe);

1
arch/powerpc/cpu/ppc4xx/usb_ohci.c
View File

@ -1462,7 +1462,6 @@ static int hc_start (ohci_t * ohci)
writel (RH_HS_LPSC, &ohci->regs->roothub.status);
#endif /* OHCI_USE_NPS */
#define mdelay(n) ({unsigned long msec=(n); while (msec--) udelay(1000);})
/* POTPGT delay is bits 24-31, in 2 ms units. */
mdelay ((roothub_a (ohci) >> 23) & 0x1fe);

8
arch/powerpc/include/asm/4xx_pcie.h
View File

@ -389,14 +389,6 @@ static inline int is_end_point(int port)
return 0;
}
static inline void mdelay(int n)
{
u32 ms = n;
while (ms--)
udelay(1000);
}
#if defined(PCIE0_SDR)
static inline u32 sdr_base(int port)
{

2
board/amcc/taishan/lcd.c
View File

@ -35,8 +35,6 @@
#define LCD_DATA_ADDR ((volatile char *)(CONFIG_SYS_EBC2_LCM_BASE+1))
#define LCD_BLK_CTRL ((volatile char *)(CONFIG_SYS_EBC1_FPGA_BASE+0x2))
#define mdelay(t) ({unsigned long msec=(t); while (msec--) { udelay(1000);}})
static int g_lcd_init_b = 0;
static char *amcc_logo = " AMCC TAISHAN 440GX EvalBoard";
static char addr_flag = 0x80;

2
board/freescale/mx35pdk/mx35pdk.c
View File

@ -46,8 +46,6 @@
#error "CONFIG_BOARD_EARLY_INIT_F must be set for this board"
#endif
#define mdelay(n) ({unsigned long msec = (n); while (msec--) udelay(1000); })
DECLARE_GLOBAL_DATA_PTR;
int dram_init(void)

6
board/karo/tx25/tx25.c
View File

@ -31,12 +31,6 @@
#include <asm/gpio.h>
#include <asm/arch/sys_proto.h>
static void mdelay(int n)
{
while (n-- > 0)
udelay(1000);
}
DECLARE_GLOBAL_DATA_PTR;
#ifdef CONFIG_FEC_MXC

2
board/linkstation/hwctl.c
View File

@ -19,8 +19,6 @@
#include <command.h>
#include <asm/io.h>
#define mdelay(n) udelay((n)*1000)
#define AVR_PORT CONFIG_SYS_NS16550_COM2
/* 2005.5.10 BUFFALO add */

7
drivers/block/fsl_sata.c
View File

@ -50,13 +50,6 @@ static struct fsl_sata_info fsl_sata_info[] = {
#endif
};
static inline void mdelay(unsigned long msec)
{
unsigned long i;
for (i = 0; i < msec; i++)
udelay(1000);
}
static inline void sdelay(unsigned long sec)
{
unsigned long i;

2
drivers/block/ftide020.c
View File

@ -54,8 +54,6 @@
#define WRITE_CMD(x) outl((x), &ftide020->cmd_fifo) /* 0x04 */
#define READ_STATUS() inl(&ftide020->cmd_fifo) /* 0x04 */
#define mdelay(n) ({unsigned long msec = (n); while (msec--) udelay(1000); })
void ftide_set_device(int cx8, int dev)
{
static struct ftide020_s *ftide020 = (struct ftide020_s *) FTIDE_BASE;

1
drivers/net/e1000.c
View File

@ -50,7 +50,6 @@ tested on both gig copper and gig fiber boards
#define virt_to_bus(devno, v) pci_virt_to_mem(devno, (void *) (v))
#define bus_to_phys(devno, a) pci_mem_to_phys(devno, a)
#define mdelay(n) udelay((n)*1000)
#define E1000_DEFAULT_PCI_PBA 0x00000030
#define E1000_DEFAULT_PCIE_PBA 0x000a0026

2
drivers/net/ftgmac100.c
View File

@ -33,8 +33,6 @@
#define ETH_ZLEN 60
#define mdelay(n) ({unsigned long msec = (n); while (msec--) udelay(1000); })
/* RBSR - hw default init value is also 0x640 */
#define RBSR_DEFAULT_VALUE 0x640

1
drivers/net/ne2000.c
View File

@ -78,7 +78,6 @@ Add SNMP
/* NE2000 base header file */
#include "ne2000_base.h"
#define mdelay(n) udelay((n)*1000)
/* find prom (taken from pc_net_cs.c from Linux) */
#include "8390.h"

1
drivers/net/ne2000_base.c
View File

@ -77,7 +77,6 @@ Add SNMP
#include <net.h>
#include <malloc.h>
#define mdelay(n) udelay((n)*1000)
/* forward definition of function used for the uboot interface */
void uboot_push_packet_len(int len);
void uboot_push_tx_done(int key, int val);

2
drivers/net/smc911x.c
View File

@ -35,8 +35,6 @@ u32 pkt_data_pull(struct eth_device *dev, u32 addr) \
void pkt_data_push(struct eth_device *dev, u32 addr, u32 val) \
__attribute__ ((weak, alias ("smc911x_reg_write")));
#define mdelay(n) udelay((n)*1000)
static void smc911x_handle_mac_address(struct eth_device *dev)
{
unsigned long addrh, addrl;

1
drivers/usb/host/ohci-hcd.c
View File

@ -1749,7 +1749,6 @@ static int hc_start(ohci_t *ohci)
ohci_writel(RH_HS_LPSC, &ohci->regs->roothub.status);
#endif /* OHCI_USE_NPS */
#define mdelay(n) ({unsigned long msec = (n); while (msec--) udelay(1000); })
/* POTPGT delay is bits 24-31, in 2 ms units. */
mdelay((roothub_a(ohci) >> 23) & 0x1fe);

2
drivers/usb/host/sl811-hcd.c
View File

@ -51,8 +51,6 @@
#define SL811_ADR (0x50000000)
#define SL811_DAT (0x50000001)
#define mdelay(n) ({unsigned long msec=(n); while (msec--) udelay(1000);})
#ifdef SL811_DEBUG
static int debug = 9;
#endif

1
include/common.h
View File

@ -706,6 +706,7 @@ int strcmp_compar(const void *, const void *);
/* lib/time.c */
void udelay (unsigned long);
void mdelay(unsigned long);
/* lib/uuid.c */
void uuid_str_to_bin(const char *uuid, unsigned char *out);

6
lib/time.c
View File

@ -41,3 +41,9 @@ void udelay(unsigned long usec)
usec -= kv;
} while(usec);
}
void mdelay(unsigned long msec)
{
while (msec--)
udelay(1000);
}