This is the mail archive of the
ecos-patches@sourceware.org
mailing list for the eCos project.
Re: Generic 8250 serial diagnostics.
- From: David Vrabel <dvrabel at arcom dot com>
- To: eCos Patches <ecos-patches at ecos dot sourceware dot org>
- Date: Mon, 19 Dec 2005 15:50:55 +0000
- Subject: Re: Generic 8250 serial diagnostics.
- References: <43A6D460.4060006@arcom.com>
Convert the PC HAL to use the generic 8250 serial diagnostics.
David Vrabel
--
David Vrabel, Design Engineer
Arcom, Clifton Road Tel: +44 (0)1223 411200 ext. 3233
Cambridge CB1 7EA, UK Web: http://www.arcom.com/
%status
pending
%patch
Index: ecos-working/packages/hal/i386/pc/current/ChangeLog
===================================================================
--- ecos-working.orig/packages/hal/i386/pc/current/ChangeLog 2005-09-05 16:22:55.000000000 +0100
+++ ecos-working/packages/hal/i386/pc/current/ChangeLog 2005-12-19 15:17:37.000000000 +0000
@@ -1,3 +1,10 @@
+2005-12-19 David Vrabel <dvrabel@arcom.com>
+
+ * cdl/hal_i386_pc.cdl: Use CYGINT_HAL_COMMON_8250_SERIAL_DIAG.
+
+ * src/hal_diag.c: Use the generic 8250 serial diagnostics. Updates
+ for the changed cyg_hal_plf_screen_init().
+
2005-06-20 Frank Pagliughi <fpagliughi@mindspring.com>
* cdl/hal_i386_pc.cdl, include/pkgconf/mlt_i386_pc_grub_hi.*:
Index: ecos-working/packages/hal/i386/pc/current/cdl/hal_i386_pc.cdl
===================================================================
--- ecos-working.orig/packages/hal/i386/pc/current/cdl/hal_i386_pc.cdl 2005-12-19 14:57:34.000000000 +0000
+++ ecos-working/packages/hal/i386/pc/current/cdl/hal_i386_pc.cdl 2005-12-19 14:58:28.000000000 +0000
@@ -64,6 +64,7 @@
implements CYGINT_HAL_DEBUG_GDB_STUBS_BREAK
implements CYGINT_HAL_VIRTUAL_VECTOR_SUPPORT
implements CYGINT_HAL_VIRTUAL_VECTOR_SUPPORT_GUARANTEED
+ implements CYGINT_HAL_COMMON_8250_SERIAL_DIAG
define_proc {
puts $::cdl_system_header "#define CYGBLD_HAL_TARGET_H <pkgconf/hal_i386.h>"
Index: ecos-working/packages/hal/i386/pc/current/src/hal_diag.c
===================================================================
--- ecos-working.orig/packages/hal/i386/pc/current/src/hal_diag.c 2005-12-19 14:57:34.000000000 +0000
+++ ecos-working/packages/hal/i386/pc/current/src/hal_diag.c 2005-12-19 14:58:28.000000000 +0000
@@ -70,54 +70,62 @@
#include <cyg/hal/hal_if.h> // interface API
#include <cyg/hal/hal_misc.h> // Helper functions
-#include <cyg/hal/pcmb_serial.h>
+#include <cyg/hal/hal_serial_8250_diag.h>
+#include <cyg/hal/pcmb_screen.h>
//=============================================================================
#if defined(CYGSEM_HAL_VIRTUAL_VECTOR_DIAG) \
|| defined(CYGPRI_HAL_IMPLEMENTS_IF_SERVICES)
-channel_data_t pc_ser_channels[CYGNUM_HAL_VIRTUAL_VECTOR_COMM_CHANNELS];
+static serial_8250_channel_data_t pc_ser_channels[] = {
+#if (defined(CYGSEM_HAL_I386_PC_DIAG_SCREEN) && CYGNUM_HAL_VIRTUAL_VECTOR_COMM_CHANNELS >= 2) \
+ || (!defined(CYGSEM_HAL_I386_PC_DIAG_SCREEN) && CYGNUM_HAL_VIRTUAL_VECTORS >= 1)
+ {
+ .freq = 1843200,
+ .base = 0x3f8,
+ .msec_timeout = 1000,
+ .isr_vector = 36,
+ },
+#endif
+#if (defined(CYGSEM_HAL_I386_PC_DIAG_SCREEN) && CYGNUM_HAL_VIRTUAL_VECTOR_COMM_CHANNELS >= 3) \
+ || (!defined(CYGSEM_HAL_I386_PC_DIAG_SCREEN) && CYGNUM_HAL_VIRTUAL_VECTORS >= 2)
+ {
+ .freq = 1843200,
+ .base = 0x2f8,
+ .msec_timeout = 1000,
+ .isr_vector = 35,
+ },
+#endif
+};
+
+#ifdef CYGSEM_HAL_I386_PC_DIAG_SCREEN
+static pcmb_screen_channel_data_t pc_screen_channel = {
+ .isr_vector = 33,
+ .msec_timeout = 1000,
+};
+#endif
+
+/* FIXME: Move somewhere common */
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
void
cyg_hal_plf_comms_init(void)
{
static int initialized = 0;
- int num_serial;
if (initialized)
return;
initialized = 1;
- num_serial = CYGNUM_HAL_VIRTUAL_VECTOR_COMM_CHANNELS;
-#ifdef CYGSEM_HAL_I386_PC_DIAG_SCREEN
- --num_serial;
-#endif
- if (num_serial > 0) {
- // COM1
- pc_ser_channels[0].base = 0x3F8;
- pc_ser_channels[0].msec_timeout = 1000;
- pc_ser_channels[0].isr_vector = 36;
- }
- if (num_serial > 1) {
- // COM2
- pc_ser_channels[1].base = 0x2F8;
- pc_ser_channels[1].msec_timeout = 1000;
- pc_ser_channels[1].isr_vector = 35;
- }
-
- cyg_hal_plf_serial_init();
+ cyg_hal_serial_8250_diag_init(pc_ser_channels, ARRAY_SIZE(pc_ser_channels));
#ifdef CYGSEM_HAL_I386_PC_DIAG_SCREEN
-
- pc_ser_channels[num_serial].base = 0x060;
- pc_ser_channels[num_serial].msec_timeout = 1000;
- pc_ser_channels[num_serial].isr_vector = 33;
- cyg_hal_plf_screen_init();
+ cyg_hal_plf_screen_init(&pc_screen_channel);
-#endif
+#endif
}
//=============================================================================
Index: ecos-working/packages/hal/i386/pcmb/current/cdl/hal_i386_pcmb.cdl
===================================================================
--- ecos-working.orig/packages/hal/i386/pcmb/current/cdl/hal_i386_pcmb.cdl 2005-12-19 14:58:28.000000000 +0000
+++ ecos-working/packages/hal/i386/pcmb/current/cdl/hal_i386_pcmb.cdl 2005-12-19 14:58:28.000000000 +0000
@@ -66,7 +66,7 @@
found on modern motherboards, such as ethernet, sound and
video devices. These are supported by drivers elsewhere."
- compile pcmb_misc.c pcmb_serial.c
+ compile pcmb_misc.c
implements CYGINT_HAL_I386_MEM_REAL_REGION_TOP
Index: ecos-working/packages/hal/i386/pcmb/current/include/pcmb_screen.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ ecos-working/packages/hal/i386/pcmb/current/include/pcmb_screen.h 2005-12-19 15:18:31.000000000 +0000
@@ -0,0 +1,48 @@
+#ifndef CYGONCE_HAL_PCMB_SCREEN_H
+#define CYGONCE_HAL_PCMB_SCREEN_H
+
+//==========================================================================
+//
+// pcmb_screen.h
+//
+// i386/pc Motherboard screen device support
+//
+//==========================================================================
+//####ECOSGPLCOPYRIGHTBEGIN####
+// -------------------------------------------
+// This file is part of eCos, the Embedded Configurable Operating System.
+//
+// Copyright (C) 2005 eCosCentric Ltd.
+//
+// eCos is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License as published by the Free
+// Software Foundation; either version 2 or (at your option) any later version.
+//
+// eCos is distributed in the hope that it will be useful, but WITHOUT ANY
+// WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+// for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with eCos; if not, write to the Free Software Foundation, Inc.,
+// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+//
+// As a special exception, if other files instantiate templates or use macros
+// or inline functions from this file, or you compile this file and link it
+// with other works to produce a work based on this file, this file does not
+// by itself cause the resulting work to be covered by the GNU General Public
+// License. However the source code for this file must still be made available
+// in accordance with section (3) of the GNU General Public License.
+//
+// This exception does not invalidate any other reasons why a work based on
+// this file might be covered by the GNU General Public License.
+// -------------------------------------------
+//####ECOSGPLCOPYRIGHTEND####
+//==========================================================================
+
+typedef struct {
+ int isr_vector;
+ cyg_int32 msec_timeout;
+} pcmb_screen_channel_data_t;
+
+#endif /* CYGONCE_HAL_PCMB_SCREEN_H */
Index: ecos-working/packages/hal/i386/pcmb/current/include/pcmb_serial.h
===================================================================
--- ecos-working.orig/packages/hal/i386/pcmb/current/include/pcmb_serial.h 2005-12-19 14:57:34.000000000 +0000
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,96 +0,0 @@
-#ifndef CYGONCE_HAL_PCMB_SERIAL_H
-#define CYGONCE_HAL_PCMB_SERIAL_H
-
-//==========================================================================
-//
-// pcmb_serial.h
-//
-// i386/pc Motherboard serial device support
-//
-//==========================================================================
-//####ECOSGPLCOPYRIGHTBEGIN####
-// -------------------------------------------
-// This file is part of eCos, the Embedded Configurable Operating System.
-// Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
-//
-// eCos is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License as published by the Free
-// Software Foundation; either version 2 or (at your option) any later version.
-//
-// eCos is distributed in the hope that it will be useful, but WITHOUT ANY
-// WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-// for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with eCos; if not, write to the Free Software Foundation, Inc.,
-// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-//
-// As a special exception, if other files instantiate templates or use macros
-// or inline functions from this file, or you compile this file and link it
-// with other works to produce a work based on this file, this file does not
-// by itself cause the resulting work to be covered by the GNU General Public
-// License. However the source code for this file must still be made available
-// in accordance with section (3) of the GNU General Public License.
-//
-// This exception does not invalidate any other reasons why a work based on
-// this file might be covered by the GNU General Public License.
-//
-// Alternative licenses for eCos may be arranged by contacting Red Hat, Inc.
-// at http://sources.redhat.com/ecos/ecos-license/
-// -------------------------------------------
-//####ECOSGPLCOPYRIGHTEND####
-//==========================================================================
-//#####DESCRIPTIONBEGIN####
-//
-// Author(s): nickg
-// Contributors:
-// Date: 2001-03-07
-// Purpose: PC serial support
-// Description:
-//
-//
-//
-//
-//
-//
-// Usage:
-// #include <cyg/hal/pcmb_serial.h>
-// ...
-//
-//####DESCRIPTIONEND####
-//
-//==========================================================================
-
-#include <pkgconf/hal.h>
-#include <pkgconf/hal_i386.h>
-#include <pkgconf/hal_i386_pcmb.h>
-
-#include <cyg/infra/cyg_type.h>
-
-//---------------------------------------------------------------------------
-
-//=============================================================================
-
-typedef struct {
- cyg_uint16 base;
- cyg_uint16 valid;
- cyg_int32 msec_timeout;
- cyg_int32 isr_vector;
-} channel_data_t;
-
-__externC channel_data_t pc_ser_channels[];
-
-//=============================================================================
-
-__externC void cyg_hal_plf_serial_init(void);
-
-#if CYGINT_HAL_I386_PCMB_SCREEN_SUPPORT > 0
-
-__externC void cyg_hal_plf_screen_init(void);
-__externC void cyg_hal_plf_screen_position(int *x, int *y);
-#endif
-
-//---------------------------------------------------------------------------
-#endif // ifndef CYGONCE_HAL_PCMB_SERIAL_H
-// End of pcmb_serial.h
Index: ecos-working/packages/hal/i386/pcmb/current/src/pcmb_screen.c
===================================================================
--- ecos-working.orig/packages/hal/i386/pcmb/current/src/pcmb_screen.c 2005-12-19 14:57:34.000000000 +0000
+++ ecos-working/packages/hal/i386/pcmb/current/src/pcmb_screen.c 2005-12-19 14:58:28.000000000 +0000
@@ -64,10 +64,9 @@
#include <cyg/hal/hal_if.h> // interface API
#include <cyg/hal/hal_misc.h>
-#include <cyg/hal/pcmb_serial.h>
+#include <cyg/hal/pcmb_screen.h>
-// Index into pc_ser_channels[] for screen entry.
-#define PCMB_PORT_INDEX (CYGNUM_HAL_VIRTUAL_VECTOR_COMM_CHANNELS - 1)
+#define SCREEN_CHANNEL_IDX (CYGNUM_HAL_VIRTUAL_VECTOR_COMM_CHANNELS - 1)
//-----------------------------------------------------------------------------
// Screen output definitions...
@@ -728,7 +727,7 @@
cyg_hal_plf_screen_getc_timeout(void* __ch_data, cyg_uint8* ch)
{
int delay_count;
- channel_data_t* chan = (channel_data_t*)__ch_data;
+ pcmb_screen_channel_data_t* chan = (pcmb_screen_channel_data_t*)__ch_data;
cyg_bool res;
CYGARC_HAL_SAVE_GP();
@@ -750,7 +749,7 @@
cyg_hal_plf_screen_control(void *__ch_data, __comm_control_cmd_t __func, ...)
{
static int irq_state = 0;
- channel_data_t* chan = (channel_data_t*)__ch_data;
+ pcmb_screen_channel_data_t* chan = (pcmb_screen_channel_data_t*)__ch_data;
int ret = 0;
CYGARC_HAL_SAVE_GP();
@@ -792,7 +791,7 @@
CYG_ADDRWORD __vector, CYG_ADDRWORD __data)
{
int res = 0;
- channel_data_t* chan = (channel_data_t*)__ch_data;
+ pcmb_screen_channel_data_t* chan = (pcmb_screen_channel_data_t*)__ch_data;
char c;
CYGARC_HAL_SAVE_GP();
@@ -815,23 +814,23 @@
return res;
}
-void cyg_hal_plf_screen_init(void)
+void cyg_hal_plf_screen_init(pcmb_screen_channel_data_t *chan)
{
hal_virtual_comm_table_t* comm;
int cur = CYGACC_CALL_IF_SET_CONSOLE_COMM(CYGNUM_CALL_IF_SET_COMM_ID_QUERY_CURRENT);
// Disable interrupts.
- HAL_INTERRUPT_MASK(pc_ser_channels[PCMB_PORT_INDEX].isr_vector);
+ HAL_INTERRUPT_MASK(chan->isr_vector);
// Init channels
- cyg_hal_plf_screen_init_channel(&pc_ser_channels[PCMB_PORT_INDEX]);
+ cyg_hal_plf_screen_init_channel(chan);
// Setup procs in the vector table
// Set channel 2
- CYGACC_CALL_IF_SET_CONSOLE_COMM(PCMB_PORT_INDEX);
+ CYGACC_CALL_IF_SET_CONSOLE_COMM(SCREEN_CHANNEL_IDX);
comm = CYGACC_CALL_IF_CONSOLE_PROCS();
- CYGACC_COMM_IF_CH_DATA_SET(*comm, &pc_ser_channels[PCMB_PORT_INDEX]);
+ CYGACC_COMM_IF_CH_DATA_SET(*comm, chan);
CYGACC_COMM_IF_WRITE_SET(*comm, cyg_hal_plf_screen_write);
CYGACC_COMM_IF_READ_SET(*comm, cyg_hal_plf_screen_read);
CYGACC_COMM_IF_PUTC_SET(*comm, cyg_hal_plf_screen_putc);
Index: ecos-working/packages/hal/i386/pcmb/current/src/pcmb_serial.c
===================================================================
--- ecos-working.orig/packages/hal/i386/pcmb/current/src/pcmb_serial.c 2005-12-19 14:57:34.000000000 +0000
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,404 +0,0 @@
-//=============================================================================
-//
-// pcmb_serial.c
-//
-// HAL diagnostic output code
-//
-//=============================================================================
-//####ECOSGPLCOPYRIGHTBEGIN####
-// -------------------------------------------
-// This file is part of eCos, the Embedded Configurable Operating System.
-// Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
-//
-// eCos is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License as published by the Free
-// Software Foundation; either version 2 or (at your option) any later version.
-//
-// eCos is distributed in the hope that it will be useful, but WITHOUT ANY
-// WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-// for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with eCos; if not, write to the Free Software Foundation, Inc.,
-// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-//
-// As a special exception, if other files instantiate templates or use macros
-// or inline functions from this file, or you compile this file and link it
-// with other works to produce a work based on this file, this file does not
-// by itself cause the resulting work to be covered by the GNU General Public
-// License. However the source code for this file must still be made available
-// in accordance with section (3) of the GNU General Public License.
-//
-// This exception does not invalidate any other reasons why a work based on
-// this file might be covered by the GNU General Public License.
-//
-// Alternative licenses for eCos may be arranged by contacting Red Hat, Inc.
-// at http://sources.redhat.com/ecos/ecos-license/
-// -------------------------------------------
-//####ECOSGPLCOPYRIGHTEND####
-//=============================================================================
-//#####DESCRIPTIONBEGIN####
-//
-// Author(s): proven
-// Contributors:proven
-// Date: 1998-10-05
-// Purpose: HAL diagnostic output
-// Description: Implementations of HAL diagnostic output support.
-//
-//####DESCRIPTIONEND####
-//
-//=============================================================================
-
-#include <pkgconf/hal.h>
-
-#include <cyg/infra/cyg_type.h> // base types
-
-#include <cyg/hal/hal_arch.h> // basic machine info
-#include <cyg/hal/hal_intr.h> // interrupt macros
-#include <cyg/hal/hal_io.h> // IO macros
-#include <cyg/hal/drv_api.h>
-#include <cyg/hal/hal_if.h> // interface API
-#include <cyg/hal/hal_misc.h>
-
-#include <cyg/hal/pcmb_serial.h>
-
-
-/*---------------------------------------------------------------------------*/
-/* From serial_16550.h */
-#if CYGNUM_HAL_VIRTUAL_VECTOR_CONSOLE_CHANNEL_BAUD==9600
-#define CYG_DEVICE_SERIAL_BAUD_MSB 0x00
-#define CYG_DEVICE_SERIAL_BAUD_LSB 0x0C
-#endif
-#if CYGNUM_HAL_VIRTUAL_VECTOR_CONSOLE_CHANNEL_BAUD==19200
-#define CYG_DEVICE_SERIAL_BAUD_MSB 0x00
-#define CYG_DEVICE_SERIAL_BAUD_LSB 0x06
-#endif
-#if CYGNUM_HAL_VIRTUAL_VECTOR_CONSOLE_CHANNEL_BAUD==38400
-#define CYG_DEVICE_SERIAL_BAUD_MSB 0x00
-#define CYG_DEVICE_SERIAL_BAUD_LSB 0x03
-#endif
-#if CYGNUM_HAL_VIRTUAL_VECTOR_CONSOLE_CHANNEL_BAUD==57600
-#define CYG_DEVICE_SERIAL_BAUD_MSB 0x00
-#define CYG_DEVICE_SERIAL_BAUD_LSB 0x02
-#endif
-#if CYGNUM_HAL_VIRTUAL_VECTOR_CONSOLE_CHANNEL_BAUD==115200
-#define CYG_DEVICE_SERIAL_BAUD_MSB 0x00
-#define CYG_DEVICE_SERIAL_BAUD_LSB 0x01
-#endif
-
-#ifndef CYG_DEVICE_SERIAL_BAUD_MSB
-#error Missing/incorrect serial baud rate defined - CDL error?
-#endif
-
-// Define the serial registers.
-#define CYG_DEV_RBR 0x00 // receiver buffer register, read, dlab = 0
-#define CYG_DEV_THR 0x00 // transmitter holding register, write, dlab = 0
-#define CYG_DEV_DLL 0x00 // divisor latch (LS), read/write, dlab = 1
-#define CYG_DEV_IER 0x01 // interrupt enable register, read/write, dlab = 0
-#define CYG_DEV_DLM 0x01 // divisor latch (MS), read/write, dlab = 1
-#define CYG_DEV_IIR 0x02 // interrupt identification register, read, dlab = 0
-#define CYG_DEV_FCR 0x02 // fifo control register, write, dlab = 0
-#define CYG_DEV_LCR 0x03 // line control register, read/write
-#define CYG_DEV_MCR 0x04 // modem control register, read/write
-#define CYG_DEV_LSR 0x05 // line status register, read
-#define CYG_DEV_MSR 0x06 // modem status register, read
-
-// Interrupt Enable Register
-#define SIO_IER_RCV 0x01
-#define SIO_IER_XMT 0x02
-#define SIO_IER_LS 0x04
-#define SIO_IER_MS 0x08
-
-// The line status register bits.
-#define SIO_LSR_DR 0x01 // data ready
-#define SIO_LSR_OE 0x02 // overrun error
-#define SIO_LSR_PE 0x04 // parity error
-#define SIO_LSR_FE 0x08 // framing error
-#define SIO_LSR_BI 0x10 // break interrupt
-#define SIO_LSR_THRE 0x20 // transmitter holding register empty
-#define SIO_LSR_TEMT 0x40 // transmitter register empty
-#define SIO_LSR_ERR 0x80 // any error condition
-
-// The modem status register bits.
-#define SIO_MSR_DCTS 0x01 // delta clear to send
-#define SIO_MSR_DDSR 0x02 // delta data set ready
-#define SIO_MSR_TERI 0x04 // trailing edge ring indicator
-#define SIO_MSR_DDCD 0x08 // delta data carrier detect
-#define SIO_MSR_CTS 0x10 // clear to send
-#define SIO_MSR_DSR 0x20 // data set ready
-#define SIO_MSR_RI 0x40 // ring indicator
-#define SIO_MSR_DCD 0x80 // data carrier detect
-
-// The line control register bits.
-#define SIO_LCR_WLS0 0x01 // word length select bit 0
-#define SIO_LCR_WLS1 0x02 // word length select bit 1
-#define SIO_LCR_STB 0x04 // number of stop bits
-#define SIO_LCR_PEN 0x08 // parity enable
-#define SIO_LCR_EPS 0x10 // even parity select
-#define SIO_LCR_SP 0x20 // stick parity
-#define SIO_LCR_SB 0x40 // set break
-#define SIO_LCR_DLAB 0x80 // divisor latch access bit
-
-// Modem Control Register
-#define SIO_MCR_DTR 0x01
-#define SIO_MCR_RTS 0x02
-#define SIO_MCR_INT 0x08 // Enable interrupts
-
-//=============================================================================
-// Basic channel functions
-
-static void
-cyg_hal_plf_serial_init_channel(void* __ch_data)
-{
- cyg_uint16 base = ((channel_data_t*)__ch_data)->base;
- cyg_uint8 lsr;
-
- HAL_WRITE_UINT8(base+CYG_DEV_IER, 0);
- HAL_WRITE_UINT8(base+CYG_DEV_IER, 0);
- HAL_WRITE_UINT8(base+CYG_DEV_MCR, 0);
-
- HAL_WRITE_UINT8(base+CYG_DEV_LCR, SIO_LCR_DLAB);
- HAL_WRITE_UINT8(base+CYG_DEV_DLL, CYG_DEVICE_SERIAL_BAUD_LSB);
- HAL_WRITE_UINT8(base+CYG_DEV_DLM, CYG_DEVICE_SERIAL_BAUD_MSB);
- // 8-1-no parity.
- HAL_WRITE_UINT8(base+CYG_DEV_LCR, SIO_LCR_WLS0 | SIO_LCR_WLS1);
-
- // Test whether the channel is valid or not. If the status
- // register reads back all ones, its a fair bet that it is not
- // actually there!
- HAL_READ_UINT8(base+CYG_DEV_LSR, lsr);
- ((channel_data_t*)__ch_data)->valid = (lsr != 0xFF);
-
- HAL_WRITE_UINT8(base+CYG_DEV_FCR, 0x07); // Enable & clear FIFO
-}
-
-//-----------------------------------------------------------------------------
-
-void
-cyg_hal_plf_serial_putc(void *__ch_data, char c)
-{
- cyg_uint16 base = ((channel_data_t*)__ch_data)->base;
- cyg_uint8 lsr;
-
- if( !((channel_data_t*)__ch_data)->valid )
- return;
-
- CYGARC_HAL_SAVE_GP();
- do {
- HAL_READ_UINT8(base+CYG_DEV_LSR, lsr);
- } while ((lsr & SIO_LSR_THRE) == 0);
-
- HAL_WRITE_UINT8(base+CYG_DEV_THR, c);
-
- CYGARC_HAL_RESTORE_GP();
-}
-
-//-----------------------------------------------------------------------------
-
-static cyg_bool
-cyg_hal_plf_serial_getc_nonblock(void* __ch_data, cyg_uint8* ch)
-{
- cyg_uint16 base = ((channel_data_t*)__ch_data)->base;
- cyg_uint8 lsr;
-
- if( !((channel_data_t*)__ch_data)->valid )
- return false;
-
- HAL_READ_UINT8(base+CYG_DEV_LSR, lsr);
- if ((lsr & SIO_LSR_DR) == 0)
- return false;
-
- HAL_READ_UINT8(base+CYG_DEV_RBR, *ch);
-
- return true;
-}
-
-//-----------------------------------------------------------------------------
-
-cyg_uint8
-cyg_hal_plf_serial_getc(void* __ch_data)
-{
- cyg_uint8 ch;
-
- if( !((channel_data_t*)__ch_data)->valid )
- return '\n';
-
- CYGARC_HAL_SAVE_GP();
-
- while(!cyg_hal_plf_serial_getc_nonblock(__ch_data, &ch));
-
- CYGARC_HAL_RESTORE_GP();
-
- return ch;
-}
-
-//=============================================================================
-// Call IF support
-
-#if defined(CYGSEM_HAL_VIRTUAL_VECTOR_DIAG) \
- || defined(CYGPRI_HAL_IMPLEMENTS_IF_SERVICES)
-
-static void
-cyg_hal_plf_serial_write(void* __ch_data, const cyg_uint8* __buf,
- cyg_uint32 __len)
-{
- CYGARC_HAL_SAVE_GP();
-
- while(__len-- > 0)
- cyg_hal_plf_serial_putc(__ch_data, *__buf++);
-
- CYGARC_HAL_RESTORE_GP();
-}
-
-static void
-cyg_hal_plf_serial_read(void* __ch_data, cyg_uint8* __buf, cyg_uint32 __len)
-{
- CYGARC_HAL_SAVE_GP();
-
- while(__len-- > 0)
- *__buf++ = cyg_hal_plf_serial_getc(__ch_data);
-
- CYGARC_HAL_RESTORE_GP();
-}
-
-static cyg_bool
-cyg_hal_plf_serial_getc_timeout(void* __ch_data, cyg_uint8* ch)
-{
- int delay_count;
- channel_data_t* chan = (channel_data_t*)__ch_data;
- cyg_bool res;
- CYGARC_HAL_SAVE_GP();
-
- delay_count = chan->msec_timeout * 10; // delay in .1 ms steps
-
- for(;;) {
- res = cyg_hal_plf_serial_getc_nonblock(__ch_data, ch);
- if (res || 0 == delay_count--)
- break;
-
- CYGACC_CALL_IF_DELAY_US(100);
- }
-
- CYGARC_HAL_RESTORE_GP();
- return res;
-}
-
-
-static int
-cyg_hal_plf_serial_control(void *__ch_data, __comm_control_cmd_t __func, ...)
-{
- static int irq_state = 0;
- channel_data_t* chan = (channel_data_t*)__ch_data;
- int ret = 0;
- CYGARC_HAL_SAVE_GP();
-
- switch (__func) {
- case __COMMCTL_IRQ_ENABLE:
- irq_state = 1;
-
- HAL_WRITE_UINT8(chan->base+CYG_DEV_IER, SIO_IER_RCV);
- HAL_WRITE_UINT8(chan->base+CYG_DEV_MCR, SIO_MCR_INT|SIO_MCR_DTR|SIO_MCR_RTS);
-
- HAL_INTERRUPT_UNMASK(chan->isr_vector);
- break;
- case __COMMCTL_IRQ_DISABLE:
- ret = irq_state;
- irq_state = 0;
-
- HAL_WRITE_UINT8(chan->base+CYG_DEV_IER, 0);
-
- HAL_INTERRUPT_MASK(chan->isr_vector);
- break;
- case __COMMCTL_DBG_ISR_VECTOR:
- ret = chan->isr_vector;
- break;
- case __COMMCTL_SET_TIMEOUT:
- {
- va_list ap;
-
- va_start(ap, __func);
-
- ret = chan->msec_timeout;
- chan->msec_timeout = va_arg(ap, cyg_uint32);
-
- va_end(ap);
- }
- default:
- break;
- }
-
-
- CYGARC_HAL_RESTORE_GP();
- return ret;
-}
-
-static int
-cyg_hal_plf_serial_isr(void *__ch_data, int* __ctrlc,
- CYG_ADDRWORD __vector, CYG_ADDRWORD __data)
-{
- int res = 0;
- channel_data_t* chan = (channel_data_t*)__ch_data;
- char c;
- cyg_uint8 lsr;
- CYGARC_HAL_SAVE_GP();
-
- cyg_drv_interrupt_acknowledge(chan->isr_vector);
-
- *__ctrlc = 0;
- HAL_READ_UINT8(chan->base+CYG_DEV_LSR, lsr);
- if ( (lsr & SIO_LSR_DR) != 0 ) {
-
- HAL_READ_UINT8(chan->base+CYG_DEV_RBR, c);
- if( cyg_hal_is_break( &c , 1 ) )
- *__ctrlc = 1;
-
- }
-
- res = CYG_ISR_HANDLED;
-
- CYGARC_HAL_RESTORE_GP();
- return res;
-}
-
-void cyg_hal_plf_serial_init(void)
-{
- hal_virtual_comm_table_t* comm;
- int cur = CYGACC_CALL_IF_SET_CONSOLE_COMM(CYGNUM_CALL_IF_SET_COMM_ID_QUERY_CURRENT);
- int i, num_serial = CYGNUM_HAL_VIRTUAL_VECTOR_COMM_CHANNELS;
-
-#ifdef CYGSEM_HAL_I386_PC_DIAG_SCREEN
- --num_serial;
-#endif
-
- for (i = 0; i < num_serial; i++) {
- // Disable interrupts.
- HAL_INTERRUPT_MASK(pc_ser_channels[i].isr_vector);
-
- // Init
- cyg_hal_plf_serial_init_channel(&pc_ser_channels[i]);
-
- // Setup procs in the vector table
-
- // Set channel 0
- CYGACC_CALL_IF_SET_CONSOLE_COMM(i);
- comm = CYGACC_CALL_IF_CONSOLE_PROCS();
- CYGACC_COMM_IF_CH_DATA_SET(*comm, &pc_ser_channels[i]);
- CYGACC_COMM_IF_WRITE_SET(*comm, cyg_hal_plf_serial_write);
- CYGACC_COMM_IF_READ_SET(*comm, cyg_hal_plf_serial_read);
- CYGACC_COMM_IF_PUTC_SET(*comm, cyg_hal_plf_serial_putc);
- CYGACC_COMM_IF_GETC_SET(*comm, cyg_hal_plf_serial_getc);
- CYGACC_COMM_IF_CONTROL_SET(*comm, cyg_hal_plf_serial_control);
- CYGACC_COMM_IF_DBG_ISR_SET(*comm, cyg_hal_plf_serial_isr);
- CYGACC_COMM_IF_GETC_TIMEOUT_SET(*comm, cyg_hal_plf_serial_getc_timeout);
- }
-
- // Restore original console
- CYGACC_CALL_IF_SET_CONSOLE_COMM(cur);
-}
-
-#endif //defined(CYGSEM_HAL_VIRTUAL_VECTOR_DIAG)
- // || defined(CYGPRI_HAL_IMPLEMENTS_IF_SERVICES)
-
-//-----------------------------------------------------------------------------
-// End of pcmb_serial.c
Index: ecos-working/packages/hal/i386/pcmb/current/ChangeLog
===================================================================
--- ecos-working.orig/packages/hal/i386/pcmb/current/ChangeLog 2005-05-04 10:33:29.000000000 +0100
+++ ecos-working/packages/hal/i386/pcmb/current/ChangeLog 2005-12-19 15:21:32.000000000 +0000
@@ -1,3 +1,16 @@
+2005-12-19 David Vrabel <dvrabel@arcom.com>
+
+ * include/pcmb_screen.h: New. Adds a pcmb_screen_channel_data_t
+ type to store details for the screen diagnostic's channel.
+
+ * src/pcmb_screen.c: channel_data_t -> pcmb_screen_channel_data_t,
+ PCMB_PORT_INDEX -> SCREEN_CHANNEL_IDX.
+ (cyg_hal_plf_screen_init): Add 'chan' parameter.
+
+ * cdl/hal_i386_pcmb.cdl, include/pcmb_serial.h, src/pcmb_serial.c:
+ Remove pcmb_serial.c -- it's been superceeded by the generic 8250
+ serial diagnostics.
+
2005-04-27 David Vrabel <dvrabel@arcom.com>
* cdl/hal_i386_pcmb.cdl (CYGPKG_HAL_I386_PCMB_MEMSIZE): Moved this