projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-marvell
[oweals/u-boot.git]
/
cmd
/
fdc.c
diff --git
a/cmd/fdc.c
b/cmd/fdc.c
index 058ae89a38765834718dc058aebee906a29adc16..7d4b8296374e2a8b76533bd7f9b4f85ec51f3834 100644
(file)
--- a/
cmd/fdc.c
+++ b/
cmd/fdc.c
@@
-1,8
+1,7
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2001
* Denis Peter, MPL AG, d.peter@mpl.ch.
/*
* (C) Copyright 2001
* Denis Peter, MPL AG, d.peter@mpl.ch.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
* Floppy Disk support
*/
/*
* Floppy Disk support
@@
-12,6
+11,7
@@
#include <config.h>
#include <command.h>
#include <image.h>
#include <config.h>
#include <command.h>
#include <image.h>
+#include <irq_func.h>
#undef FDC_DEBUG
#undef FDC_DEBUG
@@
-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();
}
@@
-635,7
+635,7
@@
int do_fdcboot (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
FD_GEO_STRUCT *pFG = (FD_GEO_STRUCT *)floppy_type;
FDC_COMMAND_STRUCT *pCMD = &cmd;
unsigned long addr,imsize;
FD_GEO_STRUCT *pFG = (FD_GEO_STRUCT *)floppy_type;
FDC_COMMAND_STRUCT *pCMD = &cmd;
unsigned long addr,imsize;
-#if defined(CONFIG_
IMAGE_FORMAT_LEGACY
)
+#if defined(CONFIG_
LEGACY_IMAGE_FORMAT
)
image_header_t *hdr; /* used for fdc boot */
#endif
unsigned char boot_drive;
image_header_t *hdr; /* used for fdc boot */
#endif
unsigned char boot_drive;
@@
-691,7
+691,7
@@
int do_fdcboot (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
}
switch (genimg_get_format ((void *)addr)) {
}
switch (genimg_get_format ((void *)addr)) {
-#if defined(CONFIG_
IMAGE_FORMAT_LEGACY
)
+#if defined(CONFIG_
LEGACY_IMAGE_FORMAT
)
case IMAGE_FORMAT_LEGACY:
hdr = (image_header_t *)addr;
image_print_contents (hdr);
case IMAGE_FORMAT_LEGACY:
hdr = (image_header_t *)addr;
image_print_contents (hdr);