mirror of
https://github.com/u-boot/u-boot.git
synced 2025-04-19 03:15:00 +00:00
Code cleanup: fix old style assignment ambiguities like "=-" etc.
Signed-off-by: Wolfgang Denk <wd@denx.de>
This commit is contained in:
parent
d7854223c5
commit
d0ff51ba5d
31 changed files with 65 additions and 65 deletions
|
@ -173,7 +173,7 @@ int cfm_flash_write_buff (flash_info_t * info, uchar * src, ulong addr, ulong cn
|
||||||
dest = cmf_backdoor_address(addr);
|
dest = cmf_backdoor_address(addr);
|
||||||
while ((cnt>=4) && (rc == ERR_OK))
|
while ((cnt>=4) && (rc == ERR_OK))
|
||||||
{
|
{
|
||||||
data =*((volatile u32 *) src);
|
data = *((volatile u32 *) src);
|
||||||
*(volatile u32*) dest = data;
|
*(volatile u32*) dest = data;
|
||||||
MCFCFM_CMD = MCFCFM_CMD_PGM;
|
MCFCFM_CMD = MCFCFM_CMD_PGM;
|
||||||
MCFCFM_USTAT = MCFCFM_USTAT_CBEIF;
|
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;
|
dest = addr;
|
||||||
while ((cnt>=2) && (rc == ERR_OK))
|
while ((cnt>=2) && (rc == ERR_OK))
|
||||||
{
|
{
|
||||||
data =*((volatile u16 *) src);
|
data = *((volatile u16 *) src);
|
||||||
rc=amd_write_word (info,dest,data);
|
rc=amd_write_word (info,dest,data);
|
||||||
src +=2;
|
src +=2;
|
||||||
dest +=2;
|
dest +=2;
|
||||||
|
|
|
@ -229,7 +229,7 @@ int drv_isa_kbd_init (void)
|
||||||
device_t kbddev ;
|
device_t kbddev ;
|
||||||
char *stdinname = getenv ("stdin");
|
char *stdinname = getenv ("stdin");
|
||||||
|
|
||||||
if(isa_kbd_init()==-1)
|
if(isa_kbd_init() == -1)
|
||||||
return -1;
|
return -1;
|
||||||
memset (&kbddev, 0, sizeof(kbddev));
|
memset (&kbddev, 0, sizeof(kbddev));
|
||||||
strcpy(kbddev.name, DEVNAME);
|
strcpy(kbddev.name, DEVNAME);
|
||||||
|
@ -515,7 +515,7 @@ int kbd_read_data(void)
|
||||||
int val;
|
int val;
|
||||||
unsigned char status;
|
unsigned char status;
|
||||||
|
|
||||||
val=-1;
|
val = -1;
|
||||||
status = kbd_read_status();
|
status = kbd_read_status();
|
||||||
if (status & KBD_STAT_OBF) {
|
if (status & KBD_STAT_OBF) {
|
||||||
val = kbd_read_input();
|
val = kbd_read_input();
|
||||||
|
|
|
@ -518,7 +518,7 @@ void usb_check_int_chain(void)
|
||||||
uhci_td_t *td,*prevtd;
|
uhci_td_t *td,*prevtd;
|
||||||
|
|
||||||
for(i=0;i<8;i++) {
|
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 */
|
link=swap_32(td_int[i].link) & 0xfffffff0; /* next in chain */
|
||||||
td=(uhci_td_t *)link; /* assign it */
|
td=(uhci_td_t *)link; /* assign it */
|
||||||
/* all interrupt TDs are finally linked to the td_int[0].
|
/* 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 */
|
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);
|
printf("Error USB UHCI (%04X,%04X) not found\n",USB_UHCI_VEND_ID,USB_UHCI_DEV_ID);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
@ -642,12 +642,12 @@ int usb_lowlevel_init(void)
|
||||||
*/
|
*/
|
||||||
int usb_lowlevel_stop(void)
|
int usb_lowlevel_stop(void)
|
||||||
{
|
{
|
||||||
if(irqvec==-1)
|
if(irqvec == -1)
|
||||||
return 1;
|
return 1;
|
||||||
irq_free_handler(irqvec);
|
irq_free_handler(irqvec);
|
||||||
irq_free_handler(0);
|
irq_free_handler(0);
|
||||||
reset_hc();
|
reset_hc();
|
||||||
irqvec=-1;
|
irqvec = -1;
|
||||||
return 0;
|
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) {
|
for (cnt = STARTVAL/sizeof(long); cnt < maxsize/sizeof(long); cnt <<= 1) {
|
||||||
addr = base + cnt; /* pointer arith! */
|
addr = base + cnt; /* pointer arith! */
|
||||||
|
|
||||||
save1=*addr; /* save contents of addr */
|
save1 = *addr; /* save contents of addr */
|
||||||
save2=*b; /* save contents of base */
|
save2 = *b; /* save contents of base */
|
||||||
|
|
||||||
*addr=cnt; /* write cnt to addr */
|
*addr=cnt; /* write cnt to addr */
|
||||||
*b=0; /* put null at base */
|
*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;
|
int eth_len=0;
|
||||||
char *eth_data;
|
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));
|
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
|
#ifdef DEBUG
|
||||||
unsigned int old_command_stat,old_psr;
|
unsigned int old_command_stat,old_psr;
|
||||||
#endif
|
#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 */
|
/* wait for tx to be ready */
|
||||||
INVALIDATE_DCACHE((unsigned int)tx,(unsigned int)(tx+1));
|
INVALIDATE_DCACHE((unsigned int)tx,(unsigned int)(tx+1));
|
||||||
|
|
|
@ -259,7 +259,7 @@ char mpsc_getchar (void)
|
||||||
int
|
int
|
||||||
mpsc_test_char(void)
|
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]);
|
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;
|
unsigned long long result;
|
||||||
int rc = ERR_OK;
|
int rc = ERR_OK;
|
||||||
|
|
||||||
result=*addr;
|
result = *addr;
|
||||||
if ((result & data) != data)
|
if ((result & data) != data)
|
||||||
return ERR_NOT_ERASED;
|
return ERR_NOT_ERASED;
|
||||||
|
|
||||||
|
@ -234,7 +234,7 @@ static int write_word (flash_info_t *info, ulong dest, unsigned long long data)
|
||||||
eieio();
|
eieio();
|
||||||
|
|
||||||
do {
|
do {
|
||||||
result=*addr;
|
result = *addr;
|
||||||
} while(~result & BIT_BUSY);
|
} while(~result & BIT_BUSY);
|
||||||
|
|
||||||
*addr=CMD_READ_ARRAY;
|
*addr=CMD_READ_ARRAY;
|
||||||
|
@ -275,7 +275,7 @@ int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt) {
|
||||||
}
|
}
|
||||||
|
|
||||||
while(cnt>=8) {
|
while(cnt>=8) {
|
||||||
data=*((unsigned long long *)src);
|
data = *((unsigned long long *)src);
|
||||||
if ((rc = write_word(info, wp, data)) != 0)
|
if ((rc = write_word(info, wp, data)) != 0)
|
||||||
return rc;
|
return rc;
|
||||||
src+=8;
|
src+=8;
|
||||||
|
|
|
@ -357,8 +357,8 @@ void copy_old_env(ulong size)
|
||||||
unsigned off;
|
unsigned off;
|
||||||
uchar *name, *value;
|
uchar *name, *value;
|
||||||
|
|
||||||
name=&name_buf[0];
|
name = &name_buf[0];
|
||||||
value=&value_buf[0];
|
value = &value_buf[0];
|
||||||
len=size;
|
len=size;
|
||||||
off = sizeof(long);
|
off = sizeof(long);
|
||||||
while (len > off) {
|
while (len > off) {
|
||||||
|
@ -377,8 +377,8 @@ void copy_old_env(ulong size)
|
||||||
if(c == '\0')
|
if(c == '\0')
|
||||||
break;
|
break;
|
||||||
} while(len > off);
|
} while(len > off);
|
||||||
name=&name_buf[0];
|
name = &name_buf[0];
|
||||||
value=&value_buf[0];
|
value = &value_buf[0];
|
||||||
if(strncmp((char *)name,"baudrate",8)!=0) {
|
if(strncmp((char *)name,"baudrate",8)!=0) {
|
||||||
setenv((char *)name,(char *)value);
|
setenv((char *)name,(char *)value);
|
||||||
}
|
}
|
||||||
|
@ -636,12 +636,12 @@ void video_get_info_str (int line_number, char *info)
|
||||||
++s;
|
++s;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
buf[i++]=*s;
|
buf[i++] = *s;
|
||||||
}
|
}
|
||||||
sprintf(&buf[i]," SN ");
|
sprintf(&buf[i]," SN ");
|
||||||
i+=4;
|
i+=4;
|
||||||
for (; s < e; ++s) {
|
for (; s < e; ++s) {
|
||||||
buf[i++]=*s;
|
buf[i++] = *s;
|
||||||
}
|
}
|
||||||
buf[i++]=0;
|
buf[i++]=0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -160,7 +160,7 @@ unsigned long flash_init (void)
|
||||||
unsigned long size_b1,flashcr,size_reg;
|
unsigned long size_b1,flashcr,size_reg;
|
||||||
int mode;
|
int mode;
|
||||||
extern char version_string;
|
extern char version_string;
|
||||||
char *p=&version_string;
|
char *p = &version_string;
|
||||||
|
|
||||||
/* Since we are relocated, we can set-up the CS finally */
|
/* Since we are relocated, we can set-up the CS finally */
|
||||||
setup_cs_reloc();
|
setup_cs_reloc();
|
||||||
|
|
|
@ -475,7 +475,7 @@ int kbd_read_data(void)
|
||||||
int val;
|
int val;
|
||||||
unsigned char status;
|
unsigned char status;
|
||||||
|
|
||||||
val=-1;
|
val = -1;
|
||||||
status = kbd_read_status();
|
status = kbd_read_status();
|
||||||
if (status & KBD_STAT_OBF) {
|
if (status & KBD_STAT_OBF) {
|
||||||
val = kbd_read_input();
|
val = kbd_read_input();
|
||||||
|
|
|
@ -536,7 +536,7 @@ void usb_check_int_chain(void)
|
||||||
uhci_td_t *td,*prevtd;
|
uhci_td_t *td,*prevtd;
|
||||||
|
|
||||||
for(i=0;i<8;i++) {
|
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 */
|
link=swap_32(td_int[i].link) & 0xfffffff0; /* next in chain */
|
||||||
td=(uhci_td_t *)link; /* assign it */
|
td=(uhci_td_t *)link; /* assign it */
|
||||||
/* all interrupt TDs are finally linked to the td_int[0].
|
/* all interrupt TDs are finally linked to the td_int[0].
|
||||||
|
@ -638,7 +638,7 @@ int usb_lowlevel_stop(void)
|
||||||
return 1;
|
return 1;
|
||||||
irq_free_handler(irqvec);
|
irq_free_handler(irqvec);
|
||||||
reset_hc();
|
reset_hc();
|
||||||
irqvec=-1;
|
irqvec = -1;
|
||||||
return 0;
|
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);
|
psc->command = (PSC_RX_ENABLE | PSC_TX_ENABLE);
|
||||||
|
|
||||||
for(i = 0;i < (len / 4); i++) {
|
for(i = 0;i < (len / 4); i++) {
|
||||||
swapped[3]=*wave_file++;
|
swapped[3] = *wave_file++;
|
||||||
swapped[2]=*wave_file++;
|
swapped[2] = *wave_file++;
|
||||||
swapped[1]=*wave_file++;
|
swapped[1] = *wave_file++;
|
||||||
swapped[0]=*wave_file++;
|
swapped[0] = *wave_file++;
|
||||||
psc->psc_buffer_32 = *((unsigned long*)swapped);
|
psc->psc_buffer_32 = *((unsigned long*)swapped);
|
||||||
while (psc->tfnum > 400) {
|
while (psc->tfnum > 400) {
|
||||||
if(ctrlc())
|
if(ctrlc())
|
||||||
|
|
|
@ -512,7 +512,7 @@ int fdc_read_data(unsigned char *buffer, unsigned long blocks,FDC_COMMAND_STRUCT
|
||||||
if(readblk>blocks) /* is end within 1st track */
|
if(readblk>blocks) /* is end within 1st track */
|
||||||
readblk=blocks; /* yes, correct it */
|
readblk=blocks; /* yes, correct it */
|
||||||
PRINTF("we read %ld blocks start %ld\n",readblk,pCMD->blnr);
|
PRINTF("we read %ld blocks start %ld\n",readblk,pCMD->blnr);
|
||||||
bufferw=&buffer[0]; /* setup working buffer */
|
bufferw = &buffer[0]; /* setup working buffer */
|
||||||
do {
|
do {
|
||||||
retryrw:
|
retryrw:
|
||||||
len=sect_size * readblk;
|
len=sect_size * readblk;
|
||||||
|
@ -566,7 +566,7 @@ retryrw:
|
||||||
* we need to get the results */
|
* we need to get the results */
|
||||||
fdc_terminate(pCMD);
|
fdc_terminate(pCMD);
|
||||||
offset+=(sect_size*readblk); /* set up buffer pointer */
|
offset+=(sect_size*readblk); /* set up buffer pointer */
|
||||||
bufferw=&buffer[offset];
|
bufferw = &buffer[offset];
|
||||||
pCMD->blnr+=readblk; /* update current block nr */
|
pCMD->blnr+=readblk; /* update current block nr */
|
||||||
blocks-=readblk; /* update blocks */
|
blocks-=readblk; /* update blocks */
|
||||||
if(blocks==0)
|
if(blocks==0)
|
||||||
|
|
|
@ -210,7 +210,7 @@ flash_fill_sect_ranges (ulong addr_first, ulong addr_last,
|
||||||
s_last [bank] = -1; /* last sector to erase */
|
s_last [bank] = -1; /* last sector to erase */
|
||||||
}
|
}
|
||||||
|
|
||||||
for (bank=0,info=&flash_info[0];
|
for (bank=0,info = &flash_info[0];
|
||||||
(bank < CFG_MAX_FLASH_BANKS) && (addr_first <= addr_last);
|
(bank < CFG_MAX_FLASH_BANKS) && (addr_first <= addr_last);
|
||||||
++bank, ++info) {
|
++bank, ++info) {
|
||||||
ulong b_end;
|
ulong b_end;
|
||||||
|
@ -427,7 +427,7 @@ int flash_sect_erase (ulong addr_first, ulong addr_last)
|
||||||
s_first, s_last, &planned );
|
s_first, s_last, &planned );
|
||||||
|
|
||||||
if (planned && (rcode == 0)) {
|
if (planned && (rcode == 0)) {
|
||||||
for (bank=0,info=&flash_info[0];
|
for (bank=0,info = &flash_info[0];
|
||||||
(bank < CFG_MAX_FLASH_BANKS) && (rcode == 0);
|
(bank < CFG_MAX_FLASH_BANKS) && (rcode == 0);
|
||||||
++bank, ++info) {
|
++bank, ++info) {
|
||||||
if (s_first[bank]>=0) {
|
if (s_first[bank]>=0) {
|
||||||
|
@ -651,7 +651,7 @@ int flash_sect_protect (int p, ulong addr_first, ulong addr_last)
|
||||||
protected = 0;
|
protected = 0;
|
||||||
|
|
||||||
if (planned && (rcode == 0)) {
|
if (planned && (rcode == 0)) {
|
||||||
for (bank=0,info=&flash_info[0]; bank < CFG_MAX_FLASH_BANKS; ++bank, ++info) {
|
for (bank=0,info = &flash_info[0]; bank < CFG_MAX_FLASH_BANKS; ++bank, ++info) {
|
||||||
if (info->flash_id == FLASH_UNKNOWN) {
|
if (info->flash_id == FLASH_UNKNOWN) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
|
@ -85,7 +85,7 @@ int fpga_loadbitstream(unsigned long dev, char* fpgadata, size_t size)
|
||||||
length = (*dataptr << 8) + *(dataptr+1);
|
length = (*dataptr << 8) + *(dataptr+1);
|
||||||
dataptr+=2;
|
dataptr+=2;
|
||||||
for(i=0;i<length;i++)
|
for(i=0;i<length;i++)
|
||||||
buffer[i]=*dataptr++;
|
buffer[i] = *dataptr++;
|
||||||
|
|
||||||
printf(" design filename = \"%s\"\n", buffer);
|
printf(" design filename = \"%s\"\n", buffer);
|
||||||
|
|
||||||
|
@ -99,7 +99,7 @@ int fpga_loadbitstream(unsigned long dev, char* fpgadata, size_t size)
|
||||||
length = (*dataptr << 8) + *(dataptr+1);
|
length = (*dataptr << 8) + *(dataptr+1);
|
||||||
dataptr+=2;
|
dataptr+=2;
|
||||||
for(i=0;i<length;i++)
|
for(i=0;i<length;i++)
|
||||||
buffer[i]=*dataptr++;
|
buffer[i] = *dataptr++;
|
||||||
printf(" part number = \"%s\"\n", buffer);
|
printf(" part number = \"%s\"\n", buffer);
|
||||||
|
|
||||||
/* get date (identifier, length, string) */
|
/* get date (identifier, length, string) */
|
||||||
|
@ -112,7 +112,7 @@ int fpga_loadbitstream(unsigned long dev, char* fpgadata, size_t size)
|
||||||
length = (*dataptr << 8) + *(dataptr+1);
|
length = (*dataptr << 8) + *(dataptr+1);
|
||||||
dataptr+=2;
|
dataptr+=2;
|
||||||
for(i=0;i<length;i++)
|
for(i=0;i<length;i++)
|
||||||
buffer[i]=*dataptr++;
|
buffer[i] = *dataptr++;
|
||||||
printf(" date = \"%s\"\n", buffer);
|
printf(" date = \"%s\"\n", buffer);
|
||||||
|
|
||||||
/* get time (identifier, length, string) */
|
/* get time (identifier, length, string) */
|
||||||
|
@ -124,7 +124,7 @@ int fpga_loadbitstream(unsigned long dev, char* fpgadata, size_t size)
|
||||||
length = (*dataptr << 8) + *(dataptr+1);
|
length = (*dataptr << 8) + *(dataptr+1);
|
||||||
dataptr+=2;
|
dataptr+=2;
|
||||||
for(i=0;i<length;i++)
|
for(i=0;i<length;i++)
|
||||||
buffer[i]=*dataptr++;
|
buffer[i] = *dataptr++;
|
||||||
printf(" time = \"%s\"\n", buffer);
|
printf(" time = \"%s\"\n", buffer);
|
||||||
|
|
||||||
/* get fpga data length (identifier, length) */
|
/* get fpga data length (identifier, length) */
|
||||||
|
|
|
@ -171,7 +171,7 @@ removable:
|
||||||
if(scsi_max_devs>0)
|
if(scsi_max_devs>0)
|
||||||
scsi_curr_dev=0;
|
scsi_curr_dev=0;
|
||||||
else
|
else
|
||||||
scsi_curr_dev=-1;
|
scsi_curr_dev = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
#include <usb.h>
|
#include <usb.h>
|
||||||
|
|
||||||
#ifdef CONFIG_USB_STORAGE
|
#ifdef CONFIG_USB_STORAGE
|
||||||
static int usb_stor_curr_dev=-1; /* current device */
|
static int usb_stor_curr_dev = -1; /* current device */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* some display routines (info command) */
|
/* some display routines (info command) */
|
||||||
|
|
|
@ -125,7 +125,7 @@ int device_deregister(char *devname)
|
||||||
device_t *dev = NULL;
|
device_t *dev = NULL;
|
||||||
char temp_names[3][8];
|
char temp_names[3][8];
|
||||||
|
|
||||||
dev_index=-1;
|
dev_index = -1;
|
||||||
for (i=1; i<=ListNumItems(devlist); i++) {
|
for (i=1; i<=ListNumItems(devlist); i++) {
|
||||||
dev = ListGetPtrToItem (devlist, i);
|
dev = ListGetPtrToItem (devlist, i);
|
||||||
if(strcmp(dev->name,devname)==0) {
|
if(strcmp(dev->name,devname)==0) {
|
||||||
|
|
|
@ -104,7 +104,7 @@ addr2info (ulong addr)
|
||||||
flash_info_t *info;
|
flash_info_t *info;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
for (i=0, info=&flash_info[0]; i<CFG_MAX_FLASH_BANKS; ++i, ++info) {
|
for (i=0, info = &flash_info[0]; i<CFG_MAX_FLASH_BANKS; ++i, ++info) {
|
||||||
if (info->flash_id != FLASH_UNKNOWN &&
|
if (info->flash_id != FLASH_UNKNOWN &&
|
||||||
addr >= info->start[0] &&
|
addr >= info->start[0] &&
|
||||||
/* WARNING - The '- 1' is needed if the flash
|
/* WARNING - The '- 1' is needed if the flash
|
||||||
|
|
|
@ -953,7 +953,7 @@ static int b_adduint(o_string *o, unsigned int i)
|
||||||
|
|
||||||
static int static_get(struct in_str *i)
|
static int static_get(struct in_str *i)
|
||||||
{
|
{
|
||||||
int ch=*i->p++;
|
int ch = *i->p++;
|
||||||
if (ch=='\0') return EOF;
|
if (ch=='\0') return EOF;
|
||||||
return ch;
|
return ch;
|
||||||
}
|
}
|
||||||
|
@ -1104,7 +1104,7 @@ static int file_get(struct in_str *i)
|
||||||
ch = 0;
|
ch = 0;
|
||||||
/* If there is data waiting, eat it up */
|
/* If there is data waiting, eat it up */
|
||||||
if (i->p && *i->p) {
|
if (i->p && *i->p) {
|
||||||
ch=*i->p++;
|
ch = *i->p++;
|
||||||
} else {
|
} else {
|
||||||
/* need to double check i->file because we might be doing something
|
/* need to double check i->file because we might be doing something
|
||||||
* more complicated by now, like sourcing or substituting. */
|
* more complicated by now, like sourcing or substituting. */
|
||||||
|
@ -1121,7 +1121,7 @@ static int file_get(struct in_str *i)
|
||||||
i->__promptme = 0;
|
i->__promptme = 0;
|
||||||
#endif
|
#endif
|
||||||
if (i->p && *i->p) {
|
if (i->p && *i->p) {
|
||||||
ch=*i->p++;
|
ch = *i->p++;
|
||||||
}
|
}
|
||||||
#ifndef __U_BOOT__
|
#ifndef __U_BOOT__
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -728,7 +728,7 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)
|
||||||
WATCHDOG_RESET();
|
WATCHDOG_RESET();
|
||||||
for (j = 0; j < width ; j++)
|
for (j = 0; j < width ; j++)
|
||||||
#if defined(CONFIG_PXA250)
|
#if defined(CONFIG_PXA250)
|
||||||
*(fb++)=*(bmap++);
|
*(fb++) = *(bmap++);
|
||||||
#elif defined(CONFIG_MPC823) || defined(CONFIG_MCC200)
|
#elif defined(CONFIG_MPC823) || defined(CONFIG_MCC200)
|
||||||
*(fb++)=255-*(bmap++);
|
*(fb++)=255-*(bmap++);
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -252,7 +252,7 @@ int usb_set_maxpacket(struct usb_device *dev)
|
||||||
|
|
||||||
for(i=0; i<dev->config.bNumInterfaces;i++) {
|
for(i=0; i<dev->config.bNumInterfaces;i++) {
|
||||||
for(ii=0; ii<dev->config.if_desc[i].bNumEndpoints; ii++) {
|
for(ii=0; ii<dev->config.if_desc[i].bNumEndpoints; ii++) {
|
||||||
ep=&dev->config.if_desc[i].ep_desc[ii];
|
ep = &dev->config.if_desc[i].ep_desc[ii];
|
||||||
b=ep->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK;
|
b=ep->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK;
|
||||||
|
|
||||||
if((ep->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK)==USB_ENDPOINT_XFER_CONTROL) { /* Control => bidirectional */
|
if((ep->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK)==USB_ENDPOINT_XFER_CONTROL) { /* Control => bidirectional */
|
||||||
|
@ -627,7 +627,7 @@ int usb_string(struct usb_device *dev, int index, char *buf, size_t size)
|
||||||
if (size <= 0 || !buf || !index)
|
if (size <= 0 || !buf || !index)
|
||||||
return -1;
|
return -1;
|
||||||
buf[0] = 0;
|
buf[0] = 0;
|
||||||
tbuf=&mybuf[0];
|
tbuf = &mybuf[0];
|
||||||
|
|
||||||
/* get langid for strings if it's not yet known */
|
/* get langid for strings if it's not yet known */
|
||||||
if (!dev->have_langid) {
|
if (!dev->have_langid) {
|
||||||
|
@ -857,7 +857,7 @@ void usb_scan_devices(void)
|
||||||
/* first make all devices unknown */
|
/* first make all devices unknown */
|
||||||
for(i=0;i<USB_MAX_DEVICE;i++) {
|
for(i=0;i<USB_MAX_DEVICE;i++) {
|
||||||
memset(&usb_dev[i],0,sizeof(struct usb_device));
|
memset(&usb_dev[i],0,sizeof(struct usb_device));
|
||||||
usb_dev[i].devnum=-1;
|
usb_dev[i].devnum = -1;
|
||||||
}
|
}
|
||||||
dev_index=0;
|
dev_index=0;
|
||||||
/* device 0 is always present (root hub, so let it analyze) */
|
/* device 0 is always present (root hub, so let it analyze) */
|
||||||
|
|
|
@ -730,8 +730,8 @@ static int usb_kbd_get_hid_desc(struct usb_device *dev)
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
printf(" report descriptor (size %u, read %d)\n", len, index);
|
printf(" report descriptor (size %u, read %d)\n", len, index);
|
||||||
start=&buffer[0];
|
start = &buffer[0];
|
||||||
end=&buffer[len];
|
end = &buffer[len];
|
||||||
i=0;
|
i=0;
|
||||||
do {
|
do {
|
||||||
index=fetch_item(start,end,&item);
|
index=fetch_item(start,end,&item);
|
||||||
|
|
|
@ -731,7 +731,7 @@ int usb_stor_CB_transport(ccb *srb, struct us_data *us)
|
||||||
ccb reqsrb;
|
ccb reqsrb;
|
||||||
int retry,notready;
|
int retry,notready;
|
||||||
|
|
||||||
psrb=&reqsrb;
|
psrb = &reqsrb;
|
||||||
status=USB_STOR_TRANSPORT_GOOD;
|
status=USB_STOR_TRANSPORT_GOOD;
|
||||||
retry=0;
|
retry=0;
|
||||||
notready=0;
|
notready=0;
|
||||||
|
@ -776,7 +776,7 @@ do_retry:
|
||||||
psrb->cmd[1]=srb->lun<<5;
|
psrb->cmd[1]=srb->lun<<5;
|
||||||
psrb->cmd[4]=18;
|
psrb->cmd[4]=18;
|
||||||
psrb->datalen=18;
|
psrb->datalen=18;
|
||||||
psrb->pdata=&srb->sense_buf[0];
|
psrb->pdata = &srb->sense_buf[0];
|
||||||
psrb->cmdlen=12;
|
psrb->cmdlen=12;
|
||||||
/* issue the command */
|
/* issue the command */
|
||||||
result=usb_stor_CB_comdat(psrb,us);
|
result=usb_stor_CB_comdat(psrb,us);
|
||||||
|
@ -858,7 +858,7 @@ static int usb_request_sense(ccb *srb,struct us_data *ss)
|
||||||
srb->cmd[1]=srb->lun<<5;
|
srb->cmd[1]=srb->lun<<5;
|
||||||
srb->cmd[4]=18;
|
srb->cmd[4]=18;
|
||||||
srb->datalen=18;
|
srb->datalen=18;
|
||||||
srb->pdata=&srb->sense_buf[0];
|
srb->pdata = &srb->sense_buf[0];
|
||||||
srb->cmdlen=12;
|
srb->cmdlen=12;
|
||||||
ss->transport(srb,ss);
|
ss->transport(srb,ss);
|
||||||
USB_STOR_PRINTF("Request Sense returned %02X %02X %02X\n",srb->sense_buf[2],srb->sense_buf[12],srb->sense_buf[13]);
|
USB_STOR_PRINTF("Request Sense returned %02X %02X %02X\n",srb->sense_buf[2],srb->sense_buf[12],srb->sense_buf[13]);
|
||||||
|
|
|
@ -126,9 +126,9 @@ long int spd_sdram(int(read_spd)(uint addr))
|
||||||
|
|
||||||
int sdram0_pmit=0x07c00000;
|
int sdram0_pmit=0x07c00000;
|
||||||
#ifndef CONFIG_405EP /* not on PPC405EP */
|
#ifndef CONFIG_405EP /* not on PPC405EP */
|
||||||
int sdram0_besr0=-1;
|
int sdram0_besr0 = -1;
|
||||||
int sdram0_besr1=-1;
|
int sdram0_besr1 = -1;
|
||||||
int sdram0_eccesr=-1;
|
int sdram0_eccesr = -1;
|
||||||
#endif
|
#endif
|
||||||
int sdram0_ecccfg;
|
int sdram0_ecccfg;
|
||||||
|
|
||||||
|
|
|
@ -784,7 +784,7 @@ retry:
|
||||||
pccb->msgout[0]=SCSI_IDENTIFY;
|
pccb->msgout[0]=SCSI_IDENTIFY;
|
||||||
transbytes=pccb->trans_bytes;
|
transbytes=pccb->trans_bytes;
|
||||||
tmpptr=pccb->pdata;
|
tmpptr=pccb->pdata;
|
||||||
pccb->pdata=&pccb->sense_buf[0];
|
pccb->pdata = &pccb->sense_buf[0];
|
||||||
datalen=pccb->datalen;
|
datalen=pccb->datalen;
|
||||||
pccb->datalen=14;
|
pccb->datalen=14;
|
||||||
tmpstat=pccb->status;
|
tmpstat=pccb->status;
|
||||||
|
|
|
@ -64,7 +64,7 @@ static int kbd_read_data(void)
|
||||||
int val;
|
int val;
|
||||||
unsigned char status;
|
unsigned char status;
|
||||||
|
|
||||||
val=-1;
|
val = -1;
|
||||||
status = kbd_read_status();
|
status = kbd_read_status();
|
||||||
if (status & KBD_STAT_OBF) {
|
if (status & KBD_STAT_OBF) {
|
||||||
val = kbd_read_input();
|
val = kbd_read_input();
|
||||||
|
|
|
@ -59,8 +59,8 @@ fsl_pci_init(struct pci_controller *hose)
|
||||||
pci_dev_t dev = PCI_BDF(busno,0,0);
|
pci_dev_t dev = PCI_BDF(busno,0,0);
|
||||||
|
|
||||||
/* Initialize ATMU registers based on hose regions and flags */
|
/* Initialize ATMU registers based on hose regions and flags */
|
||||||
volatile pot_t *po=&pci->pot[1]; /* skip 0 */
|
volatile pot_t *po = &pci->pot[1]; /* skip 0 */
|
||||||
volatile pit_t *pi=&pci->pit[0]; /* ranges from: 3 to 1 */
|
volatile pit_t *pi = &pci->pit[0]; /* ranges from: 3 to 1 */
|
||||||
|
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
int neg_link_w;
|
int neg_link_w;
|
||||||
|
|
|
@ -187,7 +187,7 @@ int flash_sect_erase (ulong addr_first, ulong addr_last)
|
||||||
|
|
||||||
erased = 0;
|
erased = 0;
|
||||||
|
|
||||||
for (bank=0,info=&flash_info[0]; bank < CFG_MAX_FLASH_BANKS; ++bank, ++info) {
|
for (bank=0,info = &flash_info[0]; bank < CFG_MAX_FLASH_BANKS; ++bank, ++info) {
|
||||||
ulong b_end;
|
ulong b_end;
|
||||||
int sect;
|
int sect;
|
||||||
|
|
||||||
|
@ -366,7 +366,7 @@ int flash_sect_protect (int p, ulong addr_first, ulong addr_last)
|
||||||
|
|
||||||
protected = 0;
|
protected = 0;
|
||||||
|
|
||||||
for (bank=0,info=&flash_info[0]; bank < CFG_MAX_FLASH_BANKS; ++bank, ++info) {
|
for (bank=0,info = &flash_info[0]; bank < CFG_MAX_FLASH_BANKS; ++bank, ++info) {
|
||||||
ulong b_end;
|
ulong b_end;
|
||||||
int sect;
|
int sect;
|
||||||
|
|
||||||
|
|
|
@ -93,7 +93,7 @@ addr2info (ulong addr)
|
||||||
flash_info_t *info;
|
flash_info_t *info;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
for (i=0, info=&flash_info[0]; i<CFG_MAX_FLASH_BANKS; ++i, ++info) {
|
for (i=0, info = &flash_info[0]; i<CFG_MAX_FLASH_BANKS; ++i, ++info) {
|
||||||
if (info->flash_id != FLASH_UNKNOWN &&
|
if (info->flash_id != FLASH_UNKNOWN &&
|
||||||
addr >= info->start[0] &&
|
addr >= info->start[0] &&
|
||||||
/* WARNING - The '- 1' is needed if the flash
|
/* WARNING - The '- 1' is needed if the flash
|
||||||
|
|
Loading…
Add table
Reference in a new issue