From 2d13854f3893fa93b2413a89ef1b84024e9cb6f5 Mon Sep 17 00:00:00 2001 From: n2232 Date: Wed, 5 Dec 2012 04:41:17 +0000 Subject: [PATCH] =?UTF-8?q?i2c=5Fxxx=20=E3=81=AE=20init=20=E3=81=A7?= =?UTF-8?q?=E5=88=9D=E6=9C=9F=E5=8C=96=E3=81=99=E3=82=8B=E3=83=9D=E3=83=BC?= =?UTF-8?q?=E3=83=88=E3=81=8C=E8=AA=A4=E3=81=A3=E3=81=A6=E3=81=84=E3=81=9F?= =?UTF-8?q?=E3=80=82=EF=BC=88hwinit2()=20=E3=81=A7=E5=88=9D=E6=9C=9F?= =?UTF-8?q?=E5=8C=96=E6=B8=88=E3=81=BF=E3=81=AE=E7=89=A9=E3=82=92=E4=B8=8A?= =?UTF-8?q?=E6=9B=B8=E3=81=8D=E3=81=99=E3=82=8B=E5=8B=95=E4=BD=9C=E3=81=A0?= =?UTF-8?q?=E3=81=A3=E3=81=9F=E3=81=AE=E3=81=A7=E5=AE=9F=E5=AE=B3=E3=81=AA?= =?UTF-8?q?=E3=81=A9=E3=81=AF=E3=81=AA=E3=81=97=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_mcu@497 013db118-44a6-b54f-8bf7-843cb86687b1 --- branches/2.22_SDK5(4thNUP)/i2c_ctr.c | 3 +-- branches/2.22_SDK5(4thNUP)/i2c_twl.c | 3 +-- branches/2.22_SDK5(4thNUP)/led.c | 25 +--------------------- branches/2.22_SDK5(4thNUP)/yav_mcu_bsr.prk | 2 +- 4 files changed, 4 insertions(+), 29 deletions(-) diff --git a/branches/2.22_SDK5(4thNUP)/i2c_ctr.c b/branches/2.22_SDK5(4thNUP)/i2c_ctr.c index 65b479e..3717ec7 100644 --- a/branches/2.22_SDK5(4thNUP)/i2c_ctr.c +++ b/branches/2.22_SDK5(4thNUP)/i2c_ctr.c @@ -270,7 +270,7 @@ void IIC_ctr_Init( void ) // IICAPR0 = 1; /* set INTIICA high priority */ // IICAPR1 = 0; /* set INTIICA high priority */ スタック不足 - P20 &= ~0x3; + Port &= ~0x03; SVA = IIC_C_SLAVEADDRESS; IICF = 0x01; @@ -293,7 +293,6 @@ void IIC_ctr_Init( void ) IICE = 1; PortMode &= ~0x03; - Port &= ~0x03; state = IIC_IDLE; } diff --git a/branches/2.22_SDK5(4thNUP)/i2c_twl.c b/branches/2.22_SDK5(4thNUP)/i2c_twl.c index fef7ac2..f0d63b8 100644 --- a/branches/2.22_SDK5(4thNUP)/i2c_twl.c +++ b/branches/2.22_SDK5(4thNUP)/i2c_twl.c @@ -204,7 +204,7 @@ void IIC_twl_Init( void ) IICAPR0 = 0; /* set INTIICA high priority */ IICAPR1 = 0; /* set INTIICA high priority */ - P20 &= ~0x3; + Port &= ~0x03; SVA = IIC_T_SLAVEADDRESS; IICF = 0x01; @@ -227,7 +227,6 @@ void IIC_twl_Init( void ) IICE = 1; PortMode &= ~0x03; - Port &= ~0x03; LREL = 1; } diff --git a/branches/2.22_SDK5(4thNUP)/led.c b/branches/2.22_SDK5(4thNUP)/led.c index 36ad484..6ae0e29 100644 --- a/branches/2.22_SDK5(4thNUP)/led.c +++ b/branches/2.22_SDK5(4thNUP)/led.c @@ -13,10 +13,6 @@ #include "led.h" -// ======================================================== -static void LED_oshirase_init(); - - // ======================================================== // TPS0 @@ -121,9 +117,6 @@ void LED_init( ) 　　　　　　　　６　電源 Ｌ 　　　　　　　　７　電源 Ｈ */ - LED_oshirase_init(); // お知らせパターン初期化 - - /// ペリフェラル初期化 /// TAU0EN = 1; TPS0 = BIT_PRS012 | BIT_PRS002; // マスタークロックはCK01,8M/2 /2^4 = 250kHz @@ -148,7 +141,7 @@ void LED_init( ) // アップデートなどでマイコンのみリブートしたとき if( system_status.reboot ) { - // SoC からのコマンドを待たず、自動で電源 LED をつける + // SoC からのコマンドが来ないので自動で電源 LED をつける vreg_ctr[VREG_C_LED_POW] = LED_POW_ILM_AUTO; LED_duty_pow_blu = LED_BRIGHT_MAX; } @@ -157,22 +150,6 @@ void LED_init( ) } -static void LED_oshirase_init() -{ - char* p_tgt = &info_LED; - int i; - - for( i = 0; i < sizeof(info_LED); i++ ) - { - *p_tgt = 0; - p_tgt++; - } -} - - - - - /********************************************//** LEDの停止。 diff --git a/branches/2.22_SDK5(4thNUP)/yav_mcu_bsr.prk b/branches/2.22_SDK5(4thNUP)/yav_mcu_bsr.prk index eaa1000..4481fab 100644 --- a/branches/2.22_SDK5(4thNUP)/yav_mcu_bsr.prk +++ b/branches/2.22_SDK5(4thNUP)/yav_mcu_bsr.prk @@ -19,7 +19,7 @@ OpenFile12=ProjectWindow PrjPos=0,0,706,0,291 OpenFile13=config.h,0,300,300,1891,1007,2,7,2,0 OpenFile14=OutputWindow -OutputPos=0,200,850,258,1214 +OutputPos=0,247,897,112,1068 ActivePRJ=yav_mcu_bsr.prj [ProjectWindow] ProjectWindowDispType=0