projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rename CFG_ macros to CONFIG_SYS
[platform/kernel/u-boot.git]
/
common
/
cmd_fdc.c
diff --git
a/common/cmd_fdc.c
b/common/cmd_fdc.c
index
b663d60
..
d995ff2
100644
(file)
--- a/
common/cmd_fdc.c
+++ b/
common/cmd_fdc.c
@@
-170,17
+170,17
@@
const static FD_GEO_STRUCT floppy_type[2] = {
static FDC_COMMAND_STRUCT cmd; /* global command struct */
/* If the boot drive number is undefined, we assume it's drive 0 */
static FDC_COMMAND_STRUCT cmd; /* global command struct */
/* If the boot drive number is undefined, we assume it's drive 0 */
-#ifndef C
FG
_FDC_DRIVE_NUMBER
-#define C
FG
_FDC_DRIVE_NUMBER 0
+#ifndef C
ONFIG_SYS
_FDC_DRIVE_NUMBER
+#define C
ONFIG_SYS
_FDC_DRIVE_NUMBER 0
#endif
/* Hardware access */
#endif
/* Hardware access */
-#ifndef C
FG
_ISA_IO_STRIDE
-#define C
FG
_ISA_IO_STRIDE 1
+#ifndef C
ONFIG_SYS
_ISA_IO_STRIDE
+#define C
ONFIG_SYS
_ISA_IO_STRIDE 1
#endif
#endif
-#ifndef C
FG
_ISA_IO_OFFSET
-#define C
FG
_ISA_IO_OFFSET 0
+#ifndef C
ONFIG_SYS
_ISA_IO_OFFSET
+#define C
ONFIG_SYS
_ISA_IO_OFFSET 0
#endif
#endif
@@
-213,9
+213,9
@@
int wait_for_fdc_int(void)
unsigned char read_fdc_reg(unsigned int addr)
{
volatile unsigned char *val =
unsigned char read_fdc_reg(unsigned int addr)
{
volatile unsigned char *val =
- (volatile unsigned char *)(C
FG
_ISA_IO_BASE_ADDRESS +
- (addr * C
FG
_ISA_IO_STRIDE) +
- C
FG
_ISA_IO_OFFSET);
+ (volatile unsigned char *)(C
ONFIG_SYS
_ISA_IO_BASE_ADDRESS +
+ (addr * C
ONFIG_SYS
_ISA_IO_STRIDE) +
+ C
ONFIG_SYS
_ISA_IO_OFFSET);
return val [0];
}
return val [0];
}
@@
-224,9
+224,9
@@
unsigned char read_fdc_reg(unsigned int addr)
void write_fdc_reg(unsigned int addr, unsigned char val)
{
volatile unsigned char *tmp =
void write_fdc_reg(unsigned int addr, unsigned char val)
{
volatile unsigned char *tmp =
- (volatile unsigned char *)(C
FG
_ISA_IO_BASE_ADDRESS +
- (addr * C
FG
_ISA_IO_STRIDE) +
- C
FG
_ISA_IO_OFFSET);
+ (volatile unsigned char *)(C
ONFIG_SYS
_ISA_IO_BASE_ADDRESS +
+ (addr * C
ONFIG_SYS
_ISA_IO_STRIDE) +
+ C
ONFIG_SYS
_ISA_IO_OFFSET);
tmp[0]=val;
}
tmp[0]=val;
}
@@
-652,7
+652,7
@@
int fdc_setup(int drive, FDC_COMMAND_STRUCT *pCMD, FD_GEO_STRUCT *pFG)
i8259_unmask_irq(6);
#endif
i8259_unmask_irq(6);
#endif
-#ifdef C
FG
_FDC_HW_INIT
+#ifdef C
ONFIG_SYS
_FDC_HW_INIT
fdc_hw_init ();
#endif
/* first, we reset the FDC via the DOR */
fdc_hw_init ();
#endif
/* first, we reset the FDC via the DOR */
@@
-789,12
+789,12
@@
int do_fdcboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
switch (argc) {
case 1:
switch (argc) {
case 1:
- addr = C
FG
_LOAD_ADDR;
- boot_drive=C
FG
_FDC_DRIVE_NUMBER;
+ addr = C
ONFIG_SYS
_LOAD_ADDR;
+ boot_drive=C
ONFIG_SYS
_FDC_DRIVE_NUMBER;
break;
case 2:
addr = simple_strtoul(argv[1], NULL, 16);
break;
case 2:
addr = simple_strtoul(argv[1], NULL, 16);
- boot_drive=C
FG
_FDC_DRIVE_NUMBER;
+ boot_drive=C
ONFIG_SYS
_FDC_DRIVE_NUMBER;
break;
case 3:
addr = simple_strtoul(argv[1], NULL, 16);
break;
case 3:
addr = simple_strtoul(argv[1], NULL, 16);