diff options
| author | Thomas Doerfler <Thomas.Doerfler@embedded-brains.de> | 2005-09-29 11:50:47 +0000 |
|---|---|---|
| committer | Thomas Doerfler <Thomas.Doerfler@embedded-brains.de> | 2005-09-29 11:50:47 +0000 |
| commit | 3741506c42e5deb153cd40a6a83535894555bff2 (patch) | |
| tree | 12733bf58f46b49629eaff5bc76bed7de71e78b5 | |
| parent | Added reference to PR527. (diff) | |
| download | rtems-3741506c42e5deb153cd40a6a83535894555bff2.tar.bz2 | |
2005-09-29 Thomas Doerfler <Thomas.Doerfler@imd-systems.de>
PR649/filesystem
* ide/idecfg.c, configure.ac:
added configuration items for primary/secondary
| -rw-r--r-- | c/src/lib/libbsp/i386/pc386/ChangeLog | 9 | ||||
| -rw-r--r-- | c/src/lib/libbsp/i386/pc386/configure.ac | 16 | ||||
| -rw-r--r-- | c/src/lib/libbsp/i386/pc386/ide/idecfg.c | 18 |
3 files changed, 42 insertions, 1 deletions
diff --git a/c/src/lib/libbsp/i386/pc386/ChangeLog b/c/src/lib/libbsp/i386/pc386/ChangeLog index c62b408682..eac8ef3cf6 100644 --- a/c/src/lib/libbsp/i386/pc386/ChangeLog +++ b/c/src/lib/libbsp/i386/pc386/ChangeLog @@ -1,3 +1,12 @@ +2005-09-29 Thomas Doerfler <Thomas.Doerfler@imd-systems.de> + + PR649/filesystem + * ide/idecfg.c: added configuration items for primary/secondary + IDE interface + + * configure.ac: added configuration items for primary/secondary + IDE interface + 2005-09-01 Joel Sherrill <joel@OARcorp.com> * clock/Makefile.am, include/Makefile.am: Install tod.h diff --git a/c/src/lib/libbsp/i386/pc386/configure.ac b/c/src/lib/libbsp/i386/pc386/configure.ac index 184be2a2e9..3ec4622356 100644 --- a/c/src/lib/libbsp/i386/pc386/configure.ac +++ b/c/src/lib/libbsp/i386/pc386/configure.ac @@ -16,6 +16,22 @@ RTEMS_CANONICALIZE_TOOLS RTEMS_CHECK_NETWORKING +RTEMS_BSPOPTS_SET([IDE_USE_PRIMARY_INTERFACE],[*],[1]) +RTEMS_BSPOPTS_HELP([IDE_USE_PRIMARY_INTERFACE], +[Determines, whether RTEMS will try to use the primary IDE interface. + Disable it, if: + - you have no primary IDE interface + - or you have no disk attached to this interface + - or you do not want to access disks attached to this interface]) + +RTEMS_BSPOPTS_SET([IDE_USE_SECONDARY_INTERFACE],[*],[0]) +RTEMS_BSPOPTS_HELP([IDE_USE_SECONDARY_INTERFACE], +[Determines, whether RTEMS will try to use the primary IDE interface. + Enable it, if: + - you have a secondary IDE interface + - and you have at least one disk attached to this interface + - and you do want to access disks attached to this interface]) + ## if this is an i386, does gas have good code16 support? RTEMS_I386_GAS_CODE16 AM_CONDITIONAL(RTEMS_GAS_CODE16,[test "$RTEMS_GAS_CODE16" = "yes"]) diff --git a/c/src/lib/libbsp/i386/pc386/ide/idecfg.c b/c/src/lib/libbsp/i386/pc386/ide/idecfg.c index e232a68046..bee9ba941d 100644 --- a/c/src/lib/libbsp/i386/pc386/ide/idecfg.c +++ b/c/src/lib/libbsp/i386/pc386/ide/idecfg.c @@ -36,7 +36,8 @@ extern ide_ctrl_fns_t pc386_ide_ctrl_fns; /* IDE controllers Table */ ide_controller_bsp_table_t IDE_Controller_Table[] = { - {"/dev/ide", +#if IDE_USE_PRIMARY_INTERFACE + {"/dev/ide0", IDE_STD, /* standard IDE controller */ &pc386_ide_ctrl_fns, NULL, /* probe for IDE standard registers */ @@ -45,6 +46,21 @@ ide_controller_bsp_table_t IDE_Controller_Table[] = { FALSE,0, /* not (yet) interrupt driven */ NULL } +#if IDE_USE_SECONDARY_INTERFACE + , /* colon only neede when bith interfaces present */ +#endif +#endif +#if IDE_USE_SECONDARY_INTERFACE + {"/dev/ide1", + IDE_STD, /* standard IDE controller */ + &pc386_ide_ctrl_fns, + NULL, /* probe for IDE standard registers */ + FALSE, /* not (yet) initialized */ + 0x170, /* base I/O address for second IDE controller */ + FALSE,0, /* not (yet) interrupt driven */ + NULL + } +#endif }; /* Number of rows in IDE_Controller_Table */ |