mirror of
https://github.com/rvtr/TwlIPL.git
synced 2025-10-31 06:01:12 -04:00
本体情報のビルドスイッチを整理。BroadOn用および社外用。
git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@1229 b08762b0-b915-fc4b-9d8c-17b2551a87ff
This commit is contained in:
yosiokat
parent
9c56cfcfcd
commit
53f65552a6
@ -22,6 +22,12 @@ SUBDIRS = \
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
|
||||
# COMPILE SWITCH ※最終ROM作成時は、全てFALSEにセットする。
|
||||
OUTSIDE_UI ?= FALSE
|
||||
BROADON_UI ?= FALSE
|
||||
|
||||
|
||||
# MAKEROM SWITCH ※最終ROM作成時は、TRUEにする
|
||||
DISABLE_DEBUG ?= FALSE
|
||||
|
||||
@ -70,6 +76,16 @@ LLIBRARIES = libes$(TWL_LIBSUFFIX).a \
|
||||
|
||||
include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
|
||||
|
||||
|
||||
ifeq ($(OUTSIDE_UI),TRUE)
|
||||
MACRO_FLAGS += -DOUTSIDE_UI
|
||||
endif
|
||||
|
||||
ifeq ($(BROADON_UI),TRUE)
|
||||
MACRO_FLAGS += -DBROADON_UI
|
||||
endif
|
||||
|
||||
|
||||
MAKEROM_ARM7_BASE = $(TWL_COMPONENTSDIR)/armadillo/$(TWL_BUILDTYPE_ARM7)/armadillo
|
||||
MAKEROM_ARM7 = $(MAKEROM_ARM7_BASE).$(TWL_ELF_EXT)
|
||||
MAKEROM = $(TWL_TOOLSDIR)/bin/makerom.TWL.secure.exe
|
||||
|
||||
@ -32,11 +32,19 @@
|
||||
#define OK_BUTTON_BOTTOM_X ( OK_BUTTON_TOP_X + 2 * 8 )
|
||||
#define OK_BUTTON_BOTTOM_Y ( OK_BUTTON_TOP_Y + 2 * 8 )
|
||||
|
||||
#ifdef BROADON_ENABLE
|
||||
#define SETTING_MENU_ELEMENT_NUM 9 // メインメニューの項目数（※ピクトチャット起動テストは除いておく）
|
||||
#else
|
||||
#define SETTING_MENU_ELEMENT_NUM 8
|
||||
#endif
|
||||
// メインメニューの項目数（※ピクトチャット起動テストは除いておく）
|
||||
#ifdef OUTSIDE_UI
|
||||
#define SETTING_MENU_ELEMENT_NUM 5 // 社外用
|
||||
#else // !OUTSIDE_UI
|
||||
|
||||
#ifdef BROADON_UI
|
||||
#define SETTING_MENU_ELEMENT_NUM 9 // BroadON用
|
||||
#else // !BROADON_UI
|
||||
#define SETTING_MENU_ELEMENT_NUM 8 // 社内用
|
||||
#endif // BROADON_UI
|
||||
|
||||
#endif // OUTSIDE_UI
|
||||
|
||||
// extern data------------------------------------------
|
||||
|
||||
extern u32 bg_char_data[8 * 6];
|
||||
@ -97,6 +105,27 @@ static const u16 *const s_pStrSettingElemTbl[ SETTING_MENU_ELEMENT_NUM ][ LCFG_T
|
||||
(const u16 *)L"TOUCH PANEL(C)",
|
||||
(const u16 *)L"TOUCH PANEL(K)",
|
||||
},
|
||||
{
|
||||
(const u16 *)L"無線設定",
|
||||
(const u16 *)L"WIRELESS",
|
||||
(const u16 *)L"WIRELESS(F)",
|
||||
(const u16 *)L"WIRELESS(G)",
|
||||
(const u16 *)L"WIRELESS(I)",
|
||||
(const u16 *)L"WIRELESS(S)",
|
||||
(const u16 *)L"WIRELESS(C)",
|
||||
(const u16 *)L"WIRELESS(K)",
|
||||
},
|
||||
#ifndef OUTSIDE_UI
|
||||
{
|
||||
(const u16 *)L"本体のクリーンアップ",
|
||||
(const u16 *)L"MACHINE CLEAN UP",
|
||||
(const u16 *)L"MACHINE CLEAN UP(F)",
|
||||
(const u16 *)L"MACHINE CLEAN UP(G)",
|
||||
(const u16 *)L"MACHINE CLEAN UP(I)",
|
||||
(const u16 *)L"MACHINE CLEAN UP(S)",
|
||||
(const u16 *)L"MACHINE CLEAN UP(C)",
|
||||
(const u16 *)L"MACHINE CLEAN UP(K)",
|
||||
},
|
||||
{
|
||||
(const u16 *)L"国設定",
|
||||
(const u16 *)L"COUNTRY",
|
||||
@ -117,27 +146,7 @@ static const u16 *const s_pStrSettingElemTbl[ SETTING_MENU_ELEMENT_NUM ][ LCFG_T
|
||||
(const u16 *)L"PARENTAL CONTROL(C)",
|
||||
(const u16 *)L"PARENTAL CONTROL(K)",
|
||||
},
|
||||
{
|
||||
(const u16 *)L"無線設定",
|
||||
(const u16 *)L"WIRELESS",
|
||||
(const u16 *)L"WIRELESS(F)",
|
||||
(const u16 *)L"WIRELESS(G)",
|
||||
(const u16 *)L"WIRELESS(I)",
|
||||
(const u16 *)L"WIRELESS(S)",
|
||||
(const u16 *)L"WIRELESS(C)",
|
||||
(const u16 *)L"WIRELESS(K)",
|
||||
},
|
||||
{
|
||||
(const u16 *)L"本体のクリーンアップ",
|
||||
(const u16 *)L"MACHINE CLEAN UP",
|
||||
(const u16 *)L"MACHINE CLEAN UP(F)",
|
||||
(const u16 *)L"MACHINE CLEAN UP(G)",
|
||||
(const u16 *)L"MACHINE CLEAN UP(I)",
|
||||
(const u16 *)L"MACHINE CLEAN UP(S)",
|
||||
(const u16 *)L"MACHINE CLEAN UP(C)",
|
||||
(const u16 *)L"MACHINE CLEAN UP(K)",
|
||||
},
|
||||
#ifdef BROADON_ENABLE
|
||||
#ifdef BROADON_UI
|
||||
{
|
||||
(const u16 *)L"フリーソフトBOX",
|
||||
(const u16 *)L"FREESOFT BOX",
|
||||
@ -148,7 +157,8 @@ static const u16 *const s_pStrSettingElemTbl[ SETTING_MENU_ELEMENT_NUM ][ LCFG_T
|
||||
(const u16 *)L"FREESOFT BOX(C)",
|
||||
(const u16 *)L"FREESOFT BOX(K)",
|
||||
},
|
||||
#endif
|
||||
#endif // BROADON_UI
|
||||
#endif // OUTSIE_UI
|
||||
#if 0
|
||||
{
|
||||
(const u16 *)L"ピクトチャット起動テスト",
|
||||
@ -268,21 +278,21 @@ int MachineSettingMain( void )
|
||||
TP_CalibrationInit();
|
||||
g_pNowProcess = TP_CalibrationMain;
|
||||
break;
|
||||
case 4:
|
||||
SelectCountryInit();
|
||||
g_pNowProcess = SelectCountryMain;
|
||||
break;
|
||||
case 5:
|
||||
SetParentalControlInit();
|
||||
g_pNowProcess = SetParentalControlMain;
|
||||
break;
|
||||
case 6:
|
||||
case 4:
|
||||
SetWirelessInit();
|
||||
g_pNowProcess = SetWirelessMain;
|
||||
break;
|
||||
case 7:
|
||||
case 5:
|
||||
CleanupMachineInit();
|
||||
g_pNowProcess = CleanupMachineMain;
|
||||
break;
|
||||
case 6:
|
||||
SelectCountryInit();
|
||||
g_pNowProcess = SelectCountryMain;
|
||||
break;
|
||||
case 7:
|
||||
SetParentalControlInit();
|
||||
g_pNowProcess = SetParentalControlMain;
|
||||
break;
|
||||
case 8:
|
||||
SetFreeSoftBoxInit();
|
||||
|
||||
@ -35,8 +35,6 @@ extern "C" {
|
||||
#define HANDLE_OK_BUTTON 255
|
||||
#define HANDLE_CANCEL_BUTTON 256
|
||||
|
||||
//#define BROADON_ENABLE // BroadOn用に設定項目を切り替える
|
||||
|
||||
// 数値入力インターフェース用ワーク（void InputDecimal()で使用）
|
||||
typedef struct InputNumParam {
|
||||
u16 pos_x; // 入力値の表示X位置
|
||||
|
||||
@ -125,11 +125,11 @@
|
||||
#define MS_PARENTAL_NUMOF_PAGES 3
|
||||
|
||||
// 項目の総数
|
||||
#ifdef BROADON_ENABLE
|
||||
#ifdef BROADON_UI
|
||||
#define MS_PARENTAL_NUMOF_ELEMENTS 10
|
||||
#else // BROADON_ENABLE
|
||||
#else // BROADON_UI
|
||||
#define MS_PARENTAL_NUMOF_ELEMENTS 7
|
||||
#endif // BROADON_ENABLE
|
||||
#endif // BROADON_UI
|
||||
|
||||
// ソフトウェアキーボードのパラメータ
|
||||
#define CHAR_LIST_CHAR_NUM 120
|
||||
@ -328,7 +328,7 @@ static const u16 *const s_pStrSettingElemTbl[ MS_PARENTAL_NUMOF_ELEMENTS ][ LCFG
|
||||
},
|
||||
|
||||
// ページ3
|
||||
#ifdef BROADON_ENABLE
|
||||
#ifdef BROADON_UI
|
||||
{
|
||||
(const u16 *)L"Wiiポイント",
|
||||
(const u16 *)L"Wii Point",
|
||||
@ -369,7 +369,7 @@ static const u16 *const s_pStrSettingElemTbl[ MS_PARENTAL_NUMOF_ELEMENTS ][ LCFG
|
||||
(const u16 *)L"Nintendo Spot(C)",
|
||||
(const u16 *)L"Nintendo Spot(K)",
|
||||
},
|
||||
#else // BROADON_ENABLE
|
||||
#else // BROADON_UI
|
||||
{
|
||||
(const u16 *)L"その他の設定(仮)",
|
||||
(const u16 *)L"OTHER SETTINGS(None)",
|
||||
@ -380,7 +380,7 @@ static const u16 *const s_pStrSettingElemTbl[ MS_PARENTAL_NUMOF_ELEMENTS ][ LCFG
|
||||
(const u16 *)L"OTHER SETTINGS(None)(C)",
|
||||
(const u16 *)L"OTHER SETTINGS(None)(K)",
|
||||
},
|
||||
#endif // BROADON_ENABLE
|
||||
#endif // BROADON_UI
|
||||
};
|
||||
|
||||
// 表示位置
|
||||
@ -398,14 +398,14 @@ static MenuPos s_settingPos[] = {
|
||||
{ TRUE, 3 * 8, 10 * 8 },
|
||||
|
||||
// ページ3
|
||||
#ifdef BROADON_ENABLE
|
||||
#ifdef BROADON_UI
|
||||
{ TRUE, 2 * 8, 6 * 8 },
|
||||
{ TRUE, 2 * 8, 8 * 8 },
|
||||
{ TRUE, 2 * 8, 10 * 8 },
|
||||
{ TRUE, 2 * 8, 12 * 8 },
|
||||
#else // BROADON_ENABLE
|
||||
#else // BROADON_UI
|
||||
{ FALSE, 4 * 8, 6 * 8 },
|
||||
#endif // BROADON_ENABLE
|
||||
#endif // BROADON_UI
|
||||
};
|
||||
|
||||
// 各ページの表示項目数
|
||||
@ -413,11 +413,11 @@ static const int sNumOfPageElements[] =
|
||||
{
|
||||
3,
|
||||
3,
|
||||
#ifdef BROADON_ENABLE
|
||||
#ifdef BROADON_UI
|
||||
4,
|
||||
#else // BROADON_ENABLE
|
||||
#else // BROADON_UI
|
||||
1,
|
||||
#endif // BROADON_ENABLE
|
||||
#endif // BROADON_UI
|
||||
};
|
||||
|
||||
// 表示パラメータ
|
||||
@ -954,7 +954,7 @@ static void DrawParentalControlMenuScene( void )
|
||||
break;
|
||||
|
||||
case 2:
|
||||
#ifdef BROADON_ENABLE
|
||||
#ifdef BROADON_UI
|
||||
PutStringUTF16( 17*8, 6*8, TXT_UCOLOR_G0,
|
||||
LCFG_TSD_IsRestrictWiiPoint() ? L"Restricted" : L"Not Restricted" );
|
||||
PutStringUTF16( 17*8, 8*8, TXT_UCOLOR_G0,
|
||||
@ -963,7 +963,7 @@ static void DrawParentalControlMenuScene( void )
|
||||
LCFG_TSD_IsRestrictPictoChatBoot() ? L"Restricted" : L"Not Restricted" );
|
||||
PutStringUTF16( 17*8, 12*8, TXT_UCOLOR_G0,
|
||||
LCFG_TSD_IsRestrictNintendoSpot() ? L"Restricted" : L"Not Restricted" );
|
||||
#endif // BROADON_ENABLE
|
||||
#endif // BROADON_UI
|
||||
break;
|
||||
}
|
||||
}
|
||||
@ -1108,7 +1108,7 @@ int SetParentalControlMain( void )
|
||||
case 2:
|
||||
switch( sCursorMenu )
|
||||
{
|
||||
#ifdef BROADON_ENABLE
|
||||
#ifdef BROADON_UI
|
||||
case 0:
|
||||
sBroadOnMenu = MS_BROADON_WIIPOINT; // すべてON/OFF設定なので設定関数を共通化してフラグで設定項目切り替え
|
||||
SetBroadOnSettingInit();
|
||||
@ -1129,10 +1129,10 @@ int SetParentalControlMain( void )
|
||||
SetBroadOnSettingInit();
|
||||
g_pNowProcess = SetBroadOnSettingMain;
|
||||
break;
|
||||
#else // BROADON_ENABLE
|
||||
#else // BROADON_UI
|
||||
case 0:
|
||||
break;
|
||||
#endif // BROADON_ENABLE
|
||||
#endif // BROADON_UI
|
||||
}
|
||||
break;
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user