new file mode 100644
--- /dev/null
+++ b/packages/io/serial/current/src/powerpc/cogent_serial_with_ints.c
@@ -0,0 +1,386 @@
+//==========================================================================
+//
+//      io/serial/powerpc/cogent_serial_with_ints.c
+//
+//      PowerPC Cogent Serial I/O Interface Module (interrupt driven)
+//
+//==========================================================================
+//####COPYRIGHTBEGIN####
+//
+// -------------------------------------------
+// The contents of this file are subject to the Cygnus eCos Public License
+// Version 1.0 (the "License"); you may not use this file except in
+// compliance with the License.  You may obtain a copy of the License at
+// http://sourceware.cygnus.com/ecos
+// 
+// Software distributed under the License is distributed on an "AS IS"
+// basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.  See the
+// License for the specific language governing rights and limitations under
+// the License.
+// 
+// The Original Code is eCos - Embedded Cygnus Operating System, released
+// September 30, 1998.
+// 
+// The Initial Developer of the Original Code is Cygnus.  Portions created
+// by Cygnus are Copyright (C) 1998, 1999 Cygnus Solutions.
+// All Rights Reserved.
+// -------------------------------------------
+//
+//####COPYRIGHTEND####
+//==========================================================================
+//#####DESCRIPTIONBEGIN####
+//
+// Author(s):   jskov, based on ARM driver by gthomas
+// Contributors:gthomas, jskov
+// Date:        1999-03-02
+// Purpose:     Cogent Serial I/O module (interrupt driven version)
+// Description: 
+//
+// To Do:
+//   Put in magic to effectively use the FIFOs. Transmitter FIFO fill is a
+//   problem, and setting receiver FIFO interrupts to happen only after
+//   n chars may conflict with hal diag.
+//   
+//####DESCRIPTIONEND####
+//==========================================================================
+
+#include <pkgconf/io_serial.h>
+#include <pkgconf/io.h>
+
+#include <cyg/io/io.h>
+#include <cyg/hal/hal_intr.h>
+#include <cyg/io/devtab.h>
+#include <cyg/infra/diag.h>
+#include <cyg/io/serial.h>
+
+#ifdef CYGPKG_IO_SERIAL_POWERPC_COGENT
+
+#include "cogent_serial.h"
+
+// Make sure the configuration is sane.
+#if defined(CYGPKG_IO_SERIAL_POWERPC_COGENT_SERIAL_A) && \
+    defined(CYGPKG_IO_SERIAL_POWERPC_COGENT_SERIAL_B) && \
+    !defined(CYGIMP_KERNEL_INTERRUPTS_CHAIN)
+#error "Need CYGIMP_KERNEL_INTERRUPTS_CHAIN to support both ports"
+#endif
+
+
+#define BUFSIZE 128
+
+typedef struct cogent_serial_info {
+    CYG_ADDRWORD   base;
+    CYG_WORD       int_num;
+    cyg_interrupt  serial_interrupt;
+    cyg_handle_t   serial_interrupt_handle;
+} cogent_serial_info;
+
+static bool cogent_serial_init(struct cyg_devtab_entry *tab);
+static bool cogent_serial_putc(serial_channel *chan, unsigned char c);
+static Cyg_ErrNo cogent_serial_lookup(struct cyg_devtab_entry **tab, 
+                                   struct cyg_devtab_entry *sub_tab,
+                                   const char *name);
+static unsigned char cogent_serial_getc(serial_channel *chan);
+static bool cogent_serial_set_config(serial_channel *chan, cyg_serial_info_t *config);
+static void cogent_serial_start_xmit(serial_channel *chan);
+static void cogent_serial_stop_xmit(serial_channel *chan);
+
+static cyg_uint32 cogent_serial_ISR(cyg_vector_t vector, cyg_addrword_t data);
+static void       cogent_serial_DSR(cyg_vector_t vector, cyg_ucount32 count, cyg_addrword_t data);
+
+static SERIAL_FUNS(cogent_serial_funs, 
+                   cogent_serial_putc, 
+                   cogent_serial_getc,
+                   cogent_serial_set_config,
+                   cogent_serial_start_xmit,
+                   cogent_serial_stop_xmit
+    );
+
+#ifdef CYGPKG_IO_SERIAL_POWERPC_COGENT_SERIAL_A
+static cogent_serial_info cogent_serial_info0 ={CMA_SER_16550_BASE_A, 
+                                                CYGNUM_HAL_INTERRUPT_SIU_IRQ1};
+#if CYGNUM_IO_SERIAL_POWERPC_COGENT_SERIAL_A_BUFSIZE > 0
+static unsigned char cogent_serial_out_buf0[CYGNUM_IO_SERIAL_POWERPC_COGENT_SERIAL_A_BUFSIZE];
+static unsigned char cogent_serial_in_buf0[CYGNUM_IO_SERIAL_POWERPC_COGENT_SERIAL_A_BUFSIZE];
+
+static SERIAL_CHANNEL_USING_INTERRUPTS(cogent_serial_channel0,
+                                       cogent_serial_funs, 
+                                       cogent_serial_info0,
+                                       CYG_SERIAL_BAUD_RATE(CYGNUM_IO_SERIAL_POWERPC_COGENT_SERIAL_A_BAUD),
+                                       CYG_SERIAL_STOP_DEFAULT,
+                                       CYG_SERIAL_PARITY_DEFAULT,
+                                       CYG_SERIAL_WORD_LENGTH_DEFAULT,
+                                       CYG_SERIAL_FLAGS_DEFAULT,
+                                       &cogent_serial_out_buf0[0], 
+                                       sizeof(cogent_serial_out_buf0),
+                                       &cogent_serial_in_buf0[0], 
+                                       sizeof(cogent_serial_in_buf0)
+    );
+#else
+static SERIAL_CHANNEL(cogent_serial_channel0,
+                      cogent_serial_funs, 
+                      cogent_serial_info0,
+                      CYG_SERIAL_BAUD_RATE(CYGNUM_IO_SERIAL_POWERPC_COGENT_SERIAL_A_BAUD),
+                      CYG_SERIAL_STOP_DEFAULT,
+                      CYG_SERIAL_PARITY_DEFAULT,
+                      CYG_SERIAL_WORD_LENGTH_DEFAULT,
+                      CYG_SERIAL_FLAGS_DEFAULT
+    );
+#endif
+
+DEVTAB_ENTRY(cogent_serial_io0, 
+             CYGDAT_IO_SERIAL_POWERPC_COGENT_SERIAL_A_NAME,
+             0,                 // Does not depend on a lower level interface
+             &serial_devio, 
+             cogent_serial_init, 
+             cogent_serial_lookup,     // Serial driver may need initializing
+             &cogent_serial_channel0
+    );
+#endif
+
+#ifdef CYGPKG_IO_SERIAL_POWERPC_COGENT_SERIAL_B
+static cogent_serial_info cogent_serial_info1 ={CMA_SER_16550_BASE_B, 
+                                                CYGNUM_HAL_INTERRUPT_SIU_IRQ1};
+#if CYGNUM_IO_SERIAL_POWERPC_COGENT_SERIAL_B_BUFSIZE > 0
+static unsigned char cogent_serial_out_buf1[CYGNUM_IO_SERIAL_POWERPC_COGENT_SERIAL_B_BUFSIZE];
+static unsigned char cogent_serial_in_buf1[CYGNUM_IO_SERIAL_POWERPC_COGENT_SERIAL_B_BUFSIZE];
+
+static SERIAL_CHANNEL_USING_INTERRUPTS(cogent_serial_channel1,
+                                       cogent_serial_funs, 
+                                       cogent_serial_info1,
+                                       CYG_SERIAL_BAUD_RATE(CYGNUM_IO_SERIAL_POWERPC_COGENT_SERIAL_B_BAUD),
+                                       CYG_SERIAL_STOP_DEFAULT,
+                                       CYG_SERIAL_PARITY_DEFAULT,
+                                       CYG_SERIAL_WORD_LENGTH_DEFAULT,
+                                       CYG_SERIAL_FLAGS_DEFAULT,
+                                       &cogent_serial_out_buf1[0], 
+                                       sizeof(cogent_serial_out_buf1),
+                                       &cogent_serial_in_buf1[0], 
+                                       sizeof(cogent_serial_in_buf1)
+    );
+#else
+static SERIAL_CHANNEL(cogent_serial_channel1,
+                      cogent_serial_funs, 
+                      cogent_serial_info1,
+                      CYG_SERIAL_BAUD_RATE(CYGNUM_IO_SERIAL_POWERPC_COGENT_SERIAL_B_BAUD),
+                      CYG_SERIAL_STOP_DEFAULT,
+                      CYG_SERIAL_PARITY_DEFAULT,
+                      CYG_SERIAL_WORD_LENGTH_DEFAULT,
+                      CYG_SERIAL_FLAGS_DEFAULT
+    );
+#endif
+
+DEVTAB_ENTRY(cogent_serial_io1, 
+             CYGDAT_IO_SERIAL_POWERPC_COGENT_SERIAL_B_NAME,
+             0,                   // Does not depend on a lower level interface
+             &serial_devio, 
+             cogent_serial_init, 
+             cogent_serial_lookup,     // Serial driver may need initializing
+             &cogent_serial_channel1
+    );
+#endif
+
+
+
+// Internal function to actually configure the hardware to desired baud rate, etc.
+static bool
+cogent_serial_config_port(serial_channel *chan, cyg_serial_info_t *new_config, bool init)
+{
+    cogent_serial_info *cogent_chan = (cogent_serial_info *)chan->dev_priv;
+    cyg_addrword_t port = cogent_chan->base;
+    cyg_uint16 baud_divisor = select_baud[new_config->baud];
+    cyg_uint8 _lcr, _ier;
+
+    if (baud_divisor == 0)
+        return false;    // Invalid baud rate selected
+
+    // Disable port interrupts while changing hardware
+    HAL_READ_UINT8(port+SER_16550_IER, _ier);
+    HAL_WRITE_UINT8(port+SER_16550_IER, 0);
+
+    // Set databits, stopbits and parity.
+    _lcr = select_word_length[(new_config->word_length -
+                               CYGNUM_SERIAL_WORD_LENGTH_5)] | 
+        select_stop_bits[new_config->stop] |
+        select_parity[new_config->parity];
+    HAL_WRITE_UINT8(port+SER_16550_LCR, _lcr);
+
+    // Set baud rate.
+    _lcr |= LCR_DL;
+    HAL_WRITE_UINT8(port+SER_16550_LCR, _lcr);
+    HAL_WRITE_UINT8(port+SER_16550_DLM, baud_divisor >> 8);
+    HAL_WRITE_UINT8(port+SER_16550_DLL, baud_divisor & 0xff);
+    _lcr &= ~LCR_DL;
+    HAL_WRITE_UINT8(port+SER_16550_LCR, _lcr);
+
+    if (init) {
+        // Enable and clear FIFO
+        HAL_WRITE_UINT8(port+SER_16550_FCR,
+                        (FCR_ENABLE | FCR_CLEAR_RCVR | FCR_CLEAR_XMIT));
+
+        if (chan->out_cbuf.len != 0) {
+            HAL_WRITE_UINT8(port+SER_16550_IER, SIO_IER_ERDAI);
+        } else {
+            HAL_WRITE_UINT8(port+SER_16550_IER, 0);
+        }
+
+        {
+            // Special initialization for ST16C552 on CMA102
+            cyg_uint8 mcr;
+        
+            HAL_READ_UINT8(CMA_SER_16550_BASE_A+SER_16550_MCR, mcr);
+            mcr |= 8;
+            HAL_WRITE_UINT8(CMA_SER_16550_BASE_A+SER_16550_MCR, mcr);
+            
+            HAL_READ_UINT8(CMA_SER_16550_BASE_B+SER_16550_MCR, mcr);
+            mcr |= 8;
+            HAL_WRITE_UINT8(CMA_SER_16550_BASE_B+SER_16550_MCR, mcr);
+        }
+    } else {
+        HAL_WRITE_UINT8(port+SER_16550_IER, _ier);
+    }
+    if (new_config != &chan->config) {
+        chan->config = *new_config;
+    }
+    return true;
+}
+
+// Function to initialize the device.  Called at bootstrap time.
+static bool 
+cogent_serial_init(struct cyg_devtab_entry *tab)
+{
+    serial_channel *chan = (serial_channel *)tab->priv;
+    cogent_serial_info *cogent_chan = (cogent_serial_info *)chan->dev_priv;
+#ifdef CYGDBG_IO_INIT
+    diag_printf("COGENT SERIAL init - dev: %x.%d\n", cogent_chan->base, cogent_chan->int_num);
+#endif
+    (chan->callbacks->serial_init)(chan);  // Really only required for interrupt driven devices
+    if (chan->out_cbuf.len != 0) {
+        cyg_drv_interrupt_create(cogent_chan->int_num,
+                                 0,         // can change IRQ0 priority
+                                 (cyg_addrword_t)chan,   //  Data item passed to interrupt handler
+                                 cogent_serial_ISR,
+                                 cogent_serial_DSR,
+                                 &cogent_chan->serial_interrupt_handle,
+                                 &cogent_chan->serial_interrupt);
+        cyg_drv_interrupt_attach(cogent_chan->serial_interrupt_handle);
+        cyg_drv_interrupt_unmask(cogent_chan->int_num);
+    }
+    cogent_serial_config_port(chan, &chan->config, true);
+    return true;
+}
+
+// This routine is called when the device is "looked" up (i.e. attached)
+static Cyg_ErrNo 
+cogent_serial_lookup(struct cyg_devtab_entry **tab, 
+                  struct cyg_devtab_entry *sub_tab,
+                  const char *name)
+{
+    serial_channel *chan = (serial_channel *)(*tab)->priv;
+    (chan->callbacks->serial_init)(chan);  // Really only required for interrupt driven devices
+    return ENOERR;
+}
+
+// Send a character to the device output buffer.
+// Return 'true' if character is sent to device
+static bool
+cogent_serial_putc(serial_channel *chan, unsigned char c)
+{
+    cogent_serial_info *cogent_chan = (cogent_serial_info *)chan->dev_priv;
+    cyg_addrword_t port = cogent_chan->base;
+    cyg_uint8 _lsr;
+
+    HAL_READ_UINT8(port+SER_16550_LSR, _lsr);
+    if (_lsr & SIO_LSR_THRE) {
+// Transmit buffer is empty
+        HAL_WRITE_UINT8(port+SER_16550_THR, c);
+        return true;
+    } else {
+// No space
+        return false;
+    }
+}
+
+// Fetch a character from the device input buffer, waiting if necessary
+static unsigned char 
+cogent_serial_getc(serial_channel *chan)
+{
+    unsigned char c;
+    cogent_serial_info *cogent_chan = (cogent_serial_info *)chan->dev_priv;
+    cyg_addrword_t port = cogent_chan->base;
+    cyg_uint8 _lsr;
+
+    do {
+        HAL_READ_UINT8(port+SER_16550_LSR, _lsr);
+    } while ((_lsr & SIO_LSR_DR) == 0);
+
+    HAL_READ_UINT8(port+SER_16550_RBR, c);
+    return c;
+}
+
+// Set up the device characteristics; baud rate, etc.
+static bool 
+cogent_serial_set_config(serial_channel *chan, cyg_serial_info_t *config)
+{
+    return cogent_serial_config_port(chan, config, false);
+}
+
+// Enable the transmitter on the device
+static void
+cogent_serial_start_xmit(serial_channel *chan)
+{
+    cogent_serial_info *cogent_chan = (cogent_serial_info *)chan->dev_priv;
+    cyg_addrword_t port = cogent_chan->base;
+    cyg_uint8 _ier;
+
+    HAL_READ_UINT8(port+SER_16550_IER, _ier);
+    _ier |= IER_XMT;                    // Enable xmit interrupt
+    HAL_WRITE_UINT8(port+SER_16550_IER, _ier);
+
+    (chan->callbacks->xmt_char)(chan);
+}
+
+// Disable the transmitter on the device
+static void 
+cogent_serial_stop_xmit(serial_channel *chan)
+{
+    cogent_serial_info *cogent_chan = (cogent_serial_info *)chan->dev_priv;
+    cyg_addrword_t port = cogent_chan->base;
+    cyg_uint8 _ier;
+
+    HAL_READ_UINT8(port+SER_16550_IER, _ier);
+    _ier &= ~IER_XMT;                   // Disable xmit interrupt
+    HAL_WRITE_UINT8(port+SER_16550_IER, _ier);
+}
+
+// Serial I/O - low level interrupt handler (ISR)
+static cyg_uint32 
+cogent_serial_ISR(cyg_vector_t vector, cyg_addrword_t data)
+{
+    serial_channel *chan = (serial_channel *)data;
+    cogent_serial_info *cogent_chan = (cogent_serial_info *)chan->dev_priv;
+    cyg_drv_interrupt_mask(cogent_chan->int_num);
+    cyg_drv_interrupt_acknowledge(cogent_chan->int_num);
+    return CYG_ISR_CALL_DSR;  // Cause DSR to be run
+}
+
+// Serial I/O - high level interrupt handler (DSR)
+static void       
+cogent_serial_DSR(cyg_vector_t vector, cyg_ucount32 count, cyg_addrword_t data)
+{
+    serial_channel *chan = (serial_channel *)data;
+    cogent_serial_info *cogent_chan = (cogent_serial_info *)chan->dev_priv;
+    cyg_addrword_t port = cogent_chan->base;
+    cyg_uint8 _iir;
+
+    HAL_READ_UINT8(port+SER_16550_IIR, _iir);
+    if ((_iir & SIO_IIR_ID_MASK) == ISR_Tx) {
+        (chan->callbacks->xmt_char)(chan);
+    } else {
+        // Assume receive interrupt
+        cyg_uint8 _c;
+        HAL_READ_UINT8(port+SER_16550_RBR, _c);
+        (chan->callbacks->rcv_char)(chan, _c);
+    }
+    cyg_drv_interrupt_unmask(cogent_chan->int_num);
+}
+#endif