Changeset d074e12 in rtems

Timestamp:

Aug 4, 1997, 10:22:59 PM (24 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

5b9ec351

Parents:

19fd334

Message:

Switched to new version of mc68681.h

File:

• c/src/lib/libbsp/m68k/idp/console/duart.c (modified) (11 diffs)

c/src/lib/libbsp/m68k/idp/console/duart.c

@@ -50 +50 @@
    */
 
-  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);
 
   /* 
@@ -93 +93 @@
      *  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);
 
     /* 
@@ -105 +105 @@
      *  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;
@@ -123 +123 @@
    * 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); 
 
   /* 
@@ -140 +140 @@
    * 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));
 
@@ -151 +151 @@
    * 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);
 
 
@@ -159 +159 @@
    * 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 
@@ -165 +165 @@
    * 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
@@ -174 +174 @@
    * 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) );
 }
@@ -244 +244 @@
    * transmit character over port A 
    */
-  MC68681_WRITE(MC68681_TRANSMIT_BUFFER_A, ch);
+  MC68681_WRITE(DUART_ADDR, MC68681_TRANSMIT_BUFFER_A, ch);
 }
 
@@ -267 +267 @@
    * transmit character over port B 
    */
-  MC68681_WRITE(MC68681_TRANSMIT_BUFFER_B, ch);
-}
+  MC68681_WRITE(DUART_ADDR, MC68681_TRANSMIT_BUFFER_B, ch);
+}