From 1aa7b8beb1bfcdae63777c144424f7ad03265598 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 9 Mar 2015 16:07:36 -0500 Subject: Move contents of libcsupport/include/zilog into libbsp/shared Only a few BSPs use this and it should not have been in libcsupport. --- c/src/lib/libbsp/m68k/mvme136/Makefile.am | 4 + c/src/lib/libbsp/m68k/mvme136/preinstall.am | 9 +++ c/src/lib/libbsp/m68k/mvme147/Makefile.am | 4 + c/src/lib/libbsp/m68k/mvme147/preinstall.am | 9 +++ c/src/lib/libbsp/m68k/mvme162/Makefile.am | 4 + c/src/lib/libbsp/m68k/mvme162/preinstall.am | 9 +++ c/src/lib/libbsp/shared/include/zilog/z8036.h | 106 ++++++++++++++++++++++++++ c/src/lib/libbsp/shared/include/zilog/z8530.h | 97 +++++++++++++++++++++++ cpukit/libcsupport/Makefile.am | 7 -- cpukit/libcsupport/include/zilog/z8036.h | 106 -------------------------- cpukit/libcsupport/include/zilog/z8530.h | 97 ----------------------- cpukit/libcsupport/preinstall.am | 13 ---- 12 files changed, 242 insertions(+), 223 deletions(-) create mode 100644 c/src/lib/libbsp/shared/include/zilog/z8036.h create mode 100644 c/src/lib/libbsp/shared/include/zilog/z8530.h delete mode 100644 cpukit/libcsupport/include/zilog/z8036.h delete mode 100644 cpukit/libcsupport/include/zilog/z8530.h diff --git a/c/src/lib/libbsp/m68k/mvme136/Makefile.am b/c/src/lib/libbsp/m68k/mvme136/Makefile.am index 262e82ec03..2dbaef49dd 100644 --- a/c/src/lib/libbsp/m68k/mvme136/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme136/Makefile.am @@ -16,6 +16,10 @@ noinst_PROGRAMS = include_HEADERS += include/coverhd.h +## Zilog component header files +include_rtems_zilogdir = $(includedir)/rtems/zilog +include_rtems_zilog_HEADERS = ../../shared/include/zilog/z8036.h + noinst_LIBRARIES = libbspstart.a libbspstart_a_SOURCES = ../../m68k/shared/start/start.S project_lib_DATA = start.$(OBJEXT) diff --git a/c/src/lib/libbsp/m68k/mvme136/preinstall.am b/c/src/lib/libbsp/m68k/mvme136/preinstall.am index 647b809f2d..4f605dc981 100644 --- a/c/src/lib/libbsp/m68k/mvme136/preinstall.am +++ b/c/src/lib/libbsp/m68k/mvme136/preinstall.am @@ -57,6 +57,15 @@ $(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h +$(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp): + @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/zilog + @: > $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp) +PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp) + +$(PROJECT_INCLUDE)/rtems/zilog/z8036.h: ../../shared/include/zilog/z8036.h $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/zilog/z8036.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/zilog/z8036.h + $(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT) TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT) diff --git a/c/src/lib/libbsp/m68k/mvme147/Makefile.am b/c/src/lib/libbsp/m68k/mvme147/Makefile.am index 07cf64697b..449c683455 100644 --- a/c/src/lib/libbsp/m68k/mvme147/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147/Makefile.am @@ -16,6 +16,10 @@ noinst_PROGRAMS = include_HEADERS += include/coverhd.h +## Zilog component header files +include_rtems_zilogdir = $(includedir)/rtems/zilog +include_rtems_zilog_HEADERS = ../../shared/include/zilog/z8530.h + noinst_LIBRARIES = libbspstart.a libbspstart_a_SOURCES = ../../m68k/shared/start/start.S project_lib_DATA = start.$(OBJEXT) diff --git a/c/src/lib/libbsp/m68k/mvme147/preinstall.am b/c/src/lib/libbsp/m68k/mvme147/preinstall.am index 647b809f2d..234789e3f8 100644 --- a/c/src/lib/libbsp/m68k/mvme147/preinstall.am +++ b/c/src/lib/libbsp/m68k/mvme147/preinstall.am @@ -57,6 +57,15 @@ $(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h +$(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp): + @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/zilog + @: > $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp) +PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp) + +$(PROJECT_INCLUDE)/rtems/zilog/z8530.h: ../../shared/include/zilog/z8530.h $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/zilog/z8530.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/zilog/z8530.h + $(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT) TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT) diff --git a/c/src/lib/libbsp/m68k/mvme162/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/Makefile.am index 8770b1da72..044d361229 100644 --- a/c/src/lib/libbsp/m68k/mvme162/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme162/Makefile.am @@ -19,6 +19,10 @@ include_HEADERS += include/page_table.h nodist_include_HEADERS += $(top_srcdir)/../shared/mvme/mvme16x_hw.h +## Zilog component header files +include_rtems_zilogdir = $(includedir)/rtems/zilog +include_rtems_zilog_HEADERS = ../../shared/include/zilog/z8036.h + noinst_LIBRARIES = libbspstart.a libbspstart_a_SOURCES = ../../m68k/shared/start/start.S project_lib_DATA = start.$(OBJEXT) diff --git a/c/src/lib/libbsp/m68k/mvme162/preinstall.am b/c/src/lib/libbsp/m68k/mvme162/preinstall.am index 4681b20018..0020d0debf 100644 --- a/c/src/lib/libbsp/m68k/mvme162/preinstall.am +++ b/c/src/lib/libbsp/m68k/mvme162/preinstall.am @@ -65,6 +65,15 @@ $(PROJECT_INCLUDE)/mvme16x_hw.h: $(top_srcdir)/../shared/mvme/mvme16x_hw.h $(PRO $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mvme16x_hw.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/mvme16x_hw.h +$(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp): + @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/zilog + @: > $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp) +PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp) + +$(PROJECT_INCLUDE)/rtems/zilog/z8036.h: ../../shared/include/zilog/z8036.h $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/zilog/z8036.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/zilog/z8036.h + $(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT) TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT) diff --git a/c/src/lib/libbsp/shared/include/zilog/z8036.h b/c/src/lib/libbsp/shared/include/zilog/z8036.h new file mode 100644 index 0000000000..fea1493905 --- /dev/null +++ b/c/src/lib/libbsp/shared/include/zilog/z8036.h @@ -0,0 +1,106 @@ +/** + * @file + * + * @brief Zilog Z8036 Counter/Timer/IO Chip + * + * This include file defines information related to a Zilog Z8036 + * Counter/Timer/IO Chip. It is a memory mapped part. + * + * @note This file shares as much as possible with the include file + * for the Z8536 via z8x36.h. + */ + +/* + * COPYRIGHT (c) 1989-2011. + * On-Line Applications Research Corporation (OAR). + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rtems.org/license/LICENSE. + */ + +#ifndef _RTEMS_ZILOG_Z8036_H +#define _RTEMS_ZILOG_Z8036_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* macros */ + +#define Z8036( ptr ) ((volatile struct z8036_map *)(ptr)) + +#define Z8x36_STATE0 ( z8036 ) \ + { /*char *garbage = *(Z8036(z8036))->???; */ } + + +#define Z8x36_WRITE( z8036, reg, data ) \ + (Z8036(z8036))->reg = (data) + + +#define Z8x36_READ( z8036, reg, data ) \ + (Z8036(z8036))->reg = (data) + +/* structures */ + +struct z8036_map { +/* MAIN CONTROL REGISTERS (0x00-0x07) */ + uint8_t MASTER_INTR; /* Master Interrupt Ctl Reg */ + uint8_t MASTER_CFG; /* Master Configuration Ctl Reg */ + uint8_t PORTA_VECTOR; /* Port A - Interrupt Vector */ + uint8_t PORTB_VECTOR; /* Port B - Interrupt Vector */ + uint8_t CNT_TMR_VECTOR; /* Counter/Timer Interrupt Vector */ + uint8_t PORTC_DATA_POLARITY; /* Port C - Data Path Polarity */ + uint8_t PORTC_DIRECTION; /* Port C - Data Direction */ + uint8_t PORTC_SPECIAL_IO_CTL; /* Port C - Special IO Control */ +/* MOST OFTEN ACCESSED REGISTERS (0x08 - 0x0f) */ + uint8_t PORTA_CMD_STATUS; /* Port A - Command Status Reg */ + uint8_t PORTB_CMD_STATUS; /* Port B - Command Status Reg */ + uint8_t CT1_CMD_STATUS; /* Ctr/Timer 1 - Command Status Reg */ + uint8_t CT2_CMD_STATUS; /* Ctr/Timer 2 - Command Status Reg */ + uint8_t CT3_CMD_STATUS; /* Ctr/Timer 3 - Command Status Reg */ + uint8_t PORTA_DATA; /* Port A - Data */ + uint8_t PORTB_DATA; /* Port B - Data */ + uint8_t PORTC_DATA; /* Port C - Data */ +/* COUNTER/TIMER RELATED REGISTERS (0x10-0x1f) */ + uint8_t CT1_CUR_CNT_MSB; /* Ctr/Timer 1 - Current Count (MSB) */ + uint8_t CT1_CUR_CNT_LSB; /* Ctr/Timer 1 - Current Count (LSB) */ + uint8_t CT2_CUR_CNT_MSB; /* Ctr/Timer 2 - Current Count (MSB) */ + uint8_t CT2_CUR_CNT_LSB; /* Ctr/Timer 2 - Current Count (LSB) */ + uint8_t CT3_CUR_CNT_MSB; /* Ctr/Timer 3 - Current Count (MSB) */ + uint8_t CT3_CUR_CNT_LSB; /* Ctr/Timer 3 - Current Count (LSB) */ + uint8_t CT1_TIME_CONST_MSB; /* Ctr/Timer 1 - Time Constant (MSB) */ + uint8_t CT1_TIME_CONST_LSB; /* Ctr/Timer 1 - Time Constant (LSB) */ + uint8_t CT2_TIME_CONST_MSB; /* Ctr/Timer 2 - Time Constant (MSB) */ + uint8_t CT2_TIME_CONST_LSB; /* Ctr/Timer 2 - Time Constant (LSB) */ + uint8_t CT3_TIME_CONST_MSB; /* Ctr/Timer 3 - Time Constant (MSB) */ + uint8_t CT3_TIME_CONST_LSB; /* Ctr/Timer 3 - Time Constant (LSB) */ + uint8_t CT1_MODE_SPEC; /* Ctr/Timer 1 - Mode Specification */ + uint8_t CT2_MODE_SPEC; /* Ctr/Timer 2 - Mode Specification */ + uint8_t CT3_MODE_SPEC; /* Ctr/Timer 3 - Mode Specification */ + uint8_t CURRENT_VECTOR; /* Current Vector */ +/* PORT A SPECIFICATION REGISTERS (0x20 -0x27) */ + uint8_t PORTA_MODE; /* Port A - Mode Specification */ + uint8_t PORTA_HANDSHAKE; /* Port A - Handshake Specification */ + uint8_t PORTA_DATA_POLARITY; /* Port A - Data Path Polarity */ + uint8_t PORTA_DIRECTION; /* Port A - Data Direction */ + uint8_t PORTA_SPECIAL_IO_CTL; /* Port A - Special IO Control */ + uint8_t PORTA_PATT_POLARITY; /* Port A - Pattern Polarity */ + uint8_t PORTA_PATT_TRANS; /* Port A - Pattern Transition */ + uint8_t PORTA_PATT_MASK; /* Port A - Pattern Mask */ +/* PORT B SPECIFICATION REGISTERS (0x28-0x2f) */ + uint8_t PORTB_MODE; /* Port B - Mode Specification */ + uint8_t PORTB_HANDSHAKE; /* Port B - Handshake Specification */ + uint8_t PORTB_DATA_POLARITY; /* Port B - Data Path Polarity */ + uint8_t PORTB_DIRECTION; /* Port B - Data Direction */ + uint8_t PORTB_SPECIAL_IO_CTL; /* Port B - Special IO Control */ + uint8_t PORTB_PATT_POLARITY; /* Port B - Pattern Polarity */ + uint8_t PORTB_PATT_TRANS; /* Port B - Pattern Transition */ + uint8_t PORTB_PATT_MASK; /* Port B - Pattern Mask */ +}; + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/c/src/lib/libbsp/shared/include/zilog/z8530.h b/c/src/lib/libbsp/shared/include/zilog/z8530.h new file mode 100644 index 0000000000..161b9a022c --- /dev/null +++ b/c/src/lib/libbsp/shared/include/zilog/z8530.h @@ -0,0 +1,97 @@ +/** + * @file + * + * @brief Information Related to a Zilog Z8530 SCC Chip + * + * This include file defines information related to a Zilog Z8530 + * SCC Chip. It is a IO mapped part. + */ + +/* + * COPYRIGHT (c) 1989-2011. + * On-Line Applications Research Corporation (OAR). + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rtems.org/license/LICENSE. + */ + +#ifndef _RTEMS_ZILOG_Z8530_H +#define _RTEMS_ZILOG_Z8530_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* macros */ + +#define VOL8( ptr ) ((volatile uint8_t *)(ptr)) + +#define Z8x30_STATE0 ( z8530 ) \ + { char *garbage; \ + (garbage) = *(VOL8(z8530)) \ + } + +#define Z8x30_WRITE_CONTROL( z8530, reg, data ) \ + *(VOL8(z8530)) = (reg); \ + *(VOL8(z8530)) = (data) + +#define Z8x30_READ_CONTROL( z8530, reg, data ) \ + *(VOL8(z8530)) = (reg); \ + (data) = *(VOL8(z8530)) + +#define Z8x30_WRITE_DATA( z8530, data ) \ + *(VOL8(z8530)) = (data); + +#define Z8x30_READ_DATA( z8530, data ) \ + (data) = *(VOL8(z8530)); + + +/* RR_0 Bit Definitions */ + +#define RR_0_TX_BUFFER_EMPTY 0x04 +#define RR_0_RX_DATA_AVAILABLE 0x01 + +/* read registers */ + +#define RR_0 0x00 +#define RR_1 0x01 +#define RR_2 0x02 +#define RR_3 0x03 +#define RR_4 0x04 +#define RR_5 0x05 +#define RR_6 0x06 +#define RR_7 0x07 +#define RR_8 0x08 +#define RR_9 0x09 +#define RR_10 0x0A +#define RR_11 0x0B +#define RR_12 0x0C +#define RR_13 0x0D +#define RR_14 0x0E +#define RR_15 0x0F + +/* write registers */ + +#define WR_0 0x00 +#define WR_1 0x01 +#define WR_2 0x02 +#define WR_3 0x03 +#define WR_4 0x04 +#define WR_5 0x05 +#define WR_6 0x06 +#define WR_7 0x07 +#define WR_8 0x08 +#define WR_9 0x09 +#define WR_10 0x0A +#define WR_11 0x0B +#define WR_12 0x0C +#define WR_13 0x0D +#define WR_14 0x0E +#define WR_15 0x0F + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/cpukit/libcsupport/Makefile.am b/cpukit/libcsupport/Makefile.am index ec9bee6c50..7474079067 100644 --- a/cpukit/libcsupport/Makefile.am +++ b/cpukit/libcsupport/Makefile.am @@ -26,13 +26,6 @@ include_rtems_HEADERS += include/rtems/malloc.h include_rtems_HEADERS += include/rtems/termiostypes.h include_rtems_HEADERS += include/rtems/gxx_wrappers.h -## zilog - -include_rtems_zilogdir = $(includedir)/rtems/zilog - -include_rtems_zilog_HEADERS = include/zilog/z8036.h -include_rtems_zilog_HEADERS += include/zilog/z8530.h - ## General stuff ERROR_C_FILES = src/error.c src/__assert.c diff --git a/cpukit/libcsupport/include/zilog/z8036.h b/cpukit/libcsupport/include/zilog/z8036.h deleted file mode 100644 index fea1493905..0000000000 --- a/cpukit/libcsupport/include/zilog/z8036.h +++ /dev/null @@ -1,106 +0,0 @@ -/** - * @file - * - * @brief Zilog Z8036 Counter/Timer/IO Chip - * - * This include file defines information related to a Zilog Z8036 - * Counter/Timer/IO Chip. It is a memory mapped part. - * - * @note This file shares as much as possible with the include file - * for the Z8536 via z8x36.h. - */ - -/* - * COPYRIGHT (c) 1989-2011. - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.org/license/LICENSE. - */ - -#ifndef _RTEMS_ZILOG_Z8036_H -#define _RTEMS_ZILOG_Z8036_H - -#ifdef __cplusplus -extern "C" { -#endif - -/* macros */ - -#define Z8036( ptr ) ((volatile struct z8036_map *)(ptr)) - -#define Z8x36_STATE0 ( z8036 ) \ - { /*char *garbage = *(Z8036(z8036))->???; */ } - - -#define Z8x36_WRITE( z8036, reg, data ) \ - (Z8036(z8036))->reg = (data) - - -#define Z8x36_READ( z8036, reg, data ) \ - (Z8036(z8036))->reg = (data) - -/* structures */ - -struct z8036_map { -/* MAIN CONTROL REGISTERS (0x00-0x07) */ - uint8_t MASTER_INTR; /* Master Interrupt Ctl Reg */ - uint8_t MASTER_CFG; /* Master Configuration Ctl Reg */ - uint8_t PORTA_VECTOR; /* Port A - Interrupt Vector */ - uint8_t PORTB_VECTOR; /* Port B - Interrupt Vector */ - uint8_t CNT_TMR_VECTOR; /* Counter/Timer Interrupt Vector */ - uint8_t PORTC_DATA_POLARITY; /* Port C - Data Path Polarity */ - uint8_t PORTC_DIRECTION; /* Port C - Data Direction */ - uint8_t PORTC_SPECIAL_IO_CTL; /* Port C - Special IO Control */ -/* MOST OFTEN ACCESSED REGISTERS (0x08 - 0x0f) */ - uint8_t PORTA_CMD_STATUS; /* Port A - Command Status Reg */ - uint8_t PORTB_CMD_STATUS; /* Port B - Command Status Reg */ - uint8_t CT1_CMD_STATUS; /* Ctr/Timer 1 - Command Status Reg */ - uint8_t CT2_CMD_STATUS; /* Ctr/Timer 2 - Command Status Reg */ - uint8_t CT3_CMD_STATUS; /* Ctr/Timer 3 - Command Status Reg */ - uint8_t PORTA_DATA; /* Port A - Data */ - uint8_t PORTB_DATA; /* Port B - Data */ - uint8_t PORTC_DATA; /* Port C - Data */ -/* COUNTER/TIMER RELATED REGISTERS (0x10-0x1f) */ - uint8_t CT1_CUR_CNT_MSB; /* Ctr/Timer 1 - Current Count (MSB) */ - uint8_t CT1_CUR_CNT_LSB; /* Ctr/Timer 1 - Current Count (LSB) */ - uint8_t CT2_CUR_CNT_MSB; /* Ctr/Timer 2 - Current Count (MSB) */ - uint8_t CT2_CUR_CNT_LSB; /* Ctr/Timer 2 - Current Count (LSB) */ - uint8_t CT3_CUR_CNT_MSB; /* Ctr/Timer 3 - Current Count (MSB) */ - uint8_t CT3_CUR_CNT_LSB; /* Ctr/Timer 3 - Current Count (LSB) */ - uint8_t CT1_TIME_CONST_MSB; /* Ctr/Timer 1 - Time Constant (MSB) */ - uint8_t CT1_TIME_CONST_LSB; /* Ctr/Timer 1 - Time Constant (LSB) */ - uint8_t CT2_TIME_CONST_MSB; /* Ctr/Timer 2 - Time Constant (MSB) */ - uint8_t CT2_TIME_CONST_LSB; /* Ctr/Timer 2 - Time Constant (LSB) */ - uint8_t CT3_TIME_CONST_MSB; /* Ctr/Timer 3 - Time Constant (MSB) */ - uint8_t CT3_TIME_CONST_LSB; /* Ctr/Timer 3 - Time Constant (LSB) */ - uint8_t CT1_MODE_SPEC; /* Ctr/Timer 1 - Mode Specification */ - uint8_t CT2_MODE_SPEC; /* Ctr/Timer 2 - Mode Specification */ - uint8_t CT3_MODE_SPEC; /* Ctr/Timer 3 - Mode Specification */ - uint8_t CURRENT_VECTOR; /* Current Vector */ -/* PORT A SPECIFICATION REGISTERS (0x20 -0x27) */ - uint8_t PORTA_MODE; /* Port A - Mode Specification */ - uint8_t PORTA_HANDSHAKE; /* Port A - Handshake Specification */ - uint8_t PORTA_DATA_POLARITY; /* Port A - Data Path Polarity */ - uint8_t PORTA_DIRECTION; /* Port A - Data Direction */ - uint8_t PORTA_SPECIAL_IO_CTL; /* Port A - Special IO Control */ - uint8_t PORTA_PATT_POLARITY; /* Port A - Pattern Polarity */ - uint8_t PORTA_PATT_TRANS; /* Port A - Pattern Transition */ - uint8_t PORTA_PATT_MASK; /* Port A - Pattern Mask */ -/* PORT B SPECIFICATION REGISTERS (0x28-0x2f) */ - uint8_t PORTB_MODE; /* Port B - Mode Specification */ - uint8_t PORTB_HANDSHAKE; /* Port B - Handshake Specification */ - uint8_t PORTB_DATA_POLARITY; /* Port B - Data Path Polarity */ - uint8_t PORTB_DIRECTION; /* Port B - Data Direction */ - uint8_t PORTB_SPECIAL_IO_CTL; /* Port B - Special IO Control */ - uint8_t PORTB_PATT_POLARITY; /* Port B - Pattern Polarity */ - uint8_t PORTB_PATT_TRANS; /* Port B - Pattern Transition */ - uint8_t PORTB_PATT_MASK; /* Port B - Pattern Mask */ -}; - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/cpukit/libcsupport/include/zilog/z8530.h b/cpukit/libcsupport/include/zilog/z8530.h deleted file mode 100644 index 161b9a022c..0000000000 --- a/cpukit/libcsupport/include/zilog/z8530.h +++ /dev/null @@ -1,97 +0,0 @@ -/** - * @file - * - * @brief Information Related to a Zilog Z8530 SCC Chip - * - * This include file defines information related to a Zilog Z8530 - * SCC Chip. It is a IO mapped part. - */ - -/* - * COPYRIGHT (c) 1989-2011. - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.org/license/LICENSE. - */ - -#ifndef _RTEMS_ZILOG_Z8530_H -#define _RTEMS_ZILOG_Z8530_H - -#ifdef __cplusplus -extern "C" { -#endif - -/* macros */ - -#define VOL8( ptr ) ((volatile uint8_t *)(ptr)) - -#define Z8x30_STATE0 ( z8530 ) \ - { char *garbage; \ - (garbage) = *(VOL8(z8530)) \ - } - -#define Z8x30_WRITE_CONTROL( z8530, reg, data ) \ - *(VOL8(z8530)) = (reg); \ - *(VOL8(z8530)) = (data) - -#define Z8x30_READ_CONTROL( z8530, reg, data ) \ - *(VOL8(z8530)) = (reg); \ - (data) = *(VOL8(z8530)) - -#define Z8x30_WRITE_DATA( z8530, data ) \ - *(VOL8(z8530)) = (data); - -#define Z8x30_READ_DATA( z8530, data ) \ - (data) = *(VOL8(z8530)); - - -/* RR_0 Bit Definitions */ - -#define RR_0_TX_BUFFER_EMPTY 0x04 -#define RR_0_RX_DATA_AVAILABLE 0x01 - -/* read registers */ - -#define RR_0 0x00 -#define RR_1 0x01 -#define RR_2 0x02 -#define RR_3 0x03 -#define RR_4 0x04 -#define RR_5 0x05 -#define RR_6 0x06 -#define RR_7 0x07 -#define RR_8 0x08 -#define RR_9 0x09 -#define RR_10 0x0A -#define RR_11 0x0B -#define RR_12 0x0C -#define RR_13 0x0D -#define RR_14 0x0E -#define RR_15 0x0F - -/* write registers */ - -#define WR_0 0x00 -#define WR_1 0x01 -#define WR_2 0x02 -#define WR_3 0x03 -#define WR_4 0x04 -#define WR_5 0x05 -#define WR_6 0x06 -#define WR_7 0x07 -#define WR_8 0x08 -#define WR_9 0x09 -#define WR_10 0x0A -#define WR_11 0x0B -#define WR_12 0x0C -#define WR_13 0x0D -#define WR_14 0x0E -#define WR_15 0x0F - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/cpukit/libcsupport/preinstall.am b/cpukit/libcsupport/preinstall.am index a74203fd1a..211a246738 100644 --- a/cpukit/libcsupport/preinstall.am +++ b/cpukit/libcsupport/preinstall.am @@ -90,16 +90,3 @@ $(PROJECT_INCLUDE)/rtems/gxx_wrappers.h: include/rtems/gxx_wrappers.h $(PROJECT_ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/gxx_wrappers.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/gxx_wrappers.h -$(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/zilog - @: > $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp) - -$(PROJECT_INCLUDE)/rtems/zilog/z8036.h: include/zilog/z8036.h $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/zilog/z8036.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/zilog/z8036.h - -$(PROJECT_INCLUDE)/rtems/zilog/z8530.h: include/zilog/z8530.h $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/zilog/z8530.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/zilog/z8530.h - -- cgit v1.2.3