From 06a8c9c2c4dbb6dbe6729b0a3bdf1eed9010804e Mon Sep 17 00:00:00 2001 From: Christopher Roy Bratusek Date: Sat, 17 Mar 2012 21:15:38 +0100 Subject: [PATCH] removed all code related to the HBC --- data/images/hbc_icon.png | Bin 6485 -> 0 bytes installer/wad/0001000154484246.tmd | Bin 592 -> 592 bytes source/BootHomebrew/BootHomebrew.cpp | 2 - source/Prompts/prompt_app_info.cpp | 26 ++---- source/Tools/app_list.cpp | 3 - source/Tools/copy_app_in_category.cpp | 5 - source/Tools/load_channel.cpp | 130 +------------------------- source/Tools/load_channel.h | 5 - source/filelist.h | 3 - source/main.cpp | 16 ++-- 10 files changed, 16 insertions(+), 174 deletions(-) delete mode 100644 data/images/hbc_icon.png diff --git a/data/images/hbc_icon.png b/data/images/hbc_icon.png deleted file mode 100644 index 71416d0e79d7974e951091ec7d45766e4b4ab241..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6485 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 delta 30 mcmcb>a)D)o6_Z$P!Yzk8`+m$f;rD+M_Pf&Yu*20y%zOaV*bW~6 diff --git a/source/BootHomebrew/BootHomebrew.cpp b/source/BootHomebrew/BootHomebrew.cpp index 8a870bf..63612bb 100644 --- a/source/BootHomebrew/BootHomebrew.cpp +++ b/source/BootHomebrew/BootHomebrew.cpp @@ -228,8 +228,6 @@ int BootGameCubeHomebrew() ES_GetTicketViews(BC, &view, 1); int ret = ES_LaunchTitle(BC, &view); - if(ret < 0) - LoadHBC(); return ret; } diff --git a/source/Prompts/prompt_app_info.cpp b/source/Prompts/prompt_app_info.cpp index 776bb13..2fbf71d 100644 --- a/source/Prompts/prompt_app_info.cpp +++ b/source/Prompts/prompt_app_info.cpp @@ -32,25 +32,15 @@ AppInfo(const char *title, string dir, u8* icon) string line, quelltext = "", version, coder, descriptionTxt; - if(strcasecmp(title, "the homebrew channel") == 0) - { - string space = " "; - version = tr("Version:") + space + HBC_version; - coder = tr("Coder:") + space + "HBC Team"; - descriptionTxt = "The Homebrew Channel is a channel for launching Wii homebrew applications. It will list homebrew applications stored and organised on an SD card or USB mass storage device in a nice little GUI, which you can very easily customise with descriptions and shiny little icons all by yourself. You can also launch applications via TCP (with a correctly configured PC) or a USBGecko. Both of those built in options make it extremely convenient for testing out new code, as well as a general purpose homebrew launcher."; - } - else - { - ifstream in(dir.c_str()); - while(getline(in, line)) - quelltext = quelltext + line + "\n"; + ifstream in(dir.c_str()); + while(getline(in, line)) + quelltext = quelltext + line + "\n"; + + string space = " "; + version = tr("Version:") + space + parser(quelltext, "", ""); + coder = tr("Coder:") + space + parser(quelltext, "", ""); + descriptionTxt = parser(quelltext, "", ""); - string space = " "; - version = tr("Version:") + space + parser(quelltext, "", ""); - coder = tr("Coder:") + space + parser(quelltext, "", ""); - descriptionTxt = parser(quelltext, "", ""); - } - GuiWindow promptWindow(520, 360); promptWindow.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE); promptWindow.SetPosition(0, -10); diff --git a/source/Tools/app_list.cpp b/source/Tools/app_list.cpp index 48c9e8e..0662d77 100644 --- a/source/Tools/app_list.cpp +++ b/source/Tools/app_list.cpp @@ -228,8 +228,5 @@ void app_list() // sortieren std::sort(vechomebrew_list_category[0].begin(),vechomebrew_list_category[0].end(), sort_name_a_z); - // suchen nach hbc - //if(DetectHBC() != 0 && Settings.system != 0) - // vechomebrew_list_category[0].insert(vechomebrew_list_category[0].begin(), homebrew_list("the homebrew channel", "the homebrew channel", "the homebrew channel", (u8*)hbc_icon_png, "the homebrew channel", "")); } diff --git a/source/Tools/copy_app_in_category.cpp b/source/Tools/copy_app_in_category.cpp index 42e8be1..46105b2 100644 --- a/source/Tools/copy_app_in_category.cpp +++ b/source/Tools/copy_app_in_category.cpp @@ -82,7 +82,6 @@ void copy_app_in_category(int category) //Apps im Kategorie kopieren { copy_app_in_unassigned(); vechomebrew_list_category[category].clear(); - bool hbc = false; for(int a = 0; a < (signed)AvailableCategory.apps[category].size(); a++) { @@ -131,10 +130,6 @@ void copy_app_in_category(int category) //Apps im Kategorie kopieren strcasecmp(AvailableCategory.apps[category][a].c_str(), "the homebrew channel") == 0 ) { - if(strcasecmp(AvailableCategory.apps[category][a].c_str(), "the homebrew channel") == 0 && !hbc) - hbc = true; - else if(strcasecmp(AvailableCategory.apps[category][a].c_str(), "the homebrew channel") == 0 && hbc) - break; vechomebrew_list_category[category].push_back(homebrew_list( vechomebrew_list_category[0][i].name, diff --git a/source/Tools/load_channel.cpp b/source/Tools/load_channel.cpp index 9954c6d..8351717 100644 --- a/source/Tools/load_channel.cpp +++ b/source/Tools/load_channel.cpp @@ -8,8 +8,6 @@ #include "filelist.h" using namespace std; -string HBC_version; - template s8 free_pointer(pointer*& ptr) { @@ -30,108 +28,6 @@ s8 free_pointer(pointer*& ptr) } } -char * DetectHBC_version(const tmd *t) -{ - static char desc[10]; - if (t->title_version) - snprintf(desc, sizeof(desc), "%d.%d", t->title_version >> 8, t->title_version & 0xFF); -/* if (t->sys_version) - snprintf(desc, sizeof(desc), "%s FW: IOS%llu ", desc, t->sys_version & 0xff); -*/ - return desc; -} - -u64 DetectHBC() -{ - u64 *list; - u32 titlecount; - s32 ret; - - vector TitleID; - TitleID.push_back(0x0001000148415858LL); //HAXX - TitleID.push_back(0x000100014A4F4449LL); //JODI - TitleID.push_back(0x00010001AF1BF516LL); //>=0.7 - - - ret = ES_GetNumTitles(&titlecount); - if(ret < 0) - { - printf("DetectHBC: ES_GetNumTitles Fehler\n"); - return 0; - } - - list = (u64*)memalign(32, titlecount * sizeof(u64) + 32); - - ret = ES_GetTitles(list, titlecount); - if(ret < 0) { - printf("DetectHBC: ES_GetTitles Error\n"); - free_pointer(list); - return 0; - } - ret = 0; - - //lets check for known HBC title id's. - for(u32 i=0; i=0.7 - { - if(ret < 3) - { - ret = 3; - HBC_version = DetectHBC_version((tmd *)SIGNATURE_PAYLOAD(s_tmd)); - } - } - } - free_pointer(list); - if(ret != 0) - return TitleID[ret -1]; - else - printf("ERROR_FIND_HBC\n"); - - return 0; -} - -void LoadHBC() -{ - u64 TitleID = DetectHBC(); - if(TitleID != 0) - { - u32 cnt ATTRIBUTE_ALIGN(32); - ES_GetNumTicketViews(TitleID, &cnt); - tikview *views = (tikview *)memalign( 32, sizeof(tikview)*cnt ); - ES_GetTicketViews(TitleID, views, cnt); - ES_LaunchTitle(TitleID, &views[0]); - } - else - { - //well that went wrong - printf("ERROR_BOOT_HBC\n"); - } - -} - bool CheckAppFound(u64 title) { @@ -152,20 +48,6 @@ bool CheckAppFound(u64 title) return false; } -u8 hbcStubAvailable() -{ - char * sig = (char *)0x80001804; - return ( - sig[0] == 'S' && - sig[1] == 'T' && - sig[2] == 'U' && - sig[3] == 'B' && - sig[4] == 'H' && - sig[5] == 'A' && - sig[6] == 'X' && - sig[7] == 'X') ? 1 : 0; -} - int DetectHBF() { u64 *list; @@ -214,15 +96,7 @@ int DetectHBF() } */ } free_pointer(list); - if(ret != 0) - { - memcpy((void*)0x80001800, stub_bin, stub_bin_size); - DCFlushRange((void*)0x80001800,stub_bin_size); - - hbcStubAvailable(); - return ret; - } - + return 0; } @@ -240,4 +114,4 @@ void LoadHBF() *(vu16*)0x800024D2 = 0x4630;//"F0"; } */ -} \ No newline at end of file +} diff --git a/source/Tools/load_channel.h b/source/Tools/load_channel.h index 751184d..87b27bf 100644 --- a/source/Tools/load_channel.h +++ b/source/Tools/load_channel.h @@ -1,6 +1 @@ - -extern string HBC_version; -u64 DetectHBC(); -void LoadHBC(); - void LoadHBF(); diff --git a/source/filelist.h b/source/filelist.h index 73e2796..b359548 100644 --- a/source/filelist.h +++ b/source/filelist.h @@ -269,9 +269,6 @@ extern const u32 edit_active_png_size; extern const u8 edit_inactive_png[]; extern const u32 edit_inactive_png_size; -extern const u8 hbc_icon_png[]; -extern const u32 hbc_icon_png_size; - extern const u8 recycle_bin_png[]; extern const u32 recycle_bin_png_size; diff --git a/source/main.cpp b/source/main.cpp index 96a94b2..e4222a4 100644 --- a/source/main.cpp +++ b/source/main.cpp @@ -159,6 +159,7 @@ DefaultOptions() int main(int argc, char *argv[]) { + SYS_SetResetCallback(WiiResetPressed); SYS_SetPowerCallback(WiiPowerPressed); WPAD_SetPowerButtonCallback(WiimotePowerPressed); @@ -229,16 +230,11 @@ main(int argc, char *argv[]) if(SelectedIOS() != IOS_GetVersion()) IOS_ReloadIOS(SelectedIOS()); - if(Settings.forwarder_path != "the homebrew channel") - { - if(strstr(Settings.forwarder_path.c_str(), ":/apps/") != 0) - BootHomebrew(); - else if(strstr(Settings.forwarder_path.c_str(), ":/gc_apps/") != 0) - BootGameCubeHomebrew(); - } - else - LoadHBC(); - } + if(strstr(Settings.forwarder_path.c_str(), ":/apps/") != 0) + BootHomebrew(); + else if(strstr(Settings.forwarder_path.c_str(), ":/gc_apps/") != 0) + BootGameCubeHomebrew(); + } else if(boot_buffer) BootHomebrew();