Ticket #649: rtems-4.6.99.2-i386-ide.diff

c/src/lib/libbsp/i386/pc386/configure.ac

@@ -18 +18 @@
 
 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"])

c/src/lib/libbsp/i386/pc386/ide/idecfg.c

@@ -35 +35 @@
 
 /* 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 */
@@ -44 +45 @@
    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 */