Changeset 21bfd93 in rtems for c/src/lib

Timestamp:

09/29/98 12:40:33 (25 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

f1ccfde

Parents:

766ed7c

Message:

Patch from Ralf Corsepius <corsepiu@…>:

Please find enclosed a patch which enables me to build the bare-bsp for
sh-rtems.

Changes:

1. Add preinstall to libbsp/bare/include/Makefile.in
2. Removed FORCEIT, add preinstall to libbsp/sh/gensh1/include/Makefile.in
3. Disabled support of set_vector from sh code (shared/setvec.c is still present but isn't used anymore), set_vector replaced with standard rtems functions.

Problems still present:

1. Support of spin-delays in bare bsp
2. Proper support of cpu frequency

To configure I used:

<srcdir>/configure \
--target=sh-rtems \
--prefix=<instdir>/sh-bare \
--enable-bare-cpu-model=sh7032 \
--enable-bare-cpu-cflags='-Wall -m1 -DMHZ=20
-DCPU_CONSOLE_DEVNAME="\"/dev/null\""'
--enable-rtemsbsp=bare \
--disable-networking \
--disable-cxx \
--disable-posix \
--disable-tests

IMO, if there are no objections to this patch, a similar approach should
be applied to all CPUs/BSPs (esp. hppa1.1, mips64orion, ppc403, because
they apply set_vector inside of libcpu).

Location:

c/src/lib

Files:

• libbsp/bare/include/Makefile.in (modified) (1 diff)
• libbsp/sh/gensh1/include/Makefile.in (modified) (1 diff)
• libbsp/sh/gensh1/include/bsp.h (modified) (3 diffs)
• libbsp/sh/gensh1/startup/Makefile.in (modified) (1 diff)
• libbsp/sh/shared/setvec.c (modified) (2 diffs)
• libcpu/sh/sh7032/clock/ckinit.c (modified) (2 diffs)
• libcpu/sh/sh7032/include/Makefile.in (modified) (1 diff)
• libcpu/sh/sh7032/timer/timer.c (modified) (2 diffs)

c/src/lib/libbsp/bare/include/Makefile.in

@@ -29 +29 @@
 CLOBBER_ADDITIONS +=
 
-all:    $(SRCS)
-        $(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
-        $(INSTALL) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE)
+all:    preinstall
+
+preinstall: $(SRCS)
+        @INSTALL@ $(INSTINCFLAGS) $(H_FILES) $(PROJECT_INCLUDE)

c/src/lib/libbsp/sh/gensh1/include/Makefile.in

@@ -31 +31 @@
 CLOBBER_ADDITIONS +=
 
-all:    $(SRCS)
-        $(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
-        $(INSTALL) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE)
+all:    preinstall
 
-install: all
+preinstall: $(SRCS)
+        @INSTALL@ $(INSTINCFLAGS) $(H_FILES) $(PROJECT_INCLUDE)

c/src/lib/libbsp/sh/gensh1/include/bsp.h

@@ -56 +56 @@
 #define MUST_WAIT_FOR_INTERRUPT 0
 
-#define Install_tm27_vector( handler ) set_vector( (handler), 0, 1 )
+#define Install_tm27_vector( handler ) \
+{ \
+  rtems_isr_entry ignored ; \
+  rtems_interrupt_catch( (handler), 0, &ignored ) ; \
+}
 
 #define Cause_tm27_intr()
@@ -111 +115 @@
  * FIXME: Should this go to libcpu/sh/sh7032 ?
  */
+#if 0
 /* functions */
 sh_isr_entry set_vector(                    /* returns old vector */
@@ -117 +122 @@
   int                 type                      /* RTEMS or RAW intr  */
 );
+#endif
 
 #ifdef __cplusplus

c/src/lib/libbsp/sh/gensh1/startup/Makefile.in

@@ -12 +12 @@
 
 # C source names, if any, go here -- minus the .c
-C_PIECES=bsplibc bsppost bspstart bspclean sbrk setvec main
+C_PIECES=bsplibc bsppost bspstart bspclean sbrk main
 C_FILES=$(C_PIECES:%=%.c)
 C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)

c/src/lib/libbsp/sh/shared/setvec.c

@@ -1 +1 @@
 /*  set_vector
+ *
+ *  NOTE: This function is considered OBSOLETE and may vanish soon.
+ *      Calls to set_vector should be replaced by calls to 
+ *      rtems_interrupt_catch or _CPU_ISR_install_raw_handler.
  *
  *  This routine installs an interrupt vector on the target Board/CPU.
@@ -53 +57 @@
   return previous_isr;
 }
-

c/src/lib/libcpu/sh/sh7032/clock/ckinit.c

@@ -153 +153 @@
 
   if ( BSP_Configuration.ticks_per_timeslice ) {
-    Old_ticker = (rtems_isr_entry) set_vector( Clock_isr, CLOCK_VECTOR, 1 );
+    rtems_interrupt_catch( Clock_isr, CLOCK_VECTOR, &Old_ticker );
     /*
      *  Hardware specific initialize goes here
@@ -281 +281 @@
       else if (args->command == rtems_build_name('N', 'E', 'W', ' '))
         {
+          rtems_isr_entry       ignored ;
           rtems_interrupt_disable( isrlevel );
-          (void) set_vector( args->buffer, CLOCK_VECTOR, 1 );
+          rtems_interrupt_catch( args->buffer, CLOCK_VECTOR, &ignored );
+          
           rtems_interrupt_enable( isrlevel );
         }

c/src/lib/libcpu/sh/sh7032/include/Makefile.in

@@ -27 +27 @@
         test -d $(PROJECT_INCLUDE)/sh || $(MKDIR) $(PROJECT_INCLUDE)/sh 
         $(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE)/sh
-
-all: FORCEIT
-        cd ../../../../libbsp/$(RTEMS_CPU)/$(RTEMS_BSP)/include; $(MAKE) all

c/src/lib/libcpu/sh/sh7032/timer/timer.c

@@ -63 +63 @@
 void Timer_initialize( void )
 {
-  rtems_unsigned8 temp8;
+  rtems_unsigned8  temp8;
   rtems_unsigned16 temp16;
   rtems_unsigned32 level;
-  rtems_isr* ignored;
+  rtems_isr        *ignored;
 
   /*
@@ -118 +118 @@
 
   /* initialize ISR */
-  ignored = set_vector( timerisr, ITU1_VECTOR, 0);
+  _CPU_ISR_install_raw_handler( ITU1_VECTOR, timerisr, &ignored );
   _CPU_ISR_Enable( level);