Ticket #368: ide_pc386_mbx8xx.diff

c/src/lib/libbsp/i386/pc386/ChangeLog

@@ +1 @@
+2003-02-27      Thomas Doerfler <Thomas.Doerfler@imd-systems.de>
+
+        * ide/*: added BSP support for libchip standard ide driver
+
 2003-02-11      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
         * configure.ac: AM_INIT_AUTOMAKE([1.7.2]).

c/src/lib/libbsp/i386/pc386/Makefile.am

@@ -7 +7 @@
 # wrapup is the one that actually builds and installs the library
 #  from the individual .rel files built in other directories
 SUBDIRS = . include tools start startup clock console timer ne2000 wd8003 \
-    3c509 wrapup
+    3c509 ide wrapup
 
 include $(top_srcdir)/../../bsp.am
 

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

@@ -38 +38 @@
 3c509/Makefile
 ne2000/Makefile
 wd8003/Makefile
+ide/Makefile
 wrapup/Makefile])
 AC_OUTPUT

c/src/lib/libbsp/i386/pc386/console/console.c

@@ -61 +61 @@
  *      to same serial device it does not work that great
  */
 
+#if 0 /* IMD hack */
 int BSPConsolePort = BSP_CONSOLE_PORT_CONSOLE;
 int BSPPrintkPort  = BSP_CONSOLE_PORT_CONSOLE;
+#else
+int BSPConsolePort = BSP_UART_COM1;
+int BSPPrintkPort  = BSP_UART_COM1;
+#endif
 
 /* int BSPConsolePort = BSP_UART_COM2;  */
 int BSPBaseBaud    = 115200;

c/src/lib/libbsp/i386/pc386/ide/Makefile.am

@@ +1 @@
+##
+## Makefile.am,v 1.5 2002/08/11 06:59:03 ralf Exp
+##
+
+
+PGM = 
+
+C_FILES = idecfg.c ide.c
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
+
+OBJS = $(C_O_FILES)
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../../../../automake/compile.am
+include $(top_srcdir)/../../../../../../automake/lib.am
+
+#
+# (OPTIONAL) Add local stuff here using +=
+#
+
+$(PGM): $(OBJS)
+        $(make-rel)
+
+# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
+
+all-local: $(ARCH) $(OBJS) $(PGM)
+
+.PRECIOUS: $(PGM)
+
+EXTRA_DIST = idecfg.c
+
+include $(top_srcdir)/../../../../../../automake/local.am

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

@@ +1 @@
+/*===============================================================*\
+| Project: RTEMS PC386 IDE harddisc driver                        |
++-----------------------------------------------------------------+
+| File: ide.c                                                     |
++-----------------------------------------------------------------+
+|                    Copyright (c) 2003 IMD                       |
+|      Ingenieurbuero fuer Microcomputertechnik Th. Doerfler      |
+|               <Thomas.Doerfler@imd-systems.de>                  |
+|                       all rights reserved                       |
++-----------------------------------------------------------------+
+| this file contains the BSP layer for IDE access below the       |
+| libchip IDE harddisc driver                                     |
+| based on a board specific driver from                           |
+| Eugeny S. Mints, Oktet                                          |
+|                                                                 |
+|  The license and distribution terms for this file may be        |
+|  found in the file LICENSE in this distribution or at           |
+|  http://www.OARcorp.com/rtems/license.html.                     |
+|                                                                 |
++-----------------------------------------------------------------+
+|   date                      history                        ID   |
+| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
+| 01.14.03  creation                                         doe  |
+\*===============================================================*/
+
+#include <rtems.h>
+#include <bsp.h>
+#include <libchip/ide_ctrl.h>
+#include <libchip/ide_ctrl_cfg.h>
+#include <libchip/ide_ctrl_io.h>
+
+/* #define DEBUG_OUT */
+/* 
+ * support functions for IDE harddisk IF 
+ */
+/*=========================================================================*\
+| Function:                                                                 |
+\*-------------------------------------------------------------------------*/
+boolean pc386_ide_probe
+(
+/*-------------------------------------------------------------------------*\
+| Purpose:                                                                  |
+|  This function should probe, whether a IDE disk is available              |
++---------------------------------------------------------------------------+
+| Input Parameters:                                                         |
+\*-------------------------------------------------------------------------*/
+ int minor
+ )
+/*-------------------------------------------------------------------------*\
+| Return Value:                                                             |
+|    TRUE, when flash disk available                                        |
+\*=========================================================================*/
+{
+  boolean ide_card_plugged = TRUE; /* assume: we have a disk here */
+  
+  return ide_card_plugged;
+}
+
+/*=========================================================================*\
+| Function:                                                                 |
+\*-------------------------------------------------------------------------*/
+void pc386_ide_initialize
+(
+/*-------------------------------------------------------------------------*\
+| Purpose:                                                                  |
+|  initialize IDE access                                                    |
++---------------------------------------------------------------------------+
+| Input Parameters:                                                         |
+\*-------------------------------------------------------------------------*/
+ int  minor                              /* controller minor number       */
+ )
+/*-------------------------------------------------------------------------*\
+| Return Value:                                                             |
+|    <none>                                                                 |
+\*=========================================================================*/
+{
+  /*
+   * FIXME: enable interrupts, if needed
+   */
+}
+
+/*=========================================================================*\
+| Function:                                                                 |
+\*-------------------------------------------------------------------------*/
+void pc386_ide_read_reg
+(
+/*-------------------------------------------------------------------------*\
+| Purpose:                                                                  |
+|  read a IDE controller register                                           |
++---------------------------------------------------------------------------+
+| Input Parameters:                                                         |
+\*-------------------------------------------------------------------------*/
+ int                        minor,  /* controller minor number       */
+ int                        reg,    /* register index to access      */
+ unsigned16                *value   /* ptr to return value location  */
+ )
+/*-------------------------------------------------------------------------*\
+| Return Value:                                                             |
+|    <none>                                                                 |
+\*=========================================================================*/
+{
+  unsigned32  port = IDE_Controller_Table[minor].port1;
+  unsigned8 bval1,bval2;
+
+  if (reg == IDE_REGISTER_DATA_WORD) {
+    inport_byte(port+reg, bval1);
+    inport_byte(port+reg+1, bval2);
+    *value = bval1 + (bval2 << 8);
+  }
+  else {
+    inport_byte(port+reg, bval1);
+    *value = bval1;
+  }
+#ifdef DEBUG_OUT
+  printk("pc386_ide_read_reg (0x%x)=0x%x\r\n",reg,*value & 0xff);
+#endif
+}
+
+/*=========================================================================*\
+| Function:                                                                 |
+\*-------------------------------------------------------------------------*/
+void pc386_ide_write_reg
+(
+/*-------------------------------------------------------------------------*\
+| Purpose:                                                                  |
+|  write a IDE controller register                                          |
++---------------------------------------------------------------------------+
+| Input Parameters:                                                         |
+\*-------------------------------------------------------------------------*/
+ int                        minor,  /* controller minor number       */
+ int                        reg,    /* register index to access      */
+ unsigned16                 value   /* value to write                */
+ )
+/*-------------------------------------------------------------------------*\
+| Return Value:                                                             |
+|    <none>                                                                 |
+\*=========================================================================*/
+{
+  unsigned32  port = IDE_Controller_Table[minor].port1;
+
+#ifdef DEBUG_OUT
+  printk("pc386_ide_write_reg(0x%x,0x%x)\r\n",reg,value & 0xff);
+#endif
+  if (reg == IDE_REGISTER_DATA_WORD) {
+    outport_word(port+reg,value);
+  }
+  else {
+    outport_byte(port+reg,value);
+  }
+}
+
+/*=========================================================================*\
+| Function:                                                                 |
+\*-------------------------------------------------------------------------*/
+void pc386_ide_read_block
+(
+/*-------------------------------------------------------------------------*\
+| Purpose:                                                                  |
+|  read a IDE controller data block                                         |
++---------------------------------------------------------------------------+
+| Input Parameters:                                                         |
+\*-------------------------------------------------------------------------*/
+ int minor, 
+ unsigned16 block_size, 
+ blkdev_sg_buffer *bufs, 
+ rtems_unsigned32 *cbuf,
+ rtems_unsigned32 *pos
+ )
+/*-------------------------------------------------------------------------*\
+| Return Value:                                                             |
+|    <none>                                                                 |
+\*=========================================================================*/
+{
+  unsigned32  port = IDE_Controller_Table[minor].port1;
+  unsigned16  cnt = 0;
+  unsigned32  llength = bufs[(*cbuf)].length;
+  unsigned8 status_val;
+  unsigned16 *lbuf = (unsigned16 *)
+    ((unsigned8 *)(bufs[(*cbuf)].buffer) + (*pos));
+
+  inport_byte(port+IDE_REGISTER_STATUS,status_val);
+  while ((status_val & IDE_REGISTER_STATUS_DRQ) && 
+         (cnt < block_size)) {
+    inport_word(port+IDE_REGISTER_DATA,*lbuf);
+
+#ifdef DEBUG_OUT
+    printk("0x%x ",*lbuf);
+#endif
+    lbuf++;
+    cnt    += sizeof(*lbuf); 
+    (*pos) += sizeof(*lbuf);
+    if ((*pos) == llength) {
+      (*pos) = 0;
+      (*cbuf)++;
+      lbuf = bufs[(*cbuf)].buffer;
+      llength = bufs[(*cbuf)].length;
+    }
+    inport_byte(port+IDE_REGISTER_STATUS,status_val);
+  } 
+#ifdef DEBUG_OUT
+  printk("pc386_ide_read_block()\r\n");
+#endif
+}
+
+/*=========================================================================*\
+| Function:                                                                 |
+\*-------------------------------------------------------------------------*/
+void pc386_ide_write_block
+(
+/*-------------------------------------------------------------------------*\
+| Purpose:                                                                  |
+|  write a IDE controller data block                                        |
++---------------------------------------------------------------------------+
+| Input Parameters:                                                         |
+\*-------------------------------------------------------------------------*/
+ int minor, 
+ unsigned16 block_size, 
+ blkdev_sg_buffer *bufs, 
+ rtems_unsigned32 *cbuf,
+ rtems_unsigned32 *pos
+ )
+/*-------------------------------------------------------------------------*\
+| Return Value:                                                             |
+|    <none>                                                                 |
+\*=========================================================================*/
+{
+  unsigned32  port = IDE_Controller_Table[minor].port1;
+  unsigned16  cnt = 0;
+  unsigned32  llength = bufs[(*cbuf)].length;
+  unsigned8   status_val;
+  unsigned16 *lbuf = (unsigned16 *)
+    ((unsigned8 *)(bufs[(*cbuf)].buffer) + (*pos));
+    
+#ifdef DEBUG_OUT
+  printk("pc386_ide_write_block()\r\n");
+#endif
+  inport_byte(port+IDE_REGISTER_STATUS,status_val);
+  while ((status_val & IDE_REGISTER_STATUS_DRQ) && 
+         (cnt < block_size)) {
+#ifdef DEBUG_OUT
+    printk("0x%x ",*lbuf);
+#endif
+    outport_word(port+IDE_REGISTER_DATA,*lbuf);
+    lbuf++;
+    cnt    += sizeof(*lbuf); 
+    (*pos) += sizeof(*lbuf);
+    if ((*pos) == llength) {
+      (*pos) = 0;
+      (*cbuf)++;
+      lbuf = bufs[(*cbuf)].buffer;
+      llength = bufs[(*cbuf)].length;
+    }
+    inport_byte(port+IDE_REGISTER_STATUS,status_val);
+  }
+}
+
+/*=========================================================================*\
+| Function:                                                                 |
+\*-------------------------------------------------------------------------*/
+int pc386_ide_control
+(
+/*-------------------------------------------------------------------------*\
+| Purpose:                                                                  |
+|  control interface for controller                                         |
++---------------------------------------------------------------------------+
+| Input Parameters:                                                         |
+\*-------------------------------------------------------------------------*/
+ int  minor,                        /* controller minor number       */
+ unsigned32 cmd,                    /* command to send               */
+ void * arg                         /* optional argument             */
+ )
+/*-------------------------------------------------------------------------*\
+| Return Value:                                                             |
+|    <none>                                                                 |
+\*=========================================================================*/
+{
+  return 0;
+}
+
+/*=========================================================================*\
+| Function:                                                                 |
+\*-------------------------------------------------------------------------*/
+rtems_status_code pc386_ide_config_io_speed
+(
+/*-------------------------------------------------------------------------*\
+| Purpose:                                                                  |
+|  set up transfer speed, if possible                                       |
++---------------------------------------------------------------------------+
+| Input Parameters:                                                         |
+\*-------------------------------------------------------------------------*/
+ int       minor,                   /* controller minor number       */
+ unsigned8 modes_avail              /* optional argument             */
+ )
+/*-------------------------------------------------------------------------*\
+| Return Value:                                                             |
+|    rtems_status_code                                                      |
+\*=========================================================================*/
+{
+  return RTEMS_SUCCESSFUL;
+}
+
+/*
+ * The following table configures the functions used for IDE drivers 
+ * in this BSP.
+ */
+
+ide_ctrl_fns_t pc386_ide_ctrl_fns = {
+  pc386_ide_probe,
+  pc386_ide_initialize,
+  pc386_ide_control,
+  pc386_ide_read_reg,
+  pc386_ide_write_reg,
+  pc386_ide_read_block,
+  pc386_ide_write_block,
+  pc386_ide_config_io_speed
+};
+

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

@@ +1 @@
+/*===============================================================*\
+| Project: RTEMS PC386 IDE harddisc driver tables                 |
++-----------------------------------------------------------------+
+| File: idecfg.c                                                  |
++-----------------------------------------------------------------+
+|                    Copyright (c) 2003 IMD                       |
+|      Ingenieurbuero fuer Microcomputertechnik Th. Doerfler      |
+|               <Thomas.Doerfler@imd-systems.de>                  |
+|                       all rights reserved                       |
++-----------------------------------------------------------------+
+| this file contains the table of functions for the BSP layer     |
+| for IDE access below the libchip IDE harddisc driver            |
+|                                                                 |
++-----------------------------------------------------------------+
+|   date                      history                        ID   |
+| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
+| 01.14.03  creation                                         doe  |
+\*===============================================================*/
+
+#include <rtems.h>
+#include <bsp.h>
+#include <libchip/ide_ctrl.h>
+#include <libchip/ide_ctrl_cfg.h>
+#include <libchip/ide_ctrl_io.h>
+
+
+/*
+ * The following table configures the functions used for IDE drivers 
+ * in this BSP.
+ */
+
+/*
+ * The following table configures the IDE drivers used in this BSP.
+ */
+extern ide_ctrl_fns_t pc386_ide_ctrl_fns;
+
+/* IDE controllers Table */
+ide_controller_bsp_table_t IDE_Controller_Table[] = {
+  {"/dev/ide",
+   IDE_STD, /* standard IDE controller */
+   &pc386_ide_ctrl_fns,
+   NULL, /* probe for IDE standard registers */
+   FALSE, /* not (yet) initialized */
+   0x1f0,  /* base I/O address for first IDE controller */
+   FALSE,0, /* not (yet) interrupt driven */
+   NULL
+  }
+};
+
+/* Number of rows in IDE_Controller_Table */
+unsigned long IDE_Controller_Count = 
+   sizeof(IDE_Controller_Table)/sizeof(IDE_Controller_Table[0]);
+
+

c/src/lib/libbsp/i386/pc386/include/bsp.h

@@ -212 +212 @@
 #define BSP_CONSOLE_PORT_COM1    (BSP_UART_COM1)
 #define BSP_CONSOLE_PORT_COM2    (BSP_UART_COM2)
 
+/*
+ * indicate, that BSP has IDE driver
+ */
+#define RTEMS_BSP_HAS_IDE_DRIVER
+
 /* GDB stub stuff */
 void i386_stub_glue_init(int uart);
 void i386_stub_glue_init_breakin(void);

c/src/lib/libbsp/i386/pc386/startup/ldsegs.S

@@ -216 +216 @@
 /*---------------------------------------------------------------------------+
 | IDT itself
 +---------------------------------------------------------------------------*/
+BEGIN_DATA
         .p2align 4
         
         PUBLIC(Interrupt_descriptor_table)
@@ -223 +224 @@
         .rept 256
         .word 0,0,0,0
         .endr
-        
+END_DATA
+                
 /*---------------------------------------------------------------------------+
 | Descriptor of IDT
 +--------------------------------------------------------------------------*/
+BEGIN_CODE
+        .p2align 4
 SYM(idtdesc):   
         .word  (256*8 - 1)
         .long  SYM (Interrupt_descriptor_table)

c/src/lib/libbsp/i386/pc386/wrapup/Makefile.am

@@ -8 +8 @@
 NETWORK = ne2000 wd8003 3c509
 endif
 
-BSP_FILES = startup clock console timer $(NETWORK)
+BSP_FILES = startup clock console timer $(NETWORK) ide
 
 # bummer; have to use $foreach since % pattern subst rules only replace 1x
 OBJS = $(foreach piece, $(BSP_FILES), $(wildcard ../$(piece)/$(ARCH)/*.$(OBJEXT))) \

c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog

@@ +1 @@
+2003-02-27      Thomas Doerfler <Thomas.Doerfler@imd-systems.de>
+
+        * ide/*: added BSP support for libchip standard ide driver
+
 2003-02-11      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
         * configure.ac: AM_INIT_AUTOMAKE([1.7.2]).

c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am

@@ -6 +6 @@
 
 # wrapup is the one that actually builds and installs the library
 #  from the individual .rel files built in other directories
-SUBDIRS = include clock console irq network startup vectors \
-    @exceptions@ wrapup
+SUBDIRS = include clock console irq network ide startup vectors \
+    @exceptions@ wrapup 
 
 include $(top_srcdir)/../../bsp.am
 

c/src/lib/libbsp/powerpc/mbx8xx/configure.ac

@@ -123 +123 @@
 console/Makefile
 include/Makefile
 irq/Makefile
+ide/Makefile
 network/Makefile
 startup/Makefile
 vectors/Makefile

c/src/lib/libbsp/powerpc/mbx8xx/ide/Makefile.am

@@ +1 @@
+##
+## Makefile.am,v 1.5 2002/08/11 06:59:03 ralf Exp
+##
+
+
+PGM = # $(ARCH)/console.rel
+
+C_FILES = idecfg.c pcmcia_ide.c
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
+
+OBJS = $(C_O_FILES)
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../../../../automake/compile.am
+include $(top_srcdir)/../../../../../../automake/lib.am
+
+#
+# (OPTIONAL) Add local stuff here using +=
+#
+
+$(PGM): $(OBJS)
+        $(make-rel)
+
+# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
+
+all-local: $(ARCH) $(OBJS) $(PGM)
+
+.PRECIOUS: $(PGM)
+
+EXTRA_DIST = idecfg.c
+
+include $(top_srcdir)/../../../../../../automake/local.am

c/src/lib/libbsp/powerpc/mbx8xx/ide/idecfg.c

@@ +1 @@
+/*===============================================================*\
+| Project: RTEMS MBX8xx IDE harddisc driver tables                |
++-----------------------------------------------------------------+
+| File: idecfg.c                                                  |
++-----------------------------------------------------------------+
+|                    Copyright (c) 2003 IMD                       |
+|      Ingenieurbuero fuer Microcomputertechnik Th. Doerfler      |
+|               <Thomas.Doerfler@imd-systems.de>                  |
+|                       all rights reserved                       |
++-----------------------------------------------------------------+
+| this file contains the table of functions for the BSP layer     |
+| for IDE access below the libchip IDE harddisc driver            |
+|                                                                 |
++-----------------------------------------------------------------+
+|   date                      history                        ID   |
+| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
+| 01.14.03  creation                                         doe  |
+\*===============================================================*/
+
+#include <rtems.h>
+#include <bsp.h>
+#include <bsp/mbx.h>
+#include <mpc8xx.h>
+#include <libchip/ide_ctrl.h>
+#include <libchip/ide_ctrl_cfg.h>
+#include <libchip/ide_ctrl_io.h>
+
+
+/*
+ * The following table configures the IDE driver used in this BSP.
+ */
+extern ide_ctrl_fns_t mbx8xx_pcmciaide_ctrl_fns;
+
+/* IDE controllers Table */
+ide_controller_bsp_table_t IDE_Controller_Table[] = {
+  {"/dev/idepcmcia",
+   IDE_STD, /* PCMCIA Flash cards emulate standard IDE controller */
+   &mbx8xx_pcmciaide_ctrl_fns,
+   NULL,  /* no BSP dependent probe needed */
+   FALSE, /* not (yet) initialized */
+   PCMCIA_MEM_ADDR,  /* access address for register set */
+   FALSE,0, /* not (yet) interrupt driven */
+   NULL
+  }
+};
+
+/* Number of rows in IDE_Controller_Table */
+unsigned long IDE_Controller_Count = 
+   sizeof(IDE_Controller_Table)/sizeof(IDE_Controller_Table[0]);
+
+

c/src/lib/libbsp/powerpc/mbx8xx/ide/pcmcia_ide.c

@@ +1 @@
+/*===============================================================*\
+| Project: RTEMS MBX8xx PCMCIA IDE harddisc driver                |
++-----------------------------------------------------------------+
+| File: pcmcia_ide.c                                              |
++-----------------------------------------------------------------+
+|                    Copyright (c) 2003 IMD                       |
+|      Ingenieurbuero fuer Microcomputertechnik Th. Doerfler      |
+|               <Thomas.Doerfler@imd-systems.de>                  |
+|                       all rights reserved                       |
++-----------------------------------------------------------------+
+| this file contains the BSP layer for PCMCIA IDE access below the|
+| libchip IDE harddisc driver                                     |
+| based on a board specific driver from                           |
+| Eugeny S. Mints, Oktet                                          |
+|                                                                 |
+|  The license and distribution terms for this file may be        |
+|  found in the file LICENSE in this distribution or at           |
+|  http://www.OARcorp.com/rtems/license.html.                     |
+|                                                                 |
++-----------------------------------------------------------------+
+|   date                      history                        ID   |
+| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
+| 01.14.03  creation                                         doe  |
+\*===============================================================*/
+
+#include <rtems.h>
+#include <bsp.h>
+#include <bsp/mbx.h>
+#include <mpc8xx.h>
+#include <libchip/ide_ctrl.h>
+#include <libchip/ide_ctrl_cfg.h>
+#include <libchip/ide_ctrl_io.h>
+
+/* #define DATAREG_16BIT */ /* 16 bit mode not yet working */
+/* #define DEBUG_OUT */
+/* 
+ * support functions for PCMCIA IDE IF 
+ */
+/*=========================================================================*\
+| Function:                                                                 |
+\*-------------------------------------------------------------------------*/
+boolean mbx8xx_pcmciaide_probe
+(
+/*-------------------------------------------------------------------------*\
+| Purpose:                                                                  |
+|  This function should probe, whether a PCMCIA flash disk is available     |
++---------------------------------------------------------------------------+
+| Input Parameters:                                                         |
+\*-------------------------------------------------------------------------*/
+ int minor
+ )
+/*-------------------------------------------------------------------------*\
+| Return Value:                                                             |
+|    TRUE, when flash disk available                                        |
+\*=========================================================================*/
+{
+  boolean ide_card_plugged = TRUE; /* assume: we have a card plugged in */
+  
+  /*
+   * check, that the CD# pins are low -> a PCMCIA card is plugged in
+   */
+  if ((m8xx.pipr 
+       & (M8xx_PCMCIA_PIPR_CACD1 | M8xx_PCMCIA_PIPR_CACD2)) != 0x00) {
+    ide_card_plugged = FALSE;
+  }
+  /*
+   * set supply voltage to 3.3V
+   * FIXME: this should be depending on state of VS1/2 pins
+   * FIXME: there should be a shadow variable for the BSP for CSR2 access
+   */
+  *((volatile unsigned8 *)MBX_CSR2) = 0xb0;
+  /*
+   * check card information service whether card is a ATA like disk
+   * -> scan for tuple of type 0x21 with content 0x04 0xXX (fixed disk)
+   * -> scan for tuple of type 0x22 with content 0x01 0x01
+   */
+  if (ide_card_plugged) {
+#define CIS_BYTE(pos) (((unsigned8 *)PCMCIA_ATTRB_ADDR)[(pos)*2])
+    int cis_pos = 0;
+    boolean fixed_disk_tuple_found = FALSE;
+    boolean ata_disk_tuple_found   = FALSE;
+    
+    while ((cis_pos < 256) &&
+           (CIS_BYTE(cis_pos) != 0xff) &&
+           (!fixed_disk_tuple_found || !ata_disk_tuple_found)) {
+      /*
+       * check for neede tuples
+       */
+      if ((CIS_BYTE(cis_pos  ) == 0x21) &&
+          (CIS_BYTE(cis_pos+2) == 0x04)) {
+        fixed_disk_tuple_found = TRUE;
+      }
+      else if ((CIS_BYTE(cis_pos  ) == 0x22) &&
+               (CIS_BYTE(cis_pos+2) == 0x01) &&
+               (CIS_BYTE(cis_pos+3) == 0x01)) {
+        ata_disk_tuple_found = TRUE;
+      }
+      /* 
+       * advance using the length field 
+       */
+      cis_pos += CIS_BYTE(cis_pos+1)+2; 
+    }
+    ide_card_plugged = fixed_disk_tuple_found && ata_disk_tuple_found;
+  }
+  return ide_card_plugged;
+}
+
+/*=========================================================================*\
+| Function:                                                                 |
+\*-------------------------------------------------------------------------*/
+void mbx8xx_pcmciaide_initialize
+(
+/*-------------------------------------------------------------------------*\
+| Purpose:                                                                  |
+|  initialize PCMCIA IDE flash card access                                  |
++---------------------------------------------------------------------------+
+| Input Parameters:                                                         |
+\*-------------------------------------------------------------------------*/
+ int  minor                              /* controller minor number       */
+ )
+/*-------------------------------------------------------------------------*\
+| Return Value:                                                             |
+|    <none>                                                                 |
+\*=========================================================================*/
+{
+  /*
+   * FIXME: enable interrupts, if needed
+   */
+  /*
+   * FIXME: set programming voltage as requested 
+   */
+}
+
+/*=========================================================================*\
+| Function:                                                                 |
+\*-------------------------------------------------------------------------*/
+void mbx8xx_pcmciaide_read_reg
+(
+/*-------------------------------------------------------------------------*\
+| Purpose:                                                                  |
+|  read a PCMCIA IDE controller register                                    |
++---------------------------------------------------------------------------+
+| Input Parameters:                                                         |
+\*-------------------------------------------------------------------------*/
+ int                        minor,  /* controller minor number       */
+ int                        reg,    /* register index to access      */
+ unsigned16                *value   /* ptr to return value location  */
+ )
+/*-------------------------------------------------------------------------*\
+| Return Value:                                                             |
+|    <none>                                                                 |
+\*=========================================================================*/
+{
+  unsigned32  port = IDE_Controller_Table[minor].port1;
+
+  if (reg == IDE_REGISTER_DATA_WORD) {
+#ifdef DATAREG_16BIT
+    *value = *(volatile unsigned16 *)(port+reg);    
+#else
+    *value = ((*(volatile unsigned8 *)(port+reg) << 8) + 
+              (*(volatile unsigned8 *)(port+reg+1) ));    
+#endif
+  }
+  else {
+    *value = *(volatile unsigned8 *)(port+reg);    
+  }
+#ifdef DEBUG_OUT
+  printk("mbx8xx_pcmciaide_read_reg(0x%x)=0x%x\r\n",reg,*value & 0xff);
+#endif
+}
+
+/*=========================================================================*\
+| Function:                                                                 |
+\*-------------------------------------------------------------------------*/
+void mbx8xx_pcmciaide_write_reg
+(
+/*-------------------------------------------------------------------------*\
+| Purpose:                                                                  |
+|  write a PCMCIA IDE controller register                                   |
++---------------------------------------------------------------------------+
+| Input Parameters:                                                         |
+\*-------------------------------------------------------------------------*/
+ int                        minor,  /* controller minor number       */
+ int                        reg,    /* register index to access      */
+ unsigned16                 value   /* value to write                */
+ )
+/*-------------------------------------------------------------------------*\
+| Return Value:                                                             |
+|    <none>                                                                 |
+\*=========================================================================*/
+{
+  unsigned32  port = IDE_Controller_Table[minor].port1;
+
+#ifdef DEBUG_OUT
+  printk("mbx8xx_pcmciaide_write_reg(0x%x,0x%x)\r\n",reg,value & 0xff);
+#endif
+  if (reg == IDE_REGISTER_DATA_WORD) {
+#ifdef DATAREG_16BIT
+    *(volatile unsigned16 *)(port+reg) = value;    
+#else
+    *(volatile unsigned8 *)(port+reg) = value >> 8;    
+    *(volatile unsigned8 *)(port+reg+1) = value;    
+#endif
+  }
+  else {
+    *(volatile unsigned8 *)(port+reg)= value;    
+  }
+}
+
+/*=========================================================================*\
+| Function:                                                                 |
+\*-------------------------------------------------------------------------*/
+void mbx8xx_pcmciaide_read_block
+(
+/*-------------------------------------------------------------------------*\
+| Purpose:                                                                  |
+|  read a PCMCIA IDE controller register                                    |
++---------------------------------------------------------------------------+
+| Input Parameters:                                                         |
+\*-------------------------------------------------------------------------*/
+ int minor, 
+ unsigned16 block_size, 
+ blkdev_sg_buffer *bufs, 
+ rtems_unsigned32 *cbuf,
+ rtems_unsigned32 *pos
+ )
+/*-------------------------------------------------------------------------*\
+| Return Value:                                                             |
+|    <none>                                                                 |
+\*=========================================================================*/
+{
+  unsigned32  port = IDE_Controller_Table[minor].port1;
+  unsigned16  cnt = 0;
+#ifdef DEBUG_OUT
+  printk("mbx8xx_pcmciaide_read_block()\r\n");
+#endif
+#ifdef DATAREG_16BIT
+  unsigned16 *lbuf = (unsigned16 *)
+    ((unsigned8 *)(bufs[(*cbuf)].buffer) + (*pos));
+#else
+  unsigned8 *lbuf = (unsigned8 *)
+    ((unsigned8 *)(bufs[(*cbuf)].buffer) + (*pos));
+#endif
+  unsigned32  llength = bufs[(*cbuf)].length;
+    
+  while (((*(volatile unsigned8 *)(port+IDE_REGISTER_STATUS)) 
+          & IDE_REGISTER_STATUS_DRQ) && 
+         (cnt < block_size)) {
+#ifdef DATAREG_16BIT
+    *lbuf++ = *(volatile unsigned16 *)(port+8); /* 16 bit data port */
+    cnt += 2; 
+    (*pos) += 2;
+#else
+    *lbuf++ = *(volatile unsigned8 *)(port+IDE_REGISTER_DATA);
+    cnt += 1; 
+    (*pos) += 1;
+#endif
+    if ((*pos) == llength) {
+      (*pos) = 0;
+      (*cbuf)++;
+      lbuf = bufs[(*cbuf)].buffer;
+      llength = bufs[(*cbuf)].length;
+    }
+  } 
+}
+
+/*=========================================================================*\
+| Function:                                                                 |
+\*-------------------------------------------------------------------------*/
+void mbx8xx_pcmciaide_write_block
+(
+/*-------------------------------------------------------------------------*\
+| Purpose:                                                                  |
+|  write a PCMCIA IDE controller register                                   |
++---------------------------------------------------------------------------+
+| Input Parameters:                                                         |
+\*-------------------------------------------------------------------------*/
+ int minor, 
+ unsigned16 block_size, 
+ blkdev_sg_buffer *bufs, 
+ rtems_unsigned32 *cbuf,
+ rtems_unsigned32 *pos
+ )
+/*-------------------------------------------------------------------------*\
+| Return Value:                                                             |
+|    <none>                                                                 |
+\*=========================================================================*/
+{
+  unsigned32  port = IDE_Controller_Table[minor].port1;
+  unsigned16  cnt = 0;
+
+#ifdef DEBUG_OUT
+  printk("mbx8xx_pcmciaide_write_block()\r\n");
+#endif
+#ifdef DATA_REG_16BIT
+  unsigned16 *lbuf = (unsigned16 *)
+    ((unsigned8 *)(bufs[(*cbuf)].buffer) + (*pos));
+#else
+  unsigned8 *lbuf = (unsigned8 *)
+    ((unsigned8 *)(bufs[(*cbuf)].buffer) + (*pos));
+#endif
+  unsigned32  llength = bufs[(*cbuf)].length;
+    
+  while (((*(volatile unsigned8 *)(port+IDE_REGISTER_STATUS)) 
+          & IDE_REGISTER_STATUS_DRQ) && 
+         (cnt < block_size)) {
+#ifdef DATAREG_16BIT
+    *(volatile unsigned16 *)(port+8) = *lbuf++; /* 16 bit data port */
+    cnt += 2; 
+    (*pos) += 2;
+#else
+    *(volatile unsigned8 *)(port+IDE_REGISTER_DATA) = *lbuf++;
+    cnt += 1; 
+    (*pos) += 1;
+#endif
+    if ((*pos) == llength) {
+      (*pos) = 0;
+      (*cbuf)++;
+      lbuf = bufs[(*cbuf)].buffer;
+      llength = bufs[(*cbuf)].length;
+    }
+  } 
+}
+
+/*=========================================================================*\
+| Function:                                                                 |
+\*-------------------------------------------------------------------------*/
+int mbx8xx_pcmciaide_control
+(
+/*-------------------------------------------------------------------------*\
+| Purpose:                                                                  |
+|  control interface for controller                                         |
++---------------------------------------------------------------------------+
+| Input Parameters:                                                         |
+\*-------------------------------------------------------------------------*/
+ int  minor,                        /* controller minor number       */
+ unsigned32 cmd,                    /* command to send               */
+ void * arg                         /* optional argument             */
+ )
+/*-------------------------------------------------------------------------*\
+| Return Value:                                                             |
+|    <none>                                                                 |
+\*=========================================================================*/
+{
+  return 0;
+}
+
+/*=========================================================================*\
+| Function:                                                                 |
+\*-------------------------------------------------------------------------*/
+rtems_status_code mbx8xx_pcmciaide_config_io_speed
+(
+/*-------------------------------------------------------------------------*\
+| Purpose:                                                                  |
+|  set up transfer speed, if possible                                       |
++---------------------------------------------------------------------------+
+| Input Parameters:                                                         |
+\*-------------------------------------------------------------------------*/
+ int       minor,                   /* controller minor number       */
+ unsigned8 modes_avail              /* optional argument             */
+ )
+/*-------------------------------------------------------------------------*\
+| Return Value:                                                             |
+|    rtems_status_code                                                      |
+\*=========================================================================*/
+{
+  return RTEMS_SUCCESSFUL;
+}
+
+/*
+ * The following table configures the functions used for IDE drivers 
+ * in this BSP.
+ */
+
+ide_ctrl_fns_t mbx8xx_pcmciaide_ctrl_fns = {
+  mbx8xx_pcmciaide_probe,
+  mbx8xx_pcmciaide_initialize,
+  mbx8xx_pcmciaide_control,
+  mbx8xx_pcmciaide_read_reg,
+  mbx8xx_pcmciaide_write_reg,
+  mbx8xx_pcmciaide_read_block,
+  mbx8xx_pcmciaide_write_block,
+  mbx8xx_pcmciaide_config_io_speed
+};
+

c/src/lib/libbsp/powerpc/mbx8xx/include/bsp.h

@@ -113 +113 @@
  */
 
 /*
+ * indicate, that BSP has IDE driver
+ */
+#define RTEMS_BSP_HAS_IDE_DRIVER
+
+/*
  * How many libio files we want
  */
 

c/src/lib/libbsp/powerpc/mbx8xx/include/mbx.h

@@ -59 +59 @@
 #define IMAP_SIZE               ((unsigned int)(64 * 1024))
 #define PCI_CSR_ADDR            ((unsigned int)0xfa210000)
 #define PCI_CSR_SIZE            ((unsigned int)(64 * 1024))
+
+#define MBX_CSR2                (MBX_CSR_ADDR+1)
 #endif

c/src/lib/libbsp/powerpc/mbx8xx/startup/imbx8xx.c

@@ -11 +11 @@
  */
 
 #include <bsp.h>
+#include <bsp/mbx.h>
 
 /*
  *  EPPCBug rev 1.1 is stupid. It clears the interrupt mask register
@@ -156 +157 @@
   register unsigned32 r1, i;
   extern unsigned32 simask_copy;
 
-  /*
-   *  Get the SIU interrupt mask.
-   */
-   simask_copy = m8xx.simask;
-  
   /*                    
    *  Initialize the Debug Enable Register (DER) to an appropriate
    *  value for EPPCBug debugging. 
@@ -213 +209 @@
   r1 = 0xFA200000;
   _mtspr( M8xx_IMMR, r1 );
 
+  /*
+   *  Get the SIU interrupt mask.
+   *  imd: accessing m8xx.* should not occure before setting up the immr !
+   */
+   simask_copy = m8xx.simask;
+  
   /* 
    * Initialize the SIU Module Configuration Register (SIUMCR) 
    * m8xx.siumcr = 0x00602900, the default MBX and firmware value.
@@ -274 +276 @@
   m8xx.plprck = M8xx_UNLOCK_KEY;        /* unlock PLPRCR */
 #if ( defined(mbx821_001) || defined(mbx821_001b) || defined(mbx860_001b) )
   m8xx.plprcr = 0x5F500000;
-#elif ( defined(mbx860_005b) )
+#elif ( defined(mbx860_005b) || \
+        defined(mbx860_002b) || \
+        defined(mbx860_003b) || \
+        defined(mbx860_004b) || \
+        defined(mbx860_006b) || \
+        defined(mbx821_002b) || \
+        defined(mbx821_003b) || \
+        defined(mbx821_004b) || \
+        defined(mbx821_005b) || \
+        defined(mbx821_006b) )
   /* Set the multiplication factor to 0 and clear the timer interrupt status*/
   m8xx.plprcr = 0x00005000;
 #elif ( defined(mbx860_001) || \
@@ -282 +293 @@
         defined(mbx860_003) || \
         defined(mbx860_004) || \
         defined(mbx860_005) || \
-        defined(mbx860_002b) || \
-        defined(mbx860_003b) || \
-        defined(mbx860_004b) || \
-        defined(mbx860_006b) || \
         defined(mbx821_002) || \
         defined(mbx821_003) || \
         defined(mbx821_004) || \
-        defined(mbx821_005) || \
-        defined(mbx821_002b) || \
-        defined(mbx821_003b) || \
-        defined(mbx821_004b) || \
-        defined(mbx821_005b) || \
-        defined(mbx821_006b) )
+        defined(mbx821_005))
   m8xx.plprcr = 0x4C400000;
 #else
 #error "MBX board not defined"  
@@ -582 +584 @@
 #endif
   m8xx.memc[7]._br = M8xx_BR_BA(0xFC000000) | M8xx_BR_AT(0) | M8xx_BR_PS8 |
                 M8xx_BR_MS_GPCM | M8xx_MEMC_BR_V;
+  /*
+   * PCMCIA initialization
+   */
+  /*
+   * PCMCIA region 0: common memory
+   */
+  m8xx.pbr0 = PCMCIA_MEM_ADDR;
+  m8xx.por0 = (M8xx_PCMCIA_POR_BSIZE_64MB 
+               | M8xx_PCMCIA_POR_PSHT(15) | M8xx_PCMCIA_POR_PSST(15) 
+               | M8xx_PCMCIA_POR_PSL(32)  
+               | M8xx_PCMCIA_POR_PPS_16   | M8xx_PCMCIA_POR_PRS_MEM 
+               |M8xx_PCMCIA_POR_PSLOT_A   |  M8xx_PCMCIA_POR_VALID);
+  /*
+   * PCMCIA region 1: dma memory
+   */
+  m8xx.pbr1 = PCMCIA_DMA_ADDR;
+  m8xx.por1 = (M8xx_PCMCIA_POR_BSIZE_64MB 
+               | M8xx_PCMCIA_POR_PSHT(15) | M8xx_PCMCIA_POR_PSST(15) 
+               | M8xx_PCMCIA_POR_PSL(32)  
+               | M8xx_PCMCIA_POR_PPS_16   | M8xx_PCMCIA_POR_PRS_DMA 
+               |M8xx_PCMCIA_POR_PSLOT_A   |  M8xx_PCMCIA_POR_VALID);
+  /*
+   * PCMCIA region 2: attribute memory
+   */
+  m8xx.pbr2 = PCMCIA_ATTRB_ADDR;
+  m8xx.por2 = (M8xx_PCMCIA_POR_BSIZE_64MB 
+               | M8xx_PCMCIA_POR_PSHT(15) | M8xx_PCMCIA_POR_PSST(15) 
+               | M8xx_PCMCIA_POR_PSL(32)  
+               | M8xx_PCMCIA_POR_PPS_16   | M8xx_PCMCIA_POR_PRS_ATT
+               |M8xx_PCMCIA_POR_PSLOT_A   |  M8xx_PCMCIA_POR_VALID);
+  /*
+   * PCMCIA region 3: I/O access
+   */
+  m8xx.pbr3 = PCMCIA_IO_ADDR;
+  m8xx.por3 = (M8xx_PCMCIA_POR_BSIZE_64MB 
+               | M8xx_PCMCIA_POR_PSHT(15) | M8xx_PCMCIA_POR_PSST(15) 
+               | M8xx_PCMCIA_POR_PSL(32)  
+               | M8xx_PCMCIA_POR_PPS_16   | M8xx_PCMCIA_POR_PRS_IO
+               |M8xx_PCMCIA_POR_PSLOT_A   |  M8xx_PCMCIA_POR_VALID);
+
+  /*
+   * PCMCIA interface general control reg
+   */
+  m8xx.pgcra = 0; /* no special options set */
+  /*
+   * PCMCIA interface enable reg
+   */
+  m8xx.per   =0; /* no interrupts enabled now */
 }

c/src/lib/libbsp/powerpc/mbx8xx/startup/mmutlbtab.c

@@ -12 +12 @@
 
 #include <bsp.h>
 #include <mpc8xx/mmu.h>
-
+#include <bsp/mbx.h>
 /*
  * This MMU_TLB_table is used to statically initialize the Table Lookaside
  * Buffers in the MMU of the MBX8xx board.
@@ -166 +166 @@
          *      R/W,X for all, no ASID comparison, cache-inhibited.
          * EPN          TWC     RPN
          */
-        { 0xFA210200,   0x11,   0xFA2109F7 }    /* QSPAN - PS=4K */
+        { 0xFA210200,   0x11,   0xFA2109F7 },   /* QSPAN - PS=4K */
+        /*
+         *
+         * PCMCIA Spaces: Start address 0xE0000000, 256M?
+         * For each space (MEM/DMA/ATTRIB/IO) only the first 8MB are mapped
+         *      ASID=0x0, APG=0x0, guarded memory,
+         *      R/W,X for all, no ASID comparison, cache-inhibited.
+         * EPN                                     TWC  
+         * RPN
+         */
+        { (PCMCIA_MEM_ADDR & 0xfffff000) | 0x200, 0x1D, 
+          (PCMCIA_MEM_ADDR & 0xfffff000) | 0x9F7 },/* PCMCIA Memory - PS=8M */
+
+        { (PCMCIA_DMA_ADDR & 0xfffff000) | 0x200, 0x1D, 
+          (PCMCIA_DMA_ADDR & 0xfffff000) | 0x9F7 },/* PCMCIA DMA - PS=8M */
+
+        { (PCMCIA_ATTRB_ADDR & 0xfffff000) | 0x200, 0x1D,       
+          (PCMCIA_ATTRB_ADDR & 0xfffff000) | 0x9F7 },/* PCMCIA ATTRIB-PS=8M*/
+
+        { (PCMCIA_IO_ADDR & 0xfffff000) | 0x200, 0x1D,  
+          (PCMCIA_IO_ADDR & 0xfffff000) | 0x9F7 }     /* PCMCIA I/O - PS=8M */
 };
 
 /* 

c/src/lib/libbsp/powerpc/mbx8xx/wrapup/Makefile.am

@@ -7 +7 @@
 NETWORKING = network
 endif
 
-BSP_PIECES = clock irq startup console vectors $(NETWORKING)
+BSP_PIECES = clock irq ide startup console vectors $(NETWORKING)
 # pieces to pick up out of libcpu/ppc
 # CPU_PIECES = mpc8xx/clock mpc8xx/console-generic mpc8xx/cpm \
 #              mpc8xx/mmu mpc8xx/timer mpc8xx/vectors

c/src/lib/libcpu/ChangeLog

@@ +1 @@
+2003-02-27      Thomas Doerfler <Thomas.Doerfler@imd-systems.de>
+
+        * libcpu/powerpc/mpc8xx/include/mpc8xx.h: added definitions for
+        PCMCIA port
+
 2003-02-11      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
         * configure.ac: AM_INIT_AUTOMAKE([1.7.2]).

c/src/lib/libcpu/powerpc/mpc8xx/include/mpc8xx.h

@@ -767 +767 @@
 
 /*
 *************************************************************************
+*                 PCMCIA Control Registers
+*************************************************************************
+*/
+#define M8xx_PCMCIA_POR_BSIZE_1B    (0x00 << (31-4))
+#define M8xx_PCMCIA_POR_BSIZE_2B    (0x01 << (31-4))
+#define M8xx_PCMCIA_POR_BSIZE_4B    (0x03 << (31-4))
+#define M8xx_PCMCIA_POR_BSIZE_8B    (0x02 << (31-4))
+#define M8xx_PCMCIA_POR_BSIZE_16B   (0x06 << (31-4))
+#define M8xx_PCMCIA_POR_BSIZE_32B   (0x07 << (31-4))
+#define M8xx_PCMCIA_POR_BSIZE_64B   (0x05 << (31-4))
+#define M8xx_PCMCIA_POR_BSIZE_128B  (0x04 << (31-4))
+#define M8xx_PCMCIA_POR_BSIZE_256B  (0x0C << (31-4))
+#define M8xx_PCMCIA_POR_BSIZE_512B  (0x0D << (31-4))
+#define M8xx_PCMCIA_POR_BSIZE_1KB   (0x0F << (31-4))
+#define M8xx_PCMCIA_POR_BSIZE_2KB   (0x0E << (31-4))
+#define M8xx_PCMCIA_POR_BSIZE_4KB   (0x0A << (31-4))
+#define M8xx_PCMCIA_POR_BSIZE_8KB   (0x0B << (31-4))
+#define M8xx_PCMCIA_POR_BSIZE_16KB  (0x09 << (31-4))
+#define M8xx_PCMCIA_POR_BSIZE_32KB  (0x08 << (31-4))
+#define M8xx_PCMCIA_POR_BSIZE_64KB  (0x18 << (31-4))
+#define M8xx_PCMCIA_POR_BSIZE_128KB (0x19 << (31-4))
+#define M8xx_PCMCIA_POR_BSIZE_256KB (0x1B << (31-4))
+#define M8xx_PCMCIA_POR_BSIZE_512KB (0x1A << (31-4))
+#define M8xx_PCMCIA_POR_BSIZE_1MB   (0x1E << (31-4))
+#define M8xx_PCMCIA_POR_BSIZE_2MB   (0x1F << (31-4))
+#define M8xx_PCMCIA_POR_BSIZE_4MB   (0x1D << (31-4))
+#define M8xx_PCMCIA_POR_BSIZE_8MB   (0x1C << (31-4))
+#define M8xx_PCMCIA_POR_BSIZE_16MB  (0x14 << (31-4))
+#define M8xx_PCMCIA_POR_BSIZE_32MB  (0x15 << (31-4))
+#define M8xx_PCMCIA_POR_BSIZE_64MB  (0x17 << (31-4))
+
+#define M8xx_PCMCIA_POR_PSHT(x)     (((x) & 0x0f) << (31-15))
+#define M8xx_PCMCIA_POR_PSST(x)     (((x) & 0x0f) << (31-19))
+#define M8xx_PCMCIA_POR_PSL(x)      (((x) & 0x1f) << (31-24))
+#define M8xx_PCMCIA_POR_PPS_8       ((0) << (31-19))
+#define M8xx_PCMCIA_POR_PPS_16      ((1) << (31-19))
+
+#define M8xx_PCMCIA_POR_PRS_MEM     ((0) << (31-28))
+#define M8xx_PCMCIA_POR_PRS_ATT     ((2) << (31-28))
+#define M8xx_PCMCIA_POR_PRS_IO      ((3) << (31-28))
+#define M8xx_PCMCIA_POR_PRS_DMA     ((4) << (31-28))
+#define M8xx_PCMCIA_POR_PRS_DML     ((5) << (31-28))
+
+#define M8xx_PCMCIA_POR_PSLOT_A     ((0) << (31-29))
+#define M8xx_PCMCIA_POR_PSLOT_B     ((1) << (31-29))
+
+#define M8xx_PCMCIA_POR_WP          ((1) << (31-30))
+#define M8xx_PCMCIA_POR_VALID       ((1) << (31-31))
+
+#define M8xx_PCMCIA_PGCR_CIRQLVL(x) (((x) & 0xff) << (31- 7))
+#define M8xx_PCMCIA_PGCR_CSCHLVL(x) (((x) & 0xff) << (31-15))
+#define M8xx_PCMCIA_PGCR_CDRQ_OFF    ((0) << (31-17))
+#define M8xx_PCMCIA_PGCR_CDRQ_IOIS16 ((2) << (31-17))
+#define M8xx_PCMCIA_PGCR_CDRQ_SPKR   ((3) << (31-17))
+#define M8xx_PCMCIA_PGCR_COE         ((1) << (31-24))
+#define M8xx_PCMCIA_PGCR_CRESET      ((1) << (31-25))
+
+#define M8xx_PCMCIA_PIPR_CAVS1      ((1) << (31- 0))
+#define M8xx_PCMCIA_PIPR_CAVS2      ((1) << (31- 1))
+#define M8xx_PCMCIA_PIPR_CAWP       ((1) << (31- 2))
+#define M8xx_PCMCIA_PIPR_CACD2      ((1) << (31- 3))
+#define M8xx_PCMCIA_PIPR_CACD1      ((1) << (31- 4))
+#define M8xx_PCMCIA_PIPR_CABVD2     ((1) << (31- 5))
+#define M8xx_PCMCIA_PIPR_CABVD1     ((1) << (31- 6))
+#define M8xx_PCMCIA_PIPR_CARDY      ((1) << (31- 7))
+#define M8xx_PCMCIA_PIPR_CBVS1      ((1) << (31-16))
+#define M8xx_PCMCIA_PIPR_CBVS2      ((1) << (31-17))
+#define M8xx_PCMCIA_PIPR_CBWP       ((1) << (31-18))
+#define M8xx_PCMCIA_PIPR_CBCD2      ((1) << (31-19))
+#define M8xx_PCMCIA_PIPR_CBCD1      ((1) << (31-20))
+#define M8xx_PCMCIA_PIPR_CBBVD2     ((1) << (31-21))
+#define M8xx_PCMCIA_PIPR_CBBVD1     ((1) << (31-22))
+#define M8xx_PCMCIA_PIPR_CBRDY      ((1) << (31-23))
+
+
+#define M8xx_SYPCR_BMT(x)       ((x)<<8)    /* Bus monitor timing */
+#define M8xx_SYPCR_BME          (1<<7)      /* Bus monitor enable */
+#define M8xx_SYPCR_SWF          (1<<3)      /* Software watchdog freeze */
+#define M8xx_SYPCR_SWE          (1<<2)      /* Software watchdog enable */
+#define M8xx_SYPCR_SWRI         (1<<1)      /* Watchdog reset/interrupt sel. */
+#define M8xx_SYPCR_SWP          (1<<0)      /* Software watchdog prescale */
+
+/*
+*************************************************************************
 *                        Memory Control Registers                       *
 *************************************************************************
 */

c/src/libchip/ChangeLog

@@ -28 +28 @@
 
 2002-10-31      Joel Sherrill <joel@OARcorp.com>
 
+        * ide/Makefile.am: various corrections to get it working
+
+2002-10-31      Joel Sherrill <joel@OARcorp.com>
+
         * network/dec21140.c: Removed warnings.
 
 2002-10-28      Eugeny S. Mints <Eugeny.Mints@oktet.ru>

c/src/libchip/ide/Makefile.am

@@ -5 +5 @@
 
 include_idedir = $(includedir)/libchip
 
+LIBNAME = libide
+LIB = $(ARCH)/$(LIBNAME).a
+
+C_FILES = ide_controller.c
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
+
+noinst_HEADERS = 
+
 include_ide_HEADERS = ide_ctrl_cfg.h ide_ctrl.h ide_ctrl_io.h
 
+OBJS = $(C_O_FILES)
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/lib.am
+
 PREINSTALL_FILES = $(PROJECT_INCLUDE)/libchip \
     $(include_ide_HEADERS:%=$(PROJECT_INCLUDE)/libchip/%)
 
@@ -15 +29 @@
 $(PROJECT_INCLUDE)/libchip/%.h: %.h
         $(INSTALL_DATA) $< $@
 
-all-local: $(PREINSTALL_FILES)
+$(LIB): $(OBJS)
+        $(make-library)
+
+all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB)
 
-EXTRA_DIST = 
+EXTRA_DIST = $(C_FILES)
 
 include $(top_srcdir)/../../../automake/subdirs.am
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../../../automake/local.am
+ No newline at end of file

c/src/libchip/ide/ide_controller.c

@@ +1 @@
+/*
+ * ide_controller.c
+ * 
+ * This is generic rtems driver for IDE controllers.
+ *
+ * Copyright (C) 2001 OKTET Ltd., St.-Petersburg, Russia
+ * Authors: Alexandra Kossovsky <sasha@oktet.ru>
+ *          Eugeny S. Mints <Eugeny.Mints@oktet.ru>
+ *
+ *  The license and distribution terms for this file may be
+ *  found in the file LICENSE in this distribution or at
+ *  http://www.OARcorp.com/rtems/license.html.
+ * 
+ * $Id: ide_ctrl.c,v 1.5 2002/10/11 05:53:51 jack Exp $
+ *
+ */
+#include <chain.h>
+#include <assert.h>
+#include <rtems/blkdev.h>
+
+#include <libchip/ide_ctrl_cfg.h>
+#include <libchip/ide_ctrl_io.h>
+
+/*
+ * ide_controller_initialize --
+ *     Initializes all configured IDE controllers. Controllers configuration 
+ *     table is provided by BSP
+ *
+ * PARAMETERS:
+ *     major     - device major number
+ *     minor_arg - device minor number
+ *     args      - arguments
+ *
+ * RETURNS:
+ *     RTEMS_SUCCESSFUL on success, or error code if
+ *     error occured
+ */
+rtems_device_driver 
+ide_controller_initialize(rtems_device_major_number  major,
+                          rtems_device_minor_number  minor_arg,
+                          void                      *args)
+{
+    unsigned long       minor;
+    rtems_status_code   status;
+
+    /* FIXME: may be it should be done on compilation phase */
+    if (IDE_Controller_Count > IDE_CTRL_MAX_MINOR_NUMBER)
+        rtems_fatal_error_occurred(RTEMS_TOO_MANY);
+        
+    for (minor=0; minor < IDE_Controller_Count; minor++)
+    {
+        IDE_Controller_Table[minor].status = IDE_CTRL_NON_INITIALIZED;
+        
+        if ((IDE_Controller_Table[minor].probe != NULL && 
+             IDE_Controller_Table[minor].probe(minor)) ||
+            IDE_Controller_Table[minor].fns->ctrl_probe(minor))
+        {
+            status = rtems_io_register_name(IDE_Controller_Table[minor].name, 
+                                            major, minor);
+            if (status != RTEMS_SUCCESSFUL) 
+                rtems_fatal_error_occurred(status);
+
+            IDE_Controller_Table[minor].fns->ctrl_initialize(minor);
+            
+            IDE_Controller_Table[minor].status = IDE_CTRL_INITIALIZED;
+        }
+    }
+    return RTEMS_SUCCESSFUL;
+}
+
+/*
+ * ide_controller_read_data_block --
+ *     Read data block via controller's data register
+ *
+ * PARAMETERS:
+ *     minor      - minor number of controller
+ *     block_size - number of bytes to read
+ *     bufs       - set of buffers to store data
+ *     cbuf       - number of current buffer from the set
+ *     pos        - position inside current buffer 'cbuf'
+ *
+ * RETURNS:
+ *     NONE
+ */
+void
+ide_controller_read_data_block(rtems_device_minor_number  minor,
+                               unsigned16                 block_size,
+                               blkdev_sg_buffer          *bufs,
+                               rtems_unsigned32          *cbuf,
+                               rtems_unsigned32          *pos)
+{
+    IDE_Controller_Table[minor].fns->ctrl_read_block(minor, block_size, bufs,
+                                                     cbuf, pos);
+}
+
+/*
+ * ide_controller_write_data_block --
+ *     Write data block via controller's data register
+ *
+ * PARAMETERS:
+ *     minor      - minor number of controller
+ *     block_size - number of bytes to write
+ *     bufs       - set of buffers which store data
+ *     cbuf       - number of current buffer from the set
+ *     pos        - position inside current buffer 'cbuf'
+ *
+ * RETURNS:
+ *     NONE
+ */
+void
+ide_controller_write_data_block(rtems_device_minor_number  minor,
+                                unsigned16                 block_size,
+                                blkdev_sg_buffer          *bufs,
+                                rtems_unsigned32          *cbuf,
+                                rtems_unsigned32          *pos)
+
+{
+    IDE_Controller_Table[minor].fns->ctrl_write_block(minor, block_size, bufs,
+                                                      cbuf, pos);
+}
+
+/*
+ * ide_controller_read_register --
+ *     Read controller's register
+ *
+ * PARAMETERS:
+ *     minor - minor number of controller
+ *     reg   - register to read
+ *     value - placeholder for result
+ *
+ * RETURNS
+ *     NONE
+ */
+void
+ide_controller_read_register(rtems_device_minor_number  minor,
+                             int                        reg, 
+                             unsigned16                *value)
+{
+    IDE_Controller_Table[minor].fns->ctrl_reg_read(minor, reg, value);
+}
+
+/*
+ * ide_controller_write_register --
+ *     Write controller's register
+ *
+ * PARAMETERS:
+ *     minor - minor number of controller
+ *     reg   - register to write
+ *     value - value to write
+ *
+ * RETURNS:
+ *     NONE
+ */
+void
+ide_controller_write_register(rtems_device_minor_number minor, int reg, 
+                              unsigned16 value)
+{
+    IDE_Controller_Table[minor].fns->ctrl_reg_write(minor, reg, value);
+}
+
+/*
+ * ide_controller_config_io_speed --
+ *     Set controller's speed of IO operations
+ *
+ * PARAMETERS:
+ *     minor         - minor number of controller
+ *     modes_avaible - speeds available
+ *
+ * RETURNS:
+ *     RTEMS_SUCCESSFUL on success, or error code if
+ *     error occured
+ */
+rtems_status_code 
+ide_controller_config_io_speed(int minor, unsigned8 modes_avaible)
+{
+    return IDE_Controller_Table[minor].fns->ctrl_config_io_speed(
+               minor, 
+               modes_avaible);
+}

c/src/libchip/ide/ide_ctrl_cfg.h

@@ -26 +26 @@
  * Avaible drivers for IDE controllers
  */
 typedef enum {
+    IDE_STD,
     IDE_CUSTOM                /* BSP specific driver */
 } ide_ctrl_devs_t;
 
@@ -70 +71 @@
     char                *name;  /* device name */
     ide_ctrl_devs_t      type;  /* chip type */
     ide_ctrl_fns_t      *fns;   /* pointer to the set of driver routines */
-    boolean              (*probe)(int minor); /* probe routine */
+    boolean              (*probe)(int minor); /* general probe routine */
     unsigned8            status; /* initialized/non initialized. Should be set 
                                   * to zero by static initialization  
                                   */

c/src/wrapup/Makefile.am

@@ -25 +25 @@
 LIBCHIP = \
     ../libchip/rtc/$(ARCH)/librtcio.a \
     ../libchip/serial/$(ARCH)/libserialio.a \
+    ../libchip/ide/$(ARCH)/libide.a \
     $(wildcard $(PROJECT_RELEASE)/lib/libnetchip$(LIB_VARIANT).a)
 endif
 

make/custom/mbx821_002.cfg

@@ +1 @@
+#
+#  Config file for a PowerPC MPC860-based MBX821-001 card.
+#
+
+#
+#  All MBX8xx configurations share the same base file, only a few
+#  parameters differ.
+#  
+
+RTEMS_MBX_MODEL=mbx821_002
+8XX_CPU_TYPE=821
+
+include $(RTEMS_ROOT)/make/custom/mbx8xx.cfg

make/custom/mbx821_002b.cfg

@@ +1 @@
+#
+#  Config file for a PowerPC MPC860-based MBX821-002b card.
+#
+
+#
+#  All MBX8xx configurations share the same base file, only a few
+#  parameters differ.
+#  
+
+RTEMS_MBX_MODEL=mbx821_002b
+8XX_CPU_TYPE=821
+
+include $(RTEMS_ROOT)/make/custom/mbx8xx.cfg