diff --git a/source/ui/section/action/deleteticket.c b/source/ui/section/action/deleteticket.c index b36abf5..c8e0d5a 100644 --- a/source/ui/section/action/deleteticket.c +++ b/source/ui/section/action/deleteticket.c @@ -20,7 +20,7 @@ static void action_delete_ticket_draw_top(ui_view* view, void* data, float x1, f static void action_delete_ticket_update(ui_view* view, void* data, float* progress, char* text) { delete_ticket_data* deleteData = (delete_ticket_data*) data; - Result res = AM_DeleteTicket(deleteData->info->ticketId); + Result res = AM_DeleteTicket(deleteData->info->titleId); ui_pop(); info_destroy(view); diff --git a/source/ui/section/action/installcdn.c b/source/ui/section/action/installcdn.c index b47d2af..43fe181 100644 --- a/source/ui/section/action/installcdn.c +++ b/source/ui/section/action/installcdn.c @@ -42,9 +42,9 @@ static Result action_install_cdn_open_src(void* data, u32 index, u32* handle) { if(context != NULL) { char url[256]; if(index == 0) { - snprintf(url, 256, "http://ccs.cdn.c.shop.nintendowifi.net/ccs/download/%016llX/tmd", installData->ticket->ticketId); + snprintf(url, 256, "http://ccs.cdn.c.shop.nintendowifi.net/ccs/download/%016llX/tmd", installData->ticket->titleId); } else { - snprintf(url, 256, "http://ccs.cdn.c.shop.nintendowifi.net/ccs/download/%016llX/%08lX", installData->ticket->ticketId, installData->contentIds[index - 1]); + snprintf(url, 256, "http://ccs.cdn.c.shop.nintendowifi.net/ccs/download/%016llX/%08lX", installData->ticket->titleId, installData->contentIds[index - 1]); } if(R_SUCCEEDED(res = httpcOpenContext(context, HTTPC_METHOD_GET, url, 1))) { @@ -171,9 +171,9 @@ static void action_install_cdn_update(ui_view* view, void* data, float* progress if(!installData->installInfo.premature) { if(R_SUCCEEDED(res = AM_InstallTitleFinish()) - && R_SUCCEEDED(res = AM_CommitImportTitles(((installData->ticket->ticketId >> 32) & 0x8010) != 0 ? MEDIATYPE_NAND : MEDIATYPE_SD, 1, false, &installData->ticket->ticketId))) { - if(installData->ticket->ticketId == 0x0004013800000002 || installData->ticket->ticketId == 0x0004013820000002) { - res = AM_InstallFirm(installData->ticket->ticketId); + && R_SUCCEEDED(res = AM_CommitImportTitles(((installData->ticket->titleId >> 32) & 0x8010) != 0 ? MEDIATYPE_NAND : MEDIATYPE_SD, 1, false, &installData->ticket->titleId))) { + if(installData->ticket->titleId == 0x0004013800000002 || installData->ticket->titleId == 0x0004013820000002) { + res = AM_InstallFirm(installData->ticket->titleId); } } } @@ -206,7 +206,7 @@ static void action_install_cdn_onresponse(ui_view* view, void* data, bool respon if(response) { u8 n3ds = false; - if(R_SUCCEEDED(APT_CheckNew3DS(&n3ds)) && !n3ds && ((installData->ticket->ticketId >> 28) & 0xF) == 2) { + if(R_SUCCEEDED(APT_CheckNew3DS(&n3ds)) && !n3ds && ((installData->ticket->titleId >> 28) & 0xF) == 2) { error_display(NULL, installData->ticket, ui_draw_ticket_info, "Failed to install CDN title.\nAttempted to install N3DS title to O3DS."); action_install_cdn_free_data(installData); @@ -214,16 +214,16 @@ static void action_install_cdn_onresponse(ui_view* view, void* data, bool respon return; } - FS_MediaType dest = ((installData->ticket->ticketId >> 32) & 0x8010) != 0 ? MEDIATYPE_NAND : MEDIATYPE_SD; + FS_MediaType dest = ((installData->ticket->titleId >> 32) & 0x8010) != 0 ? MEDIATYPE_NAND : MEDIATYPE_SD; - AM_DeleteTitle(dest, installData->ticket->ticketId); + AM_DeleteTitle(dest, installData->ticket->titleId); if(dest == MEDIATYPE_SD) { AM_QueryAvailableExternalTitleDatabase(NULL); } Result res = 0; - if(R_SUCCEEDED(res = AM_InstallTitleBegin(dest, installData->ticket->ticketId, false))) { + if(R_SUCCEEDED(res = AM_InstallTitleBegin(dest, installData->ticket->titleId, false))) { installData->cancelEvent = task_data_op(&installData->installInfo); if(installData->cancelEvent != 0) { info_display("Installing CDN Title", "Press B to cancel.", true, data, action_install_cdn_update, action_install_cdn_draw_top); diff --git a/source/ui/section/task/listfiles.c b/source/ui/section/task/listfiles.c index 9c56822..a8f1869 100644 --- a/source/ui/section/task/listfiles.c +++ b/source/ui/section/task/listfiles.c @@ -120,7 +120,7 @@ static void task_populate_files_thread(void* arg) { data->dir->containsTickets = true; fileInfo->isTicket = true; - fileInfo->ticketInfo.ticketId = __builtin_bswap64(titleId); + fileInfo->ticketInfo.titleId = __builtin_bswap64(titleId); } } } diff --git a/source/ui/section/task/listtickets.c b/source/ui/section/task/listtickets.c index 54bce2f..4f138a1 100644 --- a/source/ui/section/task/listtickets.c +++ b/source/ui/section/task/listtickets.c @@ -39,7 +39,7 @@ static void task_populate_tickets_thread(void* arg) { ticket_info* ticketInfo = (ticket_info*) calloc(1, sizeof(ticket_info)); if(ticketInfo != NULL) { - ticketInfo->ticketId = ticketIds[i]; + ticketInfo->titleId = ticketIds[i]; list_item* item = &data->items[*data->count]; snprintf(item->name, NAME_MAX, "%016llX", ticketIds[i]); diff --git a/source/ui/section/task/task.h b/source/ui/section/task/task.h index 2b61f5a..ea670d0 100644 --- a/source/ui/section/task/task.h +++ b/source/ui/section/task/task.h @@ -29,7 +29,7 @@ typedef struct { } pending_title_info; typedef struct { - u64 ticketId; + u64 titleId; } ticket_info; typedef struct { diff --git a/source/ui/ui.c b/source/ui/ui.c index b4cb80a..4e6853a 100644 --- a/source/ui/ui.c +++ b/source/ui/ui.c @@ -423,7 +423,7 @@ void ui_draw_file_info(ui_view* view, void* data, float x1, float y1, float x2, float installedSizeY = versionY + versionHeight + 2; screen_draw_string(buf, installedSizeX, installedSizeY, 0.5f, 0.5f, COLOR_TEXT, false); } else if(info->isTicket) { - snprintf(buf, 64, "Ticket ID: %016llX", info->ticketInfo.ticketId); + snprintf(buf, 64, "Ticket ID: %016llX", info->ticketInfo.titleId); float ticketIdWidth; float ticketIdHeight; @@ -503,7 +503,7 @@ void ui_draw_ticket_info(ui_view* view, void* data, float x1, float y1, float x2 char buf[64]; - snprintf(buf, 64, "Ticket ID: %016llX", info->ticketId); + snprintf(buf, 64, "Title ID: %016llX", info->titleId); float titleIdWidth; float titleIdHeight;