Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed yellow builds (int->long)

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5646 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jens Arnold 2005-01-24 01:39:24 +00:00
parent 81d4b8c492
commit 6baa55a8eb
4 changed files with 36 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
apps/debug_menu.c
View file

@ -502,9 +502,9 @@ bool dbg_partitions(void)
struct partinfo* p = disk_partinfo(partition); struct partinfo* p = disk_partinfo(partition);
lcd_clear_display(); lcd_clear_display();
snprintf(buf, sizeof buf, "P%d: S:%x", partition, p->start); snprintf(buf, sizeof buf, "P%d: S:%lx", partition, p->start);
lcd_puts(0, 0, buf); lcd_puts(0, 0, buf);
snprintf(buf, sizeof buf, "T:%x %d MB", p->type, p->size / 2048); snprintf(buf, sizeof buf, "T:%x %ld MB", p->type, p->size / 2048);
lcd_puts(0, 1, buf); lcd_puts(0, 1, buf);
lcd_update(); lcd_update();
@ -1031,7 +1031,7 @@ bool dbg_mas_info(void)
case 0: case 0:
mas_readmem(MAS_BANK_D1, 0xff7, &val, 1); mas_readmem(MAS_BANK_D1, 0xff7, &val, 1);
lcd_puts(0, 0, "Design Code"); lcd_puts(0, 0, "Design Code");
snprintf(buf, 32, "%05x ", val); snprintf(buf, 32, "%05lx ", val);
break; break;
case 1: case 1:
lcd_puts(0, 0, "DC/DC mode "); lcd_puts(0, 0, "DC/DC mode ");
@ -1064,72 +1064,72 @@ bool dbg_mas_info(void)
case 8: case 8:
mas_readmem(MAS_BANK_D0, MAS_D0_MPEG_FRAME_COUNT, &val, 1); mas_readmem(MAS_BANK_D0, MAS_D0_MPEG_FRAME_COUNT, &val, 1);
lcd_puts(0, 0, "Frame Count"); lcd_puts(0, 0, "Frame Count");
snprintf(buf, 32, "0/300: %04x", val & 0xffff); snprintf(buf, 32, "0/300: %04x", (unsigned int)(val & 0xffff));
break; break;
case 9: case 9:
mas_readmem(MAS_BANK_D0, MAS_D0_MPEG_STATUS_1, &val, 1); mas_readmem(MAS_BANK_D0, MAS_D0_MPEG_STATUS_1, &val, 1);
lcd_puts(0, 0, "Status1 "); lcd_puts(0, 0, "Status1 ");
snprintf(buf, 32, "0/301: %04x", val & 0xffff); snprintf(buf, 32, "0/301: %04x", (unsigned int)(val & 0xffff));
break; break;
case 10: case 10:
mas_readmem(MAS_BANK_D0, MAS_D0_MPEG_STATUS_2, &val, 1); mas_readmem(MAS_BANK_D0, MAS_D0_MPEG_STATUS_2, &val, 1);
lcd_puts(0, 0, "Status2 "); lcd_puts(0, 0, "Status2 ");
snprintf(buf, 32, "0/302: %04x", val & 0xffff); snprintf(buf, 32, "0/302: %04x", (unsigned int)(val & 0xffff));
break; break;
case 11: case 11:
mas_readmem(MAS_BANK_D0, MAS_D0_CRC_ERROR_COUNT, &val, 1); mas_readmem(MAS_BANK_D0, MAS_D0_CRC_ERROR_COUNT, &val, 1);
lcd_puts(0, 0, "CRC Count "); lcd_puts(0, 0, "CRC Count ");
snprintf(buf, 32, "0/303: %04x", val & 0xffff); snprintf(buf, 32, "0/303: %04x", (unsigned int)(val & 0xffff));
break; break;
case 12: case 12:
mas_readmem(MAS_BANK_D0, 0x36d, &val, 1); mas_readmem(MAS_BANK_D0, 0x36d, &val, 1);
lcd_puts(0, 0, "PLLOffset48"); lcd_puts(0, 0, "PLLOffset48");
snprintf(buf, 32, "0/36d %05x", val & 0xfffff); snprintf(buf, 32, "0/36d %05lx", val & 0xfffff);
break; break;
case 13: case 13:
mas_readmem(MAS_BANK_D0, 0x32d, &val, 1); mas_readmem(MAS_BANK_D0, 0x32d, &val, 1);
lcd_puts(0, 0, "PLLOffset48"); lcd_puts(0, 0, "PLLOffset48");
snprintf(buf, 32, "0/32d %05x", val & 0xfffff); snprintf(buf, 32, "0/32d %05lx", val & 0xfffff);
break; break;
case 14: case 14:
mas_readmem(MAS_BANK_D0, 0x36e, &val, 1); mas_readmem(MAS_BANK_D0, 0x36e, &val, 1);
lcd_puts(0, 0, "PLLOffset44"); lcd_puts(0, 0, "PLLOffset44");
snprintf(buf, 32, "0/36e %05x", val & 0xfffff); snprintf(buf, 32, "0/36e %05lx", val & 0xfffff);
break; break;
case 15: case 15:
mas_readmem(MAS_BANK_D0, 0x32e, &val, 1); mas_readmem(MAS_BANK_D0, 0x32e, &val, 1);
lcd_puts(0, 0, "PLLOffset44"); lcd_puts(0, 0, "PLLOffset44");
snprintf(buf, 32, "0/32e %05x", val & 0xfffff); snprintf(buf, 32, "0/32e %05lx", val & 0xfffff);
break; break;
case 16: case 16:
mas_readmem(MAS_BANK_D0, 0x36f, &val, 1); mas_readmem(MAS_BANK_D0, 0x36f, &val, 1);
lcd_puts(0, 0, "OutputConf "); lcd_puts(0, 0, "OutputConf ");
snprintf(buf, 32, "0/36f %05x", val & 0xfffff); snprintf(buf, 32, "0/36f %05lx", val & 0xfffff);
break; break;
case 17: case 17:
mas_readmem(MAS_BANK_D0, 0x32f, &val, 1); mas_readmem(MAS_BANK_D0, 0x32f, &val, 1);
lcd_puts(0, 0, "OutputConf "); lcd_puts(0, 0, "OutputConf ");
snprintf(buf, 32, "0/32f %05x", val & 0xfffff); snprintf(buf, 32, "0/32f %05lx", val & 0xfffff);
break; break;
case 18: case 18:
mas_readmem(MAS_BANK_D1, 0x7f8, &val, 1); mas_readmem(MAS_BANK_D1, 0x7f8, &val, 1);
lcd_puts(0, 0, "LL Gain "); lcd_puts(0, 0, "LL Gain ");
snprintf(buf, 32, "1/7f8 %05x", val & 0xfffff); snprintf(buf, 32, "1/7f8 %05lx", val & 0xfffff);
break; break;
case 19: case 19:
mas_readmem(MAS_BANK_D1, 0x7f9, &val, 1); mas_readmem(MAS_BANK_D1, 0x7f9, &val, 1);
lcd_puts(0, 0, "LR Gain "); lcd_puts(0, 0, "LR Gain ");
snprintf(buf, 32, "1/7f9 %05x", val & 0xfffff); snprintf(buf, 32, "1/7f9 %05lx", val & 0xfffff);
break; break;
case 20: case 20:
mas_readmem(MAS_BANK_D1, 0x7fa, &val, 1); mas_readmem(MAS_BANK_D1, 0x7fa, &val, 1);
lcd_puts(0, 0, "RL Gain "); lcd_puts(0, 0, "RL Gain ");
snprintf(buf, 32, "1/7fa %05x", val & 0xfffff); snprintf(buf, 32, "1/7fa %05lx", val & 0xfffff);
break; break;
case 21: case 21:
mas_readmem(MAS_BANK_D1, 0x7fb, &val, 1); mas_readmem(MAS_BANK_D1, 0x7fb, &val, 1);
lcd_puts(0, 0, "RR Gain "); lcd_puts(0, 0, "RR Gain ");
snprintf(buf, 32, "1/7fb %05x", val & 0xfffff); snprintf(buf, 32, "1/7fb %05lx", val & 0xfffff);
break; break;
case 22: case 22:
lcd_puts(0, 0, "L Trailbits"); lcd_puts(0, 0, "L Trailbits");
@ -1269,7 +1269,7 @@ static bool view_runtime(void)
#ifdef HAVE_MMC #ifdef HAVE_MMC
/* value is 10 * real value */ /* value is 10 * real value */
static unsigned char prep_value_unit(unsigned int *value, static unsigned char prep_value_unit(unsigned long *value,
const unsigned char *units) const unsigned char *units)
{ {
int unit_no = 0; int unit_no = 0;
@ -1286,7 +1286,7 @@ bool dbg_mmc_info(void)
{ {
bool done = false; bool done = false;
int currval = 0; int currval = 0;
unsigned int value; unsigned long value;
tCardInfo *card; tCardInfo *card;
unsigned char pbuf[32]; unsigned char pbuf[32];
unsigned char card_name[7]; unsigned char card_name[7];
@ -1315,23 +1315,23 @@ bool dbg_mmc_info(void)
{ {
strncpy(card_name, ((unsigned char*)card->cid) + 3, 6); strncpy(card_name, ((unsigned char*)card->cid) + 3, 6);
snprintf(pbuf, sizeof(pbuf), "%s Rev %d.%d", card_name, snprintf(pbuf, sizeof(pbuf), "%s Rev %d.%d", card_name,
mmc_extract_bits(card->cid, 72, 4), (int) mmc_extract_bits(card->cid, 72, 4),
mmc_extract_bits(card->cid, 76, 4)); (int) mmc_extract_bits(card->cid, 76, 4));
lcd_puts(0, 1, pbuf); lcd_puts(0, 1, pbuf);
snprintf(pbuf, sizeof(pbuf), "Prod: %d/%d", snprintf(pbuf, sizeof(pbuf), "Prod: %d/%d",
mmc_extract_bits(card->cid, 112, 4), (int) mmc_extract_bits(card->cid, 112, 4),
mmc_extract_bits(card->cid, 116, 4) + 1997); (int) mmc_extract_bits(card->cid, 116, 4) + 1997);
lcd_puts(0, 2, pbuf); lcd_puts(0, 2, pbuf);
snprintf(pbuf, sizeof(pbuf), "Ser#: 0x%08x", snprintf(pbuf, sizeof(pbuf), "Ser#: 0x%08lx",
mmc_extract_bits(card->cid, 80, 32)); mmc_extract_bits(card->cid, 80, 32));
lcd_puts(0, 3, pbuf); lcd_puts(0, 3, pbuf);
snprintf(pbuf, sizeof(pbuf), "M=%02x, O=%04x", snprintf(pbuf, sizeof(pbuf), "M=%02x, O=%04x",
mmc_extract_bits(card->cid, 0, 8), (int) mmc_extract_bits(card->cid, 0, 8),
mmc_extract_bits(card->cid, 8, 16)); (int) mmc_extract_bits(card->cid, 8, 16));
lcd_puts(0, 4, pbuf); lcd_puts(0, 4, pbuf);
value = mmc_extract_bits(card->csd, 54, 12) value = mmc_extract_bits(card->csd, 54, 12)
* (SECTOR_SIZE << (mmc_extract_bits(card->csd, 78, 3)+2)); * (SECTOR_SIZE << (mmc_extract_bits(card->csd, 78, 3)+2));
snprintf(pbuf, sizeof(pbuf), "Size: %d MB", snprintf(pbuf, sizeof(pbuf), "Size: %ld MB",
value / (1024*1024)); value / (1024*1024));
lcd_puts(0, 5, pbuf); lcd_puts(0, 5, pbuf);
} }
@ -1341,20 +1341,20 @@ bool dbg_mmc_info(void)
unit = prep_value_unit(&value, "kMG"); unit = prep_value_unit(&value, "kMG");
if (value < 100) if (value < 100)
snprintf(pbuf, sizeof(pbuf), "Speed: %d.%01d %cBit/s", snprintf(pbuf, sizeof(pbuf), "Speed: %d.%01d %cBit/s",
value / 10, value % 10, unit); (int)(value / 10), (int)(value % 10), unit);
else else
snprintf(pbuf, sizeof(pbuf), "Speed: %d %cBit/s", snprintf(pbuf, sizeof(pbuf), "Speed: %d %cBit/s",
value / 10, unit); (int)(value / 10), unit);
lcd_puts(0, 1, pbuf); lcd_puts(0, 1, pbuf);
value = card->tsac; value = card->tsac;
unit = prep_value_unit(&value, "nµm"); unit = prep_value_unit(&value, "nµm");
if (value < 100) if (value < 100)
snprintf(pbuf, sizeof(pbuf), "Tsac: %d.%01d %cs", snprintf(pbuf, sizeof(pbuf), "Tsac: %d.%01d %cs",
value / 10, value % 10, unit); (int)(value / 10), (int)(value % 10), unit);
else else
snprintf(pbuf, sizeof(pbuf), "Tsac: %d %cs", snprintf(pbuf, sizeof(pbuf), "Tsac: %d %cs",
value / 10, unit); (int)(value / 10), unit);
lcd_puts(0, 2, pbuf); lcd_puts(0, 2, pbuf);
snprintf(pbuf, sizeof(pbuf), "Nsac: %d clk", card->nsac); snprintf(pbuf, sizeof(pbuf), "Nsac: %d clk", card->nsac);
@ -1454,9 +1454,9 @@ static bool dbg_disk_info(void)
break; break;
case 3: { case 3: {
unsigned int free; unsigned long free;
fat_size( IF_MV2(0,) NULL, &free ); fat_size( IF_MV2(0,) NULL, &free );
snprintf(buf, sizeof buf, "%d MB", free / 1024 ); snprintf(buf, sizeof buf, "%ld MB", free / 1024 );
lcd_puts(0, y++, "Free"); lcd_puts(0, y++, "Free");
lcd_puts(0, y++, buf); lcd_puts(0, y++, buf);
break; break;

2
apps/main_menu.c
View file

@ -144,7 +144,7 @@ bool show_info(void)
bool done = false; bool done = false;
int key; int key;
int state = 1; int state = 1;
unsigned int size, free; unsigned long size, free;
fat_size( IF_MV2(0,) &size, &free ); fat_size( IF_MV2(0,) &size, &free );
size /= 1024; size /= 1024;

2
apps/plugin.h
View file

@ -174,7 +174,7 @@ struct plugin_api {
int (*remove)(const char* pathname); int (*remove)(const char* pathname);
int (*rename)(const char* path, const char* newname); int (*rename)(const char* path, const char* newname);
int (*ftruncate)(int fd, off_t length); int (*ftruncate)(int fd, off_t length);
int (*filesize)(int fd); long (*filesize)(int fd);
int (*fprintf)(int fd, const char *fmt, ...); int (*fprintf)(int fd, const char *fmt, ...);
int (*read_line)(int fd, char* buffer, int buffer_size); int (*read_line)(int fd, char* buffer, int buffer_size);
bool (*settings_parseline)(char* line, char** name, char** value); bool (*settings_parseline)(char* line, char** name, char** value);

2
apps/settings.c
View file

@ -1114,7 +1114,7 @@ static void save_cfg_table(const struct bit_entry* p_table, int count, int fd)
if (p_run->cfg_val == NULL) /* write as number */ if (p_run->cfg_val == NULL) /* write as number */
{ {
fprintf(fd, "%s: %d\r\n", p_run->cfg_name, value); fprintf(fd, "%s: %ld\r\n", p_run->cfg_name, value);
} }
else /* write as item */ else /* write as item */
{ {