Changeset 150

Timestamp:

Jan 11, 2016, 11:44:56 AM (7 years ago)

Author:

mmatsu

Message:

カーネル 1.9.2 に追従，シリアルポートＩＤの１と２を入れ替え

Location:

asp_fm/asp/target/cqfrkfm3_gcc

Files:

• Makefile.target (modified) (1 diff)
• fm3_mb9bxxx.h (modified) (1 diff)
• target_serial.c (modified) (6 diffs)
• target_serial.h (modified) (1 diff)
• target_sil.h (modified) (1 diff)
• target_stddef.h (modified) (2 diffs)
• target_syssvc.h (modified) (1 diff)

asp_fm/asp/target/cqfrkfm3_gcc/Makefile.target

@@ -16 +16 @@
 
 #
+#  ƒRƒAƒ^ƒCƒv
+#
+CORE_TYPE = CORTEX_M3
+
+#
 #  ƒRƒ“ƒpƒCƒ‹ƒIƒvƒVƒ‡ƒ“
 #
 INCLUDES := $(INCLUDES) -I$(TARGETDIR)
+CDEFS := $(CDEFS)
 COPTS := $(COPTS) -mlittle-endian -mcpu=cortex-m3
 LDFLAGS := $(LDFLAGS) -mlittle-endian
+CFG1_OUT_LDFLAGS := -nostdlib $(CFG1_OUT_LDFLAGS)
 LIBS := $(LIBS)
 

asp_fm/asp/target/cqfrkfm3_gcc/fm3_mb9bxxx.h

@@ -63 +63 @@
  */
 #define TMAX_INTNO   (16 + 47)
-
-/*
- *  Š„ž‚Ý—Dæ“x‚̃rƒbƒg•
- */
-#define TBITW_IPRI     4
 
 /*

asp_fm/asp/target/cqfrkfm3_gcc/target_serial.c

@@ -84 +84 @@
         INTNO    intno_rx;
         INTNO    intno_tx;
+        uint16_t bps_setting;   /* ƒ{[ƒŒ[ƒg‚̐ݒè’l */
 } SIOPINIB;
 
@@ -115 +116 @@
  */
 const SIOPINIB siopinib_table[TNUM_SIOP] = {
-        {(uint32_t)FM3_MFS0_UART_BASE, (INTNO)IRQ_VECTOR_MFS0RX, (INTNO)IRQ_VECTOR_MFS0TX},
-        {(uint32_t)FM3_MFS4_UART_BASE, (INTNO)IRQ_VECTOR_MFS4RX, (INTNO)IRQ_VECTOR_MFS4TX},
-        {(uint32_t)FM3_MFS3_UART_BASE, (INTNO)IRQ_VECTOR_MFS3RX, (INTNO)IRQ_VECTOR_MFS3TX},
+        {(uint32_t)FM3_MFS4_UART_BASE, (INTNO)IRQ_VECTOR_MFS4RX, (INTNO)IRQ_VECTOR_MFS4TX, MFS4_BPS_SETTING},
+        {(uint32_t)FM3_MFS0_UART_BASE, (INTNO)IRQ_VECTOR_MFS0RX, (INTNO)IRQ_VECTOR_MFS0TX, MFS0_BPS_SETTING},
+        {(uint32_t)FM3_MFS3_UART_BASE, (INTNO)IRQ_VECTOR_MFS3RX, (INTNO)IRQ_VECTOR_MFS3TX, MFS3_BPS_SETTING},
 };
 
@@ -124 +125 @@
  */
 const GPIOINIB gpioinib_table[TNUM_SIOP] = {
+        {(uint32_t)FM3_GPIO_PFR0, (uint32_t)((1 << 5) | (1 << 6)), (uint32_t)FM3_GPIO_PCR0, (uint32_t)(1<<5), (uint32_t)FM3_GPIO_EPFR08, (uint32_t)~0x000000f0, (uint32_t)0x000000f0, (uint32_t)FM3_GPIO_ADE, (uint32_t)0},
         {(uint32_t)FM3_GPIO_PFR2, (uint32_t)((1 << 1) | (1 << 2)), (uint32_t)FM3_GPIO_PCR2, (uint32_t)(1<<1), (uint32_t)FM3_GPIO_EPFR07, (uint32_t)~0x000000f0, (uint32_t)0x00000050, (uint32_t)FM3_GPIO_ADE, (uint32_t)(1 << 31)},
-        {(uint32_t)FM3_GPIO_PFR0, (uint32_t)((1 << 5) | (1 << 6)), (uint32_t)FM3_GPIO_PCR0, (uint32_t)(1<<5), (uint32_t)FM3_GPIO_EPFR08, (uint32_t)~0x000000f0, (uint32_t)0x000000f0, (uint32_t)FM3_GPIO_ADE, (uint32_t)0},
         {(uint32_t)FM3_GPIO_PFR4, (uint32_t)((1 << 8) | (1 << 9)), (uint32_t)FM3_GPIO_PCR4, (uint32_t)(1<<8), (uint32_t)FM3_GPIO_EPFR07, (uint32_t)~0x03c00000, (uint32_t)0x03c00000, (uint32_t)FM3_GPIO_ADE, (uint32_t)0},
 };
@@ -195 +196 @@
         sil_wrb_mem((uint8_t *)UART_SCR(base), 0);
         sil_wrb_mem((uint8_t *)UART_SMR(base), SMR_MD_UART | SMR_SOE);
-        sil_wrh_mem((uint16_t *)UART_BGR(base), (uint16_t)(((SysFrePCLK2 + ((uint32_t)BPS_SETTING / 2)) / (uint32_t)BPS_SETTING) - 1));
+        sil_wrh_mem((uint16_t *)UART_BGR(base), p_siopinib->bps_setting);
         sil_wrb_mem((uint8_t *)UART_ESCR(base), ESCR_DATABITS_8);
         sil_wrb_mem((uint8_t *)UART_SCR(base), SCR_RXE | SCR_TXE);
@@ -362 +363 @@
 void target_uart_init(ID siopid)
 {
+        const SIOPINIB  *p_siopinib = &siopinib_table[INDEX_PORT(siopid)];
         const GPIOINIB  *p_gpioinib = &gpioinib_table[INDEX_PORT(siopid)];
 
@@ -373 +375 @@
         sil_wrb_mem((uint8_t *)UART_SCR(base), 0);
         sil_wrb_mem((uint8_t *)UART_SMR(base), SMR_MD_UART | SMR_SOE);
-        sil_wrh_mem((uint16_t *)UART_BGR(base), (uint16_t)(((SysFrePCLK2 + ((uint32_t)BPS_SETTING / 2)) / (uint32_t)BPS_SETTING) - 1));
+        sil_wrh_mem((uint16_t *)UART_BGR(base), p_siopinib->bps_setting);
         sil_wrb_mem((uint8_t *)UART_ESCR(base), ESCR_DATABITS_8);
         sil_wrb_mem((uint8_t *)UART_SCR(base), SCR_TXE);

asp_fm/asp/target/cqfrkfm3_gcc/target_serial.h

@@ -53 +53 @@
  */
 #if (SIO_PORTID == 1)
-#define INHNO_SIO_RX    IRQ_VECTOR_MFS0RX
-#define INHNO_SIO_TX    IRQ_VECTOR_MFS0TX
+#define INTNO_SIO_RX    IRQ_VECTOR_MFS4RX
+#define INTNO_SIO_TX    IRQ_VECTOR_MFS4TX
+#elif (SIO_PORTID == 2)
 #define INTNO_SIO_RX    IRQ_VECTOR_MFS0RX
 #define INTNO_SIO_TX    IRQ_VECTOR_MFS0TX
-#elif (SIO_PORTID == 2)
-#define INHNO_SIO_RX    IRQ_VECTOR_MFS4RX
-#define INHNO_SIO_TX    IRQ_VECTOR_MFS4TX
-#define INTNO_SIO_RX    IRQ_VECTOR_MFS4RX
-#define INTNO_SIO_TX    IRQ_VECTOR_MFS4TX
 #elif (SIO_PORTID == 3)
-#define INHNO_SIO_RX    IRQ_VECTOR_MFS3RX
-#define INHNO_SIO_TX    IRQ_VECTOR_MFS3TX
 #define INTNO_SIO_RX    IRQ_VECTOR_MFS3RX
 #define INTNO_SIO_TX    IRQ_VECTOR_MFS3TX

asp_fm/asp/target/cqfrkfm3_gcc/target_sil.h

@@ -59 +59 @@
 
 /*
+ *  Š„ž‚Ý—Dæ“x‚̃rƒbƒg•
+ */
+#define TBITW_IPRI     4
+
+/*
  *  ƒRƒAˆË‘¶‚Å‹¤’Ê‚È’è‹`
  */

asp_fm/asp/target/cqfrkfm3_gcc/target_stddef.h

@@ -56 +56 @@
  *  ƒ^[ƒQƒbƒg‚ðŽ¯•Ê‚·‚邽‚߂̃}ƒNƒ‚Ì’è‹`
  */
-#define TOPPERS_CQ_FRK_FM3                              /* ƒVƒXƒeƒ€—ªÌ */
+#define TOPPERS_CQFRKFM3                                /* ƒVƒXƒeƒ€—ªÌ */
 
 /*
@@ -64 +64 @@
  *  ƒ}ƒNƒ’è‹`‚ðíœ‚µCstdint.h‚ðƒCƒ“ƒNƒ‹[ƒh‚·‚ê‚΂悢D
  */
+#if 0
 #define TOPPERS_STDINT_TYPE1
+#else
+#ifndef TOPPERS_MACRO_ONLY
+#include <stdint.h>
+#endif /* TOPPERS_MACRO_ONLY */
+#endif
 #define TOPPERS_STDFLOAT_TYPE1
 #include "gcc/tool_stddef.h"

asp_fm/asp/target/cqfrkfm3_gcc/target_syssvc.h

@@ -90 +90 @@
  *  ƒ{[ƒŒ[ƒg
  */
+#ifndef BPS_SETTING
 #define BPS_SETTING             (115200)
+#endif
+#ifndef BPS_SETTING_SIO1
+#define BPS_SETTING_SIO1 BPS_SETTING
+#endif
+#ifndef BPS_SETTING_SIO2
+#define BPS_SETTING_SIO2 BPS_SETTING
+#endif
+#ifndef BPS_SETTING_SIO3
+#define BPS_SETTING_SIO3 BPS_SETTING
+#endif
+#define MFS4_BPS_SETTING (((SysFrePCLK2 + ((uint32_t)BPS_SETTING_SIO1 / 2)) / (uint32_t)BPS_SETTING_SIO1) - 1)
+#define MFS0_BPS_SETTING (((SysFrePCLK2 + ((uint32_t)BPS_SETTING_SIO2 / 2)) / (uint32_t)BPS_SETTING_SIO2) - 1)
+#define MFS3_BPS_SETTING (((SysFrePCLK2 + ((uint32_t)BPS_SETTING_SIO3 / 2)) / (uint32_t)BPS_SETTING_SIO3) - 1)
 
 /*