Code cleanup: fix old style assignment ambiguities like "=-" etc.
Signed-off-by: Wolfgang Denk <wd@denx.de>
This commit is contained in:
@@ -173,7 +173,7 @@ int cfm_flash_write_buff (flash_info_t * info, uchar * src, ulong addr, ulong cn
|
||||
dest = cmf_backdoor_address(addr);
|
||||
while ((cnt>=4) && (rc == ERR_OK))
|
||||
{
|
||||
data =*((volatile u32 *) src);
|
||||
data = *((volatile u32 *) src);
|
||||
*(volatile u32*) dest = data;
|
||||
MCFCFM_CMD = MCFCFM_CMD_PGM;
|
||||
MCFCFM_USTAT = MCFCFM_USTAT_CBEIF;
|
||||
|
||||
@@ -348,7 +348,7 @@ int amd_flash_write_buff(flash_info_t * info, uchar * src, ulong addr, ulong cnt
|
||||
dest = addr;
|
||||
while ((cnt>=2) && (rc == ERR_OK))
|
||||
{
|
||||
data =*((volatile u16 *) src);
|
||||
data = *((volatile u16 *) src);
|
||||
rc=amd_write_word (info,dest,data);
|
||||
src +=2;
|
||||
dest +=2;
|
||||
|
||||
@@ -229,7 +229,7 @@ int drv_isa_kbd_init (void)
|
||||
device_t kbddev ;
|
||||
char *stdinname = getenv ("stdin");
|
||||
|
||||
if(isa_kbd_init()==-1)
|
||||
if(isa_kbd_init() == -1)
|
||||
return -1;
|
||||
memset (&kbddev, 0, sizeof(kbddev));
|
||||
strcpy(kbddev.name, DEVNAME);
|
||||
@@ -515,7 +515,7 @@ int kbd_read_data(void)
|
||||
int val;
|
||||
unsigned char status;
|
||||
|
||||
val=-1;
|
||||
val = -1;
|
||||
status = kbd_read_status();
|
||||
if (status & KBD_STAT_OBF) {
|
||||
val = kbd_read_input();
|
||||
|
||||
@@ -518,7 +518,7 @@ void usb_check_int_chain(void)
|
||||
uhci_td_t *td,*prevtd;
|
||||
|
||||
for(i=0;i<8;i++) {
|
||||
prevtd=&td_int[i]; /* the first previous td is the skeleton td */
|
||||
prevtd = &td_int[i]; /* the first previous td is the skeleton td */
|
||||
link=swap_32(td_int[i].link) & 0xfffffff0; /* next in chain */
|
||||
td=(uhci_td_t *)link; /* assign it */
|
||||
/* all interrupt TDs are finally linked to the td_int[0].
|
||||
@@ -595,7 +595,7 @@ int usb_lowlevel_init(void)
|
||||
|
||||
|
||||
busdevfunc=pci_find_device(USB_UHCI_VEND_ID,USB_UHCI_DEV_ID,0); /* get PCI Device ID */
|
||||
if(busdevfunc==-1) {
|
||||
if(busdevfunc == -1) {
|
||||
printf("Error USB UHCI (%04X,%04X) not found\n",USB_UHCI_VEND_ID,USB_UHCI_DEV_ID);
|
||||
return -1;
|
||||
}
|
||||
@@ -642,12 +642,12 @@ int usb_lowlevel_init(void)
|
||||
*/
|
||||
int usb_lowlevel_stop(void)
|
||||
{
|
||||
if(irqvec==-1)
|
||||
if(irqvec == -1)
|
||||
return 1;
|
||||
irq_free_handler(irqvec);
|
||||
irq_free_handler(0);
|
||||
reset_hc();
|
||||
irqvec=-1;
|
||||
irqvec = -1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -1570,8 +1570,8 @@ dram_size(long int *base, long int maxsize)
|
||||
for (cnt = STARTVAL/sizeof(long); cnt < maxsize/sizeof(long); cnt <<= 1) {
|
||||
addr = base + cnt; /* pointer arith! */
|
||||
|
||||
save1=*addr; /* save contents of addr */
|
||||
save2=*b; /* save contents of base */
|
||||
save1 = *addr; /* save contents of addr */
|
||||
save2 = *b; /* save contents of base */
|
||||
|
||||
*addr=cnt; /* write cnt to addr */
|
||||
*b=0; /* put null at base */
|
||||
|
||||
@@ -163,7 +163,7 @@ gt6426x_eth_receive(struct eth_dev_s *p,unsigned int icr)
|
||||
int eth_len=0;
|
||||
char *eth_data;
|
||||
|
||||
eth0_rx_desc_single *rx=&p->eth_rx_desc[(p->rdn)];
|
||||
eth0_rx_desc_single *rx = &p->eth_rx_desc[(p->rdn)];
|
||||
|
||||
INVALIDATE_DCACHE((unsigned int)rx,(unsigned int)(rx+1));
|
||||
|
||||
@@ -252,7 +252,7 @@ gt6426x_eth_transmit(void *v, volatile char *p, unsigned int s)
|
||||
#ifdef DEBUG
|
||||
unsigned int old_command_stat,old_psr;
|
||||
#endif
|
||||
eth0_tx_desc_single *tx=&dev->eth_tx_desc[dev->tdn];
|
||||
eth0_tx_desc_single *tx = &dev->eth_tx_desc[dev->tdn];
|
||||
|
||||
/* wait for tx to be ready */
|
||||
INVALIDATE_DCACHE((unsigned int)tx,(unsigned int)(tx+1));
|
||||
|
||||
@@ -259,7 +259,7 @@ char mpsc_getchar (void)
|
||||
int
|
||||
mpsc_test_char(void)
|
||||
{
|
||||
volatile unsigned int *p=&rx_desc_base[rx_desc_index*8];
|
||||
volatile unsigned int *p = &rx_desc_base[rx_desc_index*8];
|
||||
|
||||
INVALIDATE_DCACHE(&p[1], &p[2]);
|
||||
|
||||
|
||||
@@ -222,7 +222,7 @@ static int write_word (flash_info_t *info, ulong dest, unsigned long long data)
|
||||
unsigned long long result;
|
||||
int rc = ERR_OK;
|
||||
|
||||
result=*addr;
|
||||
result = *addr;
|
||||
if ((result & data) != data)
|
||||
return ERR_NOT_ERASED;
|
||||
|
||||
@@ -234,7 +234,7 @@ static int write_word (flash_info_t *info, ulong dest, unsigned long long data)
|
||||
eieio();
|
||||
|
||||
do {
|
||||
result=*addr;
|
||||
result = *addr;
|
||||
} while(~result & BIT_BUSY);
|
||||
|
||||
*addr=CMD_READ_ARRAY;
|
||||
@@ -275,7 +275,7 @@ int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt) {
|
||||
}
|
||||
|
||||
while(cnt>=8) {
|
||||
data=*((unsigned long long *)src);
|
||||
data = *((unsigned long long *)src);
|
||||
if ((rc = write_word(info, wp, data)) != 0)
|
||||
return rc;
|
||||
src+=8;
|
||||
|
||||
@@ -357,8 +357,8 @@ void copy_old_env(ulong size)
|
||||
unsigned off;
|
||||
uchar *name, *value;
|
||||
|
||||
name=&name_buf[0];
|
||||
value=&value_buf[0];
|
||||
name = &name_buf[0];
|
||||
value = &value_buf[0];
|
||||
len=size;
|
||||
off = sizeof(long);
|
||||
while (len > off) {
|
||||
@@ -377,8 +377,8 @@ void copy_old_env(ulong size)
|
||||
if(c == '\0')
|
||||
break;
|
||||
} while(len > off);
|
||||
name=&name_buf[0];
|
||||
value=&value_buf[0];
|
||||
name = &name_buf[0];
|
||||
value = &value_buf[0];
|
||||
if(strncmp((char *)name,"baudrate",8)!=0) {
|
||||
setenv((char *)name,(char *)value);
|
||||
}
|
||||
@@ -636,12 +636,12 @@ void video_get_info_str (int line_number, char *info)
|
||||
++s;
|
||||
break;
|
||||
}
|
||||
buf[i++]=*s;
|
||||
buf[i++] = *s;
|
||||
}
|
||||
sprintf(&buf[i]," SN ");
|
||||
i+=4;
|
||||
for (; s < e; ++s) {
|
||||
buf[i++]=*s;
|
||||
buf[i++] = *s;
|
||||
}
|
||||
buf[i++]=0;
|
||||
}
|
||||
|
||||
@@ -160,7 +160,7 @@ unsigned long flash_init (void)
|
||||
unsigned long size_b1,flashcr,size_reg;
|
||||
int mode;
|
||||
extern char version_string;
|
||||
char *p=&version_string;
|
||||
char *p = &version_string;
|
||||
|
||||
/* Since we are relocated, we can set-up the CS finally */
|
||||
setup_cs_reloc();
|
||||
|
||||
@@ -475,7 +475,7 @@ int kbd_read_data(void)
|
||||
int val;
|
||||
unsigned char status;
|
||||
|
||||
val=-1;
|
||||
val = -1;
|
||||
status = kbd_read_status();
|
||||
if (status & KBD_STAT_OBF) {
|
||||
val = kbd_read_input();
|
||||
|
||||
@@ -536,7 +536,7 @@ void usb_check_int_chain(void)
|
||||
uhci_td_t *td,*prevtd;
|
||||
|
||||
for(i=0;i<8;i++) {
|
||||
prevtd=&td_int[i]; /* the first previous td is the skeleton td */
|
||||
prevtd = &td_int[i]; /* the first previous td is the skeleton td */
|
||||
link=swap_32(td_int[i].link) & 0xfffffff0; /* next in chain */
|
||||
td=(uhci_td_t *)link; /* assign it */
|
||||
/* all interrupt TDs are finally linked to the td_int[0].
|
||||
@@ -638,7 +638,7 @@ int usb_lowlevel_stop(void)
|
||||
return 1;
|
||||
irq_free_handler(irqvec);
|
||||
reset_hc();
|
||||
irqvec=-1;
|
||||
irqvec = -1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -192,10 +192,10 @@ static int i2s_play_wave(unsigned long addr, unsigned long len)
|
||||
psc->command = (PSC_RX_ENABLE | PSC_TX_ENABLE);
|
||||
|
||||
for(i = 0;i < (len / 4); i++) {
|
||||
swapped[3]=*wave_file++;
|
||||
swapped[2]=*wave_file++;
|
||||
swapped[1]=*wave_file++;
|
||||
swapped[0]=*wave_file++;
|
||||
swapped[3] = *wave_file++;
|
||||
swapped[2] = *wave_file++;
|
||||
swapped[1] = *wave_file++;
|
||||
swapped[0] = *wave_file++;
|
||||
psc->psc_buffer_32 = *((unsigned long*)swapped);
|
||||
while (psc->tfnum > 400) {
|
||||
if(ctrlc())
|
||||
|
||||
Reference in New Issue
Block a user