projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rockchip: firefly: configs: use spl back to brom
[oweals/u-boot.git]
/
cmd
/
fdc.c
diff --git
a/cmd/fdc.c
b/cmd/fdc.c
index 058ae89a38765834718dc058aebee906a29adc16..d2281abbda90e92dee738c709e11027a36f202eb 100644
(file)
--- a/
cmd/fdc.c
+++ b/
cmd/fdc.c
@@
-189,7
+189,7
@@
int wait_for_fdc_int(void)
while((read_fdc_reg(FDC_SRA)&0x80)==0) {
timeout--;
udelay(10);
while((read_fdc_reg(FDC_SRA)&0x80)==0) {
timeout--;
udelay(10);
- if(timeout==0) /* timeout occured */
+ if(timeout==0) /* timeout occur
r
ed */
return false;
}
return true;
return false;
}
return true;
@@
-205,7
+205,7
@@
int read_fdc_byte(void)
/* direction out and ready */
udelay(10);
timeout--;
/* direction out and ready */
udelay(10);
timeout--;
- if(timeout==0) /* timeout occured */
+ if(timeout==0) /* timeout occur
r
ed */
return -1;
}
return read_fdc_reg(FDC_FIFO);
return -1;
}
return read_fdc_reg(FDC_FIFO);
@@
-235,7
+235,7
@@
int write_fdc_byte(unsigned char val)
timeout--;
udelay(10);
fdc_need_more_output();
timeout--;
udelay(10);
fdc_need_more_output();
- if(timeout==0) /* timeout occured */
+ if(timeout==0) /* timeout occur
r
ed */
return false;
}
write_fdc_reg(FDC_FIFO,val);
return false;
}
write_fdc_reg(FDC_FIFO,val);
@@
-395,7
+395,7
@@
int fdc_terminate(FDC_COMMAND_STRUCT *pCMD)
int i;
for(i=0;i<100;i++)
udelay(500); /* wait 500usec for fifo overrun */
int i;
for(i=0;i<100;i++)
udelay(500); /* wait 500usec for fifo overrun */
- while((read_fdc_reg(FDC_SRA)&0x80)==0x00); /* wait as long as no int has occured */
+ while((read_fdc_reg(FDC_SRA)&0x80)==0x00); /* wait as long as no int has occur
r
ed */
for(i=0;i<7;i++) {
pCMD->result[i]=(unsigned char)read_fdc_byte();
}
for(i=0;i<7;i++) {
pCMD->result[i]=(unsigned char)read_fdc_byte();
}