Changeset 7ae5125 in rtems

Timestamp:

08/16/01 21:08:28 (22 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

f30a0ca9

Parents:

ede9699c

Message:

2001-08-10 Radzislaw Galler <rgaller@…>

• score/cpu_asm.c (sh_set_irq_priority): Changed interrupt vector number range check and handling of interrupt priority regs to conform SH2 specs.
• sci/sci_termios.c: New file.
• include/sci_termios.h: New file.
• include/Makefile.am (EXTRA_DIST): Added sci_termios.h. (include_sh_HEADERS): Added sci_termios.h.
• score/ispsh7045.c (isp): Calling an ISR with immediate argument casued negative sign extension for vector numbers of 128 and above. This was fixed.
• sci/sci.c: Cleaned initialization of SCI registers; added necessary setup for new TERMIOS console cooperation

Location:

c/src/lib/libcpu/sh/sh7045

Files:

• ChangeLog (modified) (1 diff)
• include/Makefile.am (modified) (2 diffs)
• include/sci.h (modified) (2 diffs)
• sci/Makefile.am (modified) (2 diffs)
• sci/sci.c (modified) (10 diffs)
• score/cpu_asm.c (modified) (2 diffs)
• score/ispsh7045.c (modified) (2 diffs)

c/src/lib/libcpu/sh/sh7045/ChangeLog

@@ +1 @@
+2001-08-10  Radzislaw Galler  <rgaller@et.put.poznan.pl>
+
+        * score/cpu_asm.c (sh_set_irq_priority): Changed interrupt vector
+        number range check and handling of interrupt priority regs to
+        conform SH2 specs.
+        * sci/sci_termios.c: New file.
+        * include/sci_termios.h: New file.
+        * include/Makefile.am (EXTRA_DIST): Added sci_termios.h.
+        (include_sh_HEADERS): Added sci_termios.h.
+        * score/ispsh7045.c (isp): Calling an ISR with immediate argument
+        casued negative sign extension for vector numbers of 128 and
+        above. This was fixed.
+        * sci/sci.c: Cleaned initialization of SCI registers; added
+        necessary setup for new TERMIOS console cooperation
+
 2001-02-18      Ralf Corsepiu <corsepius@faw.uni-ulm.de>
 

c/src/lib/libcpu/sh/sh7045/include/Makefile.am

@@ -10 +10 @@
 include_rtems_scoredir = $(includedir)/rtems/score
 
-include_sh_HEADERS = io_types.h sci.h sh7_pfc.h sh7_sci.h
+include_sh_HEADERS = io_types.h sci.h sh7_pfc.h sh7_sci.h sci_termios.h
 include_rtems_score_HEADERS = ispsh7045.h iosh7045.h
 
@@ -28 +28 @@
 all-local: $(TMPINSTALL_FILES)
 
-EXTRA_DIST = io_types.h sci.h sh7_pfc.h sh7_sci.h
+EXTRA_DIST = io_types.h sci.h sh7_pfc.h sh7_sci.h sci_termios.h
 
 include $(top_srcdir)/../../../../../../automake/local.am

c/src/lib/libcpu/sh/sh7045/include/sci.h

@@ -25 +25 @@
 #ifndef _sh_sci_h
 #define _sh_sci_h
+
+#include <rtems/libio.h>
 
 #ifdef __cplusplus
@@ -78 +80 @@
   void *
 );
+    
+extern const rtems_termios_callbacks * sh_sci_get_termios_handlers( 
+  rtems_boolean poll 
+);
+    
 
 #ifdef __cplusplus

c/src/lib/libcpu/sh/sh7045/sci/Makefile.am

@@ -7 +7 @@
 PGM = $(ARCH)/sci.rel
 
-C_FILES = sci.c
+C_FILES = sci.c sci_termios.c
 C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
@@ -27 +27 @@
 .PRECIOUS: $(PGM)
 
-EXTRA_DIST = sci.c
+EXTRA_DIST = sci.c sci_termios.c
 
 include $(top_srcdir)/../../../../../../automake/local.am

c/src/lib/libcpu/sh/sh7045/sci/sci.c

@@ -42 +42 @@
 
 #include <rtems.h>
+
 
 #include <stdlib.h>
@@ -213 +214 @@
     temp = read8(SCI_SSR0) & ~SCI_RDRF;
     write8(temp, SCI_SSR0);
+    /* Check for transmission errors */
+    if(temp & (SCI_ORER | SCI_FER | SCI_PER)){
+        /* TODO: report to RTEMS transmission error */
+
+        /* clear error flags*/
+        temp &= ~(SCI_ORER | SCI_FER | SCI_PER);
+        write8(temp, SCI_SSR0);
+    }
     result = TRUE;
   }
@@ -229 +238 @@
     temp= read8(SCI_SSR1) & ~SCI_RDRF;
     write8(temp, SCI_SSR1);
+    /* Check for transmission errors */
+    if(temp & (SCI_ORER | SCI_FER | SCI_PER)){
+        /* TODO: report to RTEMS transmission error */
+
+        /* clear error flags*/
+        temp &= ~(SCI_ORER | SCI_FER | SCI_PER);
+        write8(temp, SCI_SSR1);
+    }
     result = TRUE;
-    }
+  }
   return result;
 } /* rdSCI1 */
@@ -279 +296 @@
 {
   rtems_device_driver status ;
-  rtems_device_minor_number     i;
+  rtems_device_minor_number i;
+  rtems_driver_name_t *driver = NULL;
+  
   
   /*
    * register all possible devices.
    * the initialization of the hardware is done by sci_open
+   *
+   * One of devices could be previously registered by console
+   * initialization therefore we check it everytime
    */
 
   for ( i = 0 ; i < SCI_MINOR_DEVICES ; i++ )
   {
-    status = rtems_io_register_name(
-      sci_device[i].name,
-      major,
-      sci_device[i].minor );
-    if (status != RTEMS_SUCCESSFUL)
-      rtems_fatal_error_occurred(status);
+    status = rtems_io_lookup_name(
+        sci_device[i].name,
+        &driver);
+    if( status != RTEMS_SUCCESSFUL )
+    {
+        /* OK. We assume it is not registered yet. */
+        status = rtems_io_register_name(
+            sci_device[i].name,
+            major,
+            sci_device[i].minor );
+        if (status != RTEMS_SUCCESSFUL)
+            rtems_fatal_error_occurred(status);
+    }
   }
 
@@ -305 +334 @@
  *  Open entry point
  *   Sets up port and pins for selected sci.
- *   SCI0 setup is conditional on STANDALONE_EVB == 1
  */
 
@@ -333 +361 @@
   /* set PFC registers to enable I/O pins */
 
-  if ((minor == 0) && (STANDALONE_EVB == 1)) {
+  if ((minor == 0)) {
     temp16 = read16(PFC_PACRL2);         /* disable SCK0, DMA, IRQ */
     temp16 &= ~(PA2MD1 | PA2MD0);
@@ -348 +376 @@
 
   /* set up SCI registers */
-  if ((minor != 0) || (STANDALONE_EVB == 1)) {
-    write8(0x00, sci_device[minor].addr + SCI_SCR);      /* Clear SCR */
+      write8(0x00, sci_device[minor].addr + SCI_SCR);    /* Clear SCR */
                                                    /* set SMR and BRR */
     _sci_set_cflags( &sci_device[minor], sci_device[minor].cflags );
@@ -359 +386 @@
     write8((SCI_RE | SCI_TE),              /* enable async. Tx and Rx */
            sci_device[minor].addr + SCI_SCR);
-    temp8 = read8(sci_device[minor].addr + SCI_RDR);   /* flush input */
+
+    /* clear error flags */
+    temp8 = read8(sci_device[minor].addr + SCI_SSR);
+    while(temp8 & (SCI_RDRF | SCI_ORER | SCI_FER | SCI_PER)){
+        temp8 = read8(sci_device[minor].addr + SCI_RDR);   /* flush input */
+        temp8 = read8(sci_device[minor].addr + SCI_SSR); /* clear some flags */
+        write8(temp8 & ~(SCI_RDRF | SCI_ORER | SCI_FER | SCI_PER), 
+               sci_device[minor].addr + SCI_SSR);
+        temp8 = read8(sci_device[minor].addr + SCI_SSR); /* check if everything is OK */
+    }    
     /* Clear RDRF flag */
-    temp8= read8(sci_device[minor].addr + SCI_SSR) & ~SCI_RDRF;
-    write8(temp8, sci_device[minor].addr + SCI_SSR);
     write8(0x00, sci_device[minor].addr + SCI_TDR);    /* force output */
      /* Clear the TDRE bit */
@@ -370 +404 @@
     /* add interrupt setup if required */
 
-  }
-
+  
   sci_device[minor].opened++ ;
 
@@ -472 +505 @@
   return RTEMS_SUCCESSFUL ;
 }
+
+/*
+ * Termios polled first open
+ */
+static int _sh_sci_poll_first_open(int major, int minor, void *arg)
+{
+    return sh_sci_open(major, minor, arg);
+}
+
+/*
+ * Termios general last close
+ */
+static int _sh_sci_last_close(int major, int minor, void *arg)
+{
+    return sh_sci_close(major, minor, arg);
+}
+
+/*
+ * Termios polled read
+ */
+static int _sh_sci_poll_read(int minor)
+{
+    int value = -1;
+    char ch;
+    
+    if( minor == 0 ){
+        if( rdSCI0( &ch ) )
+            value = (int) ch;
+    }else if( minor == 1 ){
+        if( rdSCI1( &ch ) )
+            value = (int) ch;
+    }
+    return value;
+}
+
+/*
+ * Termios polled write 
+ */
+static int _sh_sci_poll_write(int minor, const char *buf, int len)
+{
+    int count;
+    
+    for(count = 0; count < len; count++)
+        outbyte( minor, buf[count] );
+    return count;
+}
+
+/*
+ * Termios set attributes
+ */
+static int _sh_sci_set_attributes( int minor, const struct termios *t)
+{
+    return _sci_set_cflags( &sci_device[ minor ], t->c_cflag);
+}
+
+
+const rtems_termios_callbacks sci_poll_callbacks = {
+    _sh_sci_poll_first_open,    /* FirstOpen*/
+    _sh_sci_last_close,         /* LastClose*/
+    _sh_sci_poll_read,          /* PollRead  */
+    _sh_sci_poll_write,         /* Write */
+    _sh_sci_set_attributes,     /* setAttributes */
+    NULL,                       /* stopRemoteTX */
+    NULL,                       /* StartRemoteTX */
+    0                           /* outputUsesInterrupts */
+};
+
+/* FIXME: not yet supported */
+const rtems_termios_callbacks sci_interrupt_callbacks;
+
+const rtems_termios_callbacks* sh_sci_get_termios_handlers( rtems_boolean poll )
+{
+    return poll ?
+        &sci_poll_callbacks :
+        &sci_interrupt_callbacks;
+}

c/src/lib/libcpu/sh/sh7045/score/cpu_asm.c

@@ -82 +82 @@
    * first check for valid interrupt
    */
-  if(( irq > 113) || (_Hardware_isr_Table[irq] == _dummy_isp))
+  if(( irq > 156) || (irq < 64) || (_Hardware_isr_Table[irq] == _dummy_isp))
     return -1;
   /*
@@ -103 +103 @@
         case 1: { prioreg = INTC_IPRD; break;}
         case 2: { prioreg = INTC_IPRE; break;}
+        case 3: { prioreg = INTC_IPRF; break;}
+        case 4: { prioreg = INTC_IPRG; break;}
+        case 5: { prioreg = INTC_IPRH; break;}
         default: return -1;
         }

c/src/lib/libcpu/sh/sh7045/score/ispsh7045.c

@@ -124 +124 @@
      "    sts.l macl,@-r15 \n\t" \
      "    mov r15,r14      \n\t" \
+     "    mov.l "Str(name)"_v, r2 \n\t" \
      "    mov.l "Str(name)"_k, r1\n\t" \
      "    jsr @r1           \n\t" \
-     "    mov #"Str(number)", r4\n\t" \
+     "    mov   r2,r4      \n\t" \
      "    mov   r14,r15    \n\t" \
      "    lds.l @r15+,macl \n\t" \
@@ -144 +145 @@
      "    .align 2         \n\t" \
      #name"_k: \n\t" \
-     ".long "Str(func));
+     ".long "Str(func)"\n\t" \
+     #name"_v: \n\t" \
+     ".long "Str(number));
 
 /************************************************