diff --git a/branches/2.2A_SDK5(4thNUP)/OMakefile b/branches/2.2A_SDK5(4thNUP)/OMakefile
deleted file mode 100644
index 42baad6..0000000
--- a/branches/2.2A_SDK5(4thNUP)/OMakefile
+++ /dev/null
@@ -1,159 +0,0 @@
-############################################################
-# 環境設定
-############################################################
-
-# マイコン開発環境のインストール先を環境変数で指定する
-NECEL_ROOT =
-    if $(defined-env NECEL_ROOT)
-        value $(absname $"$(getenv NECEL_ROOT)")
-    else
-        value "C:\Program Files (x86)\NEC Electronics Tools"
-
-# cygwinのインストール先を環境変数で指定する
-CYGWIN_ROOT = 
-    if $(defined-env CYGWIN_ROOT)
-        value $(absname $"$(getenv CYGWIN_ROOT)")
-    else
-        value "C:\cygwin"
-
-# GCCバージョンを環境変数で指定する
-CYGWIN_GCC =
-    if $(defined-env CYGWIN_GCC)
-        value $(CYGWIN_ROOT)/bin/$"$(getenv CYGWIN_GCC)"
-    else
-        value $(CYGWIN_ROOT)/bin/gcc-4
-
-#デバイスファイルは NECEL_ROOT/dev に置くこと
-#自己アップデート用ライブラリは CC_LIBS_ROOT/以下に置くこと
-
-SUBDIR_INTER_ASM = $(dir inter_asm)
-
-CC_ROOT = $(NECEL_ROOT)/CC78K0R
-CC_VER = W2.13
-CC = $(CC_ROOT)/$(CC_VER)/bin/cc78k0r.exe
-RA = $(NECEL_ROOT)/RA78K0R/W1.33/bin/ra78k0r.exe
-LK = $(NECEL_ROOT)/RA78K0R/W1.33/bin/lk78k0r.exe
-OC = $(NECEL_ROOT)/RA78K0R/W1.33/bin/oc78k0r.exe
-LCNV = $(NECEL_ROOT)/RA78K0R/W1.33/bin/lc78k0r.exe
-DEVFILE_ROOT = $(NECEL_ROOT)/dev
-
-CC_LIBS_ROOT = $(CC_ROOT)/$(CC_VER)/lib78k0r
-CC_INCLUDES_ROOT = $(CC_ROOT)/$(CC_VER)/inc78k0r
-S0RM = s0rm.rel
-
-# セキュリティID
-GIVALUE = 1B339499E033F240BFAAh
-
-# ユーザオプションバイト
-GBValue = 7EFBFFh
-
-DEVICE_NAME = 9F0104
-
-FSL_LIB = fsl.lib
-
-TARGET_NAME = bsr
-TARGET_LMF = $(TARGET_NAME).lmf
-TARGET_HEX = $(TARGET_NAME).hex
-
-# ここまで
-############################################################
-
-############################################################
-# ソースを追加したら編集する箇所
-############################################################
-
-SRC_FILES[] = 
-    loader
-    pm
-    i2c_ctr
-    main
-    magic
-    WDT
-    i2c_mcu
-    i2c_twl
-    led
-    rtc
-    vreg_ctr
-    vreg_twl
-    adc
-    renge\renge
-    accero
-    self_flash
-    sw
-    task_debug
-    task_misc
-    task_sys
-    pedo_alg_thre_det2
-    ini_VECT
-    task_status
-    led_cam
-    led_pow
-    hal
-    batt_params
-    voltable
-    pedo_lpf_coeff
-
-INCLUDES[] =
-    ./
-    renge
-
-# ここまで
-############################################################
-
-.PHONY: clean BeforeBuild
-
-AddRel(files) =
-    file_names = $(addsuffix .rel, $(files))
-    return $(file_names)
-
-# *.cからinter_asm/*.asmを作るための関数
-AsmProgram(files) =
-    foreach(filename, $(files))
-        asm_name = $(addprefix $(SUBDIR_INTER_ASM)/, $(addsuffix .asm, $(basename $(filename))))
-        c_name = $(addsuffix .c, $(filename))
-
-        .SCANNER: $(asm_name): $(c_name)
-            $(CYGWIN_GCC) -MM -w -I$(CC_INCLUDES_ROOT) $(c_name) | sed 's/$(filename)\.o/$(SUBDIR_INTER_ASM)\/$(filename)\.asm/g'
-
-        $(asm_name): $(c_name)
-            $(CC) -c$(DEVICE_NAME) -y$(DEVFILE_ROOT) -_msgoff -irenge -i$(CC_INCLUDES_ROOT) -ms -qvjl2w -sa$(SUBDIR_INTER_ASM) -zpb -no $(c_name)
-
-    return $(addsuffix .c, $(files))
-
-# inter_asm/*.asm から *.relを作るための関数
-RelProgram(files) =
-    foreach(filename, $(files))
-        rel_name = $(addsuffix .rel, $(basename $(filename)))
-        asm_name = $(addprefix $(SUBDIR_INTER_ASM)/, $(addsuffix .asm, $(basename $(filename))))
-        asm_win_name = $(addprefix $(SUBDIR_INTER_ASM)\\, $(addsuffix .asm, $(basename $(filename))))
-        c_name = $(addsuffix .c, $(filename))
-
-        .SCANNER: $(rel_name): $(asm_win_name)
-            $(CYGWIN_GCC) -MM -w -I$(CC_INCLUDES_ROOT) $(c_name) | sed 's/\.o/\.rel/g'
-
-        $(rel_name): $(asm_name)
-            $(RA) -c$(DEVICE_NAME) -y$(DEVFILE_ROOT) -_msgoff $(asm_win_name)
-
-    return $(addsuffix .rel, $(basename $(files)))
-
-$(TARGET_LMF): $(RelProgram $(SRC_FILES)) $(AsmProgram $(SRC_FILES))
-    $(LK) -y$(DEVFILE_ROOT) -_msgoff -o$(TARGET_LMF) $(CC_LIBS_ROOT)/$(S0RM)  -gi$(GIVALUE) -pbsr_k0r.map -nkd -gb$(GBValue) -b$(CC_LIBS_ROOT)/$(FSL_LIB) -bcl0rdm.lib -bcl0rm.lib -bcl0rmf.lib -i$(CC_LIBS_ROOT) -dbsr_mcu.dr -s -w0  $(AddRel $(basename $(SRC_FILES)))
-
-$(TARGET_HEX) : $(TARGET_LMF)
-    $(OC) -y$(DEVFILE_ROOT) -_msgoff -o.\\$(TARGET_HEX) -nu -ki  $(TARGET_LMF)
-
-BeforeBuild:
-# ビルド前に必ず実行したい処理
-# OMakeがタイムスタンプではなくMD5でファイルの状態を管理しているので
-# 残念ながら cleanしてからビルドしなおす必要がある
-    C:\Windows\system32\cmd.exe /c $(CYGWIN_ROOT)\bin\touch magic.c
-    if $(not $(file-exists $(SUBDIR_INTER_ASM)))
-        mkdir $(SUBDIR_INTER_ASM)
-
-hoge.bin: BeforeBuild $(TARGET_HEX)
-    C:\Windows\system32\cmd.exe /c ruby nec_s_2_bsrbin2.rb $(TARGET_HEX)
-
-clean:
-    rm -rf *.prn *.rel $(SUBDIR_INTER_ASM)/*.asm *.omc .omakedb .omakedb.lock
-
-.DEFAULT: hoge.bin
diff --git a/branches/2.2A_SDK5(4thNUP)/OMakeroot b/branches/2.2A_SDK5(4thNUP)/OMakeroot
deleted file mode 100644
index 16f4b11..0000000
--- a/branches/2.2A_SDK5(4thNUP)/OMakeroot
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Include the OMakefile in this directory.
-#
-.SUBDIRS: .
diff --git a/branches/2.2A_SDK5(4thNUP)/VCProj/Debug/BuildLog.htm b/branches/2.2A_SDK5(4thNUP)/VCProj/Debug/BuildLog.htm
deleted file mode 100644
index 826ce7c..0000000
Binary files a/branches/2.2A_SDK5(4thNUP)/VCProj/Debug/BuildLog.htm and /dev/null differ
diff --git a/branches/2.2A_SDK5(4thNUP)/VCProj/Debug/bsr_trunk.lastbuildstate b/branches/2.2A_SDK5(4thNUP)/VCProj/Debug/bsr_trunk.lastbuildstate
deleted file mode 100644
index ed27c09..0000000
--- a/branches/2.2A_SDK5(4thNUP)/VCProj/Debug/bsr_trunk.lastbuildstate
+++ /dev/null
@@ -1,2 +0,0 @@
-#v4.0:v100
-Debug|Win32|C:\78k_data\yav-mcu-basara\trunk\VCProj\|
diff --git a/branches/2.2A_SDK5(4thNUP)/VCProj/Debug/bsr_trunk.log b/branches/2.2A_SDK5(4thNUP)/VCProj/Debug/bsr_trunk.log
deleted file mode 100644
index 68fa1e9..0000000
--- a/branches/2.2A_SDK5(4thNUP)/VCProj/Debug/bsr_trunk.log
+++ /dev/null
@@ -1,58 +0,0 @@
-2011/09/27 13:05:45 にビルドを開始しました。
-     1>ノード 2 上のプロジェクト "C:\78k_data\yav-mcu-basara\trunk\VCProj\bsr_trunk.vcxproj" (build ターゲット)。
-     1>InitializeBuildStatus:
-         "Debug\bsr_trunk.unsuccessfulbuild" のタッチ タスクを実行しています。
-       ClCompile:
-         C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\CL.exe /c /Zi /nologo /W1 /WX- /O2 /Oy- /D _MBCS /D _MBCS /D _WIN32 /Gm- /EHsc /MD /GS /fp:precise /Zc:wchar_t /Zc:forScope /Fo"Debug\\" /Fd"Debug\vc100.pdb" /Gd /TC /analyze- /errorReport:prompt ..\accero.c ..\adc.c ..\batt_params.c ..\hal.c ..\i2c_ctr.c ..\i2c_mcu.c ..\i2c_twl.c ..\ini_VECT.c ..\kanaria_c.c ..\led.c ..\led_cam.c ..\led_pow.c ..\loader.c ..\magic.c ..\main.c ..\my_led.c ..\pedo_alg_thre_det2.c ..\pedo_lpf_coeff.c ..\pm.c ..\reboot.c ..\renge\renge.c ..\rtc.c ..\self_flash.c ..\sw.c ..\task_debug.c ..\task_misc.c ..\task_status.c ..\task_sys.c ..\util_funcs.c ..\voltable.c ..\vreg_ctr.c ..\vreg_twl.c ..\WDT.c
-         accero.c
-     1>c:\78k_data\yav-mcu-basara\trunk\sim/simOnWin.h(14): warning C4391: 'void memcpy(void *,void *,unsigned int)' : 組み込み関数に対して戻り値の型が無効です。'void' であるべきです。
-         adc.c
-     1>c:\78k_data\yav-mcu-basara\trunk\sim/simOnWin.h(14): warning C4391: 'void memcpy(void *,void *,unsigned int)' : 組み込み関数に対して戻り値の型が無効です。'void' であるべきです。
-         batt_params.c
-         hal.c
-     1>c:\78k_data\yav-mcu-basara\trunk\sim/simOnWin.h(14): warning C4391: 'void memcpy(void *,void *,unsigned int)' : 組み込み関数に対して戻り値の型が無効です。'void' であるべきです。
-         i2c_ctr.c
-     1>c:\78k_data\yav-mcu-basara\trunk\sim/simOnWin.h(14): warning C4391: 'void memcpy(void *,void *,unsigned int)' : 組み込み関数に対して戻り値の型が無効です。'void' であるべきです。
-         i2c_mcu.c
-     1>c:\78k_data\yav-mcu-basara\trunk\sim/simOnWin.h(14): warning C4391: 'void memcpy(void *,void *,unsigned int)' : 組み込み関数に対して戻り値の型が無効です。'void' であるべきです。
-         i2c_twl.c
-     1>c:\78k_data\yav-mcu-basara\trunk\sim/simOnWin.h(14): warning C4391: 'void memcpy(void *,void *,unsigned int)' : 組み込み関数に対して戻り値の型が無効です。'void' であるべきです。
-         ini_VECT.c
-         kanaria_c.c
-     1>c:\78k_data\yav-mcu-basara\trunk\sim/simOnWin.h(14): warning C4391: 'void memcpy(void *,void *,unsigned int)' : 組み込み関数に対して戻り値の型が無効です。'void' であるべきです。
-         led.c
-     1>c:\78k_data\yav-mcu-basara\trunk\sim/simOnWin.h(14): warning C4391: 'void memcpy(void *,void *,unsigned int)' : 組み込み関数に対して戻り値の型が無効です。'void' であるべきです。
-         led_cam.c
-     1>c:\78k_data\yav-mcu-basara\trunk\sim/simOnWin.h(14): warning C4391: 'void memcpy(void *,void *,unsigned int)' : 組み込み関数に対して戻り値の型が無効です。'void' であるべきです。
-         led_pow.c
-     1>c:\78k_data\yav-mcu-basara\trunk\sim/simOnWin.h(14): warning C4391: 'void memcpy(void *,void *,unsigned int)' : 組み込み関数に対して戻り値の型が無効です。'void' であるべきです。
-         loader.c
-     1>c:\78k_data\yav-mcu-basara\trunk\sim/simOnWin.h(14): warning C4391: 'void memcpy(void *,void *,unsigned int)' : 組み込み関数に対して戻り値の型が無効です。'void' であるべきです。
-     1>..\loader.c(201): error C2059: 構文エラー : 'サフィックスが無効です。'
-     1>..\loader.c(201): error C2146: 構文エラー : ')' が、識別子 'b00000110' の前に必要です。
-         magic.c
-         main.c
-     1>c:\78k_data\yav-mcu-basara\trunk\sim/simOnWin.h(14): warning C4391: 'void memcpy(void *,void *,unsigned int)' : 組み込み関数に対して戻り値の型が無効です。'void' であるべきです。
-         my_led.c
-         pedo_alg_thre_det2.c
-     1>c:\78k_data\yav-mcu-basara\trunk\sim/simOnWin.h(14): warning C4391: 'void memcpy(void *,void *,unsigned int)' : 組み込み関数に対して戻り値の型が無効です。'void' であるべきです。
-         pedo_lpf_coeff.c
-     1>c:\78k_data\yav-mcu-basara\trunk\sim/simOnWin.h(14): warning C4391: 'void memcpy(void *,void *,unsigned int)' : 組み込み関数に対して戻り値の型が無効です。'void' であるべきです。
-         pm.c
-     1>c:\78k_data\yav-mcu-basara\trunk\sim/simOnWin.h(14): warning C4391: 'void memcpy(void *,void *,unsigned int)' : 組み込み関数に対して戻り値の型が無効です。'void' であるべきです。
-     1>..\pm.c(1328): warning C4090: '=' : 異なる 'const' 修飾子です。
-         reboot.c
-     1>..\reboot.c(8): warning C4068: 不明なプラグマがありました。
-     1>c:\78k_data\yav-mcu-basara\trunk\sim/simOnWin.h(14): warning C4391: 'void memcpy(void *,void *,unsigned int)' : 組み込み関数に対して戻り値の型が無効です。'void' であるべきです。
-     1>..\reboot.c(14): fatal error C1021: プリプロセッサ コマンド 'asm' が無効です。
-         コードを生成中...
-     1>c:\78k_data\yav-mcu-basara\trunk\i2c_mcu.c(290): fatal error C1001: コンパイラで内部エラーが発生しました。
-         (コンパイラ ファイル 'f:\dd\vctools\compiler\utc\src\p2\main.c[0x5858372A:0x00000000]'、行 183)
-          この問題を回避するには、上記の場所付近のプログラムを単純化するか変更してください。
-         詳細については、Visual C++ ヘルプ メニューのサポート情報コマンドを
-         選択してください。またはサポート情報 ヘルプ ファイルを参照してください。
-     1>プロジェクト "C:\78k_data\yav-mcu-basara\trunk\VCProj\bsr_trunk.vcxproj" (build ターゲット) のビルドが終了しました -- 失敗。
-
-ビルドに失敗しました。
-
-経過時間 00:00:15.70
diff --git a/branches/2.2A_SDK5(4thNUP)/VCProj/Debug/bsr_trunk.unsuccessfulbuild b/branches/2.2A_SDK5(4thNUP)/VCProj/Debug/bsr_trunk.unsuccessfulbuild
deleted file mode 100644
index e69de29..0000000
diff --git a/branches/2.2A_SDK5(4thNUP)/VCProj/_UpgradeReport_Files/UpgradeReport.css b/branches/2.2A_SDK5(4thNUP)/VCProj/_UpgradeReport_Files/UpgradeReport.css
deleted file mode 100644
index 3411f63..0000000
--- a/branches/2.2A_SDK5(4thNUP)/VCProj/_UpgradeReport_Files/UpgradeReport.css
+++ /dev/null
@@ -1,207 +0,0 @@
-BODY
-{
-	BACKGROUND-COLOR: white;
-	FONT-FAMILY: "Verdana", sans-serif;
-	FONT-SIZE: 100%;
-	MARGIN-LEFT: 0px;
-	MARGIN-TOP: 0px
-}
-P
-{
-	FONT-FAMILY: "Verdana", sans-serif;
-	FONT-SIZE: 70%;
-	LINE-HEIGHT: 12pt;
-	MARGIN-BOTTOM: 0px;
-	MARGIN-LEFT: 10px;
-	MARGIN-TOP: 10px
-}
-.note
-{
-	BACKGROUND-COLOR:  #ffffff;
-	COLOR: #336699;
-	FONT-FAMILY: "Verdana", sans-serif;
-	FONT-SIZE: 100%;
-	MARGIN-BOTTOM: 0px;
-	MARGIN-LEFT: 0px;
-	MARGIN-TOP: 0px;
-	PADDING-RIGHT: 10px
-}
-.infotable
-{
-	BACKGROUND-COLOR: #f0f0e0;
-	BORDER-BOTTOM: #ffffff 0px solid;
-	BORDER-COLLAPSE: collapse;
-	BORDER-LEFT: #ffffff 0px solid;
-	BORDER-RIGHT: #ffffff 0px solid;
-	BORDER-TOP: #ffffff 0px solid;
-	FONT-SIZE: 70%;
-	MARGIN-LEFT: 10px
-}
-.issuetable
-{
-	BACKGROUND-COLOR: #ffffe8;
-	BORDER-COLLAPSE: collapse;
-	COLOR: #000000;
-	FONT-SIZE: 100%;
-	MARGIN-BOTTOM: 10px;
-	MARGIN-LEFT: 13px;
-	MARGIN-TOP: 0px
-}
-.issuetitle
-{
-	BACKGROUND-COLOR: #ffffff;
-	BORDER-BOTTOM: #dcdcdc 1px solid;
-	BORDER-TOP: #dcdcdc 1px;
-	COLOR: #003366;
-	FONT-WEIGHT: normal
-}
-.header
-{
-	BACKGROUND-COLOR: #cecf9c;
-	BORDER-BOTTOM: #ffffff 1px solid;
-	BORDER-LEFT: #ffffff 1px solid;
-	BORDER-RIGHT: #ffffff 1px solid;
-	BORDER-TOP: #ffffff 1px solid;
-	COLOR: #000000;
-	FONT-WEIGHT: bold
-}
-.issuehdr
-{
-	BACKGROUND-COLOR: #E0EBF5;
-	BORDER-BOTTOM: #dcdcdc 1px solid;
-	BORDER-TOP: #dcdcdc 1px solid;
-	COLOR: #000000;
-	FONT-WEIGHT: normal
-}
-.issuenone
-{
-	BACKGROUND-COLOR: #ffffff;
-	BORDER-BOTTOM: 0px;
-	BORDER-LEFT: 0px;
-	BORDER-RIGHT: 0px;
-	BORDER-TOP: 0px;
-	COLOR: #000000;
-	FONT-WEIGHT: normal
-}
-.content
-{
-	BACKGROUND-COLOR: #e7e7ce;
-	BORDER-BOTTOM: #ffffff 1px solid;
-	BORDER-LEFT: #ffffff 1px solid;
-	BORDER-RIGHT: #ffffff 1px solid;
-	BORDER-TOP: #ffffff 1px solid;
-	PADDING-LEFT: 3px
-}
-.issuecontent
-{
-	BACKGROUND-COLOR: #ffffff;
-	BORDER-BOTTOM: #dcdcdc 1px solid;
-	BORDER-TOP: #dcdcdc 1px solid;
-	PADDING-LEFT: 3px
-}
-A:link
-{
-	COLOR: #cc6633;
-	TEXT-DECORATION: underline
-}
-A:visited
-{
-	COLOR: #cc6633;
-}
-A:active
-{
-	COLOR: #cc6633;
-}
-A:hover
-{
-	COLOR: #cc3300;
-	TEXT-DECORATION: underline
-}
-H1
-{
-	BACKGROUND-COLOR: #003366;
-	BORDER-BOTTOM: #336699 6px solid;
-	COLOR: #ffffff;
-	FONT-SIZE: 130%;
-	FONT-WEIGHT: normal;
-	MARGIN: 0em 0em 0em -20px;
-	PADDING-BOTTOM: 8px;
-	PADDING-LEFT: 30px;
-	PADDING-TOP: 16px
-}
-H2
-{
-	COLOR: #000000;
-	FONT-SIZE: 80%;
-	FONT-WEIGHT: bold;
-	MARGIN-BOTTOM: 3px;
-	MARGIN-LEFT: 10px;
-	MARGIN-TOP: 20px;
-	PADDING-LEFT: 0px
-}
-H3
-{
-	COLOR: #000000;
-	FONT-SIZE: 80%;
-	FONT-WEIGHT: bold;
-	MARGIN-BOTTOM: -5px;
-	MARGIN-LEFT: 10px;
-	MARGIN-TOP: 20px
-}
-H4
-{
-	COLOR: #000000;
-	FONT-SIZE: 70%;
-	FONT-WEIGHT: bold;
-	MARGIN-BOTTOM: 0px;
-	MARGIN-TOP: 15px;
-	PADDING-BOTTOM: 0px
-}
-UL
-{
-	COLOR: #000000;
-	FONT-SIZE: 70%;
-	LIST-STYLE: square;
-	MARGIN-BOTTOM: 0pt;
-	MARGIN-TOP: 0pt
-}
-OL
-{
-	COLOR: #000000;
-	FONT-SIZE: 70%;
-	LIST-STYLE: square;
-	MARGIN-BOTTOM: 0pt;
-	MARGIN-TOP: 0pt
-}
-LI
-{
-	LIST-STYLE: square;
-	MARGIN-LEFT: 0px
-}
-.expandable
-{
-	CURSOR: hand
-}
-.expanded
-{
-	color: black
-}
-.collapsed
-{
-	DISPLAY: none
-}
-.foot
-{
-BACKGROUND-COLOR: #ffffff;
-BORDER-BOTTOM: #cecf9c 1px solid;
-BORDER-TOP: #cecf9c 2px solid
-}
-.settings
-{
-MARGIN-LEFT: 25PX;
-}
-.help
-{
-TEXT-ALIGN: right;
-margin-right: 10px;
-}
diff --git a/branches/2.2A_SDK5(4thNUP)/VCProj/_UpgradeReport_Files/UpgradeReport.xslt b/branches/2.2A_SDK5(4thNUP)/VCProj/_UpgradeReport_Files/UpgradeReport.xslt
deleted file mode 100644
index 8277446..0000000
--- a/branches/2.2A_SDK5(4thNUP)/VCProj/_UpgradeReport_Files/UpgradeReport.xslt
+++ /dev/null
@@ -1,232 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:msxsl="urn:schemas-microsoft-com:xslt">
-
-    <xsl:key name="ProjectKey" match="Event" use="@Project"/>
-
-    <xsl:template match="Events" mode="createProjects">
-        <projects>
-            <xsl:for-each select="Event">
-                <!--xsl:sort select="@Project" order="descending"/-->
-                <xsl:if test="(1=position()) or (preceding-sibling::*[1]/@Project != @Project)">
-
-                    <xsl:variable name="ProjectName" select="@Project"/>
-
-                    <project>
-                        <xsl:attribute name="name">
-                            <xsl:value-of select="@Project"/>
-                        </xsl:attribute> 
-
-                        <xsl:if test="@Project=''">
-                        <xsl:attribute name="solution">
-                            <xsl:value-of select="@Solution"/>
-                        </xsl:attribute> 
-                        </xsl:if>
-
-                        <xsl:for-each select="key('ProjectKey', $ProjectName)">
-                            <!--xsl:sort select="@Source" /-->
-                            <xsl:if test="(1=position()) or (preceding-sibling::*[1]/@Source != @Source)">
-
-                                <source>
-                                    <xsl:attribute name="name">
-                                        <xsl:value-of select="@Source"/>
-                                    </xsl:attribute>
-
-                                    <xsl:variable name="Source">
-                                        <xsl:value-of select="@Source"/>
-                                    </xsl:variable>
-
-                                    <xsl:for-each select="key('ProjectKey', $ProjectName)[ @Source = $Source ]">
-
-                                        <event>
-                                            <xsl:attribute name="error-level">
-                                                <xsl:value-of select="@ErrorLevel"/>
-                                            </xsl:attribute> 
-                                            <xsl:attribute name="description">
-                                                <xsl:value-of select="@Description"/>
-                                            </xsl:attribute> 
-                                        </event>
-                                    </xsl:for-each>
-                                </source>
-                            </xsl:if>
-                        </xsl:for-each>
-
-                    </project>
-                </xsl:if>
-            </xsl:for-each>
-        </projects>
-    </xsl:template>
-
-    <xsl:template match="projects">
-    <xsl:for-each select="project">
-    <xsl:sort select="@Name" order="ascending"/>
-        <h2>
-        <xsl:if test="@solution"><a _locID="Solution">ソリューション</a>: <xsl:value-of select="@solution"/></xsl:if>
-        <xsl:if test="not(@solution)"><a _locID="Project">プロジェクト</a>: <xsl:value-of select="@name"/>
-            <xsl:for-each select="source">
-                <xsl:variable name="Hyperlink" select="@name"/>
-            <xsl:for-each select="event[@error-level='4']">
-             <A class="note"><xsl:attribute name="HREF"><xsl:value-of select="$Hyperlink"/></xsl:attribute><xsl:value-of select="@description"/></A>
-                </xsl:for-each>
-            </xsl:for-each>
-        </xsl:if>
-        </h2>
-
-        <table cellpadding="2" cellspacing="0" width="98%" border="1" bordercolor="white" class="infotable">
-            <tr>
-                <td nowrap="1" class="header" _locID="Filename">ファイル名</td>
-                <td nowrap="1" class="header" _locID="Status">状態</td>
-                <td nowrap="1" class="header" _locID="Errors">エラー</td>
-                <td nowrap="1" class="header" _locID="Warnings">警告</td>
-            </tr>
-
-            <xsl:for-each select="source">
-                <xsl:sort select="@name" order="ascending"/>
-                <xsl:variable name="source-id" select="generate-id(.)"/>
-
-                <xsl:if test="count(event)!=count(event[@error-level='4'])">
-
-                <tr class="row">
-                    <td class="content">
-                        <A HREF="javascript:"><xsl:attribute name="onClick">javascript:document.images['<xsl:value-of select="$source-id"/>'].click()</xsl:attribute><IMG border="0" _locID="IMG.alt" _locAttrData="alt" alt="セクションの展開/折りたたみ" class="expandable" height="11" onclick="changepic()" src="_UpgradeReport_Files/UpgradeReport_Plus.gif" width="9"><xsl:attribute name="name"><xsl:value-of select="$source-id"/></xsl:attribute><xsl:attribute name="child">src<xsl:value-of select="$source-id"/></xsl:attribute></IMG></A> <xsl:value-of select="@name"/> 
-                    </td>
-                    <td class="content">
-                        <xsl:if test="count(event[@error-level='3'])=1">
-                            <xsl:for-each select="event[@error-level='3']">
-                            <xsl:if test="@description='Converted'"><a _locID="Converted1">変換済み</a></xsl:if>
-                            <xsl:if test="@description!='Converted'"><xsl:value-of select="@description"/></xsl:if>
-                            </xsl:for-each>
-                        </xsl:if>
-                        <xsl:if test="count(event[@error-level='3'])!=1 and count(event[@error-level='3' and @description='Converted'])!=0"><a _locID="Converted2">変換済み</a>
-                        </xsl:if>
-                    </td>
-                    <td class="content"><xsl:value-of select="count(event[@error-level='2'])"/></td>
-                    <td class="content"><xsl:value-of select="count(event[@error-level='1'])"/></td>
-                </tr>
-
-                <tr class="collapsed" bgcolor="#ffffff">
-                    <xsl:attribute name="id">src<xsl:value-of select="$source-id"/></xsl:attribute>
-
-                    <td colspan="7">
-                        <table width="97%" border="1" bordercolor="#dcdcdc" rules="cols" class="issuetable">
-                            <tr>
-                                <td colspan="7" class="issuetitle" _locID="ConversionIssues">変換レポート - <xsl:value-of select="@name"/>:</td>
-                            </tr>
-
-                            <xsl:for-each select="event[@error-level!='3']">
-                                <xsl:if test="@error-level!='4'">
-                                <tr>
-                                    <td class="issuenone" style="border-bottom:solid 1 lightgray">
-                                        <xsl:value-of select="@description"/>
-                                    </td>
-                                </tr>
-                                </xsl:if>
-                            </xsl:for-each>
-                        </table>
-                    </td>
-                </tr>
-                </xsl:if>
-            </xsl:for-each>
-
-            <tr valign="top">
-                <td class="foot">
-                    <xsl:if test="count(source)!=1">
-                        <xsl:value-of select="count(source)"/><a _locID="file1"> ファイル</a>
-                    </xsl:if>
-                    <xsl:if test="count(source)=1">
-                        <a _locID="file2">1 ファイル</a>
-                    </xsl:if>
-                </td>
-                <td class="foot">
-					<a _locID="Converted3">変換済み</a>: <xsl:value-of select="count(source/event[@error-level='3' and @description='Converted'])"/><BR/>
-					<a _locID="NotConverted">変換されませんでした。</a>: <xsl:value-of select="count(source) - count(source/event[@error-level='3' and @description='Converted'])"/>
-                </td>
-                <td class="foot"><xsl:value-of select="count(source/event[@error-level='2'])"/></td>
-                <td class="foot"><xsl:value-of select="count(source/event[@error-level='1'])"/></td>
-            </tr>
-        </table>
-    </xsl:for-each>
-    </xsl:template>
-
-    <xsl:template match="Property">
-        <xsl:if test="@Name!='Date' and @Name!='Time' and @Name!='LogNumber' and @Name!='Solution'">
-        <tr><td nowrap="1"><b><xsl:value-of select="@Name"/>: </b><xsl:value-of select="@Value"/></td></tr>
-        </xsl:if>
-    </xsl:template>
-
-    <xsl:template match="UpgradeLog">
-        <html>
-            <head>
-                <META HTTP-EQUIV="Content-Type" content="text/html; charset=utf-8"/>
-                <link rel="stylesheet" href="_UpgradeReport_Files\UpgradeReport.css"/>
-                <title _locID="ConversionReport0">変換レポート 
-                    <xsl:if test="Properties/Property[@Name='LogNumber']">
-                        <xsl:value-of select="Properties/Property[@Name='LogNumber']/@Value"/>
-                    </xsl:if>
-                </title>
-                <script language="javascript">
-                    function outliner () {
-                        oMe = window.event.srcElement
-                        //get child element
-                        var child = document.all[event.srcElement.getAttribute("child",false)];
-                        //if child element exists, expand or collapse it.
-                        if (null != child)
-                            child.className = child.className == "collapsed" ? "expanded" : "collapsed";
-                    }
-
-                    function changepic() {
-                        uMe = window.event.srcElement;
-                        var check = uMe.src.toLowerCase();
-                        if (check.lastIndexOf("upgradereport_plus.gif") != -1)
-                        {
-                            uMe.src = "_UpgradeReport_Files/UpgradeReport_Minus.gif"
-                        }
-                        else
-                        {
-                            uMe.src = "_UpgradeReport_Files/UpgradeReport_Plus.gif"
-                        }
-                    }
-                </script>
-            </head>
-            <body topmargin="0" leftmargin="0" rightmargin="0" onclick="outliner();">
-                <h1 _locID="ConversionReport">変換レポート - <xsl:value-of select="Properties/Property[@Name='Solution']/@Value"/></h1>
-
-                <p><span class="note">
-                <b _locID="TimeOfConversion">変換時間:</b>  <xsl:value-of select="Properties/Property[@Name='Date']/@Value"/>  <xsl:value-of select="Properties/Property[@Name='Time']/@Value"/><br/>
-                </span></p>
-
-                <xsl:variable name="SortedEvents">
-                    <Events>
-                        <xsl:for-each select="Event">
-                            <xsl:sort select="@Project" order="ascending"/>
-                            <xsl:sort select="@Source" order="ascending"/>
-                            <xsl:sort select="@ErrorLevel" order="ascending"/>
-                            <Event>
-                                <xsl:attribute name="Project"><xsl:value-of select="@Project"/> </xsl:attribute> 
-                                <xsl:attribute name="Solution"><xsl:value-of select="/UpgradeLog/Properties/Property[@Name='Solution']/@Value"/> </xsl:attribute> 
-                                <xsl:attribute name="Source"><xsl:value-of select="@Source"/> </xsl:attribute> 
-                                <xsl:attribute name="ErrorLevel"><xsl:value-of select="@ErrorLevel"/> </xsl:attribute> 
-                                <xsl:attribute name="Description"><xsl:value-of select="@Description"/> </xsl:attribute> 
-                            </Event>
-                        </xsl:for-each>     
-                    </Events>
-                </xsl:variable>
-                
-                <xsl:variable name="Projects">
-                    <xsl:apply-templates select="msxsl:node-set($SortedEvents)/*" mode="createProjects"/>
-                </xsl:variable>
-
-                <xsl:apply-templates select="msxsl:node-set($Projects)/*"/>
-
-                <p></p><p>
-                <table class="note">
-                    <tr>
-                        <td nowrap="1">
-                            <b _locID="ConversionSettings">変換の設定</b>
-                        </td>
-                    </tr>
-                    <xsl:apply-templates select="Properties"/>
-                </table></p>
-            </body>
-        </html>
-    </xsl:template>
-</xsl:stylesheet>
diff --git a/branches/2.2A_SDK5(4thNUP)/VCProj/_UpgradeReport_Files/UpgradeReport_Minus.gif b/branches/2.2A_SDK5(4thNUP)/VCProj/_UpgradeReport_Files/UpgradeReport_Minus.gif
deleted file mode 100644
index 17751cb..0000000
Binary files a/branches/2.2A_SDK5(4thNUP)/VCProj/_UpgradeReport_Files/UpgradeReport_Minus.gif and /dev/null differ
diff --git a/branches/2.2A_SDK5(4thNUP)/VCProj/_UpgradeReport_Files/UpgradeReport_Plus.gif b/branches/2.2A_SDK5(4thNUP)/VCProj/_UpgradeReport_Files/UpgradeReport_Plus.gif
deleted file mode 100644
index f6009ca..0000000
Binary files a/branches/2.2A_SDK5(4thNUP)/VCProj/_UpgradeReport_Files/UpgradeReport_Plus.gif and /dev/null differ
diff --git a/branches/2.2A_SDK5(4thNUP)/VCProj/bsr_trunk.ncb b/branches/2.2A_SDK5(4thNUP)/VCProj/bsr_trunk.ncb
deleted file mode 100644
index c3df735..0000000
Binary files a/branches/2.2A_SDK5(4thNUP)/VCProj/bsr_trunk.ncb and /dev/null differ
diff --git a/branches/2.2A_SDK5(4thNUP)/VCProj/bsr_trunk.opensdf b/branches/2.2A_SDK5(4thNUP)/VCProj/bsr_trunk.opensdf
deleted file mode 100644
index cdfe0d5..0000000
Binary files a/branches/2.2A_SDK5(4thNUP)/VCProj/bsr_trunk.opensdf and /dev/null differ
diff --git a/branches/2.2A_SDK5(4thNUP)/VCProj/bsr_trunk.sdf b/branches/2.2A_SDK5(4thNUP)/VCProj/bsr_trunk.sdf
deleted file mode 100644
index fc6b3cc..0000000
Binary files a/branches/2.2A_SDK5(4thNUP)/VCProj/bsr_trunk.sdf and /dev/null differ
diff --git a/branches/2.2A_SDK5(4thNUP)/VCProj/bsr_trunk.sln b/branches/2.2A_SDK5(4thNUP)/VCProj/bsr_trunk.sln
deleted file mode 100644
index 520f84d..0000000
--- a/branches/2.2A_SDK5(4thNUP)/VCProj/bsr_trunk.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual C++ Express 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bsr_trunk", "bsr_trunk.vcxproj", "{9DF31AC3-BD19-4158-BD6F-9CFE64AEE5D2}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{9DF31AC3-BD19-4158-BD6F-9CFE64AEE5D2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9DF31AC3-BD19-4158-BD6F-9CFE64AEE5D2}.Debug|Win32.Build.0 = Debug|Win32
-		{9DF31AC3-BD19-4158-BD6F-9CFE64AEE5D2}.Release|Win32.ActiveCfg = Release|Win32
-		{9DF31AC3-BD19-4158-BD6F-9CFE64AEE5D2}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/branches/2.2A_SDK5(4thNUP)/VCProj/bsr_trunk.sln.old b/branches/2.2A_SDK5(4thNUP)/VCProj/bsr_trunk.sln.old
deleted file mode 100644
index 2881d87..0000000
--- a/branches/2.2A_SDK5(4thNUP)/VCProj/bsr_trunk.sln.old
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual C++ Express 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bsr_trunk", "bsr_trunk.vcproj", "{9DF31AC3-BD19-4158-BD6F-9CFE64AEE5D2}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{9DF31AC3-BD19-4158-BD6F-9CFE64AEE5D2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9DF31AC3-BD19-4158-BD6F-9CFE64AEE5D2}.Debug|Win32.Build.0 = Debug|Win32
-		{9DF31AC3-BD19-4158-BD6F-9CFE64AEE5D2}.Release|Win32.ActiveCfg = Release|Win32
-		{9DF31AC3-BD19-4158-BD6F-9CFE64AEE5D2}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/branches/2.2A_SDK5(4thNUP)/VCProj/bsr_trunk.suo b/branches/2.2A_SDK5(4thNUP)/VCProj/bsr_trunk.suo
deleted file mode 100644
index 89dc08b..0000000
Binary files a/branches/2.2A_SDK5(4thNUP)/VCProj/bsr_trunk.suo and /dev/null differ
diff --git a/branches/2.2A_SDK5(4thNUP)/VCProj/bsr_trunk.suo.old b/branches/2.2A_SDK5(4thNUP)/VCProj/bsr_trunk.suo.old
deleted file mode 100644
index 63c7d49..0000000
Binary files a/branches/2.2A_SDK5(4thNUP)/VCProj/bsr_trunk.suo.old and /dev/null differ
diff --git a/branches/2.2A_SDK5(4thNUP)/VCProj/bsr_trunk.vcproj b/branches/2.2A_SDK5(4thNUP)/VCProj/bsr_trunk.vcproj
deleted file mode 100644
index 1a6531b..0000000
--- a/branches/2.2A_SDK5(4thNUP)/VCProj/bsr_trunk.vcproj
+++ /dev/null
@@ -1,594 +0,0 @@
-<?xml version="1.0" encoding="shift_jis"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="bsr_trunk"
-	ProjectGUID="{9DF31AC3-BD19-4158-BD6F-9CFE64AEE5D2}"
-	RootNamespace="bsr_trunk"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="0"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCNMakeTool"
-				BuildCommandLine="nmake -f yav_mcu_bsr.mak"
-				ReBuildCommandLine=""
-				CleanCommandLine=""
-				Output=""
-				PreprocessorDefinitions=""
-				IncludeSearchPath=""
-				ForcedIncludes=""
-				AssemblySearchPath=""
-				ForcedUsingAssemblies=""
-				CompileAsManaged=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				GenerateDebugInformation="true"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="�\�[�X �t�@�C��"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\accero.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\adc.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\i2c_ctr.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\i2c_mcu.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\i2c_twl.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\ini_VECT.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\led.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\loader.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\magic.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\main.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\pedo_alg_thre_det2.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\pm.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\reboot.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\rtc.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\self_flash.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\sw.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\task_debug.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\task_misc.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\task_status.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\task_sys.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\vreg_ctr.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\vreg_twl.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\WDT.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="�w�b�_�[ �t�@�C��"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\accero.h"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\adc.h"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\batt_params.h"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\bsr_system.h"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\config.h"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\fsl.h"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\fsl_user.h"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\i2c_ctr.h"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\i2c_mcu.h"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\i2c_twl.h"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\i2c_twl_defs.h"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\incs.h"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\incs_loader.h"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\jhl_defs.h"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\led.h"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\loader.h"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\pedo_lpf_coeff.h"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\pedometer.h"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\pm.h"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\pool.h"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\reboot.h"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\rtc.h"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\self_flash.h"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\sw.h"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\user_define.h"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\vreg_ctr.h"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\vreg_twl.h"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\WDT.h"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="���\�[�X �t�@�C��"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-		<Filter
-			Name="renge"
-			>
-			<File
-				RelativePath="..\renge\renge.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\renge\renge.h"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\renge\renge_defs.h"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\renge\renge_task_immediate.h"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\renge\renge_task_intval.h"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<File
-			RelativePath="..\bsr_mcu.dr"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/branches/2.2A_SDK5(4thNUP)/VCProj/bsr_trunk.vcproj.NCL.N2232.user b/branches/2.2A_SDK5(4thNUP)/VCProj/bsr_trunk.vcproj.NCL.N2232.user
deleted file mode 100644
index 257e4e7..0000000
--- a/branches/2.2A_SDK5(4thNUP)/VCProj/bsr_trunk.vcproj.NCL.N2232.user
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="shift_jis"?>
-<VisualStudioUserFile
-	ProjectType="Visual C++"
-	Version="9.00"
-	ShowAllFiles="false"
-	>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			>
-			<DebugSettings
-				Command="$(TargetPath)"
-				WorkingDirectory="C:\78k_data\yav-mcu-basara\trunk"
-				CommandArguments=""
-				Attach="false"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="REDPC2232"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor="0"
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			>
-			<DebugSettings
-				Command="$(TargetPath)"
-				WorkingDirectory=""
-				CommandArguments=""
-				Attach="false"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="REDPC2232"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor=""
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
-	</Configurations>
-</VisualStudioUserFile>
diff --git a/branches/2.2A_SDK5(4thNUP)/VCProj/bsr_trunk.vcxproj b/branches/2.2A_SDK5(4thNUP)/VCProj/bsr_trunk.vcxproj
deleted file mode 100644
index 3fe99ad..0000000
--- a/branches/2.2A_SDK5(4thNUP)/VCProj/bsr_trunk.vcxproj
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{9DF31AC3-BD19-4158-BD6F-9CFE64AEE5D2}</ProjectGuid>
-    <RootNamespace>bsr_trunk</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">nmake -f yav_mcu_bsr.mak</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
-    <NMakeIncludeSearchPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
-    <NMakeForcedIncludes Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeForcedIncludes)</NMakeForcedIncludes>
-    <NMakeAssemblySearchPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeAssemblySearchPath)</NMakeAssemblySearchPath>
-    <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <None Include="..\bsr_mcu.dr" />
-    <None Include="..\renge\renge_tasks.txt" />
-    <None Include="..\renge\renge_task_config.rb" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\accero.c" />
-    <ClCompile Include="..\adc.c" />
-    <ClCompile Include="..\batt_params.c" />
-    <ClCompile Include="..\hal.c" />
-    <ClCompile Include="..\i2c_ctr.c" />
-    <ClCompile Include="..\i2c_mcu-sub.c" />
-    <ClCompile Include="..\i2c_mcu.c" />
-    <ClCompile Include="..\i2c_twl.c" />
-    <ClCompile Include="..\ini_VECT.c" />
-    <ClCompile Include="..\kanaria_c.c" />
-    <ClCompile Include="..\led.c" />
-    <ClCompile Include="..\led_cam.c" />
-    <ClCompile Include="..\led_pow.c" />
-    <ClCompile Include="..\loader.c" />
-    <ClCompile Include="..\magic.c" />
-    <ClCompile Include="..\main.c" />
-    <ClCompile Include="..\my_led.c" />
-    <ClCompile Include="..\pedo_alg_thre_det2.c" />
-    <ClCompile Include="..\pedo_lpf_coeff.c" />
-    <ClCompile Include="..\pm.c" />
-    <ClCompile Include="..\reboot.c" />
-    <ClCompile Include="..\renge\renge.c" />
-    <ClCompile Include="..\rtc.c" />
-    <ClCompile Include="..\self_flash.c" />
-    <ClCompile Include="..\sim\simFixture.c" />
-    <ClCompile Include="..\sim\sim_interrupt_decrare.c" />
-    <ClCompile Include="..\sw.c" />
-    <ClCompile Include="..\task_debug.c" />
-    <ClCompile Include="..\task_misc.c" />
-    <ClCompile Include="..\task_status.c" />
-    <ClCompile Include="..\task_sys.c" />
-    <ClCompile Include="..\util_funcs.c" />
-    <ClCompile Include="..\voltable.c" />
-    <ClCompile Include="..\vreg_ctr.c" />
-    <ClCompile Include="..\vreg_twl.c" />
-    <ClCompile Include="..\WDT.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\accero.h" />
-    <ClInclude Include="..\adc.h" />
-    <ClInclude Include="..\batt_params.h" />
-    <ClInclude Include="..\bsr_system.h" />
-    <ClInclude Include="..\config.h" />
-    <ClInclude Include="..\fsl.h" />
-    <ClInclude Include="..\fsl_user.h" />
-    <ClInclude Include="..\hal.h" />
-    <ClInclude Include="..\i2c_ctr.h" />
-    <ClInclude Include="..\i2c_mcu.h" />
-    <ClInclude Include="..\i2c_twl.h" />
-    <ClInclude Include="..\i2c_twl_defs.h" />
-    <ClInclude Include="..\incs.h" />
-    <ClInclude Include="..\incs_loader.h" />
-    <ClInclude Include="..\jhl_defs.h" />
-    <ClInclude Include="..\led.h" />
-    <ClInclude Include="..\loader.h" />
-    <ClInclude Include="..\magic.h" />
-    <ClInclude Include="..\pedometer.h" />
-    <ClInclude Include="..\pedo_lpf_coeff.h" />
-    <ClInclude Include="..\pm.h" />
-    <ClInclude Include="..\pool.h" />
-    <ClInclude Include="..\reboot.h" />
-    <ClInclude Include="..\renge\renge.h" />
-    <ClInclude Include="..\renge\renge_defs.h" />
-    <ClInclude Include="..\renge\renge_task_immediate.h" />
-    <ClInclude Include="..\renge\renge_task_intval.h" />
-    <ClInclude Include="..\rtc.h" />
-    <ClInclude Include="..\self_flash.h" />
-    <ClInclude Include="..\sim\sfrAlias.h" />
-    <ClInclude Include="..\sim\simOnWin.h" />
-    <ClInclude Include="..\sw.h" />
-    <ClInclude Include="..\user_define.h" />
-    <ClInclude Include="..\util_funcs.h" />
-    <ClInclude Include="..\voltable.h" />
-    <ClInclude Include="..\vreg_ctr.h" />
-    <ClInclude Include="..\vreg_twl.h" />
-    <ClInclude Include="..\WDT.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/branches/2.2A_SDK5(4thNUP)/VCProj/bsr_trunk.vcxproj.filters b/branches/2.2A_SDK5(4thNUP)/VCProj/bsr_trunk.vcxproj.filters
deleted file mode 100644
index d168232..0000000
--- a/branches/2.2A_SDK5(4thNUP)/VCProj/bsr_trunk.vcxproj.filters
+++ /dev/null
@@ -1,258 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="ソース ファイル">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="ヘッダー ファイル">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="リソース ファイル">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-    <Filter Include="ソース ファイル\renge">
-      <UniqueIdentifier>{4e2142a2-478d-4e47-ab3f-7ae7d1e531bd}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="ヘッダー ファイル\sim">
-      <UniqueIdentifier>{3bd01c87-17d0-4cf4-93a8-fb6bde3060a4}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\bsr_mcu.dr" />
-    <None Include="..\renge\renge_task_config.rb">
-      <Filter>ソース ファイル\renge</Filter>
-    </None>
-    <None Include="..\renge\renge_tasks.txt">
-      <Filter>ソース ファイル\renge</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\util_funcs.c">
-      <Filter>ソース ファイル</Filter>
-    </ClCompile>
-    <ClCompile Include="..\voltable.c">
-      <Filter>ソース ファイル</Filter>
-    </ClCompile>
-    <ClCompile Include="..\vreg_ctr.c">
-      <Filter>ソース ファイル</Filter>
-    </ClCompile>
-    <ClCompile Include="..\vreg_twl.c">
-      <Filter>ソース ファイル</Filter>
-    </ClCompile>
-    <ClCompile Include="..\WDT.c">
-      <Filter>ソース ファイル</Filter>
-    </ClCompile>
-    <ClCompile Include="..\accero.c">
-      <Filter>ソース ファイル</Filter>
-    </ClCompile>
-    <ClCompile Include="..\adc.c">
-      <Filter>ソース ファイル</Filter>
-    </ClCompile>
-    <ClCompile Include="..\batt_params.c">
-      <Filter>ソース ファイル</Filter>
-    </ClCompile>
-    <ClCompile Include="..\hal.c">
-      <Filter>ソース ファイル</Filter>
-    </ClCompile>
-    <ClCompile Include="..\i2c_ctr.c">
-      <Filter>ソース ファイル</Filter>
-    </ClCompile>
-    <ClCompile Include="..\i2c_mcu.c">
-      <Filter>ソース ファイル</Filter>
-    </ClCompile>
-    <ClCompile Include="..\i2c_twl.c">
-      <Filter>ソース ファイル</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ini_VECT.c">
-      <Filter>ソース ファイル</Filter>
-    </ClCompile>
-    <ClCompile Include="..\kanaria_c.c">
-      <Filter>ソース ファイル</Filter>
-    </ClCompile>
-    <ClCompile Include="..\led.c">
-      <Filter>ソース ファイル</Filter>
-    </ClCompile>
-    <ClCompile Include="..\led_cam.c">
-      <Filter>ソース ファイル</Filter>
-    </ClCompile>
-    <ClCompile Include="..\led_pow.c">
-      <Filter>ソース ファイル</Filter>
-    </ClCompile>
-    <ClCompile Include="..\loader.c">
-      <Filter>ソース ファイル</Filter>
-    </ClCompile>
-    <ClCompile Include="..\magic.c">
-      <Filter>ソース ファイル</Filter>
-    </ClCompile>
-    <ClCompile Include="..\main.c">
-      <Filter>ソース ファイル</Filter>
-    </ClCompile>
-    <ClCompile Include="..\my_led.c">
-      <Filter>ソース ファイル</Filter>
-    </ClCompile>
-    <ClCompile Include="..\pedo_alg_thre_det2.c">
-      <Filter>ソース ファイル</Filter>
-    </ClCompile>
-    <ClCompile Include="..\pedo_lpf_coeff.c">
-      <Filter>ソース ファイル</Filter>
-    </ClCompile>
-    <ClCompile Include="..\pm.c">
-      <Filter>ソース ファイル</Filter>
-    </ClCompile>
-    <ClCompile Include="..\reboot.c">
-      <Filter>ソース ファイル</Filter>
-    </ClCompile>
-    <ClCompile Include="..\rtc.c">
-      <Filter>ソース ファイル</Filter>
-    </ClCompile>
-    <ClCompile Include="..\self_flash.c">
-      <Filter>ソース ファイル</Filter>
-    </ClCompile>
-    <ClCompile Include="..\sw.c">
-      <Filter>ソース ファイル</Filter>
-    </ClCompile>
-    <ClCompile Include="..\task_debug.c">
-      <Filter>ソース ファイル</Filter>
-    </ClCompile>
-    <ClCompile Include="..\task_misc.c">
-      <Filter>ソース ファイル</Filter>
-    </ClCompile>
-    <ClCompile Include="..\task_status.c">
-      <Filter>ソース ファイル</Filter>
-    </ClCompile>
-    <ClCompile Include="..\task_sys.c">
-      <Filter>ソース ファイル</Filter>
-    </ClCompile>
-    <ClCompile Include="..\renge\renge.c">
-      <Filter>ソース ファイル\renge</Filter>
-    </ClCompile>
-    <ClCompile Include="..\sim\sim_interrupt_decrare.c">
-      <Filter>ヘッダー ファイル\sim</Filter>
-    </ClCompile>
-    <ClCompile Include="..\sim\simFixture.c">
-      <Filter>ヘッダー ファイル\sim</Filter>
-    </ClCompile>
-    <ClCompile Include="..\i2c_mcu-sub.c">
-      <Filter>ソース ファイル</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\bsr_system.h">
-      <Filter>ヘッダー ファイル</Filter>
-    </ClInclude>
-    <ClInclude Include="..\config.h">
-      <Filter>ヘッダー ファイル</Filter>
-    </ClInclude>
-    <ClInclude Include="..\fsl.h">
-      <Filter>ヘッダー ファイル</Filter>
-    </ClInclude>
-    <ClInclude Include="..\fsl_user.h">
-      <Filter>ヘッダー ファイル</Filter>
-    </ClInclude>
-    <ClInclude Include="..\hal.h">
-      <Filter>ヘッダー ファイル</Filter>
-    </ClInclude>
-    <ClInclude Include="..\i2c_ctr.h">
-      <Filter>ヘッダー ファイル</Filter>
-    </ClInclude>
-    <ClInclude Include="..\i2c_mcu.h">
-      <Filter>ヘッダー ファイル</Filter>
-    </ClInclude>
-    <ClInclude Include="..\i2c_twl.h">
-      <Filter>ヘッダー ファイル</Filter>
-    </ClInclude>
-    <ClInclude Include="..\i2c_twl_defs.h">
-      <Filter>ヘッダー ファイル</Filter>
-    </ClInclude>
-    <ClInclude Include="..\incs.h">
-      <Filter>ヘッダー ファイル</Filter>
-    </ClInclude>
-    <ClInclude Include="..\incs_loader.h">
-      <Filter>ヘッダー ファイル</Filter>
-    </ClInclude>
-    <ClInclude Include="..\jhl_defs.h">
-      <Filter>ヘッダー ファイル</Filter>
-    </ClInclude>
-    <ClInclude Include="..\led.h">
-      <Filter>ヘッダー ファイル</Filter>
-    </ClInclude>
-    <ClInclude Include="..\loader.h">
-      <Filter>ヘッダー ファイル</Filter>
-    </ClInclude>
-    <ClInclude Include="..\magic.h">
-      <Filter>ヘッダー ファイル</Filter>
-    </ClInclude>
-    <ClInclude Include="..\pedo_lpf_coeff.h">
-      <Filter>ヘッダー ファイル</Filter>
-    </ClInclude>
-    <ClInclude Include="..\pedometer.h">
-      <Filter>ヘッダー ファイル</Filter>
-    </ClInclude>
-    <ClInclude Include="..\pm.h">
-      <Filter>ヘッダー ファイル</Filter>
-    </ClInclude>
-    <ClInclude Include="..\pool.h">
-      <Filter>ヘッダー ファイル</Filter>
-    </ClInclude>
-    <ClInclude Include="..\reboot.h">
-      <Filter>ヘッダー ファイル</Filter>
-    </ClInclude>
-    <ClInclude Include="..\rtc.h">
-      <Filter>ヘッダー ファイル</Filter>
-    </ClInclude>
-    <ClInclude Include="..\self_flash.h">
-      <Filter>ヘッダー ファイル</Filter>
-    </ClInclude>
-    <ClInclude Include="..\sw.h">
-      <Filter>ヘッダー ファイル</Filter>
-    </ClInclude>
-    <ClInclude Include="..\user_define.h">
-      <Filter>ヘッダー ファイル</Filter>
-    </ClInclude>
-    <ClInclude Include="..\util_funcs.h">
-      <Filter>ヘッダー ファイル</Filter>
-    </ClInclude>
-    <ClInclude Include="..\voltable.h">
-      <Filter>ヘッダー ファイル</Filter>
-    </ClInclude>
-    <ClInclude Include="..\vreg_ctr.h">
-      <Filter>ヘッダー ファイル</Filter>
-    </ClInclude>
-    <ClInclude Include="..\vreg_twl.h">
-      <Filter>ヘッダー ファイル</Filter>
-    </ClInclude>
-    <ClInclude Include="..\WDT.h">
-      <Filter>ヘッダー ファイル</Filter>
-    </ClInclude>
-    <ClInclude Include="..\accero.h">
-      <Filter>ヘッダー ファイル</Filter>
-    </ClInclude>
-    <ClInclude Include="..\adc.h">
-      <Filter>ヘッダー ファイル</Filter>
-    </ClInclude>
-    <ClInclude Include="..\batt_params.h">
-      <Filter>ヘッダー ファイル</Filter>
-    </ClInclude>
-    <ClInclude Include="..\renge\renge.h">
-      <Filter>ソース ファイル\renge</Filter>
-    </ClInclude>
-    <ClInclude Include="..\renge\renge_defs.h">
-      <Filter>ソース ファイル\renge</Filter>
-    </ClInclude>
-    <ClInclude Include="..\renge\renge_task_immediate.h">
-      <Filter>ソース ファイル\renge</Filter>
-    </ClInclude>
-    <ClInclude Include="..\renge\renge_task_intval.h">
-      <Filter>ソース ファイル\renge</Filter>
-    </ClInclude>
-    <ClInclude Include="..\sim\sfrAlias.h">
-      <Filter>ヘッダー ファイル\sim</Filter>
-    </ClInclude>
-    <ClInclude Include="..\sim\simOnWin.h">
-      <Filter>ヘッダー ファイル\sim</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/branches/2.2A_SDK5(4thNUP)/VCProj/bsr_trunk.vcxproj.user b/branches/2.2A_SDK5(4thNUP)/VCProj/bsr_trunk.vcxproj.user
deleted file mode 100644
index 695b5c7..0000000
--- a/branches/2.2A_SDK5(4thNUP)/VCProj/bsr_trunk.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-</Project>
\ No newline at end of file
diff --git a/branches/2.2A_SDK5(4thNUP)/WDT.c b/branches/2.2A_SDK5(4thNUP)/WDT.c
deleted file mode 100644
index ed3daf3..0000000
--- a/branches/2.2A_SDK5(4thNUP)/WDT.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* ========================================================
-	wdt
-	
-	$Id$
- ======================================================== */
-#include "incs_loader.h"
-
-/*
-
-  ���g�����A�w�b�_�Ƀ}�N��������̂݁B
-
-*/
diff --git a/branches/2.2A_SDK5(4thNUP)/WDT.h b/branches/2.2A_SDK5(4thNUP)/WDT.h
deleted file mode 100644
index 2e28e9d..0000000
--- a/branches/2.2A_SDK5(4thNUP)/WDT.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _WDT_
-#define _WDT_
-
-
-
-//=========================================================
-#define WDT_RESTART_MAGIC    0xAC
-
-
-
-//=========================================================
-// �E�H�b�`�h�b�O�^�C�}�̃��X�^�[�g
-// void WDT_Restart( void );
-#define WDT_Restart()        WDTE = WDT_RESTART_MAGIC
-
-// �K��l�ȊO�������Ɨ�O�Ń��Z�b�g��������
-#define mcu_wdt_reset        WDTE = 0x0
-
-
-#endif
diff --git a/branches/2.2A_SDK5(4thNUP)/accero.c b/branches/2.2A_SDK5(4thNUP)/accero.c
deleted file mode 100644
index aa584ec..0000000
--- a/branches/2.2A_SDK5(4thNUP)/accero.c
+++ /dev/null
@@ -1,274 +0,0 @@
-/* ========================================================
-�@�����x�Z���T�֌W
-�E�f�[�^�X�V�����Ńf�[�^���z���グ�背�W�X�^���X�V�ACPU�Ɋ��荞��
-�E�t���O�������Ă���Ε����J�E���g
-�E�����x�Z���T���荞�݂���^�X�N��o�^���ĉ������B�iI2C�̋�������Ȃǂ�����̂Łj
-
- $Id: accero.c 418 2011-09-22 01:35:37Z n2232 $
- ======================================================== */
-#ifndef _WIN32
-
-#pragma SFR
-#pragma NOP
-#pragma HALT
-#pragma STOP
-#pragma ROT
-// rorb, rolb, rorw, rolw
-#pragma MUL
-#pragma BCD
-
-#endif
-
-#ifndef _WIN32
-
-#pragma interrupt INTP23	intp23_ACC_ready RB3       // �����x�Z���T�A�f�[�^��������
-
-#endif
-
-#include "incs.h"
-#include "accero.h"
-#include "i2c_mcu.h"
-
-
-#ifndef _WIN32
-#include <math.h>
-#endif
-// ========================================================
-// ���W�X�^��
-#define ACC_REG_WHOAMI 0x0F
-#define ACC_REG_CTRL1  0x20
-#define ACC_REG_CTRL5  0x24
-#define ACC_REG_X      0x28
-
-#define ACC_REG_FLG_BURST_ACCESS	0x80
-
-// �r�b�g�ʒu
-#define ACC_bP_PM0    5
-#define ACC_bP_DR0    3
-
-// �r�b�g�ݒ�l
-#define ACC_BITS_PM_PDN   0
-#define ACC_BITS_PM_NORM  1
-#define ACC_BITS_PM_LP0R5 2
-#define ACC_BITS_PM_LP1   3
-#define ACC_BITS_PM_LP2   4
-#define ACC_BITS_PM_LP5   5
-#define ACC_BITS_PM_LP10  6
-
-#define ACC_BITS_DR_50Hz   0
-#define ACC_BITS_DR_100Hz  1
-#define ACC_BITS_DR_400Hz  2
-#define ACC_BITS_DR_1000Hz 3
-
-#define ACC_BITS_ALL_AXIS_ON 7
-
-
-#define VREG_BITMASK_ACC_CONF_ACQ  ( 1 << 0 )
-#define VREG_BITMASK_ACC_CONF_HOSU ( 1 << 1 )
-
-
-
-// ========================================================
-#define ACC_RAW_DATA_SIZE	6
-
-
-// ========================================================
-static u8 acc_retry_count;	// �����x�Z���T�ǂݏo�����A�G���[�������Ƃ����g���C����B�񐔐�����
-
-
-
-// ========================================================
-task_status tsk_soft_int(  );
-
-
-
-/********************************************//**
-�@�E���荞�݂��m�F���ăf�[�^���z���グ�A���W�X�^�ɏ����o���܂�
-
-  �E�{���ł���΃R�[���o�b�N�֐���o�^���Ă����΂��������ƂȂ�̂ł����A
-  I2C���g�p����������H�Ƃ��l����Ǝ��ł͂����܂łł��Ȃ��̂ł��B
-
-  �E���������v�Ƃ��ł�����
- ***********************************************/
-task_status_immed tski_cbk_accero(  )
-{                               // �i�^���jisr����o�^����܂�
-	u8 acc_dat_buff[ ACC_RAW_DATA_SIZE ];
-
-    // �����x�Z���T�f�[�^���W�X�^�ւ̔��f
-    if( iic_mcu_read( IIC_SLA_ACCEL, ( ACC_REG_X | ACC_REG_FLG_BURST_ACCESS ), ACC_RAW_DATA_SIZE, acc_dat_buff )
-        != ERR_SUCCESS )
-    {
-		// SLA NAK //
-        if( acc_retry_count < 4 )
-        {
-	        acc_retry_count ++;
-            // ���g���C
-            return( TSKI_CONTINUE );
-        }
-        else
-        {
-            // �����x�Z���T���ُ�ɂȂ����̂Ŏ~�߂�
-			vreg_stop_acc;
-            tski_acc_setup();
-			vreg_set_acc_error;
-            return ( TSKI_FINISHED ); // �^�X�N�̍폜�͕K�v
-        }
-    }
-    else
-    {
-        // ���펞�p�X //
-		DI_wt_chk();
-		memcpy( &vreg_ctr[VREG_C_ACC_XL], acc_dat_buff, ACC_RAW_DATA_SIZE );
-		EI();
-
-        acc_retry_count = 0;
-        // �����x�X�V�����荞��
-        if( is_acc_on && ( system_status.pwr_state == ON ))
-            {
-                set_irq( VREG_C_IRQ1, REG_BIT_ACC_DAT_RDY );
-            // �S�~�f�[�^�̃J���ǂ�
-            if( ACC_VALID )
-            {
-                u8 temp[ACC_RAW_DATA_SIZE];
-                iic_mcu_read( IIC_SLA_ACCEL, ( ACC_REG_X | ACC_REG_FLG_BURST_ACCESS ), ACC_RAW_DATA_SIZE, temp );
-            }
-        }
-        if( (( system_status.pwr_state == ON )||( system_status.pwr_state == SLEEP ))
-            &&( is_pedo_on )
-            )
-        {
-            pedometer();    // �����v
-        }
-    }
-    return ( TSKI_FINISHED );
-}
-
-
-
-
-
-/********************************************//**
-�@�����x�Z���T���߃A�N�Z�X�@���[�h
- ***********************************************/
-task_status_immed tski_acc_read(  )
-{
-    vreg_ctr[VREG_C_ACC_W_BUF] = iic_mcu_read_a_byte( IIC_SLA_ACCEL, vreg_ctr[VREG_C_ACC_R_ADRS] );
-	set_irq( VREG_C_IRQ1, REG_BIT_ACC_ACK );
-    return ( TSKI_FINISHED );
-}
-
-
-
-/********************************************//**
-�@�����x�Z���T���߃A�N�Z�X�@���C�g
- ***********************************************/
-task_status_immed tski_acc_write(  )
-{
-    iic_mcu_write_a_byte( IIC_SLA_ACCEL, vreg_ctr[VREG_C_ACC_W_ADRS], vreg_ctr[VREG_C_ACC_W_BUF] );
-	set_irq( VREG_C_IRQ1, REG_BIT_ACC_ACK );
-    return ( TSKI_FINISHED );
-}
-
-
-
-/********************************************//**
-�@�����x�Z���T�̐ݒ�
- ***********************************************/
-task_status_immed tski_acc_setup(  )
-{
-
-	// �����x on/off�ݒ肷��
-	u8      str_send_buf[4];
-
-	str_send_buf[1] = 0x00;     // ctrl2  HPF:normal, filterd, HPF for IRQ : dis/dis, HPF coeff:norm
-
-	// �s���s���̂��߁ATS�Ƃ���ȊO�i��H�Ⴂ�j����ʂ��Đݒ�
-	if( system_status.model == MODEL_TS_BOARD )
-	{
-		str_send_buf[2] = bits8(0,0,0,0, 0,0,1,0);	
-	}
-	else
-	{
-		str_send_buf[2] = bits8(0,0,0,1, 0,0,0,0);
-	}
-	str_send_buf[3] = 0x80;         // ctrl3  block update:enable, MSB first, scale: +-2G(default), selftest: dis
-
-	{
-		u8 acc_setting_sent = ( vreg_ctr[VREG_C_ACC_CONFIG] & ( VREG_BITMASK_ACC_CONF_HOSU | VREG_BITMASK_ACC_CONF_ACQ ));
-
-		if( acc_setting_sent == 0 )
-		{
-			// ���S��~
-			PMK23 = 1;
-			str_send_buf[0] =
-				( ACC_BITS_PM_PDN << ACC_bP_PM0 | 0 << ACC_bP_DR0 | ACC_BITS_ALL_AXIS_ON );
-		}
-		else
-		{
-			// on	100Hz ������荞��
-			PMK23 = 0;
-			str_send_buf[0] =
-				( ACC_BITS_PM_NORM << ACC_bP_PM0
-					| ACC_BITS_DR_100Hz << ACC_bP_DR0
-					| ACC_BITS_ALL_AXIS_ON );
-		}
-		
-		// ���������݌��A�ʐM�ł������t���O�X�V
-		if( iic_mcu_write( IIC_SLA_ACCEL, ( ACC_REG_CTRL1 | ACC_REG_FLG_BURST_ACCESS ), 4, str_send_buf ) == I2C_ERR_NOSLAVE )
-		{
-			// �Z���T���������B�^�X�N�͍폜���Ȃ��Ă͂Ȃ�Ȃ��B
-			vreg_set_acc_error;
-		    return ( TSKI_FINISHED );
-			// �����܂�
-		}
-		// else
-
-		// �Z���T�ݒ萬�� ����p�X
-		vreg_ctr[ VREG_C_STATUS_1 ] &= ~REG_BIT_ACCERO_ERR;
-		acc_retry_count = 0;
-
-		// �O��̃S�~���L��΃J���ǂ�
-		if( ACC_VALID )
-		{
-			if( system_status.pwr_state == ON )
-			{
-				u8 temp[ACC_RAW_DATA_SIZE];
-				iic_mcu_read( IIC_SLA_ACCEL, ( ACC_REG_X | ACC_REG_FLG_BURST_ACCESS ), 6, temp );
-			}
-		}
-
-		// �Z���T�ɏ����ɂ����Ă���Œ���SoC���܂����������Ă��܂���������Ȃ�
-		DI_wt_chk(); 
-		if( acc_setting_sent != ( vreg_ctr[VREG_C_ACC_CONFIG] & ( VREG_BITMASK_ACC_CONF_HOSU | VREG_BITMASK_ACC_CONF_ACQ )))
-		{
-			// DI��Ԃ̂܂܋A��
-			return ( TSKI_CONTINUE );	// ������ƊԂ������čēx�����ɂ��� // �����Ƃ悢�����H
-		}
-	}
-
-	// DI��Ԃ̂܂܋A��
-    return ( TSKI_FINISHED );
-}
-
-
-
-/********************************************//**
- �����x�Z���T���荞��
-
-  I2C���g�p����������Ȃ��̂ŁA�ǂݏo���^�X�N�̓o�^���s���̂�
- ***********************************************/
-__interrupt void intp23_ACC_ready(  )
-{
-    EI();
-    if( ( vreg_ctr[VREG_C_ACC_CONFIG] & ( VREG_BITMASK_ACC_CONF_HOSU | VREG_BITMASK_ACC_CONF_ACQ ) ) != 0x00 )	
-    {
-		// �����x�Z���T on
-		if( ( system_status.pwr_state == ON ) || ( system_status.pwr_state == SLEEP ) )
-        {
-//            if( ACC_VALID )	// �m�F�s�v
-            {
-                renge_task_immed_add( tski_cbk_accero );
-            }
-        }
-    }
-}
diff --git a/branches/2.2A_SDK5(4thNUP)/accero.h b/branches/2.2A_SDK5(4thNUP)/accero.h
deleted file mode 100644
index fbf80d6..0000000
--- a/branches/2.2A_SDK5(4thNUP)/accero.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef _accero_
-#define _accero_
-
-
-#include "jhl_defs.h"
-#include "pedometer.h"
-
-
-///////////////////////////////////////////////////////////
-task_status_immed tski_cbk_accero(  );
-task_status_immed tski_acc_setup(  );
-
-
-#endif
diff --git a/branches/2.2A_SDK5(4thNUP)/adc.c b/branches/2.2A_SDK5(4thNUP)/adc.c
deleted file mode 100644
index 94920c7..0000000
--- a/branches/2.2A_SDK5(4thNUP)/adc.c
+++ /dev/null
@@ -1,475 +0,0 @@
-/* ========================================================
-    adc.c
-    
-    											���c���J�Z
-											    nintendo
-											    '09 Apr
-    $Id$
- ======================================================== */
-#include "incs.h"
-#include "adc.h"
-#include "pm.h"
-
-#include "led.h"
-
-#include "vreg_twl.h"
-#include "i2c_mcu.h"
-
-
-// ===================================================== //
-static bit	adc_updated;
-static bit	vol_changed_by_ctr;
-bit     vol_changed_by_twl;
-static u8	vol_old;
-
-static u8	adc_raw_vol;
-static u8	adc_raw_dep;
-
-u8		vol_polling;
-u8		vol_level_twl;
-
-extern const u8	slider_to_codec[];
-
-
-
-// ===================================================== //
-typedef struct filter_work
-{
-    u8* value_used;
-    s8 diffs;                   // KIKAN���̕΂�
-    s8 kikan;
-    u8 large_diff_count;
-}filter_work;
-
-
-static filter_work work_vr_3d = {
-    &vreg_ctr[ VREG_C_3D ]
-	// �̂���͕s��l�ł悵�Bconst�ɂ�����_��
-    };
-
-
-static u8 vol_data_ctr;
-static u8 vol_data_ctr_tmp;
-static filter_work work_vr_vol = {
-    &vol_data_ctr_tmp
-	// �̂���͕s��l�ł悵�Bconst�ɂ�����_��
-    };
-
-
-// twl ��8�i�Kvol�̃��j�A�l����̋��E
-/*
-    twl����32 -> 8 �e�[�u��
-    0�`1,�`4,�`8,�`13,�`18,�`23,�`28,31
- */
-static const u8 TWL_VOL_BOUNDARY[] = {
-    1, 4, 8, 13, 18, 23, 28, 31
-};
-
-// ===================================================== //
-extern void nop8();
-static void adc_filter( u8 new_val, filter_work* work );
-static u8 adc_scaling( u8 );
-static void update_twl_vol( u8 sent_index );
-
-
-
-// ===================================================== //
-#define INTERVAL_TSK_ADC  15
-
-
-
-/********************************************//**
- ADC�ݒ�ƁA�J�n
-
-  �ȉ��̃s���͎�ɂ����ő���E�Ď�����܂��B
- - BT_TEMP,_P
- - ADIN1
- - VOL
-
- ***********************************************/
-void tsk_adc(  )
-{
-    if( adc_updated )
-    {
-        adc_updated = false;
-
-        // 3D /////////////////////////////////////////
-        vreg_ctr[ VREG_C_3D ] = adc_raw_dep;         // ���l
-
-        // Volume /////////////////////////////////////
-        {
-            vreg_ctr[ VREG_C_VOL_ADC_RAW ] = adc_raw_vol;
-
-            adc_filter( adc_scaling( adc_raw_vol ), &work_vr_vol );  // ���ʂ�*work_vr_vol����w�����vol_data_ctr �ǂ݂ɂ���...
-            vol_data_ctr = vol_data_ctr_tmp / 4;
-
-            if( vol_old != vol_data_ctr )
-            {
-                vol_changed_by_ctr = true;
-                vol_old = vol_data_ctr;
-                vol_polling = 3;
-//                renge_task_immed_add( tski_vol_update );             ���œo�^
-            }
-        }
-
-        // �o�b�e������ ///////////////////////////
-        /* �Ă΂�܂��� */
-    }
-
-    // �����Y�ꂪ����Ƃ���Ȃ̂Ń|�[�����O orz
-    if( vol_polling < 5 )
-    {
-        renge_task_immed_add( tski_vol_update );
-        vol_polling = (u8)(200 / SYS_INTERVAL_TICK) + 5;                      // 5��/sec
-    }
-    vol_polling --;
-
-
-    ADCEN = 1;
-    ADM =  bits8(0,0,0,0, 1,0,1,1);      // �Z���N�g���[�h�A�����AfCLK/6 // �������� ��
-
-    ADPC = 0x06;            // ADC�|�[�g�̃Z���N�g
-    ADS = ADC_SEL_3D;
-    nop8();
-    ADCS = 1;               // AD�J�n�B                     // �����܂Ł@���@�܂ł�1us=8clk�ȏ�J����
-
-    ADIF = 0;
-    ADMK = 0;
-}
-
-
-
-/********************************************//**
- vol�����݂̃X���C�_�̈ʒu�ɋ����X�V
- ***********************************************/
-void vol_reset()
-{
-    vol_old = vol_data_ctr;
-    vreg_ctr[ VREG_C_SND_VOL ] = vol_data_ctr; // 64�i
-}
-
-
-/********************************************//**
-�@Vol���X�V���܂��B
-
- �@����Ȏ��ɓo�^����܂��B
-
-  - ���[�U�[��Vol�X���C�_�𓮂�����
-  - Horizon�ɋ����X�V���w�����ꂽ�@�icodec���Z�b�g���j
-  - TWL�A�v����Vol����������
- ***********************************************/
-task_status_immed tski_vol_update()
-{
-    static u8 sent_index, sent_index_twl;
-    static bit last_modifyer_is_twl;  // false = ctr
-
-    if( !( system_status.pwr_state == ON ) || 
-        ( system_status.pwr_state == SLEEP )){
-        return( TSKI_FINISHED );
-    }
-
-    // �ǂ̉��ʂɂ���́H //
-	if( vol_changed_by_ctr )
-    {
-        // �X���C�_
-        vol_changed_by_ctr = false;
-        last_modifyer_is_twl = false;
-        sent_index = vol_data_ctr;
-    }
-    else if( vol_changed_by_twl )
-    {
-        // TWL�A�v��
-        vol_changed_by_twl = false;
-        last_modifyer_is_twl = true;
-        if( vreg_twl[ REG_TWL_INT_ADRS_VOL ] == 0 )
-        {
-            sent_index_twl = 0;
-        }
-        else
-        {
-            sent_index_twl = vreg_twl[ REG_TWL_INT_ADRS_VOL ] *2 +1;
-        }
-        sent_index = sent_index_twl;
-    }
-    else
-    {
-        // force_slider��0�ɂ����Ƃ� & �����܂���Ƃ�
-        //  �X���C�_��TWL�̍Ō�ɃZ�b�g���������Z�b�g
-        if( last_modifyer_is_twl )
-        {
-            sent_index = sent_index_twl;
-        }
-        else
-        {
-            sent_index = vol_data_ctr;
-        }
-    }
-
-    // ���W�X�^�̍X�V //
-    vreg_ctr[ VREG_C_SND_VOL ] = sent_index;
-
-	// twl���X�V
-	update_twl_vol( sent_index );
-
-    // codec�ɓ`����
-    /// ���l�ł�����
-    iic_mcu_write_a_byte_codec( CODEC_REG_VOL, slider_to_codec[ sent_index ] );
-
-    //    set_irq( VREG_C_IRQ0, REG_BIT_VR_SNDVOL_CHANGE );  // ���荞�ݔp�~
-    return( TSKI_FINISHED );
-}
-
-
-/********************************************//**
- TWL �։��ʂ�ʒm����B
-
- �i�K�����Ⴄ�̂ŁA�����̃P�A���s��
- ***********************************************/
-static void update_twl_vol( u8 sent_index )
-{
-	// �X�P�[�����O
-    if( sent_index == 0 )
-    {
-        vreg_twl[ REG_TWL_INT_ADRS_VOL ] = 0;
-    }
-    else if( sent_index <= 4 )
-    {
-        vreg_twl[ REG_TWL_INT_ADRS_VOL ] = 2;	// �P�̓~�b�V���O�Ő���
-    }
-    else
-    {
-        vreg_twl[ REG_TWL_INT_ADRS_VOL ] = sent_index/2 ;
-    }
-
-    // 8�i�K�̃��x�����B�@���荞�݂�����̂ɕK�v
-    {
-        static u8 vol_twl_old;
-        
-        if( vol_twl_old != vreg_twl[ REG_TWL_INT_ADRS_VOL ] )
-        {
-            // 8�i���x���ɕϊ�
-            u8 new_level = 31;
-            u8 i;
-            
-            vol_twl_old = vreg_twl[ REG_TWL_INT_ADRS_VOL ];
-
-            for( i=0; i<=7; i++ )
-            {
-                if( vreg_twl[ REG_TWL_INT_ADRS_VOL ] <= TWL_VOL_BOUNDARY[ i ] )
-                {
-                    new_level = i;
-                    break;
-                }
-            }
-            vol_level_twl = new_level;
-        }
-    }
-}
-
-
-
-/********************************************//**
-�@ADC isr
-
-�@�}���`�v���N�T�̏�Ԃ��`�F�b�N���Ă�����ׂ����֓]���A
-
-�@���O�Ŏ��̃`�����l�����N������
-
-�@�@��ʂ�I�������~�߂�
- ***********************************************/
-__interrupt void int_adc(  )
-{
-    volatile u8 adc_data = ADCRH;
-
-    switch ( ADS )
-    {
-/*
-	case ( ADC_SEL_AMB_BRIT ): 
-	// �‹����邳 //
-        vreg_ctr[ VREG_C_AMBIENT_BRIGHTNESS ] = adc_data;
-        break;
-*/
-
-    case ( ADC_SEL_3D ):	
-	// 3D�{�����[�� //
-		EI();
-        adc_raw_dep = adc_data;
-        break;
-
-    case ( ADC_SEL_VOL ):
-	// ���ʃX���C�_ // 
-        EI();
-        if( system_status.model == MODEL_TS_BOARD )
-        {
-            adc_raw_vol = adc_data;
-        }
-        else
-        {
-            adc_raw_vol = 255 - adc_data;
-        }
-
-        break;
-
-    case ( ADC_SEL_BATT_TEMP ):
-	// �o�b�e�����x // 
-		EI();
-#ifdef _ENABLE_HAL_
-		if( vreg_ctr[ VREG_C_HAL_OVW_TEMPERATURE ] == 0xFF )	// HAL����
-#else
-		if( 1 )
-#endif
-		{
-	        raw_adc_temperature = adc_data;
-		}
-		else
-		{
-			raw_adc_temperature = vreg_ctr[ VREG_C_HAL_OVW_TEMPERATURE ];
-		}
-
-        if(// (( vreg_ctr[ VREG_C_STATUS_1 ] & REG_BIT_MGIC_ERR ) == 0 ) &&
-            (( system_status.pwr_state == ON ) ||
-             ( system_status.pwr_state == SLEEP )
-             )
-            )
-        {
-            renge_task_immed_add( tski_BT_temp_update );
-        }
-        break;
-
-/* �Ă΂�܂���
-    case ( ADC_SEL_BATT_DET ):
-	// �o�b�e�����[�J�[���� //
-        break;
-*/
-    }
-
-// �����Ƃ܂Ƃ��ȏ����������肻����
-    if( ADS < ADC_SEL_BATT_DET )
-    {
-        ADS += 1;               // ���̃`�����l��
-    }
-    else
-    {
-        ADCEN = 0;              // �~�߂Ă��܂�
-        adc_updated = true;
-    }
-    ADIF = 0;               // ����������Ȃ��ƁA�������O�̃`�����l���̃f�[�^�̊����Œ���Ɋ��荞�މ”\��������
-}
-
-
-
-/********************************************//**
- adc���W�X�^����ǂݏo���A���̂܂ܕԒl�ɂ���B
- 
- tsk_adc�Ƌ������邱�Ƃ��l�����Ă��܂���B
- ***********************************************/
-u8 get_adc( u8 ch )
-{
-    u8      temp;
-
-    ADMK = 1;
-    ADIF = 0;
-
-    ADCEN = 1;
-    ADM = bits8(0,0,0,0, 1,0,1,1);          // �Z���N�g���[�h�A�����AfCLK/6  ///�������火
-
-    ADPC = 0x06;                // ADC�|�[�g�̃Z���N�g
-    ADS = ch;
-
-    nop8();
-
-    ADCS = 1;                   // AD�J�n�B                     /// �����܂Ł��@�ɁA1us�ȏ�J����
-
-    ADIF = 0;
-    while( ADIF == 0 ){;}
-    temp = ADCRH;
-    ADCEN = 0;
-
-    ADMK = 0;
-    return ( temp );
-}
-
-
-
-
-
-/********************************************//**
- VR�̉“��͈͂��l���ăX�P�[�����O
-
- ����Vol��p�@�g���񂷂Ȃ炻�̂Ƃ��ǂ��ɂ�����
- ***********************************************/
-static u8 adc_scaling( u8 orig_val )
-{
-    u16 temp;
-
-    if( orig_val <= vreg_ctr[ VREG_C_VOL_CAL_MIN ] )
-    {
-        return( 0 );
-    }
-    if( orig_val >= vreg_ctr[ VREG_C_VOL_CAL_MAX ] )
-    {
-        return( 255 );
-    }
-
-    temp = (u16)(( orig_val - vreg_ctr[ VREG_C_VOL_CAL_MIN ] ) * 256 ) / ( vreg_ctr[ VREG_C_VOL_CAL_MAX ] - vreg_ctr[ VREG_C_VOL_CAL_MIN ] );
-    if( temp > 255 )
-    {
-        temp = 255;
-    }
-
-    return( (u8)( temp & 0xFF ) );
-}
-
-
-
-
-/********************************************//**
- ����q�X�e���V�X V2
-
- �l�̌ܓ��I�ȓ������܂�
- ***********************************************/
-#define KIKAN 16
-static void adc_filter( u8 new_val, filter_work *work )
-{
-    if( abs( new_val - *( work -> value_used )) > 2 )
-    {
-        // �傫�����ꂽ
-        work -> large_diff_count ++;
-        if( work -> large_diff_count > 16 )
-        {
-            *( work -> value_used ) = new_val;
-            work -> diffs = 0;
-            work -> kikan = KIKAN;
-        }
-    }
-    else
-    {
-        work -> large_diff_count = 0;
-        // �ߏ��̒l�ł��A������Ԃł����ς��΂��Ă����炻�����Ɋ񂹂�
-        if( *( work -> value_used ) < new_val )
-        {
-            work -> diffs ++;
-        }
-        else if( *( work -> value_used ) > new_val )
-        {
-            work -> diffs --;
-        }
-
-        if( --( work -> kikan ) == 0 )
-        {
-            if( ( work -> diffs ) == KIKAN )
-//                if( ( work -> diffs ) > (s8)( KIKAN * 0.8 ) )
-            {
-                *( work -> value_used ) = *( work -> value_used ) + 1;
-            }
-            else if( ( work -> diffs ) == ( -1 * KIKAN ) )
-//            else if( ( work -> diffs ) < (s8)( -1 * KIKAN * 0.8 ) )
-            {
-                *( work -> value_used ) = *( work -> value_used ) - 1;
-            }
-            work -> diffs = 0;
-            work -> kikan = KIKAN;
-        }
-    }
-}
-
diff --git a/branches/2.2A_SDK5(4thNUP)/adc.h b/branches/2.2A_SDK5(4thNUP)/adc.h
deleted file mode 100644
index 6f4ad04..0000000
--- a/branches/2.2A_SDK5(4thNUP)/adc.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#ifndef __adc__
-#define __adc__
-
-#include "jhl_defs.h"
-
-///////////////////////////////////////
-// ANI2 P22
-#define ADC_SEL_AMB_BRIT  0x02
-
-/*
-// ANI3 P23
-#define ADC_SEL_GYRO_YAW  0x03
-// ANI4 P24
-#define ADC_SEL_GYRO_PITCH 0x04
-// ANI5 P25
-#define ADC_SEL_GYRO_ROLL 0x05
-*/
-
-// ANI6 P26
-#define ADC_SEL_3D      0x06
-// ANI7 P27
-#define ADC_SEL_VOL       0x07
-
-// ANI8 P150
-#define ADC_SEL_BATT_TEMP 0x08
-// ANI9 P151
-#define ADC_SEL_BATT_DET  0x09
-
-
-
-///////////////////////////////////////
-#define CODEC_REG_VOL 0x13
-
-
-
-///////////////////////////////////////
-extern u8 vol_polling;
-extern u8 vol_level_twl;
-
-
-
-///////////////////////////////////////
-u8 get_adc( u8 ch );
-void vol_reset();
-
-
-
-#endif
diff --git a/branches/2.2A_SDK5(4thNUP)/batt_params.c b/branches/2.2A_SDK5(4thNUP)/batt_params.c
deleted file mode 100644
index 3d6733e..0000000
--- a/branches/2.2A_SDK5(4thNUP)/batt_params.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/* ========================================================
-    �e�Ѓo�b�e���[�p�����[�^
-    $Id$
- ======================================================== */
-#include "jhl_defs.h"
-
-#include "batt_params.h"
-
-
-
-const bt_param_ bt_param[ _BT_PARAM_NUM_ ] =
-{
-    // ctr ////////////////////////////////////////////////
-    // BT_PARAM_CTR_MAXELL
-    {
-        {
-            0xAE, 0xF0, 0xB4, 0x30, 0xB7, 0x40, 0xBA, 0x30,
-            0xBB, 0x50, 0xBB, 0xB0, 0xBC, 0x50, 0xBD, 0x10,
-            0xBD, 0x60, 0xBD, 0xB0, 0xBF, 0xE0, 0xC2, 0xB0,
-            0xC4, 0x20, 0xC7, 0xB0, 0xCA, 0xE0, 0xCE, 0x10,
-            0x01, 0xF0, 0x14, 0x10, 0x14, 0x20, 0x06, 0x30,
-            0x63, 0x90, 0x49, 0x00, 0x6E, 0x00, 0x77, 0x70,
-            0x7B, 0x00, 0x19, 0x00, 0x19, 0x00, 0x17, 0xF0,
-            0x1C, 0x60, 0x12, 0x00, 0x12, 0x00, 0x12, 0x00
-            },
-        2,
-        { 92, (u8)(-256* 0.79), (u8)(-256* 4.35) },		// �@(u8)��L���X�g�̌�p�����[�^�̂܂܂̕���
-        0xD800,											// �V�X�e���Ƃ��Ă͗ǍD�ȓ���
-        { 0xEA, 0xE8 }
-    },
-
-    // BT_PARAM_CTR_PANA
-    {
-        {
-            0x8C, 0x30, 0x9C, 0x10, 0xA5, 0xE0, 0xB0, 0x40,
-            0xB1, 0xC0, 0xB2, 0x00, 0xB2, 0x50, 0xB3, 0x10,
-            0xB4, 0x90, 0xB6, 0x20, 0xB8, 0x60, 0xBA, 0x50,
-            0xBF, 0xA0, 0xC6, 0xB0, 0xCE, 0x90, 0xD0, 0x20,
-            0x00, 0x20, 0x00, 0x20, 0x00, 0x20, 0x00, 0x20,
-            0x7B, 0x30, 0x68, 0x60, 0x20, 0x00, 0x17, 0x00,
-            0x17, 0x30, 0x12, 0xF0, 0x0D, 0xE0, 0x07, 0xF0,
-            0x07, 0x00, 0x09, 0x30, 0x01, 0xC0, 0x01, 0xC0
-            },
-        1,
-        { 171, (u8)(-256* 1.00), (u8)(-256* 2.60) },	// �@(u8)��L���X�g�̌�p�����[�^�̂܂܂̕���
-        0xDA20,											// �V�X�e���Ƃ��Ă͗ǍD�ȓ���
-        { 0x69, 0x67 },
-    },
-	
-    // SPFL ///////////////////////////////////////////////
-    // BT_PARAM_SPFL_MAXELL
-    {
-        {
-            0xA1, 0x20, 0xB7, 0x50, 0xB9, 0xD0, 0xBB, 0x00, 
-            0xBC, 0x30, 0xBC, 0x60, 0xBC, 0xA0, 0xBD, 0x10,
-            0xBD, 0xC0, 0xBE, 0x70, 0xBF, 0xD0, 0xC2, 0xA0,
-            0xC4, 0x00, 0xC8, 0x50, 0xCC, 0x80, 0xD0, 0xB0, 
-            0x01, 0xA0, 0x25, 0x10, 0x18, 0xB0, 0x17, 0xC0,
-            0x95, 0x20, 0x6F, 0xE0, 0x7C, 0x60, 0x35, 0x10,
-            0x35, 0x00, 0x37, 0xF0, 0x16, 0xF0, 0x1C, 0xA0,
-            0x17, 0x30, 0x11, 0xD0, 0x11, 0xF0, 0x11, 0xF0
-            },
-        2,
-        { 94, (-256* 0.35), (-256* 3.85) },
-        0xDAB0,
-        { 0xF5, 0xF3 }
-    },
-
-    // BT_PARAM_SPFL_PANA
-    {
-        {
-            0x9C, 0xF0, 0xAD, 0x50, 0xAF, 0xB0, 0xB3, 0x00,
-            0xB3, 0xE0, 0XB5, 0x60, 0XB6, 0x70, 0xB7, 0xA0,
-            0xBA, 0x00, 0xBC, 0x00, 0xBE, 0x90, 0xC1, 0x60,
-            0xC4, 0x00, 0xC7, 0x00, 0xCC, 0xA0, 0xD0, 0xA0,
-            0x02, 0x00, 0x19, 0x10, 0x12, 0x00, 0x48, 0x10,
-            0x25, 0x10, 0x41, 0xF0, 0x2F, 0xA0, 0x13, 0xF0,
-            0x1C, 0xD0, 0x10, 0xD0, 0x0F, 0xA0, 0x11, 0x00,
-            0x10, 0xE0, 0x0C, 0x10, 0x0C, 0x00, 0x0C, 0x00
-            },
-        2,
-        { 113, (-256* 0.30), (-256* 2.25) },
-        0xDAA0,
-        { 0xE5, 0xE7 },
-    },
-
-	// SNAKE (dummy) //////////////////////////////////////
-    // BT_PARAM_SPFL_MAXELL
-    {
-        {
-            0xA1, 0x20, 0xB7, 0x50, 0xB9, 0xD0, 0xBB, 0x00, 
-            0xBC, 0x30, 0xBC, 0x60, 0xBC, 0xA0, 0xBD, 0x10,
-            0xBD, 0xC0, 0xBE, 0x70, 0xBF, 0xD0, 0xC2, 0xA0,
-            0xC4, 0x00, 0xC8, 0x50, 0xCC, 0x80, 0xD0, 0xB0, 
-            0x01, 0xA0, 0x25, 0x10, 0x18, 0xB0, 0x17, 0xC0,
-            0x95, 0x20, 0x6F, 0xE0, 0x7C, 0x60, 0x35, 0x10,
-            0x35, 0x00, 0x37, 0xF0, 0x16, 0xF0, 0x1C, 0xA0,
-            0x17, 0x30, 0x11, 0xD0, 0x11, 0xF0, 0x11, 0xF0
-            },
-        2,
-        { 94, (-256* 0.35), (-256* 3.85) },
-        0xDAB0,
-        { 0xF5, 0xF3 }
-    },
-
-    // BT_PARAM_SPFL_PANA
-    {
-        {
-            0x9C, 0xF0, 0xAD, 0x50, 0xAF, 0xB0, 0xB3, 0x00,
-            0xB3, 0xE0, 0XB5, 0x60, 0XB6, 0x70, 0xB7, 0xA0,
-            0xBA, 0x00, 0xBC, 0x00, 0xBE, 0x90, 0xC1, 0x60,
-            0xC4, 0x00, 0xC7, 0x00, 0xCC, 0xA0, 0xD0, 0xA0,
-            0x02, 0x00, 0x19, 0x10, 0x12, 0x00, 0x48, 0x10,
-            0x25, 0x10, 0x41, 0xF0, 0x2F, 0xA0, 0x13, 0xF0,
-            0x1C, 0xD0, 0x10, 0xD0, 0x0F, 0xA0, 0x11, 0x00,
-            0x10, 0xE0, 0x0C, 0x10, 0x0C, 0x00, 0x0C, 0x00
-            },
-        2,
-        { 113, (-256* 0.30), (-256* 2.25) },
-        0xDAA0,
-        { 0xE5, 0xE7 },
-    }
-};
-
diff --git a/branches/2.2A_SDK5(4thNUP)/batt_params.h b/branches/2.2A_SDK5(4thNUP)/batt_params.h
deleted file mode 100644
index 9468503..0000000
--- a/branches/2.2A_SDK5(4thNUP)/batt_params.h
+++ /dev/null
@@ -1,49 +0,0 @@
-#ifndef _bt_params_h_
-#define _bt_params_h_
-
-#include "jhl_defs.h"
-/*
-   �d�r����        CTR   | SPFL | YBS
-      0   ID = 0  maxell    ��
-    120        1
-    360        2
-    750 �@     3
-    1.3k�@     4
-    2.7k       5   pana     ��
-    8.2k�@     6
-*/
-
-
-typedef enum
-{
-    BT_PARAM_CTR_MAXELL = 0,
-    BT_PARAM_CTR_PANA,
-    BT_PARAM_SPFL_MAXELL,
-    BT_PARAM_SPFL_PANA,
-    BT_PARAM_SNAKE_MAXELL,
-    BT_PARAM_SNAKE_PANA,
-    _BT_PARAM_NUM_
-} BT_TYPE;
-
-typedef struct
-{
-    u8 rcomp;
-    s16 up,down;
-} rcomp_;
-
-typedef struct
-{
-    u8 hi,low;
-} verify_;
-
-typedef struct
-{
-    u8 mg_param[64];
-    u8 v_scale;
-    rcomp_ rcomp;
-    u16 ocv;
-    verify_ verify;
-} bt_param_;
-
-
-#endif
diff --git a/branches/2.2A_SDK5(4thNUP)/bsr.hex b/branches/2.2A_SDK5(4thNUP)/bsr.hex
deleted file mode 100644
index e91f04f..0000000
--- a/branches/2.2A_SDK5(4thNUP)/bsr.hex
+++ /dev/null
@@ -1,1005 +0,0 @@
-:02000000F40CFE
-:040010002A482C4806
-:02001C00D849C1
-:020024007F4A11
-:02002A00CA4AC0
-:08003400F74B9A4BF34B384ED9
-:02004A002E483E
-:02005A006848F4
-:02006200F64D59
-:060080008B4CC44C0E4D38
-:0400C0007EFBFF04C0
-:0A00C4001B339499E033F240BFAA09
-:1000CE00C7C1FBF8FFCEABACC736F00071F4C6610A
-:1000DE00D8710006F98EA89C018C015C10D1DD0A46
-:1000EE007110A6FB710006F9EF0B8C015C80D161DB
-:1000FE00E8710006F98F06F931030EF6B1BBF66111
-:10010E004900DD05618900EFF5FDF401FD3101FDCA
-:10011E008901FD9B09FDD208FDB02FFDA92CEFA58D
-:10012E00C0C6D7C7360000674C09DE3F318E04F6D5
-:10013E000FC1317B9EFDC411897267318E04F64F5B
-:10014E0014896142DF03F6EF01E660610667318EC6
-:10015E00124900207267318E04F64F14896142DF16
-:10016E0003F6EF01E660610687EFBC40F84F3A6197
-:10017E00E88666D161E8FD3F06C6D751065B0C31B5
-:10018E001A9F08F9D508F9DF06710009F9EF047115
-:10019E000809F98F09F9310505CD3707EF03CD377A
-:1001AE0005D908F9FD4D298F06F95CE39F06F95133
-:1001BE00035B04318EE7240000DD1023DD0823DF0E
-:1001CE000E712006F9D7713006F9D7714006F9D7AE
-:1001DE00717BFACEA010CEA180E5F300000000CE18
-:1001EE00A408F5AAFFD78F06F9310508CD0003CD77
-:1001FE00030FEF08CD030EF690BFB401CD0408CD6A
-:10020E000508F521FFCE22E9CE23F8CE24F3CE2524
-:10021E00FACE26FCCE275FCE2EFCCF1105F8CF12DC
-:10022E000511CF350002CF370019CF530006CBEEA4
-:10023E00FEFFCE3831CE3970CF38050A308700BF79
-:10024E001801BF1A01BF1C01BF1E01D7D7C7F61672
-:10025E00FD7F04717BFA31329508713295717AFA0D
-:10026E00EF0C717AFAA7F647DFE95203EF01F2C6F7
-:10027E00D7C7C1C1FBF8FF17A1C1E0C18C0A70C17D
-:10028E008C0270FDA0021006629D528C0172100449
-:10029E00C6D7C7C1FBF8FFFD5B02D2DD045203EFE8
-:1002AE00618B70FDCC03D2DD077133955202EF5294
-:1002BE008C0870FDE803FD33048B6C0170FDE803C0
-:1002CE00300400BF2401301740BF1C01300400BFB2
-:1002DE0022018C0A91DF04F6BF2A01710BE2CE4493
-:1002EE00FF3182E202EFFAAC0C148E449961790C64
-:1002FE0061690A8C0AD1DFDAFD5C04710BE271339D
-:10030E0095F2C0C6D7C7C1FBF8FFFD5B02D2DD0474
-:10031E005203EF25710AE68B70FDCC03D2DD077117
-:10032E0033955202EF138C0870FDE8038C0A70FDB2
-:10033E00E803FD5C04713395F2C0C6D7C7C1FBF864
-:10034E00FFFD5B02D2DD045203EF70710AE6710B02
-:10035E00E28B70FDCC03D2DD077133955202EF5B59
-:10036E00710BE231229544C73422FBAC0C165204B9
-:10037E008B99A5A792DFF9C68B9D4F8C089D508C4B
-:10038E000A9D513184BD02EFFA717ABDCEB144CBD4
-:10039E00B422FB8C0A318EBEB8CEBB48714BE171D4
-:1003AE004BE5710ABD8C089E44EF0F710BE68C086D
-:1003BE009E448C0A9D4EAC0CBD4CF2C0C6D7C716DF
-:1003CE00FD0B04AF0401BF0C0117FDE803D2DD07DE
-:1003DE00FD5C045202EF01F2C6D7C716710AE67130
-:1003EE000BE2669E443182E202EFFAF6420401DD30
-:1003FE0009AF0401BF0C01E2EF01F2C6D7AF28012D
-:10040E00085CFB08BF2801FD5A02AF28015CFBBF48
-:10041E002801300400BF2A01301780BF1C013004B0
-:10042E0000BF2201D7AF2401086C0408BF2401AF1E
-:10043E0028016C0F086C0B08BF2801FD5A02AF2A69
-:10044E0001085CFB08BF2A01FD5A02ED0B043004C3
-:10045E0000BF2401F6BF2A01300B0BBF2801FD5A45
-:10046E0002300B0FBF2801FD5A02300F0FBF2801BB
-:10047E00D731449501D77132956A0E03713B2571C0
-:10048E003B23E0FDAE097120F000FD5A02F6BF26B7
-:10049E00015024BF1401CB440014300F0FBF2801AC
-:1004AE00712395710BE2710AE6FD0B04CE44FF3108
-:1004BE0082E202EFFAFD5C04AF0401BF0C0171335E
-:1004CE0095714295D731349502EFFAFD3304713AA6
-:1004DE0025713A235A0EFC7128F000714395D7C747
-:1004EE002008FBF8FFFD3A085014C15008FD6C07B8
-:1004FE00C0CC07048C074C14DE0C8C07318EFDD655
-:10050E0009615907EFEECC07048C074C1461C8ED56
-:10051E00DB05CC06008C064C0461C8EDBA05300A2A
-:10052E00F9BC02F6BBCEABAC31B2D109C736410530
-:10053E007184C6DEF3F1C73641057184C661DC9C59
-:10054E0005713BD1AC02148F400599715050056175
-:10055E007902617900F0E1614900DD09C736410594
-:10056E007184C6DEC3F1C73641057184C661DC0EE7
-:10057E00059C055040C18C07318E31AD128C063171
-:10058E008E318D03BDD831FFBDDADADAADD8FDA2DA
-:10059E000CC0D2DD0C5008C15014FD6C07C0FD5FBD
-:1005AE000B8C05D1DF06615906ED23058C07318EC4
-:1005BE00FDDA09D2DD0C5008C15014FD6C07C0FDE8
-:1005CE005F0B8C05D1DF06615907ED170571605081
-:1005DE0005CC0400CC05008C054C09DE2B8C0531B6
-:1005EE008E04F61FC1317B9EFDC41189728C0531BC
-:1005FE008E04F64F14896142DF03F6EF01E6600EBA
-:10060E00049C04615905EFCF41001140F81F3A6177
-:10061E00E86159048C04D1DF08FD600BFD720CEF0C
-:10062E000C5008C15014FD6C07C0FD5F0B1008C6BE
-:10063E00D7C72004FBF8FF712B24CC0100F6BC02B7
-:10064E00AC02440900DE3EAC0204F60F1441001168
-:10065E008972AC020C5014896142DF03F6EF01E699
-:10066E00600E019C01AC021249005072AC0204F6FD
-:10067E007F14896142DF03F6EF01E6600E019C01F3
-:10068E00617902EFBB40F67FFF61F86159018C0181
-:10069E00D161F8ED3807CC0100717AFAFD7F047153
-:1006AE001300711B20710303710205E0C15003FD9D
-:1006BE00622BC05013FDAE09D83BC1E0FD622BC0CA
-:1006CE00CEABAC6159018C0191DD068C014C03DF80
-:1006DE0003E6EF01F66061FB7121048C014C0861A9
-:1006EE00F8CC010031320705A024FCEF03F524FC01
-:1006FE004024FC11DC22F524FCF0C15003FD622BDA
-:10070E00C0CE3708CBE4FFFFCBE6FFF7CED4FFCF4A
-:10071E00370008F5120561FDE6BC02F6614902DDFF
-:10072E009F00000000617902EFF1FD3A08D2DFFA76
-:10073E005008C15014FD6C07C0D2FD5F0B1004C6EB
-:10074E00D73184BD02EFFA717BBDCBE4FFFFCBE660
-:10075E00FFFFCBD4FFFF717ABED7717BBED7C7C167
-:10076E00200CFBF8FF8C0C318E31ADC1317B9DD44A
-:10077E00C0BC068DD49C088C149C0B8C14318E043A
-:10078E000C00128C0B318EBDD813FD310F61C8EDEC
-:10079E003508CEABACCC05068C0B318EFDD209D212
-:1007AE00DD158C0B318EFDD6096169058C05D1DF07
-:1007BE00E7FD6807E2EF71CC0A008C0A4C04DE54A8
-:1007CE00F6BC02300AF9BBAC06148C089EFD1189EA
-:1007DE0072AB146299AC06A1BC0661790061790214
-:1007EE00F0E1614902DFE05040C18C0B318E31AD3A
-:1007FE00128C0A318E318D03BDD831FFBDDADADAB3
-:10080E00ADD8FDA20CC0D2DD06FD6807E2EF19617E
-:10081E00590AEFA68C0B318EFDDA09D2DD03E2EF19
-:10082E000761590BED8907F2100EC6D7C7717B9D74
-:10083E00717BFAFD4F07300AF9FD850AFD100AC6D5
-:10084E00D7FD3A08FD5F0BFD6807F5ABFFF2D7C782
-:10085E00310499067110B3FBEF047118B3FB8FB31B
-:10086E00FB7B8C76D1DD5B8FB3FB9D8C4004F90353
-:10087E00DF22665C10D1DD1C8FB3FB5C10D1DD0B6B
-:10088E005080C15011FDD434C0EF095040C15011F9
-:10089E00FDD434C04004F903DD064004F904DF2220
-:1008AE00665C02D1DD1C8FB3FB5C02D1DD0B5040C8
-:1008BE00C15010FDD434C0EF095020C15010FDD4EA
-:1008CE0034C0C6D7C7360000665C80D1DD10675CC9
-:1008DE0080D1DF05713398EF0B713298EF067104FA
-:1008EE0007713198665C40D1DD10675C40D1DF0541
-:1008FE00714398EF0B714298EF0671140571419890
-:10090E00665C01D1DD10675C01D1DF05715398EF94
-:10091E000B715298EF06713407715198665C02D1D3
-:10092E00DD10675C02D1DF05716398EF1D7162986F
-:10093E00EF184007F901DF08710402716198EF0AA0
-:10094E00C736100571C4C6716198665C04D1DD109E
-:10095E00675C04D1DF05717398EF0B717298EF0627
-:10096E00714407717198665C08D1DD10675C08D11F
-:10097E00DF05710399EF0B710299EF067114077180
-:10098E000199665C10D161E8715AD1C6D7F5F6FBB4
-:10099E00F5F8FBCFFEFBFFCFFAFBFFCFFBFBFFD73C
-:1009AE00C7C1C1FBF8FFCEABAC8C02D1DD126169C1
-:1009BE0002305C03BBF6614900DDEE618900EFF5A4
-:0409CE001004C6D774
-:1009D2005208EF065203EF025206FEE600FE1B002B
-:1009E200DC16089F03088F0408089F040862FE248F
-:1009F20000089F0408EEBF00EEBA00C1C514410E04
-:100A020011D9D0FF118FD1FF312E45C4C0D7F23199
-:100A1200A2C401E2D79DE261DD4C09DF12717BFACB
-:100A2200C18F06089F25FDC0CF060800EE270031C2
-:100A3200F2FA04CF0608004C00DF05D50008DD16E7
-:100A420061DD717BFAD50608DD0ACDE31F61CD6158
-:100A5200CDEE160061CDFED40061FFFE9A00FCF8D7
-:100A6200FF0EFEB20061CDFED5004C09DF0EC18F34
-:100A720006086F25FD9F0608C0EE0400CF06080099
-:100A8200F8E3D75200EF025202FE3700CF24FD00F6
-:100A9200CF060800BF0408C716629F000841001174
-:100AA2008F1A209B4100118F1B209F0108C6510005
-:100AB200FE62FFEF025205CF060800C1510CFE0A8A
-:100AC20000C0D7C1511DFE0200C0D761DD717BFAA3
-:100AD20070CEC0A59EC47CFF9EC4609EC461CDD76B
-:100AE20061DD717BFAC18EC45C1BFED6FFCF0608A6
-:100AF20001FED7FFC061CDD731F2FA1AC1AEE4BF11
-:100B020016FDAEE6BF18FDAED4BF1AFD30FFFFBE24
-:100B1200E4BEE6BED4C0D731F2FA11C1AF16FDBEB3
-:100B2200E4AF18FDBEE6AF1AFDBED4C0D7C1BF1CEC
-:100B3200FD13BF1EFD15BF20FD17BF22FDC0D7AF9D
-:100B42001CFDDB1EFDEB20FDFB22FDD7534B30527B
-:100B52005430324E323030475631323000FFC150BD
-:100B6200FEFEAB0061DD717BFACF060800FE0A00D3
-:100B7200FEA4FF61CDF8E3EECF00C7FB0408BF1669
-:100B8200FD8FC0009C05C5C337040600BF18FD35A4
-:100B920036C40B300000522BFE6600C2C4C630724F
-:100BA2000BB800300000B8022004AF18FDB80030C6
-:100BB2000F00B802AF16FD61FF520AFE3AFFECF8D1
-:100BC200FF0E717BFAC1C7FB04088C05C65C80FE70
-:100BD2000200C0D761DD717BFA70CFC0FFA59FC054
-:100BE200007CFF9FC000609FC00061CDD7618BFE7B
-:100BF200E2FF717BBE410011FB000017CEFC0061D9
-:100C0200CB089EFDF31161C999A58392DFF7D7FE48
-:100C1200B1FED524FDDF23C1CF0308035109FEF441
-:100C2200FDC0D2DF37FE3800A20408CF0308075107
-:100C320009FEE1FDD2B20408DF22C7FB04083183BA
-:100C420002C6D7C6510AFECCFD624C1FDF06CF2476
-:100C5200FD01EF04CF24FD00C0EE5BFEC0EE55FEA9
-:100C6200C7C1FB04088B31196C0161589BC0C6D700
-:100C7200717BFAFE4DFEAF0408040600C11436D69D
-:100C82000B300000522DF3FE77FF8FC000FE2BFECB
-:100C920061CF5C807C8073C0041900CEFC0F61CBF5
-:100CA200C55404EF03C55417FE18FEC7360008BB2F
-:100CB200629C0288089C03D1DD334C41DE2F70F127
-:100CC200312DB161090033081C000851FF612A412E
-:100CD2000E118FD0FF613B118FD1FF6138DC0E8B7B
-:100CE2005C03DF0964C6C4FE2BFDEECAFDC6C4EE7A
-:020CF200C3FD40
-:100CF40061CF5100718C7109FECBF800FEFCDE015E
-:100D040000F6BF00F953C0F693935820FEDFF94173
-:100D14000036484E34CCFCEF05118B99A7A5174437
-:100D2400924EDFF53602F930CCFCEF04CC0000A77C
-:100D340047DFF9410036924E3420FEEF05118B99BE
-:100D4400A7A51744A24EDFF53630FE3094FEEF041B
-:100D5400CC0000A747DFF9FCCE0000EFFE61DD7197
-:100D64007BFABEF0ADD8BEF200AEF661CDD7C3615A
-:100D7400DD717BFABEF0ADD8BEF200DBF6FFADDC70
-:100D8400BEF000AEF6BDD8AEF40312ADDABEF2008A
-:100D9400AEF661CD03BDDAC2D7C3F33174D908838B
-:100DA400C1F626D8BDD8C031750683C312F623C256
-:100DB400FDBF0D93DF0312F623C2D7440000DD26E6
-:100DC40061DD717BFACFE80080BEF6F6BEF4BEF2B8
-:100DD400ADD8BEF0CFE800818FE8003103FAAEF061
-:100DE400F5E80061CDD7B1D7C3F33174D90883C115
-:100DF400F626D8BDD8C0317505C312F623C2FD0D41
-:100E04000E93DF0312F623C2D7440000DD2761DD11
-:100E1400717BFACFE80080BEF6F6BEF4BEF2ADD820
-:100E2400BEF0CFE800818FE8003103FAAFE000F5AF
-:100E3400E80061CDD7ADD8D7C3F33174DB0F83C1DC
-:100E4400F626D8BDD861317026DABDDAC031750D09
-:100E540083C312F626DCBDDC61317023C2FD750E3E
-:100E640093DF0CF626D8BDD861317026DABDDAC21C
-:100E7400D7C161686BDC6BDDC0DD2F61DD717BFA8E
-:100E8400CFE80080BEF4ADDCBEF6ADD8BEF0ADDA7E
-:100E9400BEF2CFE800818FE8003103FAAEF0BDD88E
-:100EA400AEF2BDDAF5E80061CDD7F6BDD8BDDAD72C
-:100EB4008292DD2B61DD717BFACFE80080BEF0F613
-:100EC400BEF2BEF46208BEF6CFE800818FE80031BE
-:100ED40003FAAFE0006072AEF0F5E80061CDD760D0
-:100EE40072F6B1D706DABDDAADDC06D8BDD861D862
-:100EF400A6DAD7D1DD17C1C3DAD89DD8ADDA311C53
-:100F040061EEB4D8DFF8BDDA13BDD8C2C0D7D1DDE5
-:100F14001BC1C3DADA9DDAADD8311E33311E337109
-:100F2400F9B4DADFF4BDD813BDDAC2C0D746D8DDD0
-:100F34000771FF7177D971C0D75BDB9DDB605BDA2A
-:100F44009DDAADDC5BD9085BD808BDD8D7C3C7F33D
-:100F5400728EFDC162314C4100363E4E1161A07269
-:070F6400C09EFD62C6C2D76A
-:0A0FF60031383A31343A3531000049
-:0A20000031383A31343A353100002E
-:10200A0005214F7B9EC5E9000104080D12171C1F0C
-:10201A00080100001F003B005A0078009700B50035
-:10202A00D400F300110130014E01192634445362E1
-:10203A006E777D80807D776E625344342619100A4C
-:10204A0008080808080808080A10AEF0B430B740B3
-:10205A00BA30BB50BBB0BC50BD10BD60BDB0BFE014
-:10206A00C2B0C420C7B0CAE0CE1001F014101420C8
-:10207A000630639049006E0077707B0019001900E2
-:10208A0017F01C6012001200120002005C003600F9
-:10209A00A70000D8EAE88C309C10A5E0B040B1C097
-:1020AA00B200B250B310B490B620B860BA50BFA014
-:1020BA00C6B0CE90D02000200020002000207B3027
-:1020CA00686020001700173012F00DE007F00700D3
-:1020DA00093001C001C00100AB000000670020DA2E
-:1020EA006967A120B750B9D0BB00BC30BC60BCA0A6
-:1020FA00BD10BDC0BE70BFD0C2A0C400C850CC8045
-:10210A00D0B001A0251018B017C095206FE07C60F0
-:10211A003510350037F016F01CA0173011D011F029
-:10212A0011F002005E00A7FF27FCB0DAF5F39CF07D
-:10213A00AD50AFB0B300B3E0B560B670B7A0BA00A7
-:10214A00BC00BE90C160C400C700CCA0D0A00200F1
-:10215A00191012004810251041F02FA013F01CD0BE
-:10216A0010D00FA0110010E00C100C000C0002009F
-:10217A007100B4FFC0FDA0DAE5E7A120B750B9D0DD
-:10218A00BB00BC30BC60BCA0BD10BDC0BE70BFD01F
-:10219A00C2A0C400C850CC80D0B001A0251018B08D
-:1021AA0017C095206FE07C603510350037F016F0C7
-:1021BA001CA0173011D011F011F002005E00A7FF29
-:1021CA0027FCB0DAF5F39CF0AD50AFB0B300B3E042
-:1021DA00B560B670B7A0BA00BC00BE90C160C400BA
-:1021EA00C700CCA0D0A00200191012004810251078
-:1021FA0041F02FA013F01CD010D00FA0110010E056
-:10220A000C100C000C0002007100B4FFC0FDA0DA33
-:10221A00E5E77F7E7D7C7A7978777675747271705E
-:10222A006F6E6D6C6A6968676665646261605F5E3D
-:10223A005D5C5A5958575655535251504F4E4D4B53
-:10224A004A494948474645434241403F3E3D3B3A59
-:10225A00393801020203030200FEFBF7F3F0F0F340
-:10226A00FA041225384D5F6E777A776E5F4D3825FE
-:10227A001204FAF3F0F0F3F7FBFE00020303020282
-:02228A00010051
-:10228C008D3CB43CD1DF26CD3C1EFD3E23FDE1222E
-:10229C003132940D3104940931329805713304EFC5
-:1022AC0003713204FD1223FDBA22FD1526D771539A
-:1022BC0094D432DD05B432715294312294037152AC
-:1022CC0094715494714102314402057140B3FBD7AF
-:1022DC007148B3FBD74A304BDC114A30B9DE0C4A9B
-:1022EC003D28DE03A43DD7713394D74A303EDC053C
-:1022FC004A30BDDC0C4A3E28DE03A43ED771329432
-:10230C00D7F43DF43ED73142980C4A3F02DE03A489
-:10231C003FD7712394D73132041240AFFB3CDE0C13
-:10232C008FB2FB5C01D1DF04712394D7712294F43A
-:10233C003FD7C7C1FBF8FF313298067130B3FBEFC2
-:10234C00047138B3FB714494713798DE4F71349833
-:10235C007141943132980E5002C15011FDD434C0E9
-:10236C00CD3229EF37E0C15011FDD434C0F432170F
-:10237C00C15002FD4A2BC0D2DF0D8B318E318D083E
-:10238C000E01081C00BD34AD3444009BDC05D5AFF8
-:10239C00FBDF095020C15011FDD434C0C0C6D78D0D
-:1023AC00209D40FDED23FD7E2BD507F9DD04710347
-:1023BC0094D78D404B2061F83164941C716394FD6B
-:1023CC007F044A4007DD054A40FFDF098F06F931DB
-:1023DC000303FD7C24FD90247102943073256194D9
-:1023EC00D7C77162017172015003FDAE095008FD2F
-:1023FC005137629D305009FD51376276716301711E
-:10240C001806F94A30F1DC0BE507F9F508F9CD3778
-:10241C0007EF224A3004DE1ACF07F9025008C150E8
-:10242C006CFD7F02C092DF0DD452DF09711006F9EA
-:10243C00EF03F507F94007F901DF05710A22EF06F2
-:10244C00710B22710302CD20075700674C08DE1078
-:10245C0073090A20614EDC05679D20EF0387EFEBC3
-:10246C004A2007DF09D507F961F8CF07F903C6D76A
-:10247C00500AFDAE09304000C15006FD2D2BC05056
-:10248C0096EDAE09C72006FBF8FFD507F961E8ED1C
-:10249C006F25304A57C1503EFD2D2BC0D2DD077140
-:1024AC0000B2FBED6F257108B2FB17040200C1509E
-:1024BC0004C1500CC1506CFDA0021006EA38AA48A9
-:1024CC00318D12AA48318E616B08616A08C1500EB9
-:1024DC00FD2D2BC0F690C1500CFD2D2BC0CC010056
-:1024EC008C014C04DE2831349502EFFA712295EA06
-:1024FC00388C015010D605C15010C18C01D6044047
-:10250C0000C1506CFD4A031006615901EFD250A571
-:10251C00FDAE09EA38AA48318D12AA48318E616B9A
-:10252C0008616A08C1500EFD2D2BC050A5FDAE09E7
-:10253C005004C1506CFD7F02C0629C01EA388A4B8A
-:10254C004E0161C3048A4A4E0117040200C15004B3
-:10255C00C1500CC1506CFD4A031006F6C1503EFD33
-:10256C002D2BC01006C6D7C78D414B3061F8ED122C
-:10257C00264A4328DE05A443ED1226F4438D309DF4
-:10258C00418D305070D612307351230480001231BB
-:10259C00FF318E039D429FAEFBF68D427C804C95A5
-:1025AC00DC1B8D42318F241400EA38BDD8AA44FDBF
-:1025BC00610D1231FF318E03318F16EF198D4231BF
-:1025CC008F241400EA38BDD8AA46FD610D1231FFE4
-:1025DC00318E03318F16EA388A427217F303164490
-:1025EC00000171FE61C836FF001701DE02F61617F6
-:1025FC00BD7AC7500CFD2D2BC0D2DF068D309D410E
-:10260C00EF047100B2FBF2C6D7C72008FBF8FF40FD
-:10261C0007F901DD064007F902DF1C17040600FD6F
-:10262C00252CD2DF0A8C069C058C079C04EF4ECC23
-:10263C000563CC0400EF4617040600FD252CD2DD03
-:10264C000F7100B2FB710394CC0500711295EF2D44
-:10265C007108B2FB8C06318E318D080E07081C00F8
-:10266C00BBEA388A4072ABFDB40EBB8C019C05D121
-:10267C00DF08CC0501CC0400EF038B9C0417040687
-:10268C0000FD302CD2DD06CC06C8CC07008C069F92
-:10269C00B1FB8C06318E318D080E07081C00BD3441
-:1026AC00AD344401A5DC08CC0364F6BD44EF48AD61
-:1026BC003426444401A0DC08CC031EF6BD44EF379D
-:1026CC00AD3444819DDC09CC030AC944F401EF27E5
-:1026DC00AD3444019BDC09CC0305C944F401EF176C
-:1026EC00AD34440191DC09CC0300C944F401EF077B
-:1026FC00711295C944F4013132040C31249408CC84
-:10270C000564CC0400EF0D8C034E05DE078C039C96
-:10271C0005CC04008C059FAFFB8C049FB0FBFDB275
-:10272C002B8D464E05DD2840AFFB0BDE054A460BD4
-:10273C00DE1440AFFB06DE054A4606DE09D5AFFBCC
-:10274C00DF0DD446DD095020C15011FDD434C08FAB
-:10275C00AFFB9D46FDEF2B1008C6D7C75601D837E7
-:10276C00C15002FD622BC08F09F93105075012FDD3
-:10277C00AE09EF0E500AFDAE09712010055008FD90
-:10278C00AE098D376C0870C15002FD622BC050032E
-:10279C00FDAE098D376C1870C15002FD622BC05014
-:1027AC0016FDAE095003FD732B625C01D1DD0F7178
-:1027BC0070B3FB5002C15013FDD434C05600667286
-:1027CC00C6D7C75004FD732B625C03D1DD40501497
-:1027DC00FD652834B3FB895C9F998A0C7CFF50FF04
-:1027EC005C14D1DD228A0C7CFF5C147234B7FB893B
-:1027FC00616A997162075600316207058666D1DFFE
-:10280C00F7716307716B2734C6FB895CEB99500237
-:10281C00FD732BD2DD398D376C1070C15002FD6207
-:10282C002BC0E0FDAE09D837C15002FD622BC05061
-:10283C0033FDAE098F09F931030971281005500ACF
-:10284C00FDAE09F0C15002FD622BC07178B3FBE004
-:10285C00C15013FDD434C0C6D7C7C12004FBF8FF48
-:10286C00CC02005004FD732B629C038C045C20D1C1
-:10287C00DD0E8C036C019C038C026C209C02EF130C
-:10288C008C045C10D1DD0C8C035CFE9C038C026C04
-:10289C00109C028C045C08D1DD0E8C036C029C0332
-:1028AC008C026C089C02EF138C045C04D1DD0C8C44
-:1028BC00035CFD9C038C026C049C028C03D1DD0533
-:1028CC00501AFDAE098C0370C15004FD622BC08FF1
-:1028DC00B3FB5C9F728C03318E316D148C03318E83
-:1028EC00314D616D08616C5C606162629FB3FB8FFE
-:1028FC00BFFB7CFF50FF5E02D1DD278FBFFB7CFF4F
-:10290C005E027234B7FB89616A99716207CC01006F
-:10291C00316207086159018C01D1DFF471630771D1
-:10292C006B27F21006C6D7D9A7FBC15006FD622B48
-:10293C00C0D9A8FBC15007FD622BC0D7FD3329F2CB
-:10294C00D7C716664C02DF08CD3A10CD3B0BEF050E
-:10295C00F43ACD3B0FC6D7C7711300711B2071031E
-:10296C0003710205E0C15003FD622BC05013FDAE94
-:10297C0009D83AC15005FD622BC0D83BC1E0FD62BD
-:10298C002BC0500AFDAE097103055008FDAE098D30
-:10299C003B6C1070C1E0FD622BC05012FDAE0950B3
-:1029AC0003FD732B625C01D1DF03E2EF24F0FD73B6
-:1029BC002B629D363602F9C75008FD4A2BC05003D6
-:1029CC00C1FD622BC0710203711A20FD0A2BF43178
-:1029DC00F2C6D75003FD732B625C01D1DD15501488
-:1029EC00FD6528FDCE275014FDAE09E0C15003FD56
-:1029FC00622BC0711300711B207103035014FDAEC8
-:102A0C0009F0C1E0FD622BC0F0C15003FD622BC088
-:102A1C00D7C72004FBF8FFCC02008D319C0350106B
-:102A2C00C150A4FD7F02C0629D31D452DD04F2ED91
-:102A3C00E72A8C037B315C08D1DD0F8D315C08D12A
-:102A4C00DF05CC0210EF03CC02208C037B315C043D
-:102A5C00D1DD158D315C04D1DF088C026C049C0235
-:102A6C00EF068C026C089C028FB2FB5CF3728D310A
-:102A7C005C0C6162629FB2FB8FBEFB7CFF50FF5E01
-:102A8C00029C02D1DD1F34B6FB896E02997162077C
-:102A9C00CC0100316207086159018C01D1DFF4715E
-:102AAC006307716B278D315C40D1DD095002C15039
-:102ABC0012FDD434C08D315C01D1DD08E0C150125F
-:102ACC00FDD434C0717AFA8D315C41D1DD0C5A31B0
-:102ADC00BED831C15010FD7847C0F21004C6D7FDE6
-:102AEC006727F2D7FDCE27F2D7C78FC6FB7617FD27
-:102AFC006528664FC6FBDFF2F5C6FBF2C6D75064FD
-:102B0C00FDAE09FD3B2C6261FB711194F1711494C3
-:102B1C0061DC70C15012FD7847C0FD8236CD610377
-:102B2C00D7C7C1C1FBF8FFAC0ABB17C15002C18C9F
-:102B3C000270C1506CFD4A0310061004C6D7C7C101
-:102B4C00FBF8FFAC08C15002C18B70C1506CFDA0EA
-:102B5C00021006C0C6D7C78806166770C1C7508456
-:102B6C00FD13031004C6D7C716C75084FD7F02C0DF
-:102B7C00C6D7C74A2004DE045600EF0256014008AF
-:102B8C00F901DF048686EF0A4008F902DF045104DC
-:102B9C00610666318F12504CD633514CD6610A0403
-:102BAC005420BD38C6D740AFFB3DDC05CF04FC0F2D
-:102BBC00D740AFFB1FDC05CF04FC0BD740AFFB0BA2
-:102BCC00DC05CF04FC07D740AFFB0661D8313204DB
-:102BDC0005CF04FC03D7D5AFFBDD04E504FCD7F52A
-:102BEC0004FCD7D504F9DF04717394D7FD3B2C6238
-:102BFC0061FB71019571149471079561C8317294E0
-:102C0C0017717294710495711194F171049561DCD2
-:102C1C0070C15012FD7847C0D7C716C75004FD4A83
-:102C2C002BC0C6D7C716C75002FD4A2BC0C6D7400B
-:102C3C00AFFB0BDE02E2D7F2D771000105717850C1
-:102C4C0005713AD5713BD18F10055CFC9F1005CFF7
-:102C5C0054054AE542057110420571004205714860
-:102C6C0050057130500571205005CF530509CF52D6
-:102C7C00050B7130510571205105713BD5717050A8
-:102C8C00058F11055CFC9F11058F10055CFC9F10D6
-:102C9C0005F422D77178500571080105D7FD7C38F1
-:102CAC00FD7F04717AFAFDAB23F504F98F06F93137
-:102CBC00051B5003FD732B625C01D161E8CF04F955
-:102CCC0002CFAFFB64710407714194EF10F67104ED
-:102CDC0007611012F6B1236061FB714194FD9030D5
-:102CEC00FD1C43712297712BE7618461A461EDEFA8
-:102CFC00F8D77140F00071783002713AE6713BE21E
-:102D0C00713BEA713BEE8F10055CFC9F1005CF34D4
-:102D1C00024AE552FF711A52710A5271483002711F
-:102D2C0030300271203002CF330209CF32020B71E6
-:102D3C0030310271203102713BE6717030028E2607
-:102D4C005CFC9E265A06FC71603002D7717830020A
-:102D5C007148F000D7C788061666614FDD096761B8
-:102D6C004EDE0396EF01866672C6D7C7161714AAF5
-:102D7C000412A943DD29AA0412A923FDA24EC3AC57
-:102D8C0002FDA24E13C2BDD813FD310FDE0C171479
-:102D9C00AA0212AA0403BA04EF051714A9BA04ACC8
-:102DAC00041231FF319E03317F087208C6D77100BF
-:102DBC00F200304400BFB601300188BF90013009E9
-:102DCC0084BF9E01BF9C01BF9A01BF9801BF9601B1
-:102DDC00BF9401BF9201F53CFF30FE00BFBE01F66F
-:102DEC00BFBC01BFB80150EEBFBA01A1BFB201C94F
-:102DFC0018FE008F06F9310507F5CDFBCB6CFF00F3
-:102E0C00717395716295D730EF00BFB401F6BFBAFC
-:102E1C00017108F200712304715307BE6EBE64BECB
-:102E2C006A712304715307715BD1F455F4547163C7
-:102E3C0095D78D56B456D1DF6931D4D105715BD19C
-:102E4C00E455D455DD2E7140B2FBD854F1E7340271
-:102E5C000023DD0625DD0325DF05F6BE66EF06D96A
-:102E6C00CCFBF1BE66A4544A5420DF04F454F45550
-:102E7C00CD5619D7CD561E7148B2FBD5CEFBDF040B
-:102E8C00F6BE66D7D9CCFBF14266FFDD15D9CCFB7B
-:102E9C00F112AE6643DE05A266FFEF03B266FFCD0C
-:102EAC005603D7C7161714F6B9AA0412F623123113
-:102EBC00FF31AE03316FBA02C6D7C7C1FBF8FF8C26
-:102ECC00085080D612AB1413B9AB14AA0412A92360
-:102EDC0012D927FBF133BDD813FD9D0DBA02C0C624
-:102EEC00D731049601D74004F902DF10F6BE64BE58
-:102EFC006EBE6ABF8EFBBF94FBBF9AFB31749514F8
-:102F0C00308AFBFDAF2E3090FBFDAF2E3096FBFDD3
-:102F1C00AF2EEF713114960D7113967108D2FBF42C
-:102F2C0058F457EF60D457DF5A8F26FB9D574A58F9
-:102F3C001FDC177100D2FB4028FBFFDD1CA4598F4E
-:102F4C0028FB4B59DE13F458EF0FD858F1A1605CF5
-:102F5C001F9D587108D2FBF459E858092AFB70C11F
-:102F6C00308AFBFDC62EC0E858094AFB70C1309070
-:102F7C00FBFDC62EC0E858096AFB70C13096FBFDFC
-:102F8C00C62EC0B457308AFBFD772DF313BE6E30BE
-:102F9C0090FBFD772DF313BE6A3096FBFD772DF376
-:102FAC0013BE64D7C736F00071F4DC297170F000E1
-:102FBC00CE9D08CE9EC0CE9F80F594FFF593FFF575
-:102FCC0092FFE597FFE596FFE595FFE598FFCE9C10
-:102FDC007F7100A6FB711BE3712BE3711AE7712B58
-:102FEC00E7717A9D710A9E31929E02EFFA710B9EE7
-:102FFC00712396713396714396C6D7C73122961EAC
-:10300C00712296710A9E31929E02EFFA34D4FB36ED
-:10301C0092FF52078B99A5A792DFF9710B9EC6D729
-:10302C00C788061631329615713296C7349CFB3020
-:10303C0092FF1652078B99A5A792DFF9C6667367A4
-:10304C00189CFBC6D7C77123963134961E713396E4
-:10305C00710A9E31929E02EFFA3492FF369CFB521B
-:10306C00078B99A5A792DFF9710B9E3144961371CA
-:10307C004396717B9E8FDCFB9E9A8FDDFB9E9B7132
-:10308C007A9EC6D7CFA7FB5CCFA8FB5FCFC8FB5DF2
-:10309C00CFFCFB36CFFDFBC9D7C7CFA4FB12CFA506
-:1030AC00FB26CFCCFBFFF5CDFBF5CEFBF5CFFBF52F
-:1030BC00D0FB5600664C64DE08723826FB0086EFA7
-:1030CC00F3F5E3FB710A20711A20710203C6D7C70E
-:1030DC0088061617F1E73403002361E3ED0C342363
-:1030EC0061F8EDDE32B12361E3EDE8322561F8EDF4
-:1030FC00F632B1240D0061D8ED0C34240B0061F8CC
-:10310C00EDD0312361F8ED13322361F8EDE3312377
-:10311C0061F8ED013424060061F8ED9232B12561BD
-:10312C00D8EDAE3224000061F8EDBB322361F8ED2E
-:10313C000C342361F8ED0634B12361E3ED1633232F
-:10314C0061F8ED27332361F8ED38332361F8ED276F
-:10315C00332361F8ED49332361F8ED5A332361F8D9
-:10316C00ED69332361F8ED8B332361F8ED9733234D
-:10317C0061F8EDA2332361F8EDAA33240200236138
-:10318C00E3ED0C342361F8EDDE332361F8EDB2335B
-:10319C002361F8EDBD332561F8EDC833B124060089
-:1031AC0061D8ED0C3424000061F8ED0E342561F883
-:1031BC00EDD33324120061F8ED8C322361F8ED7CF1
-:1031CC0032ED0E3467D1DD0C30AB3B619434C4FB73
-:1031DC0089616F99ED1834675C02D1DD0730EB2AF9
-:1031EC006194EF0B675C01D1DD0530F02A619467C7
-:1031FC005C3CD1DD0F30F52A6194675C3C726673E0
-:10320C006218A4FBED183467D1DD625C01D1DD05D9
-:10321C00300800EF01F6609F01FC675C02D1DD0312
-:10322C00E6EF01F63401FC89616899675C04D1DD35
-:10323C0004E6A1EF01F63401FC89616899675C082A
-:10324C00D1DD05302000EF01F63401FC896168996D
-:10325C00675C10D1DD05301000EF01F63401FC89FC
-:10326C00616899675C20D161E8716001FCED1834EC
-:10327C004A5AC8DE08E85A67185AFAA45AED1834A4
-:10328C00679D5AED1834D448DF08679FCDFBA448DE
-:10329C00EF0D4A4805DE08E848671811FDA448ED13
-:1032AC001834675C0F7266736218A4FBED18344A0D
-:1032BC004864DE1B4A4801DF0667D161F85701E814
-:1032CC0048671826FBA4484A480561C8711296ED58
-:1032DC00183434A6FB89615F99ED183430482961A4
-:1032EC009466736718A4FBED183440A9FB6ADF13CE
-:1032FC0040AAFB68DF0D674C6CDF083059406194C5
-:10330C00713AD5679FABFBED1834675C7F70C117C2
-:10331C00F1243000FD2C30C0ED1834675C3F70C1D7
-:10332C0017F1243000FD2C30C0ED1834675C0770A9
-:10333C00C117F1243000FD2C30C0ED1834675C1F30
-:10334C0070C117F1243000FD2C30C0ED18346770BB
-:10335C00C117F1243000FD2C30C0ED1834CEABACCD
-:10336C00710A9E31929E02EFFAD592FFDF05710B26
-:10337C009EEFED679E99710B9E9FDBFBED183471F0
-:10338C004296675C7F9FDCFBED1834714296675C5C
-:10339C003F9FDDFBEF76675C3F9FDEFBEF6E675C6C
-:1033AC001F9FDFFBEF663060396194679FE4FBEF92
-:1033BC005B302D396194679FE5FBEF5030463961E6
-:1033CC0094679FE8FBEF45675C01D1DD3FFD1C4333
-:1033DC00EF3A675C02D1DD05712A21EF06714A9D37
-:1033EC00712B21675C01D1DD06710300710B206725
-:1033FC009FE3FBEF1767318EEF12679FD3FBEF0C48
-:10340C00EF0A664C5BDE05736718A4FBC6D7C716BC
-:10341C00664C30DC094C37DE05FD0730EF6B664C33
-:10342C0002DF1F8FA6FB5C03728F03FC5C03318EE3
-:10343C00316D08616A08128F03FC5C80312A61626D
-:10344C00EF56664C3DDF08AE90BD5CF85CEF49660C
-:10345C004C3EDF04F85DEF40664C4FDF05FD444306
-:10346C00EF36664C61DF08E85A095AFA72EF2966A2
-:10347C004C7FDF05FD213CEF1F664C4EDF0B31040A
-:10348C0098045210EF12F2EF0F664C5BDC0452FF03
-:10349C00EF06667309A4FB72C6D7C788061617F128
-:1034AC00241000240500DC07244C00DD17EF1771F5
-:1034BC007BFA17F104A4FB1489617F99717AFA7174
-:1034CC005296EF02A45AC6D7C7C1C1FBF8FF4004FD
-:1034DC00F903DD064004F904DF38717BFA8C0273C2
-:1034EC0009ACFB5E0AD1DF278C02318E04A4FB14DD
-:1034FC00896E0A99716207717AFACC010031620700
-:10350C00086159018C01D1DFF4716307716B27716C
-:10351C007AFA1004C6D7CF03FC03F501FCF505FCC1
-:10352C00F507FCD7C788061617F1E734020025DD2E
-:10353C003D23DD1725DD1C23DD0523DD2BEF3B7142
-:10354C000297679F06FCCD6103EF2F675C839F0397
-:10355C00FCEF27675C039F05FC675C034C0261F87A
-:10356C00712298FD3245EF12679F07FCEF0C6791B3
-:10357C00DF08E0C15012FDD434C0C6D7C71617F10E
-:10358C00E7240000DD2A23DD1E240300DD0724FBD5
-:10359C0000DD24EF2531329805308000EF01F6086C
-:1035AC006F04FC7208EF198F01FCF501FC72EF102F
-:1035BC007152975235EF09F2EF0666730900FC72EF
-:1035CC00C6D7C71617F1E7240000DD38241000DD3C
-:1035DC001C23DD1C23DD30240E00DD18241100DD3E
-:1035EC001B240F00DD12243000DD15EF1EE2EF1D51
-:1035FC005202EF195204EF155206EF115205EF0D5E
-:10360C005207EF09F2EF065203EF0252FFC6D7C77B
-:10361C00316496377163968D609FACFB8D5F9FCB49
-:10362C00FB36D2FCC7D85FFD8237618A70618AFD98
-:10363C00C737C0D864F1312F609D638D5E4B63DD5D
-:10364C000A7172968D639D5ECD61034A6105DE0839
-:10365C00308C366194CD616BB4617150F000CE301A
-:10366C000BCF170006CE3106FD5A02717A30710B62
-:10367C00E3710BE7C6D78D639D5E8D639FADFBD762
-:10368C004004F903DF064004F904DF02F2D7317479
-:10369C00960C7173967113978D639D65EF313104A0
-:1036AC00971F710397711297D506FCDF04F466EF30
-:1036BC000A8F06FC5002D6A1609D668D669D65EF53
-:1036CC000E311497068D669D65EF048D639D658D97
-:1036DC00659FADFBD865FDF436E865091C2270C109
-:1036EC005013FD7847C0F2D7C7C1C1FBF8FF8C025D
-:1036FC00D1DF05F506FCEF1A8C024C05DE06CF0671
-:10370C00FC02EF0E8C02318E1231FE03311F609FD2
-:10371C0006FC8D674F06FCDD28CC011F8F06FC9D37
-:10372C0067CC00008B4C08DE148B730912204F06FB
-:10373C00FCDC058B9C01EF05615900EFE78C019DCA
-:10374C00621004C6D7C716710AE7710BE37150F00B
-:10375C0000CE300BCF170006669E31FD5A02717AEF
-:10376C0030710BE33182E302EFFA8D1F7158F000D8
-:10377C00710BE772C6D7C7C1C1FBF8FF8FFCFB4EBC
-:10378C0002DC03F2EF318C024FFDFBDC0452FFEF45
-:10379C00268C022FFCFB706131318D128FFDFB2FBB
-:1037AC00FCFB70613133BDD813FDBF0DBB44000170
-:1037BC00DC03F690BB8B721004C6D7C7C1FBF8FFB5
-:1037CC00AC0814A91489708B6128706131FDA24E6C
-:1037DC001344030071FEDC23AC08148A04819A04A0
-:1037EC00AC08148A044C11DC10A9148B99AC081485
-:1037FC00CA0200AC0814CA0310EF72AC0814CA0455
-:10380C0000AC0814A914894DDE0AAC08148A028194
-:10381C009A02EF12AC0814A914894D61D308AC08B4
-:10382C00148A02919A02AC08148A03919A03D1DF8C
-:10383C003CAC08148A024C10DF10A91489318EA1FB
-:10384C0012AC0814A9146299EF17AC08148A024C34
-:10385C00F0DF0EA91489318EB112AC0814A91462D0
-:10386C0099AC0814CA0200AC0814CA0310C0C6D71D
-:10387C00ED7F38C75600664C0ADE0BF0317E12F62F
-:10388C007810FC86EFF0C6D7C7200CFBF8FF1704A6
-:10389C000600C15006C150A8C15030FDA002100650
-:1038AC00D2DD1B4A6A04DE05A46AE2EF7034E4FB45
-:1038BC00895CFC99FD60397110B2FBF2EF5F717B92
-:1038CC00FA300600C117040600C130E9FBFDAA4E10
-:1038DC001004717AFAF46A8FE4FB5C01D1DD2640A6
-:1038EC0004F903DF205010C180FDD434C0C736105A
-:1038FC000571D4C6DE0F17C15006C150A8C1503097
-:10390C00FDA00210064004F903DD064004F904DFB3
-:10391C000B8FE4FB5C02D161E8FD5E40F2100CC63B
-:10392C00D7D9E5FBC15030FD7F02C0629FE8FB5048
-:10393C0008C15011FDD434C0F2D7D9E8FBC1D9E786
-:10394C00FBC15030FD130310045008C15011FDD4BD
-:10395C0034C0F2D7C7200CFBF8FFCC09004007F9A4
-:10396C0001DF05CC0A02EF03CC0A10CC0B808FE4EC
-:10397C00FB5C039C07D1DF08717AD5CC0807EF06F6
-:10398C00717BD5CC082F17040800C15004C150A07E
-:10399C00C15030FD4A031006624C02DF077110B2B1
-:1039AC00FBF2EF357118B2FBF46AC736100571D40F
-:1039BC00C6DE164004F903DF1017A1C15006C15032
-:1039CC00A8C15030FDA0021006717BFA8FE4FB5C9D
-:1039DC00034E07DD03E2EF01F2100CC6D7D504F954
-:1039EC00DF03F6BD6C4004F901DD0AD476DD03B4C7
-:1039FC0076D7CD76038F04F9318FE723DD0B2402C4
-:103A0C000024030061C8ED193B8F06F931234930BE
-:103A1C001B00466CDF158FE3FB5C01D161E8F504FC
-:103A2C00F9E0C15010FDD434C0EF1D307701466C65
-:103A3C00DF165002C15010FDD434C0F64672DF08B8
-:103A4C008FC8FB5010D6BD72F64672DD36B6724684
-:103A5C0072DF30711295EF2B301B00466CDF13F6C2
-:103A6C004674DF18E0C15010FDD434C0C97453073C
-:103A7C00EF0A307701466C61F8711295F646746165
-:103A8C00E8B67431549808714397F6BD6CEF143155
-:103A9C00449705F6BD6CEF0BA66CF6466C61F8C945
-:103AAC006CFFFF316298194A6E05DE16A46E4A6EE1
-:103ABC0005DF0FA46E5004C15010FDD434C0EF02CA
-:103ACC00F46E316498194A7005DE16A4704A7005BC
-:103ADC00DF0FA4705008C15010FDD434C0EF02F4B5
-:103AEC0070D471DD03B471D7317298174A6F05DE4B
-:103AFC0014A46F4A6F05DF0DA46F5010C1FDD434B0
-:103B0C00C0EF02F46F4A6F0661F8CD7125D7C73646
-:103B1C00100571D4DE0E8FB2FB5C02D1DF0630943F
-:103B2C00386194D24004F903DF1C31220705301DA3
-:103B3C002A61943154970C7153975080C15012FDE7
-:103B4C00D434C0FD573BFD7D3BC6D78F03FC5C01D5
-:103B5C00D1DD1DD479DD03B479D7CD79098D624BD4
-:103B6C0078DD0D8D629D785040C15012FDD434C06B
-:103B7C00D74004F903DD04F6BD1AD7D5D0FBDF0816
-:103B8C00F6461ADD19B61AD7D9CCFBF1461ADD0E5A
-:103B9C00D9CCFB12AD1A43DE03A61AD7B61AD771CD
-:103BAC007BFAC78FC4FB76F5C4FB717AFA5C10D133
-:103BBC0061E8716297665C0FD1DD57665C01D1DDFF
-:103BCC0005F504F9EF4C665C02D1DD11E0C1500340
-:103BDC00FD622BC0711300711B20710303665C0422
-:103BEC00D1DD11711300711B20D503FC61F8710339
-:103BFC0003FD2235665C08D161E87103035005FDB5
-:103C0C00AE097102035003C1FD622BC0711A20FD75
-:103C1C000A2BF2C6D7C756FF4A481361C8EDD73CEA
-:103C2C008F06F9311505300400EF0F8F06F9314579
-:103C3C0005300500EF04D907F9F1609F28FC8D7A57
-:103C4C009F29FC713494E661301271049461DC316B
-:103C5C00196162629F2AFCE52BFC314498053040C7
-:103C6C0000EF01F6C131340405302000EF01F6C23B
-:103C7C00616B08616A08C131749805300400EF016A
-:103C8C00F6C2616B08616A08C131649804E6A1EF61
-:103C9C0001F6C2616B08616A08C131549803E6EF02
-:103CAC0001F6C2616B08616A9F2CFCF171240461FE
-:103CBC00DC9F26FCF171540761DC9F27FCD848F18E
-:103CCC000104ECFC14A9148976A4486672C6D7C703
-:103CDC00FDD2088F04F9318FE724000061F8EDB3B1
-:103CEC003E23DD1B2361F8EDBF3D2361F8ED383E2B
-:103CFC002361F8ED813E2361F8ED533FEDB03EF6C4
-:103D0C00BD727113954005F901DF2C3134981B46B7
-:103D1C006CDD04F424EF02A4244A2465DC0FF6BD08
-:103D2C006CF504F9712297EDD43FFDAB23AD6C44D7
-:103D3C000A0061D8EDD43F714297FD7F0471639402
-:103D4C00FDAB234007F903DF09712297F504F9ED68
-:103D5C00D43FFD152640B1FB9BDE09712297F5047B
-:103D6C00F9EDD43F714A277140110571301105717D
-:103D7C003A22715A2271501105FD6329D2DD097165
-:103D8C002297F504F9EDD43F71103500CF37001DA3
-:103D9C00714012054005F901DD064005F903DF0508
-:103DAC00F5CDFBEF04CFCDFB03CF04F902FD332996
-:103DBC00EDD43FFD452CFDFE2C714A9D712B21FD50
-:103DCC002235FDA530F537FF712BE0F505F9712291
-:103DDC0097CBE43FEFCBE6F6F0FD7F04713BD48F3D
-:103DEC0006F93105285004FD732B625C03318E31CA
-:103DFC005D34B3FB896168995002FD732BD2DD06EB
-:103E0C007170B3FBEF047178B3FBFDAB23FDBA2DDE
-:103E1C00710806F9CF04F9038FA6FB5C02D1DD090A
-:103E2C005080C15010FDD434C0EDD43FFDD63F318D
-:103E3C0064972FA47CD47CDD0831A4E00A31020CF9
-:103E4C0006712BE0FD4A4031A4E01731040C1371CC
-:103E5C002BE05027C15005FD622BC0CF04F9047133
-:103E6C002297FD3F408F06F931250731349803F531
-:103E7C0004F9EDD43FFDD63F31020C15D83AC150B0
-:103E8C0005FD622BC05005FDAE09FD4A40CF04F97B
-:103E9C0003FD3F408F06F931250731349803F504B3
-:103EAC00F9EDD43FF504F9CFCDFB03F5CEFBF5D0FE
-:103EBC00FB717295F6426CFF61E8EDD43FF6BD7272
-:103ECC00711395F5E4FBFD6039717AFAFD132EFD43
-:103EDC00A02CFD582D712B21714B9D31349502EF87
-:103EEC00FACE3708CBE4BFFFCBE6FFF3CED4FFF519
-:103EFC00B4FBF5B5FBF5B6FBF5B7FBCF3700097195
-:103F0C00481205F6BEE0BEE2BED0716A27FDDF297D
-:103F1C00714307714B2771481005714811057138B1
-:103F2C00100571381105713302713B227153027106
-:103F3C005B227158100571581105CF04F9057142B7
-:103F4C0097F6BD6CFD9B09F505F9F4243134980402
-:103F5C00D432DD20E505F9E504F98F06F931256841
-:103F6C00F5F8FBF5F6FB502EFDAE09CF05F903E590
-:103F7C0004F9EF54FDD304FD3E2371730171320437
-:103F8C0071430271039471629431949E02EFFA7141
-:103F9C002AE7CEA409F5F3003104070261FDE5F32D
-:103FAC0000F468FDD208CEA40831329806CF04F98B
-:103FBC0005EF09714397E505F9E504F9712BE78FD6
-:103FCC0006F9312503F504F9C6D78FE3FB5C01D163
-:103FDC00DF60D47DDF19310200585003FD732B6272
-:103FEC005C01D1DF07F504F9712297D7E47DD74A3C
-:103FFC007DF0DF073104003AF47DD74A7DC8DF0A33
-:10400C00F504F9712297CD7DF0D7310200084A7D75
-:10401C00FFDD1FA47DD7F0C15004FD622BC08FB310
-:10402C00FB5C9F9FB3FB7110C4FB30AB3B6194CD29
-:10403C007DF0D731149506F504F9712297D7716389
-:10404C0097F47C717207FD5A02717307D7FDED046A
-:10405C00F2D7717BFAC7200CFBF8FF8FEAFBF0F963
-:10406C00E9FBF303FDA24E13BC048FECFBF0F9EB60
-:10407C00FBF303FDA24E13BC028FEEFBF0F9EDFB3C
-:10408C00F303FDA24E13BB717AFAAC04BDD8F6BD96
-:10409C00DAAC04311EBDDCF6BDDEFD720DADD8BD53
-:1040AC00DCADDABDDEAC02BDD8F6BDDAAC02311E39
-:1040BC00DADCC3DADEC3BDDCF6BDDEFD720DC0BDDD
-:1040CC00DEC0BDDCADDEFDE80EADD8BDDCADDABDCD
-:1040DC00DEABBDD8F6BDDAAB311EDADCC3DADEC33B
-:1040EC00BDDCF6BDDEFD720DC0BDDEC0BDDCADDEDF
-:1040FC00FDE80EDADAADD8FD2D44C3C58D8A5C3FE0
-:10410C00F0317E0440FC14C2C0B9A48AF6BC08BCD1
-:10411C000A9C078C074C2EDD3D8D8A0E0770F161D1
-:10412C00DC605C3FF0317E127940FCBDD8F6BDDA24
-:10413C008C0773095C22318FBDDC70BDDEFD720D06
-:10414C00AC08BDDCAC0AFDE80EADDABC0AADD8BCDF
-:10415C0008615907EFBDAC08BDD8AC0ABDDAC9DCA3
-:10416C000004F6FD3C0EC9DCFFFFF6FD3D0FADD89B
-:10417C00BD84AF3AFC4684DD11AF3CFCBF3EFCAFC6
-:10418C003AFCBF3CFCAD84BF3AFCAF3CFC423EFC6D
-:10419C00DC46AF3AFC423CFCDE3EAD26423AFCDE4D
-:1041AC00374A2A16DC1A4A2AA0DE138D864B2ADEE1
-:1041BC000DAF3AFC268844691061C8FD1642F42AFA
-:1041CC00AF3AFC445146DC0AAF3AFC241027BD2818
-:1041DC00EF0DC928F82AEF074A2AFF61E8A42AAF95
-:1041EC003EFC423CFCDC18AF3CFC423AFCDE10AF1F
-:1041FC003AFC4628DE09F486AF3AFCBD88EF074A44
-:10420C0086FF61E8A486100CC6D7717BFAC7710AC9
-:10421C009E31929E02EFFA8E949F34FC8E969F35BF
-:10422C00FC8E979F36FC8E989F37FC8E939F38FCA4
-:10423C008E929F39FC710B9E717AFA8F37FCFD516F
-:10424C000F76FDAB4313BD82D5EFFBDF0AD5F0FB38
-:10425C00DF05D5F1FBDD25F6B14682DF11C98237CA
-:10426C0022665C0391DF060A82181A83009617FDFA
-:10427C00CE4413FDEE4231049802EF615206929245
-:10428C006934FC682EFCDFF6AD82BD80F87EF3311C
-:10429C001C790AF944FEFFDD44D87EF101040AF9C9
-:1042AC0014A944FFFFDF04E6B9EF0BD87EF101043B
-:1042BC000AF914A9A1B9717BFAA0EFFBD5EFFBDFCA
-:1042CC001CA0F0FBD5F0FBDF14A0F1FBD5F1FBDF5C
-:1042DC000CCFEFFBFFCFF0FBFFCFF1FBFFC6717AEA
-:1042EC00FAD7C716D87EF10744A800DC05710298EE
-:1042FC00EF1CF647DD18A47E4A7EA8DC05710298F7
-:10430C00EF0CF87EF3311CF6780AF9B7EFE4C6D758
-:10431C00C756A89666F0317E12F6B1780AF966D1C6
-:10432C00DFF1717BFAF5EFFBF5F0FBF5F1FBF47EB9
-:10433C00710398C6717AFAD7C72004FBF8FFD448EA
-:10434C00DF168D7E9D8B717BFA52069292692EFC44
-:10435C0068C0FCDFF6717AFA4A4806DE0EE84809B6
-:10436C00C0FC9C03A4488C0372EF30F88BF3311C17
-:10437C00790AF9BB311298058B9C03EF0F8C019CC9
-:10438C0003D48BDF05CD8BA7EF02B48B7180711733
-:10439C009861DC61FB7111988C03721004C6D7C74D
-:1043AC002008FBF8FF8F37FCFD510F9C078F36FC64
-:1043BC00FD510F9C068F35FCFD510F9C058F34FC75
-:1043CC00FD510F9C048F38FC9C038F39FC9C028C94
-:1043DC0006318E0112791A20BB8C075C03D1DF09E0
-:1043EC008C064C0361C86179008C05318EB1610972
-:1043FC0000BB313D120103BB8B0E04708C011C0001
-:10440C00BB8FF4FB4E03DC0E8C034FF4FBDC0B8CEC
-:10441C00024FF5FBDC04AB12EF03ABB1121008C674
-:10442C00D7C7C3C12008FBF8FFF661490A61F861E0
-:10443C004908DF07F7340000EDCA44E6BC04F6BCBB
-:10444C0006AC0ABC02AC08BBAC06614902AC046108
-:10445C00F8614900DE28AC04BDD8AC06BDDAE1FD3C
-:10446C00F70EADDABC06ADD8BC04ABBDD8AC02BD02
-:10447C00DAE1FD120FADDABC02ADD8BBEFCAAC0667
-:10448C00BC02AC04BBAC08BDD8AC0ABDDAAC04BDF4
-:10449C00DCAC06FD750EAC04BDDCAC06FDE80EE133
-:1044AC00FD120FADDABC06ADD8BC04AC06614902F6
-:1044BC00AC0461F8614900DCC5AC0214AB12100C01
-:1044CC00C6D7C7C12004FBF8FF8F31FCFD510F9CF0
-:1044DC00034E04DF1CAD804682DE07AD82268012BF
-:1044EC00EF40F64682DF074680DD03E7EF34F7EF57
-:1044FC00318C04318EB1128C03318E43DF1830387D
-:10450C002226800682BB8C045C0391DF05AB041869
-:10451C0000BBAB12EF0C8C034E04DE0532A900EF8E
-:10452C0001F71006C6D7717BFA3122980CF6468E2D
-:10453C00DD07B68E717AFAEF7C712398717AFA40A6
-:10454C0004F904DF07715307F42CEF69D9CFFBF1A1
-:10455C00E7240000DD0F23DD1A23DD1023DD5323B8
-:10456C00DD2723DD38715307F42CEF49715207F422
-:10457C002CEF42D42CDF07715207E42CEF0571535A
-:10458C0007F42CC98EFA00EF2CD42CDF0B715207D8
-:10459C00E42CC98EFA00EF1DF5CFFBEF18D42CDFFD
-:1045AC000B715307E42CC98EFA00EF09CFCFFB0235
-:1045BC00EF03FDC245D7D905FCF1E7240000DD0966
-:1045CC0023DD2123DD0923EF1B715307F42CD7D4F2
-:1045DC002CDF07715207E42CEF05715307F42CC93B
-:1045EC008E2D01D7715207E42CD731629501D7710A
-:1045FC000396D9CDFBF1E7240000DD1223DD19234E
-:10460C00DD1123DD2623DD3423DD3923DD3FFD825F
-:10461C0046EF3DFDA346EF38D9CCFBC1AE6CFD6136
-:10462C002DC0F313BE6C712304EF25F0C1AE6CFDED
-:10463C00612DC0F313BE6C712304EF14F6BE6C71C4
-:10464C002204EF0CCB6CFF00712304EF03FD174722
-:10465C004004F905DD064004F901DF0671230471FD
-:10466C0003963104960FF6BE64BE6A31220402EF43
-:10467C0002F690BE6ED7CD2E47F490AE6C317DBF56
-:10468C00CAFCFDEC46D2DF0ED9CCFBC1AE6CFD6191
-:10469C002DC0F313BE6CD7FDEC46D2DD0DCD2E47ED
-:1046AC00F490AE6C317DBFCAFCD7E8900934205031
-:1046BC0080D6BFC6FC22CAFCBDD8304700FD9D0D7C
-:1046CC00BFC8FC30C6FCFD772DF313BE6CB42ED4E2
-:1046DC002EDF0CCD2E47A4904A901F61C8F490D7C2
-:1046EC0040AFFB0BDC05712304F2D740AFFB066136
-:1046FC00D831229411F0C1AE6CFD612DC0F313BE04
-:10470C006C712204EF03FD1747E2D7710296F0C1DA
-:10471C00AE6CFD612DC0F313BE6CA4914A9140DCCC
-:10472C0037F491D892F1313F0412FD14D892F1BDB7
-:10473C00D85008FDEC0D087208E6D2DD040192DFBA
-:10474C00FC896158D1DD05712204EF03712304A4A7
-:10475C00924A922061C8F492D7C73026FDC6D77111
-:10476C0080717DFADE035201D75200D7C7C12004F5
-:10477C00FBF8FF17040300C1E0C15010C150A4FDA9
-:10478C00A0021006629C02D1DD058C0272EF518CE6
-:10479C000C70C18C0470FDF047C0629C02D1DD0529
-:1047AC008C0272EF3B8C035C7DD1DF03F2EF31178F
-:1047BC00A1C1E0C15010C150A4FDA0021006629C22
-:1047CC0002D1DD058C0272EF178C015C7DD1DD030B
-:1047DC00F2EF0D8C0370C15010FDF047C0629C02CB
-:1047EC001006C6D7C7880616710AE650A4FDCC037E
-:1047FC00D2DD077133955202EF2217FDE803677083
-:10480C00FDE803FD330450A4FDE8035020FDE8034C
-:0E481C0050AAFDE803FD5C04713395F2C6D787
-:10482A0061FC61FCC1C3C5C7520C929269D4FEC136
-:10483A00DFF88EFD708EFCC1717AFA4004F903DF4D
-:10484A0005301D2A6194C09EFC609EFD34D4FE5240
-:10485A0006C0B9A5A592DFF9C6C4C2C061FC61DF72
-:10486A00520C929269D4FEC1DFF88EFD708EFCC1A3
-:10487A008F4105775C04D1DD06675C01D1DD5031DB
-:10488A005496367162077153968FB4FB5FBCFBD1A5
-:10489A00DF1B8FB5FB5FBDFBD1DF128FB6FB5FBE9F
-:1048AA00FBD1DF098FB7FB5FBFFBD1DD0C3162079C
-:1048BA0002EFFA716307716B27711398FD5130F497
-:1048CA00227148500571605005717AFAEDC4496742
-:1048DA005C02D1DD16D422DD124A2202DD0DF42259
-:1048EA007148500571605005717AFA717AFA8D2211
-:1048FA00318FE7240000DD0823DD1423DD2CEF4A85
-:10490A00F4487140500571505005E422EDC4498FB6
-:10491A0040059D49715050058D499D4BD849FD1A56
-:10492A0034629D4ACD2202EDC449675C02D1DD178B
-:10493A00675C10D1DD05CD2203EF0F714850057178
-:10494A00605005F422EF73CD22044A2203DF108D52
-:10495A004A9F4005D84AC1D849FDA634C0EF1F8FE7
-:10496A00400576717449DC054A4902DE06716050D9
-:10497A0005EF47C7D849FDDB30C071505005D84B09
-:10498A00F1242900DD27240400DD22242200DD1D74
-:10499A00241100DD0C240100DD13241E00DD0EEFBE
-:1049AA000A4A4960DF07CD4961EF02A4494A220356
-:1049BA00DF08D849FD1A34629D4AC09EFC609EFDFC
-:1049CA0034D4FE5206C0B9A5A592DFF961FCC1C371
-:1049DA00C5C7520C929269D4FEC1DFF88EFD708E63
-:1049EA00FCC1717AFA51405F0401D1DD06F616A7BF
-:1049FA0047DFF2300400BF2401F6BF2A01300B0B57
-:104A0A00BF2801FD5A02300B0FBF2801FD5A0230A0
-:104A1A000F0FBF2801710AE6F6420C01DD33AF041D
-:104A2A0001BF0C0131529529715295710BE2D84F91
-:104A3A00FDCC033184BD02EFFACBB422FBD851F18D
-:104A4A00BEB8714BE1714BE5710ABD8D509E44EFC2
-:104A5A000C715395714AE5717BBD713395C09EFC0B
-:104A6A00609EFD34D4FE5206C0B9A5A592DFF9C6F0
-:104A7A00C4C2C061FCC1C5717AFAD44EDD0BEA4CDE
-:104A8A00899E44A64CB44EEF33710AE6300400BF47
-:104A9A002401F6BF2A01300B0BBF280100000000D9
-:104AAA0000000000510FBF280100000000000000B4
-:104ABA0000500FBF2801712395713395C4C061FC62
-:104ACA0061EF520C929269D4FEC1DFF88EFD708EAE
-:104ADA00FCC12006FBF8FF71503002CEABACCC040F
-:104AEA0000F6BB31B2E210617900F6614900DFF3EA
-:104AFA0071603002ED844B8E519C03713BE28C0352
-:104B0A005C02D1DD1E8C035C08D1DF0971503002D2
-:104B1A00CC0400EFCC8C0570FD8835629E50CC0425
-:104B2A0002EFBE8C035C03D1DF408E509C027150B1
-:104B3A0030028C04D1DF0E8C0270FDCE35629C05EA
-:104B4A00CC0401EF328C044C02DF0671603002EFB4
-:104B5A0029CF34025A716030028C0270C18C057000
-:104B6A00FD3035C0CF34024AEF108C035C01D1DD31
-:104B7A000671603002EF03EDEB4A1006C09EFC603E
-:104B8A009EFD34D4FE5206C0B9A5A592DFF961FC98
-:104B9A00C1C3C5C7520C929269D4FEC1DFF88EFD1B
-:104BAA00708EFCC1710A9E31929E02EFFA8FDEFB73
-:104BBA004F96FFDF198FDFFB4F97FFDF118FE0FB67
-:104BCA004F98FFDF095004C15011FDD434C0710B56
-:104BDA009EC09EFC609EFD34D4FE5206C0B9A5A5B7
-:104BEA0092DFF9C6C4C2C061FCE46861FCC1C3C5F6
-:104BFA00C7520C929269D4FEC1DFF88EFD708EFC0A
-:104C0A00C1C1FBF8FF8D1F9C018E31318EE724064E
-:104C1A0000DD0823DD0E23DD22EF38717AFA8C01DC
-:104C2A009D60EF2F717AFA4007F901DF068C019D2A
-:104C3A005FEF2051FF2E019D5FEF18717AFA8C0108
-:104C4A009D304004F903DD064004F904DF053073A2
-:104C5A002561944031FF09DE05A031FFEF07715845
-:104C6A00F000716296710BE3C0C09EFC609EFD3439
-:104C7A00D4FE5206C0B9A5A592DFF9C6C4C2C06166
-:104C8A00FC717BFAC7D46861F8312497277123979E
-:104C9A00D468DD05B468CEABAC717AFA5600664CBE
-:104CAA000ADD1172F3311C79D8FCCEFC0061CA61AD
-:104CBA00A486EFEA717AFAF2C6D7C7C1C1FBF8FF38
-:104CCA00CC01008C014C0ADE36717BFA8C01F03182
-:104CDA007E0410FC14A96168DF09AC02B9717AFA82
-:104CEA00F2EF1D8C01F0317E127910FC614902DF6E
-:104CFA0006717AFAE2EF09717AFA615901EFC4E2B0
-:104D0A001004C6D7C72004FBF8FFF64210FC61F86E
-:104D1A00EDF04D717BFA9C038C034C0ADE3C8C034C
-:104D2A00F0317E0410FC14A96168DF05717AFAEF8C
-:104D3A0029717AFA8C0372F3311C7910FCCEFC00CB
-:104D4A0061CA629C02D1DF0A8C03F0317E12E678D6
-:104D5A0010FC717BFA615903EFBECC0200CC010151
-:104D6A008C02F0317E0410FC14A96168DD788C0293
-:104D7A00F0317E127910FCE743DF658C014C0ADEC4
-:104D8A005F8C01F0317E127910FCE743DD4D717BB7
-:104D9A00FA8C01F0317E0410FC14A96168DF1861F5
-:104DAA0069018C01F0317E12F67810FC8C024E01FA
-:104DBA00DCED717AFAEF2F8C01F0317E0410FC14CD
-:104DCA00A9128C02F0317E337810FC8C01F0317E0E
-:104DDA0012E67810FC615902717AFA615901EF9B67
-:104DEA00615902ED6A4D00F21004C6D761FF520CF8
-:104DFA00929269D4FEC1DFF88EFD708EFCC1717A81
-:104E0A00FA8FE4FB5C03D1DD114004F903DD0640AF
-:104E1A0004F904DF053094386194C09EFC609EFD5D
-:104E2A0034D4FE5206C0B9A5A592DFF961FC61FC33
-:044E3A0061FC61FCBA
-:0A4E3E0000060C12181E242A30365C
-:104E4800ACFB0000000064FE00000000E9391B36DE
-:104E58008C22F6453E2EED2E32451A3B5D08DB3C92
-:104E680028FC36FE20FE02F903F929FC30FE2AFC54
-:104E78002BFC08F926FC6CFF1AFF6EFF6AFF64FF23
-:0A4E880027FC66FF2CFC555555551C
-:104E9200FF0000000000983AF82AFF0000004700D7
-:104EA200317503F7332312D714AEF8C716AC0612C6
-:104EB200C5AC0416F643DD078B99A7A5B3EFF5C27F
-:024EC200C6D751
-:024FF400325633
-:0A4FF60031383A31343A3531000009
-:00000001FF
-
\ No newline at end of file
diff --git a/branches/2.2A_SDK5(4thNUP)/bsr.lmf b/branches/2.2A_SDK5(4thNUP)/bsr.lmf
deleted file mode 100644
index 0a526a7..0000000
Binary files a/branches/2.2A_SDK5(4thNUP)/bsr.lmf and /dev/null differ
diff --git a/branches/2.2A_SDK5(4thNUP)/bsr_k0r.map b/branches/2.2A_SDK5(4thNUP)/bsr_k0r.map
deleted file mode 100644
index 1f20de8..0000000
--- a/branches/2.2A_SDK5(4thNUP)/bsr_k0r.map
+++ /dev/null
@@ -1,896 +0,0 @@
-
-
-
-78K0R Linker W1.33                            Date: 2 Aug 2012 Page:   1
-
-Command:   -yC:\Program Files (x86)\NEC Electronics Tools\DEV -_msgoff -
-           obsr.lmf ..\..\..\Program Files (x86)\NEC Electronics Tools\C
-           C78K0R\W2.13\lib78k0r\s0rm.rel -gi1B339499E033F240BFAAh -pbsr
-           _k0r.map -nkd -gb7EFBFFh -bC:\Program Files (x86)\NEC Electro
-           nics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib -bcl0rdm.lib -bcl0r
-           m.lib -bcl0rmf.lib -iC:\Program Files (x86)\NEC Electronics T
-           ools\CC78K0R\W2.13\lib78k0r -dbsr_mcu.dr -s -w2 loader.rel pm
-           .rel i2c_ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel i2c_t
-           wl.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel reng
-           e.rel accero.rel self_flash.rel sw.rel task_debug.rel task_mi
-           sc.rel task_sys.rel pedo_alg_thre_det2.rel ini_VECT.rel task_
-           status.rel led_cam.rel led_pow.rel hal.rel batt_params.rel vo
-           ltable.rel pedo_lpf_coeff.rel kanaria.rel kanaria_c.rel get_e
-           i.rel util_funcs.rel i2c_mcu-sub.rel
-Para-file:
-Out-file:  bsr.lmf
-Map-file:  bsr_k0r.map
-Direc-file:bsr_mcu.dr
-
-
-*** Link information ***
-
-    73 output segment(s)
- 3DA5H byte(s) real data
-  6320 symbol(s) defined
-
-
-*** Memory map ***
-
-
-  SPACE=REGULAR
-
-  MEMORY=BCL0
-  BASE ADDRESS=00000H   SIZE=01000H
-         OUTPUT   INPUT    INPUT      BASE      SIZE
-         SEGMENT  SEGMENT  MODULE     ADDRESS
-         @@VECT00                     00000H    00002H  CSEG AT
-                  @@VECT00 @cstart    00000H    00002H
-         LDR_CNSL                     00002H    00000H  CSEG PAGE64KP
-         LDR_CNSL                     00002H    00000H  CSEG PAGE64KP
-                  LDR_CNSL loader     00002H    00000H
-         LDR_CNSL                     00002H    00000H  CSEG PAGE64KP
-                  LDR_CNSL WDT        00002H    00000H
-         LDR_CNSL                     00002H    00000H  CSEG PAGE64KP
-                  LDR_CNSL i2c_mcu    00002H    00000H
-         LDR_CNSL                     00002H    00000H  CSEG PAGE64KP
-                  LDR_CNSL self_flash
-                                      00002H    00000H
-         LDR_CNSL                     00002H    00000H  CSEG PAGE64KP
-                  LDR_CNSL task_debug
-                                      00002H    00000H
-         LDR_CNSL                     00002H    00000H  CSEG PAGE64KP
-                  LDR_CNSL task_status
-                                      00002H    00000H
-         LDR_CNSL                     00002H    00000H  CSEG PAGE64KP
-                  LDR_CNSL hal        00002H    00000H
-         LDR_CNSL                     00002H    00000H  CSEG PAGE64KP
-                  LDR_CNSL util_funcs
-                                      00002H    00000H
-* gap *                               00002H    0000EH
-         @@VECT10                     00010H    00004H  CSEG AT
-                  @@VECT10 ini_VECT   00010H    00004H
-* gap *                               00014H    00008H
-         @@VECT1C                     0001CH    00002H  CSEG AT
-                  @@VECT1C ini_VECT   0001CH    00002H
-* gap *                               0001EH    00006H
-         @@VECT24                     00024H    00002H  CSEG AT
-                  @@VECT24 ini_VECT   00024H    00002H
-* gap *                               00026H    00004H
-         @@VECT2A                     0002AH    00002H  CSEG AT
-                  @@VECT2A i2c_twl    0002AH    00002H
-* gap *                               0002CH    00008H
-         @@VECT34                     00034H    00008H  CSEG AT
-                  @@VECT34 ini_VECT   00034H    00008H
-* gap *                               0003CH    0000EH
-         @@VECT4A                     0004AH    00002H  CSEG AT
-                  @@VECT4A ini_VECT   0004AH    00002H
-* gap *                               0004CH    0000EH
-         @@VECT5A                     0005AH    00002H  CSEG AT
-                  @@VECT5A i2c_ctr    0005AH    00002H
-* gap *                               0005CH    00006H
-         @@VECT62                     00062H    00002H  CSEG AT
-                  @@VECT62 accero     00062H    00002H
-* gap *                               00064H    0001CH
-         @@CALT                       00080H    00006H  CSEG CALLT0
-                  @@CALT   @cstart    00080H    00000H
-                  @@CALT   loader     00080H    00000H
-                  @@CALT   pm         00080H    00000H
-                  @@CALT   i2c_ctr    00080H    00000H
-                  @@CALT   main       00080H    00000H
-                  @@CALT   magic      00080H    00000H
-                  @@CALT   WDT        00080H    00000H
-                  @@CALT   i2c_mcu    00080H    00000H
-                  @@CALT   i2c_twl    00080H    00000H
-                  @@CALT   led        00080H    00000H
-                  @@CALT   rtc        00080H    00000H
-                  @@CALT   vreg_ctr   00080H    00000H
-                  @@CALT   vreg_twl   00080H    00000H
-                  @@CALT   adc        00080H    00000H
-                  @@CALT   renge      00080H    00006H
-                  @@CALT   accero     00086H    00000H
-                  @@CALT   self_flash
-                                      00086H    00000H
-                  @@CALT   sw         00086H    00000H
-                  @@CALT   task_debug
-                                      00086H    00000H
-                  @@CALT   task_misc
-                                      00086H    00000H
-                  @@CALT   task_sys   00086H    00000H
-                  @@CALT   pedo_alg_thre_det2
-                                      00086H    00000H
-                  @@CALT   ini_VECT   00086H    00000H
-                  @@CALT   task_status
-                                      00086H    00000H
-                  @@CALT   led_cam    00086H    00000H
-                  @@CALT   led_pow    00086H    00000H
-                  @@CALT   hal        00086H    00000H
-                  @@CALT   batt_params
-                                      00086H    00000H
-                  @@CALT   voltable   00086H    00000H
-                  @@CALT   pedo_lpf_coeff
-                                      00086H    00000H
-                  @@CALT   kanaria_c
-                                      00086H    00000H
-                  @@CALT   util_funcs
-                                      00086H    00000H
-                  @@CALT   i2c_mcu-sub
-                                      00086H    00000H
-* gap *                               00086H    0003AH
-         ?CSEGOB0                     000C0H    00004H  CSEG OPT_BYTE
-         @@CODE                       000C4H    00000H  CSEG BASE
-                  @@CODE   magic      000C4H    00000H
-                  @@CODE   ini_VECT   000C4H    00000H
-                  @@CODE   batt_params
-                                      000C4H    00000H
-         LDR_CODL                     000C4H    00000H  CSEG
-                  LDR_CODL loader     000C4H    00000H
-                  LDR_CODL WDT        000C4H    00000H
-                  LDR_CODL i2c_mcu    000C4H    00000H
-                  LDR_CODL self_flash
-                                      000C4H    00000H
-                  LDR_CODL task_debug
-                                      000C4H    00000H
-                  LDR_CODL task_status
-                                      000C4H    00000H
-                  LDR_CODL hal        000C4H    00000H
-                  LDR_CODL util_funcs
-                                      000C4H    00000H
-         ?CSEGSI                      000C4H    0000AH  CSEG
-         LDR_CODE                     000CEH    00904H  CSEG
-                  LDR_CODE loader     000CEH    0018CH
-                  LDR_CODE WDT        0025AH    00000H
-                  LDR_CODE i2c_mcu    0025AH    00293H
-                  LDR_CODE self_flash
-                                      004EDH    00370H
-                  LDR_CODE task_debug
-                                      0085DH    00000H
-                  LDR_CODE task_status
-                                      0085DH    00075H
-                  LDR_CODE hal        008D2H    000DCH
-                  LDR_CODE util_funcs
-                                      009AEH    00024H
-         FSL_CODE                     009D2H    00322H  CSEG
-                  FSL_CODE fsl_block_cmd
-                                      009D2H    0002BH
-                  FSL_CODE fsl_block_check
-                                      009FDH    00013H
-                  FSL_CODE fsl_common
-                                      00A10H    0014FH
-                  FSL_CODE fsl_reset
-                                      00B5FH    00001H
-                  FSL_CODE fsl_si_ibf
-                                      00B60H    00064H
-                  FSL_CODE fsl_phySwap
-                                      00BC4H    0004DH
-                  FSL_CODE fsl_si_common
-                                      00C11H    00061H
-                  FSL_CODE fsl_swap   00C72H    00030H
-                  FSL_CODE fsl_write
-                                      00CA2H    00052H
-         @@LCODE                      00CF4H    00277H  CSEG
-                  @@LCODE  @cstart    00CF4H    0006DH
-                  @@LCODE  @imul      00D61H    00011H
-                  @@LCODE  @lumul     00D72H    0002BH
-                  @@LCODE  @isdiv     00D9DH    00022H
-                  @@LCODE  @iudiv     00DBFH    0002DH
-                  @@LCODE  @isrem     00DECH    00021H
-                  @@LCODE  @iurem     00E0DH    0002FH
-                  @@LCODE  @lsdiv     00E3CH    00039H
-                  @@LCODE  @ludiv     00E75H    0003FH
-                  @@LCODE  @divuw     00EB4H    00034H
-                  @@LCODE  @ladd      00EE8H    0000FH
-                  @@LCODE  @llsh      00EF7H    0001BH
-                  @@LCODE  @lursh     00F12H    0001FH
-                  @@LCODE  @iscmp     00F31H    0000CH
-                  @@LCODE  @lband     00F3DH    00014H
-                  @@LCODE  @bcdtob    00F51H    0001AH
-* gap *                               00F6BH    0008BH
-         MGC_LOAD                     00FF6H    0000AH  CSEG AT
-                  MGC_LOAD magic      00FF6H    0000AH
-
-  MEMORY=ROM
-  BASE ADDRESS=02000H   SIZE=03000H
-         OUTPUT   INPUT    INPUT      BASE      SIZE
-         SEGMENT  SEGMENT  MODULE     ADDRESS
-         MGC_MIMI                     02000H    0000AH  CSEG AT
-                  MGC_MIMI magic      02000H    0000AH
-         @@CNST                       0200AH    00282H  CSEG
-                  @@CNST   @cstart    0200AH    00000H
-                  @@CNST   loader     0200AH    00000H
-                  @@CNST   pm         0200AH    00008H
-                  @@CNST   i2c_ctr    02012H    00000H
-                  @@CNST   main       02012H    00000H
-                  @@CNST   magic      02012H    00000H
-                  @@CNST   WDT        02012H    00000H
-                  @@CNST   i2c_mcu    02012H    00000H
-                  @@CNST   i2c_twl    02012H    00000H
-                  @@CNST   led        02012H    00000H
-                  @@CNST   rtc        02012H    00000H
-                  @@CNST   vreg_ctr   02012H    00000H
-                  @@CNST   vreg_twl   02012H    00000H
-                  @@CNST   adc        02012H    00008H
-                  @@CNST   renge      0201AH    00000H
-                  @@CNST   accero     0201AH    00000H
-                  @@CNST   self_flash
-                                      0201AH    00002H
-                  @@CNST   sw         0201CH    00000H
-                  @@CNST   task_debug
-                                      0201CH    00000H
-                  @@CNST   task_misc
-                                      0201CH    00000H
-                  @@CNST   task_sys   0201CH    00000H
-                  @@CNST   pedo_alg_thre_det2
-                                      0201CH    00018H
-                  @@CNST   ini_VECT   02034H    00000H
-                  @@CNST   task_status
-                                      02034H    00000H
-                  @@CNST   led_cam    02034H    00000H
-                  @@CNST   led_pow    02034H    00020H
-                  @@CNST   hal        02054H    00000H
-                  @@CNST   batt_params
-                                      02054H    001C8H
-                  @@CNST   voltable   0221CH    00040H
-                  @@CNST   pedo_lpf_coeff
-                                      0225CH    00030H
-                  @@CNST   kanaria_c
-                                      0228CH    00000H
-                  @@CNST   util_funcs
-                                      0228CH    00000H
-                  @@CNST   i2c_mcu-sub
-                                      0228CH    00000H
-         ROM_CODE                     0228CH    0259EH  CSEG
-                  ROM_CODE pm         0228CH    009B9H
-                  ROM_CODE i2c_ctr    02C45H    00064H
-                  ROM_CODE main       02CA9H    00055H
-                  ROM_CODE i2c_twl    02CFEH    00063H
-                  ROM_CODE led        02D61H    0024FH
-                  ROM_CODE rtc        02FB0H    000E0H
-                  ROM_CODE vreg_ctr   03090H    00492H
-                  ROM_CODE vreg_twl   03522H    000F9H
-                  ROM_CODE adc        0361BH    00261H
-                  ROM_CODE renge      0387CH    00018H
-                  ROM_CODE accero     03894H    00155H
-                  ROM_CODE sw         039E9H    00131H
-                  ROM_CODE task_misc
-                                      03B1AH    001C1H
-                  ROM_CODE task_sys   03CDBH    00383H
-                  ROM_CODE pedo_alg_thre_det2
-                                      0405EH    004D4H
-                  ROM_CODE led_cam    04532H    000C4H
-                  ROM_CODE led_pow    045F6H    0016FH
-                  ROM_CODE voltable   04765H    00000H
-                  ROM_CODE pedo_lpf_coeff
-                                      04765H    00000H
-                  ROM_CODE kanaria_c
-                                      04765H    00006H
-                  ROM_CODE get_ei     0476BH    0000DH
-                  ROM_CODE i2c_mcu-sub
-                                      04778H    000B2H
-         @@BASE                       0482AH    00614H  CSEG BASE
-                  @@BASE   loader     0482AH    00000H
-                  @@BASE   pm         0482AH    0003EH
-                  @@BASE   i2c_ctr    04868H    00170H
-                  @@BASE   main       049D8H    00000H
-                  @@BASE   magic      049D8H    00000H
-                  @@BASE   WDT        049D8H    00000H
-                  @@BASE   i2c_mcu    049D8H    000F2H
-                  @@BASE   i2c_twl    04ACAH    000D0H
-                  @@BASE   led        04B9AH    00000H
-                  @@BASE   rtc        04B9AH    0005DH
-                  @@BASE   vreg_ctr   04BF7H    00000H
-                  @@BASE   vreg_twl   04BF7H    00000H
-                  @@BASE   adc        04BF7H    00094H
-                  @@BASE   renge      04C8BH    0016BH
-                  @@BASE   accero     04DF6H    00042H
-                  @@BASE   self_flash
-                                      04E38H    00000H
-                  @@BASE   sw         04E38H    00000H
-                  @@BASE   task_debug
-                                      04E38H    00000H
-                  @@BASE   task_misc
-                                      04E38H    00000H
-                  @@BASE   task_sys   04E38H    00000H
-                  @@BASE   pedo_alg_thre_det2
-                                      04E38H    00000H
-                  @@BASE   ini_VECT   04E38H    00006H
-                  @@BASE   task_status
-                                      04E3EH    00000H
-                  @@BASE   led_cam    04E3EH    00000H
-                  @@BASE   led_pow    04E3EH    00000H
-                  @@BASE   hal        04E3EH    00000H
-                  @@BASE   batt_params
-                                      04E3EH    00000H
-                  @@BASE   voltable   04E3EH    00000H
-                  @@BASE   pedo_lpf_coeff
-                                      04E3EH    00000H
-                  @@BASE   kanaria_c
-                                      04E3EH    00000H
-                  @@BASE   util_funcs
-                                      04E3EH    00000H
-                  @@BASE   i2c_mcu-sub
-                                      04E3EH    00000H
-         @@CNSTL                      04E3EH    00000H  CSEG PAGE64KP
-                  @@CNSTL  @cstart    04E3EH    00000H
-         @@CNSTL                      04E3EH    00000H  CSEG PAGE64KP
-                  @@CNSTL  pm         04E3EH    00000H
-         @@CNSTL                      04E3EH    00000H  CSEG PAGE64KP
-                  @@CNSTL  i2c_ctr    04E3EH    00000H
-         @@CNSTL                      04E3EH    00000H  CSEG PAGE64KP
-                  @@CNSTL  main       04E3EH    00000H
-         @@CNSTL                      04E3EH    00000H  CSEG PAGE64KP
-                  @@CNSTL  i2c_twl    04E3EH    00000H
-         @@CNSTL                      04E3EH    00000H  CSEG PAGE64KP
-                  @@CNSTL  led        04E3EH    00000H
-         @@CNSTL                      04E3EH    00000H  CSEG PAGE64KP
-                  @@CNSTL  rtc        04E3EH    00000H
-         @@CNSTL                      04E3EH    00000H  CSEG PAGE64KP
-                  @@CNSTL  vreg_ctr   04E3EH    00000H
-         @@CNSTL                      04E3EH    00000H  CSEG PAGE64KP
-                  @@CNSTL  vreg_twl   04E3EH    00000H
-         @@CNSTL                      04E3EH    00000H  CSEG PAGE64KP
-                  @@CNSTL  adc        04E3EH    00000H
-         @@CNSTL                      04E3EH    00000H  CSEG PAGE64KP
-                  @@CNSTL  renge      04E3EH    00000H
-         @@CNSTL                      04E3EH    00000H  CSEG PAGE64KP
-                  @@CNSTL  accero     04E3EH    00000H
-         @@CNSTL                      04E3EH    00000H  CSEG PAGE64KP
-                  @@CNSTL  sw         04E3EH    00000H
-         @@CNSTL                      04E3EH    00000H  CSEG PAGE64KP
-                  @@CNSTL  task_misc
-                                      04E3EH    00000H
-         @@CNSTL                      04E3EH    00000H  CSEG PAGE64KP
-                  @@CNSTL  task_sys   04E3EH    00000H
-         @@CNSTL                      04E3EH    00000H  CSEG PAGE64KP
-                  @@CNSTL  pedo_alg_thre_det2
-                                      04E3EH    00000H
-         @@CNSTL                      04E3EH    00000H  CSEG PAGE64KP
-                  @@CNSTL  ini_VECT   04E3EH    00000H
-         @@CNSTL                      04E3EH    00000H  CSEG PAGE64KP
-                  @@CNSTL  led_cam    04E3EH    00000H
-         @@CNSTL                      04E3EH    00000H  CSEG PAGE64KP
-                  @@CNSTL  led_pow    04E3EH    00000H
-         @@CNSTL                      04E3EH    00000H  CSEG PAGE64KP
-                  @@CNSTL  batt_params
-                                      04E3EH    00000H
-         @@CNSTL                      04E3EH    00000H  CSEG PAGE64KP
-                  @@CNSTL  voltable   04E3EH    00000H
-         @@CNSTL                      04E3EH    00000H  CSEG PAGE64KP
-                  @@CNSTL  pedo_lpf_coeff
-                                      04E3EH    00000H
-         @@CNSTL                      04E3EH    00000H  CSEG PAGE64KP
-                  @@CNSTL  kanaria_c
-                                      04E3EH    00000H
-         @@CNSTL                      04E3EH    00000H  CSEG PAGE64KP
-                  @@CNSTL  i2c_mcu-sub
-                                      04E3EH    00000H
-         @@CNSTL                      04E3EH    0000AH  CSEG PAGE64KP
-                  @@CNSTL  @bcdtob    04E3EH    0000AH
-         @@R_INIT                     04E48H    0004AH  CSEG UNIT64KP
-                  @@R_INIT @cstart    04E48H    00000H
-                  @@R_INIT loader     04E48H    00000H
-                  @@R_INIT pm         04E48H    00000H
-                  @@R_INIT i2c_ctr    04E48H    00000H
-                  @@R_INIT main       04E48H    00000H
-                  @@R_INIT magic      04E48H    00000H
-                  @@R_INIT WDT        04E48H    00000H
-                  @@R_INIT i2c_mcu    04E48H    00000H
-                  @@R_INIT i2c_twl    04E48H    00000H
-                  @@R_INIT led        04E48H    00000H
-                  @@R_INIT rtc        04E48H    00000H
-                  @@R_INIT vreg_ctr   04E48H    00000H
-                  @@R_INIT vreg_twl   04E48H    00000H
-                  @@R_INIT adc        04E48H    0000CH
-                  @@R_INIT renge      04E54H    00014H
-                  @@R_INIT accero     04E68H    00000H
-                  @@R_INIT self_flash
-                                      04E68H    00000H
-                  @@R_INIT sw         04E68H    00000H
-                  @@R_INIT task_debug
-                                      04E68H    00000H
-                  @@R_INIT task_misc
-                                      04E68H    00026H
-                  @@R_INIT task_sys   04E8EH    00000H
-                  @@R_INIT pedo_alg_thre_det2
-                                      04E8EH    00000H
-                  @@R_INIT ini_VECT   04E8EH    00000H
-                  @@R_INIT task_status
-                                      04E8EH    00000H
-                  @@R_INIT led_cam    04E8EH    00000H
-                  @@R_INIT led_pow    04E8EH    00004H
-                  @@R_INIT hal        04E92H    00000H
-                  @@R_INIT batt_params
-                                      04E92H    00000H
-                  @@R_INIT voltable   04E92H    00000H
-                  @@R_INIT pedo_lpf_coeff
-                                      04E92H    00000H
-                  @@R_INIT kanaria_c
-                                      04E92H    00000H
-                  @@R_INIT util_funcs
-                                      04E92H    00000H
-                  @@R_INIT i2c_mcu-sub
-                                      04E92H    00000H
-                  @@R_INIT @rom       04E92H    00000H
-         @@R_INIS                     04E92H    00010H  CSEG UNIT64KP
-                  @@R_INIS @cstart    04E92H    00000H
-                  @@R_INIS loader     04E92H    00000H
-                  @@R_INIS pm         04E92H    00002H
-                  @@R_INIS i2c_ctr    04E94H    00002H
-                  @@R_INIS main       04E96H    00000H
-                  @@R_INIS magic      04E96H    00000H
-                  @@R_INIS WDT        04E96H    00000H
-                  @@R_INIS i2c_mcu    04E96H    00000H
-                  @@R_INIS i2c_twl    04E96H    00000H
-                  @@R_INIS led        04E96H    00000H
-                  @@R_INIS rtc        04E96H    00000H
-                  @@R_INIS vreg_ctr   04E96H    00000H
-                  @@R_INIS vreg_twl   04E96H    00000H
-                  @@R_INIS adc        04E96H    00000H
-                  @@R_INIS renge      04E96H    00000H
-                  @@R_INIS accero     04E96H    00000H
-                  @@R_INIS self_flash
-                                      04E96H    00000H
-                  @@R_INIS sw         04E96H    00000H
-                  @@R_INIS task_debug
-                                      04E96H    00000H
-                  @@R_INIS task_misc
-                                      04E96H    00000H
-                  @@R_INIS task_sys   04E96H    00002H
-                  @@R_INIS pedo_alg_thre_det2
-                                      04E98H    00006H
-                  @@R_INIS ini_VECT   04E9EH    00000H
-                  @@R_INIS task_status
-                                      04E9EH    00000H
-                  @@R_INIS led_cam    04E9EH    00002H
-                  @@R_INIS led_pow    04EA0H    00002H
-                  @@R_INIS hal        04EA2H    00000H
-                  @@R_INIS batt_params
-                                      04EA2H    00000H
-                  @@R_INIS voltable   04EA2H    00000H
-                  @@R_INIS pedo_lpf_coeff
-                                      04EA2H    00000H
-                  @@R_INIS kanaria_c
-                                      04EA2H    00000H
-                  @@R_INIS util_funcs
-                                      04EA2H    00000H
-                  @@R_INIS i2c_mcu-sub
-                                      04EA2H    00000H
-                  @@R_INIS @rom       04EA2H    00000H
-         @@RLINIT                     04EA2H    00000H  CSEG UNIT64KP
-                  @@RLINIT loader     04EA2H    00000H
-                  @@RLINIT pm         04EA2H    00000H
-                  @@RLINIT i2c_ctr    04EA2H    00000H
-                  @@RLINIT main       04EA2H    00000H
-                  @@RLINIT magic      04EA2H    00000H
-                  @@RLINIT WDT        04EA2H    00000H
-                  @@RLINIT i2c_mcu    04EA2H    00000H
-                  @@RLINIT i2c_twl    04EA2H    00000H
-                  @@RLINIT led        04EA2H    00000H
-                  @@RLINIT rtc        04EA2H    00000H
-                  @@RLINIT vreg_ctr   04EA2H    00000H
-                  @@RLINIT vreg_twl   04EA2H    00000H
-                  @@RLINIT adc        04EA2H    00000H
-                  @@RLINIT renge      04EA2H    00000H
-                  @@RLINIT accero     04EA2H    00000H
-                  @@RLINIT self_flash
-                                      04EA2H    00000H
-                  @@RLINIT sw         04EA2H    00000H
-                  @@RLINIT task_debug
-                                      04EA2H    00000H
-                  @@RLINIT task_misc
-                                      04EA2H    00000H
-                  @@RLINIT task_sys   04EA2H    00000H
-                  @@RLINIT pedo_alg_thre_det2
-                                      04EA2H    00000H
-                  @@RLINIT ini_VECT   04EA2H    00000H
-                  @@RLINIT task_status
-                                      04EA2H    00000H
-                  @@RLINIT led_cam    04EA2H    00000H
-                  @@RLINIT led_pow    04EA2H    00000H
-                  @@RLINIT hal        04EA2H    00000H
-                  @@RLINIT batt_params
-                                      04EA2H    00000H
-                  @@RLINIT voltable   04EA2H    00000H
-                  @@RLINIT pedo_lpf_coeff
-                                      04EA2H    00000H
-                  @@RLINIT kanaria_c
-                                      04EA2H    00000H
-                  @@RLINIT util_funcs
-                                      04EA2H    00000H
-                  @@RLINIT i2c_mcu-sub
-                                      04EA2H    00000H
-                  @@RLINIT @rom       04EA2H    00000H
-         @@CODEL                      04EA2H    00000H  CSEG
-                  @@CODEL  pm         04EA2H    00000H
-                  @@CODEL  i2c_ctr    04EA2H    00000H
-                  @@CODEL  main       04EA2H    00000H
-                  @@CODEL  magic      04EA2H    00000H
-                  @@CODEL  i2c_twl    04EA2H    00000H
-                  @@CODEL  led        04EA2H    00000H
-                  @@CODEL  rtc        04EA2H    00000H
-                  @@CODEL  vreg_ctr   04EA2H    00000H
-                  @@CODEL  vreg_twl   04EA2H    00000H
-                  @@CODEL  adc        04EA2H    00000H
-                  @@CODEL  renge      04EA2H    00000H
-                  @@CODEL  accero     04EA2H    00000H
-                  @@CODEL  sw         04EA2H    00000H
-                  @@CODEL  task_misc
-                                      04EA2H    00000H
-                  @@CODEL  task_sys   04EA2H    00000H
-                  @@CODEL  pedo_alg_thre_det2
-                                      04EA2H    00000H
-                  @@CODEL  ini_VECT   04EA2H    00000H
-                  @@CODEL  led_cam    04EA2H    00000H
-                  @@CODEL  led_pow    04EA2H    00000H
-                  @@CODEL  batt_params
-                                      04EA2H    00000H
-                  @@CODEL  voltable   04EA2H    00000H
-                  @@CODEL  pedo_lpf_coeff
-                                      04EA2H    00000H
-                  @@CODEL  kanaria_c
-                                      04EA2H    00000H
-                  @@CODEL  i2c_mcu-sub
-                                      04EA2H    00000H
-         @@LCODEL                     04EA2H    00022H  CSEG
-                  @@LCODEL abs        04EA2H    00008H
-                  @@LCODEL memcpy_n   04EAAH    0001AH
-* gap *                               04EC4H    00130H
-         MGC_VER                      04FF4H    00002H  CSEG AT
-                  MGC_VER  magic      04FF4H    00002H
-         MGC_TAIL                     04FF6H    0000AH  CSEG AT
-                  MGC_TAIL magic      04FF6H    0000AH
-
-  MEMORY=RAM
-  BASE ADDRESS=FF900H   SIZE=00500H
-         OUTPUT   INPUT    INPUT      BASE      SIZE
-         SEGMENT  SEGMENT  MODULE     ADDRESS
-         @@DATA                       FF900H    003CCH  DSEG BASEP
-                  @@DATA   @cstart    FF900H    00002H
-                  @@DATA   loader     FF902H    00000H
-                  @@DATA   pm         FF902H    00002H
-                  @@DATA   i2c_ctr    FF904H    00000H
-                  @@DATA   main       FF904H    0021EH
-                  @@DATA   magic      FFB22H    00000H
-                  @@DATA   WDT        FFB22H    00000H
-                  @@DATA   i2c_mcu    FFB22H    00004H
-                  @@DATA   i2c_twl    FFB26H    00000H
-                  @@DATA   led        FFB26H    00076H
-                  @@DATA   rtc        FFB9CH    00008H
-                  @@DATA   vreg_ctr   FFBA4H    0005CH
-                  @@DATA   vreg_twl   FFC00H    00010H
-                  @@DATA   adc        FFC10H    00000H
-                  @@DATA   renge      FFC10H    00014H
-                  @@DATA   accero     FFC24H    00000H
-                  @@DATA   self_flash
-                                      FFC24H    00002H
-                  @@DATA   sw         FFC26H    00000H
-                  @@DATA   task_debug
-                                      FFC26H    00000H
-                  @@DATA   task_misc
-                                      FFC26H    00008H
-                  @@DATA   task_sys   FFC2EH    00000H
-                  @@DATA   pedo_alg_thre_det2
-                                      FFC2EH    00098H
-                  @@DATA   ini_VECT   FFCC6H    00000H
-                  @@DATA   task_status
-                                      FFCC6H    00000H
-                  @@DATA   led_cam    FFCC6H    00000H
-                  @@DATA   led_pow    FFCC6H    00006H
-                  @@DATA   hal        FFCCCH    00000H
-                  @@DATA   batt_params
-                                      FFCCCH    00000H
-                  @@DATA   voltable   FFCCCH    00000H
-                  @@DATA   pedo_lpf_coeff
-                                      FFCCCH    00000H
-                  @@DATA   kanaria    FFCCCH    00000H
-                  @@DATA   kanaria_c
-                                      FFCCCH    00000H
-                  @@DATA   util_funcs
-                                      FFCCCH    00000H
-                  @@DATA   i2c_mcu-sub
-                                      FFCCCH    00000H
-                  @@DATA   @rom       FFCCCH    00000H
-         @@INIT                       FFCCCH    0004AH  DSEG BASEP
-                  @@INIT   @cstart    FFCCCH    00000H
-                  @@INIT   loader     FFCCCH    00000H
-                  @@INIT   pm         FFCCCH    00000H
-                  @@INIT   i2c_ctr    FFCCCH    00000H
-                  @@INIT   main       FFCCCH    00000H
-                  @@INIT   magic      FFCCCH    00000H
-                  @@INIT   WDT        FFCCCH    00000H
-                  @@INIT   i2c_mcu    FFCCCH    00000H
-                  @@INIT   i2c_twl    FFCCCH    00000H
-                  @@INIT   led        FFCCCH    00000H
-                  @@INIT   rtc        FFCCCH    00000H
-                  @@INIT   vreg_ctr   FFCCCH    00000H
-                  @@INIT   vreg_twl   FFCCCH    00000H
-                  @@INIT   adc        FFCCCH    0000CH
-                  @@INIT   renge      FFCD8H    00014H
-                  @@INIT   accero     FFCECH    00000H
-                  @@INIT   self_flash
-                                      FFCECH    00000H
-                  @@INIT   sw         FFCECH    00000H
-                  @@INIT   task_debug
-                                      FFCECH    00000H
-                  @@INIT   task_misc
-                                      FFCECH    00026H
-                  @@INIT   task_sys   FFD12H    00000H
-                  @@INIT   pedo_alg_thre_det2
-                                      FFD12H    00000H
-                  @@INIT   ini_VECT   FFD12H    00000H
-                  @@INIT   task_status
-                                      FFD12H    00000H
-                  @@INIT   led_cam    FFD12H    00000H
-                  @@INIT   led_pow    FFD12H    00004H
-                  @@INIT   hal        FFD16H    00000H
-                  @@INIT   batt_params
-                                      FFD16H    00000H
-                  @@INIT   voltable   FFD16H    00000H
-                  @@INIT   pedo_lpf_coeff
-                                      FFD16H    00000H
-                  @@INIT   kanaria    FFD16H    00000H
-                  @@INIT   kanaria_c
-                                      FFD16H    00000H
-                  @@INIT   util_funcs
-                                      FFD16H    00000H
-                  @@INIT   i2c_mcu-sub
-                                      FFD16H    00000H
-                  @@INIT   @rom       FFD16H    00000H
-         FSL_DATA                     FFD16H    00010H  DSEG UNITP
-                  FSL_DATA fsl_common
-                                      FFD16H    00010H
-         @@INITL                      FFD26H    00000H  DSEG UNIT64KP
-                  @@INITL  loader     FFD26H    00000H
-                  @@INITL  pm         FFD26H    00000H
-                  @@INITL  i2c_ctr    FFD26H    00000H
-                  @@INITL  main       FFD26H    00000H
-                  @@INITL  magic      FFD26H    00000H
-                  @@INITL  WDT        FFD26H    00000H
-                  @@INITL  i2c_mcu    FFD26H    00000H
-                  @@INITL  i2c_twl    FFD26H    00000H
-                  @@INITL  led        FFD26H    00000H
-                  @@INITL  rtc        FFD26H    00000H
-                  @@INITL  vreg_ctr   FFD26H    00000H
-                  @@INITL  vreg_twl   FFD26H    00000H
-                  @@INITL  adc        FFD26H    00000H
-                  @@INITL  renge      FFD26H    00000H
-                  @@INITL  accero     FFD26H    00000H
-                  @@INITL  self_flash
-                                      FFD26H    00000H
-                  @@INITL  sw         FFD26H    00000H
-                  @@INITL  task_debug
-                                      FFD26H    00000H
-                  @@INITL  task_misc
-                                      FFD26H    00000H
-                  @@INITL  task_sys   FFD26H    00000H
-                  @@INITL  pedo_alg_thre_det2
-                                      FFD26H    00000H
-                  @@INITL  ini_VECT   FFD26H    00000H
-                  @@INITL  task_status
-                                      FFD26H    00000H
-                  @@INITL  led_cam    FFD26H    00000H
-                  @@INITL  led_pow    FFD26H    00000H
-                  @@INITL  hal        FFD26H    00000H
-                  @@INITL  batt_params
-                                      FFD26H    00000H
-                  @@INITL  voltable   FFD26H    00000H
-                  @@INITL  pedo_lpf_coeff
-                                      FFD26H    00000H
-                  @@INITL  kanaria    FFD26H    00000H
-                  @@INITL  kanaria_c
-                                      FFD26H    00000H
-                  @@INITL  util_funcs
-                                      FFD26H    00000H
-                  @@INITL  i2c_mcu-sub
-                                      FFD26H    00000H
-                  @@INITL  @rom       FFD26H    00000H
-         @@DATAL                      FFD26H    00000H  DSEG UNIT64KP
-                  @@DATAL  loader     FFD26H    00000H
-                  @@DATAL  pm         FFD26H    00000H
-                  @@DATAL  i2c_ctr    FFD26H    00000H
-                  @@DATAL  main       FFD26H    00000H
-                  @@DATAL  magic      FFD26H    00000H
-                  @@DATAL  WDT        FFD26H    00000H
-                  @@DATAL  i2c_mcu    FFD26H    00000H
-                  @@DATAL  i2c_twl    FFD26H    00000H
-                  @@DATAL  led        FFD26H    00000H
-                  @@DATAL  rtc        FFD26H    00000H
-                  @@DATAL  vreg_ctr   FFD26H    00000H
-                  @@DATAL  vreg_twl   FFD26H    00000H
-                  @@DATAL  adc        FFD26H    00000H
-                  @@DATAL  renge      FFD26H    00000H
-                  @@DATAL  accero     FFD26H    00000H
-                  @@DATAL  self_flash
-                                      FFD26H    00000H
-                  @@DATAL  sw         FFD26H    00000H
-                  @@DATAL  task_debug
-                                      FFD26H    00000H
-                  @@DATAL  task_misc
-                                      FFD26H    00000H
-                  @@DATAL  task_sys   FFD26H    00000H
-                  @@DATAL  pedo_alg_thre_det2
-                                      FFD26H    00000H
-                  @@DATAL  ini_VECT   FFD26H    00000H
-                  @@DATAL  task_status
-                                      FFD26H    00000H
-                  @@DATAL  led_cam    FFD26H    00000H
-                  @@DATAL  led_pow    FFD26H    00000H
-                  @@DATAL  hal        FFD26H    00000H
-                  @@DATAL  batt_params
-                                      FFD26H    00000H
-                  @@DATAL  voltable   FFD26H    00000H
-                  @@DATAL  pedo_lpf_coeff
-                                      FFD26H    00000H
-                  @@DATAL  kanaria    FFD26H    00000H
-                  @@DATAL  kanaria_c
-                                      FFD26H    00000H
-                  @@DATAL  util_funcs
-                                      FFD26H    00000H
-                  @@DATAL  i2c_mcu-sub
-                                      FFD26H    00000H
-                  @@DATAL  @rom       FFD26H    00000H
-* gap *                               FFD26H    000DAH
-
-  MEMORY=RAM2
-  BASE ADDRESS=FFE20H   SIZE=000C0H
-         OUTPUT   INPUT    INPUT      BASE      SIZE
-         SEGMENT  SEGMENT  MODULE     ADDRESS
-         @@INIS                       FFE20H    00010H  DSEG SADDRP
-                  @@INIS   @cstart    FFE20H    00000H
-                  @@INIS   loader     FFE20H    00000H
-                  @@INIS   pm         FFE20H    00002H
-                  @@INIS   i2c_ctr    FFE22H    00002H
-                  @@INIS   main       FFE24H    00000H
-                  @@INIS   magic      FFE24H    00000H
-                  @@INIS   WDT        FFE24H    00000H
-                  @@INIS   i2c_mcu    FFE24H    00000H
-                  @@INIS   i2c_twl    FFE24H    00000H
-                  @@INIS   led        FFE24H    00000H
-                  @@INIS   rtc        FFE24H    00000H
-                  @@INIS   vreg_ctr   FFE24H    00000H
-                  @@INIS   vreg_twl   FFE24H    00000H
-                  @@INIS   adc        FFE24H    00000H
-                  @@INIS   renge      FFE24H    00000H
-                  @@INIS   accero     FFE24H    00000H
-                  @@INIS   self_flash
-                                      FFE24H    00000H
-                  @@INIS   sw         FFE24H    00000H
-                  @@INIS   task_debug
-                                      FFE24H    00000H
-                  @@INIS   task_misc
-                                      FFE24H    00000H
-                  @@INIS   task_sys   FFE24H    00002H
-                  @@INIS   pedo_alg_thre_det2
-                                      FFE26H    00006H
-                  @@INIS   ini_VECT   FFE2CH    00000H
-                  @@INIS   task_status
-                                      FFE2CH    00000H
-                  @@INIS   led_cam    FFE2CH    00002H
-                  @@INIS   led_pow    FFE2EH    00002H
-                  @@INIS   hal        FFE30H    00000H
-                  @@INIS   batt_params
-                                      FFE30H    00000H
-                  @@INIS   voltable   FFE30H    00000H
-                  @@INIS   pedo_lpf_coeff
-                                      FFE30H    00000H
-                  @@INIS   kanaria_c
-                                      FFE30H    00000H
-                  @@INIS   util_funcs
-                                      FFE30H    00000H
-                  @@INIS   i2c_mcu-sub
-                                      FFE30H    00000H
-                  @@INIS   @rom       FFE30H    00000H
-         @@DATS                       FFE30H    00064H  DSEG SADDRP
-                  @@DATS   @cstart    FFE30H    00000H
-                  @@DATS   loader     FFE30H    00000H
-                  @@DATS   pm         FFE30H    00018H
-                  @@DATS   i2c_ctr    FFE48H    00004H
-                  @@DATS   main       FFE4CH    00000H
-                  @@DATS   magic      FFE4CH    00000H
-                  @@DATS   WDT        FFE4CH    00000H
-                  @@DATS   i2c_mcu    FFE4CH    00008H
-                  @@DATS   i2c_twl    FFE54H    00000H
-                  @@DATS   led        FFE54H    00006H
-                  @@DATS   rtc        FFE5AH    00000H
-                  @@DATS   vreg_ctr   FFE5AH    00004H
-                  @@DATS   vreg_twl   FFE5EH    00000H
-                  @@DATS   adc        FFE5EH    0000AH
-                  @@DATS   renge      FFE68H    00002H
-                  @@DATS   accero     FFE6AH    00002H
-                  @@DATS   self_flash
-                                      FFE6CH    00000H
-                  @@DATS   sw         FFE6CH    0000CH
-                  @@DATS   task_debug
-                                      FFE78H    00000H
-                  @@DATS   task_misc
-                                      FFE78H    00004H
-                  @@DATS   task_sys   FFE7CH    00002H
-                  @@DATS   pedo_alg_thre_det2
-                                      FFE7EH    0000EH
-                  @@DATS   ini_VECT   FFE8CH    00000H
-                  @@DATS   task_status
-                                      FFE8CH    00002H
-                  @@DATS   led_cam    FFE8EH    00002H
-                  @@DATS   led_pow    FFE90H    00004H
-                  @@DATS   hal        FFE94H    00000H
-                  @@DATS   batt_params
-                                      FFE94H    00000H
-                  @@DATS   voltable   FFE94H    00000H
-                  @@DATS   pedo_lpf_coeff
-                                      FFE94H    00000H
-                  @@DATS   kanaria_c
-                                      FFE94H    00000H
-                  @@DATS   util_funcs
-                                      FFE94H    00000H
-                  @@DATS   i2c_mcu-sub
-                                      FFE94H    00000H
-                  @@DATS   @rom       FFE94H    00000H
-         @@BITS                       FFE94H    00006H  BSEG
-                  @@BITS   @cstart    FFE94H.0  00000H.0
-                  @@BITS   loader     FFE94H.0  00000H.0
-                  @@BITS   pm         FFE94H.0  00001H.1
-                  @@BITS   i2c_ctr    FFE95H.1  00000H.0
-                  @@BITS   main       FFE95H.1  00000H.1
-                  @@BITS   magic      FFE95H.2  00000H.0
-                  @@BITS   WDT        FFE95H.2  00000H.0
-                  @@BITS   i2c_mcu    FFE95H.2  00000H.4
-                  @@BITS   i2c_twl    FFE95H.6  00000H.0
-                  @@BITS   led        FFE95H.6  00000H.4
-                  @@BITS   rtc        FFE96H.2  00000H.3
-                  @@BITS   vreg_ctr   FFE96H.5  00000H.1
-                  @@BITS   vreg_twl   FFE96H.6  00000H.0
-                  @@BITS   adc        FFE96H.6  00000H.4
-                  @@BITS   renge      FFE97H.2  00000H.2
-                  @@BITS   accero     FFE97H.4  00000H.0
-                  @@BITS   self_flash
-                                      FFE97H.4  00000H.0
-                  @@BITS   sw         FFE97H.4  00000H.1
-                  @@BITS   task_debug
-                                      FFE97H.5  00000H.0
-                  @@BITS   task_misc
-                                      FFE97H.5  00000H.3
-                  @@BITS   task_sys   FFE98H.0  00000H.0
-                  @@BITS   pedo_alg_thre_det2
-                                      FFE98H.0  00000H.2
-                  @@BITS   ini_VECT   FFE98H.2  00000H.0
-                  @@BITS   task_status
-                                      FFE98H.2  00000H.0
-                  @@BITS   led_cam    FFE98H.2  00000H.1
-                  @@BITS   led_pow    FFE98H.3  00000H.0
-                  @@BITS   hal        FFE98H.3  00000H.6
-                  @@BITS   batt_params
-                                      FFE99H.1  00000H.0
-                  @@BITS   voltable   FFE99H.1  00000H.0
-                  @@BITS   pedo_lpf_coeff
-                                      FFE99H.1  00000H.0
-                  @@BITS   kanaria_c
-                                      FFE99H.1  00000H.0
-                  @@BITS   util_funcs
-                                      FFE99H.1  00000H.0
-                  @@BITS   i2c_mcu-sub
-                                      FFE99H.1  00000H.0
-* gap *                               FFE9AH    0003AH
-         @@SEGREG                     FFED4H    00004H  DSEG AT
-                  @@SEGREG @SEGREG    FFED4H    00004H
-         @@RTARG0                     FFED8H    00008H  DSEG AT
-                  @@RTARG0 @RTARG0    FFED8H    00008H
-
-
- Target chip : uPD79F0104
- Device file : E1.00b
-
\ No newline at end of file
diff --git a/branches/2.2A_SDK5(4thNUP)/bsr_mcu.dr b/branches/2.2A_SDK5(4thNUP)/bsr_mcu.dr
deleted file mode 100644
index 81aeecc..0000000
--- a/branches/2.2A_SDK5(4thNUP)/bsr_mcu.dr
+++ /dev/null
@@ -1,46 +0,0 @@
-;;; �̈�̒�`
-;32kB = 0x7FFF
-MEMORY BCL0:     (00000H, 01000H )
-;MEMORY BCL1:    (01000H, 01000H )          ; �o�b�N�A�b�v�̈�
-MEMORY ROM :     (02000H, 03000H )
-;MEMORY ROM_BKUP:(05000H, 03000H )          ; �o�b�N�A�b�v�̈�
-;MEMORY OCD :(0FC00H, 00400H )          ; OCD���g���Ă���炵��
-
-
-;;; �Z�O�����g�̊�����ݒ�
-; �u�[�g�u���b�N0�Ɋ��蓖�Ă�
-MERGE LDR_CODE : =BCL0
-MERGE LDR_CODL : =BCL0
-MERGE FSL_CODE : =BCL0         ; =FSL ; �ސ��t���b�V�����C�u����
-MERGE @@LCODE  : =BCL0         ; �X�^�[�g�A�b�v���[�`��
-;MERGE @@LCODEL : =BCL0
-
-;MERGE LDR_RINT:=BCL0
-;MERGE LDR_CNST:=BCL0
-MERGE LDR_CNSL:=BCL0
-
-
-
-; �ʏ�̈�ɒu��
-MERGE ROM_CODE:=ROM
-MERGE @@CNST:    =ROM
-MERGE @@R_INIT:  =ROM        ; ROM�ȊO�ɒu�������Ȃ�X�^�[�g�A�b�v���[�`����v�C��
-
-
-
-
-
-
-; �}�W�b�N�i���o�[
-;; magic.c�̒��Ŏw��
-
-
-;--- RAM�̈� -------------------------------------------------------
-;
-; RAM1,RAM2�̈�̓��[�U�[�v���O�����Ŏg�p���Ă��ǂ��ł����A�Z���t�v���O��������
-; �Z���t�v���O�����̃��C�u�������g�p���邽�߁A�l�͔j�󂳂�܂��B
-;
-memory RAM      : (0FF900H, 0500H)     ; ���[�U�[�q�`�l�̈�
-;memory SLF_RAM : (0FF900H, 0020H)     ; Slef Program�\��̈�[�g�p�֎~]
-memory RAM2     : (0FFE20H, 00C0H)     ; �Z���t�v���O�������A�g�p�֎~�̈�
-;memory SLF_RAM : (0FFE00H, 0020H)     ; Slef Program�\��̈�[�g�p�֎~]
diff --git a/branches/2.2A_SDK5(4thNUP)/bsr_system.h b/branches/2.2A_SDK5(4thNUP)/bsr_system.h
deleted file mode 100644
index b769294..0000000
--- a/branches/2.2A_SDK5(4thNUP)/bsr_system.h
+++ /dev/null
@@ -1,69 +0,0 @@
-#ifndef __bsr_system__
-#define __bsr_system__
-
-// �C�x���g���[�v�̃X�e�[�g
-enum pwr_state_
-{
-  OFF_TRIG = 0,
-  ON_CHECK,
-  ON_TRIG,
-  ON,
-//  SLEEP_TRIG,
-  SLEEP,
-//  WAKE,
-  OFF,
-};
-
-enum poweron_reason_
-{
-  NONE = 0,
-  RSN_PWSW,
-  RSN_RTC_ALARM,
-  RSN_TRIAL,		// �̌���
-  RSN_RSV4,
-  RSN_RSV5
-};
-
-
-enum model_
-{
-  MODEL_JIKKI,
-  MODEL_TS_BOARD,
-  MODEL_SHIROBAKO,
-  MODEL_JIKKI_NOBATT,
-  MODEL_CAPTURE_BOX,
-  MODEL_ISBAKO,         // �������Asystem_status.model�� MODEL_JIKKI �ɂ��Ă����̂Ŗ��g�p
-  MODEL_RESERVED3,
-};
-
-enum family_
-{
-  FAMILY_CTR,
-  FAMILY_SPFL,		// ���������́B
-  FAMILY_SNAKE,		// LAGER�́B
-  FAMILY_4_RESERVED
-};
-
-// �^�X�N�V�X�e���̏�ԏ��Ȃ�
-typedef struct _system_status_
-{
-  enum pwr_state_ pwr_state;
-  enum poweron_reason_ poweron_reason;
-  unsigned char reboot:1;
-//  unsigned char info_fullcolor:1;
-  unsigned char captureBox:1;         // �L���v�`���� SDK�ɂ͎��@�ƕԂ�
-  unsigned char taikendai:1;
-  unsigned char taikendai_nbd:1;
-  unsigned char is_dev:1;
-  enum model_   model;
-  enum family_  family;
-  unsigned char LCD_is_CGS:1;
-}system_status_;
-
-extern bit force_off;
-
-extern system_status_ system_status;
-
-
-
-#endif
diff --git a/branches/2.2A_SDK5(4thNUP)/config.h b/branches/2.2A_SDK5(4thNUP)/config.h
deleted file mode 100644
index 61df72d..0000000
--- a/branches/2.2A_SDK5(4thNUP)/config.h
+++ /dev/null
@@ -1,102 +0,0 @@
-#ifndef __config__
-#define __config__
-/*
-
- $Id: config.h 418 2011-09-22 01:35:37Z n2232 $
-
-*/
-
-#define MCU_VER_MAJOR    0x02
-#define MCU_VER_MINOR    0x26
-
-
-// �f�o�b�O�����X�C�b�`
-
-//#define _debug_led_				// LED print �f�o�b�O���������Ƃ�
-//#define _ALLOW_NOBATT_			// ���@�d�r�Ȃ��i=�A�_�v�^�̂݁j�ł̋N��������
-//#define _DBG_LED_PRINT_			// LED print �f�o�b�O���������Ƃ�(���ȃA�b�v�f�[�g�p)
-//#define _ENABLE_COMMAND3_			// mcu���Z�b�g��wdt�R�}���h��L���ɂ���
-//#define _FORCE_TAIKENDAI_
-//#define _FORCE_TAIKENDAI_NBD_
-//#define _DBG_FORCE_SNAKE_
-
-//#define _DBG_CHK_OFF_LEAK_		// OFF�����[�N�d���̃`�F�b�N(�f�o�b�K�Ŋm�F)
-//#define _DBG_NOP_					// �u���[�N��\�邽�߂�NOP()��L���ɂ������Ƃ�
-
-//#define _ENABLE_HAL_				// �f�o�b�O�p��HAL��L���ɂ���B�R�����g�A�E�g�ŃX���[�ɂȂ�B
-//#define _ENABLE_PRESS_SEL_TO_WDT_	// SEL ��������WDT����
-
-//#define _WDT_CHECK_					// WDT�����������炵���̂ŒǐՂ������Ƃ�break�����āA�R�[���X�^�b�N����
-// �� �I�v�V�����o�C�g��1�o�C�g�ځAbit7���Z�b�g����K�v������܂��B
-
-//#define _DI_WITH_CHECK_			// ���荞�݋֎~���d�Ɋ|���Ȃ����`�F�b�N
-
-#ifdef  _DBG_NOP_					// �R�[�h��K�v��NOP�Ƌ�ʂ��邽��
-# define dbg_nop()	NOP()
-#else
-# define dbg_nop()	;
-#endif
-
-
-#define _I2C_ERR_ABORT_				// *�W����on* I2C�Ō돑�����݂炵��������������ȍ~�����@
-									//. �u���[�N�����Ă��S�R����������Ȃ��Ȃ�܂�����...
-
-// ����d�l�t�@�[��
-//#define _TAIKENDAI_
-//					home���j���[�ɓ���Ă��܂��̂�����������t�@�[�����‚���BROM������Ȃ��̂œd�r�p�����[�^������p�X����
-//#define _TAIKENDAI_SEISAN_SPECIAL_
-//					���Y���ɑ̌�������g�p�����ǂ���ƁA�A�_�v�^���Ȃ��Ɠd�������炸�Ɍ����Ɏx�Ⴊ����̂ňꎞ�t�@�[��
-//#define _RVD_
-//					�f�o�b�K�A�^�b�`���Ƀ^�[�Q�b�g���Z�b�g�œd�����؂�Ă��܂��̂����
-
-
-// �������̎��́��C���‚��Ȃ��Ƒ̌���̐��Y�ł��Ȃ�����ˁI
-#ifdef _TAIKENDAI_SEISAN_SPECIAL_
-#define MCU_VER_MINOR    0x81
-#endif
-
-
-#ifdef _TAIKENDAI_
-#define MCU_VER_MINOR    0x92
-// 0x90 1.31 �����@HOME�ɓ���Ă��܂��̂��X�C�b�`�̃}�X�N�ő΍�
-//                 ROM�s���̂��߁A�d�r�p�����[�^�폜
-
-#endif
-
-
-#define _firm_format_v3_
-
-//#define _MODEL_TEG2_
-      // ��TEG2 CPU �{ Type-T
-
-//#define _MODEL_WM0_
-//#define _MODEL_WM0_TEG2_CTRC_
-
-//#define _MODEL_TS0_
-      // ��TEG2 CPU �{ Type-C
-
-#define _MODEL_CTR_
-      // ��TS board, WM1,1 TS-CTRC, ���@
-
-
-// ---------------------------------- //
-#ifdef _MODEL_TEG2_
-unsupported!
-#endif
-
-
-#ifdef _MODEL_WM0_
-unsupported!
-#endif
-
-
-#ifdef _MODEL_TS0_
-unsupported!
-#endif
-
-#ifdef _MODEL_CTR_
-#define _PMIC_CTR_
-#define _MCU_BSR_
-#endif
-
-#endif
diff --git a/branches/2.2A_SDK5(4thNUP)/fsl.h b/branches/2.2A_SDK5(4thNUP)/fsl.h
deleted file mode 100644
index 0e806b5..0000000
--- a/branches/2.2A_SDK5(4thNUP)/fsl.h
+++ /dev/null
@@ -1,362 +0,0 @@
-/*==============================================================================================*/
-/* Project      = Selfprogramming library for 78K0R/Ix3/Kx3-L Single Voltage SST (MF2) Flash    */
-/* Module       = fsl.h                                                                         */
-/* Version      = V1.01                                                                         */
-/* Date         = 28.03.2008 11:45:42                                                           */
-/*==============================================================================================*/
-/*                                  COPYRIGHT                                                   */
-/*==============================================================================================*/
-/* Copyright (c) 2007 by NEC Electronics (Europe) GmbH,                                         */
-/*               a company of the NEC Electronics Corporation                                   */
-/*==============================================================================================*/
-/* Purpose:                                                                                     */
-/*              constant, type and function prototype definitions used by the FSL               */
-/*                                                                                              */
-/*==============================================================================================*/
-/*                                                                                              */
-/* Warranty Disclaimer                                                                          */
-/*                                                                                              */
-/* Because the Product(s) is licensed free of charge, there is no warranty of any kind          */
-/* whatsoever and expressly disclaimed and excluded by NEC, either expressed or implied,        */
-/* including but not limited to those for non-infringement of intellectual property,            */
-/* merchantability and/or fitness for the particular purpose. NEC shall not have any obligation */
-/* to maintain, service or provide bug fixes for the supplied Product(s) and/or the Application.*/
-/*                                                                                              */
-/* Each User is solely responsible for determining the appropriateness of using the Product(s)  */
-/* and assumes all risks associated with its exercise of rights under this Agreement,           */
-/* including, but not limited to the risks and costs of program errors, compliance with         */
-/* applicable laws, damage to or loss of data, programs or equipment, and unavailability or     */
-/* interruption of operations.                                                                  */
-/*                                                                                              */
-/* Limitation of Liability                                                                      */
-/*                                                                                              */
-/* In no event shall NEC be liable to the User for any incidental, consequential, indirect,     */
-/* or punitive damage (including but not limited to lost profits) regardless of whether         */
-/* such liability is based on breach of contract, tort, strict liability, breach of warranties, */
-/* failure of essential purpose or otherwise and even if advised of the possibility of          */
-/* such damages. NEC shall not be liable for any services or products provided by third party   */
-/* vendors, developers or consultants identified or referred to the User by NEC in connection   */
-/* with the Product(s) and/or the Application.                                                  */
-/*                                                                                              */
-/*==============================================================================================*/
-/* Environment: PM plus (V6.30)                                                                 */
-/*              RA78K0(V1.20)                                                                   */
-/*              CC78K0(V2.00)                                                                   */
-/*==============================================================================================*/
-
-#ifndef __FSL_H_INCLUDED
-#define __FSL_H_INCLUDED
-
-
-/*==============================================================================================*/
-/* FSL type definitions                                                                         */
-/*==============================================================================================*/
-typedef unsigned char fsl_u08;
-typedef unsigned int fsl_u16;
-typedef unsigned long int fsl_u32;
-
-
-/*==============================================================================================*/
-/* constant definitions                                                                         */
-/*==============================================================================================*/
-
-/*status code definitions returned by the FSL functions                                         */
-#define   FSL_OK                    0x00
-#define   FSL_ERR_FLMD0             0x01
-#define   FSL_ERR_PARAMETER         0x05
-#define   FSL_ERR_PROTECTION        0x10
-#define   FSL_ERR_ERASE             0x1A
-#define   FSL_ERR_BLANKCHECK        0x1B
-#define   FSL_ERR_IVERIFY           0x1B
-#define   FSL_ERR_WRITE             0x1C
-#define   FSL_ERR_EEP_IVERIFY       0x1D
-#define   FSL_ERR_EEP_BLANKCHECK    0x1E
-#define   FSL_ERR_INTERRUPTION      0x1F
-
-
-/*==============================================================================================*/
-/* global function prototypes                                                                   */
-/*==============================================================================================*/
-
-
-/*----------------------------------------------------------------------------------------------*/
-/* Block type:   FSL command function                                                           */
-/*----------------------------------------------------------------------------------------------*/
-/* Purpose:      initialization of selfprogramming environment                                  */
-/*               After initialization:                                                          */
-/*               - the pointer to the data-buffer is stored                                     */
-/*               - all timing data are re-calculated according to the used system clock         */
-/*                                                                                              */
-/*               CAUTION:                                                                       */
-/*               The FSL_Init(&data_buffer) function is interruptible. Please use the           */
-/*               FSL_Init_cont(&data_buffer) to recall it as long return status is 0x1F.        */
-/*                                                                                              */
-/* Input:        data_buffer_pu08 - pointer to a data buffer of N...256 bytes                   */
-/*                                 (used for data exchange between firmware and application)    */
-/* Output:       -                                                                              */
-/* Returned:     u08, status_code                                                               */
-/*                    = 0x00(FSL_OK), normal and means initialization OK                        */
-/*                    = 0x1F(FSL_ERR_INTERRUPTION), initialization interrupted by user interrupt*/
-/*----------------------------------------------------------------------------------------------*/
-extern fsl_u08 FSL_Init( fsl_u08 * data_buffer_pu08 );
-extern fsl_u08 FSL_Init_cont( fsl_u08 * data_buffer_pu08 );
-
-
-/*----------------------------------------------------------------------------------------------*/
-/* Block type:   FSL command function                                                           */
-/*----------------------------------------------------------------------------------------------*/
-/* Purpose:      checks the voltage level (high or low) at FLMD0 pin                            */
-/* Input:        -                                                                              */
-/* Output:       -                                                                              */
-/* Returned:     fsl_u08, status_code                                                           */
-/*                    = 0x00(FSL_OK), normal and means FLMD0=HIGH                               */
-/*                    = 0x01(FSL_ERR_FLMD0), error, FLMD0=LOW                                   */
-/*----------------------------------------------------------------------------------------------*/
-extern fsl_u08 FSL_ModeCheck( void );
-
-
-/*----------------------------------------------------------------------------------------------*/
-/* Block type:   FSL command function                                                           */
-/*----------------------------------------------------------------------------------------------*/
-/* Purpose:      checks if specified block is blank                                             */
-/* Input:        block_u16 - block number has to be checked                                     */
-/* Output:       -                                                                              */
-/* Returned:     fsl_u08, status_code                                                           */
-/*                    = 0x00(FSL_OK), normal and means "block is blank"                         */
-/*                    = 0x05(FSL_ERR_PARAMETER), parameter error                                */
-/*                    = 0x1B(FSL_ERR_BLANKCHECK), blank-check error, means "block not blank"    */
-/*                    = 0x1F(FSL_ERR_INTERRUPTION), blank-check interrupted by user interrupt   */
-/*----------------------------------------------------------------------------------------------*/
-extern fsl_u08 FSL_BlankCheck( fsl_u16 block_u16 );
-
-
-/*----------------------------------------------------------------------------------------------*/
-/*  Block type:   FSL command function                                                          */
-/*----------------------------------------------------------------------------------------------*/
-/*  Purpose:      erase specified block                                                         */
-/*  Input:        block_u16 - block number has to be erase                                      */
-/*  Output:       -                                                                             */
-/*  Returned:     fsl_u08, status_code                                                          */
-/*                     = 0x00(FSL_OK), normal and means "block erased successfully"             */
-/*                     = 0x05(FSL_ERR_PARAMETER), parameter error                               */
-/*                     = 0x10(FSL_ERR_PROTECTION), tried to erase protected area                */
-/*                     = 0x1A(FSL_ERR_ERASE), erase error, retry up to max. 255 times           */
-/*                     = 0x1F(FSL_ERR_INTERRUPTION), erasing interrupted by user interrupt      */
-/*----------------------------------------------------------------------------------------------*/
-extern fsl_u08 FSL_Erase( fsl_u16 block_u16 );
-
-
-/*----------------------------------------------------------------------------------------------*/
-/* Block type:   FSL command function                                                           */
-/*----------------------------------------------------------------------------------------------*/
-/* Purpose:      performs internal verify on specified block                                    */
-/* Input:        block_u16 - block number has to be verified                                    */
-/* Output:       -                                                                              */
-/* Returned:     fsl_u08, status_code                                                           */
-/*                    = 0x00(FSL_OK), normal and means "block is verified"                      */
-/*                    = 0x05(FSL_ERR_PARAMETER), parameter error                                */
-/*                    = 0x1B(FSL_ERR_IVERIFY), internal verify error                            */
-/*                    = 0x1F(FSL_ERR_INTERRUPTION), verify interrupted by user interrupt        */
-/*----------------------------------------------------------------------------------------------*/
-extern fsl_u08 FSL_IVerify( fsl_u16 block_u16 );
-
-
-/*----------------------------------------------------------------------------------------------*/
-/* Block type:   FSL command function                                                           */
-/*----------------------------------------------------------------------------------------------*/
-/* Purpose:      writes N words from the data buffer into flash                                 */
-/* Input:        s_address_u32 - starting flash address the data has to be written              */
-/*                               See Condition  2) please.                                      */
-/*               my_wordcount_u08  - number of words (4 bytes) has to be written                */
-/* Output:       -                                                                              */
-/* Condition:   1) (s_address_u32 MOD 4 == 0)                                                   */
-/*              2) most significant byte (MSB) of  s_address_u32 has to be 0x00.                */
-/*                 Means: 0x00abcdef 24 bit flash address allowed                               */
-/*              3) (word_count_u08 <= sizeof(data buffer))  NOT CHECKED BY LIBRARY  !!!!!       */
-/* Changed:     -                                                                               */
-/* Returned:    fsl_u08, status code                                                            */
-/*                   = 0x00(FSL_OK), normal                                                     */
-/*                   = 0x05(FSL_ERR_PARAMETER), parameter error                                 */
-/*                   = 0x10(FSL_ERR_PROTECTION), protection error                               */
-/*                   = 0x1C(FSL_ERR_WRITE), write error                                         */
-/*                   = 0x1F(FSL_ERR_INTERRUPTION), write interrupted by user interrupt          */
-/*----------------------------------------------------------------------------------------------*/
-extern fsl_u08 FSL_Write( fsl_u32 s_address_u32, fsl_u08 word_count_u08 );
-
-
-/*----------------------------------------------------------------------------------------------*/
-/* Block type:   FSL command function                                                           */
-/*----------------------------------------------------------------------------------------------*/
-/* Purpose:      writes N words from the data buffer into flash                                 */
-/*               Before "writing" a N-word blankcheck is performed.                             */
-/*               After "writing" a N-Word internal verify is performed.                         */
-/* Input:        s_address_u32 - starting destination address has to be written                 */
-/*               my_wordcount_u08  - number of words (4 bytes) has to be written                */
-/* Output:       -                                                                              */
-/* Condition:   1) (s_address_u32 MOD 4 == 0)                                                   */
-/*              2) (word_count_u08 <= sizeof(data buffer))  NOT CHECKED BY FIRMWARE !!!!!       */
-/* Changed:     -                                                                               */
-/* Returned:    fsl_u08, status code                                                            */
-/*                   = 0x00(FSL_OK), normal                                                     */
-/*                   = 0x05(FSL_ERR_PARAMETER), parameter error                                 */
-/*                   = 0x10(FSL_ERR_PROTECTION), protection error                               */
-/*                   = 0x1C(FSL_ERR_WRITE), write error                                         */
-/*                   = 0x1D(FSL_ERR_EEP_IVERIFY), verify error                                  */
-/*                   = 0x1E(FSL_ERR_EEP_BLANKCHECK), blankcheck error                           */
-/*                   = 0x1F(FSL_ERR_INTERRUPTION), write interrupted by user interrupt          */
-/*----------------------------------------------------------------------------------------------*/
-extern fsl_u08 FSL_EEPROMWrite( fsl_u32 s_address_u32,
-                                fsl_u08 word_count_u08 );
-
-
-/*----------------------------------------------------------------------------------------------*/
-/* Block type:   FSL command function                                                           */
-/*----------------------------------------------------------------------------------------------*/
-/* Purpose:      reads the security information                                                 */
-/* Input:        destination_pu16 - destination address of the security info                    */
-/*               The format of the security info is: "unsigned short int"                       */
-/*                                                                                              */
-/*               Format of the security info:                                                   */
-/*               bit_0 = 0 -> chip erase command disabled, otherwise enabled                    */
-/*               bit_1 = 0 -> block erase command disabled, otherwise enabled                   */
-/*               bit_2 = 0 -> write command disabled, otherwise enabled                         */
-/*               bit_4 = 0 -> boot-area re-programming disabled, otherwise enabled              */
-/*               bit_8...bit_15 = 03H -> last block of the boot-area                            */
-/*               other bits = 1                                                                 */
-/* Output:       -                                                                              */
-/* Changed:      content of the data_buffer                                                     */
-/* Returned:     fsl_u08, status code                                                           */
-/*                  = 0x00(FSL_OK), normal                                                      */
-/*                  = 0x05(FSL_ERR_PARAMETER), parameter error                                  */
-/*----------------------------------------------------------------------------------------------*/
-extern fsl_u08 FSL_GetSecurityFlags( fsl_u16 * destination_pu16 );
-
-
-/*----------------------------------------------------------------------------------------------*/
-/* Block type:   FSL command function                                                           */
-/*----------------------------------------------------------------------------------------------*/
-/* Purpose:      read the boot flag i                                                           */
-/* Input:        destination_pu08 - destination address of the bootflag info                    */
-/*               The format of the boot-flag info is: "unsigned char"                           */
-/*               The value of the boot info is 0x00 for cluster 0 and 0x01 for cluster 1.       */
-/* Output:       -                                                                              */
-/* Changed:      content of the data_buffer                                                     */
-/* Returned:     fsl_u08, status code                                                           */
-/*                  = 0x00(FSL_OK), normal                                                      */
-/*                  = 0x05(FSL_ERR_PARAMETER), parameter error                                  */
-/*----------------------------------------------------------------------------------------------*/
-extern fsl_u08 FSL_GetActiveBootCluster( fsl_u08 * destination_pu08 );
-
-
-/*----------------------------------------------------------------------------------------------*/
-/* Block type:   FSL command function                                                           */
-/*----------------------------------------------------------------------------------------------*/
-/* Purpose:     puts the last address of the specified block into *destination_pu32             */
-/* Input:       *destination_pu32 - destination where the last-block-address                    */
-/*                                  should be stored                                            */
-/*              block_u16         - block number of the last address is needed                  */
-/* Changed:     -                                                                               */
-/* Returned:    fsl_u08, status code                                                            */
-/*                   = 0x00(FSL_OK), normal                                                     */
-/*                   = 0x05(FSL_ERR_PARAMETER), parameter error                                 */
-/*----------------------------------------------------------------------------------------------*/
-extern fsl_u08 FSL_GetBlockEndAddr( fsl_u32 * destination_pu32,
-                                    fsl_u16 block_u16 );
-
-
-/*----------------------------------------------------------------------------------------------*/
-/* Block type:   FSL command function                                                           */
-/*----------------------------------------------------------------------------------------------*/
-/* Purpose:     puts the information about the protected flash area into the function parameter */
-/* Input:       *start_block_pu16 - destination where the FSW start block should be stored      */
-/*              *end_block_pu16   - destination where the FSW end block should be stored        */
-/* Changed:     -                                                                               */
-/* Returned:    fsl_u08, status code                                                            */
-/*                   = 0x00(FSL_OK), normal                                                     */
-/*                   = 0x05(FSL_ERR_PARAMETER), parameter error                                 */
-/*----------------------------------------------------------------------------------------------*/
-extern fsl_u08 FSL_GetFlashShieldWindow( fsl_u16 * start_block_pu16,
-                                         fsl_u16 * end_block_pu16 );
-
-
-/*----------------------------------------------------------------------------------------------*/
-/* Block type:   FSL command function                                                           */
-/*----------------------------------------------------------------------------------------------*/
-/* Purpose:     defines a new Flash-Shield-Window area inside the flash memory                  */
-/* Input:       start_block_u16 - starting block of the Flash-Shield-Window (FSW)               */
-/*              end_block_u16   - ending block of the flash-Shield-Window (FSW)                 */
-/* Changed:     -                                                                               */
-/* Returned:    fsl_u08, status code                                                            */
-/*                    = 0x00(FSL_OK), normal                                                    */
-/*                    = 0x05(FSL_ERR_PARAMETER), parameter error                                */
-/*                    = 0x10(FSL_ERR_PROTECTION), protection error                              */
-/*                    = 0x1A(FSL_ERR_ERASE), erase error                                        */
-/*                    = 0x1B(FSL_ERR_IVERIFY), internal verify error                            */
-/*                    = 0x1F(FSL_ERR_INTERRUPTION), write interrupted by user interrupt         */
-/*----------------------------------------------------------------------------------------------*/
-extern fsl_u08 FSL_SetFlashShieldWindow( fsl_u16 start_block_u16,
-                                         fsl_u16 end_block_u16 );
-
-
-/*----------------------------------------------------------------------------------------------*/
-/* Block type:   FSL command function                                                           */
-/*----------------------------------------------------------------------------------------------*/
-/* Purpose:     Swapping of bootcluster 0 and 1                                                 */
-/*                                                                                              */
-/*              CAUTION !!!!                                                                    */
-/*              After this function the boot cluster are immediately swapped                    */
-/* Input:       -                                                                               */
-/* Output:      -                                                                               */
-/* Returned:    fsl_u08, status code                                                            */
-/*                   = 0x00(FSL_OK), normal                                                     */
-/*                   = 0x05(FSL_ERR_PARAMETER), parameter error                                 */
-/*                   = 0x10(FSL_ERR_PROTECTION), protection error                               */
-/*                   = 0x1A(FSL_ERR_ERASE), erase error                                         */
-/*                   = 0x1B(FSL_ERR_IVERIFY), internal verify error                             */
-/*                   = 0x1F(FSL_ERR_INTERRUPTION), write interrupted by user interrupt          */
-/*----------------------------------------------------------------------------------------------*/
-extern fsl_u08 FSL_SwapBootCluster( void );
-
-
-/*----------------------------------------------------------------------------------------------*/
-/* Block type:   FSL command function                                                           */
-/*----------------------------------------------------------------------------------------------*/
-/* Purpose:      sets specified security flag by dedicated command-function.                    */
-/*                                                                                              */
-/*               There are following security levels:                                           */
-/*               a) chip-erase protection   (cannot be reset by programmer !!!)                 */
-/*               b) block-erase protection  (can be reset by chip-erase on programmer)          */
-/*               c) write protection        (can be reset by chip-erase on programmer)          */
-/*               d) boot-cluster protection (cannot be reset by programmer !!!)                 */
-/*                                                                                              */
-/*               CAUTION !!!!                                                                   */
-/*               Each security flag can be written by the application only once                 */
-/*                                                                                              */
-/* Input:        -                                                                              */
-/* Output:       -                                                                              */
-/* Returned:     fsl_u08, status code                                                           */
-/*                    = 0x00(FSL_OK), normal                                                    */
-/*                    = 0x05(FSL_ERR_PARAMETER), parameter error                                */
-/*                    = 0x10(FSL_ERR_PROTECTION), protection error                              */
-/*                    = 0x1A(FSL_ERR_ERASE), erase error                                        */
-/*                    = 0x1B(FSL_ERR_IVERIFY), internal verify error                            */
-/*                    = 0x1F(FSL_ERR_INTERRUPTION), write interrupted by user interrupt         */
-/*----------------------------------------------------------------------------------------------*/
-extern fsl_u08 FSL_SetChipEraseProtectFlag( void );
-extern fsl_u08 FSL_SetBlockEraseProtectFlag( void );
-extern fsl_u08 FSL_SetWriteProtectFlag( void );
-extern fsl_u08 FSL_SetBootClusterProtectFlag( void );
-
-
-/*----------------------------------------------------------------------------------------------*/
-/* Block type:   FSL function                                                                   */
-/*----------------------------------------------------------------------------------------------*/
-/* Purpose:     defines the firmware operation method after interrupt service (ISR) execution.  */
-/* Input:       mode_u08 = 0x00,  after RETI the firmware is continuing the interrupted command.*/
-/*                       = other, after RETI the firmware is interrupted with status 0x1F.      */
-/* Changed:     -                                                                               */
-/* Returned:    -                                                                               */
-/*----------------------------------------------------------------------------------------------*/
-extern void FSL_SetInterruptMode( fsl_u08 mode_u08 );
-
-#endif
diff --git a/branches/2.2A_SDK5(4thNUP)/fsl_user.h b/branches/2.2A_SDK5(4thNUP)/fsl_user.h
deleted file mode 100644
index 1018689..0000000
--- a/branches/2.2A_SDK5(4thNUP)/fsl_user.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*==============================================================================================*/
-/* Project      = Selfprogramming library for 78K0R/Ix3/Kx3-L Single Voltage SST (MF2) Flash    */
-/* Module       = fsl_user.h                                                                    */
-/* Version      = V1.01                                                                         */
-/* Date         = 28.03.2008 11:45:55                                                           */
-/*==============================================================================================*/
-/*                                  COPYRIGHT                                                   */
-/*==============================================================================================*/
-/* Copyright (c) 2007 by NEC Electronics (Europe) GmbH,                                         */
-/*               a company of the NEC Electronics Corporation                                   */
-/*==============================================================================================*/
-/* Purpose:                                                                                     */
-/*              user configurable constant/macros of the selfprogramming library                */
-/*                                                                                              */
-/*==============================================================================================*/
-/*                                                                                              */
-/* Warranty Disclaimer                                                                          */
-/*                                                                                              */
-/* Because the Product(s) is licensed free of charge, there is no warranty of any kind          */
-/* whatsoever and expressly disclaimed and excluded by NEC, either expressed or implied,        */
-/* including but not limited to those for non-infringement of intellectual property,            */
-/* merchantability and/or fitness for the particular purpose. NEC shall not have any obligation */
-/* to maintain, service or provide bug fixes for the supplied Product(s) and/or the Application.*/
-/*                                                                                              */
-/* Each User is solely responsible for determining the appropriateness of using the Product(s)  */
-/* and assumes all risks associated with its exercise of rights under this Agreement,           */
-/* including, but not limited to the risks and costs of program errors, compliance with         */
-/* applicable laws, damage to or loss of data, programs or equipment, and unavailability or     */
-/* interruption of operations.                                                                  */
-/*                                                                                              */
-/* Limitation of Liability                                                                      */
-/*                                                                                              */
-/* In no event shall NEC be liable to the User for any incidental, consequential, indirect,     */
-/* or punitive damage (including but not limited to lost profits) regardless of whether         */
-/* such liability is based on breach of contract, tort, strict liability, breach of warranties, */
-/* failure of essential purpose or otherwise and even if advised of the possibility of          */
-/* such damages. NEC shall not be liable for any services or products provided by third party   */
-/* vendors, developers or consultants identified or referred to the User by NEC in connection   */
-/* with the Product(s) and/or the Application.                                                  */
-/*                                                                                              */
-/*==============================================================================================*/
-/* Environment: PM plus (V6.30)                                                                 */
-/*              RA78K0(V1.20)                                                                   */
-/*              CC78K0(V2.00)                                                                   */
-/*==============================================================================================*/
-
-
-#ifndef __FSL_USER_H_INCLUDED
-#define __FSL_USER_H_INCLUDED
-
-
-/*==============================================================================================*/
-/* constant definitions                                                                         */
-/*==============================================================================================*/
-
-
-/* specify the CPU frequency in [Hz], only 2MHz....20MHz allowed  */
-#define   FSL_SYSTEM_FREQUENCY      8000000
-
-/* define whether low-voltage mode is used or not                 */
-/* #define   FSL_LOW_VOLTAGE_MODE                                 */
-
-/* size of the common data buffer expressed in [bytes]                                          */
-/* the data buffer is used for data-exchange between the firmware and the selflib.              */
-//#define   FSL_DATA_BUFFER_SIZE    256
-#define   FSL_DATA_BUFFER_SIZE    0
-
-
-/* customizable interrupt controller configuration during selfprogramming period                */
-/* Bit     --7-------6-------5-------4-------3-------2-------1-------0----------------------    */
-/* MK0L:     PMK5    PMK4    PMK3    PMK2    PMK1    PMK0    LVIMK   WDTIMK                     */
-/* MK0H:     SREMK0  SRMK0*  STMK0*  DMAMK1  DMAMK0  SREMK3  SRMK3   STMK3                      */
-/* MK1L:     TMMK03  TMMK02  TMMK01  TMMK00  IICMK0  SREMK1  SRMK1   STMK1*                     */
-/* MK1H:     TMMK04  SREMK2  SRMK2   STMK2*  KRMK    RTCIMK  RTCMK   ADMK                       */
-/* MK2L:     PMK10   PMK9    PMK8    PMK7    PMK6    TMMK07  TMMK06  TMMK05                     */
-/* MK2H:     1       1       1       1       1       1       1       PMK11                      */
-/*------------------------------------------------------------------------------------------    */
-/*                                                                                              */
-/* Examples:                                                                                    */
-/* =========                                                                                    */
-/*#define   FSL_MK0L_MASK   0xF7   -> allow INTP1 interrupt during selfprogramming              */
-/*#define   FSL_MK0H_MASK   0xEF   -> allow DMA1 interrupt during selfprogramming               */
-/*#define   FSL_MK1L_MASK   0xBF   -> allow TM02 interrupt during selfprogramming               */
-/*#define   FSL_MK1H_MASK   0xFF   -> all interrupts disabled during selfprogramming            */
-/*#define   FSL_MK2L_MASK   0xF7   -> allow INTP6 interrupt during selfprogramming              */
-/*#define   FSL_MK2H_MASK   0xFF   -> all interrupts disabled during selfprogramming            */
-/*------------------------------------------------------------------------------------------    */
-#define   FSL_MK0L_MASK   0xFF  /* all interrupts disabled during selfprogramming              */
-#define   FSL_MK0H_MASK   0xFF  /* all interrupts disabled during selfprogramming              */
-#define   FSL_MK1L_MASK   0xFF  /* all interrupts disabled during selfprogramming              */
-#define   FSL_MK1H_MASK   0xFF  /* all interrupts disabled during selfprogramming              */
-#define   FSL_MK2L_MASK   0xFF  /* all interrupts disabled during selfprogramming              */
-#define   FSL_MK2H_MASK   0xFF  /* all interrupts disabled during selfprogramming              */
-
-
-/* FLMD0 control bit                        */
-#ifndef _WIN32
-#define  FSL_FLMD0_HIGH   {BECTL.7 = 1;}
-#define  FSL_FLMD0_LOW    {BECTL.7 = 0;}
-#else
-#define  FSL_FLMD0_HIGH   {BECTL_7 = 1;}
-#define  FSL_FLMD0_LOW    {BECTL_7 = 0;}
-#endif
-
-
-/*----------------------------------------------------------------------------------------------*/
-/* switch interrupt backu functionality ON/OFF using #define/#undef                             */
-/*----------------------------------------------------------------------------------------------*/
-/* #define  FSL_INT_BACKUP */
-#undef  FSL_INT_BACKUP
-
-
-#endif
diff --git a/branches/2.2A_SDK5(4thNUP)/get_ei.asm b/branches/2.2A_SDK5(4thNUP)/get_ei.asm
deleted file mode 100644
index 29f4a6e..0000000
--- a/branches/2.2A_SDK5(4thNUP)/get_ei.asm
+++ /dev/null
@@ -1,26 +0,0 @@
-$PROCESSOR ( 9F0104 )
-
-PUBLIC _get_ei
-;
-; PSW��EI��ǂݏo���܂��B
-;
-
-
-
-ROM_CODE	CSEG	BASE
-
-_get_ei:
-		set1	CY
-        and1	CY,PSW.7	; check IE bit. if 0, all interrupts are disabled.
-        bnc     $ie_dis
-        mov	    C,#01h
-        ret
-
-ie_dis:
-        mov	    C,#00h
-        ret
-
-
-        end
-        
-
diff --git a/branches/2.2A_SDK5(4thNUP)/hal.c b/branches/2.2A_SDK5(4thNUP)/hal.c
deleted file mode 100644
index f51354f..0000000
--- a/branches/2.2A_SDK5(4thNUP)/hal.c
+++ /dev/null
@@ -1,182 +0,0 @@
-/* ========================================================
-   �ȈՃe�X�g�̂��߂�HAL���C��
-   
-   $Id$
- ======================================================== */
-#ifndef _WIN32
-#pragma SFR
-#endif
-
-#include "incs_loader.h"
-
-
-#define WIFI_txLatch PIF21					// �d�g���M�p���X �{�� led.h �Œ�`
-
-
-// HAL�ł��Ԃ���� ////////////////////////////////////////
-// ����Ȏ�����Ȃ琳�_���ɂ�r...���≽�ł��Ȃ�
-bit PM_EXTDC_n;
-bit BT_IN_CHG_n;
-bit SW_POW_n;
-bit SW_HOME_n;
-bit SW_WIFI_n;
-bit SHELL_OPEN;
-
-/*
-#define REG_BIT_HAL0_PM_EXTDC_n     ( 1 << 7 )
-#define REG_BIT_HAL0_BT_IN_CHG_n    ( 1 << 6 )
-//#define REG_BIT_HAL0_PM_IRQ_n     ( 1 << 5 )  // �g��Ȃ�
-#define REG_BIT_HAL0_WL_TX          ( 1 << 4 )
-#define REG_BIT_HAL0_SHELL_OPEN     ( 1 << 3 )
-#define REG_BIT_HAL0_SW_WIFI_n      ( 1 << 2 )
-#define REG_BIT_HAL0_SW_HOME_n      ( 1 << 1 )
-#define REG_BIT_HAL0_SW_POW_n       ( 1 << 0 )
-
-#define REG_BIT_HAL1_DIPSW_1        ( 1 << 3 )
-#define REG_BIT_HAL1_DIPSW_0        ( 1 << 2 )
-#define REG_BIT_HAL1_HW_DET_1       ( 1 << 1 )
-#define REG_BIT_HAL1_HW_DET_0       ( 1 << 0 )
-*/
-
-
-// �ڂ��ւ�
-// �`���^�����O�����Ȃ炱���ł������(�������ԃJ�E���g�͕�)
-void hal_update()
-{
-#ifdef _ENABLE_HAL_
-    u8 temp_conf = vreg_ctr[ VREG_C_HAL_OVW_CONT0 ];
-    u8 temp_dat  = vreg_ctr[ VREG_C_HAL_OVW_DAT0 ];
-#else
-    u8 temp_conf = 0x00;
-    u8 temp_dat  = 0;	// ���ł��ǂ�
-#endif
-
-    // �A�_�v�^�L��
-    if( temp_conf & REG_BIT_HAL0_PM_EXTDC_n )
-    {
-        // �O�����͂Ȃ񂾂��傫���Ȃ肪��
-        if(( temp_dat & REG_BIT_HAL0_PM_EXTDC_n ) == 0 )
-        {
-            PM_EXTDC_n = 0;
-        }
-        else
-        {
-            PM_EXTDC_n = 1;
-        }
-    }
-    else
-    {
-        PM_EXTDC_n = PM_EXTDC_n_RAW;
-    }
-
-    // �[�d���H
-    if( temp_conf & REG_BIT_HAL0_BT_IN_CHG_n )
-    {
-        if(( temp_dat & REG_BIT_HAL0_BT_IN_CHG_n ) == 0 )
-        {
-            BT_IN_CHG_n = 0;
-        }
-        else
-        {
-            BT_IN_CHG_n = 1;
-        }
-    }
-    else
-    {
-        BT_IN_CHG_n = BT_IN_CHG_n_RAW;
-    }
-
-    // �d���t
-    if( temp_conf & REG_BIT_HAL0_SW_POW_n )
-    {
-        if(( temp_dat & REG_BIT_HAL0_SW_POW_n ) == 0 )
-        {
-            SW_POW_n = 0 ;
-        }
-        else
-        {
-            SW_POW_n = 1;
-        }
-    }
-    else
-    {
-        SW_POW_n = SW_POW_n_RAW;
-    }
-
-    // ���Ɩt
-    if( temp_conf & REG_BIT_HAL0_SW_HOME_n )
-    {
-        if(( temp_dat & REG_BIT_HAL0_SW_HOME_n ) == 0 )
-        {
-            SW_HOME_n = 0;
-        }
-        else
-        {
-            SW_HOME_n = 1;
-        }
-    }
-    else
-    {
-        if( system_status.model == MODEL_TS_BOARD )// �ڑ���̃|�[�g���Ⴄ����
-        {
-            SW_HOME_n = SW_HOME_n_TSBOARD_RAW;
-        }
-        else
-        {
-            SW_HOME_n = SW_HOME_n_JIKKI_RAW;  
-        }
-    }
-
-    // �����J��
-    if( temp_conf & REG_BIT_HAL0_SW_WIFI_n )
-    {
-        if(( temp_dat & REG_BIT_HAL0_SW_WIFI_n ) == 0 )
-        {
-            SW_WIFI_n = 0;
-        }
-        else
-        {
-            SW_WIFI_n = 1;
-        }
-    }
-    else
-    {
-        SW_WIFI_n = SW_WIFI_n_RAW;
-    }
-
-    // ����
-    if( temp_conf & REG_BIT_HAL0_SHELL_OPEN )
-    {
-        if(( temp_dat & REG_BIT_HAL0_SHELL_OPEN ) == 0 )
-        {
-            SHELL_OPEN = 0;
-        }
-        else
-        {
-            SHELL_OPEN = 1;
-        }
-    }
-    else
-    {
-        SHELL_OPEN = SHELL_OPEN_RAW;
-    }
-
-    // �����d�g����
-    if( temp_conf & REG_BIT_HAL0_WL_TX )
-    {
-        WIFI_txLatch = 1;
-    }
-
-}
-
-
-
-void hal_reset()
-{
-    vreg_ctr[ VREG_C_HAL_OVW_CONT0 ] = 0;
-    vreg_ctr[ VREG_C_HAL_OVW_CONT1 ] = 0;
-    vreg_ctr[ VREG_C_HAL_OVW_TEMPERATURE ] = 0xFF;
-    vreg_ctr[ VREG_C_HAL_OVW_BT_FUEL ] = 0xFF;
-    vreg_ctr[ VREG_C_HAL_OVW_BT_VOLTAGE ] = 0xFF;
-}
-
diff --git a/branches/2.2A_SDK5(4thNUP)/hal.h b/branches/2.2A_SDK5(4thNUP)/hal.h
deleted file mode 100644
index 245be75..0000000
--- a/branches/2.2A_SDK5(4thNUP)/hal.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef _hal_h_
-#define _hal_h_
-
-
-extern bit PM_EXTDC_n;
-extern bit BT_IN_CHG_n;
-extern bit SW_POW_n;
-extern bit SW_HOME_n;
-extern bit SW_WIFI_n;
-extern bit SHELL_OPEN;
-
-// ========================================================
-void hal_update();
-void hal_reset();
-
-#endif
diff --git a/branches/2.2A_SDK5(4thNUP)/hoge.bin b/branches/2.2A_SDK5(4thNUP)/hoge.bin
deleted file mode 100644
index b235118..0000000
Binary files a/branches/2.2A_SDK5(4thNUP)/hoge.bin and /dev/null differ
diff --git a/branches/2.2A_SDK5(4thNUP)/i2c_ctr.c b/branches/2.2A_SDK5(4thNUP)/i2c_ctr.c
deleted file mode 100644
index a56fb98..0000000
--- a/branches/2.2A_SDK5(4thNUP)/i2c_ctr.c
+++ /dev/null
@@ -1,314 +0,0 @@
-/* ========================================================
-  ��SoC �V�K�`�����l�� I2C�ʐM
-    ���c���J�Z.nintendo
-	'09 Apr
- $Id: i2c_ctr.c 418 2011-09-22 01:35:37Z n2232 $
- ======================================================== */
-#ifndef _WIN32
-#pragma interrupt INTIICA1	int_iic_ctr RB1
-#endif
-
-
-#include "incs.h"
-#include "rtc.h"
-#include "pedometer.h"
-
-
-#ifdef _MCU_BSR_
-// #ifdef _MODEL_TS0_ || _MODEL_WM0_
-
-// ���[�L���O���f����I2C���t
-// TEG�͉�H�}�Ńe���R
-#define ACKD        ACKD1
-#define ACKE        ACKE1
-#define COI         COI1
-#define IICAEN      IICA1EN
-#define IICRSV      IICRSV1
-#define IICA        IICA1
-#define IICAIF      IICAIF1
-#define IICAMK      IICAMK1
-#define IICAPR0     IICAPR11
-#define IICAPR1     IICAPR01
-#define IICCTL0     IICCTL10
-#define IICE        IICE1
-#define IICF        IICF1
-#define IICS        IICS1
-#define IICWH       IICWH1
-#define IICWL       IICWL1
-#define LREL        LREL1
-#define SPD         SPD1
-#define SPIE        SPIE1
-#define STCEN       STCEN1
-#define STD         STD1
-#define SVA         SVA1
-#define WREL        WREL1
-#define WTIM        WTIM1
-#define TRC         TRC1
-#define SMC         SMC1
-#define DFC         DFC1
-#define IICS		IICS1
-#define PortMode	PM20
-#define Port		P20
-
-#endif
-
-
-
-// ==============================================
-enum en_IIC_STATE
-{
-    IIC_IDLE = 0,
-    IIC_RCV_REG_ADRS,
-    IIC_TX_OR_RX,
-    IIC_TX,
-    IIC_RX
-};
-
-
-
-// ==============================================
-extern bit irq_readed;                 // �����ꂩ��IRQ���W�X�^���ǂ܂ꂽ
-
-u8 iic_burst_state;
-static enum en_IIC_STATE state = IIC_IDLE;
-
-#define bit_iics_spd	(i2c_stat & (1<<0))
-#define bit_iics_std	(i2c_stat & (1<<1))
-#define bit_iics_ackd	(i2c_stat & (1<<2))
-#define bit_iics_trc	(i2c_stat & (1<<3))
-#define bit_iics_coi	(i2c_stat & (1<<4))
-
-
-
-/********************************************//**
- isr
- 
- �X�e�[�g���Ɋ��荞�݂����菈����i�߂�
- ***********************************************/
-__interrupt void int_iic_ctr(  )
-{
-    static u8 reg_adrs;
-    static u8 tx_buf;
-    u8 rx_buf;
-    static u8 adrs_access_from;			// �o�[�X�g�A�N�Z�X�̎��Ɏg��
-
-	u8 i2c_stat = IICS;				// volatile�̂���
-
-    // �ǂݏo���I��
-    if( !bit_iics_ackd                 // ���荞�ݗv����NAK�i�f�[�^���M�̍Ō�j
-		|| bit_iics_spd )              // �X�g�b�v�R���f�B�V����(!ACKD �ɗ����Ƃ��͊��荞�ݗ��Ȃ� (SPIE = 0))
-    {
-		/* 
-			I2C�̔������x���Ă��̃t���O����������O��STD�����Ă��܂����Ƃ�����
-			���ǁA���Ȃ����삷��‚���
-		*/
-
-        // ���W�X�^���[�h�ŁA���荞�݃s�����l�Q�[�g
-        // �܂��ǂ܂�ĂȂ����荞�݂�����΁A�ēx�A�T�[�g
-        if( irq_readed )
-        {
-            IRQ0_neg;
-            irq_readed = false;
-            if( !(  (( vreg_ctr[VREG_C_IRQ0] & vreg_ctr[VREG_C_IRQ_MASK0 ] ) == 0 )
-                    && (( vreg_ctr[VREG_C_IRQ1] & vreg_ctr[VREG_C_IRQ_MASK1 ] ) == 0 )
-                    && (( vreg_ctr[VREG_C_IRQ2] & vreg_ctr[VREG_C_IRQ_MASK2 ] ) == 0 )
-                    && (( vreg_ctr[VREG_C_IRQ3] & vreg_ctr[VREG_C_IRQ_MASK3 ] ) == 0 ) ))
-            {
-                while( !IRQ0 ){;}  // ���ԉ҂��s�v����
-                IRQ0_ast;
-            }
-        }
-
-        // I2C�I�����ɉ������镨 //
-        hosu_read_end(  );		// �����v�ǂݏo���I��
-        rtc_unlock(  );
-
-        state = IIC_IDLE;
-        SPIE = 0;
-        LREL = 1;
-        EI();
-        return;
-    }
-
-    if( bit_iics_std )                   // ���荞�ݗv���F�X�^�[�g�R���f�B�V����
-    {
-        if( !( state == IIC_IDLE || state == IIC_TX_OR_RX ))
-        {
-            // sp/nack ��葹�˂�
-//            dbg_nop();          // ���Ȃ��͂�...
-/*
-            // �p�P�b�g�̐擪��st�ƌ��Ȃ��B
-            // ���ʂɑ��s
-            state = IIC_IDLE;
-/*/
-			// ���g���C���Ă��炤
-			state = IIC_IDLE;
-			SPIE = 0;
-			LREL = 1;
-			EI();
-//*/
-		}
-		// �ʏ�
-	}
-
-	EI();
-
-    switch ( state )
-    {
-    case ( IIC_IDLE ):
-        // ���njĂяo���ɉ����B
-        // �������Ȃ�
-        iic_burst_state = 0;
-        SPIE = 1;
-        WREL = 1;               // �E�F�C�g����
-        state = IIC_RCV_REG_ADRS;
-		return;
-
-    case ( IIC_RCV_REG_ADRS ):  // �Q�o�C�g�ځi���W�X�^�A�h���X�j��M��ɗ���
-        // ���W�X�^�A�h���X��M
-        reg_adrs = IICA;
-
-        WREL = 1;
-        adrs_access_from = reg_adrs;
-        tx_buf = vreg_ctr_read( reg_adrs );    // �f�[�^�̏��������Ă���
-        state = IIC_TX_OR_RX;
-		return;
-
-    case ( IIC_TX_OR_RX ):      // ���̎��ɗ��銄�荞�݁BST�Ȃ瑗�M�����A�f�[�^�������珑�����܂�
-  //    if( TRC )               // ���M�����t���O �ŋ�ʂ���̂́A���荞�ݒx�����ɕs����N���肦��
-        if( bit_iics_std )
-        {                       // �X�^�[�g�R���f�B�V�������o�t���O
-            // ���[�h�����
-            if( bit_iics_coi )
-            {                   // �A�h���X��v�t���O
-                state = IIC_TX;
-                // no break, no return //
-            }
-            else
-            {
-                // ���X�^�[�g�ňႤ�f�o�C�X���Ă΂ꂽ�I
-                SPIE = 0;
-                LREL = 1;       // �E�F�C�g����?
-                state = IIC_IDLE;       // �I������
-                return;
-            }
-        }
-        else
-        {
-            state = IIC_RX;     // �f�[�^1�o�C�g��M�̊��荞�݂�����
-            // no break, no return //
-        }
-        /* FALLTHROUGH */
-
-    default:                    // �o�[�X�g R/W �ł�����������Ă΂�邱�ƂɂȂ�
-        if( state == IIC_TX )
-        {                       // ���M
-            IICA = tx_buf;
-            vreg_ctr_after_read( reg_adrs, tx_buf );    // �ǂ񂾂�N���A�Ȃǂ̏���
-        }
-        else
-        {                       // ��M
-            rx_buf = IICA;
-
-#ifdef _I2C_ERR_ABORT_
-			if( reg_adrs >= 0x80 || reg_adrs <= 1 )
-            {
-                LREL = 1; // �Ȃ񂩃f�[�^�������̂ŒʐM�I�� nak���Ԃ�̂��Ȃ��c
-                return;
-            }
-#endif
-			vreg_ctr_write( reg_adrs, rx_buf );
-            WREL = 1;
-		}
-
-		// ���W�X�^�A�h���X�̃C���N�������g
-        /// �A�N�Z�X�|�C���^��i�߂Ȃ�����ȃ��W�X�^
-        switch( adrs_access_from )
-        {
-        case( VREG_C_ACC_HOSU_HIST ):
-        case( VREG_C_LED_NOTIFY_DATA ):
-        case( VREG_C_LED_POW ):
-        case( VREG_CX_INFO ):
-        case( VREG_CX_FREE_DATA ):
-            break;
-        case( VREG_CX_FREE_ADRS ):
-            if( reg_adrs == VREG_CX_FREE_ADRS )
-            {
-                reg_adrs = VREG_CX_FREE_DATA;
-            }
-            break;
-        default:
-	        reg_adrs ++;
-        }
-
-        if( state == IIC_TX )
-        {                       // ����ɂ‚��ɑ���f�[�^�̏��������V�e�I�N�BSP�����Ďg���Ȃ���������Ȃ�
-            tx_buf = vreg_ctr_read( reg_adrs );
-        }
-        break;
-    }
-}
-
-
-
-/********************************************//**
-�@���W���[��������
-�@
-�@todo twl �� init �Ɠ���?
-�@
-�@�r�b�g���삪�����̂ł������ĕs�o�ς�������Ȃ�
- ***********************************************/
-void IIC_ctr_Init( void )
-{
-
-    IICAEN = 1;
-
-    IICE = 0;                   /* IICA disable */
-
-    IICAMK = 1;                 /* INTIICA disable */
-    IICAIF = 0;                 /* clear INTIICA interrupt flag */
-
-//    IICAPR0 = 1;                /* set INTIICA high priority */
-//    IICAPR1 = 0;                /* set INTIICA high priority */  �X�^�b�N�s��
-
-    P20 &= ~0x3;
-
-    SVA = IIC_C_SLAVEADDRESS;
-    IICF = 0x01;
-
-    STCEN = 1;                  // ���X�^�[�g�̋���
-    IICRSV = 1;                 // �ʐM�\��������Ȃ�:�X���[�u�ɓO����
-
-    SPIE = 0;                   // �X�g�b�v�R���f�B�V�����ł̊��荞�݂��֎~
-    WTIM = 1;                   // ������ACK��Ԃ�����clk��L�ɌŒ肷��
-    ACKE = 1;
-
-    IICWH = 9;
-    IICWL = 11;                 // L���Ԃ̒���
-
-    SMC = 1;                    // �������[�h
-    DFC = 1;                    // �f�W�^���t�B���^on (@fast mode)
-
-    IICAMK = 0;                 // ���荞�݂�����
-
-    IICE = 1;
-
-	PortMode &= ~0x03;
-	Port     &= ~0x03;
-
-	state = IIC_IDLE;
-}
-
-
-
-/********************************************//**
-
- ***********************************************/
-void IIC_ctr_Stop( void )
-{
-    IICE = 0;                   /* IICA disable */
-    IICAEN = 0;
-}
-
-
-
diff --git a/branches/2.2A_SDK5(4thNUP)/i2c_ctr.h b/branches/2.2A_SDK5(4thNUP)/i2c_ctr.h
deleted file mode 100644
index 16234ff..0000000
--- a/branches/2.2A_SDK5(4thNUP)/i2c_ctr.h
+++ /dev/null
@@ -1,210 +0,0 @@
-#ifndef _MDSERIAL_A_
-#define _MDSERIAL_A_
-
-
-/* IIC operation enable	(IICE0)	*/
-#define	IIC0_OPERATION				0x80
-#define	IIC0_OPERATION_DISABLE		0x00    /* stop operation */
-#define	IIC0_OPERATION_ENABLE		0x80    /* enable operation     */
-
-/* Exit	from communications	(LREL0)	*/
-#define	IIC0_COMMUNICATION			0x40
-#define	IIC0_COMMUNICATION_NORMAL	0x00    /* normal operation     */
-#define	IIC0_COMMUNICATION_EXIT		0x40    /* exit from current communication */
-
-/* Wait	cancellation (WREL0) */
-#define	IIC0_WAITCANCEL				0x20
-#define	IIC0_WAIT_NOTCANCEL			0x00    /* do not cancel wait */
-#define	IIC0_WAIT_CANCEL			0x20    /* cancel wait */
-
-/* Generation of interrupt when	stop condition (SPIE0) */
-#define	IIC0_STOPINT				0x10
-#define	IIC0_STOPINT_DISABLE		0x00    /* disable */
-#define	IIC0_STOPINT_ENABLE			0x10    /* enable */
-
-/* Wait	and	interrupt generation (WTIM0) */
-#define	IIC0_WAITINT				0x08
-#define	IIC0_WAITINT_CLK8FALLING	0x00    /* generate     at the eighth clocks falling edge       */
-#define	IIC0_WAITINT_CLK9FALLING	0x08    /* generated at the     ninth clocks falling edge       */
-
-/* Acknowledgement control (ACKE0) */
-#define	IIC0_ACK					0x04
-#define	IIC0_ACK_DISABLE			0x00    /* enable acknowledgement */
-#define	IIC0_ACK_ENABLE				0x04    /* disable acknowledgement */
-
-/* Start condition trigger (STT0) */
-#define	IIC0_STARTCONDITION			0x02
-#define	IIC0_START_NOTGENERATE		0x00    /* do not generate start condition */
-#define	IIC0_START_GENERATE			0x02    /* generate     start condition */
-
-/* Stop	condition trigger (SPT0) */
-#define	IIC0_STOPCONDITION			0x01
-#define	IIC0_STOP_NOTGENERATE		0x00    /* do not generate stop condition */
-#define	IIC0_STOP_GENERATE			0x01    /* generate     stop condition */
-
-/*
-	IIC	Status Register	0 (IICS0)
-*/
-/* Master device status	(MSTS0)	*/
-#define	IIC0_MASTERSTATUS			0x80
-#define	IIC0_STATUS_NOTMASTER		0x00    /* slave device status or communication standby status */
-#define	IIC0_STATUS_MASTER			0x80    /* master device communication status */
-
-/* Detection of	arbitration	loss (ALD0)	*/
-#define	IIC0_ARBITRATION			0x40
-#define	IIC0_ARBITRATION_NO			0x00    /* arbitration win or no arbitration */
-#define	IIC0_ARBITRATION_LOSS		0x40    /* arbitration loss     */
-
-/* Detection of	extension code reception (EXC0)	*/
-#define	IIC0_EXTENSIONCODE			0x20
-#define	IIC0_EXTCODE_NOT			0x00    /* extension code not received */
-#define	IIC0_EXTCODE_RECEIVED		0x20    /* extension code received */
-
-/* Detection of	matching addresses (COI0) */
-#define	IIC0_ADDRESSMATCH			0x10
-#define	IIC0_ADDRESS_NOTMATCH		0x00    /* addresses do not     match */
-#define	IIC0_ADDRESS_MATCH			0x10    /* addresses match */
-
-/* Detection of	transmit/receive status	(TRC0) */
-#define	IIC0_STATUS					0x08
-#define	IIC0_STATUS_RECEIVE			0x00    /* receive status */
-#define	IIC0_STATUS_TRANSMIT		0x08    /* transmit     status */
-
-/* Detection of	acknowledge	signal (ACKD0) */
-#define	IIC0_ACKDETECTION			0x04
-#define	IIC0_ACK_NOTDETECTED		0x00    /* ACK signal was not detected */
-#define	IIC0_ACK_DETECTED			0x04    /* ACK signal was detected */
-
-/* Detection of	start condition	(STD0) */
-#define	IIC0_STARTDETECTION			0x02
-#define	IIC0_START_NOTDETECTED		0x00    /* start condition not detected */
-#define	IIC0_START_DETECTED			0x02    /* start condition detected     */
-
-/* Detection of	stop condition (SPD0) */
-#define	IIC0_STOPDETECTION			0x01
-#define	IIC0_STOP_NOTDETECTED		0x00    /* stop condition not detected */
-#define	IIC0_STOP_DETECTED			0x01    /* stop condition detected */
-
-/*
-	IIC	Flag Register 0	(IICF0)
-*/
-/* STT0	clear flag (STCF) */
-#define	IIC0_STARTFLAG				0x80
-#define	IIC0_STARTFLAG_GENERATE		0x00    /* generate     start condition */
-#define	IIC0_STARTFLAG_UNSUCCESSFUL	0x80    /* start condition generation unsuccessful */
-
-/* IIC bus status flag (IICBSY)	*/
-#define	IIC0_BUSSTATUS				0x40
-#define	IIC0_BUS_RELEASE			0x00    /* bus release status */
-#define	IIC0_BUS_COMMUNICATION		0x40    /* bus communication status     */
-
-/* Initial start enable	trigger	(STCEN)	*/
-#define	IIC0_STARTWITHSTOP			0x02
-#define	IIC0_START_WITHSTOP			0x00    /* generation of a start condition without detecting a stop     condition */
-#define	IIC0_START_WITHOUTSTOP		0x02    /* generation of a start condition upon detection of a stop     condition */
-
-/* Communication reservation function disable bit (IICRSV) */
-#define	IIC0_RESERVATION			0x01
-#define	IIC0_RESERVATION_ENABLE		0x00    /* enable communication reservation     */
-#define	IIC0_RESERVATION_DISABLE	0x01    /* disable communication reservation */
-
-/*
-	IIC	clock selection	register 0 (IICCL0)
-*/
-#define IICCL0_INITIALVALUE   		0x00
-/* Detection of	SCL0 pin level (CLD0) */
-#define	IIC0_SCLLEVEL				0x20
-#define	IIC0_SCL_LOW				0x00    /* clock line at low level */
-#define	IIC0_SCL_HIGH				0x20    /* clock line at high level     */
-
-/* Detection of	SDA0 pin level (DAD0) */
-#define	IIC0_SDALEVEL				0x10
-#define	IIC0_SDA_LOW				0x00    /* data line at low     level */
-#define	IIC0_SDA_HIGH				0x10    /* data line at high level */
-
-/* Operation mode switching	(SMC0) */
-#define	IIC0_OPERATIONMODE			0x08
-#define	IIC0_MODE_STANDARD			0x00    /* operates     in standard     mode */
-#define	IIC0_MODE_HIGHSPEED			0x08    /* operates     in high-speed mode */
-
-/* Digital filter operation	control	(DFC0) */
-#define	IIC0_DIGITALFILTER			0x04
-#define	IIC0_FILTER_OFF				0x00    /* digital filter off */
-#define	IIC0_FILTER_ON				0x04    /* digital filter on */
-
-/* Operation mode switching	(CL01, CL00) */
-#define	IIC0_CLOCKSELECTION			0x03
-
-/*	Combine	of (SMC0, CL01,	CL00)*/
-#define	IIC0_CLOCK0					0x00
-#define	IIC0_CLOCK1					0x01
-#define	IIC0_CLOCK2					0x02
-#define	IIC0_CLOCK3					0x03
-#define	IIC0_CLOCK4					0x08
-#define	IIC0_CLOCK5					0x09
-#define	IIC0_CLOCK6					0x0a
-#define	IIC0_CLOCK7					0x0b
-
-/*
-	IIC	function expansion register	0 (IICX0)
-*/
-/* IIC clock expension (CLX0) */
-#define	IIC0_CLOCKEXPENSION			0x01
-#define	IIC0_EXPENSION0				0x00
-#define	IIC0_EXPENSION1				0x01
-
-/*  Operation clock (CLX0, SMC0, CL01, CL00)
-            |   IIC0_EXPENSION0 |   IIC0_EXPENSION1 |                                
-------------|-------------------|-------------------|----------------------
-IIC0_CLOCK0 |       fprs/2      |       prohibited  |   selection clock(fw)
-            |       fprs/88     |                   |   transfer clock
-            |       normal      |                   |   mode
-------------|-------------------|-------------------|----------------------
-IIC0_CLOCK1 |       fprs/2      |       prohibited  |   selection clock(fw)
-            |       fprs/172    |                   |   transfer clock
-            |       normal      |                   |   mode
-------------|-------------------|-------------------|----------------------
-IIC0_CLOCK2 |       fprs/2      |       prohibited  |   selection clock(fw)
-            |       fprs/344    |                   |   transfer clock
-            |       normal      |                   |   mode
-------------|-------------------|-------------------|----------------------
-IIC0_CLOCK3 |prohibited/fexscl0 |       prohibited  |   selection clock(fw)
-            |       fw/66       |                   |   transfer clock
-            |       normal      |                   |   mode
-------------|-------------------|-------------------|----------------------
-IIC0_CLOCK4 |       fprs/2      |       fprs/2      |   selection clock(fw)
-            |       fprs/48     |       fprs/24     |   transfer clock
-            |     high speed    |       high speed  |   mode
-------------|-------------------|-------------------|----------------------            
-IIC0_CLOCK5 |       fprs/2      |       fprs/2      |   selection clock(fw)
-            |       fprs/48     |       fprs/24     |   transfer clock
-            |     high speed    |       high speed  |   mode
-------------|-------------------|-------------------|----------------------
-IIC0_CLOCK6 |       fprs/4      |       fprs/4      |   selection clock(fw)
-            |       fprs/96     |       fprs/48     |   transfer clock
-            |     high speed    |       high speed  |   mode
-------------|-------------------|-------------------|----------------------
-IIC0_CLOCK7 |prohibited/fexscl0 |       prohibited  |   selection clock(fw)
-            |       fw/18       |                   |   transfer clock
-            |     high speed    |                   |   mode
-------------|-------------------|-------------------|----------------------
-*/
-
-#define ADDRESS_COMPLETE   			0x80
-#define IIC_MASTER_FLAG_CLEAR 		0x00
-
-/******************************************************************************
- *  Macro define
- ******************************************************************************/
-
-
-
-/******************************************************************************
- *  Function define
- ******************************************************************************/
-
-void IIC_ctr_Init( void );
-void IIC_ctr_Stop( void );
-
-
-#endif
diff --git a/branches/2.2A_SDK5(4thNUP)/i2c_mcu-sub.c b/branches/2.2A_SDK5(4thNUP)/i2c_mcu-sub.c
deleted file mode 100644
index 2cebe19..0000000
--- a/branches/2.2A_SDK5(4thNUP)/i2c_mcu-sub.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/* ========================================================
-  �Ȉ�I2C�i�����y���t�F�����g�p�j�ʐM
-    de JHL ���c���J�Z
-    '09 Feb -
-    $Id$
- ======================================================== */
-#ifndef _WIN32
-#pragma sfr
-#pragma di
-#pragma ei
-#pragma nop
-#pragma inline                  // memcpy()���C�����C���W�J����(�̕����������I)
-#endif
-
-#include "incs.h"
-#include "i2c_mcu.h"
-#include "loader.h"
-#include "util_funcs.h"
-
-#include "i2c_mcu_sub.h"
-#include "pm.h"					/// ��肽���Ȃ������cCODEC�̃��W�X�^�����Ђ�����
-
-
-// ========================================================
-// ���[�N�A���E���h�p
-static void iic_mcu_simple_dummy_write();
-static i2c_err iic_mcu_codec_write_low( u8 adrs, u8 dat );
-
-// i2c_mcu.c �ɂ���
-extern void iic_mcu_send_re_st(  );
-extern void iic_mcu_send_sp(  );
-extern i2c_err iic_mcu_send_a_byte( u8 );
-extern i2c_err iic_mcu_call_slave( u8 slave );
-
-
-/*
-   yamaha codec����s�p�ӂɊ��荞�݂����邱�Ƃ����邪�A�^�X�N���o�^�����
-   ���ۂɓǂݏo���Ƃ��ɂ͏����߂�����Ȃ̂ʼn������Ȃ������悤�ɓ����͂�
-*/
-
-/********************************************//**
-  �R�[�f�b�N�� �w�P�o�C�g�x ���C�g
-
-  iic_mcu_write_a_byte CODEC�s����[�N�A���E���h
- ***********************************************/
-#define YAMAHA_CODEC_ERRATA_CHECK_MASK	( 0x7D )
-i2c_err iic_mcu_write_a_byte_codec( u8 adrs, u8 dat )
-{
-	u8 pm_reg_original;
-	i2c_err	rv;
-
-	// ���}�ncodec���[�N�A���E���h SPI�Ƃ̋��p���W�X�^�̒��g���擾
-	if(( rv = iic_mcu_read( IIC_SLA_CODEC, CODEC_REG_PM, 1, &pm_reg_original )) != I2C_ERR_OK )
-	{
-        return( rv );
-    }
-	// phase1 �����܂�
-
-    // �������݁I
-    if( ( rv = iic_mcu_codec_write_low( adrs, dat ) ) != I2C_ERR_OK )
-    {
-        return( rv );
-    }
-
-    // ���}�ncodec���[�N�A���E���h
-	if( ( pm_reg_original & YAMAHA_CODEC_ERRATA_CHECK_MASK ) == 0 )	// �͂��߂��狤�L���W�X�^��0��������e�X�g�����Ȃ�
-																	//  (& ���Z�b�g�v���������Ă���ǂ������Z�b�g������̂�)
-	{
-	    return( I2C_ERR_OK );
-	}
-
-    {
-        // ���L���W�X�^�� 0x00 �ɏ���������Ă���(�G���b�^�����I)�悤�Ȃ珑���߂�
-        u8 pm_reg_after;
-        
-        if(( rv = iic_mcu_read( IIC_SLA_CODEC, CODEC_REG_PM, 1, &pm_reg_after )) != I2C_ERR_OK )
-        {
-            return( rv );
-        }
-
-        if( ( pm_reg_after & YAMAHA_CODEC_ERRATA_CHECK_MASK ) != 0x00 )
-        {
-			// �R���t���N�g�͂Ȃ����� or ���Z�b�g�v���Ȃ�
-            return( I2C_ERR_OK );
-        }
-
-        // else {
-        rv = iic_mcu_codec_write_low( CODEC_REG_PM, pm_reg_original );	// �����߂����A�ă`�F�b�N�͂��Ȃ�
-        return ( rv );	// �G���[���Ԃ邱�Ƃ����邩��
-        // ���g���C�Ȃǂ͖���
-    }
-    return( rv );  // no reach //
-}
-
-
-static i2c_err iic_mcu_codec_write_low( u8 adrs, u8 dat )
-{
-    IICMK10 = 1;			// DMA�p��ISR�ɔ�΂��Ȃ����߂Ƀ}�X�N
-    if( iic_mcu_call_slave( IIC_SLA_CODEC ) != I2C_ERR_OK )
-    {
-        iic_mcu_busy = false;
-        return ( I2C_ERR_NOSLAVE );
-    }
-    iic_mcu_send_a_byte( adrs );
-    iic_mcu_send_a_byte( dat );
-
-    // TI���[�N�A���E���h
-    // re-st�Ń_�~�[���C�g
-	{
-        iic_mcu_send_re_st(  );
-        iic_mcu_send_a_byte( IIC_SLA_CODEC );	// �_�~�[���C�g
-        iic_mcu_send_a_byte( 0x20 );			// �S�~�������Ă����Ȃ��A�h���X
-        iic_mcu_send_a_byte( 0xAA );			// ���ł��悢
-	}
-
-	iic_mcu_send_sp(  );
-    iic_mcu_busy = false;
-    return( I2C_ERR_OK );
-}
-
-
diff --git a/branches/2.2A_SDK5(4thNUP)/i2c_mcu.c b/branches/2.2A_SDK5(4thNUP)/i2c_mcu.c
deleted file mode 100644
index 50916e0..0000000
--- a/branches/2.2A_SDK5(4thNUP)/i2c_mcu.c
+++ /dev/null
@@ -1,652 +0,0 @@
-/* ========================================================
-  �Ȉ�I2C�i�����y���t�F�����g�p�j�ʐM
-    de JHL ���c���J�Z
-    '09 Feb -
-    $Id$
- ======================================================== */
-#ifndef _WIN32
-#pragma sfr
-#pragma di
-#pragma ei
-#pragma nop
-#pragma inline                  // memcpy()���C�����C���W�J����(�̕����������I)
-#endif
-
-#include "incs_loader.h"
-#include "i2c_mcu.h"
-#include "loader.h"
-#include "util_funcs.h"
-
-#include "i2c_mcu_sub.h"
-
-
-
-// ========================================================
-// ���W�X�^�̃r�b�g��
-// �v���t�B�b�N�Xb�����A�ꕔ�̃r�b�g�������W�X�^���ɂ��Ԃ邽��...
-// SMR0n
-#define bCKS0    ( 1 << 15 )
-#define bCCS0    ( 1 << 14 )
-#define bSTS0    ( 1 << 8 )
-#define bSIS0    ( 1 << 6 )
-#define bMD0n2   ( 1 << 2 )
-#define bMD0n1   ( 1 << 1 )
-#define bMD0n0   ( 1 << 0 )
-#define bSMR0n_FIXEDBIT  ( 1 << 5 )
-
-// SSR0n
-#define bit_TSF0   6
-#define PEF0       ( 1 << 1 )
-
-// SIR0n
-#define PECT0      ( 1 << 1 )
-
-// SCR0n
-#define TXE0       ( 1 << 15 )
-#define RXE0       ( 1 << 14 )
-#define SLC02      4
-#define DLS02      0
-#define TSF0       ( 1 << 6 )
-
-// SOn
-#define TAUS_MASK  0x0B0B;
-
-// DMCn
-#define DRS        ( 1 << 6 )
-
-
-
-
-// ========================================================
-static void iic_mcu_send_st(  );
-
-// *sub���炵���Ă΂Ȃ�
-void iic_mcu_send_re_st(  );
-void iic_mcu_send_sp(  );
-i2c_err iic_mcu_send_a_byte( u8 );
-i2c_err iic_mcu_call_slave( u8 slave );
-
-
-// ========================================================
-bit     iic_mcu_wo_dma;
-volatile bit iic_mcu_busy;
-static volatile bit iic_mcu_initialized;
-
-
-static u8	iic_send_work[4];
-static u8	*p_iic_send_wo_dma_dat;
-static u8	iic_send_wo_dma_len;
-
-// �f�[�^�G���[�iROHM�������x�Z���T�j�����g���C�̂���
-/// �Ƃ肠�����ADMA�g�p�}���`�o�C�g���C�g �̎��ɂ����@�\���Ȃ�
-static u8 last_slave, last_reg_adrs, last_size;
-
-i2c_err		iic_mcu_result;     // �ꕶ�����[�h�̎��̓f�[�^��Ԃ��B
-
-#ifdef i2c_timeout_test
-extern bit i2c_mcu_time_out_error;
-#endif
-
-
-
-/********************************************//**
-
- ***********************************************/
-void nop8()
-{
-	// �����ɗ��� call ��3clk, return �� 6clk
-}
-
-
-/********************************************//**
- ���̒ʐM���I���̂�҂B
-
- �^�C���A�E�g�L��
- ***********************************************/
-static i2c_err iic_mcu_wait_free()
-{
-    u16 tot = 0;
-
-    iic_mcu_start(  );
-    while( 1 )
-    {
-        DI_wt_chk();
-        if( !iic_mcu_busy )
-        {
-            iic_mcu_busy = true;
-		    EI();
-            break;
-        }
-        EI();
-        if( ++tot == 0 )
-        {
-#ifdef i2c_timeout_test
-            i2c_mcu_time_out_error = true;
-#endif
-			return( I2C_ERR_TIMEOUT );
-        }
-    }
-    return( I2C_ERR_OK );
-}
-
-
-
-/********************************************//**
-  �X���[�u����� �w1�����x ���[�h
-
-  �Ԓl���f�[�^���̂��̂ł��B
-  
-  �G���[�R�[�h�� iic_mcu_result �ɓ����Ă��܂�
- ***********************************************/
-u8 iic_mcu_read_a_byte( u8 SLA, u8 adrs )
-{
-    u8      dat;
-
-	iic_mcu_result = iic_mcu_read( SLA, adrs, 1, &dat );
-
-	return ( dat );
-}
-
-
-
-/********************************************//**
-  �X���[�u����̃��[�h
-
-  �y���z
-
-  �X���[�u���E�F�C�g�R���f�B�V�������o�����Ƃ͋֎~�ł��B
-
-  ���̏ꍇ�ł��G���[���o�Ȃǂł��܂���
- ***********************************************/
-i2c_err iic_mcu_read( u8 slave, u8 adrs, u8 len, u8 * dest )
-{
-
-#if 1
-    if( iic_mcu_wait_free() != I2C_ERR_OK )
-    {
-		// (�^�C���A�E�g)
-        return( I2C_ERR_TIMEOUT );
-    }
-#else
-      // �g�p���Ȃ�A��
-#endif
-
-    // �X�^�[�g�R���f�B�V�����ƃX���[�u�̌Ăяo���A���W�X�^�A�h���X�̑��M
-    if( iic_mcu_call_slave( slave ) != 0 )
-    {
-        iic_mcu_busy = false;
-        return ( I2C_ERR_NOSLAVE );
-    }
-
-    // ���W�X�^�A�h���X�̑��M
-    iic_mcu_send_a_byte( adrs );        // �I���܂ŋA���Ă��Ȃ�
-
-	// ��΂�NAK���A���Ă��Ȃ��O��
-
-    // �f�[�^��M //
-    iic_mcu_send_re_st(  );     // ���X�^�[�g�R���f�B�V����
-    iic_mcu_send_a_byte( slave | 0x01 );        // ���M�����܂Ŗ߂��Ă��܂���B
-
-    // �f�[�^��M
-    ST0 = 0x0004;               // ��M���[�h�ɐݒ��ς���̂Ń��W�b�N��~
-    SCR02 = RXE0 | 1 << SLC02 | 7 << DLS02;     // ��M�ݒ�
-    SS0 = 0x0004;               // �ʐM�ҋ@
-
-    do
-    {
-        if( len == 1 )
-        {
-            SOE0 = 0x0000;      // �Ō��NAK
-        }
-        IICIF10 = 0;
-        SIO10 = 0xFF;           // �_�~�[�f�[�^�������Ǝ�M�J�n
-        while( IICIF10 == 0 )
-        {;}                       // ��M�����҂�
-
-        *dest = SIO10;
-        dest++;
-        len--;
-    }
-    while( len != 0 );
-
-    iic_mcu_send_sp(  );
-
-    IICIF10 = 0;
-    iic_mcu_busy = false;
-    return ( I2C_ERR_OK );
-}
-
-
-
-
-/********************************************//**
-  �X���[�u�� �w�P�o�C�g�x ���C�g
-
-  �O�̓]�����I���̂�҂��āA���C�g���܂��B
-
-  �Ԓl�@iic_mcu_write�@�ɓ���
- ***********************************************/
-i2c_err iic_mcu_write_a_byte( u8 SLA, u8 adrs, u8 dat )
-{
-    // �P�����̎���DMA�Ƃ��N�����Ȃ��ł������ƏI��点��
-    if( iic_mcu_wait_free() != I2C_ERR_OK )
-    {
-        return( I2C_ERR_TIMEOUT );
-    }
-
-    // �X�^�[�g�R���f�B�V�����ƃX���[�u�̌Ăяo��...
-    IICMK10 = 1;
-    if( iic_mcu_call_slave( SLA ) != I2C_ERR_OK )
-    {
-        iic_mcu_busy = false;
-        return( I2C_ERR_NOSLAVE );
-    }
-    iic_mcu_send_a_byte( adrs );
-    iic_mcu_send_a_byte( dat );
-    iic_mcu_send_sp(  );
-    iic_mcu_busy = false;
-    return ( I2C_ERR_OK );
-}
-
-
-
-/********************************************//**
-  �X���[�u�փ��C�g
-
- ���W�X�^ adrs ��擪�ɁA
-
- *str����
-
- len���������܂��B
-
-  �y���z
-
-  �X���[�u���E�F�C�g�R���f�B�V�������o�����Ƃ͋֎~�ł��B
-
-  ���̏ꍇ�ł��G���[���o�Ȃǂł��܂���
-
-  DMA1���g�p���܂��B
- ***********************************************/
-i2c_err iic_mcu_write( u8 slave, u8 adrs, u8 len, void * src )
-{
-    if( iic_mcu_wait_free() != I2C_ERR_OK )
-    {
-        return( I2C_ERR_TIMEOUT );
-    }
-#if 0 // renge���^�̃}���`�^�X�N�ɂȂ����łɂ�
-  // �g�p���Ȃ�A��
-#endif
-
-  // �X�^�[�g�R���f�B�V�����ƃX���[�u�̌Ăяo��...
-    IICMK10 = 1;
-    IICIF10 = 0;
-    if( iic_mcu_call_slave( slave ) != I2C_ERR_OK )
-    {
-        iic_mcu_busy = false;
-        return ( I2C_ERR_NOSLAVE );
-    }
-
-    IICIF10 = 0;
-    if( !iic_mcu_wo_dma )
-    {
-        // DMA���g�p����i�ʏ�j//
-
-        // ���W�X�^�A�h���X�𑗂�A�f�[�^�̏���
-        memcpy( iic_send_work, src, 4 );        //�o�b�t�@�Ƃ���4�o�C�g�����p�ӂ��Ė������߁B
-
-        // ���g���C���̂���
-        last_slave = slave;
-        last_reg_adrs = adrs;
-        last_size = len;
-
-        // DMA�Z�b�g
-        while( DST1 )
-        {;}
-
-        DEN1 = 1;
-        DSA1 = (u8)( &SIO10 );
-        DRA1 = (u16)( &iic_send_work[0] );
-        DBC1 = len;
-        DMC1 = DRS | 8;         // RAM -> SFR, 8bit, IRQ, IIC10
-
-        DMAIF1 = 0;
-        DMAMK1 = 0;
-        DST1 = 1;               // DEN1 = 1����2clk�ȏ�J��
-
-        SIO10 = adrs;           // �������ςȂ��I ���荞�݂���������DMA�X�^�[�g
-        // �c��͊��荞�݃��[�`������
-    }
-    else
-    {
-        // DMA���g�p���Ȃ� //
-
-        // ���W�X�^�A�h���X�̑��M
-        IICMK10 = 0;
-        SIO10 = adrs;
-
-        iic_send_wo_dma_len = len;
-        p_iic_send_wo_dma_dat = (u8*)src;
-        // �c��͊��荞�݃��[�`������
-    }
-
-    return ( I2C_ERR_OK );
-}
-
-
-
-
-/********************************************//**
-  DMA�P�]���I�����荞��
-
-  IIC_mcu �̑��M�����R�[���o�b�N�֐��̂悤�Ȃ���
-
-  ���FDMA�]�����I����������ŁAI2C�̓]���͏I����Ă܂���
-
-�@  ���荞�ݒ��ȂǂŁADMA1�̏������x�������ꍇ�A
-  IIC10�̊��荞�݂̏������ł����ɁA���荞�݂𔭐��������Ȃ��Ȃ�
-  ���ꂪ����܂��B�܂��A�����@�����ɂ���܂���B
-
-  �@���̂��߁ADMA�d�l�̍��ق́A�Ō�̃o�C�g�͑��M������
-  �t���O�̃|�[�����O�Ŋm�F���܂��B
- ***********************************************/
-__interrupt void int_dma1(  )
-{
-    static bit in_retry;
-
-    EI();
-
-    // �Ō�̃o�C�g�̑��M�����҂�
-    while( ( SSR02L & TSF0 ) != 0 )	
-    {
-        u16 i = 0;
-        if( ++i == 0 )  // �^�C���A�E�g�H
-        {
-            break;
-        }
-    }
-
-	// �X�g�b�v�R���f�B�V�������s
-//    iic_mcu_send_sp();    // ISR���ŊO�̊֐����ĂԂ͓̂s���������i�ėp���W�X�^�Ҕ�����������j�̂œW�J
-	{
-		ST0 = 0x0004;
-		SOE0 = 0;                   // ��M�̎��͂����ƑO�Ɂu���v�ݒ肵�Ă�B(NACK�o��)
-		SO0 = 0x0000 | TAUS_MASK;   // SCL
-        nop8();                 //. ���������|���Ȃ��B�O�̊֐��Ă�
-/*
- 		 NOP(); NOP(); NOP(); NOP();
-		 NOP(); NOP(); NOP(); NOP();
-*/
-        SO0 = 0x0400 | TAUS_MASK;   // SCL
-        nop8();
-/*
-		 NOP(); NOP(); NOP(); NOP();
-		 NOP(); NOP(); NOP(); NOP();
-*/
-        SO0 = 0x0404 | TAUS_MASK;
-	}
-
-	IICMK10 = 1;
-
-    // �f�[�^�̓r���� NAK ��������A��x�������g���C����B
-    /// �蔲������
-    if( SIR02 != 0 )
-    {
-        SIR02 = SSR02;
-
-        if( !in_retry )
-        {
-			in_retry = true;
-
-            IICIF10 = 0;
-            iic_mcu_call_slave( last_slave ); // ������NAK�͍��m���P�A
-
-            while( DST1 ){;}
-            DRA1 = (u16)( &iic_send_work[0] );  // �����C���N�������g����Ă��܂��Ă���̂ōăZ�b�g
-	        DBC1 = last_size;					// �����f�N�������g����Ă��܂��Ă���̂ōăZ�b�g
-            // �ق��̐ݒ�͑O��̂܂�
-
-            DMAIF1 = 0;
-            DMAMK1 = 0;
-            DST1 = 1;
-            
-            SIO10 = last_reg_adrs;           // �������ςȂ��I ���荞�݂���������DMA�X�^�[�g
-            return;
-            // �����܂�
-        }
-        else
-        {
-            // �G���[��x�ځB�����m��Ȃ�
-            dbg_nop();
-            // ���̂܂܏I��������
-        }
-    }
-
-    // ����I��
-	in_retry = false;
-    DMAMK1 = 1;
-    DEN1 = 0;
-    iic_mcu_busy = false;
-}
-
-
-
-/********************************************//**
-  IIC MCU�̃o�C�g���o�������荞��
-
-  ��DMA�g�p���͎g�p����܂���B
-
-  �@���̊��荞�ݏ�������DMA�̊��荞�݂ɂ�����΂Ȃ��ꍇ�A
-  �@IIC���荞�݂̃Z�b�g���Ԃɍ��킸���邱�Ƃ�����܂��B
- ***********************************************/
-__interrupt void int_iic10(  )
-{
-    EI();
-    if( iic_send_wo_dma_len != 0 )	// �܂����M�������Ă��Ȃ��H
-    {
-        SIO10 = *p_iic_send_wo_dma_dat;
-        p_iic_send_wo_dma_dat ++;
-        iic_send_wo_dma_len --;
-        return;
-		// �����܂� //
-    }
-
-    // �Ō�̃o�C�g���M�����A�X�g�b�v�R���f�B�V�������s
-    IICMK10 = 1;
-//    iic_mcu_send_sp();    // ISR���ŊO�̊֐����ĂԂ͓̂s���������i�ėp���W�X�^�Ҕ�����������j�̂œW�J
-	{
-		ST0 = 0x0004;
-		SOE0 = 0;                   // ��M�̎��͂����ƑO�Ɂu���v�ݒ肵�Ă�B(NACK�o��)
-		SO0 = 0x0000 | TAUS_MASK;   // clear SCL
- 		 NOP(); NOP(); NOP(); NOP();	// NOP8�����Ă�ł͂���
-		 NOP(); NOP(); NOP(); NOP();
-        SO0 = 0x0400 | TAUS_MASK;   // set SCL
-		 NOP(); NOP(); NOP(); NOP();
-		 NOP(); NOP(); NOP(); NOP();
-        SO0 = 0x0404 | TAUS_MASK;	// set CSL adn SDA
-	}
-
-    iic_mcu_wo_dma = false;
-    iic_mcu_busy = false;
-}
-
-
-
-/********************************************//**
-  �X���[�u�̌Ăяo��
-
-�@�X���[�u�A�h���X���Ă�ŁAACK�̊m�F�B
-
-  ACK�@���@�@�@�@�@�@�@�@�@�@�@�@�@�@�@�@�@�ԁFI2C_ERR_OK
-
-�@NACK ���@�X�g�b�v�R���f�B�V�������o���B�@�ԁFI2C_ERR_NOSLAVE
- ***********************************************/
-i2c_err iic_mcu_call_slave( u8 slave )
-{
-    iic_mcu_send_st(  );
-
-/*
-// dbg
-	if( SSR02 != 0 )
-	{
-		P1.5 = P1.0 = P1.3 = 1;
-	}
-*/
-
-    SIR02 = SSR02;              // NAK�G���[�̃t���O�N���A
-    if( iic_mcu_send_a_byte( slave ) != I2C_ERR_OK )
-    {
-        iic_mcu_send_sp(  );
-        return ( I2C_ERR_NOSLAVE );     // �w��̃X���[�u�����Ȃ�
-    }
-
-    return ( I2C_ERR_OK );
-}
-
-
-
-/********************************************//**
-  �ق�ƂɂP�o�C�g�����̂�
-
-  �����I���܂ŋA��܂���
- ***********************************************/
-i2c_err iic_mcu_send_a_byte( u8 dat )
-{
-    IICMK10 = 1;
-    IICIF10 = 0;
-    SIO10 = dat;
-    while( IICIF10 == 0 )
-    {
-//        NOP(  );
-    }                           // �ʐM��
-
-    if( SSR02 != 0 )            // ���炩�G���[����?
-    {
-        SIR02 = SSR02;          // �G���[�N���A
-        return( I2C_ERR_NAK );
-    }
-    return( I2C_ERR_OK );
-}
-
-
-
-/********************************************//**
-  �X�^�[�g�R���f�B�V�����𔭍s
-
-  �\�t�g�E�F�A����
- ***********************************************/
-static void iic_mcu_send_st(  )
-{
-    SO0 &= ~0x0004;             // SDA
-    nop8();
-
-    SO0 &= ~0x0400;             // SCL
-    SOE0 = 0x0004;              // �n�[�h�����
-
-    SCR02 = TXE0 | 1 << SLC02 | 7 << DLS02;     // ���M���A�f�[�^�͂W�r�b�g�P��
-    SS0 = 0x0004;               // �ʐM�ҋ@
-}
-
-
-
-/********************************************//**
-  ���X�^�[�g���s
- ***********************************************/
-void iic_mcu_send_re_st(  )
-{
-    ST0 |= 0x0004;
-    SO0 |= 0x0400 | TAUS_MASK;  // ( SDA = H ), SCL -> H
-    nop8();
-
-    SOE0 &= ~0x0004;            // ( SCL = H ), SDA -> L
-    nop8();
-
-    iic_mcu_send_st(  );
-}
-
-
-
-/********************************************//**
-  �X�g�b�v�R���f�B�V�������s
-
-  ���̑O�ɁA�u�Ō�̃o�C�g�̑���M�v�̎��ɑO�������K�v�ł��B
- ***********************************************/
-void iic_mcu_send_sp(  )
-{
-    ST0 = 0x0004;
-    SOE0 = 0;                   // ��M�̎��͂����ƑO�Ɂu���v�ݒ肵�Ă�B(NACK�o��)
-    SO0 = 0x0000 | TAUS_MASK;   // SCL
-    nop8();
-
-    SO0 = 0x0400 | TAUS_MASK;   // SCL
-    nop8();
-
-    SO0 = 0x0404 | TAUS_MASK;
-}
-
-
-
-
-/********************************************//**
-  �y���t�F�������W���[���̏�����
- ***********************************************/
-void iic_mcu_start(  )
-{
-    if( iic_mcu_initialized )
-    {
-        return;
-    }
-
-    iic_mcu_busy = true;
-//    DST1 = 0;
-
-    I2C_PU_on();
-//    DEN1 = 0;                   // DST1 = 0 ���� 2clk�������́ADSTn==0���|�[�����O���Ă���
-
-    wait_ms( 1 );               // �����オ��̂�50us�ʂ�����
-
-    SAU0EN = 1;
-    nop8();
-
-    SPS0 = 0x0000;              // �V���A�����j�b�g�̃N���b�N�O�B(8M/2)/1
-    SMR02 = bSMR0n_FIXEDBIT | bMD0n2;	// �Ȉ�I2C�ɐݒ�
-    SDR02 = 10 << 9;             // �{�[���[�g�ݒ� 8M/1/(x+1)/2
-
-    SO0 = 0x0404 | TAUS_MASK;   // �ŏ���HH
-    iic_mcu_wo_dma = false;
-
-
-    // �o�X�̃��Z�b�g
-    {
-        IICIF10 = 0;
-        IICMK10 = 1;
-
-        iic_mcu_send_st();
-
-        SIO10 = 0xFF;
-        while( IICIF10 == 0 ){;}                           // �ʐM��
-        iic_mcu_send_sp();
-
-        SIR02 = SSR02;
-    }
-
-    iic_mcu_busy = false;
-    iic_mcu_initialized = true;
-}
-
-
-
-/********************************************//**
-  ���W���[���̒�~
-
-  �ēx�g���Ƃ��͏��������K�v
- ***********************************************/
-void iic_mcu_stop(  )
-{
-    while( iic_mcu_busy )
-    {;}                         // DMA���쒆�͂��������҂�
-    iic_mcu_send_re_st(  );     // SCL,SDA��LL�ɂ���
-    I2C_PU_off();
-    SAU0EN = 0;
-    iic_mcu_initialized = false;
-}
-
diff --git a/branches/2.2A_SDK5(4thNUP)/i2c_mcu.h b/branches/2.2A_SDK5(4thNUP)/i2c_mcu.h
deleted file mode 100644
index 16eeba8..0000000
--- a/branches/2.2A_SDK5(4thNUP)/i2c_mcu.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef __ic2_mcu__
-#define __ic2_mcu__
-
-
-// ========================================================
-typedef enum{
-	I2C_ERR_OK = 0,
-	I2C_ERR_NAK,
-	I2C_ERR_NOSLAVE,
-	I2C_ERR_TIMEOUT,
-	I2C_ERR_UNDEF = 0xFF
-}i2c_err;
-
-
-
-// ========================================================
-extern volatile bit iic_mcu_busy;
-extern bit iic_mcu_wo_dma;
-
-extern i2c_err iic_mcu_result;
-
-
-// ========================================================
-i2c_err iic_mcu_read( u8 SLA, u8 adrs, u8 len, u8 * dest );
-u8 iic_mcu_read_a_byte( u8 SLA, u8 adrs );
-
-i2c_err iic_mcu_write( u8 SLA, u8 adrs, u8 len, void * src );
-i2c_err iic_mcu_write_a_byte( u8 SLA, u8 adrs, u8 dat );
-
-i2c_err iic_mcu_write_a_byte_codec( u8 adrs, u8 dat );	// codec�o�O����@�\�t��
-
-
-// �����̒ʐM�������������������܂��B
-#define iic_mcu_set_wo_dma()           { while( iic_mcu_busy ){;} iic_mcu_wo_dma = true; }
-
-void iic_mcu_start(  );
-void iic_mcu_stop(  );
-
-
-#endif
diff --git a/branches/2.2A_SDK5(4thNUP)/i2c_mcu_sub.h b/branches/2.2A_SDK5(4thNUP)/i2c_mcu_sub.h
deleted file mode 100644
index c674000..0000000
--- a/branches/2.2A_SDK5(4thNUP)/i2c_mcu_sub.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ic2_mcu_sub__
-#define __ic2_mcu_sub__
-
-i2c_err iic_mcu_write_a_byte_codec( u8 adrs, u8 dat );
-
-#endif
diff --git a/branches/2.2A_SDK5(4thNUP)/i2c_twl.c b/branches/2.2A_SDK5(4thNUP)/i2c_twl.c
deleted file mode 100644
index fef7ac2..0000000
--- a/branches/2.2A_SDK5(4thNUP)/i2c_twl.c
+++ /dev/null
@@ -1,247 +0,0 @@
-/* ========================================================
-    TWL �݊�I2C
-    
- $Id: i2c_twl.c 418 2011-09-22 01:35:37Z n2232 $
- ======================================================== */
-#ifndef _WIN32
-
-#pragma sfr                     /* ����@�\���W�X�^�g�p */
-
-#endif
-
-
-/*============================================================================*/
-#ifndef _WIN32
-# pragma interrupt INTIICA0	int_iic_twl RB2
-#endif
-
-#include "incs.h"
-#include "i2c_twl_defs.h"
-#include "i2c_twl.h"
-#include "vreg_twl.h"
-#include "WDT.h"
-
-
-#ifdef _MCU_BSR_
-//#ifdef _MODEL_TS0_ || _MODEL_WM0_
-
-// ���[�L���O���f����I2C���t
-#define ACKD       ACKD0
-#define ACKE       ACKE0
-#define COI        COI0
-#define IICAEN     IICA0EN
-#define IICRSV     IICRSV0
-#define IICA       IICA0
-#define IICAIF     IICAIF0
-#define IICAMK     IICAMK0
-#define IICAPR0    IICAPR00
-#define IICAPR1    IICAPR10
-#define IICCTL0    IICCTL00
-#define IICE       IICE0
-#define IICF       IICF0
-#define IICS       IICS0
-#define IICWH      IICWH0
-#define IICWL      IICWL0
-#define LREL       LREL0
-#define SPD        SPD0
-#define SPIE       SPIE0
-#define STCEN      STCEN0
-#define STD        STD0
-#define SVA        SVA0
-#define WREL       WREL0
-#define WTIM       WTIM0
-#define SMC        SMC0
-#define TRC        TRC0
-#define DFC		   DFC0
-#define PortMode	PM6
-#define Port		P6
-
-#endif // _MCU_BSR_
-
-#ifndef _MCU_BSR_
-
-// ke3�̎��̓_�~�[�֐�
-void IIC_twl_Stop( void )
-{
-}
-void IIC_twl_Init( void )
-{
-}
-#else // _MCU_BSR_
-
-
-
-enum IIC_TWL_STATE{
-    WAIT_ADRS = 0,
-    WAIT_DATA,
-    DATA_READED
-};
-
-
-
-
-/*============================================================================*/
-
-// ���I�@���̓}�N���Ȃ̂ŁAreturn�̓��C�����[�v�ɖ߂�܂��B
-#define wait_next {                                    \
-    tot = 0;                                           \
-  while( IICAIF != 1 ){                                \
-    tot ++;                                             \
-    if( tot == 0 ){                                    \
-      LREL = 1;                                        \
-      return;                                          \
-    }                                                  \
-  }                                                    \
-}
-
-
-/********************************************//**
- isr
- 
- TWL�̓E�F�C�g�𗝉����Ă��ꂸ�A�܂��A�o�[�X�gR/W ��
- ���Ȃ��ł�����Ă���̂ŁA�X�g�b�v�R���f�B�V�����܂ň�C�ɂ���Ă��܂��B
- ***********************************************/
-__interrupt void int_iic_twl(  )
-{
-    u8      vreg_adrs;
-    u8      state;
-
-    // �@
-    WREL = 1;                   // �E�F�C�g�������Ď��̃o�C�g��҂�
-    WDT_Restart();
-    state = WAIT_ADRS;
-
-    while( 1 )
-    {
-        u8 my_iics;
-
-		{
-			u16 tot;
-	        wait_next;              // �P�o�C�g��M������҂�
-		}
-
-		my_iics = IICS;
-        IICAIF = 0;
-
-        if( my_iics & 0x02 )    // ( STD && !SPD )
-        {
-            // �X�^�[�g�R���f�B�V����������
-            if( ( my_iics & 0x08 ) == 0 ) // ( TRC ) ���M�����t���O 0:�}�C�R������M
-            {
-                // �@�f�}�C�R���������ł����ATWL�����g���C�����Ƃ��Ƃ�
-                // �����ɗ���̂̓X���[�u�Ăяo���̎� //
-                WREL = 1;
-                state = WAIT_ADRS;
-                /// ���W�X�^�A�h���X���������̂�҂�
-            }
-            else
-            {
-                // �BR R�ł̃X���[�u�Ăяo��(���X�^�[�g�R���f�B�V����) //
-                IICA = vreg_twl_read( vreg_adrs ); // �f�[�^���M
-                // �X�g�b�v�҂���ALREL = 1 �ɂ��Ȃ��ƁA���M�o�b�t�@���j�󂳂�邱�Ƃ�����
-                state = DATA_READED;
-            }
-        }
-        else if( ( my_iics & 0x03 ) == 0 ) // ( !STD && !SPD )
-        {
-			u8 rcvd;
-
-            // ���炩��M
-            rcvd = IICA;
-            WREL = 1;
-
-            if( state == WAIT_ADRS )
-            {
-                // �A
-                vreg_adrs = adrs_table_twl_ext2int( rcvd );
-                /// �f�[�^��������邩�A���X�^�[�g�œǂݏo�����̂�҂�
-                state = WAIT_DATA;
-            }
-            else if( state == DATA_READED )
-            {
-                // �f�[�^1�o�C�g���M�㔭������
-                LREL = 1;
-                return;
-            }
-            else
-            {
-                // �BW
-                // �f�[�^�������܂�
-                SVA = 0x5A;     // �_�~�[
-                LREL = 1;       // �X�^�[�g�R���f�B�V�����҂���(�A���������ݖ��Ή��̂���)
-                vreg_twl_write( vreg_adrs, rcvd );
-                SVA = IIC_T_SLAVEADDRESS;
-                return;         // ��M�����܂� //
-            }
-        }
-        else if( my_iics & 0x01 ) // SPD
-        {
-            // �I��
-            LREL = 1;
-            return;
-        }
-        else
-        {
-            // NOP();
-        }
-    }
-}
-
-
-
-/********************************************//**
- ���W���[��������
- ***********************************************/
-void IIC_twl_Init( void )
-{
-
-    IICAEN = 1;
-
-    IICE = 0;                   /* IICA disable */
-
-    IICAMK = 1;                 /* INTIICA disable */
-    IICAIF = 0;                 /* clear INTIICA interrupt flag */
-
-    IICAPR0 = 0;                /* set INTIICA high priority */
-    IICAPR1 = 0;                /* set INTIICA high priority */
-    P20 &= ~0x3;
-
-    SVA = IIC_T_SLAVEADDRESS;
-    IICF = 0x01;
-
-    STCEN = 1;                  // ���X�^�[�g�̋���
-    IICRSV = 1;                 // �ʐM�\��������Ȃ�:�X���[�u�ɓO����
-
-    SPIE = 0;                   // �X�g�b�v�R���f�B�V�����ł̊��荞�݂��֎~
-    WTIM = 1;                   // ������ACK��Ԃ�����clk��L�ɌŒ肷��
-    ACKE = 1;                   //  �_��CPU�͖������Ď��̒ʐM���͂��߂邩������Ȃ���ő���clk���J�����Ȃ��Ƃ����Ȃ�
-
-    IICWH = 9;
-    IICWL = 11;                 // L���Ԃ̒����i�H�j
-
-    SMC = 1;
-    DFC = 1;                    // �f�W�^���t�B���^on (@fast mode)
-
-    IICAMK = 0;                 // ���荞�݂�����
-
-    IICE = 1;
-
-	PortMode &= ~0x03;
-	Port     &= ~0x03;
-
-    LREL = 1;
-}
-
-
-
-/********************************************//**
- ���W���[����~
- ***********************************************/
-void IIC_twl_Stop( void )
-{
-    IICE = 0;                   /* IICA disable */
-    IICAEN = 0;
-}
-
-
-#endif
diff --git a/branches/2.2A_SDK5(4thNUP)/i2c_twl.h b/branches/2.2A_SDK5(4thNUP)/i2c_twl.h
deleted file mode 100644
index 0f608b0..0000000
--- a/branches/2.2A_SDK5(4thNUP)/i2c_twl.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _iic_twl_
-#define _iic_twl_
-
-void IIC_twl_Init( void );
-void IIC_twl_Stop( void );
-
-#endif
diff --git a/branches/2.2A_SDK5(4thNUP)/i2c_twl_defs.h b/branches/2.2A_SDK5(4thNUP)/i2c_twl_defs.h
deleted file mode 100644
index be5d566..0000000
--- a/branches/2.2A_SDK5(4thNUP)/i2c_twl_defs.h
+++ /dev/null
@@ -1,196 +0,0 @@
-#ifndef _MDSERIAL_
-#define _MDSERIAL_
-
-
-/* IIC operation enable	(IICE0)	*/
-#define	IIC0_OPERATION				0x80
-#define	IIC0_OPERATION_DISABLE		0x00    /* stop operation */
-#define	IIC0_OPERATION_ENABLE		0x80    /* enable operation     */
-
-/* Exit	from communications	(LREL0)	*/
-#define	IIC0_COMMUNICATION			0x40
-#define	IIC0_COMMUNICATION_NORMAL	0x00    /* normal operation     */
-#define	IIC0_COMMUNICATION_EXIT		0x40    /* exit from current communication */
-
-/* Wait	cancellation (WREL0) */
-#define	IIC0_WAITCANCEL				0x20
-#define	IIC0_WAIT_NOTCANCEL			0x00    /* do not cancel wait */
-#define	IIC0_WAIT_CANCEL			0x20    /* cancel wait */
-
-/* Generation of interrupt when	stop condition (SPIE0) */
-#define	IIC0_STOPINT				0x10
-#define	IIC0_STOPINT_DISABLE		0x00    /* disable */
-#define	IIC0_STOPINT_ENABLE			0x10    /* enable */
-
-/* Wait	and	interrupt generation (WTIM0) */
-#define	IIC0_WAITINT				0x08
-#define	IIC0_WAITINT_CLK8FALLING	0x00    /* generate     at the eighth clocks falling edge       */
-#define	IIC0_WAITINT_CLK9FALLING	0x08    /* generated at the     ninth clocks falling edge       */
-
-/* Acknowledgement control (ACKE0) */
-#define	IIC0_ACK					0x04
-#define	IIC0_ACK_DISABLE			0x00    /* enable acknowledgement */
-#define	IIC0_ACK_ENABLE				0x04    /* disable acknowledgement */
-
-/* Start condition trigger (STT0) */
-#define	IIC0_STARTCONDITION			0x02
-#define	IIC0_START_NOTGENERATE		0x00    /* do not generate start condition */
-#define	IIC0_START_GENERATE			0x02    /* generate     start condition */
-
-/* Stop	condition trigger (SPT0) */
-#define	IIC0_STOPCONDITION			0x01
-#define	IIC0_STOP_NOTGENERATE		0x00    /* do not generate stop condition */
-#define	IIC0_STOP_GENERATE			0x01    /* generate     stop condition */
-
-/*
-	IIC	Status Register	0 (IICS0)
-*/
-/* Master device status	(MSTS0)	*/
-#define	IIC0_MASTERSTATUS			0x80
-#define	IIC0_STATUS_NOTMASTER		0x00    /* slave device status or communication standby status */
-#define	IIC0_STATUS_MASTER			0x80    /* master device communication status */
-
-/* Detection of	arbitration	loss (ALD0)	*/
-#define	IIC0_ARBITRATION			0x40
-#define	IIC0_ARBITRATION_NO			0x00    /* arbitration win or no arbitration */
-#define	IIC0_ARBITRATION_LOSS		0x40    /* arbitration loss     */
-
-/* Detection of	extension code reception (EXC0)	*/
-#define	IIC0_EXTENSIONCODE			0x20
-#define	IIC0_EXTCODE_NOT			0x00    /* extension code not received */
-#define	IIC0_EXTCODE_RECEIVED		0x20    /* extension code received */
-
-/* Detection of	matching addresses (COI0) */
-#define	IIC0_ADDRESSMATCH			0x10
-#define	IIC0_ADDRESS_NOTMATCH		0x00    /* addresses do not     match */
-#define	IIC0_ADDRESS_MATCH			0x10    /* addresses match */
-
-/* Detection of	transmit/receive status	(TRC0) */
-#define	IIC0_STATUS					0x08
-#define	IIC0_STATUS_RECEIVE			0x00    /* receive status */
-#define	IIC0_STATUS_TRANSMIT		0x08    /* transmit     status */
-
-/* Detection of	acknowledge	signal (ACKD0) */
-#define	IIC0_ACKDETECTION			0x04
-#define	IIC0_ACK_NOTDETECTED		0x00    /* ACK signal was not detected */
-#define	IIC0_ACK_DETECTED			0x04    /* ACK signal was detected */
-
-/* Detection of	start condition	(STD0) */
-#define	IIC0_STARTDETECTION			0x02
-#define	IIC0_START_NOTDETECTED		0x00    /* start condition not detected */
-#define	IIC0_START_DETECTED			0x02    /* start condition detected     */
-
-/* Detection of	stop condition (SPD0) */
-#define	IIC0_STOPDETECTION			0x01
-#define	IIC0_STOP_NOTDETECTED		0x00    /* stop condition not detected */
-#define	IIC0_STOP_DETECTED			0x01    /* stop condition detected */
-
-/*
-	IIC	Flag Register 0	(IICF0)
-*/
-/* STT0	clear flag (STCF) */
-#define	IIC0_STARTFLAG				0x80
-#define	IIC0_STARTFLAG_GENERATE		0x00    /* generate     start condition */
-#define	IIC0_STARTFLAG_UNSUCCESSFUL	0x80    /* start condition generation unsuccessful */
-
-/* IIC bus status flag (IICBSY)	*/
-#define	IIC0_BUSSTATUS				0x40
-#define	IIC0_BUS_RELEASE			0x00    /* bus release status */
-#define	IIC0_BUS_COMMUNICATION		0x40    /* bus communication status     */
-
-/* Initial start enable	trigger	(STCEN)	*/
-#define	IIC0_STARTWITHSTOP			0x02
-#define	IIC0_START_WITHSTOP			0x00    /* generation of a start condition without detecting a stop     condition */
-#define	IIC0_START_WITHOUTSTOP		0x02    /* generation of a start condition upon detection of a stop     condition */
-
-/* Communication reservation function disable bit (IICRSV) */
-#define	IIC0_RESERVATION			0x01
-#define	IIC0_RESERVATION_ENABLE		0x00    /* enable communication reservation     */
-#define	IIC0_RESERVATION_DISABLE	0x01    /* disable communication reservation */
-
-/*
-	IIC	clock selection	register 0 (IICCL0)
-*/
-#define IICCL0_INITIALVALUE   		0x00
-/* Detection of	SCL0 pin level (CLD0) */
-#define	IIC0_SCLLEVEL				0x20
-#define	IIC0_SCL_LOW				0x00    /* clock line at low level */
-#define	IIC0_SCL_HIGH				0x20    /* clock line at high level     */
-
-/* Detection of	SDA0 pin level (DAD0) */
-#define	IIC0_SDALEVEL				0x10
-#define	IIC0_SDA_LOW				0x00    /* data line at low     level */
-#define	IIC0_SDA_HIGH				0x10    /* data line at high level */
-
-/* Operation mode switching	(SMC0) */
-#define	IIC0_OPERATIONMODE			0x08
-#define	IIC0_MODE_STANDARD			0x00    /* operates     in standard     mode */
-#define	IIC0_MODE_HIGHSPEED			0x08    /* operates     in high-speed mode */
-
-/* Digital filter operation	control	(DFC0) */
-#define	IIC0_DIGITALFILTER			0x04
-#define	IIC0_FILTER_OFF				0x00    /* digital filter off */
-#define	IIC0_FILTER_ON				0x04    /* digital filter on */
-
-/* Operation mode switching	(CL01, CL00) */
-#define	IIC0_CLOCKSELECTION			0x03
-
-/*	Combine	of (SMC0, CL01,	CL00)*/
-#define	IIC0_CLOCK0					0x00
-#define	IIC0_CLOCK1					0x01
-#define	IIC0_CLOCK2					0x02
-#define	IIC0_CLOCK3					0x03
-#define	IIC0_CLOCK4					0x08
-#define	IIC0_CLOCK5					0x09
-#define	IIC0_CLOCK6					0x0a
-#define	IIC0_CLOCK7					0x0b
-
-/*
-	IIC	function expansion register	0 (IICX0)
-*/
-/* IIC clock expension (CLX0) */
-#define	IIC0_CLOCKEXPENSION			0x01
-#define	IIC0_EXPENSION0				0x00
-#define	IIC0_EXPENSION1				0x01
-
-/*  Operation clock (CLX0, SMC0, CL01, CL00)
-            |   IIC0_EXPENSION0 |   IIC0_EXPENSION1 |                                
-------------|-------------------|-------------------|----------------------
-IIC0_CLOCK0 |       fprs/2      |       prohibited  |   selection clock(fw)
-            |       fprs/88     |                   |   transfer clock
-            |       normal      |                   |   mode
-------------|-------------------|-------------------|----------------------
-IIC0_CLOCK1 |       fprs/2      |       prohibited  |   selection clock(fw)
-            |       fprs/172    |                   |   transfer clock
-            |       normal      |                   |   mode
-------------|-------------------|-------------------|----------------------
-IIC0_CLOCK2 |       fprs/2      |       prohibited  |   selection clock(fw)
-            |       fprs/344    |                   |   transfer clock
-            |       normal      |                   |   mode
-------------|-------------------|-------------------|----------------------
-IIC0_CLOCK3 |prohibited/fexscl0 |       prohibited  |   selection clock(fw)
-            |       fw/66       |                   |   transfer clock
-            |       normal      |                   |   mode
-------------|-------------------|-------------------|----------------------
-IIC0_CLOCK4 |       fprs/2      |       fprs/2      |   selection clock(fw)
-            |       fprs/48     |       fprs/24     |   transfer clock
-            |     high speed    |       high speed  |   mode
-------------|-------------------|-------------------|----------------------            
-IIC0_CLOCK5 |       fprs/2      |       fprs/2      |   selection clock(fw)
-            |       fprs/48     |       fprs/24     |   transfer clock
-            |     high speed    |       high speed  |   mode
-------------|-------------------|-------------------|----------------------
-IIC0_CLOCK6 |       fprs/4      |       fprs/4      |   selection clock(fw)
-            |       fprs/96     |       fprs/48     |   transfer clock
-            |     high speed    |       high speed  |   mode
-------------|-------------------|-------------------|----------------------
-IIC0_CLOCK7 |prohibited/fexscl0 |       prohibited  |   selection clock(fw)
-            |       fw/18       |                   |   transfer clock
-            |     high speed    |                   |   mode
-------------|-------------------|-------------------|----------------------
-*/
-
-#define ADDRESS_COMPLETE   			0x80
-#define IIC_MASTER_FLAG_CLEAR 		0x00
-
-#endif
diff --git a/branches/2.2A_SDK5(4thNUP)/incs.h b/branches/2.2A_SDK5(4thNUP)/incs.h
deleted file mode 100644
index 014e6f2..0000000
--- a/branches/2.2A_SDK5(4thNUP)/incs.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#ifndef _WIN32
-#pragma SFR
-#pragma di
-#pragma ei
-#pragma nop
-#pragma stop
-#pragma halt
-#endif
-
-#ifndef _WIN32
-#pragma section @@CODE ROM_CODE
-//#pragma section @@CNST ROM_CNST
-#endif
-
-#ifdef _WIN32
-// VC�̐Ԑ����ǂ��ɂ�����
-#include "sim/simOnWin.h"
-# endif
-
-
-
-//=========================================================
-#ifndef _incs_h_
-#define _incs_h_
-
-// �� �����v��_pc_�ƂŐ؂�ւ��Ă܂�
-#define _mcu_
-
-#include "jhl_defs.h"
-#include "user_define.h"
-
-#include "hal.h"
-
-#include "bsr_system.h"
-#include "renge\renge.h"
-
-#include "vreg_ctr.h"
-
-#include "util_funcs.h"
-
-//=========================================================
-
-#endif
diff --git a/branches/2.2A_SDK5(4thNUP)/incs_loader.h b/branches/2.2A_SDK5(4thNUP)/incs_loader.h
deleted file mode 100644
index 79d921d..0000000
--- a/branches/2.2A_SDK5(4thNUP)/incs_loader.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef _WIN32
-#pragma SFR
-#pragma di
-#pragma ei
-#pragma nop
-#pragma stop
-#pragma halt
-
-
-#pragma section @@CODE       LDR_CODE
-#pragma section @@CODEL      LDR_CODL
-
-//#pragma section @@R_INIT     FSL_RINT  // ������ƃX�^�[�g�A�b�v���[�`���������l��
-//#pragma section @@CNST       FSL_CNST  // �Z�b�g���Ă���Ȃ�
-#pragma section @@CNSTL      LDR_CNSL
-
-#endif
-
-# ifdef _WIN32
-// VC�̐Ԑ����ǂ��ɂ�����
-#include "sim/simOnWin.h"
-# endif
-
-
-//=========================================================
-#include "jhl_defs.h"
-#include "user_define.h"
-
-#include "hal.h"
-
-#include "bsr_system.h"
-#include "renge\renge.h"
-
-#include "vreg_ctr.h"
-#include "vreg_twl.h"
-
-
-//=========================================================
-void firm_update(  );
-void firm_restore(  );
diff --git a/branches/2.2A_SDK5(4thNUP)/ini_VECT.c b/branches/2.2A_SDK5(4thNUP)/ini_VECT.c
deleted file mode 100644
index 84da25c..0000000
--- a/branches/2.2A_SDK5(4thNUP)/ini_VECT.c
+++ /dev/null
@@ -1,347 +0,0 @@
-/* ========================================================
- ���荞�݃x�N�^�e�[�u��
- $Id$
- ======================================================== */
-
-#ifndef _WIN32
-
-#pragma nop
-
-#endif
-
-#include "config.h"
-
-#ifndef _WIN32
-
-#ifdef _WDT_CHECK_
-#pragma interrupt INTWDTI     fn_intwdti  // wdt debug
-#endif
-
-//#pragma interrupt INTLVI      fn_intlvi   // ���g�p
-
-//#pragma interrupt INTP0		intp0_slp       // SLP (CPU���A�v��) �|�[�����O
-//#pragma interrupt INTP1               fn_intp1 // (I2C)
-//#pragma interrupt INTP2               fn_intp2 // (I2C)
-//#pragma interrupt INTP3               fn_intp3 // ������
-#pragma interrupt INTP4		intp4_extdc     // EXTDC, �������d��off����N�����̂݁B�ʏ�̓|�[�����O
-#pragma interrupt INTP5		intp5_shell     // SHELL_CLOSE, �������d��off����N�����̂݁B�ʏ�̓|�[�����O
-#pragma interrupt INTP6		intp6_PM_irq    // CODEC�o�R�ŋ�PMIC�ւ̃R�}���h��������
-
-//#ifdef _MCU_BSR_                          // ���荞�݂��̂��͎̂g���܂���
-//#pragma interrupt INTP21	intp21_RFTx     // �d�g���M�p���X
-//#else
-//#pragma interrupt INTP7		intp21_RFTx
-//#endif
-
-
-/*
-
- accero��
-#ifdef _MCU_BSR_
-#pragma interrupt INTP23	intp23_ACC_ready RB3       // �����x�Z���T�A�f�[�^��������
-#endif
-*/
-
-//#pragma interrupt INTCMP0     fn_intcmp0
-//#pragma interrupt INTCMP1     fn_intcmp1
-//#pragma interrupt INTDMA0     fn_intdma0
-#pragma interrupt INTDMA1	int_dma1
-
-//#pragma interrupt INTST0      fn_intst0
-/* #pragma interrupt INTCSI00	fn_intcsi00 */
-//#pragma interrupt INTSR0      fn_intsr0
-/* #pragma interrupt INTCSI01	fn_intcsi01 */
-//#pragma interrupt INTSRE0     fn_intsre0
-
-//#pragma interrupt INTST1      fn_intst1
-/* #pragma interrupt INTCSI10	fn_intcsi10 */
-#pragma interrupt INTIIC10	int_iic10
-//#pragma interrupt INTSR1      fn_intsr1
-//#pragma interrupt INTSRE1     fn_intsre1
-
-
-/*
-// TS�̓}�U�{�Ńe���R�AWM�͉�H�}���e���R�Ō��Lj�v�c
-#pragma interrupt INTIICA1	int_iic_ctr RB1
-
-#pragma interrupt INTIICA0	int_iic_twl RB2
-*/
-
-//#pragma interrupt INTTM00     fn_inttm00
-//#pragma interrupt INTTM01     fn_inttm01
-//#pragma interrupt INTTM02     fn_inttm02
-//#pragma interrupt INTTM03     fn_inttm03
-
-#pragma interrupt INTAD		int_adc
-#pragma interrupt INTRTC	int_rtc
-#pragma interrupt INTRTCI	int_rtc_int
-#pragma interrupt INTKR		int_kr
-//#pragma interrupt INTMD               fn_intmd
-
-//#pragma interrupt INTTM04     fn_inttm04
-//#pragma interrupt INTTM05     fn_inttm05
-//#pragma interrupt INTTM06     fn_inttm06
-//#pragma interrupt INTTM07     fn_inttm07
-
-
-//#define _irq_debug_
-/****************************************************/
-/*  ���g�p���̃_�~�[�֐���`                        */
-/****************************************************/
-#ifdef _WDT_CHECK_
-__interrupt void fn_intwdti(  )
-{
-   while( 1 )
-    {
-        NOP();
-    }
-}
-#endif
-
-#ifdef _irq_debug_
-__interrupt void fn_intlvi(  )
-{
-    while( 1 )
-    {
-        NOP();
-    }
-}
-
-__interrupt void fn_intp0(){
-while( 1 )
-    {
-        NOP();
-    }
-}
-
-__interrupt void fn_intp1(  )
-{
-    while( 1 )
-    {
-        NOP();
-    }
-}                               //
-__interrupt void fn_intp2(  )
-{
-    while( 1 )
-    {
-        NOP();
-    }
-}
-
-__interrupt void fn_intp3(  )
-{
-    while( 1 )
-    {
-        NOP();
-    }
-}
-
-__interrupt void intp21_RFTx(  )
-{
-    while( 1 )
-    {
-        NOP();
-    }
-}
-
-
-//__interrupt   void    fn_intp4(){ while(1){} } // pm.c
-//__interrupt   void    fn_intp5(){ while(1){} } // pm.c
-//__interrupt   void    fn_intp6(){ while(1){} } // pm.c
-//__interrupt   void    fn_intp7(){ while(1){} } // led.c
-//__interrupt   void    fn_intp21(){ while(1){} } // led.c
-
-__interrupt void fn_intcmp0(  )
-{
-    while( 1 )
-    {
-        NOP();
-    }
-}
-
-__interrupt void fn_intcmp1(  )
-{
-    while( 1 )
-    {
-        NOP();
-    }
-}
-
-__interrupt void fn_intdma0(  )
-{
-    while( 1 )
-    {
-        NOP();
-    }
-}
-
-//__interrupt   void    fn_intdma1(){}  // i2c_mcu.c�ɂ���
-
-__interrupt void fn_intst0(  )
-{
-    while( 1 )
-    {
-        NOP();
-    }
-}
-
-/* __interrupt	void	fn_intcsi00(){} */
-__interrupt void fn_intsr0(  )
-{
-    while( 1 )
-    {
-        NOP();
-    }
-}
-
-/* __interrupt	void	fn_intcsi01(){} */
-__interrupt void fn_intsre0(  )
-{
-    while( 1 )
-    {
-        NOP();
-    }
-}
-
-__interrupt void fn_intst1(  )
-{
-    while( 1 )
-    {
-        NOP();
-    }
-}
-
-/* __interrupt	void	fn_intcsi10(){} */
-//__interrupt   void    fn_intiic10(){ while(1){} }
-__interrupt void fn_intsr1(  )
-{
-    while( 1 )
-    {
-        NOP();
-    }
-}
-
-__interrupt void fn_intsre1(  )
-{
-    while( 1 )
-    {
-        NOP();
-    }
-}
-
-//__interrupt   void    fn_intiica(){} // i2c.c�ɂ���
-/* __interrupt	void	fn_inttm00(){} *//* sub.c�ɂĒ�` */
-__interrupt void fn_inttm01(  )
-{
-    while( 1 )
-    {
-        NOP();
-    }
-}
-
-__interrupt void fn_inttm02(  )
-{
-    while( 1 )
-    {
-        NOP();
-    }
-}
-__interrupt void fn_inttm03(  )
-{
-    while( 1 )
-    {
-        NOP();
-    }
-}
-
-//__interrupt   void    fn_intad(){ while(1){} }  // adc.c
-__interrupt void fn_intrtc(  )
-{
-    while( 1 )
-    {
-        NOP();
-    }
-}
-
-//__interrupt   void    int_rtcint(){} // rtc.c�ɂ���
-//__interrupt   void    fn_intkr(){}  // main.c
-__interrupt void fn_intmd(  )
-{
-    while( 1 )
-    {
-        NOP();
-    }
-}
-
-__interrupt void fn_inttm04(  )
-{
-    while( 1 )
-    {
-        NOP();
-    }
-}
-
-__interrupt void fn_inttm05(  )
-{
-    while( 1 )
-    {
-        NOP();
-    }
-}
-
-__interrupt void fn_inttm06(  )
-{
-    while( 1 )
-    {
-        NOP();
-    }
-}
-
-__interrupt void fn_inttm07(  )
-{
-    while( 1 )
-    {
-        NOP();
-    }
-}
-
-#endif
-
-
-
-/* ========================================================
-  �L�[���^�[�����荞��
- ======================================================== */
-__interrupt void int_kr(  )
-{
-    // �N���邾��
-}
-
-
-
-/* ========================================================
-  ext dc
- ======================================================== */
-__interrupt void intp4(  )
-{
-    // �N���邾��
-}
-
-
-
-/* ========================================================
- shell close
- ======================================================== */
-__interrupt void intp5(  )
-{
-    // �N���邾��
-}
-
-
-#else
-
-#include "sim/sim_interrupt_decrare.c"
-
-#endif
-
diff --git a/branches/2.2A_SDK5(4thNUP)/jhl_defs.h b/branches/2.2A_SDK5(4thNUP)/jhl_defs.h
deleted file mode 100644
index 9a21ab3..0000000
--- a/branches/2.2A_SDK5(4thNUP)/jhl_defs.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef __jhl_defs_h__
-#define __jhl_defs_h__
-
-typedef unsigned char u8;
-typedef   signed char s8;
-typedef unsigned short u16;
-typedef   signed short s16;
-
-typedef unsigned short ux16;
-typedef   signed short sx16;
-
-#define true 1
-#define false 0
-
-
-#define set_bit( cond, reg, pos ) \
-{                                 \
-  if( cond ){                     \
-    reg |= pos;                   \
-  }else{                          \
-    reg &= ~pos;                  \
-  }                               \
-}
-
-#endif
diff --git a/branches/2.2A_SDK5(4thNUP)/kanaria.asm b/branches/2.2A_SDK5(4thNUP)/kanaria.asm
deleted file mode 100644
index 9deaddb..0000000
--- a/branches/2.2A_SDK5(4thNUP)/kanaria.asm
+++ /dev/null
@@ -1,12 +0,0 @@
-PUBLIC _END_1,_END_2,_END_3,_END_4
-
-@@DATA DSEG BASEP
-_END_1:
-@@INIT DSEG BASEP
-_END_2:
-@@INITL DSEG UNIT64KP
-_END_3:
-@@DATAL DSEG UNIT64KP
-_END_4:
-;
-END
diff --git a/branches/2.2A_SDK5(4thNUP)/kanaria_c.c b/branches/2.2A_SDK5(4thNUP)/kanaria_c.c
deleted file mode 100644
index bbb5ec7..0000000
--- a/branches/2.2A_SDK5(4thNUP)/kanaria_c.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/********************************************//**
- �X�^�b�N�̍Ō�̒l��ǂ�
- 
- �X�^�b�N�j�󌟍��̂���
- 
- $Id$
- ***********************************************/
-#include "incs.h"
-
-extern unsigned char END_4;
-
-void f()
-{
-    unsigned char *tp;
-
-    tp = &END_4;
-}
-
diff --git a/branches/2.2A_SDK5(4thNUP)/led.c b/branches/2.2A_SDK5(4thNUP)/led.c
deleted file mode 100644
index 1892658..0000000
--- a/branches/2.2A_SDK5(4thNUP)/led.c
+++ /dev/null
@@ -1,374 +0,0 @@
-/* ========================================================
-  LED.c
-
- $Id: LED.c 418 2011-09-22 01:35:37Z n2232 $
- ======================================================== */
-#ifndef _WIN32
-
-#pragma sfr
-
-#endif
-
-#include "incs.h"
-#include "led.h"
-
-
-
-// ========================================================
-// TPS0
-#define BIT_PRS012             ( 1 << 2 )
-#define BIT_PRS002             ( 1 << 6 )
-
-// TMR0
-#define BIT_CKS0             15
-#define BIT_CCS0             12
-#define BIT_MASTER0          11
-#define BIT_STS0              8
-#define BIT_CIS0              6
-#define BIT_MD123             1
-#define BIT_MD0               0
-
-
-
-// ========================================================
-bit ledInitialized;
-
-
-// ���m�点LED
-uni_info_LED info_LED;		// �p�^�[���f�[�^
-bit info_led_off;			// �d��off���ȂǁA���������t���O
-bit info_led_override;		// �d�r�c�ʋ͏������_�ŏ㏑���r�b�g
-
-// wifi led �X�e�[�g
-static u8 state_wifi_tx;
-static u8 flag_wifi_TX;
-
-
-// �[�d�����ۂ�
-extern bit BT_IN_CHG_delayed_n;
-
-
-// ========================================================
-#define led_fade_to( now, goal )       now = fade_to( now, goal )
-
-
-/********************************************//**
-   now �� goal �ɂȂ�܂� inc / dec ����B���x���ĂԂƃO���f�[�V����
-
-   �Ƃ肠�����A�X�e�b�v�Œ�
- ***********************************************/
-u8 fade_to( u8 now, u8 goal )
-{
-    if( now != goal )
-    {
-        if( now > goal )
-        {
-            now --;
-        }
-        else
-        {
-            now ++;
-        }
-    }
-    return( now );
-}
-
-
-
-
-/********************************************//**
- �X�����l�����ăO���f�[�V��������
- ***********************************************/
-#define led_fade_to2( led, status )                      \
-    led = fade_to2( status )
-
-
-u8 fade_to2( st_LED_dim_status* status )
-{
-    if( status->now != status->to )
-    {
-        if( abs(( status->to - status->now )) > abs(status->delta) )
-        {
-            status->now += status->delta;
-        }
-        else
-        {
-            status->now = status->to;
-        }
-    }
-    return( status->now / 128 );
-}
-
-
-
-
-/********************************************//**
- LED�̏�����
- 
- HW�^�C�}�[���g���̂ł����̏��������s��
- ***********************************************/
-void LED_init(  )
-{
-/**
-  PWM�̃Z�b�g�A�Ƃ肠�����S������
-
-  �}�X�^�`���l���F�O�@(P01:/reset2)�@�}�X�^�[�͋����`���l�������ł��Ȃ�
-  �X���[�u�@�@�@�@�P�@�r�k�s�n�B(�R�c �k�d�c�H)
-  �@�@�@�@�@�@�@�@�Q�@�J����
-  �@�@�@�@�@�@�@�@�R�@WiFi
-  �@�@�@�@�@�@�@�@�S�@(�s���͂q�s�b32kHz out �Ɏg�p)
-  �@�@�@�@�@�@�@�@�T�@�[�d
-  �@�@�@�@�@�@�@�@�U�@�d�� �k
-  �@�@�@�@�@�@�@�@�V�@�d�� �g
- */
-    TAU0EN = 1;
-    TPS0 = BIT_PRS012 | BIT_PRS002;     // �}�X�^�[�N���b�N��CK01,8M/2 /2^4 = 250kHz
-
-    TMR00 =
-        1 << BIT_CKS0 | 0 << BIT_CCS0 | 1 << BIT_MASTER0 | 0 << BIT_STS0 | 0
-        << BIT_CIS0 | 0 << BIT_MD123 | 1 << BIT_MD0;
-    TMR01 = TMR02 = TMR03 = TMR04 = TMR05 = TMR06 = TMR07 =
-        1 << BIT_CKS0 | 0 << BIT_CCS0 | 0 << BIT_MASTER0 | 4 << BIT_STS0 | 0
-        << BIT_CIS0 | 4 << BIT_MD123 | 1 << BIT_MD0;
-    ISC = 0;
-    TOM0 = 0x00FE; // �o�̓��[�h�B4��PWM�o�͂��Ȃ���1�ɂ��Ȃ���TO5�ȍ~�ɃN���b�N���͂��Ȃ�
-
-    TOL0 = 0x0000; // �o�͂𔽓]�����邩�t���O
-
-    TO0 = 0x0000;                    // �^�C�}�[���쒆�ŁA�^�C�}�[�o�͂ɂ��ĂȂ��Ƃ��̃s���̃��b�`�B�^�C�}�[�o�͂��g��Ȃ��Ȃ�O
-    TOE0 = 0x00EE; // TOx���^�C�}�[���W���[��������H
-
-    TS0 = 0x00EF;  // ����J�n
-
-    TDR00 = LED_BRIGHT_MAX - 1; // ���� 10bit
-
-//    system_status.info_fullcolor = 1;		// ���m�点1���d�l�p�~
-
-	if( system_status.reboot )
-    {
-        vreg_ctr[VREG_C_LED_POW] = LED_POW_ILM_AUTO;
-        LED_duty_pow_blu = LED_BRIGHT_MAX;
-    }
-    info_led_off = false;
-	ledInitialized = true;
-}
-
-
-/********************************************//**
- LED�̒�~�B
- 
- HW�^�C�}�[�̒�~
- ***********************************************/
-
-void LED_stop(  )
-{
-    TT0 = 0x00EF;  // ��Ē�~�i���Ȃ��Ƃ��߁j
-    TOE0 = 0x0000; // TOx���^�C�}�[���W���[��������H(GPIO�ɂȂ�)
-    TAU0EN = 0;
-    LED_pow_red = 0;
-    LED_CAM     = 0;
-
-	LED_duty_notify_red = 0;
-    LED_duty_notify_blu = 0;
-    LED_duty_notify_grn = 0;
-    LED_pow_red = 0;
-    LED_CAM     = 0;
-
-    WIFI_txLatch = 0;
-    flag_wifi_TX = 0;
-    state_wifi_tx = 0;
-
-	ledInitialized = false;
-}
-
-
-
-
-/********************************************//**
- WiFi LED �̍X�V
- 
- - ���W�X�^�̐ݒ�� on / off
- - off �ł����Ă����W���[������̑��M�p���X�� -_-_-_--------_-_-_-------�̃p�^�[���_��
- ***********************************************/
-void tsk_led_wifi(  )
-{
-    static u8 task_interval;
-
-    if( task_interval-- != 0 )
-    {
-        return;
-    }
-
-    // ���M�p���X�̃��b�`
-    if( WIFI_txLatch )         // ���荞�݃t���O���̂��̂��g���Ă��܂�
-    {
-        WIFI_txLatch = 0;
-        flag_wifi_TX = 1;
-    }
-
-    if( flag_wifi_TX != 0 )
-    {
-        vreg_ctr[ VREG_C_STATUS_1 ] |= REG_BIT_WIFI_TX;
-        // ���M�p�^�[��
-        switch ( state_wifi_tx )
-        {
-          case ( 1 ):
-          case ( 3 ):
-          case ( 5 ):
-            LED_duty_WiFi = 0;
-            break;
-          default:
-            LED_duty_WiFi = vreg_ctr[VREG_C_LED_BRIGHT];
-        }
-        state_wifi_tx ++;
-        if( state_wifi_tx == 32 )  // ���_�Ō�A�_�����Ă�����Ԃ̒���
-        {
-            state_wifi_tx = 0;
-            flag_wifi_TX = 0;
-        }
-        task_interval = 25;
-        return;
-    }
-    else
-    {
-        task_interval = 30;
-        // ���M�t���O�҂�
-        vreg_ctr[ VREG_C_STATUS_1 ] &= ~REG_BIT_WIFI_TX;
-
-        if( vreg_ctr[VREG_C_LED_WIFI] == WIFI_LED_OFF )
-        {
-            LED_duty_WiFi = 0;
-            return;
-        }
-        else
-        {
-            if( LED_duty_WiFi == vreg_ctr[VREG_C_LED_BRIGHT] )
-            {
-                return;
-            }
-            else if( LED_duty_WiFi < vreg_ctr[VREG_C_LED_BRIGHT] )
-            {
-                LED_duty_WiFi ++;
-            }
-            else
-            {
-                LED_duty_WiFi --;
-            }
-        }
-        task_interval = 3;
-        return;
-    }
-}
-
-
-
-
-bit info_led_pattern_updated;
-/********************************************//**
- ���m�点LED
-
-  �t�F�[�h�A�E�g�v�Z
- ***********************************************/
-static void calc_info_led_fade_out( st_LED_dim_status* tgt_led )
-{
-    tgt_led -> to = 0;
-    tgt_led -> delta = ( 0 - tgt_led -> now ) / 64;
-}
-
-
-/********************************************//**
- ���m�点LED
-
-  �O���f�[�V�����v�Z
- ***********************************************/
-static void calc_info_led_next_frame( st_LED_dim_status* tgt_led, u8 color )
-{
-    tgt_led -> to = color * 128;
-    // �O���f�[�V�����̃f���^���v�Z
-    tgt_led -> delta = (( tgt_led -> to - tgt_led -> now ) ) / info_LED.info_LED.fade_time;
-}
-
-
-/********************************************//**
- ���m�点LED
- ***********************************************/
-void tsk_led_notify(  )
-{
-    static u8 time_to_next_frame;
-    static u8 frame;
-    static u8 loops;
-    static st_LED_dim_status LED_dim_status_info_R, LED_dim_status_info_G, LED_dim_status_info_B;
-
-    if( info_led_override )
-    {
-        // �d�r�؂ꂪ�D�悷��
-        return;
-    }
-
-    if( system_status.pwr_state == ON_TRIG )
-    {
-        LED_duty_notify_blu = 0;
-        LED_duty_notify_red = 0;
-        LED_duty_notify_grn = 0;
-        LED_dim_status_info_R.now = 0;
-        LED_dim_status_info_G.now = 0;
-        LED_dim_status_info_B.now = 0;
-    }
-
-    if( info_led_off )  // ���d��off���ȂNj���off
-    {
-        // �t�F�[�h�A�E�g������
-        calc_info_led_fade_out( &LED_dim_status_info_R );
-        calc_info_led_fade_out( &LED_dim_status_info_G );
-        calc_info_led_fade_out( &LED_dim_status_info_B );
-    }
-    else
-    {
-        // �ʏ�^�]
-        if( info_led_pattern_updated )
-        {
-            info_led_pattern_updated = false;
-            vreg_ctr[ VREG_C_LED_NOTIFY_FLAG ] &= ~REG_BIT_IN_LOOP;
-            frame = 0;                      // �����Ə�����
-            time_to_next_frame = 0;
-        }
-        else
-        {
-            // ���̃t���[���ɐi�߂�H
-            if( time_to_next_frame == 0 )
-            {
-                time_to_next_frame = info_LED.info_LED.term;
-
-                if( frame >= NOTIFY_LED_TERM -1 )
-                {
-                    vreg_ctr[ VREG_C_LED_NOTIFY_FLAG ] |= REG_BIT_IN_LOOP;
-                    if( info_LED.info_LED.last_loop != 255 )  // 255:�������[�v
-                    {
-                        loops ++;
-                        if( loops > info_LED.info_LED.last_loop )
-                        {
-                            frame = 0;
-                        }
-                    }
-                }
-                else
-                {
-                    frame = (( frame + 1 ) & 0x1F ); // �������Ń}�X�N�������Ă����Ȃ��ƍŏI�t���[���`�擪�Ԃ̃O���f�������Ȃ�
-                    vreg_ctr[ VREG_C_LED_NOTIFY_FLAG ] &= ~REG_BIT_IN_LOOP;
-                    loops = 0;
-                }
-
-                // �O���f�[�V�����v�Z
-                calc_info_led_next_frame( &LED_dim_status_info_R, info_LED.info_LED.red[frame] );
-                calc_info_led_next_frame( &LED_dim_status_info_G, info_LED.info_LED.grn[frame] );
-                calc_info_led_next_frame( &LED_dim_status_info_B, info_LED.info_LED.blu[frame] );
-                
-            }
-            time_to_next_frame --;
-        }
-    }
-
-    led_fade_to2( LED_duty_notify_red, &LED_dim_status_info_R );
-    led_fade_to2( LED_duty_notify_grn, &LED_dim_status_info_G );
-    led_fade_to2( LED_duty_notify_blu, &LED_dim_status_info_B );
-}
diff --git a/branches/2.2A_SDK5(4thNUP)/led.h b/branches/2.2A_SDK5(4thNUP)/led.h
deleted file mode 100644
index ce8541f..0000000
--- a/branches/2.2A_SDK5(4thNUP)/led.h
+++ /dev/null
@@ -1,142 +0,0 @@
-#ifndef __led__
-#define __led__
-
-
-
-// ====================================
-
-//#define LED_CHARGE           P2.4  // PM�Œ�`
-
-// LED_DUTY
-#define LED_duty_pow_blu     TDR06
-#define LED_duty_WiFi        TDR03
-
-#define LED_duty_3d          TDR01
-#define LED_duty_notify_red  TDR07
-#define LED_duty_notify_grn  TDR05
-#define LED_duty_notify_blu  TDR02
-
-// ������duty�ς����܂���
-#ifndef _WIN32
-#define LED_pow_red          P4.2
-#define LED_CAM              P7.5
-#else
-#define LED_pow_red          mcuRegP[ _P4_2 ]
-#define LED_CAM              mcuRegP[ _P7_5 ]
-#endif
-
-#define NOTIFY_LED_TERM     32
-
-
-#define LED_BRIGHT_MAX      0x00FF
-
-// ====================================
-#define WIFI_txLatch PIF21					// �d�g���M�p���X
-
-
-
-// ====================================
-enum LED_ILUM_MODE
-{
-  LED_POW_ILM_AUTO = 0,
-  LED_POW_ILM_ON,
-  LED_POW_ILM_SLEEP,
-  LED_POW_ILM_OFF,
-  LED_POW_ILM_ONLY_RED,
-  LED_POW_ILM_ONLY_BLUE,
-  LED_POW_ILM_FORCE_BT_EMPTY
-};
-
-
-enum LED_MODE_3D
-{
-  LED_3D_ILM_OFF = 0,
-  LED_3D_ILM_ON
-};
-
-
-// VREG_C_WIFI_LED
-enum WIFI_LED_MODE
-{
-  WIFI_LED_OFF = 0,
-  WIFI_LED_ON
-};
-
-
-// VREG_C_WIFI_NOTIFY
-enum NOTIFY_LED_MODE
-{
-  NOTIFY_LED_OFF = 0,
-  NOTIFY_LED_ON,
-  NOTIFY_LED_PTN0,
-  NOTIFY_LED_PTN1,
-  NOTIFY_LED_PTN2
-};
-
-
-// VREG_C_CAM_LED
-enum CAM_LED_MODE
-{
-  CAM_LED_OFF = 0,
-  CAM_LED_BLINK,
-  CAM_LED_ON,
-  CAM_LED_BY_TWL,
-  CAM_LED_ON_PLUSE,
-  CAM_LED_OFF_PLUSE
-};
-
-
-
-// ���m�点LED�����֌W //
-typedef struct _st_info_LED
-{
-    u8 term;                    // 1�t���[�����`�b�N�H
-    u8 fade_time;               // ���`�b�N�Ŏ��̃t���[���̐F�ɒB���邩
-    u8 last_loop;               // �ŏI�t���[�����J��Ԃ��H
-    u8 resv1;
-    u8 red[32];
-    u8 grn[32];
-    u8 blu[32];
-}st_info_LED;
-
-typedef union _uni_info_LED
-{
-    st_info_LED info_LED;
-    u8 bindata[ sizeof( st_info_LED ) ];
-}uni_info_LED;
-
-extern uni_info_LED info_LED;
-
-
-// ��LED �_�Ō��� //
-typedef struct _st_led_red_batt_empty
-{
-    u8 dats[4];
-}st_led_red_batt_empty;
-
-extern st_led_red_batt_empty led_red_batt_empty;
-
-
-/*
-   ���m�点LED
-*/
-typedef struct _st_LED_dim_status
-{
-    sx16 to;
-    sx16 delta;
-    sx16 now;                   // �����_�ȉ����o���Ă����Ȃ��Ă͂Ȃ�Ȃ�����
-}st_LED_dim_status;
-
-
-
-// ====================================
-void LED_init(  );
-void LED_stop(  );
-
-
-// ====================================
-extern bit ledInitialized;
-extern bit info_led_override;
-
-
-#endif
diff --git a/branches/2.2A_SDK5(4thNUP)/led_cam.c b/branches/2.2A_SDK5(4thNUP)/led_cam.c
deleted file mode 100644
index 7d4a1eb..0000000
--- a/branches/2.2A_SDK5(4thNUP)/led_cam.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/******************************************************//**
-  LED_Cam          TO02
-
-  BLINK,*_PLUSE �̎��́A1�������͕K�����̏�ԂɂȂ�܂��B
-
-  ���̊Ԃ� OFF��BLINK �Ȃǂ����ƁAOFF����������܂��B
-
- $Id$
- *********************************************************/
-#ifndef _WIN32
-
-#pragma sfr
-
-#endif
-
-#include "incs.h"
-#include "led.h"
-#include "vreg_twl.h"
-
-
-// ========================================================
-static u8 state_led_cam = 0;
-static u16 task_interval;
-
-bit cam_led_update;
-
-
-
-// ========================================================
-static void cam_led_twl();
-
-
-
-
-/********************************************//**
- �C���^�[�o�����s�^�X�N�ƁAtwl���W�X�^�ւ̏������݂̂Q�J������Ă΂�܂��B
- ***********************************************/
-void tsk_led_cam(  )
-{
-	DI_wt_chk();                    // ���W�X�^�ւ̏������݂ŋ����N���������邱�Ƃ����邽��
-    if( !cam_led_update )
-    {
-        if( task_interval != 0 )
-        {
-            task_interval --;
-			EI();
-            return;
-        }
-    }
-
-	cam_led_update = false;  // TWL �̃u�����N�ݒ�i�ꔭ�����_���j�̂���
-	EI();
-
-	if( system_status.pwr_state == SLEEP )  // sleep���A��������
-	{
-        LED_CAM = 0;
-        state_led_cam = 0;
-	}
-	else
-	{
-		// �u�����N�̂悤�ɑ҂��������Ƃ��ȊO�͖��T�N������
-		//  (���W�X�^�̕ύX�ɂ����ɔ�������)
-		switch ( vreg_ctr[VREG_C_LED_CAM] )
-		{
-		case ( CAM_LED_OFF ):
-		default:
-			LED_CAM = 0;
-			state_led_cam = 0;
-			break;
-
-		case ( CAM_LED_ON ):
-			LED_CAM = 1;
-			state_led_cam = 0;
-			break;
-
-		case ( CAM_LED_BLINK ):
-			if( state_led_cam == 0 )
-			{
-				LED_CAM = 1;
-				state_led_cam = 1;
-			}
-			else
-			{
-				LED_CAM = 0;
-				state_led_cam = 0;
-			}
-			task_interval = 250;
-			break;
-
-		case ( CAM_LED_ON_PLUSE ):
-			if( state_led_cam == 0 )
-			{
-				LED_CAM = 1;
-				state_led_cam = 1;
-				task_interval = 250;
-			}
-			else
-			{
-				vreg_ctr[VREG_C_LED_CAM] = CAM_LED_OFF;
-			}
-			break;
-
-		case ( CAM_LED_OFF_PLUSE ):
-			if( state_led_cam == 0 )
-			{
-				LED_CAM = 0;
-				state_led_cam = 1;
-				task_interval = 250;
-			}
-			else
-			{
-				vreg_ctr[VREG_C_LED_CAM] = CAM_LED_ON;
-			}
-			break;
-
-		case( CAM_LED_BY_TWL ):
-			cam_led_twl();
-		}
-	} // if( system_status.pwr_state == sleep ) ... else ...
-}
-
-
-/********************************************//**
- TWL����J����LED�𑀍삳���
- ***********************************************/
-static void cam_led_twl()
-{
-	// TWL�݊� //
-	switch ( vreg_twl[ REG_TWL_INT_ADRS_CAM ] ){
-	case( TWL_CAMLED_OFF ):
-		LED_CAM = 0;
-		state_led_cam = 0;
-		break;
-
-	case( TWL_CAMLED_BLINK ):
-		if( state_led_cam == 0 )
-		{
-			LED_CAM = 1;
-			state_led_cam = 1;
-		}
-		else
-		{
-			LED_CAM = 0;
-			state_led_cam = 0;
-		}
-		task_interval = (u8)( 600 / SYS_INTERVAL_TICK ) + 250;
-		break;
-
-	case( TWL_CAMLED_ON ):
-	case( TWL_CAMLED_DEF_ON ):
-	default:
-		LED_CAM = 1;
-		state_led_cam = 1;
-		break;
-	}
-}
diff --git a/branches/2.2A_SDK5(4thNUP)/led_pow.c b/branches/2.2A_SDK5(4thNUP)/led_pow.c
deleted file mode 100644
index 4e52da5..0000000
--- a/branches/2.2A_SDK5(4thNUP)/led_pow.c
+++ /dev/null
@@ -1,296 +0,0 @@
-/* ========================================================
-  �d��LED
-  LED_POW_B,R         6,7
-
-  TDR00�@����(0x03FF�BTPS0��250kHz�ŃJ�E���g�A�b�v�B10bit�Ȃ�250Hz�ʂɂȂ�)
-  TDR0x�@Duty 0�ŏ����ATDR00(���� =0x03FF�ȏ�)�œ_���ł��B
-  $Id$
- ======================================================== */
-
-/* ========================================================
-  enum pwr_state_{
-  OFF_TRIG = 0,
-  ON_CHECK,
-  ON_TRIG,
-  ON,
-  SLEEP
-};
-
-enum LED_ILUM_MODE{
-  LED_POW_ILM_AUTO,
-  LED_POW_ILM_ON,
-  LED_POW_ILM_SLEEP,
-  LED_POW_ILM_CEOFF
-};
- ======================================================== */
-#ifndef _WIN32
-
-#pragma sfr
-
-#endif
-
-#include "incs.h"
-#include "led.h"
-#include "pm.h"
-
-// ========================================================
-// �X���[�v�����ł̃e�[�u���B�}�W���B
-const u8 LED_PTN_SLEEP[] = {
-     25,  38,  52,  68,  83,  98, 110, 119,
-    125, 128, 128, 125, 119, 110,  98,  83,
-     68,  52,  38,  25,  16,  10,   8,   8,
-      8,   8,   8,   8,   8,   8,  10,  16
-      };
-
-
-// ��LED�̓d�r�c��LED�̓_�Ńp�^�[��
-st_led_red_batt_empty led_red_batt_empty = { 0x55, 0x55, 0x55, 0x55 };
-#define LED_SLEEP_FRAME_LEN 71
-#define LED_SLEEP_DIM_LEN   71
-#define LED_SLEEP_FRAME_NUM 32
-
-
-
-// ========================================================
-static void led_pow_normal(  );
-static void led_pow_sleep(  );
-static void led_pow_bt_empty();
-static u8 led_pow_batt_low();
-
-#define led_fade_to( now, goal )       now = fade_to( now, goal )
-extern u8 fade_to( u8 now, u8 goal );
-
-#define led_fade_to2( led, status )    led = fade_to2( status )
-extern u8 fade_to2( st_LED_dim_status* status );
-
-
-
-// ========================================================
-// �d��LED�̃X���[�v�p�^�[���̃X�e�[�^�X��
-static u8 time_to_next_frame_sleep = LED_SLEEP_FRAME_LEN;
-static u8 frame_sleep;
-static st_LED_dim_status LED_dim_status_sleep;
-
-extern bit ledInitialized;
-extern bit BT_IN_CHG_delayed_n; 
-
-
-
-/********************************************//**
- �d��LED
- 
- ��{�I�ɂ́A
- 
- ���쎞�A
- - �d�r�c�� > 10%    �“_���imaster_brightness�̖��邳�j
- -             5%    �ԓ_�� (100%�_���AHW�����Œ����s��)
- -       ����ȉ�    �ԓ_���A���m�点LED�Ԃ���������B�������A�A�_�v�^���h��������5%�`�̓����
- 
- �X���[�v����
- - �d�r�c�� > 10%    �“_���imaster_brightness�̖��邳�j
- -             ��    ���쎞�Ɠ���
- 
- �X���[�v�ɂ͎����Ő؂�ւ��Ȃ��̂ŁA���W�X�^���삪�K�v�ł��i���̕����s�����悢�ł��傤�H�j
- 
- ���̃p�^�[���͐��Y�����̂��߁B
- ***********************************************/
-void tsk_led_pow(  )
-{
-	if( ! ledInitialized )
-	{
-		return;
-		// �����܂�
-	}
-
-    info_led_override = false;
-
-    switch ( vreg_ctr[VREG_C_LED_POW] )
-    {
-    case ( LED_POW_ILM_AUTO ):
-    default:
-        led_pow_normal(  );
-        break;
-
-    case ( LED_POW_ILM_SLEEP ):
-        led_pow_sleep(  );
-        break;
-
-    case ( LED_POW_ILM_ON ):
-        led_fade_to( LED_duty_pow_blu, vreg_ctr[VREG_C_LED_BRIGHT] );
-        LED_pow_red = 0;
-        break;
-
-    case ( LED_POW_ILM_OFF ):
-        led_fade_to( LED_duty_pow_blu, 0 );
-        LED_pow_red = 0;
-        break;
-
-    case ( LED_POW_ILM_ONLY_RED ):
-        LED_duty_pow_blu = 0;
-        LED_pow_red = 1;
-        break;
-
-    case ( LED_POW_ILM_ONLY_BLUE ):
-        LED_duty_pow_blu = LED_BRIGHT_MAX;
-        LED_pow_red = 0;
-        break;
-
-    case ( LED_POW_ILM_FORCE_BT_EMPTY ):
-        led_pow_bt_empty();
-        break;
-    }
-
-	if( system_status.pwr_state == OFF || system_status.pwr_state == ON_CHECK )
-	{
-        LED_pow_red = 0;
-	    info_led_override = false;
-    }
-
-    if( info_led_override )
-    {
-        LED_duty_notify_blu = 0;
-        LED_duty_notify_grn = 0;
-		LED_duty_notify_red = ( LED_pow_red == 0 )? 0 : 255;
-    }
-}
-
-
-
-/********************************************//**
-  �ʏ퓮�쎞
-  
-  �d�r�c�ʂŁA�@���ԁ��ԓ_��
- ***********************************************/
-static void led_pow_normal(  )
-{
-    time_to_next_frame_sleep = LED_SLEEP_FRAME_LEN;
-    frame_sleep = 0;
-    LED_dim_status_sleep.now = (sx16)LED_duty_pow_blu * 128;
-
-    if( led_pow_batt_low() != 0 )  // �Ԃ̓_�������ł���Ă��܂�
-    {
-        return;
-        // �����܂�
-    }
-
-    // �“_��
-    led_fade_to( LED_duty_pow_blu, vreg_ctr[VREG_C_LED_BRIGHT] );
-}
-
-
-
-/********************************************//**
-  �X���[�v���z�^���p�^�[��
-  
-   �d�r�c�ʂŐԁ��ԓ_�łɂ���
- ***********************************************/
-static void led_pow_sleep(  )
-{
-    if( led_pow_batt_low() != 0 )		// �Ԃ̓_�������ł���Ă��܂�
-    {
-        time_to_next_frame_sleep = LED_SLEEP_FRAME_LEN;
-        frame_sleep = 0;
-        LED_dim_status_sleep.now = (sx16)LED_duty_pow_blu * 128;
-        return;
-        // �����܂�
-    }
-
-    LED_dim_status_sleep.to = LED_PTN_SLEEP[frame_sleep] * 128;
-
-    // �O���f�[�V�����̃f���^���v�Z
-    LED_dim_status_sleep.delta = (( LED_dim_status_sleep.to - LED_dim_status_sleep.now ) ) / LED_SLEEP_DIM_LEN;
-    led_fade_to2( LED_duty_pow_blu, &LED_dim_status_sleep );
-
-    // ���̃t���[���ɐi�߂�H
-    time_to_next_frame_sleep --;
-    if( time_to_next_frame_sleep == 0 )
-    {
-        time_to_next_frame_sleep = LED_SLEEP_FRAME_LEN;
-
-        frame_sleep ++;
-        if( frame_sleep >= LED_SLEEP_FRAME_NUM -1 )
-        {
-            frame_sleep = 0;
-        }
-    }
-}
-
-
-
-/********************************************//**
-  �d�r�����Ȃ��Ƃ��̋���
-
-�@�Ԓl�F�@0�@�d�r�����Ȃ��Ȃ�����
-
-�@�@�@�@�@1�@�@�@�@���Ȃ������̂ŋ��ʃp�^�[���ɂ���
- ***********************************************/
-static u8 led_pow_batt_low()
-{
-    if( vreg_ctr[VREG_C_BT_REMAIN] > BATT_TH_LO )
-    {
-        LED_pow_red = 0;
-        return 0;
-        // �����܂�
-    }
-
-    if(( vreg_ctr[VREG_C_BT_REMAIN] > BATT_TH_EMPTY ) || !BT_IN_CHG_delayed_n )
-		// �d�r�c�ʂ�5%�i�`10%�j�@�܂��́A���ꖢ���ł��[�d��
-    {
-        // �ԓ_��
-        led_fade_to( LED_duty_pow_blu, 0 );
-		{
-	        LED_pow_red = 1;
-		}
-
-    }
-    else // �d�r��5%�����@���@�A�_�v�^�Ȃ�
-    {
-        led_pow_bt_empty();
-    }
-    return 1;
-}
-
-
-
-
-/********************************************//**
-�@�d�r���Ȃ��p�^�[��
-
-�@�@�w��p�^�[���𗬂�
-
-�@�@���m�点���㏑������
- ***********************************************/
-static void led_pow_bt_empty()
-{
-    static u8 delay;
-    static u8 red_blink_poi;
-
-    info_led_override = true;
-
-    // �ԓ_��
-    led_fade_to( LED_duty_pow_blu, 0 );
-
-    // �Ԃ̓_�Ńp�^�[�����w��ł���
-    delay ++;
-    if( delay < 64 ) // �t���[���̕ێ����ԉ҂�
-    {
-        return;
-    }
-    delay = 0;
-
-    if( led_red_batt_empty.dats[ red_blink_poi / 8 ] & ( 1 << ( red_blink_poi % 8 )) )
-    {
-        LED_pow_red = 1;
-    }
-    else
-    {
-        LED_pow_red = 0;
-    }
-    red_blink_poi ++;
-    if( red_blink_poi >= 32 )
-    {
-        red_blink_poi = 0;
-    }
-}
-
-
diff --git a/branches/2.2A_SDK5(4thNUP)/loader.c b/branches/2.2A_SDK5(4thNUP)/loader.c
deleted file mode 100644
index 5bfb301..0000000
--- a/branches/2.2A_SDK5(4thNUP)/loader.c
+++ /dev/null
@@ -1,407 +0,0 @@
-/* ========================================================
-  MCU CTR BSR
-  2009/03/30 - 
-  �J���Z�p�� ���c
-
-  �u�[�g���[�_�[��
-  �z�X�g�̒ʐM�ƁA���ȏ��������A�t�@�[���̃`�F�b�N���s���B
-  
- $Id: loader.c 418 2011-09-22 01:35:37Z n2232 $
- ======================================================== */
-#ifndef _WIN32
-
-#pragma SFR
-#pragma di
-#pragma ei
-#pragma nop
-#pragma stop
-#pragma halt
-#pragma opc
-
-#endif
-#include "incs_loader.h"
-
-#include <fsl.h>
-#include "fsl_user.h"
-
-#include "i2c_ctr.h"
-#include "i2c_mcu.h"
-#include "pm.h"
-#include "rtc.h"
-
-#include "reboot.h"
-
-#include "wdt.h"
-#include "magic.h"
-
-
-
-#define REG_BIT_RESF_WDT     0x10
-#define REG_BIT_RESF_TRAP    0x80
-#define REG_BIT_RESF_LVI     0x01
-
-
-
-// ========================================================
-#if (FSL_DATA_BUFFER_SIZE>0)
-fsl_u08 fsl_data_buffer[FSL_DATA_BUFFER_SIZE];
-#endif
-
-
-
-#ifdef   FSL_INT_BACKUP
-static fsl_u08 fsl_MK0L_bak_u08;        /*    if (interrupt backup required)            */
-static fsl_u08 fsl_MK0H_bak_u08;        /*    {                                         */
-static fsl_u08 fsl_MK1L_bak_u08;        /*      reserve space for backup information    */
-static fsl_u08 fsl_MK1H_bak_u08;        /*      of interrupt mask flags                 */
-static fsl_u08 fsl_MK2L_bak_u08;        /*                                              */
-static fsl_u08 fsl_MK2H_bak_u08;        /*    }                                         */
-#endif
-
-
-
-// ========================================================
-void	hdwinit();		// static �ɂ����crt0���猩���Ȃ��Ȃ�܂��B���ӁI
-static void	hdwinit2();
-static void	chk_platform_type();
-static void	chk_firm_broke();
-
-
-extern void main_loop();
-
-
-/********************************************//**
- * - �t�@�[���A�b�v�f�[�g�AWDT���̃��Z�b�g�A
- * - �t�@�[���̔j��A
- * - �{�̎�ނ̎��ʁA
- * - �|�[�g�A
- * - �჌�x���ȃy���t�F�����̏����������A
- *
- * main_loop()���ĂԁB
- ***********************************************/
-void main(  )
-{
-    while( 1 )
-    {
-        WDT_Restart(  );
-
-        if( RTCEN )  // �����TRAP(����update)�ɂ����g���Ȃ��BWDT���ł͗����Ȃ�
-        {
-            system_status.reboot = true;
-        }
-
-        {
-            volatile u8 my_resf = RESF;         // ���ǂނƏ�����
-            if( ( my_resf & REG_BIT_RESF_WDT ) != 0 )
-            {
-                vreg_ctr[ VREG_C_MCU_STATUS ] |= REG_BIT_STATUS_WDT_RESET;
-                // set_irq( VREG_C_IRQ0, REG_BIT_IRQ_WDT_RESET );
-                // ��I2C�̏�������ɍs��
-                system_status.reboot = true;
-            }
-            else if( ( my_resf & REG_BIT_RESF_TRAP ) != 0 ) // ( FSL_ForceReset, 'r' )
-            {
-                system_status.reboot = true;
-            }
-/* LVI�g�p����
-            else if(( my_resf & REG_BIT_RESF_LVI ) != 0 )
-            {
-                    vreg_ctr[ VREG_C_MCU_STATUS ] |= ( 1 << 2 );
-            }
-*/
-        }
-//* ROM���ǂ��ɂ�����Ȃ��Ȃ�����A�]���̏�R�����g�A�E�g
-        if( !system_status.reboot )
-        {
-            // �ʏ�̓d������
-            // �d�r�ڑ����A������Ƒ҂��Ă݂�(�`���^�����O�΍�)
-            u16      pwup_delay0;
-            for( pwup_delay0 = 0xFFFF; pwup_delay0 != 0; pwup_delay0 -- ){;};
-        }
-//*/
-        hdwinit2(  );
-
-#ifndef _WIN32
-        // �t�@�[���̐������`�F�b�N //
-        chk_firm_broke();	// ���Ă�����A���Ă��Ȃ�
-#endif
-
-        // �@�픻�� 
-        chk_platform_type();
-
-        // HAL�f�o�b�O���Z�b�g
-        hal_reset();
-        hal_update();
-
-        // RTC ������
-        RTC_init(  );               // �����Ń��u�[�g�����肵�ď��������邩���f���܂�
-
-        // �ʏ�^�]
-        main_loop(  );
-    }
-}
-
-
-
-/********************************************//**
- * �}�W�b�N�i���o�[���`�F�b�N���āA���삳���悤�Ƃ��Ă���t�@�[�����j�����Ă��Ȃ����`�F�b�N���܂��B
- *
- * ���Ă����ꍇ�̓��X�g�A�����݁AMCU�̓��Z�b�g���܂��B
- ***********************************************/
-static void chk_firm_broke()
-{
-    u8      i;
-    u8      comp = 0;
-
-    // ���[�_�[�Ɩ{�͓̂����o�[�W�������H
-    /// ���ւ̃A�b�v�f�[�g�̓r���ŏI����ĂȂ����H
-    for( i = 0; i < sizeof( __TIME__ ); i++ )      // sizeof( __TIME__ ) = 8 �炵
-    {
-        comp += ( *( __far u8 * )( MGC_LOAD + i ) == *( u8 * )( MGC_FOOT + i ) ) ? 0 : 1;
-        comp += ( *( u8 * )( MGC_HEAD + i ) == *( u8 * )( MGC_FOOT + i ) ) ? 0 : 1;
-    }
-
-    if( *( u8 * )( MGC_FOOT +2 ) != ':' )  // �����ς̂܂�
-    {
-        comp ++;
-    }
-
-    if( comp != 0 )
-    {
-        // �t�@�[�����X�g�A�����݂�
-        firm_restore(  );
-        // �A���Ă��Ȃ��B���Z�b�g��������B
-    }
-}
-
-
-/********************************************//**
-�v���b�g�t�H�[���̔�����s���Asystem_status�ɃZ�b�g���܂��B
-
-  �f�o�b�K�‚Ȃ��ł�Ə��ɔ���ł��Ȃ����Ƃ�����܂��B
-
-��CTR�t�@�~��
-
- DEV_DET(P12.[2:1])
-  
-
-��CTR�����̊J���@��
-
- P40,41                   !����! �f�o�b�O�L����P40��L����MCU���N�����܂���I
-
- - HH ���@
- - HL NBD���V��
- - LH �X�^���h�A�������V��
- - LL IS�f�o�b�K
-
- ***********************************************/
-void chk_platform_type()
-{
-    // ��CTR�t�@�~�� //
-	system_status.family = (enum family_)( DEV_DET >> 1 );  /// ����...
-#ifdef _DBG_FORCE_SNAKE_
-	system_status.family = FAMILY_SNAKE;
-#endif
-
-	if( system_status.family == FAMILY_CTR )
-	{
-		system_status.LCD_is_CGS = true;
-	}
-	else
-	{
-		// FAMILY_SPFL or FAMILY_SNAKE		// �A�����t�@�X�������Y���Ȃ�
-		system_status.LCD_is_CGS = false;
-	}
-
-	if( system_status.LCD_is_CGS == true )
-	{
-		pm_reg_bit_vddlcd = PM_REG_BIT_VDDLCD_CGS;
-	}
-	else
-	{
-		pm_reg_bit_vddlcd = PM_REG_BIT_VDDLCD_AMO;
-	}
-	set_vdd_voltages( system_status.family );
-
-	// ��CTR�����̊J���@�� //
-	// �ꉞ������
-	system_status.is_dev = false;
-	system_status.taikendai = false;
-	system_status.taikendai_nbd = false;
-
-	switch( DIPSW )
-	{
-		case DIPSW_TAIKENDAI:
-			system_status.taikendai = true;
-			break;
-
-		case DIPSW_TAIKENDAI_NBD:
-			system_status.taikendai_nbd = true;
-			break;
-
-		case DIPSW_ISDEV:
-	        system_status.is_dev = true;
-			break;
-	}
-#ifdef _FORCE_TAIKENDAI_
-	system_status.taikendai = true;
-#endif
-
-#ifdef _FORCE_TAIKENDAI_NBD_
-	system_status.taikendai_nbd = true;
-#endif
-}
-
-
-
-
-/********************************************//**
- �ŏ����̃��W�X�^���������s���܂��B
- 
- �g�ݍ��݃X�^�[�g�A�b�v���[�`������Ă΂�܂��B
- ***********************************************/
-void hdwinit( void )
-{                               // �X�^�[�g�A�b�v���[�`��������ɌĂт܂�
-    DI(  );                     /* �}�X�^���荞�݋֎~ */
-
-    CMC = bits8(0,0,0,1, 0,0,0,0);          /* X1���U����(���̓|�[�g)�AXT1�g�p�A����d�͔��U�͕s����ɕt���ʏ�� */
-    CSC = bits8(1,0,0,0, 0,0,0,0);          /* X1���U�Ȃ��AXT1���U����A�����������U���� */
-	OSMC = bits8(0,0,0,0, 0,0,0,1);         /* �B�����W�X�^ */
-	NOP();NOP();NOP();  // 3clk�J����
-    CKC = bits8(0,0,0,0, 1,0,0,0);          /* CPU/���ӃN���b�N=fMAIN�AfMAIN=fMX�AfCLK=fMX */
-
-    /*--- ��d�����o��H�̐ݒ� ---*/
-    /* ���Z�b�g�������̃f�t�H���g�́A�I�v�V�����E�o�C�g�ɂĎw�肳��� */
-    LVIS = 0x00;         /* VLVI = 4.22�}0.1V */
-//  LVIM = 0x00;         /* LVI����֎~ */
-    /* �d���d��(VDD)�����o�d��(VLVI)���Ɋ������� */
-    /* �d���d��(VDD)�����o�d��<VLVI)�A�܂��͓���֎~���ɒ�d�����o */
-}
-
-
-
-/********************************************//**
- �lj��̃��W�X�^���������s���܂��B
- 
- �o���邾�� hdwinit �ɂ͏����Ȃ����j�ł��B
- ***********************************************/
-static void hdwinit2(  )
-{
-	// �|�[�g�ݒ� //
-
-	// ���Z�b�g��̏����l���ۏ؂���Ă���̂͏ȗ�
-    if( system_status.reboot )  // ���Z�b�g�s�������͂����ɃZ�b�g����
-    {
-        P0  = bits8(0,0,0,0, 0,0,1,1);  // -,-,-,-, -,-,/reset2,/reset1
-        P3  = bits8(0,0,0,0, 1,1,1,1);  // -,-,-,-, i2c_pu,scl_m,sda_m,/fcr_rst		// �Ȉ�I2C�͏o�̓��b�`��1�ɂ���
-    }
-    else
-    {
-		// ���Z�b�g��̏����l0���ۏ؂���Ă���̂͏ȗ�
-//      P0  = bits8(0,0,0,0, 0,0,0,0);  // -,-,-,-, -,-,/reset2,/reset1
-//      P1  = bits8(0,0,0,0, 0,0,0,0);  // bt_temp_p,bt_det_p,led_info_r,led_pow_b led_info_g,32khz_o,led_wifi,led_info_b
-//      P2  = bits8(0,0,0,0, 0,0,0,0);  // ad_vol,ad_3d,acc_int1,led_chg, (sw_sel),(-),(-),(ext_vdd33)
-        P3  = bits8(0,0,0,0, 1,1,1,0);  // -,-,-,-, i2c_pu,scl_m,sda_m,/fcr_rst		// �Ȉ�I2C�͏o�̓��b�`��1�ɂ���
-//      P6  = bits8(0,0,0,0, 0,0,0,0);  // -,-,-,-, -,-,sda2,scl2
-//      P7  = bits8(0,0,0,0, 0,0,0,0);  // slp_o,/irq,led_cam,sw_wifi, sw_pow,pm_irw,shell_close,/extdc
-//      P12 = bits8(0,0,0,0, 0,0,0,0);  // -,-,-,xtal, xtal,dip(�@�픻��)[1,0],slp_i
-//      P14 = bits8(0,0,0,0, 0,0,0,0);  // -,-,-,-, -,-,i2c_pu,i2c_pu				// i2c_pu�̃|�[�g�ݒ�͂����Ɛ�p�֐����g���ď��ԂɁB
-//      P15 = bits8(0,0,0,0, 0,0,0,0);  // -,-,-,-, -,-,ad_bt_det,ad_bt_temp		// AD�͂ǂ����ł�
-//      P20 = bits8(0,0,0,0, 0,0,0,0);  // -,-,accel2,sw_home, wl_tx,amoled_hv,sda1,sda2�B	// spfl reboot���̉t���d���̃P�A�͌�ق�
-
-        /*--- �^�C�}�E�A���C�E���j�b�g�̓����~ ---*/
-//      TAU0EN = 0;                 /* �^�C�}�E�A���C�E���j�b�g�ւ̃N���b�N������~ */
-        TT0 = 0x00ff;               /* �S�^�C�}�E�`���l���̓����~ */
-
-        /*--- RTC�̓����~ ---*/
-        // �ʓr�������֐�
-    }
-
-    P4  = bits8(0,0,0,0, 1,0,0,0);  // -,-,-,-, /chg_en, led_pow_r, dipsw[1,0]
-    P5  = bits8(0,0,0,0, 1,0,0,0);  // -,-,-,-, i2c_pu,led_3d,/chg,/gyro_cs
-
-    /*--- ���荞�ݐݒ� ---------*/
-//    IF0 = 0x0000;               /* ���荞�ݗv���t���O�N���A */
-//    IF1 = 0x0000;
-//    IF2 = 0x0000;
-//    MK0 = 0xFFFF;               /* ���荞�݋֎~ */
-//    MK1 = 0xFFFF;
-//    MK2 = 0xFFFF;
-
-
-//  PM0  = bits8(1,1,1,1, 1,1,1,1);     // BSR�}�C�R���ł́Areset1�͊Ď��݂̂ɂȂ�B
-    PM1  = bits8(0,0,0,0, 0,0,0,0);
-    PM2  = bits8(1,1,1,0, 1,0,0,1);
-    PM3  = bits8(1,1,1,1, 1,0,0,0);     // P31,32�͊Ȉ�I2C
-    PM4  = bits8(1,1,1,1, 0,0,1,1);
-    PM5  = bits8(1,1,1,1, 1,0,1,0);
-    PM6  = bits8(1,1,1,1, 1,1,0,0);		// I2C�̃��C����L�o�͂ɂȂ��Ă��܂����A�V�X�e����OFF�Ȃ̂ł��܂�Ȃ�
-    PM7  = bits8(0,1,0,1, 1,1,1,1);
-//    PM12 = bits8(1,1,1,1, 1,1,1,1);	// 32kHz�N���b�N�̃s���ݒ�͂ǂ����ł��悢
-    PM14 = bits8(1,1,1,1, 1,1,0,0);
-//    PM15 = bits8(1,1,1,1, 1,1,1,1);
-    PM20 = bits8(1,1,1,1, 1,0,0,0);		// p20.2�͂�������O��L�ɂ��Ă�������
-
-    PU20 = bits8(0,0,0,1, 0,0,0,1);
-//  PU0  = bits8(0,0,0,0, 0,0,0,0);		// �o�b�e���F�،�ɂ��ꂼ��Z�b�g
-//  PU1  = bits8(0,0,0,0, 0,0,0,0);
-//  PU3  = bits8(0,0,0,0, 0,0,0,0);		// �O���Ńv���A�b�v���Ȃ��Ƌ�������BCPU���v���A�b�v����
-//  PU4  = bits8(0,0,0,0, 0,0,0,0);		// �O���Ńv���A�b�v���Ăق���tool0,1)
-    PU5  = bits8(0,0,0,0, 0,0,1,0);
-    PU7  = bits8(0,0,0,1, 1,0,0,1);		 // irq(7.6)cpu��pu
-//  PU12 = bits8(0,0,0,0, 0,0,0,0);
-//  PU14 = bits8(0,0,0,0, 0,0,0,0);
-
-    // �|�[�g���̓��[�h�E���W�X�^�ݒ� /////////////////////
-    // [0:�ʏ���̓o�b�t�@ 1:TTL���̓o�b�t�@]
-//  PIM3 = bits8(0,0,0,0, 0,0,0,0);
-//  PIM7 = bits8(0,0,0,0, 0,0,0,0);
-
-    // �|�[�g�o�̓��[�h�E���W�X�^�ݒ�
-    // [0:�ʏ�o�̓��[�h 1:N-ch�I�[�v���E�h���[���o��]
-    POM3 = bits8(0,0,0,0, 0,1,1,0);
-//  POM7 = bits8(0,0,0,0, 0,0,0,0);
-
-    /* ���荞�ݗD�揇�ʁA�S�Ē��(LV3) */
-//  PR00 = 0xFFFF;
-//  PR01 = 0xFFFF;
-//  PR10 = 0xFFFF;
-    PR11 = 0xFFFE;
-//  PR02 = 0xFFFF;
-//  PR12 = 0xFFFF;
-
-    /*--- �O�������̗L���G�b�W�ݒ� ---*/
-    EGP0 = bits8(0,0,1,1, 0,0,0,1);
-    EGN0 = bits8(0,1,1,1, 0,0,0,0);
-    EGP2 = bits8(0,0,0,0, 1,0,1,0);
-//    EGN2 = bits8(0,0,0,0, 0,0,0,0);
-
-    /*--- �L�[���荞�ݐݒ� ---*/
-//  KRM = bits8(0,0,0,0, 0,0,0,0);          /* �S�L�[���荞�ݐM�������o���Ȃ� */
-
-    /*--- ADC�̓����~ ---*/
-//  ADCEN = 0;                  /* ADC�ւ̃N���b�N������~ */
-//  ADM  = bits8(0,0,0,0, 0,0,0,0);          /* �ϊ������~ */
-
-    /*--- �V���A���E�A���C�E���j�b�g�̓����~ ---*/
-//  SAU0EN = 0;                 /* �V���A���E�A���C�E���j�b�g0�ւ̃N���b�N������~ */
-    SCR00 = 0x0087;             /* �e�`�����l���̒ʐM�֎~ */
-    SCR01 = 0x0087;
-    SCR02 = 0x0087;
-    SCR03 = 0x0087;
-
-    // IIC�̓����~
-//  IICA0EN = 0;                /* IICA0(CTR)�ւ̃N���b�N������~ */
-//  IICCTL00 = 0x00;            /* IICA1�����~ */
-//  IICA1EN = 0;                // IICA1(TWL)�ւ̃N���b�N������~
-//  IICCTL01 = 0x00;            // IICA1�����~
-
-    /*--- DMA�̓����~ ---*/
-//  DRC0 = bits8(0,0,0,0, 0,0,0,0);         /* DMA�`���l��0�̓���֎~ */
-//  DRC1 = bits8(0,0,0,0, 0,0,0,0);         /* DMA�`���l��1�̓���֎~ */
-
-    /*--- �N���b�N�o��/�u�U�[�o�͒�~ ---*/
-//  CKS0 = bits8(0,0,0,0, 0,0,0,0);
-//  CKS1 = bits8(0,0,0,0, 0,0,0,0);
-}
-
diff --git a/branches/2.2A_SDK5(4thNUP)/loader.h b/branches/2.2A_SDK5(4thNUP)/loader.h
deleted file mode 100644
index 4561c3f..0000000
--- a/branches/2.2A_SDK5(4thNUP)/loader.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _loader_h_
-#define _loader_h_
-
-
-#endif
-
diff --git a/branches/2.2A_SDK5(4thNUP)/magic.c b/branches/2.2A_SDK5(4thNUP)/magic.c
deleted file mode 100644
index 5cf42fa..0000000
--- a/branches/2.2A_SDK5(4thNUP)/magic.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/********************************************//**
- magic.c
- 
- �r���h�����𖄂ߍ��݂܂��B
-
- �r���h�̓x�ɍX�V�����悤�ɂ���K�v������܂��B(touch)
-
- $Id$
- ***********************************************/
-#include "magic.h"
-#include "config.h"
-
-#ifndef _WIN32
-
-#pragma section @@CNSTL MGC_LOAD AT 0x0FF6
-__far const unsigned char MGC_LOADd[] = __TIME__;
-
-#ifdef _firm_format_v3_
-#pragma section @@CNST MGC_MIMI AT 0x2000
-const unsigned char MGC_HEADdN[] = __TIME__;
-
-#else
-#pragma section @@CNST MGC_MIM2 AT 0x2100
-const unsigned char MGC_HEADd[] = __TIME__;
-#endif
-
-#pragma section @@CNST MGC_TAIL AT 0x4FF6
-const unsigned char MGC_TAILd[] = __TIME__;
-
-#pragma section @@CNST MGC_VER AT 0x4FF4
-const unsigned char MCU_VER[2] = { MCU_VER_MAJOR +'0', MCU_VER_MINOR +'0' };
-
-#endif
diff --git a/branches/2.2A_SDK5(4thNUP)/magic.h b/branches/2.2A_SDK5(4thNUP)/magic.h
deleted file mode 100644
index b80bfb2..0000000
--- a/branches/2.2A_SDK5(4thNUP)/magic.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef _magic_h_
-
-#define _magic_h_
-
-// magic.c �̋L�q�ƈ��Ȃ��悤�ɒ��ӁI
-#define MGC_LOAD   0x0FF6
-#define MGC_FOOT   0x4FF6
-
-#ifdef _firm_format_v3_
-#define MGC_HEAD   0x2000
-#else
-#define MGC_HEAD   0x2100
-#endif
-
-#define MGC_LOAD_BKUP   0x1FF6
-#define MGC_FOOT_BKUP   0x7FF6
-
-#ifdef _firm_format_v3_
-#define MGC_HEAD_BKUP  0x5000
-#else
-#define MGC_HEAD_BKUP   0x5100
-#endif
-
-#endif
diff --git a/branches/2.2A_SDK5(4thNUP)/main.c b/branches/2.2A_SDK5(4thNUP)/main.c
deleted file mode 100644
index e1125a0..0000000
--- a/branches/2.2A_SDK5(4thNUP)/main.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/* ========================================================
-  MCU CTR BSR
-                                       2008- nintendo
-                                       �J���Z�p���@���c
-  $Id$
- ======================================================== */
-
-
-// ========================================================
-//#include "incs_loader.h"
-#include "incs.h"
-
-//#include "WDT.h"
-#include "rtc.h"
-#include "pm.h"
-#include "accero.h"
-#include "led.h"
-#include "adc.h"
-#include "i2c_mcu.h"
-#include "pool.h"
-
-
-// ========================================================
-system_status_ system_status;
-uni_pool pool;
-bit force_off;
-
-#ifdef i2c_timeout_test
-bit i2c_mcu_time_out_error;      // I2C�����炩�ŋl�܂����B���I�ȂNJ܂ށB
-extern void i2c_mcu_error_monitor();
-#endif
-
-extern bit pm_extdc_old;
-
-/********************************************//**
- ���C�����[�v�ł��B
- 
- �{���̃G���g���֐��� loader.c �ɂ���܂�
- 
- - �y���t�F�����EI2C���W�X�^�̏������A
- - ���u�[�g����
- 
- ���s���A�^�X�N�V�X�e�����񂵂܂��B
- ***********************************************/
-void main_loop( void )
-{
-    renge_init(  );
-
-#ifdef i2c_timeout_test
-    i2c_mcu_time_out_error = false;
-#endif
-    iic_mcu_start(  );
-
-    EI(  );
-
-    BT_chk();
-
-    system_status.pwr_state = OFF_TRIG;
-    // ���u�[�g����
-    if( system_status.reboot )
-    {
-        // �{�̓d��on�Ȃ�Aon���p��������
-        if( PM_chk_LDSW() )
-        {
-            system_status.pwr_state = ON_TRIG;
-        }
-        vreg_ctr[VREG_C_BT_REMAIN] = 100;
-        pm_extdc_old = PM_EXTDC_n_RAW;			// ���u�[�g���A�[�dLED���O��̏�Ԃ𑱂���悤��
-    }
-    else
-    {
-        pm_extdc_old = ~PM_EXTDC_n_RAW;			// �A�_�v�^��POR���ɓ_���邽�߁B
-    }
-
-    vreg_ctr_init(  );
-
-    clear_hosu_hist(); // �����N���A
-
-    renge_task_interval_run_force = true;
-
-    RTCIMK = 0;                 /* ���荞��(�A���[��&�C���^�[�o��)���� */
-
-    // ���C�����[�v //
-    while( 1 )
-    {                           // �V�X�e��tick�A�܂��͊��荞�݂ʼn��܂��B
-        renge_task_interval_run(  );    // �����ŁA�V�X�e��tick�܂��͋����N�����܂�
-        renge_task_immed_run();
-#ifdef i2c_timeout_test
-        if( i2c_mcu_time_out_error )
-        {
-            i2c_mcu_error_monitor();
-        }
-#endif
-        HALT(  );
-    }
-}
-
-
-
diff --git a/branches/2.2A_SDK5(4thNUP)/nec_s_2_bsrbin2.rb b/branches/2.2A_SDK5(4thNUP)/nec_s_2_bsrbin2.rb
deleted file mode 100755
index c4c33fa..0000000
--- a/branches/2.2A_SDK5(4thNUP)/nec_s_2_bsrbin2.rb
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/usr/bin/ruby
-$KCODE = "S"
-=begin
-
-�@NEC�̊‹����f��������SREC���A
-�@�@�����w�蕔���ɂ�0xFF�p�f�B���O���A
-�@�@��BSR�̃A�b�v�f�[�g�p�ɕK�v�ȕ��������؂�o���܂��B
-�@�@�@�@�@�@�@�@�@�@�@�@�i0x0000 - 0x0FFF, 0x2000-0x47FF�j
-
-=end
-
-
-=begin
-if( ARGV[0] == nil )
-  print( "input file name is nessesary!\nabort.\n" )
-  exit(1)
-end
-
-
-unless(File.exist?( ARGV[0] ))
-  print( "file" << ARGV[0] << " not found.\nabort.\n" )
-  exit(1)
-end
-=end
-
-src = File.open( 'bsr.hex' )
-
-dest = File.new( "hoge.bin","wb" )
-
-
-dest.write( 'jhl' )
-
-### get data ##########################
-src_in = Hash.new 
-tempA = Array.new
-dataTemp = Array.new
-
-offset = Numeric.new
-bindata = Array.new( 32*1024, 0xFF )
-
-while(src.readline)
-  tempA = $_.scan(/(\:)(\w\w)(\w\w\w\w)(\w\w)(\w+)(\w\w)/)
-
-  break if( tempA.size == 0 )
-  
-  src_in = { "len" => tempA[0][1], "offset" => tempA[0][2], "type" => tempA[0][3], "data" => tempA[0][4], "CRC" => tempA[0][5] }
-
-  break if src_in["type"].hex == 01
-  break if src_in["len"].hex == 00
-  #  next if  src_in["type"].hex != 00
-  if( src_in["type"].hex != 00 )
-#    p dat
-    next
-  end
-
-  offset = src_in["offset"].hex
-  next if(( 0x1000 <= offset ) && ( offset < 0x2000 ))
-
-  dataTemp = src_in["data"].scan(/\w\w/)
-
-  ( 0...(src_in["len"].to_s.hex) ).each{|i|
-    bindata[ offset + i ] = ( dataTemp[ i ] ).to_s.hex
-  }
-end
-
-### debug enable bit check #############
-# �f�o�b�O���‚ɂȂ��Ă����IS�f�o�b�K�ŋN�����Ȃ��iMCU�����삵�Ȃ��j
-p bindata[0xC3]
-if( bindata[0xC3] != 0x04 )
-  print( "!E debug enable!!" )
-  exit( 1 )
-end
-
-
-### format data and output #############
-4096.times{
-  bindata.delete_at(4096)
-}
-dest.write( bindata[0..(0x4FFF - 0x1000)].pack("c*") )
-dest.close
-
-printf( "intel-HEX to bsr bin converter\n file converted!\n\n" )
diff --git a/branches/2.2A_SDK5(4thNUP)/pedo_alg_thre_det2.c b/branches/2.2A_SDK5(4thNUP)/pedo_alg_thre_det2.c
deleted file mode 100644
index 4e69a04..0000000
--- a/branches/2.2A_SDK5(4thNUP)/pedo_alg_thre_det2.c
+++ /dev/null
@@ -1,567 +0,0 @@
-/* ********************************************************
- �����v
- 
- 3�������x�̃��A���^�C���f�[�^����A�x�N�g���̃m�������o���A
- 臒l�𒴂��鎞�ԁA�Ԋu�A�m�����̑傫����臒l��؂�ւ���Ȃ�
- 
- $Id$
-********************************************************* */
-#ifndef _WIN32
-
-#pragma mul
-#pragma div
-#pragma bcd
-
-#endif
-
-#include "incs.h"
-
-#ifndef _WIN32
-#include <math.h>
-#endif
-
-#include "accero.h"
-#include "pedometer.h"
-
-#include "pool.h"
-
-// ========================================================
-// �����̍ŏI�L�^����
-//  ���̏��Ԃ̓��O�ǂݏo���̏��Ԃł�����̂ł�����Ȃ��ł�
-//  ���ԂɃA�h���X�̎Ⴂ�̂���m�ۂ����̂����҂��Ă܂�...
-typedef struct{
-    u8 hour_bcd;
-    u8 day_bcd;
-	u8 month_bcd;
-	u8 year_bcd;
-	u8 min_bcd;
-	u8 sec_bcd;
-}st_calender;
-
-
-
-// ========================================================
-static u16 get_long_hour();
-static u16 calc_hours_spend( u8 );
-
-
-
-// ========================================================
-bit pedolog_overflow;           // 192���ԋL�^�ς݃t���O(i2c�œǂ߂�)
-extern uni_pool pool;           // �������O�͂��̍\���̂̒�
-static u8 p_record;             // ���O�̏������݈ʒu
-static st_calender cal_log_latest; // �Ō�ɕ������X�V��������
-static u16 last_hour_fny;       // fny:from new year
-static st_calender cal_temp;
-static u16 now_longhour;
-
-
-
-
-
-
-// ========================================================
-#define _use_my_sqrt_
-#ifdef _use_my_sqrt_
-static unsigned long my_sqrt( unsigned long );
-#endif
-
-// ���N�͉[�N�H
-#define is_leapyear( y )  (( y & 0x03 ) == 0 )
-// �u���N�v�͉[�N�H
-#define is_firstyear( y ) (( y & 0x03 ) == 1 )
-
-
-// �����x�Z���T�l��FIR-LPF�ɒʂ��B����̌W��
-extern const s8 lpf_coeff[];
-#define TAP 64
-#define FIL_COEFF_QUANT 10
-
-
-/********************************************//**
-�@�����v
- ***********************************************/
-void pedometer()
-{
-    static s16 th_H = 15000; // 臒l�B���I�ύX���܂�
-    static s16 th_L = 11000;
-    static u16 acc_norm[3]; // �����x�̑傫���̃q�X�g���B�������傫�������Â�
-    static u16 acc_norm_temp;
-    static u8 interval_hh = 0xFF;  // �R-�R�Ԃ̎��ԁB�Z�߂�����͂����B
-    static u8 time_l;       // �O��̋ɏ�����̌o�ߎ���
-    static u16 peak_l;      // �J�̐[��
-    static u16 norm_hist[TAP];
-
-    static u8 hist_indx;
-
-    signed long filterd;
-
-    u8 i;
-
-    u16 sx16,sy16,sz16;
-
-	DI_wt_chk();
-	sx16 = abs( (u16)vreg_ctr[VREG_C_ACC_XH] * 256 + vreg_ctr[VREG_C_ACC_XL] );
-    sy16 = abs( (u16)vreg_ctr[VREG_C_ACC_YH] * 256 + vreg_ctr[VREG_C_ACC_YL] );
-    sz16 = abs( (u16)vreg_ctr[VREG_C_ACC_ZH] * 256 + vreg_ctr[VREG_C_ACC_ZL] );
-	EI();
-
-    // �x�N�g���̃m����
-#ifdef _mcu_
-# ifndef _use_my_sqrt_
-    norm_hist[ hist_indx & TAP-1 ] = sqrt( (long)sx16 * ( sx16 / 2 ) +
-                                           (long)sy16 * ( sy16 / 2 ) +
-                                           (long)sz16 * ( sz16 / 2 )
-                                           );
-# else
-    norm_hist[ hist_indx & TAP-1 ] = my_sqrt( (long)sx16 * ( sx16 / 2 ) +
-                                              (long)sy16 * ( sy16 / 2 ) +
-                                              (long)sz16 * ( sz16 / 2 )
-                                              );
-# endif
-#endif
-
-#ifdef _pc_
-    norm_hist[ hist_indx & TAP-1 ] = normh * 256 + norml;
-#endif
-
-    hist_indx ++;
-
-    // �q�X�g���Ƀt�B���^(fir)���|���āA����̒l�����߂� //
-    filterd = 0;
-//    for( i = 8; i != 55; i++ )  // �W�����O�΂���̂���
-    for( i = 0; i != 46; i++ )  // �W���e�[�u����������܂����B�p�����[�^����������
-    {
-        filterd += (signed long)norm_hist[ ( hist_indx + i ) & TAP-1 ] * lpf_coeff[ i ];
-    }
-
-    filterd += (4096)*512;      // DC�����Z...�������Ǝv��
-    acc_norm_temp = (s16)( filterd /1024 & 0xFFFF ); // ��FIL_COEFF_QUANT���琳�K��
-/*
-    if( acc_norm[0] < acc_norm_temp )
-    {
-        t_rise ++;
-        if( t_rise == 0 )
-            t_rise == 254;
-    }
-    else
-    {
-        t_rise = 0;
-    }
-*/
-    if( acc_norm[0] != acc_norm_temp )
-    {
-        acc_norm[2] = acc_norm[1];  // �q�X�g��
-        acc_norm[1] = acc_norm[0];
-        acc_norm[0] = acc_norm_temp;
-    }
-
-    if( acc_norm[2] <= acc_norm[1] && acc_norm[1] > acc_norm[0]
-        && acc_norm[0] > th_H )
-        // �ɑ�ŁA臒l�𒴂��Ă���
-    {
-        if( 21 < interval_hh )
-            // �O��̋ɑ傩��̊Ԋu���قǂ悢
-        {
-            if(( interval_hh < 160 ) && ( time_l < interval_hh ))
-                // �J������ł���
-            {
-                if( acc_norm[0] - peak_l > 4200 ){
-                    // ����������܂���
-                    hosu_increment_if_necessary();
-                }
-            }
-            interval_hh = 0;
-        }
-        // �Ȃ񂿂����臒l�̓��I�ύX
-        if( acc_norm[0] > 18000 )
-        {
-            th_L = acc_norm[0] - 10000;
-        }
-        else
-        {
-            th_L = 11000;
-        }
-    }
-    else
-    {
-		if( interval_hh != 255 )	 // �O�a���Z���Ċy�ɏ������炢���̂�
-		{
-			interval_hh ++;
-		}
-    }
-
-    // (2) ���߂̋ɏ�����̎���
-    if( acc_norm[2] >= acc_norm[1] && acc_norm[1] < acc_norm[0]
-        && acc_norm[0] < th_L )
-    {
-        // �ɏ������o
-        time_l = 0;
-        peak_l = acc_norm[0];
-    }
-    else
-    {
-		if( time_l != 255 )
-		{
-			time_l ++;
-		}
-    }
-}
-
-
-/********************************************//**
-�@�����{�P
-
- - �ݐς��C���N�������g
- - �������X�V
-
-   *2011/01/20
-
-	�d�l�ύX�@���O�������ς��ɂȂ����炻���Ŏ~�߂�
- ***********************************************/
-#define HOSU_NODATA 0xFFFF
-#define HOSU_MAX    0xFFFE
-
-void hosu_increment_if_necessary()
-{
-    u8 year_compd;               // hour���E�␳�ς݌��ݔN�Bcomp(ensation -ed)
-
-	// ���ݎ����擾
-    DI_wt_chk();
-    RWAIT = 1;
-    while( !RWST ){;}
-
-    cal_temp.hour_bcd  = HOUR;
-    cal_temp.day_bcd   = DAY;
-    cal_temp.month_bcd = MONTH;
-    cal_temp.year_bcd  = YEAR;
-    cal_temp.min_bcd   = MIN;
-    cal_temp.sec_bcd   = SEC;
-    
-    RWAIT = 0;
-    EI();
-    
-    year_compd = bcdtob( cal_temp.year_bcd );
-
-    now_longhour = get_long_hour();
-
-	// �������݃|�C���^�̍X�V
-    if( ! ( vreg_ctr[ VREG_C_ACC_HOSU_L ] == 0 &&  // �����von��A�ŏ��̈���܂ł͑O�񂩂�̌o�ߎ��Ԃ��v�Z���Ȃ�
-            vreg_ctr[ VREG_C_ACC_HOSU_M ] == 0 &&
-            vreg_ctr[ VREG_C_ACC_HOSU_H ] == 0 ))  //. �S�r�b�gOR�Ń[�����肷��̂̓f�W�^����H���̕����݂���
-	{
-		// �����v���~�܂��Ă������Ԃ��l�����ĕK�v�Ȃ�i�߂�
-        // �␳�v�Z�@���U�뎞��ō�������ɂȂ����ꍇ�A��A����23����ɏ㏑��
-        if( now_longhour == (u16)-1 ) // ��N��A����23���䈵���̂Ƃ��A�v�Z���ʂ� -1 �ɂȂ��Ă�
-        {
-            now_longhour = 365 * 24 -1;
-			if( is_firstyear(year_compd) )
-			{
-				now_longhour += 24;
-			}
-            year_compd --;
-        }
-        fill_hosu_hist_hours( calc_hours_spend( year_compd ) );  // ���������݃|�C���^�̍X�V���s��
-
-		// ���O���ӂ�ŋL�^��~�H
-		if( pedolog_overflow )
-		{
-			return;
-            // �����܂��B���O�̍X�V���Ȃ��B
-		}
-	}
-
-	// �C���N�������g���ėǂ�
-    cal_log_latest = cal_temp;  // �����O�����X�V
-    last_hour_fny  = now_longhour;
-
-	// �������O�@�C���N�������g
-	if( pool.vreg_c_ext.pedo_log[ p_record ] == HOSU_MAX )
-	{
-		// �������Ȃ��ł����܂�
-		//. ���v�̍��v�Ɨ݌v������Ȃ��Ȃ�̂�����邽�߂��낤���ǁA�ǂ��Ȃ́H
-		return;
-	}
-	else if( pool.vreg_c_ext.pedo_log[ p_record ] == HOSU_NODATA )   // ���̎��ԑэŏ��̃J�E���g�̎�
-    {															//  ���ꂵ�Ȃ���1������Ȃ�
-        pool.vreg_c_ext.pedo_log[ p_record ] = 1;
-    }
-    else 
-	{
-		// �ʏ�p�X
-        pool.vreg_c_ext.pedo_log[ p_record ] ++;
-	}
-
-	// �ݐς̍X�V //
-	DI_wt_chk();
-	if( ++vreg_ctr[ VREG_C_ACC_HOSU_L ] == 0 )		// �J���X�g�`�F�b�N
-	{
-		if( ++vreg_ctr[ VREG_C_ACC_HOSU_M ] == 0 )
-		{
-			if( ++vreg_ctr[ VREG_C_ACC_HOSU_H ] == 0 ){
-				vreg_ctr[ VREG_C_ACC_HOSU_L ] = 255; //. ���낢�뎸�s��������...
-				vreg_ctr[ VREG_C_ACC_HOSU_M ] = 255;
-				vreg_ctr[ VREG_C_ACC_HOSU_H ] = 255;
-			}
-		}
-    }
-	EI();
-}
-
-
-/********************************************//**
-�󔒂̎��Ԃ�K�؂�0�ɂ��āA
-�����܂ނP���Ԃ̃f�[�^�������ʒu�Ƀ|�C���^�H��i�߂�
- ***********************************************/
-static void fill_hosu_hist_hours( u16 hours )
-{
-	// ���O���ӂ�H
-	if( (u16)p_record + hours >= PEDOMETER_LOG_SIZE ) 
-	{
-		pedolog_overflow = true;
-		return;
-	}
-
-	// �󔒂̐����Ԃ̐ݒ�
-    while( hours != 0 )
-    {
-		// �V�d�l�@�����ς��Œ�~
-	    p_record ++;
-#if 1	// debug
-		if( p_record >= PEDOMETER_LOG_SIZE )
-        {
-			pedolog_overflow = true;
-//			dbg_nop();  // �����ɗ���悤���ƃo�O
-			break;
-        }
-		else
-#endif
-		{
-	        pool.vreg_c_ext.pedo_log[ p_record ] = 0;
-		}
-        hours --;
-    }
-
-	return;
-}
-
-
-
-/********************************************//**
-�������N���A�A�������u�f�[�^�����v�ɏ�����
- ***********************************************/
-void clear_hosu_hist()
-{
-    u8 hours = PEDOMETER_LOG_SIZE;
-    do
-    {
-        hours --;
-        pool.vreg_c_ext.pedo_log[ hours ] = 0xFFFF;
-    }
-    while( hours != 0 );
-
-	DI_wt_chk();
-	vreg_ctr[ VREG_C_ACC_HOSU_L ] = 0;
-    vreg_ctr[ VREG_C_ACC_HOSU_M ] = 0;
-    vreg_ctr[ VREG_C_ACC_HOSU_H ] = 0;
-    p_record = 0;
-	pedolog_overflow = false;
-	EI();
-}
-
-
-extern u8 iic_burst_state;
-bit pedolog_read_msb;
-/********************************************//**
-  �����v�̃q�X�g����Ԃ��B
-
-  �P��Ăԓx�ɁA�q�X�g���̉��ʁA��ʁA�ꎞ�ԑk���ĉ��ʏ��...
- ***********************************************/
-u8 hosu_read(  )
-{
-    u8 rv;
-    static u8 p_record_buffer;
-    static st_calender cal_buff;	// �ꉞ�A�A�g�~�b�N������
-
-    if( iic_burst_state == 0 )
-    {
-		p_record_buffer = p_record;
-		DI_wt_chk();
-		cal_buff = cal_log_latest;
-		EI();
-    }
-
-    if( iic_burst_state <= 5 )
-    {
-        rv = *( (u8*)&cal_buff + iic_burst_state );  // ��������
-        iic_burst_state ++;
-        return( rv );
-    }
-    else
-    {
-        u16 temp;
-        // 16�r�b�g�ŋL�^���Ă���̂ł΂炵�đ��� /// �����Ɗy������@������񂶂�
-        temp = pool.vreg_c_ext.pedo_log[ p_record_buffer ];
-        if( !pedolog_read_msb  )
-        {
-            rv = (u8)( temp & 0x00FF );
-        }
-        else
-        {
-            rv = (u8)(( temp >> 8 ) & 0x00FF );
-            if( p_record_buffer == 0 )
-            {
-                p_record_buffer = PEDOMETER_LOG_SIZE-1;
-            }
-            else
-            {
-                p_record_buffer --;
-            }
-        }
-        pedolog_read_msb ^= 1;
-        return( rv );
-    }
-
-}
-
-
-
-/********************************************//**
-  ���N�̌��U����̌o�ߎ���(hour)��Ԃ��B
-
-  ����  ����
-
-  �Ԓl  u16 long_hour
- ***********************************************/
-const u16 DAYS_FROM_HNY[] = {
-    0,
-    31,
-    31+28,  // =59�B�@�c�R���O���͂P���T�X��
-    31+28+31,
-    31+28+31+30,
-    31+28+31+30+31,
-    31+28+31+30+31+30,
-    31+28+31+30+31+30+31,
-    31+28+31+30+31+30+31+31,
-    31+28+31+30+31+30+31+31+30,
-    31+28+31+30+31+30+31+31+30+31,
-    31+28+31+30+31+30+31+31+30+31+30
-    };
-
-static u16 get_long_hour()
-{
-    u8 year    = bcdtob( cal_temp.year_bcd );
-    u8 month   = bcdtob( cal_temp.month_bcd );
-    u8 day     = bcdtob( cal_temp.day_bcd );
-    u8 hour    = bcdtob( cal_temp.hour_bcd );
-    u8 min_bcd = cal_temp.min_bcd; // �召��r�������Ȃ��̂�bcd�̂܂܂ł悢
-    u8 sec_bcd = cal_temp.sec_bcd;
-    u16 long_hour;
-
-    // �܂������̕���
-    long_hour = DAYS_FROM_HNY[ month -1 ]; // -1�̓C���f�b�N�X���킹
-    if( is_leapyear(year) && ( 3 <= month ))
-    {
-        // �[�N�ŁA�[������
-        long_hour ++;
-    }
-    long_hour += day - 1;
-    long_hour *= 24; // ����������
-
-    long_hour += hour;
-
-    // ���E�����E�̑O�H��H
-    if( ( min_bcd > vreg_ctr[ VREG_C_ACC_HOSU_HOUR_BOUNDARY ] )
-        || ( ( min_bcd >= vreg_ctr[ VREG_C_ACC_HOSU_HOUR_BOUNDARY ] )
-                && ( sec_bcd >= vreg_ctr[ VREG_C_ACC_HOSU_HOUR_BOUNDARY_SEC ] ))
-        )
-    {
-        return( long_hour );
-    }
-    else
-    {
-        return( long_hour -1 );  // 1���ԑO�Ɋ܂߂� ���ӁF���U�ō�N�����ɂ���Ƃ��B-1 �ɂȂ�
-    }
-}
-
-
-
-/********************************************//**
-�@�y�ʕ������B
-
-�@�K�v�\���Ȑ��x�őł��؂�
-
-   pc��ŃV�~�����[�V�������đ��v����
- ***********************************************/
-static unsigned long my_sqrt(unsigned long x)
-{
-    unsigned long s, t;
-
-    if (x <= 0) return 0;
-
-    s = 1;
-    t = x;
-    while (s < t)
-    {
-        s <<= 1;
-        t >>= 1;
-    }
-    do
-    {
-        t = s;
-        s = (x / s + s) >> 1;
-    } while (s < t);
-
-  return t;
-}
-
-
-
-
-/********************************************//**
-�@��‚� �O��Ă΂ꂽ�����ƁA���ݎ����̍��������߂�B�Ԃ�̂�fill_hosu_hist_hours �ɂ��̂܂ܓn����
- //. ������year_bcd �Ȃ̂�������Ƃ��₾����...
- ***********************************************/
-static u16 calc_hours_spend( u8 year )
-{
-	u8 cal_log_latest_year = bcdtob( cal_log_latest.year_bcd );
-
-	// �����N�̓�
-    if( cal_log_latest_year == year )
-    {
-        if( now_longhour > last_hour_fny )
-        {
-            return( now_longhour - last_hour_fny );
-        }
-		else if( now_longhour == 0 && last_hour_fny != 0 )
-		{
-			// �N�������΂���ŁA���E���z�������ځB������Ȃ��ƍ�N�Ō�ɉ��Z���Ă��܂��B
-			return( 1 );
-		}
-		else
-		{
-			return( 0 );  // �������ԑ�(�ƁA�����߂�B�@�ǂ��Ȃ��Ă��m��Ȃ�)
-		}
-    }
-    else if( cal_log_latest_year == ( year -1 ) )
-    {
-        // �N���܂����ł���Ƃ�
-		u16 temp = 365 * 24 - last_hour_fny + now_longhour;
-		if( is_firstyear(year) )
-		{
-			temp += 24;
-		}
-		return( temp );
-    }
-    else if( cal_log_latest_year < year )
-    {
-        // ���N���u
-        return( PEDOMETER_LOG_SIZE +1 );
-    }
-    else
-    {
-        // �J�����_�[�������߂�Ȃ�
-        // �m�[�P�A�ł悢�c���A�s��l�Ƃ����킯�ɂ������Ȃ�
-        return( 0 );
-    }
-}
diff --git a/branches/2.2A_SDK5(4thNUP)/pedo_lpf_coeff.c b/branches/2.2A_SDK5(4thNUP)/pedo_lpf_coeff.c
deleted file mode 100644
index 877ef98..0000000
--- a/branches/2.2A_SDK5(4thNUP)/pedo_lpf_coeff.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/********************************************//**
- �����v�Ŏg�p����ALPF�̃t�B���^�W��
- $Id$
- ***********************************************/
-
-#include "incs.h"
-
-// =========================================================
-#define TAP 64
-#define FIL_COEFF_QUANT 10
-const s8 lpf_coeff[]={
-/*
-Window Function Algorithm LPF
-Sampling Frequency =     100.0
-cutoff1 =   6.0000000
-Tap Count =64
-Kaiser Constant =  7.000000
-Quantized by 11 [bits]
- */
-/*         0,// [0]
-         0,
-         0,
-         0,
-         0,
-         0,
-         0,
-         0,
-*/
-         1,// 8
-         2,
-         2,
-         3,
-         3,
-         2,
-         0,
-        -2,
-        -5,// 16
-        -9,
-       -13,
-       -16,
-       -16,
-       -13,
-        -6,
-         4,
-        18,// 24
-        37,
-        56,
-        77,
-        95,
-       110,
-       119,
-       122,
-       119,// 32
-       110,
-        95,
-        77,
-        56,
-        37,
-        18,
-         4,
-        -6,// 40
-       -13,
-       -16,
-       -16,
-       -13,
-        -9,
-        -5,
-        -2,
-         0,// 48
-         2,
-         3,
-         3,
-         2,
-         2,
-         1,
-/*
-         0,
-         0,// 56
-         0,
-         0,
-         0,
-         0,
-         0,
-         0,
-         0
-*/
-};
diff --git a/branches/2.2A_SDK5(4thNUP)/pedo_lpf_coeff.h b/branches/2.2A_SDK5(4thNUP)/pedo_lpf_coeff.h
deleted file mode 100644
index f81d6c2..0000000
--- a/branches/2.2A_SDK5(4thNUP)/pedo_lpf_coeff.h
+++ /dev/null
@@ -1,84 +0,0 @@
-#ifndef _pedo_coeff_h_
-#define _pedo_coeff_h_
-
-// =========================================================
-#define TAP 64
-#define FIL_COEFF_QUANT 10
-const s8 lpf_coeff[]={
-/*
-Window Function Algorithm LPF
-Sampling Frequency =     100.0
-cutoff1 =   6.0000000
-Tap Count =64
-Kaiser Constant =  7.000000
-Quantized by 11 [bits]
- */
-/*         0,// [0]
-         0,
-         0,
-         0,
-         0,
-         0,
-         0,
-         0,
-*/
-         1,// 8
-         2,
-         2,
-         3,
-         3,
-         2,
-         0,
-        -2,
-        -5,// 16
-        -9,
-       -13,
-       -16,
-       -16,
-       -13,
-        -6,
-         4,
-        18,// 24
-        37,
-        56,
-        77,
-        95,
-       110,
-       119,
-       122,
-       119,// 32
-       110,
-        95,
-        77,
-        56,
-        37,
-        18,
-         4,
-        -6,// 40
-       -13,
-       -16,
-       -16,
-       -13,
-        -9,
-        -5,
-        -2,
-         0,// 48
-         2,
-         3,
-         3,
-         2,
-         2,
-         1,
-/*
-         0,
-         0,// 56
-         0,
-         0,
-         0,
-         0,
-         0,
-         0,
-         0
-*/
-};
-#endif
diff --git a/branches/2.2A_SDK5(4thNUP)/pedometer.h b/branches/2.2A_SDK5(4thNUP)/pedometer.h
deleted file mode 100644
index 8760308..0000000
--- a/branches/2.2A_SDK5(4thNUP)/pedometer.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef _pedo_
-#define _pedo_
-
-#ifdef WIN32
-typedef unsigned char bit;
-typedef unsigned char u8;
-typedef unsigned short u16;
-
-
-#endif
-
-
-// =========================================================
-extern bit pedolog_read_msb;
-
-
-
-// =========================================================
-//void hosu_read_end(  );	�}�N����
-#define hosu_read_end()		pedolog_read_msb = 0
-
-u8   hosu_read(  );
-void hosu_increment_if_necessary();
-void fill_hosu_hist_hours( u16 );
-void clear_hosu_hist();
-void pedometer();
-
-
-
-// =========================================================
-#define PEDOMETER_LOG_SIZE ( 24 * 7 )
-
-
-
-// =========================================================
-#endif
diff --git a/branches/2.2A_SDK5(4thNUP)/pm.c b/branches/2.2A_SDK5(4thNUP)/pm.c
deleted file mode 100644
index 0d2d009..0000000
--- a/branches/2.2A_SDK5(4thNUP)/pm.c
+++ /dev/null
@@ -1,1461 +0,0 @@
-/* ========================================================
-  ��PMIC
-    ���c���J�Z
-    nintendo
-    '08 Dec
-    
-     $Id: pm.c 418 2011-09-22 01:35:37Z n2232 $
- ======================================================== */
-#ifndef _WIN32
-
-#pragma nop
-
-#endif
-
-#include "incs.h"
-#include "adc.h"
-#include "led.h"
-#include "pm.h"
-#include "renge\renge.h"
-
-#include "batt_params.h"
-
-#include <fsl.h>
-#include "fsl_user.h"
-
-#include "vreg_twl.h"
-#include "i2c_mcu.h"
-
-// ========================================================
-u8			raw_adc_temperature;
-BT_VENDER	battery_manufacturer = BT_VENDER_NOT_CHECKED;
-static u8	ntr_pm_reg_shadow;                 // NTR PMIC ���W�X�^�~���[
-bit			bt_authorized;               // �o�b�e���p�����[�^���M�ρB�[�d�J�n����
-u8			chg_led_override;            // �A�_�v�^�������Ƃ��A�[�d���邵�Ȃ��Ɋւ�炸���΂炭�_��������
-
-static u16	bt_volt16;
-
-static bit	ntr_pm_bt_low_old;
-
-bit			BT_IN_CHG_delayed_n;
-bit			temp_zone_charge_disable;    // ���x�ŏ[�d��~���鎞�Ƀq�X�e���V�X��t���邽��
-
-u8			pmic_version;
-u8			mgic_version[2];
-
-u8			pm_reg_bit_vddlcd;
-
-static bt_param_*	p_bt_param;
-extern const	bt_param_ bt_param[];
-
-bit			pm_extdc_old;				// �O��A�_�v�^�`�F�b�N�����Ƃ��h�����Ă������H
-
-u8			pmreg_v_core;				// SoC�̃R�A�d���ݒ�BSNAKE(LAGER)�ŕύX�����邽�߁B
-u8			pmreg_v_vdd;				// SNAKE�ł�2.8V���N�����Ȃ��悤�ɂ��邽��
-
-// ========================================================
-static void BT_model_detect();
-static void BT_mgic_quick_start();
-static void BT_mgic_init();
-static void bt_chk_temparature();
-static void bt_get_charge_status();
-static void bt_param_select();
-static void bt_batt_update_twl();
-static void bt_batt_update_ntr();
-static void update_chg_led();
-
-
-// ���b�p�[
-static err send_cmd_mgic_2B( u8 reg, u16 dat );
-static err read_mgic_2B( u8 reg, u8* dat );
-static err read_BT_SOC( u8* dest );
-static err read_BT_voltage( u8* dest );
-static u8 conv_ctr_bt_to_twl_bt();
-
-
-
-// ========================================================
-#define swap_endian_16( x ) (unsigned int)(( x << 8 ) | ( x >> 8 ))
-
-
-
-// ========================================================
-const u8 BT_MANUF_BORDER[] = {
-    5, 33, 79, 123, 158, 197, 233
-    };
-
-
-
-/********************************************//**
-  �d�r�̊Ǘ�
-
-  �ȉ��̃s���͎�ɂ����ő���E�Ď�����܂��B
- - PM_BT_AUTH		����AGPI                  in
- - PM_CHARGE_n		CCIC /CHG                  in
- - PM_EXTDC_n           /DOK          INTP4   in
- - PM_CHARGE_EN_n	     /CEN                  out
-
-  �ȉ��̕��͊֌W���肻���ł����ʂ̂Ƃ���ŊĎ�����Ă��܂��B
- - LED Charge			tsk_LED
- - BT_TEMP,_P			tsk_ADC
-
-  PM_EXTDC�͊��荞�݃��C���ɂ��邩��
- ***********************************************/
-#define INTERVAL_TSK_BATT  60
-// ��100���Ə[�d�G���[���ɂ��܂��_�ł��Ȃ��̂�
-
-/********************************************//**
- �d������̊Ď�
- - �A�_�v�^�̊Ď�
- - �[�d����ALED�X�V
- - �c�ʎ擾�ALED�X�V
- ***********************************************/
-void tsk_batt(  )
-{
-    static u8 task_interval;
-
-    if( task_interval -- != 0 )
-    {
-        return;
-    }
-    else
-    {
-        task_interval = (u8)( INTERVAL_TSK_BATT / SYS_INTERVAL_TICK );
-    }
-
-    // �A�_�v�^�X�e�[�^�X�X�V //
-    pm_chk_adapter();
-
-    // �[�d //
-    bt_chk_temparature();       // ���x�`�F�b�N
-    if( !temp_zone_charge_disable && bt_authorized && !PM_EXTDC_n )
-    {
-        BT_CHG_ENABLE(); // ���x�͈�OK�ŏ[�d�ĊJ
-    }
-    else
-    {
-        BT_CHG_DISABLE(); // ���x�댯�I�@�[�d��~
-    }
-
-    bt_get_charge_status();		// �[�d�󋵃`�F�b�N
-	update_chg_led();			// chg led�X�V
-
-    // �d�r�c�� //
-    BT_get_left();
-}
-
-
-/********************************************//**
-	�[�dLED�X�V
-
-	- CCIC���[�d���Ƃ����Γ_������B
-	- �łȂ��Ă��A�A�_�v�^�h�����΂���Ȃ�5�b�_������
-	- �������A�w�^���d�r�Ή��ʼnR�[�d���̎��A�q���[�Y�؂�iMGIC��NAK�j�Ȃ����
- ***********************************************/
-static void update_chg_led()
-{
-	static bit temp_led_chg;
-	
-	temp_led_chg = false;
-
-	// �A�_�v�^�‚Ȃ����u�ԁA���[�d�ł����b�킴�Ɠ_��������B���d���Ă邱�Ƃ��킩�点�邽�߁B
-	if( chg_led_override != 0 )
-	{
-		chg_led_override --;
-		temp_led_chg = true;
-	}
-
-	// CCIC ���[�d���Ƃ����̂ł���΁A���ꂪ��ԋ���		
-	if( ! BT_IN_CHG_delayed_n )         // bt_get_charge_status()�ōX�V����܂��B
-	{
-		temp_led_chg = true;
-	}
-
-	LED_CHARGE = temp_led_chg;
-
-	// ���W�X�^�̏[�d���r�b�g��LED�ɓ�������
-	set_bit( LED_CHARGE, vreg_ctr[VREG_C_STATUS], REG_BIT_BATT_CHARGE );  // set_bit�̂݁B
-	                                                                      /// ���荞�݂�task_status()�ōs��
-}
-
-
-
-/********************************************//**
- ���x�`�F�b�N
-  ���x�t���q�X�e���V�X�L��
- ***********************************************/
-#define RAW_TEMP_LH    75	// 50 [degC]
-#define RAW_TEMP_LL    61	// 55
-#define RAW_TEMP_HL    184  //  1
-#define RAW_TEMP_HH    189  // -1
-#define AVG_COUNT      40
-
-void bt_chk_temparature()
-{
-    static u8 heikinka_h,heikinka_l;
-
-    if(( RAW_TEMP_LH <= raw_adc_temperature )
-       && ( raw_adc_temperature <= RAW_TEMP_HL ))
-    {
-        if( heikinka_h < AVG_COUNT )
-        {
-            heikinka_h++;
-        }
-        else
-        {
-            temp_zone_charge_disable = false;         // �[�d����
-        }
-    }
-    else if(( raw_adc_temperature <= RAW_TEMP_LL )
-       || ( RAW_TEMP_HH <= raw_adc_temperature ))
-    {
-        if( heikinka_l < AVG_COUNT )
-        {
-            heikinka_l++;
-        }
-        else
-        {
-            temp_zone_charge_disable = true;         // �[�d�֎~
-        }
-    }
-    else
-    {
-        // temp_zone_charge_disable ���̂܂�
-        heikinka_h = 0;
-        heikinka_l = 0;
-    }
-}
-
-
-
-/********************************************//**
- �[�d�����̃`�F�b�N
- 
- �[�dIC�̃o�O�΍���s���B
- ***********************************************/
-void bt_get_charge_status()
-{
-    // CCIC�̕s�����̂��߁A/CHG�̃l�Q�[�g��������ƒ��J�ɒx��������
-    static u8 anti_chatter;
-
-    if( !BT_IN_CHG_n )
-    {
-        // ����Ƀ`���^�����O����
-        if( anti_chatter < 2 )  // �d�r�����ŃA�_�v�^�����āA�d�ɂ����킳��
-        {                       //  ����Ə[�dLED��������������̂�
-            anti_chatter++;
-        }
-        else
-        {
-            BT_IN_CHG_delayed_n = 0;  // �[�d��
-        }
-    }
-    else
-    {
-        if( !BT_CHG_Ena_n 
-			&& ( vreg_ctr[ VREG_C_BT_REMAIN ] < 60 )
-			&& !( is_mgic_error )
-			)
-        {
-            BT_IN_CHG_delayed_n = 0;  // �[�d���ƈ����B�[�d���I����Ă���͂����Ȃ�
-        }
-        else
-        {
-            BT_IN_CHG_delayed_n = 1;
-            anti_chatter = 0;
-        }
-    }
-}
-
-
-
-/********************************************//**
- �A�_�v�^�̗L���`�F�b�N
- ***********************************************/
-void pm_chk_adapter()
-{
-    set_bit( !PM_EXTDC_n, vreg_ctr[VREG_C_STATUS], REG_BIT_POW_SUPPLY );
-
-    if( pm_extdc_old != PM_EXTDC_n )								// HAL ��ʂ����߁A PM_EXTDC_n �� volatile �ɂ���S�z�Ȃ�
-    {
-        pm_extdc_old = PM_EXTDC_n;
-        if( !PM_EXTDC_n )
-        {
-            // �h������
-            set_irq( VREG_C_IRQ1, REG_BIT_BT_DC_CONNECT );
-            chg_led_override = (u8)( 2500 / INTERVAL_TSK_BATT );	// bt_chck��wait_ms(5)�̐��ŐL�΂����Btoriaezu�蓮������ 4.5 sec
-        }
-        else
-        {
-            u8 temp_v[2];
-
-            // ������
-            set_irq( VREG_C_IRQ1, REG_BIT_BT_DC_DISC );
-            chg_led_override = 0;
-
-            // �d�r�c�ʂ�1%��ŁA�A�_�v�^�L��̎��ɂ͖{�̂��N�����A�Q�[����������
-            //  1%��ɉ񕜂���O�ɃA�_�v�^���������Ƃ��A���荞�݂����Ȃ��Ɗ��Ғʂ��
-            //  ����łȂ��B���ʑΉ��̂��߂����őΉ�
-            if( read_mgic_2B( BT_GAUGE_REG_VCELL, temp_v ) == ERR_SUCCESS )
-            {
-                bt_volt16 = ( temp_v[0] * 256 + temp_v[1] );
-            }
-
-            if(( bt_volt16 < V_TH_ZERO ) || ( vreg_ctr[ VREG_C_BT_REMAIN ] == 0 ))
-            {
-                set_irq( VREG_C_IRQ1, REG_BIT_BT_REMAIN );
-            }
-        }
-    }
-}
-
-
-
-/********************************************************
-�d�r�֌W�̏�����
-
-�@�@�@�Q�[�W�@�@�b�@�L��@�@�@�@�@�b�@����
-�@�@�[�[�[�[�[�[�[�[�[�[�[�[�[�[�[�[�[�[�[�[�[�[�[
-�@�@�@�d�r�@�L��b�@���@�@�@�@�@�@�b�@�H
-�@�@�[�[�[�[�[�[�[�[�[�[�[�[�[�[�[�[�[�[�[�[�[�[�[
-�@�@�@�@�@�@�����b�@�����@�@�@�@�@�b�@�s�r
-�@�@�@�@�@�@�@�@�b�@���@�d�r�����@�b
-�@�@�[�[�[�[�[�[�[�[�[�[�[�[�[�[�[�[�[�[�[�[�[�[�[
-
-�@�@�Q�[�W�L��A�d�r�����@�̔����^���@���ʂ́A
-�@�d�r���x�Ŕ��肷��
-
- �Ԓl�F�@�d�r����               0xFF
-         �d�r�ς���ĂȂ�       0
-         �d�r���           1
-
-***********************************************************/
-bit bt_force_update;
-
-
-
-/********************************************//**
- �o�b�e���̃`�F�b�N�A�ƁA�{�̎�ʎ��ʁi�s�������p�̂��߁j
- ***********************************************/
-void BT_chk()
-{
-    static BT_VENDER battery_manufacturer_old;
-
-    battery_manufacturer_old = battery_manufacturer;
-
-    BT_model_detect();
-	bt_param_select();  // �o�b�e���c�ʕ␳�p�����[�^�ȂǃZ�b�g ����@�ł��A�Ƃ肠�����̒l(�p�i)�w��ɂ��Ă����B
-						//  ���ʂ�rcomp�v�Z�����邪�A���������|�C���^���Q�Ƃ���̂��₾���A����@�Ȃ�v�Z���Ȃ��Ƃ��ʓ|
-
-    if( system_status.model != MODEL_JIKKI )
-    {
-        bt_authorized = false;
-        return;
-        // �����܂�
-    }
-
-    if(( battery_manufacturer_old != battery_manufacturer ) ||
-           bt_force_update )
-    {
-        bt_force_update = false;
-        iic_mcu_start(  ); // ���ŏ������t���O�������Ă�̂ŌĂт܂����ėǂ��@����ȂƂ���Ɂcorz
-        if( (( battery_manufacturer_old == BT_VENDER_OPEN ) ||
-             ( battery_manufacturer_old == BT_VENDER_NOT_CHECKED )) &&
-              !system_status.reboot )
-        {
-            BT_mgic_quick_start();
-        }
-        BT_mgic_init();          // �@�픻����s���܂�
-    }
-    bt_authorized = true;
-    renge_task_immed_add( tski_BT_temp_update ); // �d�r���x��
-}
-
-
-
-/********************************************//**
- �{�̎�ʎ���
- ***********************************************/
-void BT_model_detect()
-{
-    u8 temp;
-
-    BT_DET_P = 1;
-    BT_TEMP_P = 1;
-    wait_ms( 3 );                 // �d�����オ��̂Ɏ��Ԃ��|����
-
-    raw_adc_temperature = get_adc( ADC_SEL_BATT_TEMP );
-    temp = get_adc( ADC_SEL_BATT_DET );
-    BT_DET_P = 0;
-
-    system_status.captureBox = false;
-    // �v���b�g�t�H�[������ //
-    if( raw_adc_temperature > 0xF0 )
-    {
-        // TS //
-        system_status.model  = MODEL_TS_BOARD;
-		system_status.family = FAMILY_CTR;			// ����H�ł̌딻����㏑��
-		pm_reg_bit_vddlcd    = PM_REG_BIT_VDDLCD_CGS;
-//		set_voltages( system_status.family );	�s�v�H
-	}
-    else if( raw_adc_temperature < 4 )
-    {
-        // ���� //
-        system_status.model = MODEL_SHIROBAKO;
-
-        // ���������āF�L���v�`���{�[�h //
-        if(( iic_mcu_read_a_byte( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_VERSION ) == 0x01 ) &&
-            ( iic_mcu_result == I2C_ERR_OK ))
-        {
-            system_status.captureBox = true;
-        }
-    }
-    else
-    {
-        // ���@�A�c��IC NACK( �o�b�e�������܂��͎c��IC�̏� )
-        system_status.model = MODEL_JIKKI;  // �o�b�e�������̎��́��ŏ㏑������
-    }
-
-	// TS��home�{�^���A���@�͖��ڑ��Ȃ̂ŗv�[�q���� /// gnd�ɂ��Ƃ��΂悩�����c
-	if( system_status.model == MODEL_TS_BOARD )
-	{
-		PM_SW_HOME_n_TSBOARD = 1;
-	}
-	else
-	{
-		PM_SW_HOME_n_TSBOARD = 0;
-		SW_HOME_n_TSBOARD_RAW = 0;				/// ���@open �ǂ����ł������񂾂���
-	}
-
-    // �d�r���[�J�[�̎��� //
-    {
-        u8 i;
-
-        battery_manufacturer = BT_VENDER_OPEN;  // �f�t�H���g�l
-        for(i=0; i<=7; i++)
-        {
-            if( temp <= BT_MANUF_BORDER[ i ] )
-            {
-                battery_manufacturer = (BT_VENDER)i;
-                break;
-                /*
-                   BT_VENDER_MAXELL;  // = 0
-                   BT_VENDER_1;
-                   BT_VENDER_2;
-                   BT_VENDER_3;
-                   BT_VENDER_4;
-                   BT_VENDER_PANA;
-                   BT_VENDER_6;
-
-                   BT_VENDER_OPEN;
-                 */
-            }
-        }
-    }
-
-
-    if( ( battery_manufacturer == BT_VENDER_OPEN ) &&
-        ( system_status.model == MODEL_JIKKI ) )
-    {
-        system_status.model = MODEL_JIKKI_NOBATT;
-    }
-}
-
-
-
-#define MGIC_CMD_QUICKSTART           0x4000
-/********************************************//**
- MGIC�N�C�b�N�X�^�[�g�i��Ƀo�O�΍�j
- ***********************************************/
-static void BT_mgic_quick_start()
-{
-    wait_ms( 10 );  // MGIC�̋N���Ɋ|����
-
-    // 0. �o�b�e���c��IC �N�C�b�N�X�^�[�g
-    send_cmd_mgic_2B( BT_GAUGE_REG_MODE, swap_endian_16( MGIC_CMD_QUICKSTART ) );
-
-    wait_ms( 150 );
-}
-
-
-/********************************************//**
- �d�r�c�ʑ��菉����
- 
- �d�r�p�����[�^�Ȃǂ��]������
- ***********************************************/
-
-#define MGIC_CMD_UNLOCK_KEY      0x4A57
-#define MGIC_CMD_RESET           0x5400
-static void BT_mgic_init()
-{
-    u8      origParam[4];
-
-    /*
-    // -1. ���Z�b�g�������Ă݂�
-    �������Ⴞ��!
-    i2c_send_buff_2B._u16 = swap_endian_16( MGIC_CMD_RESET );
-    send_cmd_mgic_2B( BT_GAUGE_REG_COMMAND );  // �����‚�NACK��Ԃ�
-    */
-
-    if( system_status.model != MODEL_JIKKI )
-    {
-        return;
-        // �����܂�
-    }
-
-    // 1. ���b�N����
-    if( send_cmd_mgic_2B( BT_GAUGE_REG_LOCK, swap_endian_16( MGIC_CMD_UNLOCK_KEY ) ) != ERR_SUCCESS )
-    {
-        // �c��IC NACK
-        vreg_set_mgic_error;
-        return;
-        // �����܂�
-    }
-
-    vreg_clear_mgic_error;
-
-    //        wait_ms( 5 + 1 ); �O�ɃE�F�C�g����Ă�̂ŕs�v
-
-    // 2. �����p�����[�^���ꎞ�ۑ�
-    iic_mcu_read( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_RCOMP, 4, origParam );
-
-    // 3. �ꎞ�I��OCV��ύX
-    send_cmd_mgic_2B( BT_GAUGE_REG_OCV, swap_endian_16( p_bt_param->ocv )); // �}�W�b�N�i���o�[�I�Ȃ��́B���[�J�[�w��
-
-    // 4. �ꎞ�I��RCOMP��ύX
-    send_cmd_mgic_2B( BT_GAUGE_REG_RCOMP, swap_endian_16( 0xFF00 ) );
-
-    // 5.���[�J�[�ʃp�����[�^�̃��[�h
-    {
-        u8 loop;
-
-        // 16�o�C�g���Ƃɋ�؂�Ƃ̂��Ɓ@�i�m�C�Y�΍�Ƃ������񂾂��ǁA�Ӗ�����񂩁H�j
-        for( loop = 0; loop < 4; loop ++ )
-        {
-            iic_mcu_set_wo_dma(  );
-            iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_BT_PARAM + loop*16, 16, p_bt_param->mg_param + loop*16 );
-        }
-    }
-
-    // 6. 150ms�ȏ�҂�
-    wait_ms( 150 + 15 );
-
-    // 7. OCV�Ɂu�Ƃ���l�v������
-    send_cmd_mgic_2B( BT_GAUGE_REG_OCV, swap_endian_16( p_bt_param->ocv ) ); // �}�W�b�N�i���o�[�I�Ȃ��́B���[�J�[�w��
-
-    // 8. 150�`600ms�҂B600ms�͌���
-    wait_ms( 150 + 15 );
-
-    // 9. SOC��ǂށB�x���t�@�C�̂��߁B
-    { u8 temp;
-	    temp = iic_mcu_read_a_byte( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_SOC );
-
-    	if(( p_bt_param->verify.low <= temp ) && ( temp <= p_bt_param->verify.hi ))
-	    {
-    	    // �J�X�^�����f����������OK�I
-	    }else{
-    	    // ���s�������烊�g���C����̂��H
-	//        dbg_nop();
-    	}
-    }
-
-    // 10.����RCOMP��OCV�������߂�
-    iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_RCOMP, 4, origParam );
-
-    // 11. ���b�N
-    send_cmd_mgic_2B( BT_GAUGE_REG_LOCK, swap_endian_16( 0x0000 ) ); // lock key
-}
-
-
-
-extern u16 _dbg_rcomp;
-/********************************************//**
-  raw_adc_temperature�ɓ����Ă���l�����ɕϊ�����ƂƂ��ɁA
-  - ���W�X�^�ɃZ�b�g
-  - �c��IC�ɃZ�b�g
- ***********************************************/
-task_status_immed tski_BT_temp_update(  )
-{
-    static u8 rawdat_old;
-    static s8 temperature;
-    s16       newrcomp;
-    static u8 heikinka;
-
-/*
-	�T�[�~�X�^ - 10k�������_�̎��A
-	��p���x�ł͕�����̃J�[�u���قڃ��j�A�ŁA
-	���c T[��] = 81.48  - 111.97 x ratio
-	TDK  T     = 81.406 - 111.81 x ratio
-*/
-
-    if( rawdat_old != raw_adc_temperature )
-    {
-        if( heikinka < 40 )
-        {
-            heikinka ++;
-        }
-        else
-        {
-            heikinka = 0;
-            rawdat_old = raw_adc_temperature;
-            //        temperature = 81.45 - 111.9 * raw_adc_temperature/256.0;
-            // ���ꂼ��256�{���Ă���
-            temperature = (u8)(( 20851 - 112 * raw_adc_temperature + (256/2) ) /256);
-            vreg_ctr[VREG_C_BT_TEMP] = temperature;
-
-            newrcomp = 0;
-            if( temperature > 20 )
-            {
-                newrcomp = ( ( temperature - 20 ) * p_bt_param->rcomp.up )/256;
-            }
-            else
-            {
-                newrcomp = ( ( temperature - 20 ) * p_bt_param->rcomp.down )/256;
-            }
-            newrcomp = p_bt_param->rcomp.rcomp + newrcomp;
-
-            if( newrcomp > 255 )
-            {
-                newrcomp = 255;
-            }
-            if( newrcomp < 0 )
-            {
-                newrcomp = 0;
-            }
-            _dbg_rcomp = newrcomp;
-
-            if( send_cmd_mgic_2B( BT_GAUGE_REG_RCOMP, newrcomp ) == ERR_SUCCESS )  // swap�s�v
-            {
-                rawdat_old = raw_adc_temperature;
-            }
-            else
-            {
-                vreg_set_mgic_error;
-            }
-        }
-    }
-    return ( TSKI_FINISHED );
-}
-
-
-
-/********************************************//**
- �d�r�c��IC����c�ʂ��擾���A���W�X�^�ɏ������ށB
-
- �@�d�r�c��IC�������E�̏�Ȃǂ̎��͂Ƃ肠�����c��99%�Ƃ���B
-
- �@�@�@�@�@�@�@�@���� status_1�Ŋm�F�”\�B�d���������Ƀ`�F�b�N���Ă��܂��B
-
- �@BT_chk()�����s����Ă���K�v������܂��B
- ***********************************************/
-void BT_get_left(){
-    u8 temp[2];
-    u8 reg_volatile_temp_bt_remain,reg_volatile_temp_bt_remain_fine;  // I2C�̔񓯊��ǂݍ��݂ł̂���‚��h�~ �L���b�v�����̏���
-    u8 fuel_cap_by_voltage;	// �d���ŃL���b�v�Ɏg��
-
-    // �d�r�c��
-    if( system_status.model == MODEL_TS_BOARD
-        || system_status.model == MODEL_SHIROBAKO )
-    {
-        // TS & ���� //
-        if( read_BT_SOC( temp ) == ERR_SUCCESS )
-        {
-            reg_volatile_temp_bt_remain = temp[0];
-            reg_volatile_temp_bt_remain_fine = temp[1];
-        }
-        else
-        {
-            // �G�~�����[�V�����@�\����������
-            // �@����œd���f�͕s�ւ����邾�낤
-            reg_volatile_temp_bt_remain = 99; 
-            reg_volatile_temp_bt_remain_fine = 0;
-        }
-    }
-    else
-    {
-        // ���@ //
-        // �c�ʃ��[�h
-        if( read_BT_SOC( temp ) != ERR_SUCCESS )
-        {
-            // �c��IC��NACK �c�o�b�e���͂��ꂽ
-            vreg_set_mgic_error;
-            bt_authorized = false;
-            reg_volatile_temp_bt_remain = 0;
-            force_off = true;
-        }
-        else
-        {
-            u16 temp_u16;
-
-		    vreg_clear_mgic_error;
-            // �o�b�e���p�����[�^�̊֌W�Ńr�b�g�V�t�g���K�v
-            temp_u16 = temp[0] * 256 + temp[1];
-            temp_u16 /= p_bt_param->v_scale;
-            reg_volatile_temp_bt_remain = (u8)(( temp_u16 >> 8 ) & 0xFF );
-            if( reg_volatile_temp_bt_remain == 0 )
-            {
-                // 0%��̎���1.00%�ɏグ��
-                //  �[�d�J�n������΂炭�͓d�r�c�ʂ�����̂�
-                //  0%�ɓ��B���Ă��܂����Ƃ�����̂�
-                reg_volatile_temp_bt_remain = 1;
-				reg_volatile_temp_bt_remain_fine = 0;
-            }
-            else
-            {
-                reg_volatile_temp_bt_remain_fine = (u8)(temp_u16 & 0xFF);
-            }
-        }
-    }
-
-    // �d�r�d��
-    {
-        if( read_BT_voltage( temp ) != ERR_SUCCESS )  // 2byte read
-        {
-			temp[0] = (u8)( V_BT_4000MV / 256 );	// �d�r�d���ǂ߂Ȃ�������4000mV���������Ƃɂ��Ă����B
-            temp[1] = 0;
-        }
-        vreg_ctr[ VREG_C_BT_VOLTAGE ] = temp[0];
-        bt_volt16 = ( temp[0] * 256 + temp[1] );
-    }
-
-
-    // �d���ŃL���b�v...�̏���
-    {
-        static u16 hysteresis;
-
-        if( bt_volt16 > V_TH_30 )
-        {
-            fuel_cap_by_voltage = 100;
-            hysteresis = 0;
-        }
-        else if( bt_volt16 - hysteresis > V_TH_LO )
-        {
-            fuel_cap_by_voltage = 30;
-            hysteresis = 0;
-        }
-        else if( bt_volt16 > V_TH_EMPTY )
-        {
-            fuel_cap_by_voltage = BATT_TH_LO;  // ���������
-            hysteresis = 500;
-        }
-        else if( bt_volt16 > V_TH_ZERO )
-        {
-            fuel_cap_by_voltage = BATT_TH_EMPTY;
-            hysteresis = 500;
-        }
-        else if( bt_volt16 > V_TH_FORCE_OFF )
-        {
-            fuel_cap_by_voltage = 0;
-            hysteresis = 500;
-        }
-        else
-        {
-            force_off = true;
-            hysteresis = 500;
-        }
-    }
-    
-
-    // �[�d���i���A�_�v�^���h�����Ă�j�̂ɏ[�d���ĂȂ�
-    //     ���A�i���Ȃ��Ƃ��j�f�̓d�r�c�ʂ�60%�ȏ�iCCIC�o�O����ABT_IN_CHG_delayed_n�ɐD�荞�ݍς݁j
-    // = �[�d�����B�d�r���ւ����Ă����MGIC��100%��Ԃ��Ȃ�
-    if( !BT_CHG_Ena_n && BT_IN_CHG_delayed_n ){
-        reg_volatile_temp_bt_remain = 100;
-        reg_volatile_temp_bt_remain_fine = 0;
-    }
-    else
-    {   // �d���ł̃L���b�v���|���邩�H
-        if( fuel_cap_by_voltage < reg_volatile_temp_bt_remain )
-        {
-            reg_volatile_temp_bt_remain = fuel_cap_by_voltage;
-            reg_volatile_temp_bt_remain_fine = 0;
-        }
-    }
-
-	/*
-	�\���ɖ��Ȃ��d������������Ă�炵���̂ŃP�A�����ł悵
-	if( system_status.taikendai_nbd && system_status.model != MODEL_TS_BOARD )	// �d�r�[�q�ɓd�����‚Ȃ����ĂĒl���s���Ȃ��ߏ㏑���B
-    {
-        reg_volatile_temp_bt_remain = 100;
-    }
-	*/
-
-	vreg_ctr[ VREG_C_BT_REMAIN ]      = reg_volatile_temp_bt_remain;
-	vreg_ctr[ VREG_C_BT_REMAIN_FINE ] = reg_volatile_temp_bt_remain_fine;
-
-    // twl�̃��W�X�^�X�V�@(CTR�Ɋ��荞�ݓ����O�ɍX�V���Ȃ��Ɗ��荞�݂̃^�C�~���O���܂�����������Ȃ�)
-    bt_batt_update_twl();
-
-    // �c�ʂŊ��荞�݁B�}���Ɍ���Ɣ�Ԃ��Ƃ����� //
-    {
-        static u8 bt_remain_old_ctr;
-
-        if( bt_remain_old_ctr != reg_volatile_temp_bt_remain )
-        // CTR�ɒʒm
-        {
-            if( (( vreg_ctr[ VREG_C_BT_REMAIN ] <= BATT_TH_LO )    && ( BATT_TH_LO    < bt_remain_old_ctr ))||
-                (( vreg_ctr[ VREG_C_BT_REMAIN ] <= BATT_TH_EMPTY ) && ( BATT_TH_EMPTY < bt_remain_old_ctr ))||
-                (( vreg_ctr[ VREG_C_BT_REMAIN ] == 0 )             && ( bt_remain_old_ctr != 0 )) )
-            {
-                set_irq( VREG_C_IRQ1, REG_BIT_BT_REMAIN );
-            }
-        }
-        bt_remain_old_ctr = vreg_ctr[ VREG_C_BT_REMAIN ];
-    }
-
-    // PMIC-NTR�ɓd�r�c�ʂ������Ă�����
-    bt_batt_update_ntr();
-}
-
-
-
-/********************************************//**
-  �t���n�̓d������
-
-  �@�X�e�[�^�X�t���O�͂����ɗ��ĂĂ��܂��B
-
-   �@�s�������Ԃ����邵�A
-
-     �N�����s�ł���Γd����������
-
-     �ʂ̃^�X�N�œd�������͊Ď����Ă��āA�X�e�[�^�X���N���A����
- ***********************************************/
-err PM_LCD_on(  )
-{
-    err rv = ERR_ERR;
-
-    PM_VDDLCD_on(  );		// ������ CGS �� AMO �؂�ւ��Ă܂�
-
-    if( system_status.LCD_is_CGS == true )
-    {
-		// CTR ��
-	    wait_ms( DELAY_PM_TSS_50B_AND_TCOM );
-    }
-	else
-	{
-		// SPFL/SNAKE �Ȃ�A�����t�@�XHV on ���Ԃɋ���
-		wait_ms( 10 );
-        SPFL_LCD_AMOL_HV_CONT = 1;
-	    wait_ms( DELAY_PM_TSS_50B_AND_TCOM - 10 );
-	}
-
-    PM_TCOM_on(  );
-
-    wait_ms( DELAY_PM_TCOM_TO_VCS );
-
-    PM_VCS_on(  );
-
-    wait_ms( DELAY_PM_VCS_TO_BL );
-
-    if( PM_chk_LDSW() != 0 ) // ����p�X
-    {
-        // �d���N���G���[�Ȃ�d�����؂�Ă��܂��B�����ł̓P�A���Ȃ�
-        vreg_ctr[VREG_C_STATUS] |= REG_BIT_LCD_POW;
-        set_irq( VREG_C_IRQ3, REG_BIT_LCD_ON );
-		rv = ERR_SUCCESS;
-    }
-
-    return rv;
-}
-
-
-void PM_LCD_off()
-{
-    // BL�‚��Ă�������B// �`�F�b�N����̂͊��荞�݂̊֌W
-    if( ( read_pmic( PM_REG_ADRS_BL ) & 0x03 ) != 0 )
-    {
-        u8 tot;
-
-        PM_BL_set( REG_BIT_CMD_BL_U_OFF | REG_BIT_CMD_BL_L_OFF );
-        vreg_ctr[VREG_C_STATUS] &= bits8(1,0,0,1, 1,1,1,1);
-
-        if( (( REG_BIT_BL_U_OFF | REG_BIT_BL_L_OFF ) & ~vreg_ctr[ VREG_C_IRQ_MASK3 ] ) != 0 )
-        {
-            vreg_ctr[ VREG_C_IRQ3 ] |= ( ( REG_BIT_BL_U_OFF | REG_BIT_BL_L_OFF ) & ~vreg_ctr[ VREG_C_IRQ_MASK3 ] );
-            IRQ0_neg;
-            tot = 0;
-            while( !IRQ0 && ( ++tot != 0 ) ){;}
-            IRQ0_ast;
-        }
-        vreg_ctr[VREG_C_COMMAND2] &= ~( REG_BIT_CMD_BL_U_OFF | REG_BIT_CMD_BL_L_OFF );
-    }
-
-
-
-    // 50ms�Ƃ��҂‚��A�m�F���܂��傤���ˁc
-    if( read_pmic( PM_REG_ADRS_VDD_LCD ) != 0 )
-    {
-        PM_TCOM_off();
-        wait_ms( 1 );
-        PM_TCOM_VCS_off(  );
-        wait_ms( DELAY_PM_LCD_OFF );
-
-		if( system_status.LCD_is_CGS == false )
-        {
-			// �A�����t�@�X�Ȃ�|�[�g����
-			SPFL_LCD_AMOL_HV_CONT = 0;	// ���̃t�@�~���ł�L����Ȃ̂ŕ��Q�Ȃ�
-            wait_ms( 10 );  // �A�����t�@�X15V��؂����Ƃ��̃E�F�C�g�B
-        }
-
-        PM_VDDLCD_off(  ); // �c���Ă��̑S���~�߂܂��B
-        vreg_ctr[VREG_C_STATUS] &= ~REG_BIT_LCD_POW;
-    }
-
-	set_irq( VREG_C_IRQ3, REG_BIT_LCD_OFF );  // �������ɔ����B�}�X�N������΁B
-}
-
-
-
-/********************************************//**
-�@�o�b�N���C�g�̌•�on/off
-
-�@���󂩂�@on/off/�ێ��@�̃t���O�Ȃ̂Ŗʓ|
-
-�@BL on/on �̏�ԂŁAon/on�ɂ���ƌ����Ă��Aon/on���荞�݂����܂��B
- ***********************************************/
-err PM_BL_set( u8 dat )
-{
-    u8 blset;
-    u8 intset = 0;
-    // RMW���s��
-
-    // Read
-    blset = read_pmic( PM_REG_ADRS_BL );
-
-    // Modify
-    // ue
-    if(( dat & REG_BIT_CMD_BL_U_ON ) != 0 )
-    {
-        blset |= PM_REG_BIT_BL_U;
-        intset |= REG_BIT_BL_U_ON;
-    }
-    else if(( dat & REG_BIT_CMD_BL_U_OFF ) != 0 )
-    {
-        blset &= ~PM_REG_BIT_BL_U;
-        intset |= REG_BIT_BL_U_OFF;
-    }
-
-    // shita
-    if(( dat & REG_BIT_CMD_BL_L_ON ) != 0 )
-    {
-        blset |= PM_REG_BIT_BL_L;
-        intset |= REG_BIT_BL_L_ON;
-    }
-    else if(( dat & REG_BIT_CMD_BL_L_OFF ) != 0 )
-    {
-        blset &= ~PM_REG_BIT_BL_L;
-        intset |= REG_BIT_BL_L_OFF;
-    }
-
-    if( blset != 0 )  // BL��t����ꍇ�̓E�F�C�g�����܂Ȃ���PWM�����Ă��炸
-                      //  �V���b�g�_�E�����邱�Ƃ�����
-    {
-        wait_ms( 16 + 10 );
-    }
-    send_cmd_pmic(  PM_REG_ADRS_BL, blset );
-
-	//    SoC��PWM���o���悤���W�X�^���Z�b�g���Ă���x�����L�邽�߁A�X�e�[�^�X����
-	//    �X�V���Ă��܂��B���Ăق����Ƃ̗v���B
-
-	// PMIC��BL�̃r�b�g�ƁAMCU��STATUS���W�X�^�̃r�b�g�ʒu���t�Ȃ��ߓ���ւ�
-    vreg_ctr[VREG_C_STATUS] = (( vreg_ctr[VREG_C_STATUS] & bits8(1,0,0,1, 1,1,1,1) )
-                              | ( (( blset << 6 ) | ( blset << 4 )) & bits8(0,1,1,0, 0,0,0,0) ));
-
-    // ���荞��
-    /// �����r�b�g�܂Ƃ߂čs���̂ŁAset_irq()�g��Ȃ���������
-    {
-        u8 tot;
-
-        if( ( intset & ~vreg_ctr[ VREG_C_IRQ_MASK3 ] ) != 0 )
-        {
-            vreg_ctr[ VREG_C_IRQ3 ] |= ( intset & ~vreg_ctr[ VREG_C_IRQ_MASK3 ] );
-            IRQ0_neg;
-            tot = 0;
-            while( !IRQ0 && ( ++tot != 0 ) ){;}
-            IRQ0_ast;
-        }
-    }
-
-    return( ERR_SUCCESS );         // �����łُ͈�`�F�b�N�s�v
-}
-
-
-
-/********************************************//**
-  �t���̑Ό��d���̐ݒ���s���܂��B
-
-  ���z���W�X�^�̓��e�𑗂邾��
- ***********************************************/
-void PM_LCD_vcom_set(  )
-{
-    send_cmd_pmic(  PM_REG_ADRS_POW_DAC1, vreg_ctr[VREG_C_VCOM_T] );   // ��������Ȃ��ƂɁAPMIC�̓o�[�X�g�������ݕs��
-    send_cmd_pmic(  PM_REG_ADRS_POW_DAC2, vreg_ctr[VREG_C_VCOM_B] );
-    return;
-}
-
-
-
-/********************************************//**
-  ���ŁA���W�X�^�������݂���Ăяo����鎞�̂���
-
-  �@I2C�̎�荇���̊֌W�ł�������Ă�
- ***********************************************/
-task_status_immed tski_vcom_set(  )
-{
-    PM_LCD_vcom_set(  );
-    return ( TSKI_FINISHED );
-}
-
-
-void set_vdd_voltages( enum family_  family )
-{
-	if( family == FAMILY_SNAKE )
-	{
-		// LAGER
-		pmreg_v_core = PM_REG_BIT_VDD1P_1R00;
-		pmreg_v_vdd  = PM_REG_BIT_VDD_SNK;
-	}
-	else
-	{
-		// NORMAL
-		pmreg_v_core = PM_REG_BIT_VDD1P_1R15;
-		pmreg_v_vdd  = PM_REG_BIT_VDD_CTR;
-	}
-}
-
-/********************************************//**
-  �V�[�P���X�̒ʂ�d���𗧂��グ�Ă䂫�܂��B
-
- - �Ԓl 0 �Ō�܂Ő���Ɋ��������B
- -      1 �V���[�g�Ȃǂœd���������肫��Ȃ�����
- ***********************************************/
-err PM_sys_pow_on(  )
-{
-    // �d�����������グ
-//    PM_reset_ast(  );       �s�v PM_LDSW_on�܂���
-    RESET2_ast;
-    FCRAM_RST_ast;
-    GYRO_DISABLE();
-
-    PM_LDSW_on(  );
-
-    wait_ms( 1 + DELAY_PM_TW_PWUP );
-
-    PM_VDD_normMode();
-    PM_VDD_on(  );
-//    wait_ms( DELAY_PM_TW_PWUP );   // GYRO�����ނ���
-    wait_ms( 10 );
-    GYRO_ENABLE();
-    wait_ms( DELAY_PM_TW_PWUP - 10 );
-
-    PM_VDD50A_on(  );				// �t���d���ł͂Ȃ��Aled�Ɏg��
-
-    wait_ms( DELAY_PM_TW_PWUP );
-
-    // �����d�����N���������`�F�b�N�B
-    if( !PM_chk_LDSW() )
-    {
-        return ( ERR_ERR );			// reset1�͂ق��Ƃ��ėǂ�
-    }
-
-    // �d������IC���
-    pmic_version = read_pmic( PM_REG_ADRS_VER );
-    read_mgic_2B( BT_GAUGE_REG_VERSION, mgic_version );
-
-    // ���Z�b�g�����ȂǁB�V�X�e���N���I
-    PM_reset_neg();
-    FCRAM_RST_neg;
-    RESET2_neg;
-
-    codec_reg_init();        // CODEC �s�背�W�X�^������(reset2�̌�łȂ��Ƃ����Ȃ��̂�)
-    ntr_pm_reg_shadow = 0;          // �@�V�@����ȂƂ����...
-
-    return ( ERR_SUCCESS );
-}
-
-
-
-
-/********************************************//**
-  �d��OFF�V�[�P���X
- ***********************************************/
-void PM_sys_pow_off(  )
-{
-//    if( RESET1_n )
-    if( PM_chk_LDSW() )
-    {
-        // �ُ�I���łȂ��Ƃ�
-        PM_BL_set( REG_BIT_CMD_BL_U_OFF | REG_BIT_CMD_BL_L_OFF );
-        PM_LCD_off();             //     TCOM,VCS OFF �������Ă��܂��B
-        wait_ms( 20 );
-
-        PM_reset_ast();
-    }
-
-    RESET2_ast;
-    FCRAM_RST_ast;
-
-    wait_ms( 20 );
-
-    PM_off(  );
-    PM_LDSW_off(  );
-
-}
-
-
-
-/********************************************//**
-  extDC���荞��
-  
-  �d��OFF����N�����i�[�d�̉��x�Ď��̂��߁j�̂�
-
-  ���i�̓|�[�����O(pm)
- ***********************************************/
-__interrupt void intp4_extdc(  )
-{
-}
-
-
-
-/********************************************//**
-  �t�^�J���‚ߊ��荞��
-  
-  ���i�̓|�[���O(misc)
- ***********************************************/
-__interrupt void intp5_shell(  )
-{
-    ;
-}
-
-
-/********************************************//**
-  ��PMIC�ւ̃R�}���h��������
- ***********************************************/
-__interrupt void intp6_PM_irq(  )
-{
-    EI();
-    if( system_status.pwr_state == ON )
-    {
-        renge_task_immed_add( tski_ntr_pmic_comm );
-    }
-}
-
-
-/********************************************//**
- CODEC����̊��荞�݂��󂯂āANTR PMIC�݊����W�X�^���烊�[�h
- ***********************************************/
-task_status_immed tski_ntr_pmic_comm(  )
-{
-    u8        reg1_old;
-    u8        irq_work = 0;
-
-    reg1_old = ntr_pm_reg_shadow;
-    ntr_pm_reg_shadow = iic_mcu_read_a_byte( IIC_SLA_CODEC, CODEC_REG_PM );
-    if( iic_mcu_result != ERR_SUCCESS )
-    {
-        return ( TSKI_FINISHED );
-    }
-
-//    DI(  );
-
-    // �o�b�N���C�g �� ////////////////////////////////////
-    if( ( ( reg1_old ^ ntr_pm_reg_shadow ) & REG_BIT_TWL_REQ_BL_U ) != 0 )
-    {
-        if( ( ntr_pm_reg_shadow & REG_BIT_TWL_REQ_BL_U ) == 0 )             // ������
-        {
-            irq_work = REG_BIT_TWL_BL_U_OFF;
-        }
-        else
-        {
-            irq_work = REG_BIT_TWL_BL_U_ON;
-        }
-    }
-
-    // �o�b�N���C�g ��
-    if( ( ( reg1_old ^ ntr_pm_reg_shadow ) & REG_BIT_TWL_REQ_BL_L ) != 0 )
-    {
-        if( ( ntr_pm_reg_shadow & REG_BIT_TWL_REQ_BL_L ) == 0 )             // ������
-        {
-            irq_work |= REG_BIT_TWL_BL_L_OFF;
-        }
-        else
-        {
-            irq_work |= REG_BIT_TWL_BL_L_ON;
-        }
-    }
-
-//    EI();
-
-    vreg_ctr[ VREG_C_STATUS_1 ] = ( vreg_ctr[ VREG_C_STATUS_1 ] & ~REG_BIT_MASK_STATUS1_NTR_PM_REG ) 
-									| ( ntr_pm_reg_shadow & REG_BIT_MASK_STATUS1_NTR_PM_REG );  // TWL�o�b�N���C�g���̃~���[
-
-    irq_work &= ~vreg_ctr[ VREG_C_IRQ_MASK2 ];
-    // set_irq �����i
-    if( irq_work != 0 )
-    {
-        u8 tot;
-
-        vreg_ctr[ VREG_C_IRQ2 ] |= irq_work;
-        IRQ0_neg;  // ��u�グ�ăp���X�𑗂蒼��
-        tot = 0;
-        while( !IRQ0 && ( ++tot != 0 ) ){;}  // O.D�Ȃ̂ł����Ƃ�����̂�҂� �� IRQ_mcu ��L�ɔ����Ă�ƍ���(��•s��)
-        IRQ0_ast;
-    }
-
-    /// �o�b�N���C�g�A�C�𗘂����ď������肵�܂���B
-
-    // off���N�G�X�g //////////////////////////////////////
-    if( ( ntr_pm_reg_shadow & REG_BIT_TWL_REQ_OFF_REQ ) != 0 )
-    {
-        set_irq( VREG_C_IRQ2, REG_BIT_TWL_OFF_REQ );
-    }
-
-    // ���Z�b�g���N�G�X�g /////////////////////////////////
-    if( ( ntr_pm_reg_shadow & REG_BIT_TWL_REQ_RST_REQ ) != 0 )
-    {
-        set_irq( VREG_C_IRQ2, REG_BIT_TWL_RESET_REQ );
-    }
-
-    // �o�b�N���C�g���}�X�N���ď����߂�
-    EI(  );
-    if( ( ntr_pm_reg_shadow & ( REG_BIT_TWL_REQ_OFF_REQ | REG_BIT_TWL_REQ_RST_REQ )) != 0 )
-    {
-        ntr_pm_reg_shadow &= ~( REG_BIT_TWL_REQ_OFF_REQ | REG_BIT_TWL_REQ_RST_REQ );
-        iic_mcu_write_a_byte_codec( CODEC_REG_PM, ntr_pm_reg_shadow );
-    }
-    return ( TSKI_FINISHED );
-}
-
-
-
-/********************************************//**
-    command2 �t���n
-
-�@  ���b�p�[�I�ȕ��BERR_SUCCESS�����Ԃ��Ȃ����c
- ***********************************************/
-task_status_immed tski_PM_LCD_on()
-{
-    PM_LCD_on();
-    return( TSKI_FINISHED );
-}
-
-task_status_immed tski_PM_LCD_off()
-{
-    PM_LCD_off();
-    return( TSKI_FINISHED );
-}
-
-task_status_immed tski_PM_BL_set()
-{
-    u8 cmd_BL;                  // ��volatile�Ƃ��t���Ȃ��Ă����v�݂���
-
-    do
-    {
-        cmd_BL = vreg_ctr[VREG_C_COMMAND2];
-        PM_BL_set( cmd_BL ); // �}�X�N�ς�
-    }
-    while( cmd_BL != vreg_ctr[VREG_C_COMMAND2] );  // <- PM_BL_set���X�V����
-    vreg_ctr[VREG_C_COMMAND2] = 0;
-
-    return( TSKI_FINISHED );
-}
-
-
-
-/********************************************//**
-�@reset2 �� CODEC �Ƀ��Z�b�g��������A���W�X�^���s��ɂȂ邽��
- ***********************************************/
-void codec_reg_init()
-{
-    wait_ms( 100 );
-
-    ntr_pm_bt_low_old = conv_ctr_bt_to_twl_bt();
-
-    iic_mcu_write_a_byte_codec( CODEC_REG_BT, (u8)ntr_pm_bt_low_old ); // SoC ���珑����
-
-    vol_reset();
-//    renge_task_immed_add( tski_vol_update ); �|�[�����O����̂ŁB
-    vol_polling = 3;
-}
-
-
-/********************************************//**
-  �w���p�[�Ƃ��������b�p�[�Ƃ������H
-
-  ROM�ߖ�̂���
- ***********************************************/
-err send_cmd_mgic_2B( u8 reg, u16 dat )
-{
-    u16 temp = dat;			  // ���M�o�b�t�@
-    return iic_mcu_write( IIC_SLA_BT_GAUGE, reg, 2, &temp ); // DMA�]������̂ő��M�f�[�^�o�b�t�@�̃|�C���^���ǂ����K�v
-}
-
-err read_mgic_2B( u8 reg, u8* dat )  // ���M�o�b�t�@�͌Œ�
-{
-    return iic_mcu_read( IIC_SLA_BT_GAUGE, reg, 2, dat );
-}
-
-err send_cmd_pmic( u8 reg, u8 dat )
-{
-	return iic_mcu_write_a_byte( IIC_SLA_PMIC, reg, dat );
-}
-
-u8 read_pmic( u8 reg )
-{
-	return iic_mcu_read_a_byte( IIC_SLA_PMIC, reg );
-}
-
-
-/********************************************//**
-  �d�r���[�J�[�ƃ��f������A�g���d�r�p�����[�^�̌���
- ***********************************************/
-void bt_param_select()
-{
-    BT_TYPE bt_type_temp;
-    // �Ή��������Ă����番��R�[�h���������‚����
-    if( battery_manufacturer <= BT_VENDER_3 )
-    {
-        bt_type_temp = BT_PARAM_CTR_MAXELL;
-    }
-    else
-    {
-        bt_type_temp = BT_PARAM_CTR_PANA;
-    }
-
-    if( system_status.family == FAMILY_SPFL )
-    {
-        bt_type_temp += BT_PARAM_SPFL_MAXELL;  // �I�t�Z�b�g �c�O�Ȏ����Łc�B
-    }
-    else if( system_status.family == FAMILY_SNAKE )
-    {
-        bt_type_temp += BT_PARAM_SNAKE_MAXELL;
-    }
-    p_bt_param = &bt_param[ bt_type_temp ];
-}
-
-
-
-
-#define TWL_BT_LEVEL_THREASH_F	60
-#define TWL_BT_LEVEL_THREASH_B	30
-#define TWL_BT_LEVEL_THREASH_1	0
-
-/********************************************//**
-  TWL�ɓd�r�c�ʂ������Ă�����
- ***********************************************/
-static void bt_batt_update_twl()
-{
-    if (vreg_ctr[VREG_C_BT_REMAIN]		> TWL_BT_LEVEL_THREASH_F )
-    {
-        vreg_twl[REG_TWL_INT_ADRS_POWER_INFO] = 0x0F;
-    }
-    else if (vreg_ctr[VREG_C_BT_REMAIN] > TWL_BT_LEVEL_THREASH_B )
-    {
-        vreg_twl[REG_TWL_INT_ADRS_POWER_INFO] = 0x0B;
-    }
-    else if (vreg_ctr[VREG_C_BT_REMAIN] > BATT_TH_LO)
-    {
-        vreg_twl[REG_TWL_INT_ADRS_POWER_INFO] = 0x07;
-    }
-    else if (( vreg_ctr[ VREG_C_BT_REMAIN ] > BATT_TH_EMPTY )||
-             !BT_CHG_Ena_n )
-    { // �A�_�v�^�̗L���Œ�グ
-        vreg_twl[REG_TWL_INT_ADRS_POWER_INFO] = 0x03;
-    }
-    else if (vreg_ctr[VREG_C_BT_REMAIN] > TWL_BT_LEVEL_THREASH_1 )
-    {
-        vreg_twl[REG_TWL_INT_ADRS_POWER_INFO] = 0x01;
-    }
-    else
-    {
-        vreg_twl[REG_TWL_INT_ADRS_POWER_INFO] = 0x00;
-    }
-}
-
-
-/********************************************//**
-  NTR�ɓd�r�c�ʂ������Ă�����
- ***********************************************/
-static void bt_batt_update_ntr()
-{
-    static bit initialized;
-    static bit flag;  // ����Hstatic�łȂ��ƃR���p�C���ɓ{����
-
-    if( system_status.pwr_state == OFF_TRIG )
-    {
-        initialized = false;
-    }
-    else
-    {
-
-        flag = conv_ctr_bt_to_twl_bt();
-
-        if(( ntr_pm_bt_low_old != flag ) || !initialized )
-        {
-            initialized = true;
-            ntr_pm_bt_low_old = flag;
-            iic_mcu_write_a_byte_codec( CODEC_REG_BT, (u8)flag );
-        }
-    }
-}
-
-
-/********************************************//**
- �d�r�c�ʂ�ǂ�ł���
- ***********************************************/
-static err read_BT_SOC( u8* dest )
-{
-#ifdef _ENABLE_HAL_
-    if( vreg_ctr[ VREG_C_HAL_OVW_BT_FUEL ] != 0xFF )	// true�Ȃ�HAL�L��
-#else
-	if( 0 )
-#endif
-    {
-        *dest = vreg_ctr[ VREG_C_HAL_OVW_BT_FUEL ];
-        *(dest+1) = 0x00;
-        return ERR_SUCCESS;
-    }
-    else
-    {
-        return( read_mgic_2B( BT_GAUGE_REG_SOC, dest ) );
-    }
-}
-
-
-/********************************************//**
- �d�r�d����ǂ�ł���
- ***********************************************/
-static err read_BT_voltage( u8* dest )
-{
-#ifdef _ENABLE_HAL_
-	if( vreg_ctr[ VREG_C_HAL_OVW_BT_VOLTAGE ] != 0xFF )	// true�Ȃ�HAL�L��
-#else
-	if( 0 )
-#endif
-    {
-        *dest = vreg_ctr[ VREG_C_HAL_OVW_BT_VOLTAGE ];
-//        *(dest+1) = 0x00;            // �g��Ȃ���@���ǂQ�o�C�g���[�h�֐������p�ӂ��ĂȂ��̂ł�
-        return ERR_SUCCESS;
-    }
-    else
-    {
-        return( read_mgic_2B( BT_GAUGE_REG_VCELL, dest ) );
-    }
-}
-
-
-/********************************************//**
- �d�r�c�ʂ�twl�Ƀt���O�ɕϊ�����
- ***********************************************/
-static u8 conv_ctr_bt_to_twl_bt()
-{
-//    ntr_pm_bt_low_old = ( vreg_ctr[ VREG_C_BT_REMAIN ] <= BATT_TH_LO )? NTR_PM_BT_EMPTY: NTR_PM_BT_ENOUGH;  // 1�œd�r�؂�
-    if( vreg_ctr[ VREG_C_BT_REMAIN ] <= BATT_TH_LO )
-    {
-        return NTR_PM_BT_EMPTY;
-    }
-    else
-    {
-        return NTR_PM_BT_ENOUGH;
-    }
-}
diff --git a/branches/2.2A_SDK5(4thNUP)/pm.h b/branches/2.2A_SDK5(4thNUP)/pm.h
deleted file mode 100644
index 6baa5d7..0000000
--- a/branches/2.2A_SDK5(4thNUP)/pm.h
+++ /dev/null
@@ -1,221 +0,0 @@
-#ifndef __PM__
-#define __PM__
-
-
-
-#define IIC_SLA_PMIC              0x84
-#define IIC_SLA_BT_GAUGE          0x6C
-
-#define VCOM_DEFAULT_T  92
-#define VCOM_DEFAULT_B  95
-
-
-
-#define BATT_TH_LO           10
-#define BATT_TH_EMPTY        5
-
-// �d�����W�X�^�ƒ��ڔ�r�ł���p�ɃI�t�Z�b�g
-#define V_BT_4000MV          (u16)( 4000 * 12.8 )		// �d���ǂݏo�����s�p 4000mV�ݒ�
-#define V_TH_30              (u16)( 3300 * 12.8 )		// 30%
-#define V_TH_LO              (u16)( 3200 * 12.8 )		// 10%
-#define V_TH_EMPTY           (u16)( 3150 * 12.8 )		//  5%
-#define V_TH_ZERO            (u16)( 3100 * 12.8 )		//  0%
-#define V_TH_FORCE_OFF       (u16)( 2900 * 12.8 )		// 2.9V �ŏI�����f
-
-
-//=========================================================
-#ifdef _WIN32
-#define LED_CHARGE           mcuRegP[ _P2_4 ]
-#else
-#define LED_CHARGE           P2.4
-#endif
-
-
-//=========================================================
-enum PMIC_REG_ADRS
-{
-  PM_REG_ADRS_VER = 0x00,       // verinfo �Ȃ�
-  PM_REG_ADRS_VDD_SYS,          // �V�X�e�����g�p����d��
-  PM_REG_ADRS_VDD_LCD,          // �t���d��
-  PM_REG_ADRS_CONT,             // /RESET1, LoadSwitch
-  PM_REG_ADRS_BL,               // �o�b�N���C�g on/off
-  PM_REG_ADRS_POW_SAVE,         // �ȓd�͐ݒ�
-  PM_REG_ADRS_POW_DAC1,
-  PM_REG_ADRS_POW_DAC2
-};
-
-enum BT_GAUGE_REG_ADRS
-{
-  BT_GAUGE_REG_VCELL    = 0x02,    // ���ꂼ��16�r�b�g�̂���
-  BT_GAUGE_REG_SOC      = 0x04,
-  BT_GAUGE_REG_MODE     = 0x06,
-  BT_GAUGE_REG_VERSION  = 0x08,
-  BT_GAUGE_REG_OCV      = 0x0E,
-  BT_GAUGE_REG_RCOMP    = 0x0C,
-  BT_GAUGE_REG_LOCK     = 0x3E,
-  BT_GAUGE_REG_BT_PARAM = 0x40,
-  BT_GAUGE_REG_COMMAND  = 0xFE
-};
-
-
-typedef enum BT_VENDER
-{
-    BT_VENDER_MAXELL = 0,               // �V���[�g
-    BT_VENDER_1,                       // 120
-    BT_VENDER_2,                       // 360
-    BT_VENDER_3,                       // 750
-    BT_VENDER_4,                       // 1.3k
-    BT_VENDER_PANA   = 5,              // 2.7k
-    BT_VENDER_6,                       // 8.2k
-    BT_VENDER_OPEN = 7,                // open
-    BT_VENDER_NOT_CHECKED = 0xFF,
-}BT_VENDER;
-
-
-
-enum NTR_PM_BT_STATUS{
-    NTR_PM_BT_ENOUGH,
-    NTR_PM_BT_EMPTY,
-    NTR_PM_BT_NOT_INITIALIZED = 0xFF
-};
-
-
-
-//=========================================================
-// CODEC���PMIC�݊����W�X�^
-#define CODEC_REG_PM 0x10
-#define CODEC_REG_BL 0x11
-#define CODEC_REG_BT 0x12
-//#define CODEC_REG_VOL 0x13   // ...�s���ɂ��Aadc.h�Œ�`
-
-// TWL��SPI��PMIC�ɓ������R�}���h
-#define REG_BIT_TWL_REQ_OFF_REQ  ( 1 << 6 )
-#define REG_BIT_TWL_REQ_RST_REQ  ( 1 << 0 )
-#define REG_BIT_TWL_REQ_BL       ( 3 << 2 )
-
-
-
-
-// 0x03 pw cnt3
-#define PM_REG_BIT_LDSW      ( 1 << 0 )
-#define PM_REG_BIT_nRST1     ( 1 << 1 )
-
-// 0x01 pw cnt1
-#define PM_REG_BIT_VDD_CTR   0x0F
-#define PM_REG_BIT_VDD_SNK   0x0B		// 2.8V�s�v
-#define PM_REG_BIT_VDD50A    ( 1 << 4 )
-
-// 0x02 pw cnt2
-#define PM_REG_BIT_VDDLCD_CGS    0x07
-#define PM_REG_BIT_VDDLCD_AMO    0x05
-#define PM_REG_BIT_LCD_VCS   ( 0x01 << 4 )
-#define PM_REG_BIT_LCD_TCOM  ( 0x01 << 3 )
-
-// 0x04 bl cnt
-#define PM_REG_BIT_BL_U         0x01
-#define PM_REG_BIT_BL_L         0x02
-
-
-// 0x05 pow save
-#define PM_REG_BIT_VDD1P_1R15   bits8(0,0,0,0, 0,0,0,0)
-#define PM_REG_BIT_VDD1P_1R05   bits8(0,0,0,0, 1,0,0,0)
-#define PM_REG_BIT_VDD1P_1R00   bits8(0,0,0,1, 0,0,0,0)
-#define PM_REG_BIT_VDD1P_0R90   bits8(0,0,1,0, 0,0,0,0)
-#define PM_REG_BIT_VDD_AUTO     bits8(0,0,0,0, 0,1,1,1)
-#define PM_REG_BIT_VDD_PWM      bits8(0,0,0,0, 0,0,0,0)
-
-
-#define DELAY_PM_TW_PWUP               16 + 2
-#define DELAY_PM_TSS_50B_AND_TCOM      17 + 1
-#define DELAY_PM_5V_TO_TCOM            17 + 1
-#define DELAY_PM_TCOM_TO_VCS           3
-#define DELAY_PM_VCS_TO_BL             ( 17 + 5 )
-#define DELAY_PM_LCD_OFF               ( 50 + 1 )
-
-
-//=========================================================
-extern u8	raw_adc_temperature;
-extern BT_VENDER	battery_manufacturer;
-extern bit	bt_force_update;
-
-extern u8	pmic_version;
-extern u8	mgic_version[];
-
-extern u8	pm_reg_bit_vddlcd;  // �A�����t�@�X�Ή�(�d���V�[�P���X���Ⴄ)
-
-extern u8	pmreg_v_core;		// SoC�̃R�A�d���ݒ�BSNAKE(LAGER)�ŕύX�����邽�߁B
-extern u8	pmreg_v_vdd;		// SNAKE�ł�2.8V�s�v
-
-//=========================================================
-err PM_sys_pow_on(  );
-void PM_sys_pow_off(  );
-//err PM_bt_auth(  );
-void PM_LCD_vcom_set(  );
-
-err PM_LCD_on(  );
-void PM_LCD_off(  );
-err PM_BL_set( u8 );
-
-
-void BT_chk();
-void BT_get_left();
-void pm_chk_adapter();
-
-void codec_reg_init();
-
-void set_vdd_voltages( enum family_  family );
-
-task_status_immed tski_BT_temp_update(  );
-task_status_immed tski_vcom_set(  );
-task_status_immed tski_PM_LCD_on();
-task_status_immed tski_PM_LCD_off();
-task_status_immed tski_PM_BL_set();
-
-
-err send_cmd_pmic( u8 reg, u8 dat );
-u8 read_pmic( u8 reg );
-
-
-#define PM_Chg_Stop()  { BT_TEMP_P = 0; BT_CHG_DISABLE(); LED_CHARGE = 0; bt_authorized = false; }
-//  �@������ĂԑO�ɁA���݉��x�������Ă����K�v������܂��B
-#define PM_reset()     ( send_cmd_pmic(  PM_REG_ADRS_CONT, 0x00 ) )
-
-
-//=========================================================
-
-
-// ���� //
-#define PM_LDSW_on()	( send_cmd_pmic(  PM_REG_ADRS_CONT, PM_REG_BIT_LDSW ))
-#define PM_LDSW_off()	( send_cmd_pmic(  PM_REG_ADRS_CONT, 0 ))
-
-
-// �V�X�e���d�� //
-#define PM_VDD_on()		( send_cmd_pmic(  PM_REG_ADRS_VDD_SYS, pmreg_v_vdd ))
-#define PM_VDD50A_on()	( send_cmd_pmic(  PM_REG_ADRS_VDD_SYS, ( pmreg_v_vdd | PM_REG_BIT_VDD50A )))
-#define PM_VDD_off()	( send_cmd_pmic(  PM_REG_ADRS_VDD_SYS, 0 ))
-#define PM_off()		PM_VDD_off()
-
-// CPU�d��
-#define PM_VDD_normMode()   ( send_cmd_pmic(  PM_REG_ADRS_POW_SAVE, pmreg_v_core | PM_REG_BIT_VDD_PWM ))
-#define PM_VDD_ecoMode()    ( send_cmd_pmic(  PM_REG_ADRS_POW_SAVE, PM_REG_BIT_VDD1P_0R90 | PM_REG_BIT_VDD_AUTO ))
-
-// �ق� //
-#define PM_reset_neg()	( send_cmd_pmic(  PM_REG_ADRS_CONT, ( PM_REG_BIT_LDSW | PM_REG_BIT_nRST1 )))
-#define PM_reset_ast()	( send_cmd_pmic(  PM_REG_ADRS_CONT, ( PM_REG_BIT_LDSW )))
-#define PM_chk_LDSW()	( read_pmic( PM_REG_ADRS_CONT ) & PM_REG_BIT_LDSW )
-// �� 1�̂Ƃ��A���d��on
-
-// �t���n�d�� //
-#define PM_VDDLCD_on()	( send_cmd_pmic(  PM_REG_ADRS_VDD_LCD, pm_reg_bit_vddlcd ))
-#define PM_TCOM_on()	( send_cmd_pmic(  PM_REG_ADRS_VDD_LCD, ( pm_reg_bit_vddlcd | PM_REG_BIT_LCD_TCOM )))
-#define PM_VCS_on()		( send_cmd_pmic(  PM_REG_ADRS_VDD_LCD, ( pm_reg_bit_vddlcd | PM_REG_BIT_LCD_VCS | PM_REG_BIT_LCD_TCOM )))
-#define PM_TCOM_off()   ( send_cmd_pmic(  PM_REG_ADRS_VDD_LCD, ( pm_reg_bit_vddlcd | PM_REG_BIT_LCD_VCS )))
-#define PM_TCOM_VCS_off() PM_VDDLCD_on()
-#define PM_VDDLCD_off() ( send_cmd_pmic(  PM_REG_ADRS_VDD_LCD, 0 ) )
-
-#define PM_set_BL( dat )	( send_cmd_pmic(  PM_REG_ADRS_BL, dat ) )
-#define PM_set_adc1( dat )	( send_cmd_pmic(  PM_REG_ADRS_POW_DAC1, dat ) )
-#define PM_set_adc2( dat )	( send_cmd_pmic(  PM_REG_ADRS_POW_DAC2, dat ) )
-
-
-#endif // __PM__
diff --git a/branches/2.2A_SDK5(4thNUP)/pool.h b/branches/2.2A_SDK5(4thNUP)/pool.h
deleted file mode 100644
index 81c8091..0000000
--- a/branches/2.2A_SDK5(4thNUP)/pool.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef _pool_h_
-#define _pool_h_
-
-
-#include "pedometer.h"
-
-#define VREG_C_FREE_SIZE     200
-
-// �󂢂Ă郁����
-typedef struct _st_vreg_c_ext{
-    unsigned short pedo_log[ PEDOMETER_LOG_SIZE ];
-    unsigned char vreg_c_free[ VREG_C_FREE_SIZE ];
-}st_vreg_c_ext;
-
-typedef union _uni_pool
-{
-    st_vreg_c_ext vreg_c_ext;
-    u8 self_update_work[ 256 ]; // 256�ȏ�͂܂Ƃߏ����ł��Ȃ�
-}uni_pool;
-
-extern uni_pool pool;
-
-
-#endif
diff --git a/branches/2.2A_SDK5(4thNUP)/reboot.c b/branches/2.2A_SDK5(4thNUP)/reboot.c
deleted file mode 100644
index 53912a5..0000000
--- a/branches/2.2A_SDK5(4thNUP)/reboot.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/********************************************************//*
-  �ނ��胊�u�[�g
-
-  �t�@�C�����ɃC�����C���A�Z���u��������ƁA
-  ���̃��W���[���S���œK���������Ȃ��Ȃ邽�ߒǂ��o����
- $Id$
- **********************************************************/
-#pragma SFR
-
-#include "incs_loader.h"
-
-
-void my_reboot(){
-#asm
-
-    MOV     PSW,#06H                ; �_�~�[��PSW���Z�b�g
-    MOVW    AX,#000d0h              ; ���Z�b�g�̃x�N�^�l����荞��ł��܂��B
-    PUSH    PSW
-    PUSH    AX                      ; �����RETI�̂��߂̃X�^�b�N������
-    RETI                            ; ����Ń��Z�b�g�E�x�N�^�ɕ���
-
-#endasm
-}
diff --git a/branches/2.2A_SDK5(4thNUP)/reboot.h b/branches/2.2A_SDK5(4thNUP)/reboot.h
deleted file mode 100644
index c20e11e..0000000
--- a/branches/2.2A_SDK5(4thNUP)/reboot.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __MYREBOOT__
-#define __MYREBOOT__
-
-void my_reboot();
-
-#endif
diff --git a/branches/2.2A_SDK5(4thNUP)/renge/renge.c b/branches/2.2A_SDK5(4thNUP)/renge/renge.c
deleted file mode 100644
index 19bee20..0000000
--- a/branches/2.2A_SDK5(4thNUP)/renge/renge.c
+++ /dev/null
@@ -1,313 +0,0 @@
-#ifndef _WIN32
-
-#pragma section @@CODE ROM_CODE
-#pragma nop
-#pragma ei
-#pragma di
-#pragma sfr
-
-#endif
-
-
-#ifdef _WIN32
-typedef unsigned char bit;
-typedef unsigned char u8;
-#endif
-
-/******************************************************************************
- �^�X�N�V�X�e���H
-  �Ȃ�قǁAiTRON�ɂ̓R���t�B�M�����[�^������͂����B
-  �����܂���
-  ctr_mcu_config.rb �Q�ƁB task_config.h���쐬����܂��B
- *****************************************************************************/
-#include "renge.h"
-#include "renge_task_intval.h"
-#include "renge_task_immediate.h"
-#include "..\WDT.h"
-#include "..\config.h"
-#include "..\user_define.h"
-#include "..\util_funcs.h"
-
-
-#ifdef _WIN32
-#include "../sim/simOnWin.h"
-#endif
-//#define _renge_test_
-
-#define true 1
-#define false 0
-
-//******************************************************************************
-u8 renge_flg_interval;
-bit renge_task_interval_run_force;
-bit renge_task_immediate_not_empty;
-
-
-#include "..\bsr_system.h"
-extern system_status_ system_status;
-
-
-//******************************************************************************
-static void renge_task_immed_init();
-static void renge_task_immed_del();
-
-
-
-//******************************************************************************
-task_status_immed ( *tasks_immed[ TASK_IMMED_RUN_LIST_MAX ] )();
-
-
-
-/******************************************************************************
-  ������
-�E�^�X�N�V�X�e���̓��I�����̏�����
-�E�C���^�[�o���^�C�}
- *****************************************************************************/
-void renge_init(){
-  renge_task_immed_init();
-  /*
-    �C�x���g�^�C�}�̃Z�b�g�Ȃ�
-    �����RTC�𗬗p���Ă���̂ŃR�����g�A�E�g
-    #define renge_tick 19xxxxxxx [ms]
-    renge_interval_init(); �� RTC_init();
-   */
-}
-
-
-
-/******************************************************************************
- �V�X�e���`�b�N��i�߂�
- *****************************************************************************/
-/*
-void renge_interval(){
-// RTC����������
-��__interrupt void int_rtc_int();
-}
-*/
-
-
-
-/******************************************************************************
- �R���p�C�����Ɍ��܂��Ă���A�C���^�[�o���N���̃^�X�N
-  ���̂����A�����N���ƍ����邩������Ȃ��B
- *****************************************************************************/
-__callt err renge_task_interval_run(){
-  u8 i;
-
-  // �C���^�[�o���N��
-    DI_wt_chk();
-  if(( renge_flg_interval != 0 ) ||
-     ( renge_task_interval_run_force )) /// ���������������ȁc
-  {
-      renge_task_interval_run_force = false;  // ������N������^�X�N�A���荞�ރ^�X�N�Ńt���O�����‚����Ȃ̂�
-      if( renge_flg_interval != 0 )
-      {
-          renge_flg_interval --;
-          WDT_Restart(  );
-      }
-      EI();
-      for( i = 0; i != TSK_LAST; i ++ )
-      {
-          tasks[ i ]();
-          // �����N���^�X�N����������Ԃɋ���
-          renge_task_immed_run();
-      }
-  }
-  EI();
-  return( ERR_SUCCESS );
-}
-
-
-
-/*****************************************************************************
- ������N���^�X�N��
-
- ��task_immed ��Ԃ��֐��B
- ���V�X�e��tick�A���炩�̊��荞�݁iI2C�ʐM�����Ȃǁj��
- �X���[�v���畜�A�����^�C�~���O�Ŏ��s����܂��B
-
-���Ԓl�@TSKI_FINISHED�@�^�X�N���폜
-�@�@�@�@����ȊO     ���̃^�C�~���O�ł܂����s
-
- *****************************************************************************/
-
-
-/**************************************
- **************************************/
-void renge_task_immed_init(){
-    u8 i;
-
-    for( i = 0; i < TASK_IMMED_RUN_LIST_MAX; i++ ){
-        tasks_immed[ i ] = TSK_IMM_EMPTY_;
-    }
-}
-
-
-
-/**************************************
-  �������s�^�X�N�̓o�^
-  ���荞�݋֎~ 36us ��
- **************************************/
-__callt err renge_task_immed_add( task_status_immed (*new_task)() ){
-    u8 i;
-
-    // ���X�g�̋󂫂̐擪�ɓo�^
-    // �폜�����΂���̃^�X�N�́A�폜�}�[�N(TSK_IMM_DELETED_)�ƂȂ�A�󂫂Ƃ͖����I�ɋ�ʂ����
-    // �d���o�^�������
-    for( i = 0; i < TASK_IMMED_RUN_LIST_MAX; i ++ )
-    {
-        DI_wt_chk();
-        if( tasks_immed[ i ] == TSK_IMM_EMPTY_ )
-        {
-            // �󂫂����‚���
-            tasks_immed[ i ] = new_task;
-            EI();
-            return( ERR_SUCCESS );
-        }
-        else
-        {
-            // �d���o�^�`�F�b�N
-            /// �������ɂȂ��ĂȂ��A�O�l�߂���Ă�O��
-            if( tasks_immed[ i ] == new_task )
-            {
-                // �d���o�^�͂��Ȃ�
-                EI();
-                return( ERR_ERR );
-            }
-        }
-        EI();
-    }
-    // �^�X�N�o�^������(�����͂�
-    return( ERR_ERR );
-}
-
-
-
-/**************************************
-  �������s�^�X�N�̎��s
- **************************************/
-__callt err renge_task_immed_run(){
-    u8 list_id;
-
-//    while( tasks_immed[ 0 ] != TSK_IMM_EMPTY_ )
-    if( tasks_immed[ 0 ] != TSK_IMM_EMPTY_ )
-    {
-        DI_wt_chk();
-        for( list_id = 0; list_id < TASK_IMMED_RUN_LIST_MAX; list_id ++ ){
-            if( tasks_immed[ list_id ] == TSK_IMM_EMPTY_ ){
-                // ���X�g����
-                EI();
-                break;
-            }
-#ifdef _renge_test_
-            else if( tasks_immed[ list_id ] == TSK_IMM_DELETED_ )
-            {
-                EI();
-                NOP();
-                // �^�X�N�Ǘ��̕s��
-                // ���݂��Ȃ��^�X�N�����s���悤�Ƃ���
-                // �^�X�N�̍폜��̏������܂���
-                // �\�����Ȃ��^�C�~���O�� immed_run ���Ă΂ꂽ
-            }
-#endif
-            else
-            {
-                u8 rv;
-
-                EI();
-                rv = tasks_immed[ list_id ]();	// �^�X�N���s
-                if( rv == ERR_SUCCESS )
-                {
-                    tasks_immed[ list_id ] = TSK_IMM_DELETED_;
-                }
-				// ����ǂ��^�C�~���O�œ����^�X�N�̓o�^������ƍ���̂�DI��Ԃł������ė��鎖������
-            }
-            DI_wt_chk();
-        }
-        // ���X�g��̃^�X�N����ʂ���s����
-
-        // �^�X�N�폜 //
-        {
-            u8 i = 0; // ���X�g�̕��בւ���
-            u8 j = 1;
-
-            // �K�� i < j�Aj < TASK_IMMED_RUN_LIST_MAX (�łȂ��ƃ^�X�N���ӂ�)
-            while( 1 )
-            {
-                if( tasks_immed[ i ] == TSK_IMM_EMPTY_ )
-                {
-                    // �O�l�ߊ��� && ���X�g�����
-                    // break;
-                    goto imm_list_sort_fin;
-                }
-                else if( tasks_immed[ i ] == TSK_IMM_DELETED_ )
-                {
-                    for( ; j < TASK_IMMED_RUN_LIST_MAX; j++ )
-                    {
-                        if( tasks_immed[ j ] == TSK_IMM_DELETED_ )
-                        {
-                            // �ׁi�H�j���폜�Ώۂ�����
-                            // next j
-                        }
-                        else
-                        {
-                            DI_wt_chk();
-                            if( tasks_immed[ j ] == TSK_IMM_EMPTY_ )
-                            {
-                                do{
-                                    j --;
-                                    tasks_immed[ j ] = TSK_IMM_EMPTY_;
-                                    // ���X�g�O�l�ߊ���
-                                }while( i < j );
-                                EI();
-                                goto imm_list_sort_fin;
-                            }
-                            else
-                            {
-                                // �O�l�߂��ׂ��^�X�N�����‚���
-                                tasks_immed[ i ] = tasks_immed[ j ];
-                                tasks_immed[ j ] = TSK_IMM_DELETED_;
-                                i ++;
-                                EI();
-                            }
-                        }
-                    }
-                }
-                else
-                {
-                    // ���̃^�X�N�A�ؗ�
-                }
-                i ++;
-            }
-        }
-    }
-
-imm_list_sort_fin:
-        // �����܂łŊ��S�ɑO�l�߂���Ă���
-#ifdef _renge_test_
-        /// �ق��?
-        {
-            u8 a,b;
-
-            a = 0;
-            for( b = 0 ; b < TASK_IMMED_RUN_LIST_MAX; b++ )
-            {
-                if( tasks_immed[ b ] == TSK_IMM_EMPTY_ )
-                {
-                    a = 1;
-                }
-                else
-                {
-                    if( a != 0 )
-                    {
-                        NOP();    // EMPTY�����Ƀ^�X�N��deleted���L��
-                    }
-                }
-            }
-        }
-#else
-        NOP();  // �Ȃ񂩖����ƃ����J���{��
-#endif
-//  }
-    return( ERR_SUCCESS );
-}
diff --git a/branches/2.2A_SDK5(4thNUP)/renge/renge.h b/branches/2.2A_SDK5(4thNUP)/renge/renge.h
deleted file mode 100644
index 9c7b2e4..0000000
--- a/branches/2.2A_SDK5(4thNUP)/renge/renge.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef __renge__
-#define __renge__
-
-//******************************************************************************
-
-
-
-//******************************************************************************
-#include "renge_defs.h"
-#include "renge_task_immediate.h"
-// #include "renge_task_interval_run.h" // �O���狭���N���֎~�I
-
-//******************************************************************************
-void renge_init();
-void renge_task_immed_init();
-__callt err renge_task_immed_run();
-__callt err renge_task_immed_add( task_status_immed (*p_task_func)() );
-// static err renge_task_immed_del( u8 );
-
-
-//******************************************************************************
-__callt err renge_task_interval_run();
-extern u8 renge_flg_interval;
-extern bit renge_task_interval_run_force;  // �^�X�N�������s�t���O
-
-#endif
diff --git a/branches/2.2A_SDK5(4thNUP)/renge/renge_defs.h b/branches/2.2A_SDK5(4thNUP)/renge/renge_defs.h
deleted file mode 100644
index 03c98a6..0000000
--- a/branches/2.2A_SDK5(4thNUP)/renge/renge_defs.h
+++ /dev/null
@@ -1,55 +0,0 @@
-#ifndef __renge_defs__
-#define __renge_defs__
-/******************************************************************************
-  Renge Ver.0      (2009/04/09)
-  2009- 7k4jhl R.Fujita @ RED.nintendo
-
-  OS�ɂ͂قlj����A�ȈՓI�ȃ^�X�N�V�X�e���B
-  Range �� Typo �ł͂Ȃ��ł��B�����Q�ł��B
-
-  �Ȃ�� �����Q �͑��̂œ��{���� �Q���Q
-  ���������ǖ��ɗ��–𑐂ł��B
-  �傫������ĂˁI
- ******************************************************************************/
-
-typedef unsigned char u8;
-typedef signed char s8;
-typedef unsigned short u16;
-typedef signed short s16;
-
-
-// ************************************
-#define SYS_INTERVAL_TICK 1.953
-
-
-
-// ************************************
-typedef enum _ERR
-{
-  ERR_SUCCESS = 0,
-  ERR_ERR
-}err;
-
-
-typedef enum _IMMED_TASK_ERR
-{
-  TSKI_FINISHED = 0,
-  TSKI_CONTINUE
-}IMMED_TASK_ERR;
-
-
-
-/**************************************
- �C���^�[�o���N��
- *************************************/
-typedef void task_status;
-
-
-/**************************************
- ����N���̃^�X�N���X�g
- �p�~�ɂȂ邩������Ȃ���
- *************************************/
-typedef IMMED_TASK_ERR task_status_immed;
-
-
-#endif
diff --git a/branches/2.2A_SDK5(4thNUP)/renge/renge_task_config.rb b/branches/2.2A_SDK5(4thNUP)/renge/renge_task_config.rb
deleted file mode 100644
index c2de509..0000000
--- a/branches/2.2A_SDK5(4thNUP)/renge/renge_task_config.rb
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/usr/bin/ruby -Ks
-
-tasklist = Array.new
-
-
-if( ARGV[0] == nil )
-  printf( "����t�@�C�� renge_tasks.txt ���g�p���܂�" )
-  datfile = "renge_tasks.txt"
-else
-  datfile = ARGV[0]
-end
-
-if( !File.exist?( datfile ) )
-  printf("�ݒ�t�@�C�������‚���܂���B")
-  exit( 1 )
-end
-  
-
-setting = File.open( datfile )
-
-setting.each{|dat|
-  dat.chomp!
-  if( dat != nil )
-    tasklist << dat
-  end
-}
-
-tasklist.each{|dat|
-  printf( "\n%s" , dat )
-}
-printf( "\n----------\n�^�X�N�� %d \n", tasklist.size )
-
-
-#----- �ÓI�^�X�N�̗� -------------------------------------------------------
-conf = File.new( "renge_task_intval.h", "w+" )
-
-conf << "/*�X�N���v�g�ɂ�鎩�������ł��B�蓮�ŏ��������Ȃ������悢�ł�*/\n\n"
-conf << "#ifndef __renge_task__\n#define __renge_task__\n\n"
-conf << "#include \"renge_defs.h\"\n\n"
-
-conf << "enum {\n  "
-tasklist.each{|dat|
-  conf << "TSK_" << dat.upcase << ", "
-}
-conf << "TSK_LAST \n  };\n\n"
-
-
-tasklist.each{|dat|
-  conf << "extern void tsk_" << dat << "();\n"
-}
-conf << "\n"
-
-conf << "const void ( *tasks[ TSK_LAST ] )() = {\n"
-tasklist.each{|dat|
-  conf << "  tsk_" << dat << ",\n"
-}
-conf << "  };\n"
-
-conf << "\n#endif\n"
diff --git a/branches/2.2A_SDK5(4thNUP)/renge/renge_task_immediate.h b/branches/2.2A_SDK5(4thNUP)/renge/renge_task_immediate.h
deleted file mode 100644
index 9ac3bd2..0000000
--- a/branches/2.2A_SDK5(4thNUP)/renge/renge_task_immediate.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef __tasks__
-#define __tasks__
-
-#include "renge_defs.h"
-
-// *************************************
-#define TASK_IMMED_RUN_LIST_MAX 10
-
-
-extern task_status_immed tski_do_command0(  );
-extern task_status_immed tski_ntr_pmic_comm();
-extern task_status_immed tski_acc_read();
-extern task_status_immed tski_acc_write();
-//extern task_status_immed tski_acc_setup();  // accero.h
-extern task_status_immed tski_mcu_reset();
-extern task_status_immed tski_vol_update();
-
-
-// *************************************
-#define TSK_IMM_EMPTY_ ( void * )( 0x0000 )
-#define TSK_IMM_DELETED_ ( void * )( 0x0001 )
-
-
-
-#endif
diff --git a/branches/2.2A_SDK5(4thNUP)/renge/renge_task_intval.h b/branches/2.2A_SDK5(4thNUP)/renge/renge_task_intval.h
deleted file mode 100644
index 9b0d9ea..0000000
--- a/branches/2.2A_SDK5(4thNUP)/renge/renge_task_intval.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*�X�N���v�g�ɂ�鎩�������ł��B�蓮�ŏ��������Ȃ������悢�ł�*/
-
-#ifndef __renge_task__
-#define __renge_task__
-
-#include "renge_defs.h"
-
-enum TSK
-{
-  TSK_SW, TSK_ADC, TSK_BATT, TSK_LED_POW, TSK_LED_WIFI, TSK_LED_NOTIFY, TSK_LED_CAM, TSK_MISC, TSK_STATUS, TSK_SYS, TSK_LAST 
-  };
-
-extern void tsk_sw();
-extern void tsk_adc();
-extern void tsk_batt();
-extern void tsk_led_pow();
-extern void tsk_led_wifi();
-extern void tsk_led_notify();
-extern void tsk_led_cam();
-extern void tsk_misc();
-extern void tsk_status();
-extern void tsk_sys();
-
-const void ( *tasks[ TSK_LAST ] )() = {
-  tsk_sw,
-  tsk_adc,
-  tsk_batt,
-  tsk_led_pow,
-  tsk_led_wifi,
-  tsk_led_notify,
-  tsk_led_cam,
-  tsk_misc,
-  tsk_status,
-  tsk_sys,
-  };
-
-#endif
diff --git a/branches/2.2A_SDK5(4thNUP)/renge/renge_tasks.txt b/branches/2.2A_SDK5(4thNUP)/renge/renge_tasks.txt
deleted file mode 100644
index 73af545..0000000
--- a/branches/2.2A_SDK5(4thNUP)/renge/renge_tasks.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-sw
-adc
-batt
-led_pow
-led_wifi
-led_notify
-led_cam
-misc
-status
-debug
-sys
diff --git a/branches/2.2A_SDK5(4thNUP)/rtc.c b/branches/2.2A_SDK5(4thNUP)/rtc.c
deleted file mode 100644
index dd2d1a9..0000000
--- a/branches/2.2A_SDK5(4thNUP)/rtc.c
+++ /dev/null
@@ -1,182 +0,0 @@
-/* ========================================================
-  RTC
-  $Id$
- ======================================================== */
-#ifndef _WIN32
-
-#pragma sfr
-#pragma inline
-
-#endif
-
-#include "incs.h"
-
-
-#define RTC_DATA_SIZE 7
-// ========================================================
-static u8      rtc_work[RTC_DATA_SIZE];
-static bit     rtc_lock;
-static bit     rtc_dirty;
-bit     rtc_alarm_dirty;
-
-
-/********************************************//**
- �y���t�F�����̏�����
- 
- ���W�X�^�̓d�r�����r�b�g�̃Z�b�g
- ***********************************************/
-void RTC_init( void )
-{
-
-    if( !RTCEN )            // �r�b�g�������Ă����烊�u�[�g
-    {
-        RTCEN = 1;              // ���W���[��ON
-
-        // RTC�ݒ�
-        RTCC0 = bits8(0,0,0,0, 1,0,0,0);    /* �����~�A24���Ԑ��A32k�o�́u�܂��Ȃ��v�A��������荞�݂Ȃ� */
-											// (RTCE 0 RCLOE1 RCLOE0 AMPM CT2 CT1 CT0)
-        RTCC1 = bits8(1,1,0,0, 0,0,0,0);    /* �A���[�����荞�ݗL��������J�n */
-											// (WALE WALIE 0 WAFG RIFG 0 RWST RWAIT)
-        RTCC2 = bits8(1,0,0,0, 0,0,0,0);    /* �C���^�[�o��:32k/2^6=2ms�ARTCDIV�o�͂Ȃ� */
-											// (RINTE RCLOE2 RCKDIV 0 0 ICT2 ICT1 ICT0)
-
-        HOUR  = 0x00;
-        MIN   = 0x00;
-        SEC   = 0x00;
-        MONTH = 0x01;
-        DAY   = 0x01;
-        WEEK  = 0x01;           // Mon
-        YEAR  = 0x01;
-
-        ALARMWW = 0x7F;
-
-        vreg_ctr[VREG_C_MCU_STATUS] |= REG_BIT_RTC_BLACKOUT;
-    }
-    // ���荞�ݐݒ�
-    RTCIF = 0;
-    RTCIIF = 0;
-    RTCMK = 1;                  /* ���荞��(�����)�֎~ */
-    RTCIMK = 0;                 /* ���荞��(�A���[��&�C���^�[�o��)���� */
-
-    RTCE = 1;                   /* ����J�n */
-
-    RWAIT = 1;
-    while( !RWST )
-    {;}
-    RWAIT = 0;
-
-    rtc_lock = false;
-    rtc_dirty = false;
-    rtc_alarm_dirty = false;
-}
-
-
-
-/********************************************//**
- RTC �A���[�����荞��
- ***********************************************/
-__interrupt void int_rtc(  )
-{
-    RWAIT = 1;
-    while( !RWST )
-    {;}
-    // ���t���w�����
-    if( ( vreg_ctr[VREG_C_RTC_ALARM_DAY] == DAY )
-        && ( vreg_ctr[VREG_C_RTC_ALARM_MONTH] == MONTH )
-        && ( vreg_ctr[VREG_C_RTC_ALARM_YEAR] == YEAR ) )
-    {
-        set_irq( VREG_C_IRQ1, REG_BIT_RTC_ALARM );
-    }
-    RWAIT = 0;
-}
-
-
-
-/********************************************//**
- RTC �̃��[�h
- 
-  ���W�X�^�́Asec,min,hour,week,day,month,year �̏�
- ***********************************************/
-void rtc_buf_refresh(  )
-{
-    if( !rtc_lock )
-    {
-        rtc_lock = true;
-        RWAIT = 1;
-        while( !RWST )
-        {;}
-
-        memcpy( &vreg_ctr[VREG_C_RTC_SEC], &SEC, RTC_DATA_SIZE );
-        RWAIT = 0;
-//    renge_task_immed_add( tski_rtc_close );
-    }
-}
-
-
-
-/********************************************//**
- RTC �̃��C�g
-
-  set_rtc_close �Ƒ΂Ŏg���ĉ������B
-
-  �����‚̓o�b�t�@�ɃR�s�[���邾���ŁA
-  ���ۂ�RTC�ɃZ�b�g����̂�set_rtc_close()�ł��B
- ***********************************************/
-void set_rtc( u8 adrs, u8 data )
-{
-    if( !rtc_dirty )
-    {
-        rtc_dirty = true;
-        memcpy( rtc_work, &SEC, RTC_DATA_SIZE );
-//    renge_task_immed_add( tski_rtc_close );  // I2C�I�����ɍs��
-    }
-    rtc_work[adrs] = data;
-}
-
-
-
-/********************************************//**
- �K�v�Ȃ�΁ARTC���W�X�^�̍X�V
- ***********************************************/
-// task_status_immed tski_rtc_close(){
-void rtc_unlock(  )
-{
-    // ���[�h���b�N
-    rtc_lock = false;
-
-    // ���C�g���b�N
-    if( rtc_dirty )
-    {
-        rtc_dirty = false;
-        RWAIT = 1;
-        while( !RWST )
-        {;}
-        memcpy( &SEC, rtc_work, RTC_DATA_SIZE );
-        RWAIT = 0;
-    }
-
-    // �A���[���Z�b�g
-    if( rtc_alarm_dirty )
-    {
-        rtc_alarm_dirty = false;
-        WALE = 0;
-        ALARMWM = vreg_ctr[VREG_C_RTC_ALARM_MIN];
-        ALARMWH = vreg_ctr[VREG_C_RTC_ALARM_HOUR];
-        WALE = 1;
-    }
-}
-
-
-
-
-/********************************************//**
- RTC �V�X�e���`�b�N�^�C�}���荞�݃x�N�^
-
-  2^6/fXT�i1.953125 ms�j
- ***********************************************/
-__interrupt void int_rtc_int(  )
-{
-//    renge_flg_interval ++;  // �C���N�������g/�f�N�������g���߂��g���̂� DI()�s�v
-    renge_flg_interval = 1;  // set1���߂��g���̂� DI()�s�v
-}
-
diff --git a/branches/2.2A_SDK5(4thNUP)/rtc.h b/branches/2.2A_SDK5(4thNUP)/rtc.h
deleted file mode 100644
index bda575c..0000000
--- a/branches/2.2A_SDK5(4thNUP)/rtc.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef __rtc_h__
-#define __rtc_h__
-
-
-void RTC_init( void );
-void rtc_buf_refresh(  );
-void set_rtc( u8 adrs, u8 data );
-
-//task_status_immed tski_rtc_close();
-void rtc_unlock(  );
-
-// ------------------------------------
-#define RTC_32k_on()         { /*RCLOE2 = 0;*/ RCLOE0 = 1; /*P1.2 = 0;*/ PM1.2 = 0; }
-#define RTC_32k_off()        { PM1.2 = 0; RCLOE0 = 0; }
-#define RTC_32k_HI_Z()       { PM1.2 = 1; }
-
-
-// ------------------------------------
-extern bit rtc_alarm_dirty;
-
-
-#endif
diff --git a/branches/2.2A_SDK5(4thNUP)/self_flash.c b/branches/2.2A_SDK5(4thNUP)/self_flash.c
deleted file mode 100644
index a662d07..0000000
--- a/branches/2.2A_SDK5(4thNUP)/self_flash.c
+++ /dev/null
@@ -1,635 +0,0 @@
-/* ========================================================
-  ���ȃA�b�v�f�[�^
-  $Id$
- ======================================================== */
-#ifndef _WIN32
-
-#pragma SFR
-#pragma di
-#pragma ei
-#pragma nop
-#pragma stop
-#pragma halt
-
-#endif
-
-#include "incs_loader.h"
-
-#include <fsl.h>
-#include "fsl_user.h"
-#include "i2c_ctr.h"
-#include "i2c_mcu.h"
-
-#include "pool.h"
-#include "magic.h"
-
-#include "pm.h"
-#include "WDT.h"
-#include "util_funcs.h"
-
-
-// ========================================================
-const u8 fsl_fx_MHz_u08 = 8;
-const u8 fsl_low_voltage_u08 = 1;
-
-
-// ���ȃt���b�V���p�����[�^
-#define SAM_BLOCK_SIZE                 1024
- // ��256�o�C�g�ȏ�͂܂Ƃ߂Ă����܂���B
-#define SELF_UPDATE_BUFF_SIZE          256
-#define SELF_UPDATE_SPLIT_WRITE_NUM    ( SAM_BLOCK_SIZE / SELF_UPDATE_BUFF_SIZE )
-#define SAM_WORD_SIZE                  4
-
-//                                    ���u���b�N�ԍ��i1�u���b�N��1kB�j
-#define INACTIVE_BOOTSECT_TOP          4
-#define FIRM_TOP                       8
-#define FIRM_SIZE                     12
-#define ALTERNATE_FIRMTOP             20
-
-
-#ifdef _MCU_BSR_
-#define ACKD       ACKD1
-#define ACKE       ACKE1
-#define COI        COI1
-#define IICAEN     IICA1EN
-#define IICAPR0    IICAPR10
-#define IICRSV     IICRSV1
-#define IICA       IICA1
-#define IICAIF     IICAIF1
-#define IICAMK     IICAMK1
-#define IICAPR1    IICAPR11
-#define IICCTL0    IICCTL01
-#define IICE       IICE1
-#define IICF       IICF1
-#define IICS       IICS1
-#define IICWH      IICWH1
-#define IICWL      IICWL1
-#define LREL       LREL1
-#define SPD        SPD1
-#define SPIE       SPIE1
-#define STCEN      STCEN1
-#define STD        STD1
-#define SVA        SVA1
-#define WREL       WREL1
-#define WTIM       WTIM1
-#endif
-
-#ifndef _WIN32
-#define LED_POW1 P4.2
-#define LED_PM_POW1 PM4.2
-#else
-#define LED_POW1	mcuRegP[ _P4_2 ]
-#define LED_PM_POW1 mcuRegPM[ _P4_2 ]
-#endif
-
-// ========================================================
-static void FSL_Open( void );
-static void FSL_Close( void );
-void     firm_restore(  );
-
-static err my_FSL_Init();
-static err firm_duplicate( u8 block_src, u8 block_dest );
-
-#ifdef _DBG_LED_PRINT_
-void alert( u8 );
-void led_print( u8 );
-#else
-# define alert( x )         ;
-# define led_print( x )     ;
-#endif
-
-
-// ========================================================
-extern uni_pool pool;
-
-
-// 0.D�ȍ~ �V�A�b�v�f�[�^����
-// �V�t�@�[���͑��v�H
-#define N_MGC_L   0x1FF6
-#define N_MGC_T   0x4FF6
-
-
-
-/********************************************//**
-  I2C�Ŏ�M���āA
-
-  �������݁A
-
-  �`�F�b�NOK�@���@�V�t�@�[���ɐ؂�ւ��čċN��
-
-  �@�@�@�@NG�@���@���i���j�t�@�[���ɖ߂��čċN��
-
-  �i���̊֐�����͖߂�܂���j
- ***********************************************/
-void firm_update(  )
-{
-    u8      target_block;
-    u8      split_write_count;  // �u���b�N�ւ��܂��܏������ރJ�E���^
-
-    // �����ւ��O���� /////////////////////////////////////
-    my_FSL_Init();
-
-    /* �t�@�[���̃o�b�N�A�b�v
-    �J�n�A�h���X�A�������ݐ�̐擪�h�u���b�N�ԍ��h (�T�C�Y�� FIRM_SIZE)
-       0x2000 - 0x4FFF ��
-       0x5000 - 0x7FFF (�u���b�N 20 - 31) �ɃR�s�[
-     */
-    firm_duplicate( FIRM_TOP,
-                    ALTERNATE_FIRMTOP );
-
-    // �S�u���b�N�폜 /////////////////////////////////////
-    // �d���f�𔻒肷�邽�߁A�ŏ��ɑS�N���X�^��������
-    //�i�V�t�@�[�����������Ƃ���Ɏc���Ă�A�ȑO�̃t�@�[���̃t�b�^�����������j
-    for( target_block = INACTIVE_BOOTSECT_TOP;
-         target_block < ALTERNATE_FIRMTOP;
-         target_block ++ )
-    {
-        FSL_Erase( target_block );
-    }
-
-
-    // �����ւ� ///////////////////////////////////////////
-    // ���X�g�b�v�R���f�B�V����������܂ő�����
-    // ���I�������A�X�^�[�g�A�b�v���[�`���ɔ��
-    for( target_block = INACTIVE_BOOTSECT_TOP;
-         target_block < ALTERNATE_FIRMTOP;
-         target_block ++ )
-    {
-            u8      my_spd;
-
-/* ���łɏ����Ă���B�łȂ��ƒ��f���ꂽ�Ƃ��I�����Ă邩���ʏo���Ȃ�
-//          // �V�t�@�[���̈�폜
-//        FSL_Erase( target_block );
-*/
-        // ������������
-        for( split_write_count = 0;
-             split_write_count < SELF_UPDATE_SPLIT_WRITE_NUM;
-             split_write_count ++ )
-        {
-            u8*     p_buffer = &pool.self_update_work[0];
-            u16     buff_written_size = 0;
-
-            WDT_Restart(  );
-
-            // I2C���珑�����݃f�[�^���o�b�t�@�ɂ��߂�
-            do
-            {
-                while( !IICAIF && !SPD )
-                {;}
-                my_spd = SPD;
-                IICAIF = 0;
-                *p_buffer = IICA;
-                WREL = 1;
-                p_buffer ++;
-                buff_written_size ++;
-            }
-            while( ( buff_written_size != SELF_UPDATE_BUFF_SIZE )
-                   && !SPD );
-
-            my_spd += SPD;
-
-            // ��������
-            // �Ōゾ�ƁA�S�~���p�f�B���O���邪�ʂɂ��܂�Ȃ�
-            if( FSL_Write( ( fsl_u32 ) ( target_block * SAM_BLOCK_SIZE
-                                         + split_write_count * SELF_UPDATE_BUFF_SIZE ),
-                           ( fsl_u08 ) ( SELF_UPDATE_BUFF_SIZE / SAM_WORD_SIZE ) )
-
-                != FSL_OK )
-            {
-                alert(1);
-                // �������݌�̃`�F�b�N�G���[
-                // ���X�g�A
-                firm_duplicate( ALTERNATE_FIRMTOP, FIRM_TOP );
-                FSL_ForceReset(); // ���Z�b�g
-                // FSL_SwapBootCluster(  );  // �u�[�g�X���b�v�u�����Ɂv�ċN�����ďo���Ȃ��炵��
-                // �߂��Ă��Ȃ� //
-            }
-
-            if( my_spd != 0 )
-            {
-                break;
-            }
-        }
-
-        // 1�u���b�N�������݊����B�����x���t�@�C���s��
-        if( FSL_IVerify( target_block ) != FSL_OK ){
-            alert(2);
-            // �ēx�������������� �x���t�@�C���J��Ԃ���������_���ł���... /// �ď������݂��ׂ��H
-            // ���X�g�A
-            firm_duplicate( ALTERNATE_FIRMTOP, FIRM_TOP );
-            FSL_ForceReset(); // ���Z�b�g
-            // FSL_SwapBootCluster(  );  // �u�[�g�X���b�v�u�����Ɂv�ċN�����ďo���Ȃ��炵��
-            // �߂��Ă��Ȃ� //
-        }
-
-        if( my_spd != 0 )
-        {
-            break;
-        }
-    }
-
-    LREL = 1;
-
-    // �������񂾃t�@�[���̃`�F�b�N //
-    {
-        u8      i;
-        u8      comp = 0;
-
-        // ���[�_�[�̃}�W�b�N�ƁA�{���̖����̃}�W�b�N�͓������m�F
-        for( i = 0; i < sizeof( __TIME__ ); i++ )
-        {
-            comp += (u8)(( (*( __far u8 * ) ( N_MGC_L + i )) == (*( u8 * ) ( N_MGC_T + i ) )) ? 0 : 1);
-        }
-        if( *( __far u8 * )( N_MGC_L +2 ) != ':' )  // �����ς̂܂�
-        {
-            comp ++;
-        }
-
-        if( comp == 0 )
-        {
-            // OK!
-            FSL_InvertBootFlag(  );
-            FSL_SwapBootCluster(  );  // ���Z�b�g�����ɓ�����BFSL_Close�͕s�v
-        }
-        else
-        {
-            // �f�[�^(�}�W�b�N�i���o�[�������ĂȂ�)�G���[
-            // ���X�g�A
-            alert(3);
-
-            firm_duplicate( ALTERNATE_FIRMTOP, FIRM_TOP );
-            FSL_ForceReset(); // ���Z�b�g
-            // FSL_SwapBootCluster(  );  // �u�[�g�X���b�v�u�����Ɂv�ċN�����ďo���Ȃ��炵��
-        }
-        // �߂��Ă��Ȃ� //
-    }
-}
-
-
-
-
-/********************************************//**
-�t�@�[�����o�b�N�A�b�v�̈悩�烊�X�g�A���܂��B
-
-�`�F�b�N��A�Ō�̍Ō�Ńu�[�g�X���b�v����̂ŁA
-�����ł̓u�[�g�X���b�v�͕s�v�ł��B
- ***********************************************/
-void firm_restore(  )
-{
-    DBG_LED_on;
-    LED_PM_POW1 = 0;
-
-    // �o�b�N�A�b�v�͐���H //
-    {
-        u16      i;
-        u8      comp = 0;
-
-        for( i = 0; i < sizeof( __TIME__ ); i++ )      // sizeof( __TIME__ ) = 8 �炵
-        {
-            comp += ( *( __far u8 * )( MGC_LOAD + i ) == *( u8 * )( MGC_HEAD_BKUP + i ) ) ? 0 : 1;
-            comp += ( *( u8 * )( MGC_HEAD_BKUP + i ) == *( u8 * )( MGC_FOOT_BKUP + i ) ) ? 0 : 1;
-        }
-        if( *( u8 * )( MGC_FOOT_BKUP ) == 0xFF )
-        {
-            comp ++;
-        }
-
-        if( comp != 0 )
-        {
-            // �o�b�N�A�b�v�̈����ꂽ...
-            comp = 0;
-
-            // 3.3V���オ��Ȃ��ƍ���
-            EI(  );
-            iic_mcu_start(  );
-            RESET2_ast;
-            FCRAM_RST_ast;
-            GYRO_DISABLE();
-            PM_LDSW_on();
-            wait_ms( 1 + DELAY_PM_TW_PWUP );
-            PM_VDD_on(  );
-
-            while(1)
-            {
-                WDT_Restart();
-
-                {
-                    // ��LED �s�R�s�R
-                    comp++;
-                    LED_POW1 = ( comp == 1 || comp == 3 )? 1: 0;
-                    if( comp == 8 )
-                    {
-                        comp = 0;
-                    }
-                }
-
-                {
-                    // �d���{�^���œd��off
-                    static u8 sw_hold_count;
-
-                    if( !SW_POW_n_RAW )
-                    {
-                        sw_hold_count++;
-                    }
-                    else
-                    {
-                        sw_hold_count = 0;
-                    }
-
-                    if( sw_hold_count > 16 )
-                    {
-                        sw_hold_count = 0;
-                        // �d��off
-                        PM_LDSW_off(  );
-
-						// pwsw�҂��ŐQ��
-						KRM = ( KR_SW_POW );				// Mask �ł͂Ȃ��AMode
-						MK0 = 0xFFFF;
-						MK1 = ~( INT_MSK1_KR );
-						MK2L = 0xFF;
-
-						// PU5 ���̂܂�
-						PU7  = bits8(0,0,0,0, 1,0,0,0);		// PWSWI
-						PU20 = bits8(0,0,0,0, 0,0,0,0);     // SW_HOME ��~
-
-						STOP(  );
-
-//		                mcu_wdt_reset;	// �������[�v����̂͂悭�Ȃ��Ǝv��
-
-//						while(1){
-//							NOP();		// ���Ȃ�
-//						}
-					}
-                }
-
-                // �E�F�C�g
-                for( i = 1; i != 0; i++ )
-                {
-                    NOP();
-                    NOP();
-                    NOP();
-                    NOP();
-                }
-            }
-        }
-    }
-
-	// else{		// �o�b�N�A�b�v�͐����Ă���
-
-	while( my_FSL_Init() != ERR_SUCCESS ){	// FSL���������s����悤�Ȃ�����~���Ȃ�...
-		// todo ���g���C�񐔏���H
-        alert(1);
-    }
-
-    /* �t�@�[���̃��X�g�A
-       0x4800 - 0x7FFF (�u���b�N 18 - 27) ����
-       0x2000 - 0x47FF (�u���b�N  8 - 17) �փR�s�[
-     */
-    if( firm_duplicate( ALTERNATE_FIRMTOP, FIRM_TOP ) != ERR_SUCCESS )
-    {
-        alert(2);
-    }
-    DBG_LED_off;
-
-    // todo ���X�g�A���s������ALED���������Ƃ������āA�T�[�r�X����ɂ��Ă��炤�H
-
-    FSL_ForceReset();	// ���Z�b�g�A�߂��Ă��Ȃ�
-}
-
-
-
-/********************************************//**
-�����t���b�V���̏��������̂��߂̑O����
- ***********************************************/
-static void FSL_Open( void )
-{
-    /* save the configuration of the interrupt controller and set */
-#ifdef   FSL_INT_BACKUP
-    fsl_MK0L_bak_u08 = MK0L;    /* if (interrupt backup required)                 */
-    fsl_MK0H_bak_u08 = MK0H;    /* {                                              */
-    fsl_MK1L_bak_u08 = MK1L;    /*                                                */
-    fsl_MK1H_bak_u08 = MK1H;    /*        save interrupt controller               */
-    fsl_MK2L_bak_u08 = MK2L;    /*        configuration                           */
-    fsl_MK2H_bak_u08 = MK2H;    /*                                                */
-    MK0L = FSL_MK0L_MASK;       /*                                                */
-    MK0H = FSL_MK0H_MASK;       /*                                                */
-    MK1L = FSL_MK1L_MASK;       /*        prepare interrupt controller            */
-    MK1H = FSL_MK1H_MASK;       /*        for selfprogramming                     */
-    MK2L = FSL_MK2L_MASK;       /*                                                */
-    MK2H = FSL_MK2H_MASK;       /* }                                              */
-#endif
-
-    while( DST1 ){;}            // DMA��~
-    DEN1 = 0;
-
-    MK0 = 0xFFFF;
-    MK1 = 0xFFFF;
-    MK2 = 0xFFFF;
-/*
-    LVIM = bits8(0,0,0,0, 0,0,1,0);
-    LVIS = bits8(0,0,0,0, 1,0,0,0);
-    LVIM = bits8(1,0,0,0, 0,0,1,0);
-*/
-    FSL_FLMD0_HIGH;             // �t���b�V�������ւ�����
-}
-
-
-
-/********************************************//**
-�����t���b�V���̏��������I������
- ***********************************************/
-static void FSL_Close( void )
-{
-    // ������n���H
-
-    FSL_FLMD0_LOW;              // �t���b�V�����C�g�v���e�N�g
-
-#ifdef   FSL_INT_BACKUP
-    MK0L = fsl_MK0L_bak_u08;    /*   do{                                          */
-    MK0H = fsl_MK0H_bak_u08;    /*        restore interrupt controller            */
-    MK1L = fsl_MK1L_bak_u08;    /*        configuration                           */
-    MK1H = fsl_MK1H_bak_u08;    /*                                                */
-    MK2L = fsl_MK2L_bak_u08;    /*                                                */
-    MK2H = fsl_MK2H_bak_u08;    /*   }                                            */
-#endif
-}
-
-
-
-/********************************************//**
-�@�}�C�R�����Ńt�@�[�����R�s�[���܂��B
-
-  __far u8 * p_rom  �R�s�[���̐擪�A�h���X
-
-  block_dest        �R�s�[��̐擪�u���b�N
-
-  �R�s�[��ɏ�����悤��my_FSL_Init�����炩���ߎ��s����K�v������܂��B
- ***********************************************/
-static err firm_duplicate( u8 block_src,
-                           u8 block_dest )
-{
-    u8      target_block;
-    u8      split_write_count;  // �u���b�N�ւ��܂��܏������ރJ�E���^
-    __far u8* p_src = ( __far u8* )( block_src * 0x400 );
-    u8      retry_error;
-
-    led_print(1);
-
-    // �������ݐ�u���b�N�̐������J��Ԃ�
-    for( target_block = block_dest;
-         target_block < ( block_dest + FIRM_SIZE );
-         target_block ++ )
-    {
-        led_print(2);
-        WDT_Restart(  );
-        // �u���b�N����
-        retry_error = 5 + 1;
-        while( FSL_BlankCheck( target_block ) != FSL_OK )
-        {
-            led_print(3);
-            FSL_Erase( target_block );
-            if( -- retry_error == 0 )
-            {
-                // �t���b�V�������H
-                FSL_Close(  );
-                return ( ERR_ERR );  // ���Z�b�g�����A�����݂�@�ǂ��Ȃ邩�m���
-            }
-        }
-
-        led_print(4);
-        // �����������ݕ��J��Ԃ�
-        for( split_write_count = 0;
-             split_write_count < SELF_UPDATE_SPLIT_WRITE_NUM;
-             split_write_count ++ )
-        {
-            u16     buff_written_size;
-            u8*     p_buff;
-
-            // �������݃f�[�^���o�b�t�@�ɂ��߂�
-            buff_written_size = 0;
-            p_buff = &pool.self_update_work[0];
-            do
-            {
-                *p_buff = *p_src;
-                p_src ++;
-                p_buff ++;
-                buff_written_size ++;
-            }
-            while( buff_written_size != SELF_UPDATE_BUFF_SIZE );
-
-            // ��������
-            if( FSL_Write( ( fsl_u32 ) ( target_block * SAM_BLOCK_SIZE
-                                         + split_write_count * SELF_UPDATE_BUFF_SIZE ),
-                           ( fsl_u08 ) ( SELF_UPDATE_BUFF_SIZE / SAM_WORD_SIZE ) )
-                != FSL_OK )
-            {
-                // ���J�o���̓��u�[�g�� //
-                FSL_Close(  );
-                led_print(5);
-//                while(1){}
-                return ( ERR_ERR );
-            }
-        }
-        led_print(6);
-
-        // 1�u���b�N�������݊����B�����d���`�F�b�N���s��
-        while( FSL_IVerify( target_block ) != FSL_OK )
-        {
-            // ���J�o���̓��u�[�g�� //
-            led_print(7);
-            return ( ERR_ERR );
-        }
-    }
-    return( ERR_SUCCESS );
-
-}
-
-
-
-/********************************************//**
-���Ɣœ����t���b�V���̏�����������
- ***********************************************/
-static err my_FSL_Init()
-{
-    u8 rv;
-
-    RTCE = 0;
-
-    // �����ւ��O���� //
-    DI(  );
-    FSL_Open(  );               // ���荞�݋֎~�Ȃ�
-
-    FSL_Init( &pool.self_update_work[0] );      // ���C�u�����������B���荞�ݒ��f�l������
-    rv = FSL_ModeCheck(  );   // ���C�g�v���e�N�g�`�F�b�N�B���s���邱�Ƃ��l������
-
-    return( (err)rv );
-}
-
-
-/********************************************//**
-MCU���Z�b�g
-
-system_status.reboot �������܂��B
- ***********************************************/
-task_status_immed tski_mcu_reset()
-{
-    // ���ʂɍċN��
-    my_FSL_Init();
-
-    FSL_ForceReset();           // ���Z�b�g
-    FSL_Close(  );
-
-    // �ی��H //
-    mcu_wdt_reset;
-    return( ERR_SUCCESS );      // no reach
-}
-
-
-
-/********************************************//**
-�����������ɃG���[�����������ۂ�LED��_�ł����ăG���[��ʒm
-
-�l������悤�ł͂Ȃ��A�I�V���ȂǂŃp���X�����`�F�b�N����
-
-�f�o�b�K���g���Ȃ���ԂȂ̂� LEDprintf �f�o�b�O�̂��߁B
- ***********************************************/
-#ifdef _DBG_LED_PRINT_
-// P1.5 = led_pow_red_old
-void alert( u8 num )
-{
-    u8 i;
-
-    while(1)
-    {
-        WDT_Restart();
-        LED_POW1 = 1;
-        for( i = 0; i < num; i++ )
-        {
-            DBG_LED_on;
-            DBG_LED_off;
-        }
-        LED_POW1 = 0;
-    }
-}
-
-
-/********************************************//**
-�����������ɃG���[�����������ۂ�LED��_�ł����ăG���[��ʒm�i�Q�j
-
-�l������悤�ł͂Ȃ��A�I�V���ȂǂŃp���X�����`�F�b�N����
-
-�f�o�b�K���g���Ȃ���ԂȂ̂� LEDprintf �f�o�b�O�̂��߁B
- ***********************************************/
-void led_print( u8 num )
-{
-    u8 i;
-
-    DBG_LED_on;
-    for( i = 0; i < num; i++ )
-    {
-        LED_POW1 = 1;
-        LED_POW1 = 0;
-    }
-    DBG_LED_off;
-}
-#endif
diff --git a/branches/2.2A_SDK5(4thNUP)/self_flash.h b/branches/2.2A_SDK5(4thNUP)/self_flash.h
deleted file mode 100644
index 768565e..0000000
--- a/branches/2.2A_SDK5(4thNUP)/self_flash.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef _self_flash_h_
-#define _self_flash_h_
-
-
-void firm_update();
-
-
-#endif
-
diff --git a/branches/2.2A_SDK5(4thNUP)/sw.c b/branches/2.2A_SDK5(4thNUP)/sw.c
deleted file mode 100644
index d0cd54f..0000000
--- a/branches/2.2A_SDK5(4thNUP)/sw.c
+++ /dev/null
@@ -1,209 +0,0 @@
-/* ========================================================
-�X�C�b�`
-�EHOME
-�EPOWER
-�EWiFi
-�̊Ď��^�X�N
-
- $Id$
-======================================================== */
-#ifndef _WIN32
-
-#pragma SFR
-#pragma NOP
-#pragma HALT
-#pragma STOP
-
-#endif
-
-#include "incs.h"
-
-#include "i2c_twl.h"
-#include "i2c_ctr.h"
-#include "led.h"
-#include "pm.h"
-#include "rtc.h"
-#include "sw.h"
-
-
-//=========================================================
-/*
- vreg_ctr����ǂ݂����̂Ńw�b�_��
-#define INTERVAL_TSK_SW
-#define CLICK_THRESHOLD
-
-#define HOLD_THREASHOLD
-#define FORCEOFF_THREASHOLD
-*/
-#define TIME_MUKAN					( u8)(   300 / INTERVAL_TSK_SW )
-#define TIME_MUKAN_PWSW_RED_TRIAL	(u16)( 15000 / INTERVAL_TSK_SW )	// ���V��Ahome�}�X�N����
-
-//=========================================================
-u16     SW_pow_count;
-bit     SW_pow_mask;
-
-static u8	SW_home_count, SW_wifi_count, SW_home_count_rel;
-static u8	sw_wifi_mukan_time;
-
-u16		off_timeout_timer;
-
-static u16	sw_pwsw_mukan_time;
-
-
-
-/********************************************//**
- ���������Ԃ𐔂���B�������ςȂ��ł�0�ɖ߂�Ȃ�
-
- mask����0�̎��́A��x�����܂Ŗ�������
- ***********************************************/
-#define count_sw_n( sw, counter, mask )   \
-  {                                       \
-    if( sw ){                             \
-      mask = 0;                           \
-      counter = 0;                        \
-    }else{                                \
-      if( mask != 0 ){                    \
-        counter = 0;                      \
-      }else{                              \
-        counter ++;                       \
-        if( counter == 0 ) counter = -1;  \
-      }                                   \
-    }                                     \
-  }
-
-
-/********************************************//**
- �N���b�N������(�`���^�����O����)�B�K�v�ɉ����Ċ��荞��
- ***********************************************/
-#define chk_clicked( button, count, irq_bit_name )    \
-    if( !button )                                     \
-    {                                                 \
-        if( count < CLICK_THRESHOLD )                 \
-        {                                             \
-            count ++;                                 \
-			if( count == CLICK_THRESHOLD )            \
-			{                                         \
-	            count ++;                             \
-				set_irq( VREG_C_IRQ0, irq_bit_name ); \
-			}                                         \
-        }                                             \
-    }                                                 \
-    else                                              \
-    {                                                 \
-        count = 0;                                    \
-    }                                             
-
-
-
-/********************************************//**
- �X�C�b�`�̊Ď�
-
-  �@�`���^�����O���͂˂���A��������A�������g���K�Ȃǂ̌��o���s��
- ***********************************************/
-void tsk_sw(  )
-{
-    static u8 task_interval;
-
-	if( system_status.pwr_state == OFF_TRIG )
-    {
-        SW_pow_count = 0;  // �d�������ɔ����ăN���A
-//		task_interval = 0;
-    }
-
-	if( system_status.pwr_state != ON_CHECK )  // ���莞��(PWSW_POWON_TIME)���Z���̂Ńv���X�P�[�������@�łȂ��ƃ`���^���������܂肫���Ȃ�
-	{
-		if( task_interval != 0 )
-		{
-			task_interval--;
-			return;
-			// �����܂�
-		}
-
-		task_interval = (u8)( INTERVAL_TSK_SW / SYS_INTERVAL_TICK ) -1;	// �v���X�P�[������Ɏg���Ă܂��ˁc
-																	// -1�̓|�X�g�f�N�������g�̂��߂̒���
-	}
-
-    // 8ms ���ɂ��܂�
-    switch ( system_status.pwr_state )
-    {
-    case ( ON ):
-    case ( SLEEP ):
-    case ( OFF ):
-    case ( ON_CHECK ):
-		// ���@�̏ꍇ
-        if( ! system_status.taikendai )
-        {
-            
-            // �d���X�C�b�`�̊Ď� //
-            if( SW_pow_count == ( TIME_PWSW_CLICK ) )  // �N���b�N���Ԃɓ��B
-            {
-				if( is_wifi_calib_resets_ast )	// wifi �L�����u���[�V�������Ȃ�ASoC�ɒʒm������off�ɑJ��
-				{
-		            system_status.pwr_state = OFF_TRIG;
-				}
-                set_irq( VREG_C_IRQ0, REG_BIT_SW_POW_CLICK );
-            }
-            else if( SW_pow_count == ( HOLD_THREASHOLD ) )  // �������ɓ��B
-            {
-                set_irq( VREG_C_IRQ0, REG_BIT_SW_POW_HOLD );
-                if( off_timeout_timer == 0 ) // �����d���f�J�E���g�_�E���J�n�A���x���������Ȃ��悤�ɁB
-                {
-                    off_timeout_timer = vreg_ctr[ VREG_C_OFF_DELAY ] * 16;
-                }
-            }
-
-            if( off_timeout_timer != 0 )   // ���������荞�݌�A�^�C���A�E�g�ŋ����I�t�B
-            {
-                off_timeout_timer --;
-                if( off_timeout_timer == 0 )
-                {
-                    force_off = true;
-                }
-            }
-        
-        }else{
-			// �X�^���h�A�������V��
-            // �d���X�C�b�`�̊Ď� //
-            if( SW_pow_count == ( TIME_PWSW_CLICK ) )
-            {
-                if( sw_pwsw_mukan_time == 0 )
-                {
-                    set_irq( VREG_C_IRQ0, REG_BIT_SW_POW_CLICK );
-                    // ����ȃ^�C�~���O��PWSW��������HOME���j���[�ɓ���Ă��܂��̂�������邽�߂̃}�X�N�^�C�}�[
-                    sw_pwsw_mukan_time = TIME_MUKAN_PWSW_RED_TRIAL;
-                }
-            }
-            else if( SW_pow_count == ( HOLD_THREASHOLD ) )
-            {
-                force_off = true;
-            }
-            
-            if( sw_pwsw_mukan_time != 0 )
-            {
-                sw_pwsw_mukan_time--;
-            }
-        }
-
-        count_sw_n( SW_POW_n, SW_pow_count, SW_pow_mask );        // �{�^���������Ԃ̃J�E���g
-
-        // HOME sw //
-        chk_clicked(  SW_HOME_n, SW_home_count,     REG_BIT_SW_HOME_CLICK );
-        chk_clicked( !SW_HOME_n, SW_home_count_rel, REG_BIT_SW_HOME_RELEASE );
-                
-        // wifi sw //
-        /// �ň��Ȏ����Ȃ̂͂킩���Ă��邪�A�s��ɏo�Ă��܂����s�ǃX�C�b�`���~������
-        if( sw_wifi_mukan_time != 0 )
-        {
-            sw_wifi_mukan_time--;
-        }
-        else
-        {
-            chk_clicked( SW_WIFI_n, SW_wifi_count, REG_BIT_SW_WIFI_CLICK );
-            if( SW_wifi_count == CLICK_THRESHOLD +1 ) // ���������蔭���I
-            {
-                sw_wifi_mukan_time = TIME_MUKAN;
-            }
-        }
-    }
-}
-
diff --git a/branches/2.2A_SDK5(4thNUP)/sw.h b/branches/2.2A_SDK5(4thNUP)/sw.h
deleted file mode 100644
index abe9715..0000000
--- a/branches/2.2A_SDK5(4thNUP)/sw.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _sw_
-#define _sw_
-
-#include "config.h"
-
-extern u16     SW_pow_count;
-extern bit     SW_pow_mask;
-
-#define INTERVAL_TSK_SW  8
-#define CLICK_THRESHOLD  5
-
-#define HOLD_THREASHOLD     (u16)( 3000 /INTERVAL_TSK_SW )
-#define TIME_PWSW_CLICK     (u8)(   220 /INTERVAL_TSK_SW )
-#define FORCEOFF_THREASHOLD (u8)( 12000 /INTERVAL_TSK_SW /16 )
-
-
-extern u16 off_timeout_timer;
-#define clear_pow_off_countdown(){ off_timeout_timer = 0; force_off = false; }
-
-#endif
diff --git a/branches/2.2A_SDK5(4thNUP)/task_debug.c b/branches/2.2A_SDK5(4thNUP)/task_debug.c
deleted file mode 100644
index e5b502c..0000000
--- a/branches/2.2A_SDK5(4thNUP)/task_debug.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/* ========================================================
- �f�o�b�O�^�X�N
- $Id$
- ======================================================== */
-#ifndef _WIN32
-
-#pragma SFR
-#pragma NOP
-#pragma HALT
-#pragma STOP
-
-#endif
-
-#include "incs_loader.h"
-//#include "incs.h"
-#include "renge\renge.h"
-#include "pm.h"
-#include "accero.h"
-
-
-// ========================================================
-// 7�Z�O 4�o�C�g��
-#define IIC_SLA_DBG_MONITOR   0x44
-
-
-
-#if 0 // �f�o�b�O���j�^�p�^�X�N
-
-���ӁI�@�^�X�N���X�g������O���Ă܂��̂ŁA�g���Ȃ畜�������ĉ������I
-
-/********************************************//**
- �f�o�b�O�p�^�X�N
- ***********************************************/
-void tsk_debug(  )
-{
-//    u8      temp;
-
-    /*
-    if( system_status.pwr_state == ON_TRIG ){
-    {
-    static u8 count = 0;
-    // �f�o�b�OLED�i8bit�j�̏�����
-       temp = iic_mcu_read_a_byte( IIC_SLA_8LEDS, IIC_8LEDS_REG_DO );
-       count ++;
-       iic_mcu_write_a_byte( IIC_SLA_8LEDS, IIC_8LEDS_REG_DO, count );
-       iic_mcu_write_a_byte( IIC_SLA_DBG_MONITOR, 3, count );
-    }
-    }
-     */
-
-//    iic_mcu_write_a_byte( IIC_SLA_DBG_MONITOR, 2, vreg_ctr[ VREG_C_IRQ1 ] );
-//    iic_mcu_write_a_byte( IIC_SLA_DBG_MONITOR, 1, boot_ura );
-//    iic_mcu_write_a_byte( IIC_SLA_DBG_MONITOR, 1, vreg_ctr[ VREG_C_SND_VOL ] );
-//    iic_mcu_write_a_byte( IIC_SLA_DBG_MONITOR, 1, vreg_ctr[ VREG_3D ] );
-//    iic_mcu_write_a_byte( IIC_SLA_DBG_MONITOR, 0, vreg_ctr[ VREG_C_ACC_ZH ] );
-//    iic_mcu_write_a_byte( IIC_SLA_DBG_MONITOR, 3, vreg_ctr[ VREG_C_3D ] );
-//    iic_mcu_write_a_byte( IIC_SLA_DBG_MONITOR, 2, vreg_ctr[ VREG_C_SND_VOL ] );
-//    iic_mcu_write_a_byte( IIC_SLA_DBG_MONITOR, 1, vreg_ctr[ VREG_C_STATUS ] );
-//    iic_mcu_write_a_byte( IIC_SLA_DBG_MONITOR, 0, vreg_ctr[ VREG_C_ACC_ZH ] );
-
-    /*
-    {
-        u8      str[4];
-        
-        if( ( system_status.pwr_state == ON ) || ( system_status.pwr_state == SLEEP ) )
-        {
-            str[3] = vreg_ctr[ VREG_C_FREE0 ];
-            str[2] = vreg_ctr[ VREG_C_FREE1 ];
-            str[1] = vreg_ctr[ VREG_C_STATUS ];
-            str[0] = vreg_ctr[ VREG_C_RTC_SEC ];
-
-            str[3] = vreg_ctr[ VREG_C_SND_VOL ];
-            str[2] = vreg_ctr[ VREG_C_3D ];
-            str[1] = vreg_ctr[ VREG_C_ACC_CONFIG ];
-            str[0] = SEC;
-            iic_mcu_write( IIC_SLA_DBG_MONITOR, 0x03, 4, &str );
-        }
-    }
-     */
-}
-
-#endif
-
-
-#if 0 // �^�X�N�ЂȌ`
-/********************************************//**
-�^�X�N�ЂȌ`
- ***********************************************/
-task_interval tsk_hina(  )
-{
-    switch ( system_status.pwr_state )
-    {
-    case ON_CHECK:
-    case ON_TRIG:
-    case ON:
-    case SLEEP:
-    case OFF_TRIG:
-    default:
-    }
-
-    return;  // �� tic �Ă΂�邱�ƂɂȂ�܂�
-}
-
-
-// �|�C���^�ʼn������炤�̂͊댯�ȋC�����Ă���
-/* ���̂悤�Ɏg��
-      renge_task_immed_add( �^�X�N�֐��ւ̃|�C���^ );
-*/
-
-/********************************************//**
-�^�X�N�ЂȌ`(�������s)
- ***********************************************/
-task_status_immed tski_hina( u8 * arg )
-{
-    return ( TSKI_FINISHED );
-    // TSKI_FINISHED �^�X�N���폜
-    // TSKI_CONTINUE ���ɂȂ񂩊��荞�݂Ȃ�A���[�U�[����Ȃ�A�V�X�e���`�b�N��
-    //             �����Ƃ��ɍēx���s
-}
-
-
-#endif
diff --git a/branches/2.2A_SDK5(4thNUP)/task_misc.c b/branches/2.2A_SDK5(4thNUP)/task_misc.c
deleted file mode 100644
index f13e0da..0000000
--- a/branches/2.2A_SDK5(4thNUP)/task_misc.c
+++ /dev/null
@@ -1,422 +0,0 @@
-/* ========================================================
- ���̑��G���ȃ^�X�N
- �^�X�N�𕪂����������₷���Ȃ�C�����邪�A���\�[�X�̖��ŕ����Ȃ�������
-
- $Id: task_misc.c 418 2011-09-22 01:35:37Z n2232 $
- ======================================================== */
-
-#ifndef _WIN32
-
-#pragma SFR
-#pragma NOP
-#pragma HALT
-#pragma STOP
-
-#endif
-
-#include "incs.h"
-#include "renge\renge.h"
-#include "pm.h"
-
-#include "accero.h"
-#include "adc.h"
-#include "i2c_mcu.h"
-#include "led.h"
-#include "vreg_twl.h"
-
-
-
-#ifdef _MCU_BSR_
-#define ACKD       ACKD1
-#define ACKE       ACKE1
-#define COI        COI1
-#define IICAEN     IICA1EN
-#define IICRSV     IICRSV1
-#define IICA       IICA1
-#define IICAIF     IICAIF1
-#define IICAMK     IICAMK1
-#define IICAPR0    IICAPR11
-#define IICAPR1    IICAPR01
-#define IICCTL0    IICCTL10
-#define IICE       IICE1
-#define IICF       IICF1
-#define IICS       IICS1
-#define IICWH      IICWH1
-#define IICWL      IICWL1
-#define LREL       LREL1
-#define SPD        SPD1
-#define SPIE       SPIE1
-#define STCEN      STCEN1
-#define STD        STD1
-#define SVA        SVA1
-#define WREL       WREL1
-#define WTIM       WTIM1
-#define TRC        TRC1
-#define SMC        SMC1
-#define DFC        DFC1
-#endif
-
-// ========================================================
-extern void f();	// �X�^�b�N�̍Ō�𓾂�
-
-
-// ========================================================
-bit twl_ver_read;	// twl home menu��ver��ǂ񂾂�݊��J�[�l���Ɋ��荞�݂����邽��
-bit going_to_sleep; // SoC����Asleep�ɓ���ʒm�����炤�Bslp_i ��H���Ԃ�0�ɂȂ��
-					//  �X���[�v���畜�A�ł��Ȃ��Ȃ�̂�h������
-
-
-// �����e�X�g�p
-bit reserve_pedo_increnent;  
-
-
-// ========================================================
-static void update_LED_3D();
-static void check_twl_vol_irq();
-
-
-
-/********************************************//**
- �P�i�Ń^�X�N�ɂ��Ȃ��G���ȏ���
- - �����x�Z���T���荞�݂̎�肱�ڂ��m�F(�O�̈�)
- - TWL PM�݊����W�X�^�ւ̏������݂�����Γǂ݂ɍs��
- - �݊��J�[�l����TWL�����`���[�̋N����ʒm
- - TWL�̉��ʕω����荞�݂��`�F�b�N
- - 3D�����v�̍X�V
- - (HAL) �����v�A������₷
- - (�f�o�b�O) SEL�����������WDT���Z�b�g�𔭐�������
- ***********************************************/
-void tsk_misc(  )
-{
-    // ���荞�݂̎�肱�ڂ��H
-	if( ACC_VALID && ( ( vreg_ctr[ VREG_C_STATUS_1 ] & REG_BIT_ACCERO_ERR ) == 0 ))
-    {
-        if( renge_task_immed_add( tski_cbk_accero ) == ERR_SUCCESS ){
-            // dbg_nop();
-        }
-    }
-
-    if( system_status.pwr_state == ON )
-    {
-        /* ========================================================
-            PM�݊����W�X�^�ւ̏�������
-            �|�[�����O�őΉ�
-            ======================================================== */
-        if( !PM_IRQ_n )
-		{
-            renge_task_immed_add( tski_ntr_pmic_comm );
-            // dbg_nop();
-        }
-
-        /* ========================================================
-            TWL�����`���[���N���������Ƃ�CTR���m�肽���炵��
-            ======================================================== */
-        if( twl_ver_read )
-        {
-            twl_ver_read = false;
-            set_irq( VREG_C_IRQ2, REG_BIT_TWL_VER_READ );
-        }
-
-		// TWL �̉��ʕω����荞�݃`�F�b�N //
-		check_twl_vol_irq();
-	}
-
-	// 3D �����v�X�V //
-	update_LED_3D();
-
-#ifdef _ENABLE_HAL_
-    // �f�o�b�OHAL ������������₷ //
-	if( reserve_pedo_increnent )
-	{
-		reserve_pedo_increnent = 0;
-		hosu_increment_if_necessary();
-	}
-#endif
-
-#ifdef _ENABLE_PRESS_SEL_TO_WDT_
-	if(( system_status.pwr_state == ON )
-		|| ( system_status.pwr_state == SLEEP ))
-	{
-		static u16 timer;
-		if( !SW_SEL_n )
-		{
-			timer += 1;
-			if( timer == 2000 )
-			{
-				DI();
-				timer = 0;
-				while(1)
-				{
-					NOP();	// ���̂���WDT����������
-				}
-			}
-		}
-	}
-#endif
-
-    //. �X�^�b�N�e�X�g
-//    f();
-}
-
-
-
-/********************************************//**
-TWL��Vol�������̂ƁA�X���C�_�̑��삪�o�b�e�B���O�����
-�s�������N���鎖������A�����h��
-
- TWL�ł͒ʏ펞�A�����{�^����8�i�K�������B����ɍ��킹�Ċ��荞�݂�����B
- ***********************************************/
-void check_twl_vol_irq()
-{
-	static u8 vol_level_twl_sent;
-    static u8 mabiki;
-
-    if( !is_TWL )
-	{
-		return;
-		// �����܂�
-	}
-
-    if( mabiki != 0 )
-    {
-        mabiki--;
-		return;
-		// �����܂�
-	}
-
-	mabiki = 9;  // 1�t���[���͊J����
-    if( vol_level_twl != vol_level_twl_sent )
-    {
-		vol_level_twl_sent = vol_level_twl;
-        set_irq( VREG_C_IRQ2, REG_BIT_SLIDE_VOL_ACROSS_TWL_BOUNDARY );
-    }
-}
-
-
-/********************************************//**
-3D�����v�X�V
- ***********************************************/
-void update_LED_3D()
-{
-    if( system_status.pwr_state != ON )
-    {
-        LED_duty_3d = 0;
-		return;
-		// �����܂� //
-    }
-
-    if( vreg_ctr[VREG_C_LED_3D] == LED_3D_ILM_OFF )
-    {
-        if( LED_duty_3d != 0 )
-        {
-            LED_duty_3d --;
-        }
-    }
-    else
-    {
-        if( LED_duty_3d != vreg_ctr[VREG_C_LED_BRIGHT] )
-        {
-            if( LED_duty_3d < vreg_ctr[VREG_C_LED_BRIGHT] )
-            {
-            	LED_duty_3d ++;
-        	}
-        	else
-        	{
-        		LED_duty_3d --;
-        	}
-        }
-    }
-}
-
-
-
-
-/********************************************//**
-  COMMAND���W�X�^�ւ̏�������
-
-  0�Ȃ�Ă΂�܂���B�P�A�s�v
-  
-  - sleep �ʒm(��)
-  - ���Z�b�g�n�R�}���h
- ***********************************************/
-task_status_immed tski_do_command0(  )
-{
-    u8 temp_command;
-
-	// command0 �{�̓d���Ȃ�
-	DI_wt_chk();
-    temp_command = vreg_ctr[VREG_C_COMMAND0];
-    vreg_ctr[VREG_C_COMMAND0] = 0;
-	EI();
-
-	// SLPO(SoC->mcu) ���񓯊��̂��߁A�p���X�����[���ɂȂ��Ă��܂��Amcu �� SoC�̈�u��
-	//  �X���[�v�����o�o�����ASLPI���g�O���o���Ȃ���������B���炩���ߒʒm���Ă��炢�A
-	//  �^�C���A�E�g�������s���B
-    if( temp_command & REG_BIT_GOING_TO_SLEEP )
-    {
-        going_to_sleep = true;
-    }
-
-	// ���Z�b�g�n�̃R�}���h //
-    if( ( temp_command & ( REG_BIT_OFF_REQ | REG_BIT_RESET1_REQ | REG_BIT_FCRAM_RESET_REQ | REG_BIT_RESET2_REQ )) != 0x00 )
-    {
-        if( temp_command & REG_BIT_OFF_REQ )
-        {
-            system_status.pwr_state = OFF_TRIG;
-        }
-        else
-        {
-            if( temp_command & REG_BIT_RESET1_REQ )
-            {
-                PM_reset_ast(  );
-                RESET2_ast;
-                FCRAM_RST_ast;
-            }
-            if( temp_command & REG_BIT_RESET2_REQ )
-            {
-                RESET2_ast;
-                if( vreg_twl[ REG_TWL_INT_ADRS_MODE ] == 0 )
-                {
-                    FCRAM_RST_ast;         // twl��ntr���[�h�œ��삵�Ă�
-                }
-                // TWL���[�h����DS���[�h�ւ̐؂�ւ����Ƀ��Z�b�g�����
-                // IRQ���ǂ܂�Ȃ��ꍇ������̂�TWL���W�X�^������������
-                vreg_twl_init();
-            }
-            if( temp_command & REG_BIT_FCRAM_RESET_REQ )
-            {
-                FCRAM_RST_ast;
-            }
-            wait_ms( 5 );	// ���ԉ҂�
-            FCRAM_RST_neg;
-            PM_reset_neg();
-            RESET2_neg;
-
-            // CODEC �s�背�W�X�^������ //
-            codec_reg_init();
-        }
-    }
-/*
-    �X���[�v�v������ɓd��OFF�E���Z�b�g�R�}���h�͗��܂�
-    if( vreg_ctr[VREG_C_COMMAND0] != 0 )
-    {
-        return ( TSKI_CONTINUE );
-    }
-*/
-    return ( TSKI_FINISHED );
-}
-
-
-
-/* �f�o�b�O�E�����e�X�g�p ============================== */
-u16 _dbg_rcomp;
-extern u8 raw_adc_temperature;
-
-extern u8 iic_burst_state;
-extern bit temp_zone_charge_disable;
-extern bit bt_authorized;
-
-
-
-
-#define KOUMOKU 19
-
-static u8 infos_bits[2];
-static u8 infos_temp[5];
-
-static const u8 *infos_table[ KOUMOKU ] = {
-    &infos_temp[0],               /* 0 */
-    &pmic_version,
-    (u8*)&battery_manufacturer,
-    &mgic_version[0],
-    &mgic_version[1],
-    &infos_temp[1],               /* 5 */
-    &raw_adc_temperature,
-    &infos_temp[2],
-    &infos_temp[3],
-    (u8*)&system_status.family,
-//        LED_pow_red,           /* 10 */
-    &infos_bits[0],
-    (u8*)&LED_duty_pow_blu,
-    (u8*)&LED_duty_3d,
-    (u8*)&LED_duty_notify_red,
-    (u8*)&LED_duty_notify_grn,
-    (u8*)&LED_duty_notify_blu,   /* 15 */
-    &infos_bits[1],
-//        &LED_CAM,
-    (u8*)&LED_duty_WiFi,
-    &infos_temp[4]                /* 18 */
-    /* ���ڑ����Ƃ��� KOUMOKU �ɒ��� */
-};
-
-/********************************************//**
-�@�f�o�b�O�p�ɃX�e�[�^�X��Ԃ��B�i�g���X�e�[�^�X 0x7F�j
-
-�@�Ԓl�̓f�[�^���̂���
-
- �o�Ă��鏇��́A
-
- -  1) �v���b�g�t�H�[��
- -  2) PMIC �o�[�W����
- -  3) �d�r���[�J�[
- -  4) �K�X�Q�[�W�o�[�W����
- -  5)        �V
- -  6) ( rcomp & 0xFF )
- -  7) raw_adc_temperature
- -  8) ( !temp_zone_charge_disable | ( bt_authorized << 1 ) )
- -  9) ���m�点LED�̓t���J���[�H
- - 10) system_status.family
- ***********************************************/
-u8 extinfo_read(void)
-{
-	u8 ret = 0xFF;
-    
-    /*
-     * temp�͌v�Z�������K�v�ȃf�[�^�B�������ɗ]�T���Ȃ��̂Ōv�Z���K�v��
-     * �ϐ��́A�v/�s�v�Ɋւ�炸�v�Z����|���V�[
-     */
-
-    if( iic_burst_state < KOUMOKU )
-    {
-        infos_temp[0] = system_status.captureBox? MODEL_CAPTURE_BOX
-            : ( system_status.is_dev? MODEL_ISBAKO: (u8)system_status.model );
-        infos_temp[1] = (u8)( _dbg_rcomp & 0xFF ); 
-        infos_temp[2] = ( !temp_zone_charge_disable | ( bt_authorized << 1 ) ); 
-        infos_temp[3] = 1;            /* �d�l�ύX�ɂ��1�Œ�ɂȂ��� */
-        infos_temp[4] = 0
-//            | ( PM_EXTDC_n  ? REG_BIT_HAL0_PM_EXTDC_n  : 0 )  // status0�ɂ���
-              | ( BT_IN_CHG_n ? REG_BIT_HAL0_BT_IN_CHG_n : 0 )   
-              | ( BT_CHG_Ena_n ? REG_BIT_HAL0_RSV_5      : 0 )  // �󂫃r�b�g�g�p,out pin
-              | 0                                               // WL_TX �g���Ȃ�
-//            | ( SHELL_OPEN  ? REG_BIT_HAL0_SHELL_OPEN  : 0 )  // status0�ɂ���
-              | ( SW_WIFI_n   ? REG_BIT_HAL0_SW_WIFI_n   : 0 )
-              | ( SW_HOME_n   ? REG_BIT_HAL0_SW_HOME_n   : 0 )
-              | ( SW_POW_n    ? REG_BIT_HAL0_SW_POW_n    : 0 );
-
-		infos_bits[0] = (u8)LED_pow_red;
-		infos_bits[1] = (u8)LED_CAM;
-
-		ret = *infos_table[iic_burst_state];
-        iic_burst_state ++;
-    }
-
-    return ret;
-}
-
-
-#ifdef i2c_timeout_test
-/********************************************//**
-�i�f�o�b�O�p�jI2C_mcu �Ƀv���g�R���ᔽ(�g�`����)�����o���ꂽ��SLED��_�����Ēʒm����
- ***********************************************/
-void i2c_mcu_error_monitor()
-{
-    LED_duty_pow_blu = 0xff;
-    LED_duty_3d         = 0xff;
-    LED_duty_notify_red = 0xff;
-    LED_duty_notify_grn = 0xff;
-    LED_duty_notify_blu = 0xff;
-    LED_pow_red         = 1;
-    LED_CAM             = 1;
-}
-#endif
-
diff --git a/branches/2.2A_SDK5(4thNUP)/task_status.c b/branches/2.2A_SDK5(4thNUP)/task_status.c
deleted file mode 100644
index 361497b..0000000
--- a/branches/2.2A_SDK5(4thNUP)/task_status.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/* ********************************************************
- �ꕔ�̃X�e�[�^�X���W�X�^���X�V�A�K�v�ɉ����Ċ��荞�݂����܂��B
-
- $Id$
-********************************************************* */
-
-#ifndef _WIN32
-
-#pragma SFR
-#pragma NOP
-#pragma HALT
-#pragma STOP
-
-#endif
-
-#include "incs_loader.h"
-#include "renge\renge.h"
-
-#include "pm.h"
-
-#include "accero.h"
-#include "adc.h"
-#include "i2c_mcu.h"
-#include "led.h"
-
-
-/********************************************//**
- �X�e�[�^�X���W�X�^�́A
- - �W�J��
-
- �Ŋ��荞�݂��K�v�ł���Δ��������܂��B
- todo: �����H
- ***********************************************/
-void tsk_status(  )
-{
-    static u8 state_old;        // �X�e�[�^�X�ω����o�����荞�� �̈�
-    u8      diff;
-
-    // �W�J���`�F�b�N
-    set_bit( SHELL_OPEN, vreg_ctr[VREG_C_STATUS], REG_BIT_ST_SHELL_OPEN );
-
-    // �X�e�[�^�X���W�X�^�֌W �� ���荞�� //
-    // pm.c �ŁA���̏�ōs���܂��B
-    // REG_BIT_LCD_ON/OFF
-    // REG_BIT_BL_ON/OFF
-    // REG_BIT_BT_DC_CONNECT/DISC
-    // REG_BIT_BT_CHG_START/STOP
-
-    diff = (u8)( vreg_ctr[VREG_C_STATUS] ^ state_old );
-    if( diff != 0 )
-    {
-        state_old = vreg_ctr[VREG_C_STATUS];
-
-        if( system_status.pwr_state == ON )
-        {
-            if( diff & REG_BIT_BATT_CHARGE )
-            {
-                // �[�d��Ԕ��f
-                if( is_bt_charging ) // set_irq��ʁX�ɌĂԕ����R���p�N�g
-                {
-                    set_irq( VREG_C_IRQ1, REG_BIT_BT_CHG_START );
-                }
-                else
-                {
-                    set_irq( VREG_C_IRQ1, REG_BIT_BT_CHG_STOP );
-                }
-			}
-        }
-
-        if(( system_status.pwr_state == ON ) ||
-           ( system_status.pwr_state == SLEEP )
-           )
-        {
-        if( diff & REG_BIT_ST_SHELL_OPEN )
-        {
-            // �W�̊J���‚�
-            if( is_shell_open )
-            {
-                set_irq( VREG_C_IRQ0, REG_BIT_SHELL_OPEN );
-            }
-            else
-            {
-                set_irq( VREG_C_IRQ0, REG_BIT_SHELL_CLOSE );
-                }
-            }
-        }
-    }
-}
-
diff --git a/branches/2.2A_SDK5(4thNUP)/task_sys.c b/branches/2.2A_SDK5(4thNUP)/task_sys.c
deleted file mode 100644
index 5a99cba..0000000
--- a/branches/2.2A_SDK5(4thNUP)/task_sys.c
+++ /dev/null
@@ -1,666 +0,0 @@
-/* ========================================================
-   task_sys
-   �d��������i��̃^�X�N
-   
- $Id$
- ======================================================== */
-#ifndef _WIN32
-
-#pragma SFR
-#pragma NOP
-#pragma HALT
-#pragma STOP
-
-#endif
-
-#include "incs.h"
-
-#include "i2c_twl.h"
-#include "i2c_ctr.h"
-#include "led.h"
-#include "accero.h"
-#include "pm.h"
-#include "rtc.h"
-#include "sw.h"
-#include "adc.h"
-#include "self_flash.h"
-#include "i2c_mcu.h"
-#include "vreg_twl.h"
-
-
-//=========================================================
-#define WAIT_SHIROBAKO_POW_CONTROL 240
-
-
-//=========================================================
-extern void nop8();
-
-
-static void chk_emergencyExit();
-static void force_off_check();
-static void send_getup_to_soc();
-#ifdef _DBG_CHK_OFF_LEAK_
-static void leak_check();
-#endif
-
-
-
-//=========================================================
-extern bit info_led_off;
-extern bit going_to_sleep;
-extern bit bt_authorized;
-
-static u8 timeout_sleep;
-extern u8 chg_led_override;
-
-#ifdef i2c_timeout_test
-extern bit i2c_mcu_time_out_error;
-#endif
-
-
-//=========================================================
-#define PWSW_POWON_TIME		(u8)( 20 / SYS_INTERVAL_TICK )	// [ms]  // INTERVAL_TSK_SW �Ŋ���Ȃ��B�l�������珬�����̂�
-#define PWSW_ON_CHECK_TIMEOUT		100	// �K�� �d��on�ׂ̈ɓd���X�C�b�`�����삳�ꂽ�Ƃ��A���̎��Ԍo�߂�����mcu���ȓd�͂ɖ߂�
-
-
-
-/********************************************//**
-  �d���̗����グ��X���[�v�Ȃǂ��Ǘ�
- ***********************************************/
-void tsk_sys(  )
-{
-    static u8 pwsw_timeout = 0;	// �d���{�^���`���^�����O����B�@�^�C���A�E�g����܂łɓd�������m�肵�Ȃ���off�ɖ߂�
-
-	hal_update();
-
-	switch ( system_status.pwr_state )
-    {
-    case ON_CHECK:                  //-------------------------------------------------------
-		// �����d���f�J�E���g�_�E���^�C�}�N���A
-		clear_pow_off_countdown();
-
-		// ���̊��荞�݂�HALT(�X���[�v)������ �^�@�A�_�v�^�L��
-
-        // �d���X�C�b�`��HALT���� //
-        if( system_status.poweron_reason == RSN_PWSW )
-        {
-			if( PM_EXTDC_n )
-			{
-				// �A�_�v�^�Ȃ�
-				if( SW_pow_count != 0 )
-				{
-					pwsw_timeout = 0;
-				}
-				else
-				{
-					pwsw_timeout ++;
-				}
-
-				if( pwsw_timeout > PWSW_ON_CHECK_TIMEOUT )
-				{
-					SW_pow_count = 0;
-					system_status.pwr_state = OFF_TRIG;     // �X�C�b�`�̓m�C�Y�������B�Q��B
-					renge_task_interval_run_force = true;
-					return;
-				}
-			}
-			else
-			{
-				BT_chk();
-			}
-
-
-			if( SW_pow_count < PWSW_POWON_TIME )
-			{
-				// �������Ԃ��Z���ēd��on�ɓ��B���Ă��Ȃ�
-				return;
-			}
-        }
-		// else { if( system_status.poweron_reason == RSN_TRIAL�A�c ) �d������ }
-
-        SW_pow_mask = true;		// pwsw�������ςȂ��œd����/�� ���J��Ԃ��Ȃ��悤��
-
-        // �d������ //
-        iic_mcu_start(  );
-
-        bt_force_update = false;
-        BT_chk();				// ���@��o�b�e���̔���A�d�r�c��IC�̐ݒ�
-
-#ifndef _ALLOW_NOBATT_
-        if( system_status.model == MODEL_JIKKI_NOBATT )
-        {
-            renge_task_interval_run_force = true;
-            system_status.pwr_state = OFF_TRIG;
-            return;
-        }
-#endif
-
-        // �c�ʃ`�F�b�N
-        BT_get_left();         // ��ɁABT_chk()�����s����Ă���K�v������܂��B
-        if(
-//            ( vreg_ctr[VREG_C_BT_REMAIN] < 1 )  // �������Ŕ��肷��Ɠd�r���قƂ�ǖ����Ƃ���
-//                                                //  �A�_�v�^�����Ă������N���ł��Ȃ��Ȃ����Ⴄ
-            ( vreg_ctr[VREG_C_BT_VOLTAGE] < ( V_TH_ZERO / 256 ) ) // �d�r�����
-            )
-        {
-            // �d�r�����Ȃ��̂ŋN�������Ȃ�(�d���`�F�b�N������Ă�)
-            renge_task_interval_run_force = true;
-            system_status.pwr_state = OFF_TRIG;
-            return;
-        }
-
-        // �|�[�g�̕����ݒ�@�d�������O�ɁB
-        PM_SW_WIFI_n  = 1;
-        PM_SW_HOME_n_JIKKI = 1;
-        PM_WL_TX      = 1;
-        PM_SW_SEL_n   = 1;
-        PM_ACCEL_INT1 = 1;
-		PM_ACC_VALID  = 1;
-
-        if( PM_sys_pow_on(  ) != ERR_SUCCESS )  // ���Z�b�g���������Ă��܂�
-        {                       // �d���N���s�ƒG���[
-            renge_task_interval_run_force = true;
-            system_status.pwr_state = OFF_TRIG;
-            return;
-        }
-
-        // �����܂ŗ���ƁA�d�������m�� //
-		// �v���A�b�von
-        PU_BT_IN_CHG_n = 1;
-        PU7 = bits8(0,0,0,1, 1,1,0,1);       // 4:SW_WIFI 3:SW_PWSW 2:PM_IRQ 0:PM_EXTDC_n
-        PU_SW_HOME_n_JIKKI = 1;            // SW_HOME
-
-        if( system_status.poweron_reason == RSN_PWSW ||
-			system_status.poweron_reason == RSN_TRIAL )
-        {
-            // �d���{�^���ł�on�̎��́ALED��_��������
-            vreg_ctr[VREG_C_LED_POW] = LED_POW_ILM_AUTO;
-        }
-        else
-        {
-            // �Ƃ肠�����ALED������ԂŋN��������
-            vreg_ctr[VREG_C_LED_POW] = LED_POW_ILM_OFF;
-        }
-
-        system_status.pwr_state = ON_TRIG;
-
-        PM_LCD_vcom_set(  );    // LCD�̑Ό��d���l�ȂǏ�������
-
-        break;
-
-    case ON_TRIG:              //-------------------------------------------------------
-#ifdef i2c_timeout_test
-        LED_duty_pow_blu = 0;     // debug
-        LED_duty_3d         = 0;
-        LED_duty_notify_red = 0;
-        LED_duty_notify_grn = 0;
-        LED_duty_notify_blu = 0;
-        LED_pow_red         = 0;
-        LED_CAM             = 0;
-        i2c_mcu_time_out_error = false;
-#endif
-        IIC_ctr_Init(  );
-        IIC_twl_Init(  );
-        RTC_32k_on(  );
-
-        vreg_twl_init(  );
-        vreg_ctr_reset(  );
-
-        KRM  = bits8(0,0,0,0, 0,0,0,0);
-        PIF0 = 0;
-
-        system_status.poweron_reason = NONE;
-        renge_task_interval_run_force = true;
-
-        MK0 = INT_MSK0_RSV;
-        MK1 = INT_MSK1_RSV;
-
-        iic_mcu_start();
-
-//        MK2 = ~( INT_MSK2_IIC_TWL | INT_MSK2_WIFI_TX_BSR | INT_MSK2_CODEC_PMIRQ );
-//        PMK21 = 0;  // wifi  �g��Ȃ�
-        PMK6 = 0;   // pm_irq
-
-        // ���u�[�g���A�X�e�[�^�X�����ƂȂ��X�V
-        if( system_status.reboot )
-        {
-            u8 bl_status_temp;
-
-            bl_status_temp = read_pmic( PM_REG_ADRS_BL );
-            vreg_ctr[ VREG_C_STATUS ] |= (( bl_status_temp & 0x03 ) << 5 );
-            set_bit( ( read_pmic( PM_REG_ADRS_VDD_LCD ) != 0 ),
-                    vreg_ctr[ VREG_C_STATUS ], REG_BIT_LCD_POW );
-            BT_chk();
-        }
-
-        LED_init(  );  // reboot���́�BT_Chk,BT_chk��ɍs������
-
-        system_status.reboot = 0;
-        system_status.pwr_state = ON;
-
-        // WDT���Z�b�g���AI2C�̏������܂Ŋ��荞�ݕۗ�
-        //  �ق�Ƃ͂����ɂׂ������������Ȃ���...
-        if( ( vreg_ctr[ VREG_C_MCU_STATUS ] & REG_BIT_STATUS_WDT_RESET ) != 0 )
-        {
-            set_irq( VREG_C_IRQ0, REG_BIT_IRQ_WDT_RESET );
-        }
-
-        break;
-
-    case ON:                   //---------------------------------------------
-        // PMIC�ɂ�鋭���d���f�`�F�b�N
-        // �f�o�b�K��reset1���A�T�[�g���邱�Ƃ�����B���̂Ƃ��͑S�����Z�b�g
-        chk_emergencyExit();
-
-        // SLP��
-        if( going_to_sleep )          // ��΂� SLP_REQ �̑O�ɗ\��������
-        {
-            timeout_sleep ++;
-            if( timeout_sleep == 0 ||  // �I�[�o�[�t���[�����ҁBsleep������Č��������Lj�u�ŋN���ċC���‚��Ȃ�����
-                ( PIF0 && !SLP_REQ ))  // slp���荞�݂��������C���������A�����N���Ă��܂���
-            {
-                PIF0 = 0;
-                send_getup_to_soc();
-            }
-            if( PIF0 && SLP_REQ ){
-                PIF0 = 0;
-                PM_VDD_ecoMode();
-                system_status.pwr_state = SLEEP;
-                renge_task_interval_run_force = true;
-            }
-        }
-
-        // ����off�J�E���g
-        force_off_check();
-
-#ifndef _TAIKENDAI_SEISAN_SPECIAL_
-        if( system_status.taikendai )		// �A�_�v�^���������玩���œd��off
-        {
-            if( PM_EXTDC_n )
-            {
-                system_status.pwr_state = OFF_TRIG;
-            }
-        }
-#endif
-
-        break;
-
-    case SLEEP:                //------------------------------------------
-        chk_emergencyExit();
-        // �X���[�v���畜�A
-        if( !SLP_REQ ){
-            PM_VDD_normMode();
-            wait_ms( 5 );  // tdly_sw
-            send_getup_to_soc();
-            system_status.pwr_state = ON;
-        }
-		
-        force_off_check();
-//		leak_check();
-
-#ifndef _TAIKENDAI_SEISAN_SPECIAL_
-        if( system_status.taikendai )		// �A�_�v�^���������玩���œd��off
-        {
-            if( PM_EXTDC_n )
-            {
-                system_status.pwr_state = OFF_TRIG;
-            }
-        }
-        break;	// �������ł悢�B
-#else
-		/* FALLTHROUGH */
-#endif
-
-    default:                   //---------------------------------------
-        system_status.pwr_state = OFF_TRIG;  // ���蓾�Ȃ��X�e�[�g�B�f�o�b�O�p
-//		dbg_nop();
-		/* FALLTHROUGH */
-
-	case OFF_TRIG:             //---------------------------------------
-        // LED������҂�
-        vreg_ctr[ VREG_C_LED_POW ] = LED_POW_ILM_OFF;
-        vreg_ctr[ VREG_C_LED_WIFI ] = WIFI_LED_OFF;
-        vreg_ctr[ VREG_C_LED_3D ] = LED_3D_ILM_OFF;
-        info_led_off = true;
-        if( LED_duty_pow_blu != 0 )
-        {
-            return;
-        }
-
-		// �����d���f�J�E���g�_�E���^�C�}�N���A
-		clear_pow_off_countdown();
-
-		// �����x�Z���T��~
-        vreg_ctr[ VREG_C_ACC_CONFIG ] = 0x00;
-        tski_acc_setup();
-		EI();	// DI��Ԃł������ė���̂ŁAI2C_mcu ����������̂ɕK�v��
-
-		// ���̑��y���t�F������~
-        LED_stop(  );
-        IIC_ctr_Stop(  );
-        IIC_twl_Stop(  );
-        RTC_32k_off();
-
-//  �d���I�������̊��荞�݃Z�b�g
-// PWSW        KR3   ������L
-// BG24        KR4
-// �ӂ��J��    INTP5 �‚����L
-// AC�A�_�v�^  INTP4 �A�_�v�^�����L
-// RTC
-        while( iic_mcu_busy )
-        {;}
-
-		// irq�}�X�N�ݒ�
-        KRM = ( KR_SW_POW );    // Mask �ł͂Ȃ��AMode�Ȃ̂��������B����킵��
-        MK0 = ~( INT_MSK0_EXTDC | INT_MSK0_WDTI );
-        MK1 = ~( INT_MSK1_KR | INT_MSK1_RTCINTVAL );  // INT_MSK1_RTCALARM | RTC�A���[������
-        MK2L = 0xFF;
-
-		// irq�t���O�N���A
-		vreg_ctr[VREG_C_IRQ0] = 0;
-        vreg_ctr[VREG_C_IRQ1] = 0;
-        vreg_ctr[VREG_C_IRQ2] = 0;
-        vreg_ctr[VREG_C_IRQ3] = 0;
-
-        // PU5 ���̂܂�
-        PU7 = bits8(0,0,0,0, 1,0,0,1);   // PWSWI,PM_EXTTDC,( IRQ0_deactive(), PM_IRQ_deactive )
-        PU_SW_HOME_n_JIKKI = 0;          // SW_HOME ��~
-
-        IF0 = 0;
-        IF1 = 0;
-        IF2 = 0;
-
-        IRQ0_disable;
-
-        PM_sys_pow_off(  );				 // �d���J�b�g�I�t
-
-		// �|�[�g�ނ��~���[�h�ɁB����������H�ł��AL�o�͂ɂ��Ȃ��Ⴞ�߂������ȁB
-        SW_WIFI_n_RAW = 0;
-        PM_SW_WIFI_n = 0;
-
-        SW_HOME_n_JIKKI_RAW = 0;
-        PM_SW_HOME_n_JIKKI = 0;
-
-        WL_TX = 0;
-        PM_WL_TX = 0;
-
-        SW_SEL_n = 0;
-        PM_SW_SEL_n = 0;
-
-		ACCEL_INT1 = 0;
-        PM_ACCEL_INT1 = 0;
-        ACC_VALID = 0;
-        PM_ACC_VALID = 0;
-
-        system_status.pwr_state = OFF;
-        SW_pow_mask = true;
-        SW_pow_count = 0;
-
-		// HAL�f�o�b�O���Z�b�g�@�Y���Ɠd��on�o���Ȃ��Ȃ邱�Ƃ��c
-		hal_reset();
-		/* FALLTHROUGH */
-
-    case OFF:
-		//  ���F����ł͓d���{�^�������d�������͂���܂���B
-
-		system_status.poweron_reason = NONE;
-		pwsw_timeout = 0;
-
-		if( !PM_EXTDC_n 
-			|| chg_led_override != 0 )	// ���ꂪ�[���ɂȂ�܂ő҂�
-        {
-            // �A�_�v�^�L�� /////////////////////////////// �܂��́A�A�_�v�^�����ĂR�b�͏[�dLED��_���Ă������
-
-			// �d���{�^�������`�F�b�N��
-		    system_status.poweron_reason = RSN_PWSW;
-			system_status.pwr_state = ON_CHECK;		
-
-#ifndef _TAIKENDAI_SEISAN_SPECIAL_
-			// ���V��Ȃ玩���œd���ē���
-            if( system_status.taikendai )
-            {
-                vreg_ctr[ VREG_C_HAL_OVW_CONT0 ] = vreg_ctr[ VREG_C_HAL_OVW_CONT1 ] = 0;
-                wait_ms(46);    // pmic�̓d���ē����d�l�̂���
-				system_status.poweron_reason = RSN_TRIAL;
-                system_status.pwr_state = ON_CHECK;
-            }
-#endif
-        }
-        else
-        {
-            // �A�_�v�^�Ȃ� ///////////////////////////////
-
-            // �ȓd�͂ֈڍs
-            iic_mcu_stop(  );
-            pm_chk_adapter();
-            PM_Chg_Stop();
-
-            bt_force_update = true;
-
-            while( RWST )
-            {;}
-
-            // ���荞�ݑ҂��ŐQ�� //
-            RTCIMK = 1;		// systick�p�C���^�[�o���^�C�}�[���荞�݃}�X�N
-
-#ifdef _DBG_CHK_OFF_LEAK_
-			leak_check();
-#endif
-            CKC  = bits8(0,0,0,0, 1,0,0,1);		// 4MHz�ɗ��Ƃ���(bit0)����STOP���Ȃ��Ă͂Ȃ�Ȃ�
-			OSMC = bits8(0,0,0,0, 0,0,0,0);		// 5MHz�ȉ����[�h�ցB
-
-			if( PM_EXTDC_n_RAW )  // ����ǂ��^�C�~���O�ő}�����N���邱�Ƃ�����BHAL�ʂ��Ȃ��ׂ��ioff���ł����j
-			{
-				STOP();
-			}
-
-			// �N���� //
-            // �N���������
-            // �EKeyReturn���荞�݁i�d���{�^���j
-            // �ERTC�A���[���i���ݕ���j
-
-			// �N���b�N���A
-			OSMC = bits8(0,0,0,0, 0,0,0,1);		// 8MHz���쏀��
-			renge_flg_interval = 0;
-			hal_update();
-
-			CKC  = bits8(0,0,0,0, 1,0,0,0);		// OSMC.FSEL = 1 ��3clk�ȏ�J����
-
-			// �N�������R�́H
-			if( !PM_EXTDC_n ){
-	            system_status.pwr_state = OFF;	// ������Ă��āAON_CHECK�ɍs��
-			}
-/*			// RTC�A���[���B����
-			else if( vreg_ctr[ VREG_C_IRQ1 ] & REG_BIT_RTC_ALARM )
-			{
-		        system_status.poweron_reason = RSN_RTC_ALARM;
-	            system_status.pwr_state = ON_CHECK;
-			}
-			// else if( ���̊��荞�݂œd��on ){
-			//		���󑼂̗v���ł͋N���Ȃ�
-			// }
-*/
-			else // if( !SW_POW_n )	// �i����ȊO�Ȃ�j�d���{�^���ŋN����
-            {
-                SW_pow_mask = false;
-		        system_status.poweron_reason = RSN_PWSW;
-	            system_status.pwr_state = ON_CHECK;
-            }
-
-            RTCIMK = 0;         // sys tick �^�C�}�[�L��
-            
-#ifndef _TAIKENDAI_SEISAN_SPECIAL_
-            if( system_status.taikendai )
-            {
-                system_status.pwr_state = OFF_TRIG;
-            }
-#endif
-        }
-    }
-}
-
-
-
-/********************************************//**
-    PMIC���d���ُ�Ŏ~�߂����m�F
-
- ***********************************************/
-static void chk_emergencyExit(){
-    static u8 shirobako_power_control_count;
-
-	// wifi ���W���[���L�����u���[�V�������[�h��reset1���������牺���Ă�Ƃ��̓`�F�b�N���p�X
-	if( is_wifi_calib_resets_ast )
-	{
-		return;
-	}
-
-	if( shirobako_power_control_count == 0 )
-    {
-        if( !RESET1_n )         // PM_chk_LDSW() ��I2C_m���g�p���A���R�X�g
-        {
-            if( !PM_chk_LDSW() )
-            {
-                // ���Z�b�g����������
-                /// PMIC���ُ�I�����f������
-                system_status.pwr_state = OFF_TRIG;
-                renge_task_interval_run_force = true;
-            }
-            else
-            {
-                // �����̎d��
-                shirobako_power_control_count = 1;
-            }
-        }
-    }
-    else
-    {
-        if( shirobako_power_control_count == WAIT_SHIROBAKO_POW_CONTROL ) // �}�W�b�N�i���o�[
-        // �f�o�b�K�����������Breset1����������܂ł͖���
-        {
-            if( RESET1_n )      // ���Z�b�g�l�Q�[�g�҂�
-            {
-                shirobako_power_control_count = 0;
-            }
-            else
-            {
-                // nothing to do
-            }
-        }
-        else if( shirobako_power_control_count == 200 ) // * (sys_tick)[ms]
-        // �f�o�b�K�������������炵��
-        {
-#ifndef _RVD_
-            // �����͓d����؂肽���炵��
-            system_status.pwr_state = OFF_TRIG;
-            renge_task_interval_run_force = true;
-            shirobako_power_control_count = WAIT_SHIROBAKO_POW_CONTROL;
-#endif
-        }
-        else
-        {
-            if( !RESET1_n )
-            {
-                if( shirobako_power_control_count != 255 )
-                    shirobako_power_control_count ++;
-            }
-            else
-            {
-                // (TS�{�[�h�Ŏ蓮��/�f�o�b�K��)���Z�b�g���������炵��
-                send_cmd_pmic(  PM_REG_ADRS_BL, 0 );
-                vreg_ctr[VREG_C_STATUS] = ( vreg_ctr[VREG_C_STATUS] & bits8(1,0,0,1, 1,1,1,1) );
-                vreg_ctr[VREG_C_COMMAND0] |= REG_BIT_RESET1_REQ;
-                renge_task_immed_add( tski_do_command0 );
-                shirobako_power_control_count = WAIT_SHIROBAKO_POW_CONTROL;
-            }
-        }
-    }
-}
-
-
-
-/********************************************//**
-  - �d���{�^��������
-  - �d�r�؂�
-  - �d�r����
-
-  �ł̋���OFF�B��������Ɖ����s�\
- ***********************************************/
-static void force_off_check()
-{
-    if( force_off )
-    {
-        system_status.pwr_state = OFF_TRIG;
-        renge_task_interval_run_force = true;
-    }
-}
-
-
-
-/********************************************//**
-  SoC���N����
-
-�@�@�d�����ʏ�ɖ߂��Ă���Ă�ʼn������B
- ***********************************************/
-void send_getup_to_soc()
-{
-    going_to_sleep = false;
-    timeout_sleep  = 0;
-#ifdef _MODEL_CTR_
-    SLP_ACK = 1;
-    nop8();
-    SLP_ACK = 0;
-#endif
-}
-
-
-
-
-/********************************************//**
-  ���ȃA�b�v�f�[�g firm_update() ���Ăԁiisr��������s�ł��Ȃ��̂Łj
-  
-   task_status_immed�^ ��Ԃ��悤�ɂ���΂����̂ł���...
- ***********************************************/
-task_status_immed tski_firm_update(){
-    firm_update();
-    return( ERR_SUCCESS );
-}
-
-
-
-#ifdef _DBG_CHK_OFF_LEAK_
-/********************************************//**
-    pin�ݒ�~�X�`�F�b�N
- ***********************************************/
-static void leak_check()
-{
-	volatile u8 ports_i[12];
-	volatile u8 ports_o[12];
-
-	ports_i[0]  = ( PM0  & PU0  & ~P0  );	// �v���A�b�v�؂�Y��H
-	ports_i[1]  = ( PM1  & PU1  & ~P1  );
-	ports_i[2]  = 0;
-	ports_i[3]  = ( PM3  & PU3  & ~P3  );
-	ports_i[4]  = ( PM4  & PU4  & ~P4  );
-	ports_i[5]  = ( PM5  & PU5  & ~P5  );
-	ports_i[6]  = 0;
-	ports_i[7]  = ( PM7  & PU7  & ~P7  );
-	ports_i[8]  = ( PM12 & PU12 & ~P12 );
-	ports_i[9]  = ( PM14 & PU14 & ~P14 );
-	ports_i[10] = 0;
-	ports_i[11] = ( PM20 & PU20 & ~P20 );
-
-	ports_o[0]  = ( ~PM0  & P0  );			// H �o�͂�������Ă邩��
-	ports_o[1]  = ( ~PM1  & P1  );
-	ports_o[2]  = ( ~PM2  & P2  );
-	ports_o[3]  = ( ~PM3  & P3  & ~POM3 );
-	ports_o[4]  = ( ~PM4  & P4  ); // bit3��chg_en�Ȃ̂�1�ł��悢
-	ports_o[5]  = ( ~PM5  & P5  );
-	ports_o[6]  = ( ~PM6  & P6  );
-	ports_o[7]  = ( ~PM7  & P7  );
-	ports_o[8]  = ( ~PM12 & P12 );
-	ports_o[9]  = ( ~PM14 & P14 );
-	ports_o[10] = ( ~PM15 & P15 );
-	ports_o[11] = ( ~PM20 & P20 );
-	NOP();          // ���u���[�N�u������
-}
-#endif _DBG_CHK_OFF_LEAK_
diff --git a/branches/2.2A_SDK5(4thNUP)/user_define.h b/branches/2.2A_SDK5(4thNUP)/user_define.h
deleted file mode 100644
index 68072de..0000000
--- a/branches/2.2A_SDK5(4thNUP)/user_define.h
+++ /dev/null
@@ -1,213 +0,0 @@
-#ifndef _USER_DEF_
-#define _USER_DEF_
-
-
-#define IIC_T_SLAVEADDRESS	0x4A
-#define IIC_C_SLAVEADDRESS	0x4A
-#define IIC_C_SLAVEADDRESS_DMY	0x4C
-
-//#define IIC_SLA_DCP     0x50
-
-#define bits8(a,b,c,d,e,f,g,h) ( a<<7 | b<<6 | c<<5 | d<<4 | e<<3 | f<<2 | g<<1 | h )
-
-#ifndef _WIN32
-// ���@�‹�
-
-#ifdef _debug_led_
-/*spfl�Ή��ȍ~�Anc�łȂ��Ȃ�̂Ŏg���܂���
-# define DBG_LED_on      { PM2.1 = 0; P2.1 = 1; }
-# define DBG_LED_off     { P2.1 = 0; }
-# define DBG_LED_toggle  ( P2.1 ^= 1 )
-# define DBG_LED2_on      { PM2.2 = 0; P2.2 = 1; }
-# define DBG_LED2_off     { P2.2 = 0; }
-# define DBG_LED2_toggle  ( P2.2 ^= 1 )
-*/
-#else
-# define DBG_LED_on      ;
-# define DBG_LED_off     ;
-# define DBG_LED_toggle  ;
-# define DBG_LED2_on      ;
-# define DBG_LED2_off     ;
-# define DBG_LED2_toggle  ;
-#endif // _debug_led_
-
-#define IIC_SLA_CODEC   0xA4
-#define IIC_SLA_ACCEL   0x30           // ST LIS331DLH
-
-
-#define SLP_ACK         P7.7
-
-
-// PMx��0�ŏo�̓��[�h
-
-// SoC
-#define IRQ0_ast            { P7.6 = 0; PM7.6 = 0; }	// B4
-#define IRQ0_neg            { P7.6 = 1; }
-#define IRQ0_enable         { PM7.6 = 0; }
-#define IRQ0_disable        { PM7.6 = 1; }
-#define IRQ0              ( P7.6 )
-
-
-// �������h�~
-#define RESET1_n             ( P0.0 )					// G7
-
-#if 1 // ���i��PM_RESET1���g�����AWiFi���W���[���̃e�X�g�̎��͒�����������
-# define RESET1_ast           { P0.0 = 0; PM0.0 = 0; }
-# define RESET1_neg           { PM0.0 = 1; }
-#endif
-
-#define RESET2_ast           { P0.1 = 0; PM0.1 = 0; }	// F7
-#define RESET2_neg           { PM0.1 = 1; }
-
-#define SLP_REQ              P12.0						// H8
-
-// CTR,SPFL,SNAKE,�܂����ʔh���@����
-#define DEV_DET              ( P12 & 0b00000110 )		// [2:1] = D8,C8
-#define DEV_CTR              ( 0b00 << 1 )
-#define DEV_SPFL             ( 0b01 << 1 )
-#define DEV_SNAKE            ( 0b10 << 1 )
-#define DEV_RSV2             ( 0b11 << 1 )
-
-// FCRAM
-#define FCRAM_RST            P3.0						// B6
-#define FCRAM_RST_ast        { P3.0 = 0; }
-#define FCRAM_RST_neg        { P3.0 = 1; }
-
-// CODEC
-#define PM_IRQ_n             P7.2						// A3
-// INTP6
-
-// PM
-#define PM_EXTDC_n_RAW       P7.0						// B2
-// INTP7
-//#define BT_TEMP              P15.0					// G3(a)
-// ANI8
-//#define BT_DET               P15.1					// H2(a)
-// ANI9
-#define BT_DET_P             P1.6						// D4
-#define BT_TEMP_P            P1.7						// C4
-
-
-// SPFL�̃A�����t�@�XLCD�ŕK�v�ȁ}15V�̓d���B
-#define SPFL_LCD_AMOL_HV_CONT P20.2						// F2
-
-
-// �[�d����(out)
-// ���_���ł��B���ӁB
-#define BT_CHG_ENABLE()      ( P4.3 = 0 )				// F6
-#define BT_CHG_DISABLE()     ( P4.3 = 1 )
-#define BT_CHG_Ena_n         ( P4.3 )
-
-// �[�d��(in)
-#define BT_IN_CHG_n_RAW       P5.1						// B1
-#define PM_BT_IN_CHG_n       PM5.1
-#define PU_BT_IN_CHG_n       PU5.1
-
-#define SW_WIFI_n_RAW         P7.4						// C3
-#define PM_SW_WIFI_n         PM7.4
-// KR4
-#define SW_POW_n_RAW          P7.3						// B3
-// KR3
-#define SW_SEL_n              P2.3						// G5
-#define PM_SW_SEL_n          PM2.3
-//#define VOL                  P2.7						// H4(a)
-// ANI7
-
-#define SW_HOME_n_JIKKI_RAW   P20.4						// G2
-#define PM_SW_HOME_n_JIKKI   PM20.4
-#define PU_SW_HOME_n_JIKKI   PU20.4
-
-// INTP22
-#define SW_HOME_n_TSBOARD_RAW P2.0	// TS�}�U�[���pull up(P2�͓���p.u.����)	// G6
-#define PM_SW_HOME_n_TSBOARD PM2.0
-
-// WiFi
-#define WL_TX                P20.3      // INTP21		// F3
-#define PM_WL_TX             PM20.3      // INTP21
-
-//#define VOL_P				  P2.1						// E5 ����open
-//#define VOL_N		          P2.2						// F5   �V
-
-//#define LED_CAM            P1.0      // TO02			// E4
-//#define LED_WIFI           P1.1      // TO03			// E3
-//#define LED_NOTIFY         P1.3      // TO05			// D3
-//#define LED_3D			 P5.2      // SLTO �� TO01	// A2
-//#define LED_POW2           P1.4      // TO06 ( �� )	// D2
-//#define LED_POW1           P1.5      // TO07 ( �� )	// D1
-//#define LED_CHARGE         P2.4						// H5
-
-// P5.3 �ɉ����AP5.5, P140 P141
-// P140���o�͐�p�Ȃ̂�...
-#define I2C_PU_on()          { P14 |= 0x03; PM5.3 = 0; PM3.3 = 0; }	// P14[1:0] H6,H7 P5.3,3.3 A1,C5
-#define I2C_PU_off()         { PM5.3 = 1; PM3.3 = 1; P14 &= ~0x03; }
-
-#define GYRO_ENABLE()     P5.0 = 0						// C1
-#define GYRO_DISABLE()    P5.0 = 1
-
-//#define I2C_M_SDA            P3.1      // SDA10		// C6
-//#define I2C_M_SCL            P3.2      // SCL10		// B5
-
-//#define I2C_0_SCL            P6.0        // IIC_TWL SCL0	// A7
-//#define I2C_0_SDA            P6.1        //         SDA0	// A6
-
-//#define I2C_1_SCL            P20.0       // IIC CTR SCL1	// E1
-//#define I2C_1_SDA            P20.1       //         SDA1	// F1
-
-//#define 32kHz_O              P1.2        // RTCCL			// E2
-//#define 32k_I1               P12.3       // XT1			// F8
-//#define 32k_I2               P12.4       // XT2			// G8
-
-// ���@�A�J���@�A���V�䔻�ʁB
-#define DIPSW                ( P4 & 0b00000011 )  // mini cube & �\�t�g�E�F�A�f�B�b�v�X�C�b�` TOOL0,1�B P4.0�� L ���ӁI
-#define DIPSW_CTR            0b11  // ���g�p
-#define DIPSW_ISDEV          0b00  // KuC��BattGauge�Ŕ���
-#define DIPSW_TAIKENDAI      0b10
-#define DIPSW_TAIKENDAI_NBD  0b01
-
-
-#define SHELL_OPEN_RAW        P7.1       // INTP5 �ӂ��J�� (�‚����L)	// C2
-
-#define ACC_VALID             P20.5		// H3
-#define PM_ACC_VALID         PM20.5
-#define ACCEL_INT1            P2.5		// F4
-#define PM_ACCEL_INT1        PM2.5
-
-
-#endif // _WIN32 
-
-// win32 sim�‹��Ƌ���
-
-#define KR_SW_POW            ( 1 << 3 )
-#define KR_SW_WIFI           ( 1 << 4 )
-
-///////////////////////////////////////////////////////////
-#ifdef _WDT_CHECK_
-# define INT_MSK0_WDTI        1<<15
-#else
-# define INT_MSK0_WDTI        0
-#endif
-
-#define INT_MSK0_IIC_M_DMA    1<<12
-#define INT_MSK0_SHELL        1<<7
-#define INT_MSK0_EXTDC        1<<6
-//#define INT_MSK0_SLP        1<<2
-#define INT_MSK0_RSV          ~( INT_MSK0_IIC_M_DMA | INT_MSK0_SHELL | INT_MSK0_EXTDC | INT_MSK0_WDTI )
-
-#define INT_MSK1_KR           1<<11
-#define INT_MSK1_RTCINTVAL    1<<10
-#define INT_MSK1_RTCALARM     1<<9
-#define INT_MSK1_ADC          1<<8
-#define INT_MSK1_IIC_CTR      1<<3
-#define INT_MSK1_IIC_MCU      1<<0
-#define INT_MSK1_RSV          ~( INT_MSK1_KR | INT_MSK1_RTCINTVAL | INT_MSK1_RTCALARM | INT_MSK1_ADC \
-                                 | INT_MSK1_IIC_CTR | INT_MSK1_IIC_MCU )
-
-#define INT_MSK2_WIFI_TX_KE3  1<<4
-#define INT_MSK2L_RSV         ~( INT_MSK2_WIFI_TX_KE3 )
-
-#define INT_MSK2_IIC_TWL      1<<8
-#define INT_MSK2_WIFI_TX_BSR  1<<10
-#define INT_MSK2_CODEC_PMIRQ  1<<3
-#define INT_MSK2_RSV          ~( INT_MSK2_IIC_TWL | INT_MSK2_WIFI_TX_BSR | INT_MSK2_CODEC_PMIRQ )
-
-#endif // dupe include guard
diff --git a/branches/2.2A_SDK5(4thNUP)/util_funcs.c b/branches/2.2A_SDK5(4thNUP)/util_funcs.c
deleted file mode 100644
index 2edea63..0000000
--- a/branches/2.2A_SDK5(4thNUP)/util_funcs.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/* ========================================================
-   util_funcs
-   
-   �G���ȃ��[�e�B���e�B�֐�
-
-   $Id$
- ======================================================== */
-#ifndef _WIN32
-
-#pragma SFR
-#pragma di
-#pragma ei
-#pragma nop
-#pragma stop
-#pragma halt
-#pragma opc
-
-#endif
-#include "incs_loader.h"
-#include "wdt.h"
-
-
-
-/********************************************//**
-  �P�ʂ� ms
-
-  NOP���񂷂����A�w�莞��CPU�� *��L���܂�* �B
-
-  ���荞�݂Ƃ�����Ƃ��̕��x��܂��B
-
-  �����덷����܂��B
- ***********************************************/
-void wait_ms( u8 ms ){
-  u16 fine;
-
-  WDT_Restart();
-  while( ms != 0 ){
-    ms--;
-    fine = 860;
-    while( fine != 0 ){
-      fine --;
-    }
-  }
-}
-
-
-
-
-extern unsigned char get_ei();
-
-#ifdef _DI_WITH_CHECK_
-/********************************************//**
-  ���ł� ���荞�݋֎~��ԉ��`�F�b�N���Ă��犄�荞�݋֎~�ɂ���
-  
-  �]���̌��ʁA����A#ifdef �Ń`�F�b�N������ DI ����
- ***********************************************/
-void DI_wt_chk()
-{
-	if( !get_ei() )
-	{
-		dbg_nop();
-	}
-	DI();
-}
-#endif // _DI_WITH_CHECK_
diff --git a/branches/2.2A_SDK5(4thNUP)/util_funcs.h b/branches/2.2A_SDK5(4thNUP)/util_funcs.h
deleted file mode 100644
index 4229413..0000000
--- a/branches/2.2A_SDK5(4thNUP)/util_funcs.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef _util_funcs_h_
-#define _util_funcs_h_
-
-
-void wait_ms( u8 );
-
-
-# ifdef _DI_WITH_CHECK_
-void DI_wt_chk();
-# else
-#  define DI_wt_chk()	DI()
-# endif /* _DI_WITH_CHECK_ */
-
-
-#endif
-
diff --git a/branches/2.2A_SDK5(4thNUP)/voltable.c b/branches/2.2A_SDK5(4thNUP)/voltable.c
deleted file mode 100644
index 4d2e14a..0000000
--- a/branches/2.2A_SDK5(4thNUP)/voltable.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/* ========================================================
-   voltable.c
-
-   $Id$
- ======================================================== */
-#include "incs.h"
-
-#define _10db_
-
-
-
-/********************************************//**
-   �X���C�_�l �� CODEC �ɃZ�b�g����ہA�ő�Vol�̊֌W��
-   �K���ɃX�P�[�����O����K�v������
-   
-   �y�Ȃ̂Ńe�[�u������
- ***********************************************/
-
-
-
-#ifdef _10db_
-// max -10db
-const u8 slider_to_codec[64] =
-{
-    127, 126, 125, 124, 122, 121, 120, 119,
-    118, 117, 116, 114, 113, 112, 111, 110,
-    109, 108, 106, 105, 104, 103, 102, 101,
-    100, 98, 97, 96, 95, 94, 93, 92,
-    90, 89, 88, 87, 86, 85, 83, 82,
-    81, 80, 79, 78, 77, 75, 74, 73,
-    73, 72, 71, 70, 69, 67, 66, 65,
-    64, 63, 62, 61, 59, 58, 57, 56
-    };
-#endif
-
-#ifdef _15db_
-// max -15db
-const u8 slider_to_codec[64] =
-{
-    127,	127,	127,	127,	127,	126,	125,	123,
-    122,	121,	120,	119,	118,	117,	116,	115,
-    114,	113,	112,	110,	109,	108,	107,	106,
-    105,	104,	103,	102,	101,	100,	99,	97,
-     96,	95,	94,	93,	92,	91,	90,	89,
-     88,	87,	86,	85,	84,	83,	82,	81,
-     80,	79,	78,	77,	76,	75,	74,	73,
-     71,	70,	69,	68,	67,	66,	66,	66
-};
-#endif
-
-#ifdef _4db_
-// max -4db
-const u8 slider_to_codec[64] =
-{
-    127,	127,	126,	125,	123,	122,	121,	119,
-    118,	117,	115,	114,	112,	111,	110,	108,
-    107,	106,	104,	103,	101,	100,	99,	97,
-     96,	94,	93,	92,	90,	89,	88,	86,
-     85,	83,	82,	81,	79,	78,	77,	75,
-     74,	72,	71,	70,	68,	67,	66,	64,
-     64,	63,	61,	60,	59,	57,	56,	54,
-     53,	52,	50,	49,	48,	46,	44,	44
-};
-#endif
diff --git a/branches/2.2A_SDK5(4thNUP)/voltable.h b/branches/2.2A_SDK5(4thNUP)/voltable.h
deleted file mode 100644
index 6ff34ab..0000000
--- a/branches/2.2A_SDK5(4thNUP)/voltable.h
+++ /dev/null
@@ -1,57 +0,0 @@
-#ifdef _10db_
-// max -10db
-/*
-const u8 slider_to_codec[64] =
-{
-    127, 127, 127, 127, 126, 125, 123, 122,
-    121, 120, 118, 117, 116, 115, 113, 112,
-    111, 110, 108, 107, 106, 105, 103, 102,
-    101, 100,  98,  97,  96,  95,  93,  92,
-     91,  90,  88,  87,  86,  85,  83,  82,
-     81,  80,  78,  77,  76,  75,  73,  72,
-     72,  71,  70,  68,  67,  66,  64,  63,
-     62,  61,  59,  58,  57,  56,  55,  55
-     };
-*/
-const u8 slider_to_codec[64] =
-{
-    127, 126, 125, 124, 122, 121, 120, 119,
-    118, 117, 116, 114, 113, 112, 111, 110,
-    109, 108, 106, 105, 104, 103, 102, 101,
-    100, 98, 97, 96, 95, 94, 93, 92,
-    90, 89, 88, 87, 86, 85, 83, 82,
-    81, 80, 79, 78, 77, 75, 74, 73,
-    73, 72, 71, 70, 69, 67, 66, 65,
-    64, 63, 62, 61, 59, 58, 57, 56
-    };
-#endif
-
-#ifdef _15db_
-// max -15db
-const u8 slider_to_codec[64] =
-{
-    127,	127,	127,	127,	127,	126,	125,	123,
-    122,	121,	120,	119,	118,	117,	116,	115,
-    114,	113,	112,	110,	109,	108,	107,	106,
-    105,	104,	103,	102,	101,	100,	99,	97,
-     96,	95,	94,	93,	92,	91,	90,	89,
-     88,	87,	86,	85,	84,	83,	82,	81,
-     80,	79,	78,	77,	76,	75,	74,	73,
-     71,	70,	69,	68,	67,	66,	66,	66
-};
-#endif
-
-#ifdef _4db_
-// max -4db
-const u8 slider_to_codec[64] =
-{
-    127,	127,	126,	125,	123,	122,	121,	119,
-    118,	117,	115,	114,	112,	111,	110,	108,
-    107,	106,	104,	103,	101,	100,	99,	97,
-     96,	94,	93,	92,	90,	89,	88,	86,
-     85,	83,	82,	81,	79,	78,	77,	75,
-     74,	72,	71,	70,	68,	67,	66,	64,
-     64,	63,	61,	60,	59,	57,	56,	54,
-     53,	52,	50,	49,	48,	46,	44,	44
-};
-#endif
diff --git a/branches/2.2A_SDK5(4thNUP)/vreg_ctr.c b/branches/2.2A_SDK5(4thNUP)/vreg_ctr.c
deleted file mode 100644
index ecf1295..0000000
--- a/branches/2.2A_SDK5(4thNUP)/vreg_ctr.c
+++ /dev/null
@@ -1,624 +0,0 @@
-/* ========================================================
-
-    CTR MCU I2C���W�X�^
-
- $Id$
-  ====================================================== */
-#include "incs.h"
-#include "vreg_ctr.h"
-#include "rtc.h"
-#include "led.h"
-#include "accero.h"
-#include "pm.h"
-#include "pool.h"
-#include "vreg_twl.h"
-#include "sw.h"
-#include "WDT.h"
-
-#include <fsl.h>
-#include "fsl_user.h"
-
-
-
-
-extern u8 extinfo_read();   // task_misc.c
-
-extern u8 iic_burst_state;  // ����o�[�X�g�A�N�Z�X���鎞�̃J�E���^
-extern bit info_led_pattern_updated;  // ���m�点LED�̃p�^�[����擪�ɖ߂�
-
-extern bit pedolog_overflow;
-extern bit reserve_pedo_increnent;
-
-
-
-// ********************************************************
-u8      vreg_ctr[VREG_C_ENDMARK_];
-
-static u8      vreg_free_adrs;      // �A�h���X���ł�̂ł��΂炭�͂����
-bit     irq_readed;					// AAA�^�̂��߁B
-
-
-
-// ********************************************************
-extern task_status_immed tski_firm_update();
-extern task_status_immed tski_mcu_reset();
-extern unsigned char get_ei();
-
-
-
-// ********************************************************
-#ifdef _MCU_BSR_
-#define IICAMK     IICAMK1
-#endif
-
-
-/********************************************//**
- ������
-
- ��[���̏����l�̎w�肪�K�v�ȃA�h���X
-
- �}�C�R�����Z�b�g���ɌĂ΂�܂�
- ***********************************************/
-void vreg_ctr_init(  )
-{
-    vreg_ctr[ VREG_C_VCOM_T ] = VCOM_DEFAULT_T;
-    vreg_ctr[ VREG_C_VCOM_B ] = VCOM_DEFAULT_B;
-
-    vreg_ctr[ VREG_C_OFF_DELAY ] = FORCEOFF_THREASHOLD;
-
-    vreg_ctr[ VREG_C_VOL_CAL_MIN ] = 0x36;
-    vreg_ctr[ VREG_C_VOL_CAL_MAX ] = 0xFF - 0x36;
-}
-
-
-/********************************************//**
- �����l�Z�b�g
- 
- �V�X�e�����Z�b�g���ɌĂ΂�܂�
- ***********************************************/
-void vreg_ctr_reset(  )
-{
-    vreg_ctr[ VREG_C_MCU_VER_MAJOR ] = MCU_VER_MAJOR | 0x10;
-    vreg_ctr[ VREG_C_MCU_VER_MINOR ] = MCU_VER_MINOR;
-
-    vreg_ctr[ VREG_C_LED_BRIGHT ] = 0xFF;
-    vreg_ctr[ VREG_C_LED_POW ] = 0;
-    vreg_ctr[ VREG_C_LED_WIFI ] = 0;
-    vreg_ctr[ VREG_C_LED_CAM ] = 0;
-    vreg_ctr[ VREG_C_LED_3D ] = 0;
-    {
-        u8 i;
-        for( i = 0; i < sizeof( uni_info_LED ); i++ )
-        {
-            info_LED.bindata[ i ] = 0;
-        }
-    }
-
-	vreg_ctr[ VREG_C_WIFI_CALIB ] = 0;
-	RESET1_neg;
-	RESET2_neg;
-	FCRAM_RST_neg;
-}
-
-
-
-/********************************************//**
-   I2C���z���W�X�^�ɏ����܂��B
-
-  �@���� adrs �͓����A�h���X
-
-    �@�����Ȃ��A�h���X�ɃA�N�Z�X�����ꍇ�A�������܂���B
-
-   ���������񂾌��ʁAI2C_mcu�ʐM����������ꍇ�Arenge_task_immed_add()
-    ���g�p���Ȃ��ƁAI2C_mcu�g�p���ŃG���[�I�������ꍇ�Ƀ��g���C���܂���B
- ***********************************************/
-void vreg_ctr_write( u8 adrs, u8 data )
-{
-    switch ( adrs )
-    {
-
-    case VREG_C_COMMAND0:
-        if( data != 0 )
-        {
-            renge_task_immed_add( tski_do_command0 );
-	        vreg_ctr[ VREG_C_COMMAND0 ] |= data;
-        }
-        break;
-
-    case VREG_C_COMMAND2:
-        // �����炩��̊������荞�݂�҂��Ă���Ȃ������ł��B #-��-) ���̂��߂̊��荞�݂�
-        // �t���d��
-        if(( data & REG_BIT_CMD_LCD_ON ) != 0 )
-        {
-            renge_task_immed_add( tski_PM_LCD_on );
-        }
-        else if(( data & REG_BIT_CMD_LCD_OFF ) != 0 )
-        {
-            renge_task_immed_add( tski_PM_LCD_off );
-        }
-
-        // �o�b�N���C�g�ݒ�
-        /// ���̂Ƃ��낳��ɍׂ����͕����Ȃ����ǁc
-        if(( data & REG_BITS_CMD_BL ) != 0 )
-        {
-            renge_task_immed_add( tski_PM_BL_set );
-            vreg_ctr[adrs] = (u8)( data & REG_BITS_CMD_BL );
-        }
-        break;
-
-    case VREG_C_COMMAND1:
-        if( data != 0 )
-        {
-            // u8 temp; ���ԕϐ��g������΂��ł����Ȃ���...
-            // TWL�Ɋ��荞�݂�����
-            /// ���ۂɊ��荞�݂�����̂�SoC
-            /// �r�b�g�̕��т��Ⴄ����ʓ|
-            vreg_twl[ REG_TWL_INT_ADRS_IRQ ]  = ( ( data & REG_BIT_SEND_TWL_PWSW_DET )   != 0 ) ? REG_BIT_TWL_IRQ_PWSW_DET : 0x00;  //pwsw_det
-            vreg_twl[ REG_TWL_INT_ADRS_IRQ ] |= ( ( data & REG_BIT_SEND_TWL_RESET_DET )  != 0 ) ? REG_BIT_TWL_IRQ_RESET : 0x00;     //reset_req
-
-            vreg_twl[ REG_TWL_INT_ADRS_IRQ ] |= ( ( data & REG_BIT_SEND_TWL_OFF_DET )    != 0 ) ? REG_BIT_TWL_IRQ_OFF : 0x00;       //off_req
-
-            vreg_twl[ REG_TWL_INT_ADRS_IRQ ] |= ( ( data & REG_BIT_SEND_TWL_BATT_LOW )   != 0 ) ? REG_BIT_TWL_IRQ_BT_LOW : 0x00;    //batt_low
-            vreg_twl[ REG_TWL_INT_ADRS_IRQ ] |= ( ( data & REG_BIT_SEND_TWL_BATT_EMPTY ) != 0 ) ? REG_BIT_TWL_IRQ_BT_EMPTY : 0x00;  //batt_empty
-
-            if(( data & REG_BIT_SEND_TWL_VOL_CLICK ) != 0 )
-            {
-                vreg_twl[ REG_TWL_INT_ADRS_IRQ ] |= REG_BIT_TWL_IRQ_VOL_CHANGE; //vol_changed
-            }
-        }
-        break;
-
-    case VREG_CX_FREE_DATA:
-        if( vreg_free_adrs < VREG_C_FREE_SIZE )
-        {
-            pool.vreg_c_ext.vreg_c_free[ vreg_free_adrs ] = data;
-            vreg_free_adrs ++;
-        }
-        break;
-
-    case VREG_CX_FREE_ADRS:
-        vreg_free_adrs = data;
-        break;
-
-	case VREG_C_LED_POW:
-        if( iic_burst_state == 0 )
-        {
-            vreg_ctr[ VREG_C_LED_POW ] = data;
-            iic_burst_state ++;
-        }
-        else if( iic_burst_state < 5 )
-        {
-            led_red_batt_empty.dats[ iic_burst_state -1 ] = data;
-            iic_burst_state ++;
-        }
-        break;
-
-    case VREG_C_LED_WIFI:
-    case VREG_C_LED_CAM:
-    case VREG_C_LED_3D:
-        vreg_ctr[adrs] = (u8)( data & 0x0F );
-        break;
-
-    case VREG_C_LED_NOTIFY_DATA:
-        if( iic_burst_state < sizeof( uni_info_LED ) )
-        {
-            if(( iic_burst_state == 1 ) && ( data == 0 ))  // fade_time == 0 �֎~
-            {
-                data = 1;
-            }
-            info_LED.bindata[ iic_burst_state ] = data;
-            iic_burst_state ++;
-            if( iic_burst_state > 4 )             // �p�^�[����1�����ł�������
-            {
-                info_led_pattern_updated = true;
-            }
-        }
-        break;
-
-    case VREG_C_MCU_STATUS:
-//        vreg_twl[ REG_TWL_INT_ADRS_MODE ] = (u8)( ( data >> 6 ) & 0x03 ); R�ł悢�B���̑��胊�Z�b�g�ŃN���A
-        vreg_ctr[ VREG_C_MCU_STATUS ] &= data;  // bit�N���A�͂��邪�Z�b�g�͂��Ȃ��B
-												// ��̕���twl���W�X�^�~���[�͓ǂݏo���ꎞ�ɍ���
-        break;
-
-    case VREG_C_VCOM_T:
-    case VREG_C_VCOM_B:
-        renge_task_immed_add( tski_vcom_set );
-        vreg_ctr[adrs] = data;
-        break;
-
-    case VREG_C_DBG03:
-        if( ( vreg_ctr[VREG_C_DBG01] == 'j' )
-            && ( vreg_ctr[VREG_C_DBG02] == 'h' )
-            && ( data == 'l' ) )
-        {
-            renge_task_immed_add( tski_firm_update );
-            IICAMK = 1;
-        }
-        vreg_ctr[ VREG_C_DBG03 ] = data;
-        break;
-
-	/// �񓯊��œ����Ă��邽�߂����ł͏����Ȃ��B
-    // �\�񂷂邾����stop�ŏ���
-    case VREG_C_RTC_SEC:
-    case VREG_C_RTC_MIN:
-        set_rtc( adrs - VREG_C_RTC_SEC, data & 0x7F );
-        break;
-
-    case VREG_C_RTC_DAY:
-    case VREG_C_RTC_HOUR:
-        set_rtc( adrs - VREG_C_RTC_SEC, data & 0x3F );
-        break;
-
-    case VREG_C_RTC_YOBI:
-        set_rtc( adrs - VREG_C_RTC_SEC, data & 0x07 );
-        break;
-
-    case VREG_C_RTC_MONTH:
-        set_rtc( adrs - VREG_C_RTC_SEC, data & 0x1F );
-        break;
-
-    case VREG_C_RTC_YEAR:
-        set_rtc( adrs - VREG_C_RTC_SEC, data );
-        break;
-
-    case VREG_C_RTC_COMP:
-        WDT_Restart();
-        while(1)
-        {
-            RWAIT = 1;
-            while( !RWST ){}
-            if( SEC != 0 )
-            {
-                break;
-            }
-            RWAIT = 0;
-        }
-        SUBCUD = data;
-        RWAIT = 0;
-        vreg_ctr[ VREG_C_RTC_COMP ] = data;
-        break;
-
-    case VREG_C_RTC_ALARM_MIN:
-        rtc_alarm_dirty = true;
-        vreg_ctr[ VREG_C_RTC_ALARM_MIN ] = (u8)( data & 0x7F );
-        break;
-
-    case VREG_C_RTC_ALARM_HOUR:
-        rtc_alarm_dirty = true;
-        vreg_ctr[ VREG_C_RTC_ALARM_HOUR ] = (u8)( data & 0x3F );
-        break;
-
-        // ���������ł悢
-    case VREG_C_RTC_ALARM_DAY:
-        vreg_ctr[ VREG_C_RTC_ALARM_DAY ] = (u8)( data & 0x3F );
-        break;
-
-    case VREG_C_RTC_ALARM_MONTH:
-        vreg_ctr[ VREG_C_RTC_ALARM_MONTH ] = (u8)( data & 0x1F );
-        break;
-
-    case VREG_C_ACC_CONFIG:
-        renge_task_immed_add( tski_acc_setup );
-        vreg_ctr[ VREG_C_ACC_CONFIG ] = data;
-        break;
-
-    case VREG_C_ACC_R_ADRS:
-        renge_task_immed_add( tski_acc_read );
-        vreg_ctr[ VREG_C_ACC_R_ADRS ] = data;
-        break;
-
-    case VREG_C_ACC_W_BUF:
-        renge_task_immed_add( tski_acc_write );
-        vreg_ctr[ VREG_C_ACC_W_BUF ] = data;
-        break;
-
-    case VREG_C_ACC_HOSU_SETTING:
-        if( ( data & 0x01 ) != 0 )
-        {
-            clear_hosu_hist(); // �����N���A
-        }
-        break;
-
-	case VREG_C_WIFI_CALIB:
-		if( data & REG_BIT_WIFI_CALIB_32K_HI_Z )
-		{
-			RTC_32k_HI_Z();
-		}
-		else{
-			RTC_32k_on();
-		}
-		if( data & REG_BIT_WIFI_CALIB_RSTS_AST )
-		{
-			RESET1_ast;
-			// RESET2_ast;		RESET1�̂݁B
-			// FCRAM_RST_ast;
-		}
-		else{
-/*
-		SoC ���~�܂��Ă��܂��̂ł����ɗ��Ȃ�
-		RESET1_neg;
-		RESET2_neg;
-		FCRAM_RST_neg;
-*/
-		}
-        vreg_ctr[ VREG_C_WIFI_CALIB ] = data;
-		break;
-
-	case VREG_C_COMMAND3:
-        switch ( data )
-        {
-#ifdef _ENABLE_COMMAND3_
-        case 'r':
-            // ���荞�݃��[�`������FSL���C�u�������ĂԂ̂͋֎~
-            // �}�C�R�����ċN���B�@���W�X�^�ނ������������B
-            renge_task_immed_add( tski_mcu_reset );
-            break;
-
-        case 'w':
-            // WDT�ōċN���i�e�X�g�����j
-//            mcu_wdt_reset;  // ���̃R�}���h�g������Ӗ��Ȃ��ł���I
-            while(1)
-            {
-                dbg_NOP();
-            }
-            break;
-#endif //_ENABLE_COMMAND3_
-
-#ifdef _ENABLE_HAL_
-		case 'p':
-			reserve_pedo_increnent = 1;
-			// �����ő��₷�ɂ̓X�^�b�N������Ȃ��B���ŗ\��̂݁Atask_misc���ŏ���
-//			hosu_increment_if_necessary();		// ���A���������
-			break;
-#endif //_ENABLE_HAL_
-
-        }
-//        vreg_ctr[ VREG_C_COMMAND3 ] = data;	// �����K�v�Ȃ�
-        break;
-
-	case VREG_C_RBR_CONTROL:
-        vreg_ctr[ VREG_C_RBR_CONTROL ] = data;	// todo debug �u���[�N�|�C���g��u�����߁B����A�t���[���W�X�^
-        break;
-
-
-	// read only //////////////////////////////////////////
-    case VREG_C_MCU_VER_MAJOR:
-    case VREG_C_MCU_VER_MINOR:
-	case VREG_C_3D:             // �����Ƀ��t���b�V�������
-    case VREG_C_SND_VOL:		// �����Ƀ��t���b�V�������
-    case VREG_C_BT_TEMP:		// �����Ƀ��t���b�V�������
-    case VREG_C_BT_REMAIN:      // �����Ƀ��t���b�V�������
-    case VREG_C_BT_REMAIN_FINE:	// �����Ƀ��t���b�V�������
-    case VREG_C_BT_VOLTAGE:     // �����Ƀ��t���b�V�������
-	case VREG_C_STATUS_1:		// �K���Ƀ��t���b�V�������
-    case VREG_C_STATUS:			// �K���Ƀ��t���b�V�������
-    case VREG_C_IRQ0:			// ���̂‚��łɊ��荞�݋N�����Ăق����Ȃ�...
-    case VREG_C_IRQ1:
-    case VREG_C_IRQ2:
-    case VREG_C_IRQ3:
-    case VREG_C_IRQ4:
-    case VREG_C_LED_NOTIFY_FLAG: // �������t���b�V�������
-    case VREG_C_RTC_SEC_FINE_L:	// �������t���b�V�������
-    case VREG_C_RTC_SEC_FINE_H:	// �������t���b�V�������
-        //  VREG_C_ACC_RESERVE,	// �����N���Ȃ�
-        //  VREG_C_ACC_HOSU_HIST = 0x4F,
-	case VREG_C_ACC_XH:				// �������t���b�V�������
-	case VREG_C_ACC_XL:
-	case VREG_C_ACC_YH:
-	case VREG_C_ACC_YL:
-	case VREG_C_ACC_ZH:
-	case VREG_C_ACC_ZL:
-//        dbg_nop();
-		// return( ERROR )
-        break;
-
-	case VREG_C_ACC_HOSU_L:	// �����Ă��������ǁA�f�o�b�O�p�B(�A�h���X0x4B == mcu sla(r))
-//        dbg_nop();
-        /* FALLTHROUGH */
-
-    // ���ʂɏ�����邾�� /////////////////////////////////
-	default:
-        /*
-    case VREG_C_IRQ_MASK0:
-    case VREG_C_IRQ_MASK1:
-    case VREG_C_IRQ_MASK2:
-    case VREG_C_IRQ_MASK3:
-    case VREG_C_IRQ_MASK4:
-    case VREG_C_DBG01:
-    case VREG_C_DBG02:
-    case VREG_C_LED_BRIGHT:
-    case VREG_C_ACC_HOSU_L:
-    case VREG_C_ACC_HOSU_M:
-    case VREG_C_ACC_HOSU_H:
-    case VREG_C_ACC_HOSU_HOUR_BOUNDARY:
-    case VREG_C_FREE_ADRS:
-    case VREG_C_RTC_ALARM_YEAR:
-    case VREG_C_ACC_W_ADRS:
-    case VREG_C_OFF_DELAY:
-    case VREG_C_HAL_OVW_CONT0:
-    case VREG_C_HAL_OVW_DAT0:
-    case VREG_C_HAL_OVW_CONT1:
-    case VREG_C_HAL_OVW_DAT1:
-        */
-        if( adrs < VREG_C_ENDMARK_ )
-        {
-            vreg_ctr[adrs] = data;
-            break;
-        }
-        else
-        {
-//            dbg_nop();		// ����`�A�h���X�ɏ������@�Ȃ񂩃o�O���ĂȂ��H
-			// return( ERROR )
-            break;
-        }
-    }
-//	return( SUCCESS )
-	return;
-}
-
-
-
-/********************************************//**
-   I2C���z���W�X�^����ǂ݂܂��B
-
-   �߂�F xx �f�[�^
-
-   ���ӁF���̃A�h���X�̏����ŌĂ΂�� �̂ŁA
-         ���[�h���ꂽ��N���A�Ȃǂ͋C���‚���
-
-         ( ��vreg_ctr_after_read( u8 adrs ) )
- ***********************************************/
-u8 vreg_ctr_read( u8 adrs )
-{
-    static u16 rsub_temp;
-    u8 temp;
-
-    // RTC�͓ǂݏo���r���ɌJ��オ��̂�����邽��
-    if( ( VREG_C_RTC_SEC <= adrs ) && ( adrs <= VREG_C_RTC_YEAR ) )
-    {
-        rtc_buf_refresh(  );
-    }
-    else if( adrs == VREG_C_MCU_STATUS )
-    {
-        return( ( vreg_ctr[ VREG_C_MCU_STATUS ] & 0x03 ) |
-            ( ( vreg_twl[ REG_TWL_INT_ADRS_MODE ] & 0x03 ) << 6 ) |  // sys_mode
-            ( ( vreg_twl[ REG_TWL_INT_ADRS_MODE ] & 0x80 ) >> 2 ));   // vol32
-    }
-    else if( adrs == VREG_C_RTC_SEC_FINE_L )
-    {
-        rsub_temp = RSUBC;
-        return( (u8)( rsub_temp & 0xFF ) );
-    }
-    else if( adrs == VREG_C_RTC_SEC_FINE_H )
-    {
-        return( (u8)( ( rsub_temp >> 8 ) & 0xFF ) );
-    }
-/*
-	// debug �I��
-	else if( adrs == VREG_C_IRQ_MASK0 )
-    {
-        return( vreg_ctr[ VREG_C_IRQ_MASK0 ] & 0x7F );  // ���`��������MSB��0�B1�Ȃ�ʐM�G���[
-    }
-*/
-	else if( adrs == VREG_C_ACC_HOSU_HIST )
-    {
-        return( hosu_read() );
-    }
-    else if( adrs == VREG_CX_FREE_DATA )
-    {
-        temp = pool.vreg_c_ext.vreg_c_free[ vreg_free_adrs ];
-        // vreg_free_adrs ++;  // �����ʼn��Z���Ă��܂��ƃC���f�b�N�X�������
-        return( temp );
-    }
-    else if( adrs == VREG_CX_INFO )
-    {
-        return( extinfo_read() );
-    }
-    else if( adrs == VREG_C_ACC_HOSU_SETTING )
-    {
-        if( pedolog_overflow )
-        {
-            return( 0x10 );
-        }
-        else
-        {
-            return( 0 );
-        }
-    }
-
-    if( adrs >= VREG_C_ENDMARK_ )
-    {
-        // VREG_C_INFO > VREG_C_ENDMARK_ �Ȃ̂ł�����Ƃ�����
-        return( 0xFF );
-    }
-    return ( vreg_ctr[adrs] );
-}
-
-
-/********************************************//**
- I2C���z���W�X�^����ǂ܂�ĉ������郌�W�X�^
- ***********************************************/
-void vreg_ctr_after_read( u8 adrs, u8 data )
-{
-    // ���荞�݃t���O�̓��[�h�ŃN���A
-    switch( adrs )
-    {
-    case VREG_C_IRQ0:
-    case VREG_C_IRQ1:
-    case VREG_C_IRQ2:
-    case VREG_C_IRQ3:
-    case VREG_C_IRQ4:
-        DI_wt_chk();
-        vreg_ctr[ adrs ] ^= data;
-        EI();
-        irq_readed = true;
-        break;
-
-    case VREG_CX_FREE_DATA:
-        vreg_free_adrs ++;
-        break;
-
-    default:
-        break;
-    }
-}
-
-
-
-
-
-
-/********************************************//**
-  ���荞�݂�����
-
- - �@�}�X�N����Ă���A�t���O�u���ĂȂ��v�A���荞�ݓ���Ȃ��B
-
- - �@���荞�݂����A�ǂݏo�����O�Ƀ}�X�N�����������Ƃ��́ASoC��̏����L���[��ɂ�
-  IRQ��ǂރ^�X�N���ς�ł���̂ŁA�ǂ݂ɂ͗���B
-
-  �@����ƁA�O�̂��߁A�}�X�N��������Ƃ��͋�ǂ݂��Ă��炤�B
-
-   �����ł�DI���̃`�F�b�N�s�v�B
-
-   �@DI���ɗ���̂�I2C_twl���ARTC_�A���[���B���̒��Ŗ��ڒ���EI���Ď��g�p����Ȃ�
- ***********************************************/
-void set_irq( u8 irqreg, u8 irq_flg )
-{
-    u8 tot;
-//0	u8 ei_orig;		// EI�t���O�ۑ�
-
-    if(( system_status.pwr_state == ON ) ||
-       ( system_status.pwr_state == SLEEP ))
-    {
-/*0	���ł�DI��ԂȂ�P�A���K�v��������Ȃ�
-		ei_orig = get_ei();
-		
-		//. debug
-		if( !ei_orig )
-		{
-			dbg_nop();
-		}
-
-		DI_wt_chk();
-*/
-		DI();
-        if( ( vreg_ctr[ irqreg + 8 ] & irq_flg ) == 0 )
-		{
-            vreg_ctr[ irqreg ] |= irq_flg;
-            IRQ0_neg;   // ��u�グ��...
-//0			if( ei_orig )
-			{
-				EI();
-			}
-            tot = 0;
-            while( !IRQ0 && ( ++tot != 0 ) ){;}   // O.D.�Ȃ̂ł����Ƃ�����̂�҂� �� IRQ_mcu ��L�ɔ����Ă�ƍ���(��•s��)
-            IRQ0_ast;   // ���Ƃ������B�i�G�b�W���荞�ׁ݂̈j
-        }
-//0		if( ei_orig )
-		{
-			EI();
-		}
-    }
-}
-
diff --git a/branches/2.2A_SDK5(4thNUP)/vreg_ctr.h b/branches/2.2A_SDK5(4thNUP)/vreg_ctr.h
deleted file mode 100644
index 00c2140..0000000
--- a/branches/2.2A_SDK5(4thNUP)/vreg_ctr.h
+++ /dev/null
@@ -1,327 +0,0 @@
-#ifndef __vreg_ctr__
-#define __vreg_ctr__
-/*
-
-
- $Id$
-*/
-
-#include "config.h"
-
-// VREG_C_MCU_STATUS
-// bit[7.6] twl.sys_mode��[1.0]     ctr���珑���Ȃ����Afcr_reset���ɓK���Ƀ��Z�b�g
-// bit[5]         �V      [7]       ctr���珑���Ȃ����Afcr_reset���ɓK���Ƀ��Z�b�g
-#define REG_BIT_STATUS_WDT_RESET    ( 1 << 1 )
-#define REG_BIT_RTC_BLACKOUT        ( 1 << 0 )
-
-
-//  VREG_C_STATUS,
-#define REG_BIT_LCD_POW             ( 1 << 7 )
-#define REG_BIT_BL_U                ( 1 << 6 )
-#define REG_BIT_BL_L                ( 1 << 5 )
-#define REG_BIT_BATT_CHARGE         ( 1 << 4 )
-#define REG_BIT_POW_SUPPLY          ( 1 << 3 )
-//                           ���g�p ( 1 << 2 )
-#define REG_BIT_ST_SHELL_OPEN       ( 1 << 1 )
-//                           ���g�p ( 1 << 0 )
-
-
-//  VREG_C_STATUS_X
-//                           ���g�p ( 1 << 6 )
-//                           ���g�p ( 1 << 5 )
-#define REG_BIT_WIFI_TX             ( 1 << 4 )
-//               twl bl �̃~���[[1: ( 1 << 3 )
-//                                0]( 1 << 2 )
-#define REG_BIT_ACCERO_ERR          ( 1 << 1 )
-#define REG_BIT_MGIC_ERR            ( 1 << 0 )
-
-#define REG_BIT_MASK_STATUS1_NTR_PM_REG	0x0C
-
-
-//  VREG_C_IRQ0
-#define REG_BIT_IRQ_WDT_RESET       ( 1 << 7 )
-#define REG_BIT_SHELL_OPEN          ( 1 << 6 )
-#define REG_BIT_SHELL_CLOSE         ( 1 << 5 )
-#define REG_BIT_SW_WIFI_CLICK       ( 1 << 4 )
-#define REG_BIT_SW_HOME_RELEASE     ( 1 << 3 )
-#define REG_BIT_SW_HOME_CLICK       ( 1 << 2 )
-#define REG_BIT_SW_POW_HOLD         ( 1 << 1 )
-#define REG_BIT_SW_POW_CLICK        ( 1 << 0 )
-
-//  VREG_C_IRQ1
-#define REG_BIT_BT_CHG_START        ( 1 << 7 )
-#define REG_BIT_BT_CHG_STOP         ( 1 << 6 )
-#define REG_BIT_BT_REMAIN           ( 1 << 5 )
-#define REG_BIT_ACC_DAT_RDY         ( 1 << 4 )
-#define REG_BIT_ACC_ACK             ( 1 << 3 )
-#define REG_BIT_RTC_ALARM           ( 1 << 2 )
-#define REG_BIT_BT_DC_CONNECT       ( 1 << 1 )
-#define REG_BIT_BT_DC_DISC          ( 1 << 0 )
-
-//  VREG_C_IRQ2
-#define REG_BIT_TWL_VER_READ        ( 1 << 7 )
-//#define REG_BIT_TWL_SNDVOL_CHANGE   ( 1 << 6 ) �p�~
-#define REG_BIT_SLIDE_VOL_ACROSS_TWL_BOUNDARY   ( 1 << 6 )
-#define REG_BIT_TWL_BL_U_ON         ( 1 << 5 )
-#define REG_BIT_TWL_BL_U_OFF        ( 1 << 4 )
-#define REG_BIT_TWL_BL_L_ON         ( 1 << 3 )
-#define REG_BIT_TWL_BL_L_OFF        ( 1 << 2 )
-#define REG_BIT_TWL_OFF_REQ         ( 1 << 1 )
-#define REG_BIT_TWL_RESET_REQ       ( 1 << 0 )
-
-//  VREG_C_IRQ3
-#define REG_BIT_BL_U_ON             ( 1 << 5 )
-#define REG_BIT_BL_U_OFF            ( 1 << 4 )
-#define REG_BIT_BL_L_ON             ( 1 << 3 )
-#define REG_BIT_BL_L_OFF            ( 1 << 2 )
-#define REG_BIT_LCD_ON              ( 1 << 1 )
-#define REG_BIT_LCD_OFF             ( 1 << 0 )
-
-
-// ���̂����ǂ�����...
-//#define REG_BIT_VR_3D_CHANGE      ( 1 << 7 )
-
-
-
-// VREG_C_COMMAND0
-//#define REG_BIT_CMD_LCD_ON              ( 1 << 7 )
-//#define REG_BIT_CMD_LCD_OFF             ( 1 << 6 )
-//#define REG_BIT_CMD_BL_ON               ( 1 << 5 )
-//#define REG_BIT_CMD_BL_OFF              ( 1 << 4 )
-#define REG_BIT_GOING_TO_SLEEP      ( 1 << 4 )
-#define REG_BIT_FCRAM_RESET_REQ     ( 1 << 3 )
-#define REG_BIT_RESET2_REQ          ( 1 << 2 )
-#define REG_BIT_RESET1_REQ          ( 1 << 1 )
-#define REG_BIT_OFF_REQ             ( 1 << 0 )
-
-// VREG_C_COMMAND1 (TWL�Ɋ��荞�݂�����)
-//                           ���g�p ( 1 << 7 )
-//                           ���g�p ( 1 << 6 )
-#define REG_BIT_SEND_TWL_VOL_CLICK  ( 1 << 5 )
-#define REG_BIT_SEND_TWL_BATT_EMPTY ( 1 << 4 )
-#define REG_BIT_SEND_TWL_BATT_LOW   ( 1 << 3 )
-#define REG_BIT_SEND_TWL_OFF_DET    ( 1 << 2 )
-#define REG_BIT_SEND_TWL_RESET_DET  ( 1 << 1 )
-#define REG_BIT_SEND_TWL_PWSW_DET   ( 1 << 0 )
-
-// VREG_C_COMMAND2 �t���֌W
-#define REG_BIT_CMD_BL_U_ON         ( 1 << 5 )
-#define REG_BIT_CMD_BL_U_OFF        ( 1 << 4 )
-#define REG_BIT_CMD_BL_L_ON         ( 1 << 3 )
-#define REG_BIT_CMD_BL_L_OFF        ( 1 << 2 )
-#define REG_BIT_CMD_LCD_ON          ( 1 << 1 )
-#define REG_BIT_CMD_LCD_OFF         ( 1 << 0 )
-#define REG_BITS_CMD_BL             ( REG_BIT_CMD_BL_U_ON | REG_BIT_CMD_BL_U_OFF | REG_BIT_CMD_BL_L_ON | REG_BIT_CMD_BL_L_OFF )
-
-
-// ��TWL�ɒʒm����IRQ���W�X�^
-#define REG_BIT_TWL_IRQ_PWSW_DET 0x08
-#define REG_BIT_TWL_IRQ_RESET    0x01
-#define REG_BIT_TWL_IRQ_OFF      0x02
-#define REG_BIT_TWL_IRQ_BT_LOW   0x20
-#define REG_BIT_TWL_IRQ_BT_EMPTY 0x10
-#define REG_BIT_TWL_IRQ_VOL_CHANGE 0x40
-
-
-// CODEC���PMIC NTR �̑㗝���W�X�^
-#define REG_BIT_TWL_REQ_OFF            ( 1 << 6 )
-#define REG_BIT_TWL_REQ_BL_U           ( 1 << 3 )
-#define REG_BIT_TWL_REQ_BL_L           ( 1 << 2 )
-#define REG_BIT_TWL_REQ_RESET          ( 1 << 0 )
-
-
-// VREG_C_LED_NOTIFY_FLAG
-#define REG_BIT_IN_LOOP                ( 1 << 0 )
-
-// RBR control (0x57)
-#define REG_BIT_FLIGHT              ( 1 << 1 )
-#define REG_BIT_RESET_n             ( 1 << 0 )
-
-
-// HAL bitfields 0
-#define REG_BIT_HAL0_PM_EXTDC_n     ( 1 << 7 )
-#define REG_BIT_HAL0_BT_IN_CHG_n    ( 1 << 6 )
-//#define REG_BIT_HAL0_PM_IRQ_n                 // �g��Ȃ�
-#define REG_BIT_HAL0_RSV_5          ( 1 << 5 ) 
-#define REG_BIT_HAL0_WL_TX          ( 1 << 4 )
-#define REG_BIT_HAL0_SHELL_OPEN     ( 1 << 3 )            // status�ɂ���܂�
-#define REG_BIT_HAL0_SW_WIFI_n      ( 1 << 2 )
-#define REG_BIT_HAL0_SW_HOME_n      ( 1 << 1 )
-#define REG_BIT_HAL0_SW_POW_n       ( 1 << 0 )
-
-
-// HAL bitfields 1
-#define REG_BIT_HAL1_DIPSW_1        ( 1 << 3 )
-#define REG_BIT_HAL1_DIPSW_0        ( 1 << 2 )
-#define REG_BIT_HAL1_HW_DET_1       ( 1 << 1 )
-#define REG_BIT_HAL1_HW_DET_0       ( 1 << 0 )
-
-
-// VREG_C_WIFI_CALIB
-#define REG_BIT_WIFI_CALIB_32K_HI_Z	( 1 << 1 )
-#define REG_BIT_WIFI_CALIB_RSTS_AST	( 1 << 0 )
-
-
-/*
-  �e���v��
-#define REG_BIT_                    ( 1 << 7 )
-#define REG_BIT_                    ( 1 << 6 )
-#define REG_BIT_                    ( 1 << 5 )
-#define REG_BIT_                    ( 1 << 4 )
-#define REG_BIT_                    ( 1 << 3 )
-#define REG_BIT_                    ( 1 << 2 )
-#define REG_BIT_                    ( 1 << 1 )
-#define REG_BIT_                    ( 1 << 0 )
-*/
-
-
-
-/*============================================================================*/
-extern u8 vreg_ctr[];
-
-/*============================================================================*/
-enum VREG_C_ADRS
-{                               // ����`�A�h���X�֏������񂾍ۂ̓���͕s��
-  VREG_C_MCU_VER_MAJOR = 0x00,
-  VREG_C_MCU_VER_MINOR,
-  VREG_C_MCU_STATUS,
-
-  VREG_C_VCOM_T = 0x03,
-  VREG_C_VCOM_B,
-
-  VREG_C_DBG01 = 0x05,
-  VREG_C_DBG02,
-  VREG_C_DBG03,
-
-  VREG_C_3D = 0x08,
-  VREG_C_SND_VOL,
-  VREG_C_BT_TEMP,
-  VREG_C_BT_REMAIN,
-  VREG_C_BT_REMAIN_FINE,
-  VREG_C_BT_VOLTAGE,
-
-  VREG_C_STATUS_1 = 0x0E,
-  VREG_C_STATUS = 0x0F,
-
-  VREG_C_IRQ0 = 0x10,
-  VREG_C_IRQ1,
-  VREG_C_IRQ2,
-  VREG_C_IRQ3,
-  VREG_C_IRQ4,
-
-  VREG_C_IRQ_MASK0 = 0x18,
-  VREG_C_IRQ_MASK1,
-  VREG_C_IRQ_MASK2,
-  VREG_C_IRQ_MASK3,
-  VREG_C_IRQ_MASK4,
-
-  VREG_C_COMMAND0 = 0x20,
-  VREG_C_COMMAND1,
-  VREG_C_COMMAND2,
-  VREG_C_COMMAND3,  // 'r' �Ń}�C�R�����Z�b�g�A 'w' ��WDT���Z�b�g
-
-  VREG_C_OFF_DELAY = 0x24,
-//  VREG_C_VOL_DIGITAL = 0x25,  // todo ������
-//  VREG_C_VOL_OPTION,
-  VREG_C_VOL_ADC_RAW = 0x27,
-
-  VREG_C_LED_BRIGHT = 0x28,
-  VREG_C_LED_POW,
-  VREG_C_LED_WIFI,
-  VREG_C_LED_CAM,
-  VREG_C_LED_3D,
-  VREG_C_LED_NOTIFY_DATA,
-  VREG_C_LED_NOTIFY_FLAG,
-
-  VREG_C_RBR_CONTROL = 0x2F,	// �p�~
-
-  VREG_C_RTC_SEC = 0x30,
-  VREG_C_RTC_MIN,
-  VREG_C_RTC_HOUR,
-  VREG_C_RTC_YOBI,
-  VREG_C_RTC_DAY,
-  VREG_C_RTC_MONTH,
-  VREG_C_RTC_YEAR,
-
-  VREG_C_RTC_COMP,
-
-  VREG_C_RTC_ALARM_MIN = 0x38,
-  VREG_C_RTC_ALARM_HOUR,
-  VREG_C_RTC_ALARM_DAY,
-  VREG_C_RTC_ALARM_MONTH,
-  VREG_C_RTC_ALARM_YEAR,
-
-  VREG_C_RTC_SEC_FINE_L,
-  VREG_C_RTC_SEC_FINE_H,
-
-  VREG_C_WIFI_CALIB = 0x3F,
-
-  VREG_C_ACC_CONFIG = 0x40,
-  VREG_C_ACC_R_ADRS,
-  VREG_C_ACC_RESERVE,
-  VREG_C_ACC_W_ADRS,
-  VREG_C_ACC_W_BUF,		// r,w ���p
-
-  VREG_C_ACC_XL = 0x45,
-  VREG_C_ACC_XH,
-  VREG_C_ACC_YL,
-  VREG_C_ACC_YH,
-  VREG_C_ACC_ZL,
-  VREG_C_ACC_ZH,
-
-  VREG_C_ACC_HOSU_L = 0x4B,
-  VREG_C_ACC_HOSU_M,
-  VREG_C_ACC_HOSU_H,
-  VREG_C_ACC_HOSU_SETTING,
-  VREG_C_ACC_HOSU_HIST = 0x4F,
-  
-  VREG_C_ACC_HOSU_HOUR_BOUNDARY = 0x50,
-  VREG_C_ACC_HOSU_HOUR_BOUNDARY_SEC,
-
-  VREG_C_HAL_OVW_CONT0 = 0x52,
-  VREG_C_HAL_OVW_DAT0,
-  VREG_C_HAL_OVW_CONT1,				// reserved
-  VREG_C_HAL_OVW_DAT1,				// reserved
-
-  VREG_C_HAL_OVW_BT_FUEL = 0x56,
-  VREG_C_HAL_OVW_BT_VOLTAGE,
-
-  VREG_C_VOL_CAL_MIN = 0x58,
-  VREG_C_VOL_CAL_MAX,
-
-  VREG_C_HAL_OVW_TEMPERATURE = 0x5A,
-
-  VREG_C_ENDMARK_
-};
-
-// ���Ԃ͔����ɂ��āA���������m�ۂ��Ȃ����߂� �ʂ� define ���Ă�
-#define VREG_CX_INFO 0x7F
-#define VREG_CX_FREE_ADRS 0x60
-#define VREG_CX_FREE_DATA 0x61
-//  VREG_C_AMBIENT_BRIGHTNESS = 0xXX,
-
-
-
-
-/*============================================================================*/
-void vreg_ctr_init(  );
-void vreg_ctr_reset(  );
-void vreg_ctr_write( u8 adrs, u8 data );
-u8 vreg_ctr_read( u8 phy_adrs );
-void vreg_ctr_after_read( u8 adrs, u8 data );
-void set_irq( u8 irqreg, u8 irq_flg );
-
-
-#define is_wifi_calib_resets_ast       ( vreg_ctr[ VREG_C_WIFI_CALIB ] & REG_BIT_WIFI_CALIB_RSTS_AST )
-#define vreg_stop_acc                  ( vreg_ctr[ VREG_C_ACC_CONFIG ] &= ~( VREG_BITMASK_ACC_CONF_HOSU | VREG_BITMASK_ACC_CONF_ACQ ) )
-#define vreg_set_acc_error             ( vreg_ctr[ VREG_C_STATUS_1 ] |= REG_BIT_ACCERO_ERR )
-#define is_acc_on                      ( vreg_ctr[VREG_C_ACC_CONFIG] & VREG_BITMASK_ACC_CONF_ACQ )
-#define is_pedo_on                     ( vreg_ctr[VREG_C_ACC_CONFIG] & VREG_BITMASK_ACC_CONF_HOSU )
-#define is_mgic_error                  ( vreg_ctr[ VREG_C_STATUS_1 ] & REG_BIT_MGIC_ERR )
-#define vreg_set_mgic_error            ( vreg_ctr[ VREG_C_STATUS_1 ] |= REG_BIT_MGIC_ERR )
-#define vreg_clear_mgic_error          ( vreg_ctr[ VREG_C_STATUS_1 ] &= ~(REG_BIT_MGIC_ERR) )
-#define is_bt_charging                 ( vreg_ctr[VREG_C_STATUS] & REG_BIT_BATT_CHARGE )
-#define is_shell_open                  ( vreg_ctr[VREG_C_STATUS] & REG_BIT_ST_SHELL_OPEN )
-
-
-#endif
diff --git a/branches/2.2A_SDK5(4thNUP)/vreg_twl.c b/branches/2.2A_SDK5(4thNUP)/vreg_twl.c
deleted file mode 100644
index 1cb1225..0000000
--- a/branches/2.2A_SDK5(4thNUP)/vreg_twl.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/* ========================================================
-   TWL�݊�����I2C���W�X�^
-
-  $Id$
- ======================================================== */
-#include "incs.h"
-#include "jhl_defs.h"
-#include "led.h"
-
-#include "vreg_twl.h"
-//#include "vreg_ctr.h"
-#include "adc.h"
-
-
-// ========================================================
-#define TWL_REG_VER_INFO               0x35
-#define NON_EXIST_REG                  0xFF
-
-// ========================================================
-u8      vreg_twl[_REG_TWL_INT_ADRS_ENDMARK];
-
-
-extern bit twl_ver_read;
-extern bit cam_led_update;
-extern bit vol_changed_by_twl;
-
-
-// ========================================================
-extern void tsk_led_cam();
-
-
-
-
-/********************************************//**
-  ���z���W�X�^�̏�����
- ***********************************************/
-void vreg_twl_init(  )
-{
-    vreg_twl[ REG_TWL_INT_ADRS_MODE ] = 0x03;
-    vreg_twl[ REG_TWL_INT_ADRS_IRQ ] = 0;
-    vreg_twl[ REG_TWL_INT_ADRS_CAM ] = 0;
-    vreg_twl[ REG_TWL_INT_ADRS_TEMP0 ] = 0;
-}
-
-
-
-/********************************************//**
-   I2C���z���W�X�^�ɏ����E�����A�N�V��������
-
-  �@���� adrs �͓����A�h���X
-
-    �@���݂��Ȃ��A�h���X�ɃA�N�Z�X�����ꍇ�A�������܂���B
- ***********************************************/
-void vreg_twl_write( u8 adrs, u8 data )
-{
-    switch ( adrs )
-    {
-      case ( REG_TWL_INT_ADRS_VOL ):
-        {
-            vol_changed_by_twl = true;
-            vreg_twl[ REG_TWL_INT_ADRS_VOL ] = data;
-            //renge_task_immed_add( tski_vol_update );
-            vol_polling = 3;
-            break;
-        }
-
-      case ( REG_TWL_INT_ADRS_MODE ):
-        vreg_twl[ REG_TWL_INT_ADRS_MODE ] = ( data & 0x83 );  // [8]vol32 [1:0]nand
-        break;
-
-      case ( REG_TWL_INT_ADRS_CAM ):
-        vreg_twl[ REG_TWL_INT_ADRS_CAM ] = ( data & 0x03 );
-        if( ( data & 0x03 ) == TWL_CAMLED_BLINK )
-        {
-        	cam_led_update = true;        	// �����łȂ��ƈꔭ�������ɕs������邽��
-        }
-	    tsk_led_cam();	// �u�����N�̓s���ŋ����N��
-        break;
-
-      case ( REG_TWL_INT_ADRS_TEMP0 ):
-        vreg_twl[ REG_TWL_INT_ADRS_TEMP0 ] = data;
-        break;
-
-      case ( REG_TWL_INT_ADRS_COMMAND ):
-/*
-        if( data <= 2 ){
-            if( ( data & REG_BIT_TWL_OFF_REQ ) != 0 )
-            {
-                set_irq( VREG_C_IRQ2, REG_BIT_TWL_OFF_REQ );      // OFF���������Ă����炵���B
-                break;
-            }
-            else if( ( data & REG_BIT_TWL_RESET_REQ ) != 0 )
-            {
-                set_irq( VREG_C_IRQ2, REG_BIT_TWL_RESET_REQ );      //���Z�b�g�����Ȃ��B���̂́ASPI���痈�܂��B
-                break;
-            }
-          }
-*/
-        if( data == REG_BIT_TWL_RESET_REQ )
-        {
-            set_irq( VREG_C_IRQ2, REG_BIT_TWL_RESET_REQ );      //���Z�b�g�����Ȃ��B���̂́ASPI���痈�܂��B
-            break;
-        }
-    }
-    return;
-}
-
-
-
-/********************************************//**
-   I2C���z���W�X�^����ǂ݂܂��B
-
-  �@���� adrs �O���猩���Ƃ��́A�A�h���X
-
-  �@�߂�   xx �f�[�^
-
-    �@���݂��Ȃ��A�h���X�ɃA�N�Z�X�����ꍇ�A�߂�l��0x5A
- ***********************************************/
-u8 vreg_twl_read( u8 phy_adrs )
-{
-    u8 temp;
-
-    switch( phy_adrs ){
-        // 10%�ȉ��ŐԂɂȂ�
-      case( REG_TWL_INT_ADRS_POWER_INFO ):
-          // ���x���̃Z�b�g�� get_batt_left()���i�������x���Ė����ł����j
-          return( vreg_twl[ REG_TWL_INT_ADRS_POWER_INFO ] | ( !PM_EXTDC_n ? 0x80: 0x00 ) );  // �A�_�v�^bit(�A�_�v�^�L��)
-
-      case( REG_TWL_INT_ADRS_IRQ ):
-          temp = vreg_twl[ REG_TWL_INT_ADRS_IRQ ];
-          vreg_twl[ REG_TWL_INT_ADRS_IRQ ]= 0;
-          return( temp );
-
-      case( REG_TWL_INT_ADRS_VER_INFO ):
-//          set_irq( VREG_C_IRQ2, REG_BIT_TWL_VER_READ );  // ���x�I�ɖ����Ȃ̂�
-          twl_ver_read = true;
-          return( TWL_REG_VER_INFO );
-
-      case( REG_TWL_ADRS_NON_EXIST ):
-          return( 0x00 );
-
-      default:
-          return( vreg_twl[ phy_adrs ] );
-    }
-}
-
-
-
-/********************************************//**
-   �O�����猩���钎�H���A�h���X���A�����̘A���A�h���X�ɓǂݑւ���
-
-   0xFF�͑��݂��Ȃ��A�h���X�B
- ***********************************************/
-u8 adrs_table_twl_ext2int( u8 img )
-{
-    switch( img ){
-      case( REG_TWL_ADRS_IRQ ):        return( REG_TWL_INT_ADRS_IRQ );
-      case( REG_TWL_ADRS_COMMAND ):    return( REG_TWL_INT_ADRS_COMMAND );
-      case( REG_TWL_ADRS_POWER_INFO ): return( REG_TWL_INT_ADRS_POWER_INFO );
-      case( REG_TWL_ADRS_VOL ):        return( REG_TWL_INT_ADRS_VOL );
-      case( REG_TWL_ADRS_CAM ):        return( REG_TWL_INT_ADRS_CAM );
-      case( REG_TWL_ADRS_TEMP0 ):      return( REG_TWL_INT_ADRS_TEMP0 );
-      case( REG_TWL_ADRS_VER_INFO ):   return( REG_TWL_INT_ADRS_VER_INFO );
-      case( REG_TWL_ADRS_MODE ):       return( REG_TWL_INT_ADRS_MODE );
-      default:                         return( REG_TWL_ADRS_NON_EXIST );
-//      0���ǂ߂�΂悢�A�����Ȃ��ėǂ�
-//      case( REG_TWL_ADRS_WIFI ):       return( REG_TWL_INT_ADRS_WIFI );
-    }
-}
diff --git a/branches/2.2A_SDK5(4thNUP)/vreg_twl.h b/branches/2.2A_SDK5(4thNUP)/vreg_twl.h
deleted file mode 100644
index 63cdd94..0000000
--- a/branches/2.2A_SDK5(4thNUP)/vreg_twl.h
+++ /dev/null
@@ -1,127 +0,0 @@
-#ifndef __vreg_twl__
-#define __vreg_twl__
-/* ========================================================================= */
-extern u8 vreg_twl[];
-
-
-/*
- * �O���猩���Ƃ��̃}�C�R�����W�X�^�A�h���X�B
- * �g�����Ȃǂ��l���Ĕ�є�тɂ��Ă���B
- */
-/*
- * ���荞�ݗv���t���O��
- * MSB:�O���d�������L��/�Ȃ��ω� �i�������j
- *   6:Vol�L�[����i�ύX�Ɍ��炸�BMAX���Ɂ{�ł��B�j
- *   5:�d�r�d�� �� ���o
- *   4:         ��
- *   3:�d���X�C�b�` �����ꌟ�o
- *   2:�i���ݒ�j
- *   1:�d���X�C�b�` OFF      ���ԉ����ꌟ�o
- * LSB:             ���Z�b�g
- */
-enum REG_TWL_ADRS
-{                               // ����`�A�h���X�֏������񂾍ۂ͖���
-  REG_TWL_ADRS_VER_INFO = 0x00,
-  REG_TWL_ADRS_PMIC_INFO,
-  REG_TWL_ADRS_BATT_INFO,
-  REG_TWL_ADRS_IRQ = 0x10,
-  REG_TWL_ADRS_COMMAND,
-  REG_TWL_ADRS_MODE,
-  REG_TWL_ADRS_POWER_INFO = 0x20,
-  REG_TWL_ADRS_POWER_SAVE,
-  REG_TWL_ADRS_WIFI = 0x30,
-  REG_TWL_ADRS_CAM,
-  REG_TWL_ADRS_VOL = 0x40,
-  REG_TWL_ADRS_BL,
-  REG_TWL_ADRS_CODEC_MIC_GAIN = 0x50,
-  REG_TWL_ADRS_ADC_CALIB = 0x60,
-  REG_TWL_ADRS_ADC_CALIB_STATUS,
-  REG_TWL_ADRS_ADC_CALIB_VALUE,
-  REG_TWL_ADRS_POWER_LED,
-  REG_TWL_ADRS_TEMP0 = 0x70,
-  REG_TWL_ADRS_TEMP1,
-  REG_TWL_ADRS_TEMP2,
-  REG_TWL_ADRS_TEMP3,
-  REG_TWL_ADRS_TEMP4,
-  REG_TWL_ADRS_TEMP5,
-  REG_TWL_ADRS_TEMP6,
-  REG_TWL_ADRS_TEMP7,
-  REG_TWL_ADRS_TIME_PWSW_DELAY = 0x80,
-  REG_TWL_ADRS_TIME_PWSW_THRESHOLD
-};
-
-#define REG_TWL_ADRS_NON_EXIST 0xFF
-
-/*
- * �}�C�R�������ł̃��W�X�^�̎���
- * �������‚߂Ă���
- */
-enum REG_TWL_ADRS_INT
-{
-  REG_TWL_INT_ADRS_VER_INFO = 0x00,
-//  REG_TWL_INT_ADRS_PMIC_INFO,
-//  REG_TWL_INT_ADRS_BATT_INFO,
-  REG_TWL_INT_ADRS_IRQ,         // 0x10,
-  REG_TWL_INT_ADRS_COMMAND,
-  REG_TWL_INT_ADRS_MODE,
-  REG_TWL_INT_ADRS_POWER_INFO,  // 0x20,
-//  REG_TWL_INT_ADRS_POWER_SAVE,
-//  REG_TWL_INT_ADRS_WIFI,        // 0x30,
-  REG_TWL_INT_ADRS_CAM,
-  REG_TWL_INT_ADRS_VOL,         // 0x40,
-//  REG_TWL_INT_ADRS_BL,
-//  REG_TWL_INT_ADRS_CODEC_MIC_GAIN,      // 0x50,
-//  REG_TWL_INT_ADRS_CODEC_MIC_GAIN_RELOAD,
-//  REG_TWL_INT_ADRS_ADC_CALIB,   // 0x60,
-//  REG_TWL_INT_ADRS_ADC_CALIB_STATUS,
-//  REG_TWL_INT_ADRS_ADC_CALIB_VALUE,
-//  REG_TWL_INT_ADRS_POWER_LED,
-    REG_TWL_INT_ADRS_TEMP0,       // 0x70 - 0x77
-  REG_TWL_INT_ADRS_TEMP1,
-  REG_TWL_INT_ADRS_TEMP2,
-  REG_TWL_INT_ADRS_TEMP3,
-  REG_TWL_INT_ADRS_TEMP4,
-  REG_TWL_INT_ADRS_TEMP5,
-  REG_TWL_INT_ADRS_TEMP6,
-  REG_TWL_INT_ADRS_TEMP7,
-//  REG_TWL_INT_ADRS_TIME_PWSW_DELAY,
-//  REG_TWL_INT_ADRS_TIME_PWSW_THRESHOLD
-  _REG_TWL_INT_ADRS_ENDMARK,
-};
-
-
-
-/* ========================================================================= */
-#define is_TWL               ( vreg_twl[ REG_TWL_INT_ADRS_MODE ] & 0x01 )
-#define with_NAND            ( vreg_twl[ REG_TWL_INT_ADRS_MODE ] & 0x02 )
-#define volSteps32           ( vreg_twl[ REG_TWL_INT_ADRS_MODE ] & 0x80 )
-
-#define reg_wifi_led         ( vreg_twl[ REG_TWL_INT_ADRS_WIFI ] & 0x01 )
-#define reg_wifi_led_blink   ( vreg_twl[ REG_TWL_INT_ADRS_WIFI ] & 0x02 )
-
-#define REG_TWL_ADRS_MODE__VOL32 ( 1 << 7 )
-
-typedef enum CAM_LED_TWL_MODE
-{
-  TWL_CAMLED_OFF,
-  TWL_CAMLED_ON,
-  TWL_CAMLED_BLINK,
-  TWL_CAMLED_DEF_ON
-}twl_camLed_mode;
-
-
-/* ========================================================================= */
-void vreg_twl_init(  );
-void vreg_twl_write( u8 adrs, u8 data );
-u8 adrs_table_twl_ext2int( u8 img );
-u8 vreg_twl_read( u8 phy_adrs );
-
-
-// �ǂ񂾂�N���A�Ȃǂ̏���
-#define vreg_twl_after_read( reg_adrs );    \
-    if( reg_adrs == REG_TWL_INT_ADRS_IRQ )  \
-    {                                       \
-        vreg_twl[ REG_TWL_INT_ADRS_IRQ ]= 0;\
-    }
-
-#endif
diff --git a/branches/2.2A_SDK5(4thNUP)/yav_mcu_bsr.plg b/branches/2.2A_SDK5(4thNUP)/yav_mcu_bsr.plg
deleted file mode 100644
index c63b8df..0000000
--- a/branches/2.2A_SDK5(4thNUP)/yav_mcu_bsr.plg
+++ /dev/null
@@ -1,43 +0,0 @@
-C:\Windows\system32\cmd.exe /c c:\cygwin\bin\touch magic.c
-"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no magic.c
-Compilation complete,    0 error(s) and    0 warning(s) found.
-"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\magic.asm
-Assembly complete,     0 error(s) and     0 warning(s) found.
-"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no batt_params.c
-batt_params.c(64) : CC78K0R warning W0401: Conversion may lose significant digits
-batt_params.c(64) : CC78K0R warning W0401: Conversion may lose significant digits
-batt_params.c(82) : CC78K0R warning W0401: Conversion may lose significant digits
-batt_params.c(101) : CC78K0R warning W0401: Conversion may lose significant digits
-batt_params.c(101) : CC78K0R warning W0401: Conversion may lose significant digits
-batt_params.c(119) : CC78K0R warning W0401: Conversion may lose significant digits
-Compilation complete,    0 error(s) and    6 warning(s) found.
-"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\batt_params.asm
-Assembly complete,     0 error(s) and     0 warning(s) found.
-"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\lk78k0r.exe" -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -obsr.lmf "..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\s0rm.rel"  -gi1B339499E033F240BFAAh -pbsr_k0r.map -nkd -gb7EFBFFh -b"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib" -bcl0rdm.lib -bcl0rm.lib -bcl0rmf.lib -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r" -dbsr_mcu.dr -s -w2  loader.rel pm.rel i2c_ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel i2c_twl.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel renge.rel accero.rel self_flash.rel sw.rel task_debug.rel task_misc.rel task_sys.rel pedo_alg_thre_det2.rel ini_VECT.rel task_status.rel led_cam.rel led_pow.rel hal.rel batt_params.rel voltable.rel pedo_lpf_coeff.rel kanaria.rel kanaria_c.rel get_ei.rel util_funcs.rel i2c_mcu-sub.rel 
-RA78K0R warning W3420: File 'loader.rel' already has had error(s)/warning(s) by 'CC78K'
- Read Device File Directory : C:\PROGRAM FILES (X86)\NEC ELECTRONICS TOOLS\DEV\
-RA78K0R warning W3420: File 'pm.rel' already has had error(s)/warning(s) by 'CC78K'
-RA78K0R warning W3420: File 'i2c_ctr.rel' already has had error(s)/warning(s) by 'CC78K'
-RA78K0R warning W3420: File 'i2c_mcu.rel' already has had error(s)/warning(s) by 'CC78K'
-RA78K0R warning W3420: File 'led.rel' already has had error(s)/warning(s) by 'CC78K'
-RA78K0R warning W3420: File 'vreg_ctr.rel' already has had error(s)/warning(s) by 'CC78K'
-RA78K0R warning W3420: File 'vreg_twl.rel' already has had error(s)/warning(s) by 'CC78K'
-RA78K0R warning W3420: File 'adc.rel' already has had error(s)/warning(s) by 'CC78K'
-RA78K0R warning W3420: File 'accero.rel' already has had error(s)/warning(s) by 'CC78K'
-RA78K0R warning W3420: File 'self_flash.rel' already has had error(s)/warning(s) by 'CC78K'
-RA78K0R warning W3420: File 'task_misc.rel' already has had error(s)/warning(s) by 'CC78K'
-RA78K0R warning W3420: File 'task_sys.rel' already has had error(s)/warning(s) by 'CC78K'
-RA78K0R warning W3420: File 'pedo_alg_thre_det2.rel' already has had error(s)/warning(s) by 'CC78K'
-RA78K0R warning W3420: File 'led_pow.rel' already has had error(s)/warning(s) by 'CC78K'
-RA78K0R warning W3420: File 'batt_params.rel' already has had error(s)/warning(s) by 'CC78K'
-
-Link complete,     0 error(s) and    15 warning(s) found.
-"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\oc78k0r.exe" -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -o.\bsr.hex -nu -ki  bsr.lmf
-Object Conversion Complete,      0 error(s) and     0 warning(s) found.
-C:\Windows\system32\cmd.exe /c ruby nec_s_2_bsrbin2.rb bsr.hex
-4
-intel-HEX to bsr bin converter
- file converted!
-
-
-Build Total error(s) : 0  Total warning(s) : 21 
diff --git a/branches/2.2A_SDK5(4thNUP)/yav_mcu_bsr.pri b/branches/2.2A_SDK5(4thNUP)/yav_mcu_bsr.pri
deleted file mode 100644
index 1c108c1..0000000
--- a/branches/2.2A_SDK5(4thNUP)/yav_mcu_bsr.pri
+++ /dev/null
@@ -1,1021 +0,0 @@
-[Project.ID]
-Ver=200
-Target=IDK0R32G
-[Configuration]
-Chip=uPD79F0104
-Internal Rom=32KB
-Internal Ram=1536B
-Clock=Target
-Sub Clock=Target
-Peripheral Break=0x3
-Firm Clock=System
-Flash Programming=Permit
-Low-voltage Flash Rewriting=On
-Fail Safe Break=0x2000
-Port=0
-NMI=OFF
-TRESET=OFF
-IRESET=OFF
-WAIT=OFF
-SysClock=None
-SubClock=None
-[Mapping]
-Count=0
-[Main]
-Geometry=157, 45, 1007, 931
-Window=Normal
-MDI_MAX=OFF
-Button=ON
-Mode=Auto
-Trace=Uncond ON
-Trace2=Non Stop
-Coverage=OFF
-Timer=OFF
-Tracer=OFF
-[Load File]
-Dir=\\tsclient\C\78k_data\tahara_analogKey\
-SaveFilter=0
-Start=0
-End=0
-LoadFilter=5
-Offset=0
-Object=ON
-Symbol=ON
-Erase=ON
-HighSpeed=OFF
-Symbol Reset=ON
-CPU Reset=ON
-File1=\\tsclient\C\78k_data\tahara_analogKey\bsr.lmf
-LoadFilter1=5
-Offset1=0
-Object1=ON
-Symbol1=ON
-Erase1=ON
-HighSpeed1=OFF
-CPU Reset1=ON
-Symbol Reset1=ON
-[View File]
-Dir=\\tsclient\C\78k_data\yav-mcu-basara\trunk\
-Filter=Source
-[Debugger Option]
-Source Path=""
-Symbol Size=Byte
-Symbol Format=Hex
-Register Name=Func
-Offset Label=OFF
-Offset Mnemonic=ON
-Tab Count=4
-Tab Size1=*.*, 8
-Tab Size2=*.c, 8
-Tab Size3=*.s, 8
-Tab Size4=*.asm, 8
-Default Source=*.c;*.s;*.asm
-Default Module=*.lnk;*.lmf
-Startup Start=_@cstart
-Startup End=_@cend
-Main Symbol=_main
-Symbol Type=OFF
-Language=C
-Kanji=SJIS
-[Source]
-Geometry=474, 10, 769, 857
-Window=Hide
-DispStart=1
-CaretPos=0,0
-Mode=Normal
-DispFile=
-Address1=
-Address2=
-Address3=
-Address4=
-Address5=
-Address6=
-Address7=
-Address8=
-Address9=
-Address10=
-Address11=
-Address12=
-Address13=
-Address14=
-Address15=
-Address16=
-Data1=
-Data2=
-Data3=
-Data4=
-Data5=
-Data6=
-Data7=
-Data8=
-Data9=
-Data10=
-Data11=
-Data12=
-Data13=
-Data14=
-Data15=
-Data16=
-Option=0
-Case=ON
-Direction=Down
-File1=
-File2=
-File3=
-File4=
-File5=
-File6=
-File7=
-File8=
-File9=
-File10=
-File11=
-File12=
-File13=
-File14=
-File15=
-File16=
-SaveRange=Screen
-SaveStart=
-SaveEnd=
-Accumulative=ON
-[Assemble]
-Geometry=50, 50, 600, 400
-Window=Normal
-DispStart=3110
-CaretPos=3110,27
-Address1=
-Address2=
-Address3=
-Address4=
-Address5=
-Address6=
-Address7=
-Address8=
-Address9=
-Address10=
-Address11=
-Address12=
-Address13=
-Address14=
-Address15=
-Address16=
-Data1=
-Data2=
-Data3=
-Data4=
-Data5=
-Data6=
-Data7=
-Data8=
-Data9=
-Data10=
-Data11=
-Data12=
-Data13=
-Data14=
-Data15=
-Data16=
-Case=ON
-Scan=OFF
-Direction=Down
-FindStart=0
-FindEnd=0
-SaveRange=Screen
-SaveStart=
-SaveEnd=
-[Memory]
-Geometry=0, 0, 0, 0
-Window=Hide
-Boundary=0
-Format=Hex
-Mode=Byte
-Endian=
-Ascii=OFF
-Idtag=OFF
-Address=
-DispStart=FFFFFFFF
-CaretPosData=0, 0
-CaretPosAscii=0, 0
-Address1=
-Address2=
-Address3=
-Address4=
-Address5=
-Address6=
-Address7=
-Address8=
-Address9=
-Address10=
-Address11=
-Address12=
-Address13=
-Address14=
-Address15=
-Address16=
-Data1=
-Data2=
-Data3=
-Data4=
-Data5=
-Data6=
-Data7=
-Data8=
-Data9=
-Data10=
-Data11=
-Data12=
-Data13=
-Data14=
-Data15=
-Data16=
-Binary=ON
-Scan=OFF
-Direction=DOWN
-FindStart=
-FindEnd=
-Unit=Byte
-SaveRange=Screen
-SaveStart=
-SaveEnd=
-Accumulative=ON
-[Memory fill]
-Scope=0, 0
-Code=0
-[Memory copy]
-Scope=0, 0
-To=0
-[Memory compare]
-Source=0, 0
-Destination=0
-[I/O Port]
-Line=0
-[Stack]
-Geometry=0, 0, 0, 0
-Window=Hide
-Boundary=0
-Mode=Proper
-[Sfr]
-Geometry=0, 0, 0, 0
-Window=Hide
-Address1=
-Address2=
-Address3=
-Address4=
-Address5=
-Address6=
-Address7=
-Address8=
-Address9=
-Address10=
-Address11=
-Address12=
-Address13=
-Address14=
-Address15=
-Address16=
-Boundary=0, 0
-Mode=Hex
-Attribute=Show
-Sort=Unsort
-Pickup=OFF
-SelectSort=Address
-Last Name=
-Line=531
-L1=P0
-L2=P1
-L3=P2
-L4=P3
-L5=P4
-L6=P5
-L7=P6
-L8=P7
-L9=P12
-L10=P14
-L11=P15
-L12=SDR00
-L13=SIO00
-L14=TXD0
-L15=SDR01
-L16=RXD0
-L17=SIO01
-L18=TDR00
-L19=TDR01
-L20=ADCRH
-L21=PM0
-L22=PM1
-L23=PM2
-L24=PM3
-L25=PM4
-L26=PM5
-L27=PM6
-L28=PM7
-L29=PM12
-L30=PM14
-L31=PM15
-L32=ADM
-L33=ADCE
-L34=ADCS
-L35=ADS
-L36=KRM
-L37=EGP0
-L38=EGN0
-L39=ISC
-L40=TIS0
-L41=SDR02
-L42=SIO10
-L43=TXD1
-L44=SDR03
-L45=RXD1
-L46=IICA0
-L47=IICS0
-L48=SPD0
-L49=STD0
-L50=ACKD0
-L51=TRC0
-L52=COI0
-L53=EXC0
-L54=ALD0
-L55=MSTS0
-L56=IICF0
-L57=IICRSV0
-L58=STCEN0
-L59=IICBSY0
-L60=STCF0
-L61=TDR02
-L62=TDR03
-L63=TDR04
-L64=TDR05
-L65=TDR06
-L66=TDR07
-L67=RSUBC
-L68=SEC
-L69=MIN
-L70=HOUR
-L71=WEEK
-L72=DAY
-L73=MONTH
-L74=YEAR
-L75=SUBCUD
-L76=ALARMWM
-L77=ALARMWH
-L78=ALARMWW
-L79=RTCC0
-L80=RCLOE0
-L81=RCLOE1
-L82=RTCE
-L83=RTCC1
-L84=RWAIT
-L85=RWST
-L86=RIFG
-L87=WAFG
-L88=WALIE
-L89=WALE
-L90=RTCC2
-L91=RCKDIV
-L92=RCLOE2
-L93=RINTE
-L94=CMC
-L95=CSC
-L96=HIOSTOP
-L97=XTSTOP
-L98=MSTOP
-L99=OSTC
-L100=OSTS
-L101=CKC
-L102=MCM0
-L103=MCS
-L104=CSS
-L105=CLS
-L106=CKS0
-L107=PCLOE0
-L108=CKS1
-L109=PCLOE1
-L110=RESF
-L111=LVIM
-L112=LVIF
-L113=LVIMD
-L114=LVISEL
-L115=LVION
-L116=LVIS
-L117=WDTE
-L118=DSA0
-L119=DSA1
-L120=DRA0
-L121=DRA0L
-L122=DRA0H
-L123=DRA1
-L124=DRA1L
-L125=DRA1H
-L126=DBC0
-L127=DBC0L
-L128=DBC0H
-L129=DBC1
-L130=DBC1L
-L131=DBC1H
-L132=DMC0
-L133=DWAIT0
-L134=DS0
-L135=DRS0
-L136=STG0
-L137=DMC1
-L138=DWAIT1
-L139=DS1
-L140=DRS1
-L141=STG1
-L142=DRC0
-L143=DST0
-L144=DEN0
-L145=DRC1
-L146=DST1
-L147=DEN1
-L148=BECTL
-L149=FLMDPUP
-L150=PFCMD
-L151=PFS
-L152=FPRERR
-L153=FLPMC
-L154=BFAEN
-L155=FWEPR
-L156=BRAMEN
-L157=IF2
-L158=IF2L
-L159=TMIF05
-L160=TMIF06
-L161=TMIF07
-L162=PIF6
-L163=IF2H
-L164=IICAIF1
-L165=PIF20
-L166=PIF21
-L167=PIF22
-L168=PIF23
-L169=MK2
-L170=MK2L
-L171=TMMK05
-L172=TMMK06
-L173=TMMK07
-L174=PMK6
-L175=MK2H
-L176=IICAMK1
-L177=PMK20
-L178=PMK21
-L179=PMK22
-L180=PMK23
-L181=PR02
-L182=PR02L
-L183=TMPR005
-L184=TMPR006
-L185=TMPR007
-L186=PPR06
-L187=PR02H
-L188=IICAPR01
-L189=PPR020
-L190=PPR021
-L191=PPR022
-L192=PPR023
-L193=PR12
-L194=PR12L
-L195=TMPR105
-L196=TMPR106
-L197=TMPR107
-L198=PPR16
-L199=PR12H
-L200=IICAPR11
-L201=PPR120
-L202=PPR121
-L203=PPR122
-L204=PPR123
-L205=IF0
-L206=IF0L
-L207=WDTIIF
-L208=LVIIF
-L209=PIF0
-L210=PIF1
-L211=PIF2
-L212=PIF4
-L213=PIF5
-L214=IF0H
-L215=DMAIF0
-L216=DMAIF1
-L217=CSIIF00
-L218=STIF0
-L219=CSIIF01
-L220=SRIF0
-L221=SREIF0
-L222=IF1
-L223=IF1L
-L224=CSIIF10
-L225=IICIF10
-L226=STIF1
-L227=SRIF1
-L228=SREIF1
-L229=IICAIF0
-L230=TMIF00
-L231=TMIF01
-L232=TMIF02
-L233=TMIF03
-L234=IF1H
-L235=ADIF
-L236=RTCIF
-L237=RTCIIF
-L238=KRIF
-L239=MDIF
-L240=TMIF04
-L241=MK0
-L242=MK0L
-L243=WDTIMK
-L244=LVIMK
-L245=PMK0
-L246=PMK1
-L247=PMK2
-L248=PMK4
-L249=PMK5
-L250=MK0H
-L251=DMAMK0
-L252=DMAMK1
-L253=CSIMK00
-L254=STMK0
-L255=CSIMK01
-L256=SRMK0
-L257=SREMK0
-L258=MK1
-L259=MK1L
-L260=CSIMK10
-L261=IICMK10
-L262=STMK1
-L263=SRMK1
-L264=SREMK1
-L265=IICAMK0
-L266=TMMK00
-L267=TMMK01
-L268=TMMK02
-L269=TMMK03
-L270=MK1H
-L271=ADMK
-L272=RTCMK
-L273=RTCIMK
-L274=KRMK
-L275=MDMK
-L276=TMMK04
-L277=PR00
-L278=PR00L
-L279=WDTIPR0
-L280=LVIPR0
-L281=PPR00
-L282=PPR01
-L283=PPR02
-L284=PPR04
-L285=PPR05
-L286=PR00H
-L287=DMAPR00
-L288=DMAPR01
-L289=CSIPR000
-L290=STPR00
-L291=CSIPR001
-L292=SRPR00
-L293=SREPR00
-L294=PR01
-L295=PR01L
-L296=CSIPR010
-L297=IICPR010
-L298=STPR01
-L299=SRPR01
-L300=SREPR01
-L301=IICAPR00
-L302=TMPR000
-L303=TMPR001
-L304=TMPR002
-L305=TMPR003
-L306=PR01H
-L307=ADPR0
-L308=RTCPR0
-L309=RTCIPR0
-L310=KRPR0
-L311=MDPR0
-L312=TMPR004
-L313=PR10
-L314=PR10L
-L315=WDTIPR1
-L316=LVIPR1
-L317=PPR10
-L318=PPR11
-L319=PPR12
-L320=PPR14
-L321=PPR15
-L322=PR10H
-L323=DMAPR10
-L324=DMAPR11
-L325=CSIPR100
-L326=STPR10
-L327=CSIPR101
-L328=SRPR10
-L329=SREPR10
-L330=PR11
-L331=PR11L
-L332=CSIPR110
-L333=IICPR110
-L334=STPR11
-L335=SRPR11
-L336=SREPR11
-L337=IICAPR10
-L338=TMPR100
-L339=TMPR101
-L340=TMPR102
-L341=TMPR103
-L342=PR11H
-L343=ADPR1
-L344=RTCPR1
-L345=RTCIPR1
-L346=KRPR1
-L347=MDPR1
-L348=TMPR104
-L349=MDAL
-L350=MULA
-L351=MDAH
-L352=MULB
-L353=MDBH
-L354=MULOH
-L355=MDBL
-L356=MULOL
-L357=PMC
-L358=MAA
-L359=ADPC
-L360=PU0
-L361=PU1
-L362=PU3
-L363=PU4
-L364=PU5
-L365=PU7
-L366=PU12
-L367=PU14
-L368=PIM3
-L369=PIM7
-L370=POM3
-L371=POM7
-L372=NFEN0
-L373=NFEN1
-L374=NFEN2
-L375=MDCL
-L376=MDCH
-L377=MDUC
-L378=DIVST
-L379=DIVMODE
-L380=PER0
-L381=SAU0EN
-L382=IICA0EN
-L383=ADCEN
-L384=RTCEN
-L385=PER2
-L386=TAU0EN
-L387=OSMC
-L388=BCDADJ
-L389=SSR00
-L390=SSR00L
-L391=SSR01
-L392=SSR01L
-L393=SSR02
-L394=SSR02L
-L395=SSR03
-L396=SSR03L
-L397=SIR00
-L398=SIR00L
-L399=SIR01
-L400=SIR01L
-L401=SIR02
-L402=SIR02L
-L403=SIR03
-L404=SIR03L
-L405=SMR00
-L406=SMR01
-L407=SMR02
-L408=SMR03
-L409=SCR00
-L410=SCR01
-L411=SCR02
-L412=SCR03
-L413=SE0
-L414=SE0L
-L415=SS0
-L416=SS0L
-L417=ST0
-L418=ST0L
-L419=SPS0
-L420=SPS0L
-L421=SO0
-L422=SOE0
-L423=SOE0L
-L424=SOL0
-L425=SOL0L
-L426=TCR00
-L427=TCR01
-L428=TCR02
-L429=TCR03
-L430=TCR04
-L431=TCR05
-L432=TCR06
-L433=TCR07
-L434=TMR00
-L435=TMR01
-L436=TMR02
-L437=TMR03
-L438=TMR04
-L439=TMR05
-L440=TMR06
-L441=TMR07
-L442=TSR00
-L443=TSR00L
-L444=TSR01
-L445=TSR01L
-L446=TSR02
-L447=TSR02L
-L448=TSR03
-L449=TSR03L
-L450=TSR04
-L451=TSR04L
-L452=TSR05
-L453=TSR05L
-L454=TSR06
-L455=TSR06L
-L456=TSR07
-L457=TSR07L
-L458=TE0
-L459=TE0L
-L460=TS0
-L461=TS0L
-L462=TT0
-L463=TT0L
-L464=TPS0
-L465=TPS0L
-L466=TO0
-L467=TO0L
-L468=TOE0
-L469=TOE0L
-L470=TOL0
-L471=TOL0L
-L472=TOM0
-L473=TOM0L
-L474=IICCTL00
-L475=SPT0
-L476=STT0
-L477=ACKE0
-L478=WTIM0
-L479=SPIE0
-L480=WREL0
-L481=LREL0
-L482=IICE0
-L483=IICCTL10
-L484=DFC0
-L485=SMC0
-L486=DAD0
-L487=CLD0
-L488=WUP0
-L489=IICWL0
-L490=IICWH0
-L491=SVA0
-L492=PER3
-L493=IICA1EN
-L494=P20
-L495=PM20
-L496=PU20
-L497=EGP2
-L498=EGN2
-L499=IICA1
-L500=IICS1
-L501=SPD1
-L502=STD1
-L503=ACKD1
-L504=TRC1
-L505=COI1
-L506=EXC1
-L507=ALD1
-L508=MSTS1
-L509=IICF1
-L510=IICRSV1
-L511=STCEN1
-L512=IICBSY1
-L513=STCF1
-L514=IICCTL01
-L515=SPT1
-L516=STT1
-L517=ACKE1
-L518=WTIM1
-L519=SPIE1
-L520=WREL1
-L521=LREL1
-L522=IICE1
-L523=IICCTL11
-L524=DFC1
-L525=SMC1
-L526=DAD1
-L527=CLD1
-L528=WUP1
-L529=IICWL1
-L530=IICWH1
-L531=SVA1
-[Local Variable]
-Geometry=0, 0, 0, 0
-Window=Hide
-Boundary=0
-Mode=Proper
-[Trace View]
-Geometry=0, 0, 0, 0
-Window=Hide
-Mode=Normal
-Frame=Show
-Timetag=Clock
-Address=Show
-Data=Hex
-Status=Show
-Address2=Show
-Data2=Hex
-Status2=Show
-Disasm=Show
-Pick Up=Off
-Synchronize=0 0 0 0
-Frameno=
-Frameno1=
-Frameno2=
-Frameno3=
-Frameno4=
-Frameno5=
-Frameno6=
-Frameno7=
-Frameno8=
-Frameno9=
-Frameno10=
-Frameno11=
-Frameno12=
-Frameno13=
-Frameno14=
-Frameno15=
-Frameno16=
-ScanStatus=ALL
-Access Size=B
-ScanAddress=<>-<>
-Mask Address=
-ScanData=
-Mask Data=
-ScanExternal=
-Mask External=
-Scan=OFF
-Direction=Down
-FindStart=
-FindEnd=
-SaveRange=Screen
-SaveStart=
-SaveEnd=
-[Register]
-Geometry=0, 0, 0, 0
-Window=Hide
-Mode=Hex
-Boundary=62
-Pickup=OFF
-Name=Functional
-Register Bank=0
-RP0=1
-RP1=1
-RP2=1
-RP3=1
-PC=1
-SP=1
-PSW=1
-ES=1
-CS=1
-[Event Manager]
-Geometry=0, 0, 0, 0
-Window=Hide
-Sort by=Unsort
-Detail=OFF
-[Event Set]
-Geometry=0, 0, 0, 0
-Window=Hide
-Manager=ON
-Sort by=Unsort
-Detail=OFF
-Last Name=
-Count=0
-[Event Link]
-Geometry=0, 0, 0, 0
-Window=Hide
-Manager=ON
-Sort by=Unsort
-Detail=OFF
-Last Name=
-Count=0
-[Break]
-Geometry=0, 0, 0, 0
-Window=Hide
-Manager=ON
-Sort by=Unsort
-Detail=OFF
-Last Name=
-Count=0
-[Trace]
-Geometry=0, 0, 0, 0
-Window=Hide
-Manager=ON
-Sort by=Unsort
-Detail=OFF
-Last Name=
-Delay Count0=2
-Count=0
-[Snap]
-Geometry=0, 0, 0, 0
-Window=Hide
-Manager=ON
-Sort by=Unsort
-Detail=OFF
-Last Name=
-Count=0
-[Stub]
-Geometry=0, 0, 0, 0
-Window=Hide
-Manager=ON
-Sort by=Unsort
-Detail=OFF
-Last Name=
-Count=0
-[Timer]
-Geometry=0, 0, 0, 0
-Window=Hide
-Manager=ON
-Sort by=Unsort
-Detail=OFF
-Last Name=
-TimerRateRunBreak=0011
-TimerBreakOutRunBreak=OFF
-Count=0
-[Timer Monitor]
-Count=0
-[Dmm]
-Geometry=0, 0, 0, 0
-Window=Hide
-Manager=ON
-Sort by=Unsort
-Detail=OFF
-Last Name=
-Count=0
-[Variable]
-Geometry=35, 451, 309, 300
-Window=Normal
-Boundary=13762700
-0=.P0.1,P,S,A,+,1
-1=.P0.0,P,S,A,+,1
-2=.PU0,P,S,A,+,1
-3=.temp_command,P,N,A,+,1
-4=.shirobako_power_control_count,P,N,A,+,1
-5=.P2.3,P,S,A,+,1
-6=.PM0,B,S,A,+,1
-Line=7
-[Quick Watch]
-0=p00,P,A,1
-1=P0.0,P,A,1
-2=P0.1,P,A,1
-3=PM0,B,A,1
-4=P20.4,P,A,1
-5=PU0,P,A,1
-6=P2.3,P,A,1
-7=shirobako_power_control_count,P,A,1
-8=temp_command,P,A,1
-9=
-10=
-11=
-12=
-13=
-14=
-15=
-[Software Break]
-Geometry=19, 162, 500, 200
-Window=Normal
-Width=150 30 200 100
-Count=0
-[Reset]
-Debugger=ON
-Symbol=OFF
-Target CPU=OFF
-[Extended Option]
-OnClick Software Break=ON
-TraceTimetag=x1
-Redraw=500
-Break When Access Function=OFF
-Break When Access Whole=Select
-Verify=ON
-Break Sound=ON
-TraceAutoClear=OFF
-RRM Clock=Internal
-CKC Register Value=0x09
-RRM Internal Clock Frequency=8.000
-[About]
-Version=Program
-[Pseudo Emulation]
-Geometry=0, 0, 0, 0
-Window=Hide
-[Data Flash Option]
-Data Flash Emulation=OFF
-[List]
-Geometry=0, 0, 0, 0
-Window=Hide
-[Console]
-Geometry=0, 0, 0, 0
-Window=Hide
diff --git a/branches/2.2A_SDK5(4thNUP)/yav_mcu_bsr.prj b/branches/2.2A_SDK5(4thNUP)/yav_mcu_bsr.prj
deleted file mode 100644
index b00ea84..0000000
--- a/branches/2.2A_SDK5(4thNUP)/yav_mcu_bsr.prj
+++ /dev/null
@@ -1,1411 +0,0 @@
-[ProjectManager]
-Version=6.00
-Path=C:\78k_data\yav-mcu-basara\trunk\
-Title=yav-mcu
-Series=78K0R.PM
-Device=uPD79F0104
-DeviceVer=E1.00b
-DebugMode=1
-Target=bsr.lmf
-[BuildMode0]
-BuildModeName=Debug Build
-TargetFile=0
-[BuildMode1]
-BuildModeName=Release Build
-TargetFile=0
-[Tools]
-MakeFile=yav_mcu_bsr.mak
-Debugger=C:\Program Files (x86)\NEC Electronics Tools\ID78K0R-QB\V3.61\BIN\IDK0R32G.EXE
-DebOption=
-DebCpuReset=1
-DebSymReset=1
-MuitiLoad=0
-LoadPrjNum=0
-CheckVersion=CC78K0R|W2.13;RA78K0R|W1.33
-[Option.IDK0R32G]
-File=\\tsclient\C\78k_data\yav-mcu-basara\trunk\yav_mcu_bsr.pri
-[BuildMode2]
-BuildModeName=K0R_dbg
-TargetFile=0
-[BuildMode3]
-BuildModeName=BSR_dbg
-TargetFile=0
-[BuildMode4]
-BuildModeName=BSR_rel
-TargetFile=0
-[BuildMode5]
-BuildModeName=BSR_WM0
-TargetFile=0
-[Options.OC78K0R 0]
-Version=100
-O0=.\bsr.hex
-O1=bsr.hex
-UC=1
-UN=FF
-UST=
-USZ=
-K=1
-ZF=0
-S=1
-E=0
-CommandFile=0
-[Options.OC78K0R 1]
-Version=100
-UC=1
-UN=FF
-UST=
-USZ=
-K=1
-ZF=0
-S=1
-E=0
-CommandFile=0
-[Options.OC78K0R 2]
-Version=100
-O0=.\bsr.hex
-O1=bsr.hex
-UC=0
-UN=FF
-UST=
-USZ=
-K=0
-ZF=0
-S=1
-E=0
-CommandFile=0
-[Options.OC78K0R 3]
-Version=100
-O0=.\bsr.hex
-O1=bsr.hex
-UC=1
-UN=FF
-UST=
-USZ=
-K=1
-ZF=0
-S=1
-E=0
-CommandFile=0
-[Options.OC78K0R 4]
-Version=100
-O0=.\bsr.hex
-O1=bsr.hex
-UC=1
-UN=FF
-UST=
-USZ=
-K=1
-ZF=0
-S=1
-E=0
-CommandFile=0
-[Options.OC78K0R 5]
-Version=100
-O0=.\bsr.hex
-O1=bsr.hex
-UC=1
-UN=FF
-UST=
-USZ=
-K=1
-ZF=0
-S=1
-E=0
-CommandFile=0
-[BuildBefore-AfterCmd]
-Before1=c:\cygwin\bin\touch magic.c
-After1=ruby nec_s_2_bsrbin2.rb bsr.hex
-[ToolSet]
-ToolSetName=(�ύX)78K0R Software Package V1.10
-Tool1=CC78K0R|W2.13
-Tool2=RA78K0R|W1.33
-Tool3=SK78K0R|V3.10
-Tool4=ID78K0R-QB|V3.61
-[Options.RA78K0R 0]
-Version=100
-G=1
-GA=1
-E=0
-COMMON=0
-COMPATI=0
-P=1
-KA=1
-KS=0
-KX=0
-LF=0
-LW=132
-LL=0
-LT=8
-Z=0
-CommandFile=0
-RA_OPT=
-[Options.RA78K0R 1]
-Version=100
-G=0
-GA=0
-E=0
-COMMON=0
-COMPATI=0
-P=1
-KA=1
-KS=0
-KX=0
-LF=0
-LW=132
-LL=0
-LT=8
-Z=0
-CommandFile=0
-RA_OPT=
-[Options.RA78K0R 2]
-Version=100
-O0=
-O1=obj
-G=1
-GA=1
-E=0
-COMMON=0
-COMPATI=0
-P=1
-P0=inter_asm
-KA=1
-KS=1
-KX=1
-LF=0
-LW=132
-LL=0
-LT=8
-Z=0
-CommandFile=0
-RA_OPT=-pinter_asm -ks -kx 
-[Options.RA78K0R 3]
-Version=100
-G=1
-GA=1
-E=0
-COMMON=0
-COMPATI=0
-P=1
-KA=1
-KS=0
-KX=0
-LF=0
-LW=132
-LL=0
-LT=8
-Z=0
-CommandFile=0
-RA_OPT=
-[Options.RA78K0R 4]
-Version=100
-G=1
-GA=1
-E=0
-COMMON=0
-COMPATI=0
-P=1
-KA=1
-KS=0
-KX=0
-LF=0
-LW=132
-LL=0
-LT=8
-Z=0
-CommandFile=0
-RA_OPT=
-[Options.RA78K0R 5]
-Version=100
-G=1
-GA=1
-E=0
-COMMON=0
-COMPATI=0
-P=1
-KA=1
-KS=0
-KX=0
-LF=0
-LW=132
-LL=0
-LT=8
-Z=0
-CommandFile=0
-RA_OPT=
-[Options.CC78K0R 0]
-Version=210
-Include0=renge,C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r
-Include1=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r
-Memorymodel=1
-Flashobj=0
-FlashStartadr=
-FlashBranchStartadr=
-Mirror=0
-Saddrglobalchk=0
-Saddrglobal=1066
-Saddrstaticchk=0
-Saddrstatic=1072
-Bitfieldmsb=0
-Onebytechk=0
-Pacstructchk=0
-AssignROMchk=0
-AssignROM=0
-Maxoptimizechk=0
-Maxoptimize=1104
-Charunexpandchk=1
-Unsignedchar=0
-Usesaddrchk=0
-Autoallocationchk=1
-Jumpoptimize=1
-Librarycallchk=0
-Librarycall=1129
-Aggressivechk=1
-Relativebranchchk=1
-Debugoptchk=0
-Outdebugchk=1
-Outdebug=1153
-Outasmsrccmb0=inter_asm
-Outasmsrccmb1=bsr.asm
-Outasmsrcchk=1
-Outasmsrc=1158
-Outasmoptall=1
-Common=0
-Outerrlistchk=0
-Outerrlist=1174
-Xreference=0
-Preprocess=0
-Prenocomment=0
-Predefine=0
-Preifdef=1
-Preinclude=0
-Preline=1
-Prenumber=1
-Formfeed=0
-Columns=132
-Lines=0
-Tablength=8
-Ansi=0
-Cpraspras=1
-Commentnest=0
-Intunexpand=0
-Kanjicode=1210
-Verbose=0
-CommandFile=0
-Warninglevel=0
-Startupchk=1
-Fixation=1
-FarROMization=0
-Objectsel=1305
-Librarychk=1
-Floatingpoint=0
-Muldivunit=1
-Mulunit=1
-Startup=s0rml.rel
-Library1=cl0rdm.lib
-Library2=cl0rm.lib
-Library3=cl0rmf.lib
-VfiFileBoot0=
-VfiFileBoot1=boot.vfi
-VF78K0Rchk=0
-VF78K0Rvs=
-[Options.CC78K0R 1]
-Version=210
-Memorymodel=2
-Flashobj=0
-FlashStartadr=
-FlashBranchStartadr=
-Mirror=0
-Saddrglobalchk=0
-Saddrglobal=1066
-Saddrstaticchk=0
-Saddrstatic=1072
-Bitfieldmsb=0
-Onebytechk=0
-Pacstructchk=0
-AssignROMchk=0
-AssignROM=0
-Maxoptimizechk=0
-Maxoptimize=1104
-Charunexpandchk=1
-Unsignedchar=0
-Usesaddrchk=0
-Autoallocationchk=1
-Jumpoptimize=1
-Librarycallchk=1
-Librarycall=1128
-Aggressivechk=1
-Relativebranchchk=0
-Debugoptchk=0
-Outdebugchk=0
-Outdebug=1153
-Outasmsrcchk=0
-Outasmsrc=1157
-Outasmoptall=1
-Common=0
-Outerrlistchk=0
-Outerrlist=1173
-Xreference=0
-Preprocess=0
-Prenocomment=0
-Predefine=0
-Preifdef=1
-Preinclude=0
-Preline=1
-Prenumber=1
-Formfeed=0
-Columns=132
-Lines=0
-Tablength=8
-Ansi=0
-Cpraspras=0
-Commentnest=0
-Intunexpand=0
-Kanjicode=1210
-Verbose=0
-CommandFile=0
-Warninglevel=1
-Startupchk=1
-Fixation=1
-FarROMization=1
-Objectsel=1305
-Librarychk=1
-Floatingpoint=0
-Muldivunit=1
-Mulunit=1
-Startup=s0rll.rel
-Library1=cl0rdm.lib
-Library2=cl0rm.lib
-Library3=cl0rmf.lib
-VF78K0Rchk=0
-VF78K0Rvs=
-[Options.CC78K0R 2]
-Version=210
-Define0=
-Define1=_debug_,_TEG_,proc_is_ke3
-Define2=_debug_,_TEG_,proc_is_ke3,%time%
-Define3=_TEG_,proc_is_ke3
-Define4=proc_is_ke3
-Include0=renge,C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r
-Include1=renge,C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r
-Include2=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r
-Memorymodel=1
-Flashobj=0
-FlashStartadr=
-FlashBranchStartadr=
-Mirror=0
-Saddrglobalchk=1
-Saddrglobal=1063
-Saddrstaticchk=1
-Saddrstatic=1069
-Bitfieldmsb=0
-Onebytechk=0
-Pacstructchk=0
-AssignROMchk=0
-AssignROM=0
-Maxoptimizechk=0
-Maxoptimize=1104
-Charunexpandchk=0
-Unsignedchar=0
-Usesaddrchk=0
-Autoallocationchk=1
-Jumpoptimize=1
-Librarycallchk=1
-Librarycall=1129
-Aggressivechk=1
-Relativebranchchk=0
-Debugoptchk=0
-Outdebugchk=1
-Outdebug=1153
-Outobjectcmb0=
-Outobjectcmb1=obj
-Outasmsrccmb0=inter_asm
-Outasmsrccmb1=bsr.asm
-Outasmsrcchk=1
-Outasmsrc=1158
-Outasmoptall=1
-Common=0
-Outerrlistchk=0
-Outerrlist=1174
-Xreference=0
-Preprocess=0
-Prenocomment=0
-Predefine=0
-Preifdef=1
-Preinclude=1
-Preline=1
-Prenumber=1
-Formfeed=0
-Columns=132
-Lines=0
-Tablength=8
-Ansi=0
-Cpraspras=1
-Commentnest=0
-Intunexpand=1
-Kanjicode=1210
-Verbose=0
-CommandFile=0
-Warninglevel=1
-Startupchk=1
-Fixation=0
-FarROMization=0
-Objectsel=1305
-Librarychk=1
-Floatingpoint=0
-Muldivunit=1
-Mulunit=1
-Startup=s0rm.rel
-Library1=cl0rdm.lib
-Library2=cl0rm.lib
-Library3=cl0rmf.lib
-VfiFileBoot0=
-VfiFileBoot1=boot.vfi
-VF78K0Rchk=0
-VF78K0Rvs=
-[Options.CC78K0R 3]
-Version=210
-Define0=_debug_,proc_is_bsr,_TEG_
-Define1=_debug_,proc_is_bsr
-Define2=proc_is_bsr
-Define3=_TEG_,proc_is_ke3
-Define4=proc_is_ke3
-Include0=renge,C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r
-Include1=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r
-Memorymodel=1
-Flashobj=0
-FlashStartadr=
-FlashBranchStartadr=
-Mirror=0
-Saddrglobalchk=0
-Saddrglobal=1066
-Saddrstaticchk=0
-Saddrstatic=1072
-Bitfieldmsb=0
-Onebytechk=0
-Pacstructchk=0
-AssignROMchk=0
-AssignROM=0
-Maxoptimizechk=0
-Maxoptimize=1104
-Charunexpandchk=1
-Unsignedchar=0
-Usesaddrchk=0
-Autoallocationchk=1
-Jumpoptimize=1
-Librarycallchk=0
-Librarycall=1129
-Aggressivechk=1
-Relativebranchchk=1
-Debugoptchk=0
-Outdebugchk=1
-Outdebug=1153
-Outasmsrccmb0=inter_asm
-Outasmsrccmb1=bsr.asm
-Outasmsrcchk=1
-Outasmsrc=1158
-Outasmoptall=1
-Common=0
-Outerrlistchk=0
-Outerrlist=1174
-Xreference=0
-Preprocess=0
-Prenocomment=0
-Predefine=0
-Preifdef=1
-Preinclude=0
-Preline=1
-Prenumber=1
-Formfeed=0
-Columns=132
-Lines=0
-Tablength=8
-Ansi=0
-Cpraspras=1
-Commentnest=0
-Intunexpand=0
-Kanjicode=1210
-Verbose=0
-CommandFile=0
-Warninglevel=0
-Startupchk=1
-Fixation=1
-FarROMization=0
-Objectsel=1305
-Librarychk=1
-Floatingpoint=0
-Muldivunit=1
-Mulunit=1
-Startup=s0rml.rel
-Library1=cl0rdm.lib
-Library2=cl0rm.lib
-Library3=cl0rmf.lib
-VfiFileBoot0=
-VfiFileBoot1=boot.vfi
-VF78K0Rchk=0
-VF78K0Rvs=
-[Options.CC78K0R 4]
-Version=210
-Define0=proc_is_bsr
-Include0=renge,C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r
-Include1=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r
-Memorymodel=1
-Flashobj=0
-FlashStartadr=
-FlashBranchStartadr=
-Mirror=0
-Saddrglobalchk=0
-Saddrglobal=1066
-Saddrstaticchk=0
-Saddrstatic=1072
-Bitfieldmsb=0
-Onebytechk=0
-Pacstructchk=0
-AssignROMchk=0
-AssignROM=0
-Maxoptimizechk=0
-Maxoptimize=1104
-Charunexpandchk=1
-Unsignedchar=0
-Usesaddrchk=0
-Autoallocationchk=1
-Jumpoptimize=1
-Librarycallchk=0
-Librarycall=1129
-Aggressivechk=1
-Relativebranchchk=1
-Debugoptchk=0
-Outdebugchk=1
-Outdebug=1153
-Outasmsrccmb0=inter_asm
-Outasmsrccmb1=bsr.asm
-Outasmsrcchk=1
-Outasmsrc=1158
-Outasmoptall=1
-Common=0
-Outerrlistchk=0
-Outerrlist=1174
-Xreference=0
-Preprocess=0
-Prenocomment=0
-Predefine=0
-Preifdef=1
-Preinclude=0
-Preline=1
-Prenumber=1
-Formfeed=0
-Columns=132
-Lines=0
-Tablength=8
-Ansi=0
-Cpraspras=1
-Commentnest=0
-Intunexpand=0
-Kanjicode=1210
-Verbose=0
-CommandFile=0
-Warninglevel=0
-Startupchk=1
-Fixation=1
-FarROMization=0
-Objectsel=1305
-Librarychk=1
-Floatingpoint=0
-Muldivunit=1
-Mulunit=1
-Startup=s0rml.rel
-Library1=cl0rdm.lib
-Library2=cl0rm.lib
-Library3=cl0rmf.lib
-VfiFileBoot0=
-VfiFileBoot1=boot.vfi
-VF78K0Rchk=0
-VF78K0Rvs=
-[Options.CC78K0R 5]
-Version=210
-Define0=
-Define1=_debug_,proc_is_bsr,_TEG_,_WM0_
-Define2=_debug_,proc_is_bsr,_TEG_,_WM0
-Define3=_debug_,proc_is_bsr,_TEG_
-Define4=_debug_,proc_is_bsr
-Include0=renge,C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r
-Include1=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r
-Memorymodel=1
-Flashobj=0
-FlashStartadr=
-FlashBranchStartadr=
-Mirror=0
-Saddrglobalchk=0
-Saddrglobal=1066
-Saddrstaticchk=0
-Saddrstatic=1072
-Bitfieldmsb=0
-Onebytechk=0
-Pacstructchk=0
-AssignROMchk=0
-AssignROM=0
-Maxoptimizechk=0
-Maxoptimize=1104
-Charunexpandchk=1
-Unsignedchar=0
-Usesaddrchk=0
-Autoallocationchk=1
-Jumpoptimize=1
-Librarycallchk=0
-Librarycall=1129
-Aggressivechk=1
-Relativebranchchk=1
-Debugoptchk=0
-Outdebugchk=1
-Outdebug=1153
-Outasmsrccmb0=inter_asm
-Outasmsrccmb1=bsr.asm
-Outasmsrcchk=1
-Outasmsrc=1158
-Outasmoptall=1
-Common=0
-Outerrlistchk=0
-Outerrlist=1174
-Xreference=0
-Preprocess=0
-Prenocomment=0
-Predefine=0
-Preifdef=1
-Preinclude=0
-Preline=1
-Prenumber=1
-Formfeed=0
-Columns=132
-Lines=0
-Tablength=8
-Ansi=0
-Cpraspras=1
-Commentnest=0
-Intunexpand=0
-Kanjicode=1210
-Verbose=0
-CommandFile=0
-Warninglevel=0
-Startupchk=1
-Fixation=1
-FarROMization=0
-Objectsel=1305
-Librarychk=1
-Floatingpoint=0
-Muldivunit=1
-Mulunit=1
-Startup=s0rml.rel
-Library1=cl0rdm.lib
-Library2=cl0rm.lib
-Library3=cl0rmf.lib
-VfiFileBoot0=
-VfiFileBoot1=boot.vfi
-VF78K0Rchk=0
-VF78K0Rvs=
-[Options.CC78K0R 2 self_flash.c]
-Version=210
-Define0=
-Define1=_debug_,_TEG_,proc_is_ke3
-Define2=_debug_,_TEG_,proc_is_ke3,%time%
-Undefine0=
-Include0=renge,C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r
-Include1=renge,C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r
-Include2=renge,C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r
-Include3=renge,C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r
-Include4=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r
-Memorymodel=1
-Flashobj=0
-FlashStartadr=
-FlashBranchStartadr=
-Mirror=0
-Saddrglobalchk=1
-Saddrglobal=1063
-Saddrstaticchk=0
-Saddrstatic=1072
-Bitfieldmsb=0
-Onebytechk=0
-Pacstructchk=0
-AssignROMchk=0
-AssignROM=0
-Maxoptimizechk=0
-Maxoptimize=1104
-Charunexpandchk=0
-Unsignedchar=0
-Usesaddrchk=0
-Autoallocationchk=1
-Jumpoptimize=1
-Librarycallchk=1
-Librarycall=1129
-Aggressivechk=1
-Relativebranchchk=0
-Debugoptchk=0
-Outdebugchk=1
-Outdebug=1153
-Outobjectcmb0=
-Outobjectcmb1=obj
-Outasmsrccmb0=inter_asm
-Outasmsrccmb1=bsr.asm
-Outasmsrcchk=1
-Outasmsrc=1158
-Outasmoptall=1
-Common=0
-Outerrlistchk=0
-Outerrlist=1174
-Xreference=0
-Preprocess=0
-Prenocomment=0
-Predefine=0
-Preifdef=1
-Preinclude=1
-Preline=1
-Prenumber=1
-Formfeed=0
-Columns=132
-Lines=0
-Tablength=8
-Ansi=0
-Cpraspras=1
-Commentnest=0
-Intunexpand=1
-Kanjicode=1210
-Verbose=0
-CommandFile=0
-Warninglevel=1
-Startupchk=1
-Fixation=0
-FarROMization=0
-Objectsel=1305
-Librarychk=1
-Floatingpoint=0
-Muldivunit=1
-Mulunit=1
-Startup=s0rm.rel
-Library1=cl0rdm.lib
-Library2=cl0rm.lib
-Library3=cl0rmf.lib
-VfiFileBoot0=
-VfiFileBoot1=boot.vfi
-VF78K0Rchk=0
-VF78K0Rvs=
-[Options.CC78K0R 2 vreg_twl.c]
-Version=210
-Define0=
-Define1=_debug_,_TEG_,proc_is_ke3
-Define2=_debug_,_TEG_,proc_is_ke3,%time%
-Undefine0=
-Include0=renge,C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r
-Include1=renge,C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r
-Include2=renge,C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r
-Include3=renge,C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r
-Include4=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r
-Memorymodel=1
-Flashobj=0
-FlashStartadr=
-FlashBranchStartadr=
-Mirror=0
-Saddrglobalchk=1
-Saddrglobal=1063
-Saddrstaticchk=1
-Saddrstatic=1075
-Bitfieldmsb=0
-Onebytechk=0
-Pacstructchk=0
-AssignROMchk=0
-AssignROM=0
-Maxoptimizechk=0
-Maxoptimize=1104
-Charunexpandchk=0
-Unsignedchar=0
-Usesaddrchk=0
-Autoallocationchk=1
-Jumpoptimize=1
-Librarycallchk=1
-Librarycall=1129
-Aggressivechk=1
-Relativebranchchk=0
-Debugoptchk=0
-Outdebugchk=1
-Outdebug=1153
-Outobjectcmb0=
-Outobjectcmb1=obj
-Outasmsrccmb0=inter_asm
-Outasmsrccmb1=bsr.asm
-Outasmsrcchk=1
-Outasmsrc=1158
-Outasmoptall=1
-Common=0
-Outerrlistchk=0
-Outerrlist=1174
-Xreference=0
-Preprocess=0
-Prenocomment=0
-Predefine=0
-Preifdef=1
-Preinclude=1
-Preline=1
-Prenumber=1
-Formfeed=0
-Columns=132
-Lines=0
-Tablength=8
-Ansi=0
-Cpraspras=1
-Commentnest=0
-Intunexpand=1
-Kanjicode=1210
-Verbose=0
-CommandFile=0
-Warninglevel=1
-Startupchk=1
-Fixation=0
-FarROMization=0
-Objectsel=1305
-Librarychk=1
-Floatingpoint=0
-Muldivunit=1
-Mulunit=1
-Startup=s0rm.rel
-Library1=cl0rdm.lib
-Library2=cl0rm.lib
-Library3=cl0rmf.lib
-VfiFileBoot0=
-VfiFileBoot1=boot.vfi
-VF78K0Rchk=0
-VF78K0Rvs=
-[Options.CC78K0R 2 renge.c]
-Version=210
-Define0=
-Define1=_debug_,_TEG_,proc_is_ke3
-Define2=_debug_,_TEG_,proc_is_ke3,%time%
-Undefine0=
-Include0=renge,C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r
-Include1=renge,C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r
-Include2=renge,C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r
-Include3=renge,C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r
-Include4=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r
-Memorymodel=1
-Flashobj=0
-FlashStartadr=
-FlashBranchStartadr=
-Mirror=0
-Saddrglobalchk=1
-Saddrglobal=1063
-Saddrstaticchk=1
-Saddrstatic=1075
-Bitfieldmsb=0
-Onebytechk=0
-Pacstructchk=0
-AssignROMchk=0
-AssignROM=0
-Maxoptimizechk=0
-Maxoptimize=1104
-Charunexpandchk=0
-Unsignedchar=0
-Usesaddrchk=0
-Autoallocationchk=1
-Jumpoptimize=1
-Librarycallchk=1
-Librarycall=1129
-Aggressivechk=1
-Relativebranchchk=0
-Debugoptchk=0
-Outdebugchk=1
-Outdebug=1153
-Outobjectcmb0=
-Outobjectcmb1=obj
-Outasmsrccmb0=inter_asm
-Outasmsrccmb1=bsr.asm
-Outasmsrcchk=1
-Outasmsrc=1158
-Outasmoptall=1
-Common=0
-Outerrlistchk=0
-Outerrlist=1174
-Xreference=0
-Preprocess=0
-Prenocomment=0
-Predefine=0
-Preifdef=1
-Preinclude=1
-Preline=1
-Prenumber=1
-Formfeed=0
-Columns=132
-Lines=0
-Tablength=8
-Ansi=0
-Cpraspras=1
-Commentnest=0
-Intunexpand=1
-Kanjicode=1210
-Verbose=0
-CommandFile=0
-Warninglevel=1
-Startupchk=1
-Fixation=0
-FarROMization=0
-Objectsel=1305
-Librarychk=1
-Floatingpoint=0
-Muldivunit=1
-Mulunit=1
-Startup=s0rm.rel
-Library1=cl0rdm.lib
-Library2=cl0rm.lib
-Library3=cl0rmf.lib
-VfiFileBoot0=
-VfiFileBoot1=boot.vfi
-VF78K0Rchk=0
-VF78K0Rvs=
-[Options.CC78K0R 2 vreg_ctr.c]
-Version=210
-Define0=
-Define1=_debug_,_TEG_,proc_is_ke3
-Define2=_debug_,_TEG_,proc_is_ke3,%time%
-Undefine0=
-Include0=renge,C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r
-Include1=renge,C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r
-Include2=renge,C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r
-Include3=renge,C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r
-Include4=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r
-Memorymodel=1
-Flashobj=0
-FlashStartadr=
-FlashBranchStartadr=
-Mirror=0
-Saddrglobalchk=1
-Saddrglobal=1063
-Saddrstaticchk=1
-Saddrstatic=1075
-Bitfieldmsb=0
-Onebytechk=0
-Pacstructchk=0
-AssignROMchk=0
-AssignROM=0
-Maxoptimizechk=0
-Maxoptimize=1104
-Charunexpandchk=0
-Unsignedchar=0
-Usesaddrchk=0
-Autoallocationchk=1
-Jumpoptimize=1
-Librarycallchk=1
-Librarycall=1129
-Aggressivechk=1
-Relativebranchchk=0
-Debugoptchk=0
-Outdebugchk=1
-Outdebug=1153
-Outobjectcmb0=
-Outobjectcmb1=obj
-Outasmsrccmb0=inter_asm
-Outasmsrccmb1=bsr.asm
-Outasmsrcchk=1
-Outasmsrc=1158
-Outasmoptall=1
-Common=0
-Outerrlistchk=0
-Outerrlist=1174
-Xreference=0
-Preprocess=0
-Prenocomment=0
-Predefine=0
-Preifdef=1
-Preinclude=1
-Preline=1
-Prenumber=1
-Formfeed=0
-Columns=132
-Lines=0
-Tablength=8
-Ansi=0
-Cpraspras=1
-Commentnest=0
-Intunexpand=1
-Kanjicode=1210
-Verbose=0
-CommandFile=0
-Warninglevel=1
-Startupchk=1
-Fixation=0
-FarROMization=0
-Objectsel=1305
-Librarychk=1
-Floatingpoint=0
-Muldivunit=1
-Mulunit=1
-Startup=s0rm.rel
-Library1=cl0rdm.lib
-Library2=cl0rm.lib
-Library3=cl0rmf.lib
-VfiFileBoot0=
-VfiFileBoot1=boot.vfi
-VF78K0Rchk=0
-VF78K0Rvs=
-[SrcFile]
-Source1=loader.c
-Source2=pm.c
-Source3=i2c_ctr.c
-Source4=main.c
-Source5=magic.c
-Source6=WDT.c
-Source7=i2c_mcu.c
-Source8=i2c_twl.c
-Source9=led.c
-Source10=rtc.c
-Source11=vreg_ctr.c
-Source12=vreg_twl.c
-Source13=adc.c
-Source14=renge\renge.c
-Source15=accero.c
-Source16=self_flash.c
-Source17=sw.c
-Source18=task_debug.c
-Source19=task_misc.c
-Source20=task_sys.c
-Source21=pedo_alg_thre_det2.c
-Source22=ini_VECT.c
-Source23=task_status.c
-Source24=led_cam.c
-Source25=led_pow.c
-Source26=hal.c
-Source27=batt_params.c
-Source28=voltable.c
-Source29=pedo_lpf_coeff.c
-Source30=kanaria.asm
-Source31=kanaria_c.c
-Source32=get_ei.asm
-Source33=util_funcs.c
-Source34=i2c_mcu-sub.c
-[IncFile]
-Include1=incs_loader.h
-Include2=sim\simOnWin.h
-Include3=sim\sfrAlias.h
-Include4=config.h
-Include5=jhl_defs.h
-Include6=user_define.h
-Include7=hal.h
-Include8=bsr_system.h
-Include9=renge\renge.h
-Include10=renge\renge_defs.h
-Include11=renge\renge_task_immediate.h
-Include12=vreg_ctr.h
-Include13=vreg_twl.h
-Include14=loader.h
-Include15=i2c_mcu.h
-Include16=WDT.h
-Include17=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h
-Include18=fsl_user.h
-Include19=i2c_ctr.h
-Include20=pm.h
-Include21=rtc.h
-Include22=reboot.h
-Include23=magic.h
-Include24=incs.h
-Include25=i2c_twl.h
-Include26=accero.h
-Include27=pedometer.h
-Include28=sw.h
-Include29=adc.h
-Include30=led.h
-Include31=batt_params.h
-Include32=pool.h
-Include33=i2c_twl_defs.h
-Include34=renge\renge_task_intval.h
-Include35=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h
-Include36=self_flash.h
-Include37=sim\sim_interrupt_decrare.c
-Include38=util_funcs.h
-Include39=i2c_mcu_sub.h
-[Options.LK78K0R 0]
-Version=100
-O0=bsr_k0r.lmf
-O1=bsr.lmf
-O2=flash.lmf
-O3=a.lmf
-G=1
-E=0
-E0=flash.elk
-E1=a.elk
-GO=1
-GOValue=85
-GOStart=FC00
-GOSizeValue=1024
-GI=1
-GIValue=FFFFFFFFFFFFFFFFFFFF
-CCZA=0
-MemInfoCheck=1
-P=1
-P0=bsr_k0r.map
-P1=bsr.map
-P2=flash.map
-P3=a.map
-MI=0
-GB=1
-GBValue=6EFBFF
-KM=1
-KD=0
-KP=1
-KL=0
-LF=0
-LL=0
-B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib
-D0=bsr_mcu.dr
-D1=user_area.dr
-S=1
-W=0
-SELFCheck=1
-SELF=0
-ZB=
-Etcetera0=
-Etcetera1=boot.lmf
-CommandFile=0
-[Options.LK78K0R 1]
-Version=100
-O0=a.lmf
-G=0
-E=0
-E0=a.elk
-GO=0
-GOValue=
-GOStart=FC00
-GOSizeValue=1024
-GI=0
-GIValue=FFFFFFFFFFFFFFFFFFFF
-CCZA=1
-MemInfoCheck=0
-P=1
-P0=a.map
-MI=0
-GB=0
-GBValue=
-KM=1
-KD=1
-KP=0
-KL=0
-LF=0
-LL=0
-S=0
-W=1
-SELFCheck=0
-SELF=0
-ZB=
-CommandFile=0
-[Options.LK78K0R 2]
-Version=100
-O0=bsr.lmf
-O1=bsr_k0r.lmf
-O2=flash.lmf
-O3=a.lmf
-G=1
-E=0
-E0=flash.elk
-E1=a.elk
-GO=0
-GOValue=85
-GOStart=FC00
-GOSizeValue=1024
-GI=1
-GIValue=1B339499E033F240BFAA
-CCZA=0
-MemInfoCheck=1
-P=1
-P0=bsr_k0r.map
-P1=bsr.map
-P2=flash.map
-P3=a.map
-MI=0
-GB=1
-GBValue=7EFBFF
-KM=1
-KD=0
-KP=0
-KL=0
-LF=0
-LL=0
-B0=C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib
-B1=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib
-D0=bsr_mcu.dr
-D1=user_area.dr
-S=1
-W=2
-SELFCheck=0
-SELF=0
-ZB=
-Etcetera0=
-Etcetera1=boot.lmf
-CommandFile=0
-OFILE=C:\78k_data\yav-mcu-basara\trunk\bsr.lmf
-[Options.LK78K0R 3]
-Version=100
-O0=bsr_bsr.lmf
-O1=bsr_k0r.lmf
-O2=bsr.lmf
-O3=flash.lmf
-O4=a.lmf
-G=1
-E=0
-E0=flash.elk
-E1=a.elk
-GO=1
-GOValue=85
-GOStart=FC00
-GOSizeValue=1024
-GI=1
-GIValue=FFFFFFFFFFFFFFFFFFFF
-CCZA=0
-MemInfoCheck=1
-P=1
-P0=bsr_bsr.map
-P1=bsr_k0r.map
-P2=bsr.map
-P3=flash.map
-P4=a.map
-MI=0
-GB=1
-GBValue=6EFBFF
-KM=1
-KD=0
-KP=1
-KL=0
-LF=0
-LL=0
-B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib
-D0=bsr_mcu.dr
-D1=user_area.dr
-S=1
-W=2
-SELFCheck=0
-SELF=0
-ZB=
-Etcetera0=
-Etcetera1=boot.lmf
-CommandFile=0
-[Options.LK78K0R 4]
-Version=100
-O0=bsr_k0r.lmf
-O1=bsr.lmf
-O2=flash.lmf
-O3=a.lmf
-G=1
-E=0
-E0=flash.elk
-E1=a.elk
-GO=1
-GOValue=85
-GOStart=FC00
-GOSizeValue=1024
-GI=1
-GIValue=FFFFFFFFFFFFFFFFFFFF
-CCZA=0
-MemInfoCheck=1
-P=1
-P0=bsr_k0r.map
-P1=bsr.map
-P2=flash.map
-P3=a.map
-MI=0
-GB=1
-GBValue=6EFBFF
-KM=1
-KD=0
-KP=1
-KL=0
-LF=0
-LL=0
-B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib
-D0=bsr_mcu.dr
-D1=user_area.dr
-S=1
-W=0
-SELFCheck=1
-SELF=0
-ZB=
-Etcetera0=
-Etcetera1=boot.lmf
-CommandFile=0
-[Options.LK78K0R 5]
-Version=100
-O0=bsr_bsr.lmf
-O1=bsr_k0r.lmf
-O2=bsr.lmf
-O3=flash.lmf
-O4=a.lmf
-G=1
-E=0
-E0=flash.elk
-E1=a.elk
-GO=1
-GOValue=85
-GOStart=FC00
-GOSizeValue=1024
-GI=1
-GIValue=FFFFFFFFFFFFFFFFFFFF
-CCZA=0
-MemInfoCheck=1
-P=1
-P0=bsr_bsr.map
-P1=bsr_k0r.map
-P2=bsr.map
-P3=flash.map
-P4=a.map
-MI=0
-GB=1
-GBValue=6EFBFF
-KM=1
-KD=0
-KP=1
-KL=0
-LF=0
-LL=0
-B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib
-D0=bsr_mcu.dr
-D1=user_area.dr
-S=1
-W=2
-SELFCheck=0
-SELF=0
-ZB=
-Etcetera0=
-Etcetera1=boot.lmf
-CommandFile=0
-[Options.LCNV78K0R 0]
-Version=100
-LCNV_GO=0
-E=0
-CommandFile=0
-[Options.LCNV78K0R 1]
-Version=100
-LCNV_GO=0
-E=0
-CommandFile=0
-[Options.LCNV78K0R 2]
-Version=100
-LCNV_GO=0
-O0=inter_asm
-E=0
-CommandFile=0
-[Options.LCNV78K0R 3]
-Version=100
-LCNV_GO=0
-E=0
-CommandFile=0
-[Options.LCNV78K0R 4]
-Version=100
-LCNV_GO=0
-E=0
-CommandFile=0
-[Options.LCNV78K0R 5]
-Version=100
-LCNV_GO=0
-E=0
-CommandFile=0
-[Options.78K0R]
-BuildMode=2
-BuildMode2=K0R_dbg
-BuildMode3=BSR_dbg
-BuildMode4=BSR_rel
-BuildMode5=BSR_WM0
-DefaultMode2=1
-DefaultMode3=1
-DefaultMode4=1
-DefaultMode5=1
diff --git a/branches/2.2A_SDK5(4thNUP)/yav_mcu_bsr.prk b/branches/2.2A_SDK5(4thNUP)/yav_mcu_bsr.prk
deleted file mode 100644
index 1f22087..0000000
--- a/branches/2.2A_SDK5(4thNUP)/yav_mcu_bsr.prk
+++ /dev/null
@@ -1,17 +0,0 @@
-[ProjectManager]
-FrameMax=0
-FrameX=36
-FrameY=209
-FrameCX=1447
-FrameCY=919
-OpenFile1=config.h,0,974,359,2565,1066,29,10,29,0
-OpenFile2=kanaria_c.c,0,87,284,782,915,25,2,25,0
-OpenFile3=ProjectWindow
-PrjPos=0,0,706,0,291
-OpenFile4=OutputWindow
-OutputPos=0,200,778,258,926
-OpenFile5=i2c_ctr.c,0,655,120,1628,751,14,7,14,0
-OpenFile6=config.h,0,216,85,1393,610,29,10,0,0
-ActivePRJ=yav_mcu_bsr.prj
-[ProjectWindow]
-ProjectWindowDispType=0
diff --git a/branches/2.2A_SDK5(4thNUP)/yav_mcu_bsr.prw b/branches/2.2A_SDK5(4thNUP)/yav_mcu_bsr.prw
deleted file mode 100644
index 7c0bbd6..0000000
--- a/branches/2.2A_SDK5(4thNUP)/yav_mcu_bsr.prw
+++ /dev/null
@@ -1,8 +0,0 @@
-[System]
-System1=default
-[default]
-Project1=yav_mcu_bsr.prj
-[BATCH_BUILD]
-Build1=yav_mcu_bsr.prj,Debug Build,1
-Build2=yav_mcu_bsr.prj,Release Build,0
-Build3=yav_mcu_bsr.prj,BSR_WM0,0
diff --git a/branches/2.2A_SDK5(4thNUP)/yav_mcu_bsr.sdb b/branches/2.2A_SDK5(4thNUP)/yav_mcu_bsr.sdb
deleted file mode 100644
index dc75def..0000000
--- a/branches/2.2A_SDK5(4thNUP)/yav_mcu_bsr.sdb
+++ /dev/null
@@ -1,335 +0,0 @@
-[SdbInfo]
-Ver=5
-[loader.c]
-T=5004f29d
-1=incs_loader.h
-2=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h
-3=fsl_user.h
-4=i2c_ctr.h
-5=i2c_mcu.h
-6=pm.h
-7=rtc.h
-8=reboot.h
-9=WDT.h
-10=magic.h
-[pm.c]
-T=50050475
-1=incs.h
-2=adc.h
-3=led.h
-4=pm.h
-5=renge\renge.h
-6=batt_params.h
-7=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h
-8=fsl_user.h
-9=vreg_twl.h
-10=i2c_mcu.h
-[i2c_ctr.c]
-T=4fcefcb0
-1=incs.h
-2=rtc.h
-3=pedometer.h
-[main.c]
-T=4e647b08
-1=incs.h
-2=rtc.h
-3=pm.h
-4=accero.h
-5=led.h
-6=adc.h
-7=i2c_mcu.h
-8=pool.h
-[magic.c]
-T=50079f46
-1=magic.h
-2=config.h
-[WDT.c]
-T=4e649146
-1=incs_loader.h
-[i2c_mcu.c]
-T=4eeed909
-1=incs_loader.h
-2=i2c_mcu.h
-3=loader.h
-4=util_funcs.h
-5=i2c_mcu_sub.h
-[i2c_twl.c]
-T=4fcefcb2
-1=incs.h
-2=i2c_twl_defs.h
-3=i2c_twl.h
-4=vreg_twl.h
-5=WDT.h
-[led.c]
-T=4f13d418
-1=incs.h
-2=led.h
-[rtc.c]
-T=4e647eec
-1=incs.h
-[vreg_ctr.c]
-T=50079f22
-1=incs.h
-2=vreg_ctr.h
-3=rtc.h
-4=led.h
-5=accero.h
-6=pm.h
-7=pool.h
-8=vreg_twl.h
-9=sw.h
-10=WDT.h
-11=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h
-12=fsl_user.h
-[vreg_twl.c]
-T=4e6491f4
-1=incs.h
-2=jhl_defs.h
-3=led.h
-4=vreg_twl.h
-5=adc.h
-[adc.c]
-T=4fcdd1ab
-1=incs.h
-2=adc.h
-3=pm.h
-4=led.h
-5=vreg_twl.h
-6=i2c_mcu.h
-[renge\renge.c]
-T=4fcdd1ab
-1=renge\renge.h
-2=renge\renge_task_intval.h
-3=renge\renge_task_immediate.h
-4=WDT.h
-5=config.h
-6=user_define.h
-7=util_funcs.h
-8=sim\simOnWin.h
-9=bsr_system.h
-[accero.c]
-T=4fd8263b
-1=incs.h
-2=accero.h
-3=i2c_mcu.h
-4=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h
-[self_flash.c]
-T=4e686baa
-1=incs_loader.h
-2=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h
-3=fsl_user.h
-4=i2c_ctr.h
-5=i2c_mcu.h
-6=pool.h
-7=magic.h
-8=pm.h
-9=WDT.h
-10=util_funcs.h
-[sw.c]
-T=5004e509
-1=incs.h
-2=i2c_twl.h
-3=i2c_ctr.h
-4=led.h
-5=pm.h
-6=rtc.h
-7=sw.h
-[task_debug.c]
-T=4fcdd1ab
-1=incs_loader.h
-2=renge\renge.h
-3=pm.h
-4=accero.h
-[task_misc.c]
-T=4fd7f6fa
-1=incs.h
-2=renge\renge.h
-3=pm.h
-4=accero.h
-5=adc.h
-6=i2c_mcu.h
-7=led.h
-8=vreg_twl.h
-[task_sys.c]
-T=5004e509
-1=incs.h
-2=i2c_twl.h
-3=i2c_ctr.h
-4=led.h
-5=accero.h
-6=pm.h
-7=rtc.h
-8=sw.h
-9=adc.h
-10=self_flash.h
-11=i2c_mcu.h
-12=vreg_twl.h
-[pedo_alg_thre_det2.c]
-T=4e687ba7
-1=incs.h
-2=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h
-3=accero.h
-4=pedometer.h
-5=pool.h
-[ini_VECT.c]
-T=4e6864d2
-1=config.h
-2=sim\sim_interrupt_decrare.c
-[task_status.c]
-T=4fd828b4
-1=incs_loader.h
-2=renge\renge.h
-3=pm.h
-4=accero.h
-5=adc.h
-6=i2c_mcu.h
-7=led.h
-[led_cam.c]
-T=4e687272
-1=incs.h
-2=led.h
-3=vreg_twl.h
-[led_pow.c]
-T=4e648b74
-1=incs.h
-2=led.h
-3=pm.h
-[hal.c]
-T=4e648ec7
-1=incs_loader.h
-[batt_params.c]
-T=5017927d
-1=jhl_defs.h
-2=batt_params.h
-[voltable.c]
-T=4e649285
-1=incs.h
-[pedo_lpf_coeff.c]
-T=4e6489bd
-1=incs.h
-[kanaria.asm]
-T=4e4226a2
-[kanaria_c.c]
-T=4e6489de
-1=incs.h
-[get_ei.asm]
-T=4e5223c3
-[util_funcs.c]
-T=4e68724a
-1=incs_loader.h
-2=WDT.h
-[i2c_mcu-sub.c]
-T=4f210a14
-1=incs.h
-2=i2c_mcu.h
-3=loader.h
-4=util_funcs.h
-5=i2c_mcu_sub.h
-6=pm.h
-[incs_loader.h]
-T=4e646cef
-1=sim\simOnWin.h
-2=jhl_defs.h
-3=user_define.h
-4=hal.h
-5=bsr_system.h
-6=renge\renge.h
-7=vreg_ctr.h
-8=vreg_twl.h
-[sim\simOnWin.h]
-T=4e559884
-1=sim\sfrAlias.h
-[sim\sfrAlias.h]
-T=4fd7f6f9
-1=config.h
-[config.h]
-T=50079f24
-[jhl_defs.h]
-T=4e647343
-[user_define.h]
-T=4fd8204b
-[hal.h]
-T=4e5229fb
-[bsr_system.h]
-T=5004ed54
-[renge\renge.h]
-T=4e5e108a
-1=renge\renge_defs.h
-2=renge\renge_task_immediate.h
-[renge\renge_defs.h]
-T=4fcdd1ab
-[renge\renge_task_immediate.h]
-T=4e54ab05
-1=renge\renge_defs.h
-[vreg_ctr.h]
-T=5004e509
-1=config.h
-[vreg_twl.h]
-T=4d42202e
-[loader.h]
-T=4e646df6
-[i2c_mcu.h]
-T=4eeeb6a7
-[WDT.h]
-T=4c319dfc
-[..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h]
-T=49a3bd4e
-[fsl_user.h]
-T=4e409e62
-[i2c_ctr.h]
-T=4bf0d1e1
-[pm.h]
-T=5004ed54
-[rtc.h]
-T=4fd8204b
-[reboot.h]
-T=4bf0d1e1
-[magic.h]
-T=4caab849
-[incs.h]
-T=4e646ff5
-1=sim\simOnWin.h
-2=jhl_defs.h
-3=user_define.h
-4=hal.h
-5=bsr_system.h
-6=renge\renge.h
-7=vreg_ctr.h
-8=util_funcs.h
-[i2c_twl.h]
-T=4bf4e29e
-[accero.h]
-T=4e54ab05
-1=jhl_defs.h
-2=pedometer.h
-[pedometer.h]
-T=4e409e19
-[sw.h]
-T=4df2001a
-1=config.h
-[adc.h]
-T=4dd5c8b2
-1=jhl_defs.h
-[led.h]
-T=4e530d97
-[batt_params.h]
-T=4fb9cb80
-1=jhl_defs.h
-[pool.h]
-T=4c072cf1
-1=pedometer.h
-[i2c_twl_defs.h]
-T=4bf0d1e1
-[renge\renge_task_intval.h]
-T=4e530e07
-1=renge\renge_defs.h
-[..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h]
-T=45f12258
-[self_flash.h]
-T=4bf0d1e0
-[sim\sim_interrupt_decrare.c]
-T=4e409e19
-[util_funcs.h]
-T=4e687249
-[i2c_mcu_sub.h]
-T=4eeed7e6
diff --git a/branches/2.2A_SDK5(4thNUP)/ベースからの変更.xls b/branches/2.2A_SDK5(4thNUP)/ベースからの変更.xls
deleted file mode 100644
index 5212dac..0000000
Binary files a/branches/2.2A_SDK5(4thNUP)/ベースからの変更.xls and /dev/null differ
diff --git a/branches/2.2A_SDK5(4thNUP)/覚え書き.txt b/branches/2.2A_SDK5(4thNUP)/覚え書き.txt
deleted file mode 100644
index 40b93aa..0000000
--- a/branches/2.2A_SDK5(4thNUP)/覚え書き.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-��2012/01/19
-trunk R436
-�@�d�r�[�d���荞�ݒʒm�ɂ‚��Ẵ��t�@�N�^�����O�i�������[�ɓ��삪�ς�邩�烊�t�@�N�^�����O�Ƃ͌Ă΂Ȃ���������Ȃ����j�A���؃R�X�g�Ɍ�����Ȃ��̂�R437�Ŏ蓮�����߂�
-
-
-������
-branch spfl_taiken_seisan
-�@trunk R437����G�N�X�|�[�g�BSPFL���Y�̂��߁B
-�@#ifdef _TAIKENDAI_SEISAN_SPECIAL_ �ň͂��Y��Ă��āA�����œd���������Ă��܂��ȂǁB�Ȃ񂩂̃^�C�~���O��trunk�Ƀ}�[�W����
-