Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 15:14:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Replace __asm references with __asm__

Browse source 
__asm__ follows gcc's documented syntax and is generally more common
than __asm.  This change is only asthetic and should not affect
functionality.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
This commit is contained in:
Peter Tyser 2009-04-20 11:09:05 -05:00 committed by Wolfgang Denk
parent f9a109b3ad
commit 54e822f959
7 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
board/MAI/AmigaOneG3SE/enet.c
View file

@ -297,50 +297,50 @@ static void eth_3com_halt(struct eth_device* dev);
static inline int ETH_INL(struct eth_device* dev, u_long addr)
{
__asm volatile ("eieio");
__asm__ volatile ("eieio");
return le32_to_cpu(*(volatile u32 *)io_to_phys(addr + dev->iobase));
}
static inline int ETH_INW(struct eth_device* dev, u_long addr)
{
__asm volatile ("eieio");
__asm__ volatile ("eieio");
return le16_to_cpu(*(volatile u16 *)io_to_phys(addr + dev->iobase));
}
static inline int ETH_INB(struct eth_device* dev, u_long addr)
{
__asm volatile ("eieio");
__asm__ volatile ("eieio");
return *(volatile u8 *)io_to_phys(addr + dev->iobase);
}
static inline void ETH_OUTB(struct eth_device* dev, int command, u_long addr)
{
*(volatile u8 *)io_to_phys(addr + dev->iobase) = command;
__asm volatile ("eieio");
__asm__ volatile ("eieio");
}
static inline void ETH_OUTW(struct eth_device* dev, int command, u_long addr)
{
*(volatile u16 *)io_to_phys(addr + dev->iobase) = cpu_to_le16(command);
__asm volatile ("eieio");
__asm__ volatile ("eieio");
}
static inline void ETH_OUTL(struct eth_device* dev, int command, u_long addr)
{
*(volatile u32 *)io_to_phys(addr + dev->iobase) = cpu_to_le32(command);
__asm volatile ("eieio");
__asm__ volatile ("eieio");
}
static inline int ETH_STATUS(struct eth_device* dev)
{
__asm volatile ("eieio");
__asm__ volatile ("eieio");
return le16_to_cpu(*(volatile u16 *)io_to_phys(EL3_STATUS + dev->iobase));
}
static inline void ETH_CMD(struct eth_device* dev, int command)
{
*(volatile u16 *)io_to_phys(EL3_CMD + dev->iobase) = cpu_to_le16(command);
__asm volatile ("eieio");
__asm__ volatile ("eieio");
}
/* Command register is always in the same spot in all the register windows */

10
board/MAI/AmigaOneG3SE/flash_new.c
View file

@ -153,14 +153,14 @@ static ulong flash_get_size (ulong addr, flash_info_t *info)
/* Write auto select command: read Manufacturer ID */
x[0x0555] = 0xAA;
__asm volatile ("sync\n eieio");
__asm__ volatile ("sync\n eieio");
x[0x02AA] = 0x55;
__asm volatile ("sync\n eieio");
__asm__ volatile ("sync\n eieio");
x[0x0555] = 0x90;
__asm volatile ("sync\n eieio");
__asm__ volatile ("sync\n eieio");
value = x[0];
__asm volatile ("sync\n eieio");
__asm__ volatile ("sync\n eieio");
DEBUGF("Manuf. ID @ 0x%08lx: 0x%08x\n", (ulong)addr, value);
@ -186,7 +186,7 @@ static ulong flash_get_size (ulong addr, flash_info_t *info)
}
value = x[1];
__asm volatile ("sync\n eieio");
__asm__ volatile ("sync\n eieio");
DEBUGF("Device ID @ 0x%08lx: 0x%08x\n", addr+1, value);

6
board/MAI/AmigaOneG3SE/serial.c
View file

@ -75,17 +75,17 @@ void serial_init (void)
/* COM_WRITE_BYTE(LINE_CONTROL, 0x83); */
/* COM_WRITE_BYTE(DIVISOR_LATCH_LSB, (uint8)(clock_divisor & 0xFF)); */
/* COM_WRITE_BYTE(DIVISOR_LATCH_MSB, (uint8)(clock_divisor >> 8)); */
/* __asm("eieio"); */
/* __asm__("eieio"); */
/* Set 8-N-1 */
COM_WRITE_BYTE (LINE_CONTROL, 0x03);
__asm ("eieio");
__asm__ ("eieio");
/* Disable FIFO */
COM_WRITE_BYTE (MODEM_CONTROL, 0x03);
COM_WRITE_BYTE (FIFO_CONTROL, 0x07);
__asm ("eieio");
__asm__ ("eieio");
serial_init_done = 1;
}

2
board/MAI/AmigaOneG3SE/via686.c
View file

@ -211,7 +211,7 @@ void via_cfgfunc_via686(struct pci_controller *host, pci_dev_t dev, struct pci_c
}
}
__asm (" .globl via_calibrate_time_base \n"
__asm__ (" .globl via_calibrate_time_base \n"
"via_calibrate_time_base: \n"
" lis 9, 0xfe00 \n"
" li 0, 0x00 \n"

2
board/trab/vfd.c
View file

@ -369,7 +369,7 @@ int vfd_init_clocks (void)
gpio->PCCON = (gpio->PCCON & 0xFFFFFF00); /* configure GPC0...GPC3 as inputs */
/* allow signals to settle */
for (i=0; i<10000; i++) /* udelay isn't working yet at this point! */
__asm("NOP");
__asm__("NOP");
vfd_board_id = (~gpio->PCDAT) & 0x000F; /* read GPC0...GPC3 port pins */
VFD_DISABLE; /* activate blank for the vfd */

2
cpu/ixp/npe/IxFeatureCtrl.c
View file

@ -317,7 +317,7 @@ ixFeatureCtrlProductIdRead ()
/* Use ARM instruction to move register0 from coprocessor to ARM register */
#ifndef __wince
__asm("mrc p15, 0, %0, cr0, cr0, 0;" : "=r"(pdId) :);
__asm__("mrc p15, 0, %0, cr0, cr0, 0;" : "=r"(pdId) :);
#else
#ifndef IN_KERNEL

10
tools/updater/flash_hw.c
View file

@ -153,14 +153,14 @@ static ulong flash_get_size (ulong addr, flash_info_t *info)
/* Write auto select command: read Manufacturer ID */
x[0x0555] = 0xAA;
__asm volatile ("sync\n eieio");
__asm__ volatile ("sync\n eieio");
x[0x02AA] = 0x55;
__asm volatile ("sync\n eieio");
__asm__ volatile ("sync\n eieio");
x[0x0555] = 0x90;
__asm volatile ("sync\n eieio");
__asm__ volatile ("sync\n eieio");
value = x[0];
__asm volatile ("sync\n eieio");
__asm__ volatile ("sync\n eieio");
DEBUGF("Manuf. ID @ 0x%08lx: 0x%08x\n", (ulong)addr, value);
@ -186,7 +186,7 @@ static ulong flash_get_size (ulong addr, flash_info_t *info)
}
value = x[1];
__asm volatile ("sync\n eieio");
__asm__ volatile ("sync\n eieio");
DEBUGF("Device ID @ 0x%08lx: 0x%08x\n", addr+1, value);