From d074e129e85a4670d806ffe68dacf527dfc2b495 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 4 Aug 1997 22:22:59 +0000 Subject: Switched to new version of mc68681.h --- c/src/lib/libbsp/m68k/idp/console/duart.c | 58 +++++++++++++++---------------- 1 file changed, 29 insertions(+), 29 deletions(-) (limited to 'c/src/lib/libbsp/m68k/idp/console/duart.c') diff --git a/c/src/lib/libbsp/m68k/idp/console/duart.c b/c/src/lib/libbsp/m68k/idp/console/duart.c index 80f8a5dae5..5d245c0efa 100644 --- a/c/src/lib/libbsp/m68k/idp/console/duart.c +++ b/c/src/lib/libbsp/m68k/idp/console/duart.c @@ -49,11 +49,11 @@ volatile void init_pit() * + disable port B receiver */ - MC68681_WRITE(MC68681_INTERRUPT_MASK_REG, 0x00); - MC68681_WRITE(MC68681_COMMAND_REG_A ,MC68681_MODE_REG_DISABLE_TX); - MC68681_WRITE(MC68681_COMMAND_REG_A, MC68681_MODE_REG_DISABLE_RX); - MC68681_WRITE(MC68681_COMMAND_REG_B, MC68681_MODE_REG_DISABLE_TX); - MC68681_WRITE(MC68681_COMMAND_REG_B, MC68681_MODE_REG_DISABLE_RX); + MC68681_WRITE(DUART_ADDR, MC68681_INTERRUPT_MASK_REG, 0x00); + MC68681_WRITE(DUART_ADDR, MC68681_COMMAND_REG_A ,MC68681_MODE_REG_DISABLE_TX); + MC68681_WRITE(DUART_ADDR, MC68681_COMMAND_REG_A, MC68681_MODE_REG_DISABLE_RX); + MC68681_WRITE(DUART_ADDR, MC68681_COMMAND_REG_B, MC68681_MODE_REG_DISABLE_TX); + MC68681_WRITE(DUART_ADDR, MC68681_COMMAND_REG_B, MC68681_MODE_REG_DISABLE_RX); /* * install ISR for ports A and B @@ -92,9 +92,9 @@ volatile void init_pit() * reset rx, channel b * reset mr pointer, ch */ - MC68681_WRITE(MC68681_COMMAND_REG_B, MC68681_MODE_REG_RESET_TX); - MC68681_WRITE(MC68681_COMMAND_REG_B, MC68681_MODE_REG_RESET_RX); - MC68681_WRITE(MC68681_COMMAND_REG_B, MC68681_MODE_REG_RESET_MR_PTR); + MC68681_WRITE(DUART_ADDR, MC68681_COMMAND_REG_B, MC68681_MODE_REG_RESET_TX); + MC68681_WRITE(DUART_ADDR, MC68681_COMMAND_REG_B, MC68681_MODE_REG_RESET_RX); + MC68681_WRITE(DUART_ADDR, MC68681_COMMAND_REG_B, MC68681_MODE_REG_RESET_MR_PTR); /* * initialize the duart registers on port a @@ -104,9 +104,9 @@ volatile void init_pit() * reset rx, channel a * reset mr pointer, ch */ - MC68681_WRITE(MC68681_COMMAND_REG_A, MC68681_MODE_REG_RESET_TX); - MC68681_WRITE(MC68681_COMMAND_REG_A, MC68681_MODE_REG_RESET_RX); - MC68681_WRITE(MC68681_COMMAND_REG_A, MC68681_MODE_REG_RESET_MR_PTR); + MC68681_WRITE(DUART_ADDR, MC68681_COMMAND_REG_A, MC68681_MODE_REG_RESET_TX); + MC68681_WRITE(DUART_ADDR, MC68681_COMMAND_REG_A, MC68681_MODE_REG_RESET_RX); + MC68681_WRITE(DUART_ADDR, MC68681_COMMAND_REG_A, MC68681_MODE_REG_RESET_MR_PTR); Pit_initialized = 1; } @@ -122,15 +122,15 @@ volatile void init_pit() * init opcr * init cts */ - MC68681_WRITE(MC68681_INTERRUPT_VECTOR_REG, + MC68681_WRITE(DUART_ADDR, MC68681_INTERRUPT_VECTOR_REG, MC68681_INTERRUPT_VECTOR_INIT); - MC68681_WRITE(MC68681_INTERRUPT_MASK_REG, + MC68681_WRITE(DUART_ADDR, MC68681_INTERRUPT_MASK_REG, MC68681_IR_RX_READY_A | MC68681_IR_RX_READY_B); - MC68681_WRITE(MC68681_AUX_CTRL_REG, MC68681_CLEAR); - MC68681_WRITE(MC68681_COUNTER_TIMER_UPPER_REG, 0x00); - MC68681_WRITE(MC68681_COUNTER_TIMER_LOWER_REG, 0x02); - MC68681_WRITE(MC68681_OUTPUT_PORT_CONFIG_REG, MC68681_CLEAR); - MC68681_WRITE(MC68681_OUTPUT_PORT_SET_REG, 0x01); + MC68681_WRITE(DUART_ADDR, MC68681_AUX_CTRL_REG, MC68681_CLEAR); + MC68681_WRITE(DUART_ADDR, MC68681_COUNTER_TIMER_UPPER_REG, 0x00); + MC68681_WRITE(DUART_ADDR, MC68681_COUNTER_TIMER_LOWER_REG, 0x02); + MC68681_WRITE(DUART_ADDR, MC68681_OUTPUT_PORT_CONFIG_REG, MC68681_CLEAR); + MC68681_WRITE(DUART_ADDR, MC68681_OUTPUT_PORT_SET_REG, 0x01); /* * init the actual serial port for port a @@ -139,18 +139,18 @@ volatile void init_pit() * Set Stop bit length of 1 * enable Transmit and receive */ - MC68681_WRITE(MC68681_CLOCK_SELECT_REG_A, MC68681_BAUD_RATE_MASK_9600); - MC68681_WRITE(MC68681_MODE_REG_1A, + MC68681_WRITE(DUART_ADDR, MC68681_CLOCK_SELECT_REG_A, MC68681_BAUD_RATE_MASK_9600); + MC68681_WRITE(DUART_ADDR, MC68681_MODE_REG_1A, (MC68681_8BIT_CHARS | MC68681_NO_PARITY)); - MC68681_WRITE(MC68681_MODE_REG_2A,MC68681_STOP_BIT_LENGTH_1); - MC68681_WRITE(MC68681_COMMAND_REG_A, + MC68681_WRITE(DUART_ADDR, MC68681_MODE_REG_2A,MC68681_STOP_BIT_LENGTH_1); + MC68681_WRITE(DUART_ADDR, MC68681_COMMAND_REG_A, (MC68681_MODE_REG_ENABLE_TX | MC68681_MODE_REG_ENABLE_RX)); /* * init the actual serial port for port b * init csrb -- 9600 baud */ - MC68681_WRITE(MC68681_CLOCK_SELECT_REG_B, MC68681_BAUD_RATE_MASK_9600); + MC68681_WRITE(DUART_ADDR, MC68681_CLOCK_SELECT_REG_B, MC68681_BAUD_RATE_MASK_9600); #define EIGHT_BITS_NO_PARITY @@ -158,13 +158,13 @@ volatile void init_pit() /* * Set 8 Bit characters with no parity */ - MC68681_WRITE(MC68681_MODE_REG_1B, + MC68681_WRITE(DUART_ADDR, MC68681_MODE_REG_1B, (MC68681_NO_PARITY | MC68681_8BIT_CHARS) ); #else /* * Set 7 Bit Characters with parity */ - MC68681_WRITE(MC68681_MODE_REG_1B, + MC68681_WRITE(DUART_ADDR, MC68681_MODE_REG_1B, (MC68681_WITH_PARITY | MC68681_7BIT_CHARS) ); #endif @@ -173,8 +173,8 @@ volatile void init_pit() * Set Stop Bit length to 1 * Disable Recieve and transmit on B */ - MC68681_WRITE(MC68681_MODE_REG_2B,MC68681_STOP_BIT_LENGTH_1); - MC68681_WRITE(MC68681_COMMAND_REG_B, + MC68681_WRITE(DUART_ADDR, MC68681_MODE_REG_2B,MC68681_STOP_BIT_LENGTH_1); + MC68681_WRITE(DUART_ADDR, MC68681_COMMAND_REG_B, (MC68681_MODE_REG_ENABLE_TX | MC68681_MODE_REG_ENABLE_RX) ); } @@ -243,7 +243,7 @@ void transmit_char(char ch) /* * transmit character over port A */ - MC68681_WRITE(MC68681_TRANSMIT_BUFFER_A, ch); + MC68681_WRITE(DUART_ADDR, MC68681_TRANSMIT_BUFFER_A, ch); } @@ -266,5 +266,5 @@ void transmit_char_portb(char ch) /* * transmit character over port B */ - MC68681_WRITE(MC68681_TRANSMIT_BUFFER_B, ch); + MC68681_WRITE(DUART_ADDR, MC68681_TRANSMIT_BUFFER_B, ch); } -- cgit v1.2.3