Changeset 4a238002 in rtems for c/src/lib/libbsp/sh

Timestamp:

11/18/99 21:22:58 (24 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

97c465c

Parents:

5503d75

Message:

Patch from "John M. Mills" <jmills@…> with subsequent cleanup from
Ralf Corsepius <corsepiu@…> that adds initial Hitachi SH-2
support to RTEMS. Ralf's comments are:

Changes:
------

1. SH-Port:

• Many files renamed.
• CONSOLE_DEVNAME and MHZ defines removed from libcpu.
• console.c moved to libbsp/sh/shared, build in libbsp/sh/<BSP>/console applying VPATH.
• CONSOLE_DEVNAME made BSP-specific, replacement is defined in bsp.h
• MHZ define replaced with HZ (extendent resolution) in custom/*.cfg
• -DHZ=HZ used in bspstart.c, only
• Makefile variable HZ used in bsp-dependent directories only.

2. SH1-Port

• clock-driver rewritten to provide better resolution for odd CPU frequencies. This driver is only partially tested on hardware, ie. sightly experimental, but I don't expect severe problems with it.
• Polling SCI-driver added. This driver is experimental and completly untested yet. Therefore it is not yet used for the console (/dev/console is still pointing to /dev/null, cf. gensh1/bsp.h).
• minor changes to the timer driver
• SH1 specific delay()/CPU_delay() now is implemented as a function

3. SH2-Port

• Merged
• IMO, the code is still in its infancy. Therefore I have interspersed comments (FIXME) it for items which I think John should look after.
• sci and console drivers partially rewritten and extended (John, I hope you don't mind).
• Copyright notices are not yet adapted

Location:

c/src/lib/libbsp/sh

Files:

• gensh1/Makefile.in (modified) (1 diff)
• gensh1/README (modified) (1 diff)
• gensh1/include/bsp.h (modified) (4 diffs)
• gensh1/scitab/Makefile.in (modified) (1 diff)
• gensh1/startup/bspstart.c (modified) (1 diff)
• gensh1/wrapup/Makefile.in (modified) (2 diffs)
• gensh2/Makefile.in (added)
• gensh2/README (added)
• gensh2/bsp_specs (added)
• gensh2/console/Makefile.in (moved) (moved from c/src/lib/libcpu/sh/sh7032/console/Makefile.in) (3 diffs)
• gensh2/include/Makefile.in (added)
• gensh2/include/bsp.h (added)
• gensh2/include/coverhd.h (added)
• gensh2/scitab/Makefile.in (added)
• gensh2/start/Makefile.in (added)
• gensh2/start/start.S (added)
• gensh2/start/start.ram (added)
• gensh2/start/start.rom (added)
• gensh2/startup/Makefile.in (added)
• gensh2/startup/bspclean.c (added)
• gensh2/startup/bspstart.c (added)
• gensh2/startup/hw_init.c (added)
• gensh2/startup/linkcmds (added)
• gensh2/startup/linkcmds.ram (added)
• gensh2/startup/linkcmds.rom (added)
• gensh2/wrapup/Makefile.in (added)

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

@@ -21 +21 @@
 # wrapup is the one that actually builds and installs the library
 #  from the individual .rel files built in other directories
-SUB_DIRS = include start startup scitab wrapup
+SUB_DIRS = include start startup scitab console wrapup
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

c/src/lib/libbsp/sh/gensh1/README

@@ -46 +46 @@
 =====
 
-(1) Only stub console driver available at the moment.
-    Driver for the on-chip serial devices (sci) will be available soon.
+(1) The stub console driver (null) is enabled by default.
 
+(2) The driver for the on-chip serial devices (sci) is still in its infancy
+    and not fully tested. It may even be non-functional and therefore is
+    disabled by default. Please let us know any problems you encounter with
+    it.
+    To activate it edit libbsp/sh/gensh1/include/bsp.h

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

@@ -31 +31 @@
 #endif
 
-#define CPU_CONSOLE_DEVNAME "/dev/null"
-
-
 #include <rtems.h>
 #include <clockdrv.h>
+#include <console.h>
+
+/* EDIT: To activate the sci driver, change the define below */
+#if 1
 #include <sh/null.h>
-#include <console.h>
+#define BSP_CONSOLE_DEVNAME "/dev/null"
+#define BSP_CONSOLE_DRIVER_TABLE_ENTRY DEVNULL_DRIVER_TABLE_ENTRY
+#else
+#include <sh/sci.h>
+#define BSP_CONSOLE_DEVNAME "/dev/sci0"
+#define BSP_CONSOLE_DRIVER_TABLE_ENTRY DEVSCI_DRIVER_TABLE_ENTRY
+#endif
+
 
 /*
@@ -69 +77 @@
 
 /* Constants */
-#ifndef MHZ
-#error Missing MHZ
-#endif
 
 /*
  *  Simple spin delay in microsecond units for device drivers.
  *  This is very dependent on the clock speed of the target.
- *
- *  Since we don't have a real time clock, this is a very rough
- *  approximation, assuming that each cycle of the delay loop takes
- *  approx. 4 machine cycles.
- *
- *  e.g.: MHZ = 20 =>     5e-8 secs per instruction
- *                 => 4 * 5e-8 secs per delay loop
  */
 
-#define delay( microseconds ) \
-{ register unsigned int _delay = (microseconds) * (MHZ / 4 ); \
-  asm volatile ( \
-"0:     add  #-1,%0\n \
-        nop\n \
-        cmp/pl %0\n \
-        bt 0b\
-        nop" \
-    :: "r" (_delay) );  \
-}
-
-/*
- * For backward compatibility only.
- * Do not rely on them being present in future
- */
-#define CPU_delay( microseconds ) delay( microseconds )
-#define sh_delay( microseconds ) delay( microseconds )
+#define delay( microseconds ) CPU_delay(microseconds)
+#define sh_delay( microseconds ) CPU_delay(microseconds)
 
 /*
@@ -129 +112 @@
  * We redefine CONSOLE_DRIVER_TABLE_ENTRY to redirect /dev/console
  */
-#if defined(CONSOLE_DRIVER_TABLE_ENTRY)
-#warning Overwriting CONSOLE_DRIVER_TABLE_ENTRY
 #undef CONSOLE_DRIVER_TABLE_ENTRY
-#endif
-
 #define CONSOLE_DRIVER_TABLE_ENTRY \
-  DEVNULL_DRIVER_TABLE_ENTRY, \
+  BSP_CONSOLE_DRIVER_TABLE_ENTRY, \
   { console_initialize, console_open, console_close, \
       console_read, console_write, console_control }
@@ -143 +122 @@
  */
 
-/*
- * FIXME: Should this go to libcpu/sh/sh7032 ?
- */
-#if 0
-/* functions */
-sh_isr_entry set_vector(                    /* returns old vector */
-  rtems_isr_entry     handler,                  /* isr routine        */
-  rtems_vector_number vector,                   /* vector number      */
-  int                 type                      /* RTEMS or RAW intr  */
-);
-#endif
-
 #ifdef __cplusplus
 }

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

@@ -65 +65 @@
 
 scitab.c: $(SHGEN)
-        $(SHGEN) -M $(MHZ) sci > $@
+        $(SHGEN) -H $(HZ) sci > $@
 
 # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile

c/src/lib/libbsp/sh/gensh1/startup/bspstart.c

@@ -127 +127 @@
   Cpu_table.pretasking_hook = bsp_pretasking_hook;  /* init libc, etc. */
   Cpu_table.postdriver_hook = bsp_postdriver_hook;
-
+  
 #if ( CPU_ALLOCATE_INTERRUPT_STACK == TRUE )
   Cpu_table.interrupt_stack_size = 4096;
 #endif
-
+  Cpu_table.clicks_per_second = HZ ;
 }

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

@@ -16 +16 @@
 VPATH = @srcdir@
 
-BSP_PIECES = startup scitab
+BSP_PIECES = startup scitab console
 GENERIC_PIECES =
 
 # pieces to pick up out of libcpu/sh
-CPU_PIECES = sh7032/null sh7032/clock sh7032/console sh7032/timer
+CPU_PIECES = sh7032/null sh7032/clock sh7032/timer sh7032/sci sh7032/delay
 
 # bummer; have to use $foreach since % pattern subst rules only replace 1x
@@ -62 +62 @@
         $(make-library)
 
-all: ${ARCH} $(SRCS) $(LIB)
-        $(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib
+$(PROJECT_RELEASE)/lib/libbsp$(LIBSUFFIX_VA): $(LIB)
+        $(INSTALL_DATA) $^ $@
+
+all: ${ARCH} $(SRCS) $(PROJECT_RELEASE)/lib/libbsp$(LIBSUFFIX_VA)
 
 install: all

c/src/lib/libbsp/sh/gensh2/console/Makefile.in

@@ -1 @@
-#
-#  $Id$
-#
+##
+##  $Id$
+##
 
 @SET_MAKE@
@@ -7 +7 @@
 top_srcdir = @top_srcdir@
 top_builddir = ../../..
-subdir = sh/sh7032/console
+subdir = sh/gensh2/console
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
 
-VPATH = @srcdir@
+VPATH = @srcdir@:@top_srcdir@/sh/shared
 
 PGM = ${ARCH}/console.rel
@@ -64 +64 @@
 
 # the .rel file built here will be put into libbsp.a by 
-#       libbsp/sh/BSP/wrapup/Makefile
+#       ../wrapup/Makefile
 install: all