From 8120d7b9dd7182db1ce289edc484f186083717c8 Mon Sep 17 00:00:00 2001 From: aoki_ryoma Date: Tue, 18 Nov 2008 23:57:09 +0000 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=8A=9B=E3=83=95=E3=82=A1=E3=82=A4?= =?UTF-8?q?=E3=83=AB=E5=90=8D=E3=82=92sysmenu.log=E5=9B=BA=E5=AE=9A?= =?UTF-8?q?=E3=81=8B=E3=82=89=E6=9C=AC=E4=BD=93=E3=82=B7=E3=83=AA=E3=82=A2?= =?UTF-8?q?=E3=83=AB=E3=83=8A=E3=83=B3=E3=83=90=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@2693 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- .../SystemLogReader/ARM9.TWL/Makefile | 3 +- .../ARM9.TWL/nandfirm/nandfirm.dev.o | Bin 320892 -> 320892 bytes .../ARM9.TWL/nandfirm/nandfirm.prod.o | Bin 320892 -> 320892 bytes .../SystemLogReader/ARM9.TWL/src/main.c | 34 ++++++++-- .../systemMenu_tools/SystemLogReader/make.rb | 62 ++++++++++-------- 5 files changed, 64 insertions(+), 35 deletions(-) diff --git a/build/systemMenu_tools/SystemLogReader/ARM9.TWL/Makefile b/build/systemMenu_tools/SystemLogReader/ARM9.TWL/Makefile index 8d107a66..e5def126 100644 --- a/build/systemMenu_tools/SystemLogReader/ARM9.TWL/Makefile +++ b/build/systemMenu_tools/SystemLogReader/ARM9.TWL/Makefile @@ -46,7 +46,8 @@ ROM_SPEC = main.rsf TARGET_BIN = SystemLogReader.srl -LLIBRARIES += liberrorlog$(TWL_LIBSUFFIX).a +LLIBRARIES += liberrorlog$(TWL_LIBSUFFIX).a \ + liblcfg$(TWL_LIBSUFFIX).a include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs diff --git a/build/systemMenu_tools/SystemLogReader/ARM9.TWL/nandfirm/nandfirm.dev.o b/build/systemMenu_tools/SystemLogReader/ARM9.TWL/nandfirm/nandfirm.dev.o index 49fa7b5f608bb35a064e96619903b63035e09e50..56d447e49f0b7e621ed46dba1ffbdcadb974b62f 100644 GIT binary patch delta 446 zcmex!O8Czy;SB{W^;QZ0^m&UvJ$=T>u{Ox`+2+^hm}QqvX*+&j^=r1%s=FPPHr>0_ zro`BR}8E;}ahzjRFR z@ZWfc<-D4?{zDrF-YkJB&(nLH_Hwm6N>7x|6*NAqZSiEib+O##sqse4vHMbX`uq=n zJj<6;VYBNm-SV{_bD}p2_-&ETRx#UuqbVl2R&~uQFYkklKbt>rw141W-2Q=sX=N1i a<=@QhbCQ{Wn0fo0WR}~Ftj5M>yj%b!Q`xBi delta 446 zcmex!O8Czy;SB{W^&8sia$n07^z5n05c;PeX=KDcF-kp0>B+{MQ{?%?Z)Tl{zqs(= z-G*@0e@+EKfw9ScZJ$0Y{~R|lD>*@pB{s)Om7nR+?Kj&4iZ(py@O&}dBw)1#C&QkK zuM>+J=e)3wD`Q-Khc~e3Zk+;8Tkzw@=C_Yb+bFs`tfKZ#TVq&SHw&Za<_|0ljDx`$ zY(Qt6{@%G`k@>NNb-t_IBltw#UOpw`|ANWu+eg+}(GL4-Kj(ElntGh+o8>7ny{PG; zt0!q$e|xDdKY8=p?;^Jq+IG3e`dVwRzjMTp%{nTe!l7^`@AUXbCnQTEnF2IVZ{>D& zwb>i$_(I&dV%4$pGE9*#eBDZqn#N3Fa#IT`d|1s<%vjs}fusEc2jlh+984>tm@oZf YX`hqK1jNkS=OnY-Ze%qwGvwt00A7{MPyhe` diff --git a/build/systemMenu_tools/SystemLogReader/ARM9.TWL/nandfirm/nandfirm.prod.o b/build/systemMenu_tools/SystemLogReader/ARM9.TWL/nandfirm/nandfirm.prod.o index 48a1882862eccfbb8cda6635514aa33d7739a323..7d8180967518917e205fa03ec9c1177ee9c61a4b 100644 GIT binary patch delta 446 zcmex!O8Czy;SB{W^|Sphvj^#G>B+UdIX1;)?q0^^U58aqr~YNTHzRwsg-8Fq?Qg#Z zJ`kOxdTZ{7o=gAoy7M2n?f<%5k40tD`@o!U7e9ZU>Ad7!C+DiKtvvFv?VmE{1q*(g z+u3+K^sBKD?>$wk_IF~1)1wUnb7$*ZdGc88`BAT{y^84@H%KxbU&|cEcy#jzmIlVb z;0!jPGv3s;ex5sVy^M(uxww?8hqP!sW3vc9c? zVY$VgWc?_!W6Q7244YhkwzybG)_StXsrP>uF3U7uU}(#Iy?x4oN%7}(o>#eVTF>;j zGT7|>rmfx20!8v=uQL6!6nXz7?0I75nVd71_#AeMd6dm&jA;JA(f)yhar*}jCe0}3 a2R-HOGRaIp%)DJDnI*c3)!5jKmkR*hS=!?O delta 446 zcmex!O8Czy;SB{W_1Bkk>^S%9@dWcs+0B=?v>tDqCR8Zue8YIkKfBi85beoo(^waV zAL3}9v#jG??me%6Kiw%1E>j_ORh zWG8Pm`Syz4@pD#OF?T#RlVRHJDZ0;=hq)Yl8@TJSDy{*Do9YRTmQ&8ZII #define BUFSIZE 256 @@ -28,7 +29,7 @@ #define SCREEN_WIDTH 32 #define RESULT_LINE_OFFSET 6 -#define DST_LOGFILE_PATH "sdmc:/sysmenu.log" +#define DST_LOGFILE_PATH "sdmc:/" #define ERRORLOG_LOGFILE_PATH "nand:/sys/log/sysmenu.log" #define NAND_BLOCK_BYTE 0x200 @@ -96,8 +97,8 @@ TwlMain() ERRORLOG_Init( OS_AllocFromMain, OS_FreeToMain ); + resetConsoleFlag = TRUE; - OS_TPrintf( "boottype : %d\n", OS_GetBootType() ); drawMenu(); doProc(); @@ -165,7 +166,7 @@ static BOOL deleteLogfile( void ) static BOOL copyLogToSD( void ) { FSFile src, dst; - // 最悪で読み込んだサイズの倍の文字列になる可能性がある + // 書き込みサイズは、最悪で読み込んだサイズの倍のになる可能性がある BOOL result = TRUE; int idxlog; int sizelog; @@ -173,14 +174,33 @@ static BOOL copyLogToSD( void ) char winbuf[BUFSIZE*2 +1]; s32 readSize; s32 writeSize = 0; + char filename[BUFSIZE+1]; + u8 *lcfgbuf; + u8 serial[OS_TWL_HWINFO_SERIALNO_LEN_MAX]; + + buf[BUFSIZE] = '\0'; - buf[256] = '\0'; FS_InitFile( &dst ); + printConsole("Reading serial number..."); + lcfgbuf = OS_Alloc( LCFG_READ_TEMP ); + + if( LCFG_ReadTWLSettings( (u8 (*)[LCFG_READ_TEMP]) lcfgbuf ) && LCFG_ReadHWSecureInfo() ) + { + LCFG_THW_GetSerialNo( (u8*)serial ); + STD_TSNPrintf( filename , BUFSIZE, "sdmc:/%s.log", serial); + } + else + { + printConsoleErr( "failed to read Serial."); + return FALSE; + } + + // まずファイルを削除 - FS_DeleteFile( DST_LOGFILE_PATH ); + FS_DeleteFile( filename ); - if( ! FS_CreateFile( DST_LOGFILE_PATH, FS_PERMIT_R | FS_PERMIT_W ) ) + if( ! FS_CreateFile( filename, FS_PERMIT_R | FS_PERMIT_W ) ) { printConsoleErr( "Copy Failed." ); printConsoleErr( "func: FS_CreateFile" ); @@ -189,7 +209,7 @@ static BOOL copyLogToSD( void ) } // ファイル作成に成功 - if( !FS_OpenFileEx( &dst , DST_LOGFILE_PATH, FS_FILEMODE_RW )) + if( !FS_OpenFileEx( &dst , filename, FS_FILEMODE_RW )) { // 作成したファイルをopenできなかった場合 printConsoleErr( "Copy Failed." ); diff --git a/build/systemMenu_tools/SystemLogReader/make.rb b/build/systemMenu_tools/SystemLogReader/make.rb index b94b681c..c52e6a31 100755 --- a/build/systemMenu_tools/SystemLogReader/make.rb +++ b/build/systemMenu_tools/SystemLogReader/make.rb @@ -10,34 +10,37 @@ def putex(str) end -def buildgcd(buildtype, prodopt) +def buildgcd(buildtype, prodopt, shortbuild) puts "buildtype : #{buildtype}" + puts "**shortbuild**" if shortbuild - # build TwlIPL Root - Dir.chdir(ENV['TWL_IPL_RED_ROOT']) do - putex "make -f Makefile.full clean; " + - "makesp CYGPATH_NOCMD=TRUE -j 2 -f Makefile.full TWL_FINALROM=TRUE #{prodopt}" - end - - # build nandfirm - Dir.chdir(ENV['TWL_IPL_RED_ROOT'] + "/build/nandfirm/menu-launcher") do - putex "make clean; make TWL_FINALROM=TRUE #{prodopt}" - nandfirm = Dir.glob("menu_launcher*#{buildtype}.nand") - if nandfirm.none? - puts "build nandfirm failed." - exit - else - nandfirm = nandfirm[0] + unless shortbuild + # build TwlIPL Root + Dir.chdir(ENV['TWL_IPL_RED_ROOT']) do + putex "make -f Makefile.full clean; " + + "makesp CYGPATH_NOCMD=TRUE -j 2 -f Makefile.full TWL_FINALROM=TRUE #{prodopt}" end - - putex "$TWLSDK_ROOT/tools/bin/bin2obj.TWL.exe #{nandfirm} nandfirm.#{buildtype}.o " + - "-b nandfirm_begin -e nandfirm_end" - putex "cp nandfirm.#{buildtype}.o #{Rootdir}/ARM9.TWL/nandfirm/" + # build nandfirm + Dir.chdir(ENV['TWL_IPL_RED_ROOT'] + "/build/nandfirm/menu-launcher") do + putex "make clean; make TWL_FINALROM=TRUE #{prodopt}" + nandfirm = Dir.glob("menu_launcher*#{buildtype}.nand") + if nandfirm.none? + puts "build nandfirm failed." + exit + else + nandfirm = nandfirm[0] + end + + + putex "$TWLSDK_ROOT/tools/bin/bin2obj.TWL.exe #{nandfirm} nandfirm.#{buildtype}.o " + + "-b nandfirm_begin -e nandfirm_end" + putex "cp nandfirm.#{buildtype}.o #{Rootdir}/ARM9.TWL/nandfirm/" + end end # build systemlogreader - putex "make clean; make TWL_FINALROM=TRUE #{prodopt}" + putex "makesp CYGPATH_NOCMD=TRUE -j 2 clean; makesp CYGPATH_NOCMD=TRUE -j 2 TWL_FINALROM=TRUE #{prodopt}" Dir.chdir(Rootdir + "/ARM9.TWL/bin/ARM9-TS.LTD.thumb/Rom") do if buildtype == "dev" putex 'cp ./SystemLogReader.srl $TWL_IPL_RED_ROOT/build/gcdfirm/memory-launcher-writer/' @@ -64,15 +67,16 @@ end Rootdir = ENV['TWL_IPL_RED_ROOT'] + '/build/systemMenu_tools/SystemLogReader' prodopt = "" +shortbuild = false # default buildtype = dev -if ARGV.none? || ARGV[0] == 'dev' +if ARGV.none? || ARGV.include?('dev') build = ["dev"] opt = ["FIRM_USE_PRODUCT_KEYS="] -elsif ARGV[0] == "prod" +elsif ARGV.include?("prod") build = ["prod"] opt = ["FIRM_USE_PRODUCT_KEYS=TRUE"] -elsif ARGV[0] == "full" +elsif ARGV.include? "full" build = ["dev", "prod"] opt = ["FIRM_USE_PRODUCT_KEYS=", "FIRM_USE_PRODUCT_KEYS=TRUE"] else @@ -80,8 +84,12 @@ else exit end -p build.zip(opt) -build.zip(opt).each do |b,op| - buildgcd(b,op) +if ARGV.include? "short" + shortbuild = true +end + +p build.zip(opt) +build.zip(opt).each do |b,op| + buildgcd(b,op,shortbuild) end