リファクタリング

diff --git a/uzume_prototype/Makefile.depend b/uzume_prototype/Makefile.depend
index 42df8cc..f2dec94 100644 (file)
--- a/uzume_prototype/Makefile.depend
+++ b/uzume_prototype/Makefile.depend
@@ -3,15 +3,15 @@ kernel_cfg.c kernel_id.h kernel_chk.c: kernel/systask/logtask.cfg \
        kernel/config/blackfin/_common_bf592/chip_defs.h \
        kernel/config/blackfin/_common_bf592/sys_rename.h \
        kernel/include/t_config.h kernel/uzume/ad7999.cfg \
-       kernel/config/blackfin/tool_config.h kernel/uzume/uzume.cfg \
-       uzume_prototype.cfg kernel/config/blackfin/cpu_rename.h \
+       kernel/config/blackfin/tool_config.h uzume_prototype.cfg \
+       kernel/config/blackfin/cpu_rename.h \
        kernel/include/t_stddef.h kernel/uzume/i2c0_m.cfg \
        kernel/include/t_services.h kernel/include/sil.h \
        kernel/config/blackfin/tool_defs.h kernel/include/t_syslog.h \
        kernel/config/blackfin/_common_bf592/hw_timer.h \
        kernel/systask/timer.cfg kernel/systask/serial.cfg \
        kernel/config/blackfin/bsp_amakusa592/sys_config.h \
-       kernel/uzume/bsp_amakusa592.cfg \
+       kernel/uzume/bsp_amakusa592.cfg kernel/uzume/i2s.cfg \
        kernel/config/blackfin/cpu_config.h \
        kernel/include/s_services.h \
        kernel/config/blackfin/_common_bf592/chip_config.h \
@@ -208,33 +208,44 @@ chip_dump.o: \
        kernel/include/itron.h \
        /opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/include/stddef.h \
        kernel/config/blackfin/bsp_amakusa592/sys_defs.h 
-uzume.o: \
+i2s_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/fr2x16_typedef.h \
        kernel/config/blackfin/tool_config.h kernel/include/serial.h \
+       /opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/r2x16_base.h \
        ./kernel_id.h \
+       /opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/fr2x16_math.h \
        /opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/cdefBF59x_base.h \
-       kernel/include/t_stddef.h kernel/uzume/uzume.c \
-       kernel/config/blackfin/tool_defs.h kernel/uzume/uzume.h \
+       kernel/include/t_stddef.h kernel/config/blackfin/tool_defs.h \
+       kernel/uzume/uzume.h \
+       /opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/fract_math.h \
        kernel/include/s_services.h \
+       /opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/fr2x16_base.h \
        kernel/config/blackfin/_common_bf592/chip_config.h \
        kernel/include/kernel.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 \
+       kernel/uzume/i2s_subsystem.h \
+       kernel/config/blackfin/_common_bf592/chip_defs.h \
        /opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/cdef_LPBlackfin.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 \
+       /opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/raw_typedef.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/fract_typedef.h \
+       kernel/config/blackfin/cpu_rename.h \
+       kernel/uzume/i2s_subsystem.c \
        /opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/def_LPBlackfin.h \
-       kernel/uzume/i2c_subsystem.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/gcc.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/r2x16_typedef.h \
        kernel/config/blackfin/bsp_amakusa592/sys_config.h \
-       kernel/config/blackfin/cpu_config.h kernel/include/itron.h \
+       kernel/config/blackfin/cpu_config.h \
        /opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/include/stddef.h \
+       kernel/include/itron.h \
        kernel/config/blackfin/bsp_amakusa592/sys_defs.h 
 i2c_subsystem.o: \
        /opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/defBF59x_base.h \
@@ -280,30 +291,85 @@ i2c_subsystem.o: \
        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/bsp_amakusa592/sys_defs.h 
-ad7999.o: kernel/uzume/i2c_subsystem.h kernel/include/kernel.h \
-       kernel/include/t_services.h \
-       kernel/config/blackfin/cpu_defs.h \
+ad7999.o: kernel/include/kernel.h kernel/config/blackfin/cpu_defs.h \
        kernel/config/blackfin/_common_bf592/chip_defs.h \
+       kernel/uzume/ad7999.c \
+       /opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/fr2x16_typedef.h \
+       /opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/raw_typedef.h \
+       kernel/include/serial.h \
+       /opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/r2x16_base.h \
+       ./kernel_id.h \
+       /opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/fr2x16_math.h \
+       /opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/fract_typedef.h \
+       kernel/include/t_stddef.h kernel/include/t_services.h \
+       kernel/uzume/i2c_subsystem.h \
+       /opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/gcc.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 \
-       kernel/uzume/ad7999.c kernel/uzume/uzume.h \
-       kernel/include/serial.h kernel/uzume/ad7999.h ./kernel_id.h \
-       kernel/include/itron.h \
+       /opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/r2x16_typedef.h \
+       kernel/config/blackfin/tool_defs.h kernel/include/t_syslog.h \
+       kernel/uzume/uzume.h \
+       /opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/fract_math.h \
+       kernel/uzume/ad7999.h \
+       /opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/fr2x16_base.h \
        /opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/include/stddef.h \
-       kernel/config/blackfin/bsp_amakusa592/sys_defs.h \
-       kernel/include/t_stddef.h 
-uzume_callback.o: kernel/include/kernel.h \
+       kernel/include/itron.h \
+       kernel/config/blackfin/bsp_amakusa592/sys_defs.h 
+uzume_callback.o: kernel/config/blackfin/cpu_defs.h \
+       /opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/fr2x16_typedef.h \
+       kernel/config/blackfin/tool_config.h kernel/include/serial.h \
+       /opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/r2x16_base.h \
+       /opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/fr2x16_math.h \
+       kernel/include/t_stddef.h kernel/config/blackfin/tool_defs.h \
+       kernel/uzume/uzume.h \
+       /opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/fract_math.h \
+       uzume_callback.c kernel/include/s_services.h \
+       /opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/fr2x16_base.h \
+       kernel/config/blackfin/_common_bf592/chip_config.h \
+       kernel/include/kernel.h kernel/uzume/i2s_subsystem.h \
+       kernel/config/blackfin/_common_bf592/chip_defs.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/raw_typedef.h \
+       /opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/fract_typedef.h \
+       kernel/config/blackfin/cpu_rename.h kernel/include/sil.h \
        kernel/include/t_services.h \
-       kernel/config/blackfin/cpu_defs.h \
+       /opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/gcc.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/r2x16_typedef.h \
+       kernel/config/blackfin/bsp_amakusa592/sys_config.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_id.h kernel/config/blackfin/bsp_amakusa592/sys_defs.h 
+ssm2603.o: kernel/config/blackfin/cpu_defs.h \
+       /opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/fr2x16_typedef.h \
+       kernel/config/blackfin/tool_config.h kernel/include/serial.h \
+       /opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/r2x16_base.h \
+       /opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/fr2x16_math.h \
+       kernel/include/t_stddef.h kernel/config/blackfin/tool_defs.h \
+       kernel/uzume/uzume.h \
+       /opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/fract_math.h \
+       kernel/include/s_services.h \
+       /opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/fr2x16_base.h \
+       kernel/config/blackfin/_common_bf592/chip_config.h \
+       kernel/include/kernel.h kernel/uzume/i2s_subsystem.h \
        kernel/config/blackfin/_common_bf592/chip_defs.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/raw_typedef.h \
+       /opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/fract_typedef.h \
+       kernel/config/blackfin/cpu_rename.h \
+       kernel/uzume/i2c_subsystem.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/gcc.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 \
-       kernel/uzume/uzume.h kernel/include/serial.h \
-       uzume_callback.c kernel/uzume/ad7999.h kernel_id.h \
-       kernel/include/itron.h \
+       kernel/include/t_syslog.h \
+       /opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/r2x16_typedef.h \
+       kernel/config/blackfin/bsp_amakusa592/sys_config.h \
+       kernel/config/blackfin/cpu_config.h \
        /opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/include/stddef.h \
-       kernel/config/blackfin/bsp_amakusa592/sys_defs.h \
-       kernel/include/t_stddef.h 
+       kernel/include/itron.h kernel/uzume/ssm2603.c \
+       kernel/config/blackfin/bsp_amakusa592/sys_defs.h 
 cpu_config.o: kernel/include/kernel.h \
        kernel/config/blackfin/cpu_defs.h \
        kernel/config/blackfin/_common_bf592/chip_defs.h \
@@ -688,16 +754,16 @@ start.o: kernel/include/kernel.h kernel/config/blackfin/cpu_defs.h \
        kernel/config/blackfin/bsp_amakusa592/sys_defs.h 
 cpu_crtbegin.o: kernel/config/blackfin/cpu_crtbegin.c 
 uzume_prototype.o: kernel/include/kernel.h \
-       kernel/config/blackfin/cpu_defs.h \
+       kernel/include/t_services.h \
+       kernel/config/blackfin/cpu_defs.h uzume_prototype.c \
        kernel/config/blackfin/_common_bf592/chip_defs.h \
-       kernel/include/serial.h kernel/include/t_stddef.h \
-       kernel/include/t_services.h kernel/uzume/i2c_subsystem.h \
-       uzume_prototype.c \
        /opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/include-fixed/limits.h \
-       kernel/config/blackfin/tool_defs.h kernel/include/t_syslog.h \
+       kernel/include/t_syslog.h kernel/config/blackfin/tool_defs.h \
+       kernel/include/serial.h uzume_prototype.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/itron.h kernel_id.h uzume_prototype.h \
-       kernel/config/blackfin/bsp_amakusa592/sys_defs.h 
+       kernel/config/blackfin/bsp_amakusa592/sys_defs.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 \
@@ -804,48 +870,59 @@ strerror.o: kernel/include/kernel.h kernel/include/t_services.h \
        kernel/include/t_stddef.h 
 kernel_cfg.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 \
-       kernel/pdic/simple_sio/uart.h \
-       kernel/include/../kernel/mempfix.h kernel/include/serial.h \
-       kernel/config/blackfin/tool_config.h kernel_cfg.c \
+       /opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/fr2x16_typedef.h \
+       /opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/r2x16_base.h \
+       kernel_cfg.c \
+       /opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/fr2x16_math.h \
        /opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/cdefBF59x_base.h \
-       kernel/include/../kernel/cyclic.h kernel/include/t_stddef.h \
-       kernel/include/../kernel/semaphore.h \
-       kernel/config/blackfin/tool_defs.h kernel/uzume/uzume.h \
-       kernel/include/../kernel/exception.h \
+       kernel/include/../kernel/semaphore.h kernel/uzume/uzume.h \
        kernel/include/../kernel/dataqueue.h \
-       kernel/config/blackfin/_common_bf592/hw_serial.h \
-       kernel/include/../kernel/time_event.h \
        kernel/config/blackfin/_common_bf592/sys_unrename.h \
        kernel/include/../kernel/jsp_unrename.h \
-       kernel/include/kernel_cfg.h kernel/include/s_services.h \
+       kernel/include/kernel_cfg.h \
+       /opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/fr2x16_base.h \
        kernel/config/blackfin/_common_bf592/chip_config.h \
-       kernel/include/../kernel/task.h kernel/include/kernel.h \
-       kernel/include/timer.h \
-       /opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/stdint.h \
+       kernel/include/timer.h kernel/uzume/i2s_subsystem.h \
+       /opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/fract_typedef.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/gcc.h \
+       kernel/uzume/i2c_subsystem.h kernel/include/t_services.h \
+       /opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/include-fixed/limits.h \
+       /opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/r2x16_typedef.h \
+       kernel/config/blackfin/_common_bf592/hw_timer.h \
+       kernel/include/../kernel/jsp_rename.h \
+       kernel/include/../kernel/mailbox.h \
+       kernel/config/blackfin/bsp_amakusa592/sys_config.h \
+       kernel/uzume/ad7999.h kernel/config/blackfin/cpu_config.h \
+       kernel_id.h kernel/include/itron.h \
+       kernel/config/blackfin/bsp_amakusa592/sys_defs.h \
+       kernel/config/blackfin/cpu_defs.h \
+       kernel/pdic/simple_sio/uart.h \
+       kernel/include/../kernel/mempfix.h \
+       kernel/config/blackfin/tool_config.h kernel/include/serial.h \
+       kernel/include/t_stddef.h kernel/include/../kernel/cyclic.h \
+       kernel/config/blackfin/tool_defs.h \
+       kernel/include/../kernel/exception.h \
+       kernel/config/blackfin/_common_bf592/hw_serial.h \
+       kernel/include/../kernel/time_event.h \
+       /opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/fract_math.h \
+       kernel/include/s_services.h kernel/include/../kernel/task.h \
+       kernel/include/kernel.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 \
-       kernel/include/t_config.h \
        kernel/config/blackfin/_common_bf592/sys_rename.h \
+       kernel/include/t_config.h \
        /opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/defBF592-A.h \
+       /opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/raw_typedef.h \
        kernel/include/../kernel/eventflag.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/uzume/i2c_subsystem.h \
+       kernel/config/blackfin/cpu_unrename.h kernel/include/sil.h \
        /opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/../../../../bfin-elf/include/def_LPBlackfin.h \
-       kernel/include/sil.h kernel/include/t_services.h \
-       kernel/config/blackfin/cpu_unrename.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/_common_bf592/hw_timer.h \
-       kernel/include/../kernel/jsp_rename.h \
-       kernel/include/../kernel/mailbox.h \
        kernel/include/../kernel/interrupt.h \
-       kernel/config/blackfin/bsp_amakusa592/sys_config.h \
-       kernel/include/../kernel/jsp_kernel.h kernel/uzume/ad7999.h \
-       kernel/include/logtask.h kernel/config/blackfin/cpu_config.h \
-       uzume_prototype.h kernel_id.h \
+       kernel/include/../kernel/jsp_kernel.h \
+       kernel/include/logtask.h kernel/include/../kernel/queue.h \
        /opt/uClinux2011R1RC4/bfin-elf/bin/../lib/gcc/bfin-elf/4.3.5/include/stddef.h \
-       kernel/include/itron.h kernel/include/../kernel/queue.h \
-       kernel/config/blackfin/bsp_amakusa592/sys_defs.h 
+       uzume_prototype.h 
 cpu_crtend.o: kernel/config/blackfin/cpu_crtend.c 

diff --git a/uzume_prototype/kernel/config/blackfin/bsp_amakusa592/Makefile.config b/uzume_prototype/kernel/config/blackfin/bsp_amakusa592/Makefile.config
index e037080..f47b484 100644 (file)
--- a/uzume_prototype/kernel/config/blackfin/bsp_amakusa592/Makefile.config
+++ b/uzume_prototype/kernel/config/blackfin/bsp_amakusa592/Makefile.config
@@ -17,7 +17,7 @@ LDFLAGS := $(LDFLAGS)
 #
 KERNEL_DIR := $(KERNEL_DIR) :$(SRCDIR)/config/$(CPU)/$(SYS) :$(SRCDIR)/config/$(CPU)/_common_bf592 :$(SRCDIR)/pdic/simple_sio :$(SRCDIR)/uzume
 KERNEL_ASMOBJS := $(KERNEL_ASMOBJS) 
-KERNEL_COBJS := $(KERNEL_COBJS) chip_config.o uart.o chip_debugboot.o chip_dump.o uzume.o i2c_subsystem.o ad7999.o uzume_callback.o
+KERNEL_COBJS := $(KERNEL_COBJS) chip_config.o uart.o chip_debugboot.o chip_dump.o i2s_subsystem.o i2c_subsystem.o ad7999.o uzume_callback.o ssm2603.o
 
 
 #

diff --git a/uzume_prototype/kernel/uzume/ad7999.c b/uzume_prototype/kernel/uzume/ad7999.c
index 8bedfe5..a371c66 100644 (file)
--- a/uzume_prototype/kernel/uzume/ad7999.c
+++ b/uzume_prototype/kernel/uzume/ad7999.c
@@ -6,6 +6,7 @@
 
 
 #include <t_services.h>
+#include <s_services.h>
 #include <i2c_subsystem.h>
 #include "kernel_id.h"
 #include "uzume.h"
@@ -17,8 +18,9 @@
  * 変換値を保存する。アクセスは排他的でなければならない。値は符号付き左詰めである。
  * 整数部はないので、1ビットの符号の右に小数部が連なる。
  */
-static int values[4];
+static fract32 values[4];
 
+#define AD7999_I2C_ADRS 0x28
 
 /**
  * \brief ADU999 制御タスク
@@ -26,16 +28,13 @@ static int values[4];
  */
 void ad7999_task(VP_INT exinf)
 {
-    unsigned int adcaddress, ch;
+    unsigned int ch;
     unsigned char adcbuf[2];
 
-        /* タスク引数として渡される数字を、7bitのI2Cデバイスアドレスとみなす */
-    adcaddress = (unsigned int) exinf;
 
     while(1)
     {
-        i2c_master_read(0, adcaddress, adcbuf, 2);
-        syslog( LOG_NOTICE, "ADC is : %02x%02x ", adcbuf[0], adcbuf[1]);
+        i2c_master_read(0, AD7999_I2C_ADRS, adcbuf, 2);
 
             /* 上位バイトのbit 5:4 をチャンネル番号として受け取る */
         ch = ( adcbuf[0] & 0x30 ) >> 4;
@@ -51,9 +50,9 @@ void ad7999_task(VP_INT exinf)
     }
 }
 
-FX32 get_volume(unsigned int ch)
+fract32 get_volume(unsigned int ch)
 {
-    FX32 retval;
+    fract32 retval;
 
     /* 排他区間開始 */
     wai_sem(AD7999_SEM);
@@ -63,3 +62,8 @@ FX32 get_volume(unsigned int ch)
 
     return retval;
 }
+
+
+void set_volume(unsigned int ch, fract32 value)
+{
+}

diff --git a/uzume_prototype/kernel/uzume/ad7999.cfg b/uzume_prototype/kernel/uzume/ad7999.cfg
index ef4d214..e4e490c 100644 (file)
--- a/uzume_prototype/kernel/uzume/ad7999.cfg
+++ b/uzume_prototype/kernel/uzume/ad7999.cfg
@@ -14,6 +14,11 @@
 INCLUDE("\"ad7999.h\"");
 
 /*
+* タスク優先順位はGUIや一般タスクより低くても構わない。
+*/
+#define AD7999_TASK_PRI 7
+
+/*
 * プライベートな資源
 */
 
@@ -29,9 +34,9 @@ CRE_SEM (AD7999_SEM,
 CRE_TSK( AD7999_TASK, 
             { 
                 TA_HLNG|TA_ACT, /* 初期状態からアクティブ */
-                0x28,           /* タスク引数（AD7999のI2C デバイスアドレス） */
+                0,           /* タスク引数（無視） */
                 ad7999_task,    /* タスク本体 */
-                AD7999_PRIORITY, /* タスク優先順位 */
+                AD7999_TASK_PRI, /* タスク優先順位 */
                 1024,           /* タスク・スタックサイズ */
                 NULL            /* タスク・スタック。NULLならシステムが準備 */
              });

diff --git a/uzume_prototype/kernel/uzume/ad7999.h b/uzume_prototype/kernel/uzume/ad7999.h
index d619e85..345a7c1 100644 (file)
--- a/uzume_prototype/kernel/uzume/ad7999.h
+++ b/uzume_prototype/kernel/uzume/ad7999.h
@@ -10,12 +10,11 @@
 #ifndef AD7999_H_
 #define AD7999_H_
 
+#include "uzume.h"
 
-#define AD7999_PRIORITY 7
 
 #ifndef _MACRO_ONLY
 
-extern FX32 get_volume(unsigned int ch);
 extern void ad7999_task(VP_INT exinf);
 
 #endif

diff --git a/uzume_prototype/kernel/uzume/bsp_amakusa592.cfg b/uzume_prototype/kernel/uzume/bsp_amakusa592.cfg
index 7ea6123..a5d9d45 100644 (file)
--- a/uzume_prototype/kernel/uzume/bsp_amakusa592.cfg
+++ b/uzume_prototype/kernel/uzume/bsp_amakusa592.cfg
@@ -1,3 +1,3 @@
 #include "i2c0_m.cfg"
-#include "uzume.cfg"
+#include "i2s.cfg"
 #include "ad7999.cfg"

diff --git a/uzume_prototype/kernel/uzume/i2s.cfg b/uzume_prototype/kernel/uzume/i2s.cfg
new file mode 100644 (file)
index 0000000..213afe3
--- /dev/null
+++ b/uzume_prototype/kernel/uzume/i2s.cfg
@@ -0,0 +1,45 @@
+INCLUDE("\"i2s_subsystem.h\"");
+
+/* 
+* CODEC_TASKのタスク優先順位。0が最も優先順位が高い。I2SのCODEC制御はDMA割り込みに連動する。基本的には小ディレイは
+* 問題なく、割り込み周期いないで処理が完結すればいい。GUIよりも優先順位を高く、プロトコル・スタックのような応答性能が
+* 求められるタスクより低く設定する。
+*/
+
+#define CODEC_TASK_PRI 3        
+
+
+/*
+* SPORT0の割り込み通知用セマフォ
+*/
+CRE_SEM( 
+        SPORT0_SEM,             /* SPORT0割り込み通知用セマフォ */    
+        { 
+            TA_TPRI,            /* タスクプライオリティに従う */
+            0,                  /* 初期値は0なので、割り込みハンドラがsignalするまでタスクは待ち状態になる */ 
+            1                   /* 最大値は1。signalがどんどん正に増えていくのは異常状態なので考慮しない */
+        });
+
+
+/*
+* プライベートな資源
+*/
+
+CRE_TSK( 
+        CODEC_TASK,             /* I2Sコーデック/DMA制御タスクID */ 
+        { 
+            TA_HLNG|TA_ACT,     /* 初期状態でアクティブとする */
+            0,                  /* タスク引数。特に何も与えない */
+            task_audiocodec,    /* タスク実体となる関数 */
+            CODEC_TASK_PRI,     /* タスク優先順位 */
+            512,                /* タスク・スタック・サイズ */
+            NULL                /* スタックは自動割付とする */
+         });
+
+DEF_INH( 
+        INHNO_SPORT0_RX,        /* SPORT0 RX 割り込みハンドラ */
+        {
+            TA_HLNG,            /* 高級言語で記述する */
+            inh_codec_sport     /* ハンドラの実体となる関数 */
+        } );
+

diff --git a/uzume_prototype/kernel/uzume/uzume.c b/uzume_prototype/kernel/uzume/i2s_subsystem.c
similarity index 83%
rename from uzume_prototype/kernel/uzume/uzume.c
rename to uzume_prototype/kernel/uzume/i2s_subsystem.c
index 35e33b3..1525c6d 100644 (file)
--- a/uzume_prototype/kernel/uzume/uzume.c
+++ b/uzume_prototype/kernel/uzume/i2s_subsystem.c
@@ -3,44 +3,18 @@
  * @file uzume.c
  * @brief CODECの初期化と制御
  */
-#include "t_services.h"
-#include "s_services.h"
+#include "i2s_subsystem.h"
+#include <s_services.h>
 #include "uzume.h"
 #include "kernel_id.h"
-#include <i2c_subsystem.h>
-/**
- * \brief コーデック初期化データ列の長さ
- * \details
- * TLV320AIC23に与える初期化データの長さである。長さはレジスタアドレスとデータの組が
- * 何組であるかを示す。
- */
-#define     CODECINITDATALEN        11      /* TLV320AIC23B初期化データ長 */
+#include <cdefBF592-A.h>
 
-#define     I2C_PORT        0
-#define     CODEC_ADDRESS   0x1A
-
-/**
- * \brief CODEC初期化データ列
- * \details
- * TLV320AIC23Bを初期化するためのデータ列である。
- */
-static unsigned char tlv320aic23init[CODECINITDATALEN][2] =
-{
-                { 30 | 0x00, 0x00 },     /* RESET. */
-                { 0 | 0x01, 0x17 },     /* L_in vol : LR simul-update, unmute, 0dB */
-                { 2 | 0x01, 0x17 },     /* R_in vol : LR simul-update, unmute, 0dB */
-                { 4 | 0x01, 0xF9 },     /* L_HP vol : LR simul-update, zero-cross, 0dB */
-                { 6 | 0x01, 0xF9 },     /* R_HP vol : LR simul-update, zero-cross, 0dB */
-                { 8 | 0x00, 0x12 },     /* Analog Audio Path : No Sidetone, No bypass, DAC for Out, Line out for ADC, Mic Mute */
-                { 10 | 0x00, 0x00 },    /* Digital Path: DAC unmute, De-emphasis 48k, ADC HPF enable */
-                { 12 | 0x00, 0x02 },    /* Power Down : Only Mic is down*/
-                { 14 | 0x00, 0x4E },    /* Digital Audio Format : Master, 32bit, I2S */
-                { 16 | 0x00, 0x01 },    /* Sanmpling Rate, 48kHz, USB mode*/
-//                { 16 | 0x00, 0x00 },    /* Sanmpling Rate, 48kHz, NORMAL mode*/
-                { 18 | 0x00, 0x01 }     /* Activateion : Active. */
-
-};
 
+// CODECのスロット番号
+#define ADC_L0  0
+#define ADC_R0  1
+#define DAC_L0  0
+#define DAC_R0  1
 
 /**
  * @brief DMAデスクリプタ型
@@ -102,7 +76,7 @@ static struct DMA_DESCRIPTOR rxDesc[3];
  * 左右チャンネルそれぞれに配列を与える。配列内部にはサンプル順にデータが並ぶ。
  * ステレオは2系統あるので左チャンネルも２系統分のデータがある。
  */
-static int leftIn[UZUME_BLOCKSIZE];
+static AUDIOSAMPLE leftIn[UZUME_BLOCKSIZE];
 /**
  * @brief 右入力データ引渡し変数
  * 
@@ -111,7 +85,7 @@ static int leftIn[UZUME_BLOCKSIZE];
  * 左右チャンネルそれぞれに配列を与える。配列内部にはサンプル順にデータが並ぶ。
  * ステレオは2系統あるので右チャンネルも２系統分のデータがある。
  */
-static int rightIn[UZUME_BLOCKSIZE];
+static AUDIOSAMPLE rightIn[UZUME_BLOCKSIZE];
 /**
  * @brief 左出力データ引渡し変数
  * 
@@ -119,7 +93,7 @@ static int rightIn[UZUME_BLOCKSIZE];
  * @ref codec_callback()関数から出力オーディオデータをうけとるための引数。
  * 左右チャンネルそれぞれに配列を与える。配列内部にはサンプル順にデータが並ぶ。
  */
-static int leftOut[UZUME_BLOCKSIZE];
+static AUDIOSAMPLE leftOut[UZUME_BLOCKSIZE];
 /**
  * @brief 右出力データ引渡し変数
  * 
@@ -127,26 +101,7 @@ static int leftOut[UZUME_BLOCKSIZE];
  * @ref codec_callback()関数から出力オーディオデータをうけとるための引数。
  * 左右チャンネルそれぞれに配列を与える。配列内部にはサンプル順にデータが並ぶ。
  */
-static int rightOut[UZUME_BLOCKSIZE];
-
-/**
- * @brief コーデックの初期化
- * @details
- * TLV32AIC23Bに初期化数値列をI2C経由で送り込む。タスクコンテキストで呼び出さなければならない。
- * 初期化後、TLV32AIC23Bはクロック信号を生成して動作を開始する。
- */
-void init_codec()
-{
-        int i;
-
-
-                /* TLV320AIC23Bに初期化データを送信する */
-        for ( i=0; i< CODECINITDATALEN; i++){
-                i2c_master_write( I2C_PORT, CODEC_ADDRESS, tlv320aic23init[i], 2 );
-        }
-}
-
-
+static AUDIOSAMPLE rightOut[UZUME_BLOCKSIZE];
 
 /**
  * @brief CODEC用SPORTを設定する

diff --git a/uzume_prototype/kernel/uzume/uzume.cfg b/uzume_prototype/kernel/uzume/uzume.cfg
deleted file mode 100644 (file)
index 70dd4db..0000000
--- a/uzume_prototype/kernel/uzume/uzume.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-INCLUDE("\"uzume.h\"");
-
-/*
-* SPORT0の割り込み通知用セマフォ
-*/
-CRE_SEM( SPORT0_SEM,    { TA_TPRI, 0, 1});
-
-
-/*
-* プライベートな資源
-*/
-
-CRE_TSK( CODEC_TASK, { TA_HLNG|TA_ACT, 0, task_audiocodec,  3, 512, NULL });
-DEF_INH( INHNO_SPORT0_RX, {TA_HLNG, inh_codec_sport} );
-

diff --git a/uzume_prototype/kernel/uzume/uzume.h b/uzume_prototype/kernel/uzume/uzume.h
index b072e39..b2c2822 100644 (file)
--- a/uzume_prototype/kernel/uzume/uzume.h
+++ b/uzume_prototype/kernel/uzume/uzume.h
@@ -5,12 +5,13 @@
 #ifndef UZUME_H_
 #define UZUME_H_
 
+#include <fract_math.h>
 /**
- * @brief 汎用固定小数点型。
+ * @brief オーディオコーデック用データ型。
  * @datails
- * Blackfinでは32bitで使用する。整数部のビット長は0である。
+ * Blackfinでは32bitで使用する。整数部のビット長は、 UZUME_INT_BITS で宣言する。
  */
-typedef int FX32;
+typedef fract32 AUDIOSAMPLE;
 
 /**
  * @brief 割り込み1回あたりのサンプル数。ユーザーが変えてもよい。
@@ -23,45 +24,12 @@ typedef int FX32;
  * 3ならば4.28、7ならば8.24となる。
  */
 #define UZUME_BLOCKSIZE 64
-/**
- * @brief サンプルあたりのスロット数。I2Sなら2。
- */
-#define SLOT_PER_SAMPLE 2
-
-/**
- * @brief オーディオコーデック用データ型。
- * @datails
- * Blackfinでは32bitで使用する。整数部のビット長は、 UZUME_INT_BITS で宣言する。
- */
-typedef int AUDIOSAMPLE;
-
-// CODECのスロット番号
-#define ADC_L0 0
-#define ADC_R0 1
-#define DAC_L0  0
-#define DAC_R0  1
 
+#ifndef _MACRO_ONLY
 
-/**
- * @brief CODECとデータをやり取りするためのバッファ
- * 
- * 割り込み１回の間にCODECが転送するデータを格納するバッファ。サイズは
- * 割り込み１回あたりのサンプル数 @ref SAMPLE_PER_INTRと1サンプル内の
- * スロット数 @ref SLOT_PER_SAMPLEの積である。
- */
-struct CODEC_BUFFER{
-       AUDIOSAMPLE data[UZUME_BLOCKSIZE][SLOT_PER_SAMPLE];
-} ;
-
+extern fract32 get_volume(unsigned int ch);
+extern void set_volume(unsigned int ch, fract32 value);
 
-extern void task_audiocodec( VP_INT exinf );
-extern void inh_codec_sport(void);
-extern void init_audio( int count );
-extern void process_audio( 
-        AUDIOSAMPLE input_left[],
-        AUDIOSAMPLE input_right[],
-        AUDIOSAMPLE output_left[],
-        AUDIOSAMPLE output_right[]
-        );
+#endif
 
 #endif /*UZUME_H_*/

diff --git a/uzume_prototype/kernel_cfg.c b/uzume_prototype/kernel_cfg.c
index 247f989..2c876d1 100644 (file)
--- a/uzume_prototype/kernel_cfg.c
+++ b/uzume_prototype/kernel_cfg.c
@@ -28,7 +28,7 @@
 #include "serial.h"
 #include "logtask.h"
 #include "i2c_subsystem.h"
-#include "uzume.h"
+#include "i2s_subsystem.h"
 #include "ad7999.h"
 
 
@@ -47,7 +47,7 @@ const TINIB _kernel_tinib_table[TNUM_TSKID] = {
        {0x00u | 0x02u, (VP_INT)(0), (FP)(main_task), INT_PRIORITY(5), __TROUND_STK_UNIT(1024), __stack_MAIN_TASK, TA_NULL, (FP)(NULL)},
        {0x00u | 0x02u, (VP_INT)(( VP_INT ) 1), (FP)(logtask), INT_PRIORITY(LOGTASK_PRIORITY), __TROUND_STK_UNIT(LOGTASK_STACK_SIZE), __stack_LOGTASK, TA_NULL, (FP)(NULL)},
        {0x00u | 0x02u, (VP_INT)(0), (FP)(task_audiocodec), INT_PRIORITY(3), __TROUND_STK_UNIT(512), __stack_CODEC_TASK, TA_NULL, (FP)(NULL)},
-       {0x00u | 0x02u, (VP_INT)(40), (FP)(ad7999_task), INT_PRIORITY(AD7999_PRIORITY), __TROUND_STK_UNIT(1024), __stack_AD7999_TASK, TA_NULL, (FP)(NULL)}
+       {0x00u | 0x02u, (VP_INT)(0), (FP)(ad7999_task), INT_PRIORITY(7), __TROUND_STK_UNIT(1024), __stack_AD7999_TASK, TA_NULL, (FP)(NULL)}
 };
 
 const ID _kernel_torder_table[TNUM_TSKID] = {1,2,3,4};

diff --git a/uzume_prototype/kernel_obj.dat b/uzume_prototype/kernel_obj.dat
index eb92b83..80c0ccf 100644 (file)
Binary files a/uzume_prototype/kernel_obj.dat and b/uzume_prototype/kernel_obj.dat differ

diff --git a/uzume_prototype/uzume_callback.c b/uzume_prototype/uzume_callback.c
index 8c3b064..b616416 100644 (file)
--- a/uzume_prototype/uzume_callback.c
+++ b/uzume_prototype/uzume_callback.c
@@ -4,9 +4,10 @@
  * 
  */
 #include "t_services.h"
+#include "s_services.h"
 #include "kernel_id.h"
 #include "uzume.h"
-#include "ad7999.h"
+#include "i2s_subsystem.h"
 /**
  * @brief 信号処理初期化関数
  * @param count @ref codec_callback()に渡される引数配列のサイズ
@@ -45,7 +46,7 @@ void process_audio(
 {
                // ループ変数
        int sample;
-       FX32 volume;
+       fract32 volume;
 
            // ch 0 のボリューム値(32bit)
        volume = get_volume(0)>>15;