Changeset 12ae6d9e in rtems


Ignore:
Timestamp:
10/15/01 18:01:12 (21 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
6ce599c
Parents:
3bcc0d8
Message:

2001-10-15 Ralf Corsepius <corsepiu@…>

  • include/sh4uart.h: move to include/sh/sh4uart.h.
  • include/ispsh7750.h: move to include/rtems/score/ispsh7750.h.
  • include/iosh7750.h: move include/rtems/score/iosh7750.h.
  • include/sh7750_regs.h: move to include/rtems/score/sh7750_regs.h.
  • include/rtems/score/ipl.h: move to include/rtems/score/ipl.h.
  • include/rtems/score/sh4_regs.h: Reintroduce from Alexandra Kossovsky's original sources.
  • include/Makefile.am: reflect changes above, remove EXTRA_DIST, require automake 1.5.
  • sci/Makefile.am: Disable compilation of console.c.
  • sci/sh4uart.c: include <sh/sh4uart.h>, add SH7750_SCSMR_CHK_S, remove SH4_CPU_HZ_Frequency;
  • score/isph7750.c: Remove #if !defined(sh7750), include sh4_regs.h.
Location:
c/src/lib/libcpu/sh/sh7750
Files:
1 added
1 deleted
5 edited
4 moved

Legend:

Unmodified
Added
Removed

  • c/src/lib/libcpu/sh/sh7750/ChangeLog

    r3bcc0d8 r12ae6d9e  
     12001-10-15      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * include/sh4uart.h: move to include/sh/sh4uart.h.
     4        * include/ispsh7750.h: move to include/rtems/score/ispsh7750.h.
     5        * include/iosh7750.h: move include/rtems/score/iosh7750.h.
     6        * include/sh7750_regs.h: move to include/rtems/score/sh7750_regs.h.
     7        * include/rtems/score/ipl.h: move to include/rtems/score/ipl.h.
     8        * include/rtems/score/sh4_regs.h: Reintroduce from Alexandra
     9        Kossovsky's original sources.
     10        * include/Makefile.am: reflect changes above, remove EXTRA_DIST,
     11        require automake 1.5.
     12        * sci/Makefile.am: Disable compilation of console.c.
     13        * sci/sh4uart.c: include <sh/sh4uart.h>, add SH7750_SCSMR_CHK_S,
     14        remove SH4_CPU_HZ_Frequency;
     15        * score/isph7750.c: Remove #if !defined(sh7750), include sh4_regs.h.
     16
    1172001-10-12      Joel Sherrill <joel@OARcorp.com>
    218

  • c/src/lib/libcpu/sh/sh7750/include/Makefile.am

    r3bcc0d8 r12ae6d9e  
    33##
    44
    5 AUTOMAKE_OPTIONS = foreign 1.4
     5AUTOMAKE_OPTIONS = foreign 1.5
    66
    77# NOTE: Unlike other CPUS, we install into a subdirectory to avoid
    … …  
    1010include_rtems_scoredir = $(includedir)/rtems/score
    1111
    12 include_sh_HEADERS = sh4uart.h
    13 include_rtems_score_HEADERS = ispsh7750.h iosh7750.h
     12include_sh_HEADERS = sh/sh4uart.h
     13include_rtems_score_HEADERS = \
     14rtems/score/sh7750_regs.h \
     15rtems/score/ipl.h \
     16rtems/score/iosh7750.h \
     17rtems/score/ispsh7750.h \
     18rtems/score/sh4_regs.h
    1419
    1520$(PROJECT_INCLUDE)/sh:
    1621        $(mkinstalldirs) $@
    1722
    18 $(PROJECT_INCLUDE)/sh/%.h: %.h
     23$(PROJECT_INCLUDE)/rtems/score:
     24        $(mkinstalldirs) $@
     25
     26$(PROJECT_INCLUDE)/%.h: %.h
    1927        $(INSTALL_DATA) $< $@
    2028
    21 $(PROJECT_INCLUDE)/rtems/score/%.h: %.h
    22         $(INSTALL_DATA) $< $@
    23 
    24 TMPINSTALL_FILES = $(PROJECT_INCLUDE)/sh \
    25     $(include_sh_HEADERS:%=$(PROJECT_INCLUDE)/sh/%) \
    26     $(include_rtems_score_HEADERS:%=$(PROJECT_INCLUDE)/rtems/score/%)
     29TMPINSTALL_FILES = \
     30    $(PROJECT_INCLUDE)/sh \
     31    $(include_sh_HEADERS:%=$(PROJECT_INCLUDE)/%) \
     32    $(PROJECT_INCLUDE)/rtems/score \
     33    $(include_rtems_score_HEADERS:%=$(PROJECT_INCLUDE)/%)
    2734
    2835all-local: $(TMPINSTALL_FILES)
    2936
    30 # FIXME: What are these files here?
    31 # They should either be installed or removed
    32 EXTRA_DIST = \
    33 ipl.h \
    34 sh4uart.h \
    35 sh7750_regs.h
    36 
    3737include $(top_srcdir)/../../../../../../automake/local.am

  • c/src/lib/libcpu/sh/sh7750/include/rtems/score/iosh7750.h

    r3bcc0d8 r12ae6d9e  
    4545#define __IOSH7750_H
    4646
    47 #include "sh7750_regs.h"
     47#include <rtems/score/sh7750_regs.h>
    4848
    4949#endif

  • c/src/lib/libcpu/sh/sh7750/sci/Makefile.am

    r3bcc0d8 r12ae6d9e  
    77PGM = $(ARCH)/sci.rel
    88
    9 C_FILES = console.c sh4uart.c
     9C_FILES = sh4uart.c
    1010C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
    1111
    … …  
    2727.PRECIOUS: $(PGM)
    2828
     29## FIXME: Moved to libbsp/sh/<BSP>/console/
     30## Needs to be reworked to be usable here.
     31EXTRA_DIST = console.c
     32
    2933include $(top_srcdir)/../../../../../../automake/local.am

  • c/src/lib/libcpu/sh/sh7750/sci/sh4uart.c

    r3bcc0d8 r12ae6d9e  
    11/*
    22 * Generic UART Serial driver for SH-4 processors
    3  *
    4  * This driver uses variable SH4_CPU_HZ_Frequency,
    5  * which should be defined in bsp to HZ macro.
    63 *
    74 * Copyright (C) 2000 OKTET Ltd., St.-Petersburg, Russian Fed.
    … …  
    2320#include <termios.h>
    2421#include <rtems/libio.h>
    25 #include "sh/sh4uart.h"
     22#include <sh/sh4uart.h>
    2623
    2724#ifndef SH4_UART_INTERRUPT_LEVEL
    2825#define SH4_UART_INTERRUPT_LEVEL 4
    2926#endif
     27
     28/* FIXME: ???
     29#define SH7750_SCSMR_CKS_S SH7750_SCSMR_CKS_DIV1
     30 */
     31#define SH7750_SCSMR_CKS_S     0
    3032
    3133/* Forward function declarations */
    … …  
    8789{
    8890    rtems_unsigned16 frqcr = *(volatile rtems_unsigned16 *)SH7750_FRQCR;
    89     rtems_unsigned32 Pph = SH4_CPU_HZ_Frequency;
     91    rtems_unsigned32 Pph = rtems_cpu_configuration_get_clicks_per_second() ;
    9092
    9193    switch (frqcr & SH7750_FRQCR_IFC)

  • c/src/lib/libcpu/sh/sh7750/score/ispsh7750.c

    r3bcc0d8 r12ae6d9e  
    4242#include <rtems/score/isr.h>
    4343
    44 #if !defined (sh7750)
    45 #error Wrong CPU MODEL
    46 #endif
    47 
    4844/*
    4945 * This is a exception vector table
    … …  
    5450
    5551#include <rtems/score/ispsh7750.h>
     52#include <rtems/score/sh4_regs.h>
    5653#include <rtems/score/sh7750_regs.h>
    5754
Note: See TracChangeset for help on using the changeset viewer.