The-Homebrew-Cloud/usbloadergx
2
0
Fork 0
mirror of https://github.com/wiidev/usbloadergx.git synced 2024-12-19 00:11:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Small change in install again.

Browse Source
This commit is contained in:
dimok321 2009-05-20 19:51:28 +00:00
parent f4df20c9c3
commit b98baef239
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/libwbfs/libwbfs.c
View File

@ -4,6 +4,7 @@
#include "libwbfs.h" #include "libwbfs.h"
#include <time.h>
#define likely(x) __builtin_expect(!!(x), 1) #define likely(x) __builtin_expect(!!(x), 1)
#define unlikely(x) __builtin_expect(!!(x), 0) #define unlikely(x) __builtin_expect(!!(x), 0)
@ -405,6 +406,8 @@ u32 wbfs_add_disc(wbfs_t*p,read_wiidisc_callback_t read_src_wii_disc,
wbfs_disc_info_t *info = 0; wbfs_disc_info_t *info = 0;
u8* copy_buffer = 0; u8* copy_buffer = 0;
used = wbfs_malloc(p->n_wii_sec_per_disc); used = wbfs_malloc(p->n_wii_sec_per_disc);
time_t last_time = 0;
time_t time_now = 0;
if(!used) if(!used)
ERROR("unable to alloc memory"); ERROR("unable to alloc memory");
if(!copy_1_1) if(!copy_1_1)
@ -461,8 +464,17 @@ u32 wbfs_add_disc(wbfs_t*p,read_wiidisc_callback_t read_src_wii_disc,
p->write_hdsector(p->callback_data,p->part_lba+bl*(p->wbfs_sec_sz/p->hd_sec_sz)+j*(p->wii_sec_sz/p->hd_sec_sz), p->write_hdsector(p->callback_data,p->part_lba+bl*(p->wbfs_sec_sz/p->hd_sec_sz)+j*(p->wii_sec_sz/p->hd_sec_sz),
p->wii_sec_sz/p->hd_sec_sz,copy_buffer); p->wii_sec_sz/p->hd_sec_sz,copy_buffer);
cur++; cur++;
if(spinner) }
if(spinner) {
if(last_time == 0)
time(&last_time);
time(&time_now);
/* Update that crap only every 0.5 secs */
if (difftime(time_now,last_time) > 0.5) {
spinner(cur,tot); spinner(cur,tot);
last_time = 0;
}
} }
} }
info->wlba_table[i] = wbfs_htons(bl); info->wlba_table[i] = wbfs_htons(bl);

13
source/menu.cpp
View File

@ -1705,8 +1705,6 @@ ShowProgress (s32 done, s32 total)
static u32 expected; static u32 expected;
u32 d, h, m, s; u32 d, h, m, s;
static time_t last_time;
time_t time_now = 0;
//first time //first time
if (!done) { if (!done) {
@ -1731,14 +1729,6 @@ ShowProgress (s32 done, s32 total)
m = (d / 60) % 60; m = (d / 60) % 60;
s = d % 60; s = d % 60;
if(last_time == 0)
time(&last_time);
time(&time_now);
/** Update that crap only every 0.5 secs **/
if (difftime(time_now,last_time) > 0.5) {
//Calculate percentage/size //Calculate percentage/size
f32 percent = (done * 100.0) / total; f32 percent = (done * 100.0) / total;
@ -1757,9 +1747,6 @@ ShowProgress (s32 done, s32 total)
progressbarImg.SetTile((int)(80*done/total));} progressbarImg.SetTile((int)(80*done/total));}
else {progressbarImg.SetTile((int)(100*done/total));} else {progressbarImg.SetTile((int)(100*done/total));}
last_time = 0;
}
} }
/**************************************************************************** /****************************************************************************