Commit: 87042c4ae2f1c64ba864a8181a1ad25f1200e2e9 - i2c_subsystem (git)

TWIペリフェラルを使ってI2Cプロトコルを制御する

Commit MetaInfo

• Revisión: 87042c4ae2f1c64ba864a8181a1ad25f1200e2e9 (tree)
• Tiempo: 2012-09-13 23:36:27
• Autor: takemasa <suikan@user...>
• Commiter: takemasa

Log Message

複数のプロセッサに対応

Cambiar Resumen

• modified: i2c-test/Makefile
• modified: i2c-test/Makefile.depend
• modified: i2c-test/configure-project
• modified: i2c-test/kernel/config/blackfin/acb_bf592/Makefile.config
• delete: i2c-test/{ => kernel/config/blackfin/acb_bf592}/i2c_subsystem.c
• delete: i2c-test/{ => kernel/config/blackfin/acb_bf592}/i2c_subsystem.h

Diferencia incremental

--- a/i2c-test/Makefile
+++ b/i2c-test/Makefile
@@ -116,10 +116,10 @@ UTASK_CFG = $(UNAME).cfg
 UTASK_DIR = $(SRCDIR)/library
 UTASK_ASMOBJS =
 ifdef USE_CXX
-    UTASK_CXXOBJS = $(UNAME).o i2c_subsystem.o
+    UTASK_CXXOBJS = $(UNAME).o 
     UTASK_COBJS =
 else
-    UTASK_COBJS = $(UNAME).o i2c_subsystem.o
+    UTASK_COBJS = $(UNAME).o 
 endif
 UTASK_CFLAGS =
 UTASK_LIBS =

--- a/i2c-test/Makefile.depend
+++ b/i2c-test/Makefile.depend
@@ -209,6 +209,52 @@ chip_dump.o: \
 	kernel/config/blackfin/_common_bf592/chip_config.h \
 	kernel/include/itron.h \
 	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/include/stddef.h 
+i2c_subsystem.o: \
+	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/defBF59x_base.h \
+	kernel/config/blackfin/cpu_defs.h \
+	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/newlib.h \
+	kernel/include/serial.h kernel/config/blackfin/tool_config.h \
+	./kernel_id.h \
+	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/cdefBF59x_base.h \
+	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/machine/_default_types.h \
+	kernel/include/t_stddef.h \
+	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/stdlib.h \
+	kernel/config/blackfin/tool_defs.h \
+	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/builtins.h \
+	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/ccblkfn.h \
+	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/_ansi.h \
+	kernel/include/s_services.h \
+	kernel/config/blackfin/acb_bf592/sys_config.h \
+	kernel/config/blackfin/_common_bf592/chip_config.h \
+	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/sys/features.h \
+	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/alloca.h \
+	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/sys/mc_typedef.h \
+	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/sys/reent.h \
+	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/sys/anomaly_macros_rtl.h \
+	kernel/include/kernel.h \
+	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/sys/config.h \
+	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/sys/lock.h \
+	kernel/config/blackfin/_common_bf592/chip_defs.h \
+	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/stdint.h \
+	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/cdef_LPBlackfin.h \
+	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/machine/_types.h \
+	kernel/include/t_config.h \
+	kernel/config/blackfin/_common_bf592/sys_rename.h \
+	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/defBF592-A.h \
+	kernel/config/blackfin/acb_bf592/i2c_subsystem.h \
+	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/cdefBF592-A.h \
+	kernel/config/blackfin/cpu_rename.h kernel/include/sil.h \
+	kernel/include/t_services.h \
+	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/def_LPBlackfin.h \
+	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/machine/stdlib.h \
+	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/include-fixed/limits.h \
+	kernel/include/t_syslog.h \
+	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/machine/ieeefp.h \
+	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/sys/_types.h \
+	kernel/config/blackfin/acb_bf592/sys_defs.h \
+	kernel/config/blackfin/cpu_config.h kernel/include/itron.h \
+	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/include/stddef.h \
+	kernel/config/blackfin/acb_bf592/i2c_subsystem.c 
 cpu_config.o: kernel/include/kernel.h \
 	kernel/config/blackfin/cpu_defs.h \
 	kernel/config/blackfin/_common_bf592/chip_defs.h \
@@ -612,56 +658,11 @@ i2c-test.o: kernel/include/kernel.h kernel/include/t_services.h \
 	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/include-fixed/limits.h \
 	kernel/include/t_syslog.h kernel/config/blackfin/tool_defs.h \
 	i2c-test.c kernel/include/serial.h \
-	kernel/config/blackfin/acb_bf592/sys_defs.h i2c_subsystem.h \
-	kernel_id.h kernel/include/itron.h \
-	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/include/stddef.h \
-	kernel/include/t_stddef.h 
-i2c_subsystem.o: \
-	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/defBF59x_base.h \
-	kernel/config/blackfin/cpu_defs.h \
-	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/newlib.h \
-	kernel/include/serial.h kernel/config/blackfin/tool_config.h \
-	i2c_subsystem.c \
-	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/cdefBF59x_base.h \
-	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/machine/_default_types.h \
-	kernel/include/t_stddef.h \
-	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/stdlib.h \
-	kernel/config/blackfin/tool_defs.h \
-	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/builtins.h \
-	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/ccblkfn.h \
-	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/_ansi.h \
-	kernel/include/s_services.h \
-	kernel/config/blackfin/acb_bf592/sys_config.h \
-	kernel/config/blackfin/_common_bf592/chip_config.h \
-	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/sys/features.h \
-	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/alloca.h \
-	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/sys/mc_typedef.h \
-	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/sys/reent.h \
-	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/sys/anomaly_macros_rtl.h \
-	kernel/include/kernel.h \
-	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/sys/config.h \
-	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/sys/lock.h \
-	kernel/config/blackfin/_common_bf592/chip_defs.h \
-	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/stdint.h \
-	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/cdef_LPBlackfin.h \
-	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/machine/_types.h \
-	kernel/include/t_config.h \
-	kernel/config/blackfin/_common_bf592/sys_rename.h \
-	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/defBF592-A.h \
-	i2c_subsystem.h \
-	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/cdefBF592-A.h \
-	kernel/config/blackfin/cpu_rename.h kernel/include/sil.h \
-	kernel/include/t_services.h \
-	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/def_LPBlackfin.h \
-	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/machine/stdlib.h \
-	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/include-fixed/limits.h \
-	kernel/include/t_syslog.h \
-	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/machine/ieeefp.h \
-	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/sys/_types.h \
 	kernel/config/blackfin/acb_bf592/sys_defs.h \
-	kernel/config/blackfin/cpu_config.h kernel_id.h \
+	kernel/config/blackfin/acb_bf592/i2c_subsystem.h kernel_id.h \
 	kernel/include/itron.h \
-	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/include/stddef.h 
+	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/include/stddef.h \
+	kernel/include/t_stddef.h 
 timer.o: \
 	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/defBF59x_base.h \
 	kernel/include/kernel.h kernel/include/timer.h \
@@ -796,7 +797,8 @@ kernel_cfg.o: \
 	kernel/include/t_config.h \
 	kernel/config/blackfin/_common_bf592/sys_rename.h \
 	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/defBF592-A.h \
-	kernel/include/../kernel/eventflag.h i2c_subsystem.h \
+	kernel/include/../kernel/eventflag.h \
+	kernel/config/blackfin/acb_bf592/i2c_subsystem.h \
 	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/cdefBF592-A.h \
 	kernel/config/blackfin/cpu_rename.h \
 	/opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/def_LPBlackfin.h \

--- a/i2c-test/configure-project
+++ b/i2c-test/configure-project
@@ -1 +1 @@
-kernel/configure -C blackfin -S acb_bf592 -A i2c-test  -U "i2c_subsystem.o"
+kernel/configure -C blackfin -S acb_bf592 -A i2c-test 

--- a/i2c-test/kernel/config/blackfin/acb_bf592/Makefile.config
+++ b/i2c-test/kernel/config/blackfin/acb_bf592/Makefile.config
@@ -16,7 +16,7 @@ LDFLAGS := $(LDFLAGS)
 #
 KERNEL_DIR := $(KERNEL_DIR) :$(SRCDIR)/config/$(CPU)/$(SYS) :$(SRCDIR)/config/$(CPU)/_common_bf592 :$(SRCDIR)/pdic/simple_sio
 KERNEL_ASMOBJS := $(KERNEL_ASMOBJS) 
-KERNEL_COBJS := $(KERNEL_COBJS) chip_config.o uart.o chip_debugboot.o chip_dump.o
+KERNEL_COBJS := $(KERNEL_COBJS) chip_config.o uart.o chip_debugboot.o chip_dump.o i2c_subsystem.o
 
 
 #

--- a/i2c-test/i2c_subsystem.c
+++ b/i2c-test/kernel/config/blackfin/acb_bf592/i2c_subsystem.c
@@ -11,6 +11,12 @@
 
 #ifdef _COMMON_BF592
 #include <cdefBF592-A.h>
+#elif defined(_COMMON_BF506)
+#include <cdefBF506F.h>
+#elif defined(_COMMON_BF518)
+#include <cdefBF518.h>
+#elif defined(_COMMON_BF537)
+#include <cdefBF537.h>
 #else
 #error "This processor is not supported"
 #endif
@@ -61,18 +67,18 @@ struct I2C_MASTER_CONTROL_TYPE {
     ID signal;                /**< データの送受信が全部終わったときに割り込みハンドラからタスクに知らせるためのセマフォ */
     ID blocking;            /**< I2Cペリフェラルへの排他アクセスのためのセマフォ */
     unsigned short intr_state;         /**< TWIペリフェラルの割り込みステータスのコピー **/
-    volatile uint16_t *    clkdiv;      /**< TWI_CLCKDIVレジスタのアドレス **/
-    volatile uint16_t *    control;     /**< TWI_CONTROLレジスタのアドレス **/
-    volatile uint16_t *    master_ctl;  /**< TWI_MASTER_CTLレジスタのアドレス **/
-    volatile uint16_t *    master_stat; /**< TWI_MASTER_STATレジスタのアドレス **/
-    volatile uint16_t *    master_addr; /**< TWI_MASTER_ADDRレジスタのアドレス **/
-    volatile uint16_t *    int_stat;    /**< TWI_MASTER_STATレジスタのアドレス **/
-    volatile uint16_t *    int_mask;    /**< TWI_INT_MASKレジスタのアドレス **/
-    volatile uint16_t *    fifo_ctl;    /**< TWI_FIFO_CTLレジスタのアドレス **/
-    volatile uint16_t *    fifo_stat;   /**< TWI_FIFO_STATレジスタのアドレス **/
-    volatile uint16_t *    xmt_data8;   /**< TWI_XMT_DATA8レジスタのアドレス **/
-    volatile uint16_t *    rcv_data8;   /**< TWI_RCV_DATA8レジスタのアドレス **/
-    volatile uint16_t *    slave_ctl;   /**< TWI_MASTER_CTLレジスタのアドレス **/
+    volatile unsigned short *   clkdiv;      /**< TWI_CLCKDIVレジスタのアドレス **/
+    volatile unsigned short *    control;     /**< TWI_CONTROLレジスタのアドレス **/
+    volatile unsigned short *    master_ctl;  /**< TWI_MASTER_CTLレジスタのアドレス **/
+    volatile unsigned short *    master_stat; /**< TWI_MASTER_STATレジスタのアドレス **/
+    volatile unsigned short *    master_addr; /**< TWI_MASTER_ADDRレジスタのアドレス **/
+    volatile unsigned short *    int_stat;    /**< TWI_MASTER_STATレジスタのアドレス **/
+    volatile unsigned short *    int_mask;    /**< TWI_INT_MASKレジスタのアドレス **/
+    volatile unsigned short *    fifo_ctl;    /**< TWI_FIFO_CTLレジスタのアドレス **/
+    volatile unsigned short *    fifo_stat;   /**< TWI_FIFO_STATレジスタのアドレス **/
+    volatile unsigned short *    xmt_data8;   /**< TWI_XMT_DATA8レジスタのアドレス **/
+    volatile unsigned short *    rcv_data8;   /**< TWI_RCV_DATA8レジスタのアドレス **/
+    volatile unsigned short *    slave_ctl;   /**< TWI_MASTER_CTLレジスタのアドレス **/
 
 };