diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/debug_menu.c | 66 | ||||
-rw-r--r-- | apps/main_menu.c | 2 | ||||
-rw-r--r-- | apps/plugin.h | 2 | ||||
-rw-r--r-- | apps/settings.c | 2 |
4 files changed, 36 insertions, 36 deletions
diff --git a/apps/debug_menu.c b/apps/debug_menu.c index 67eb287e6f..1c633200c2 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c | |||
@@ -502,9 +502,9 @@ bool dbg_partitions(void) | |||
502 | struct partinfo* p = disk_partinfo(partition); | 502 | struct partinfo* p = disk_partinfo(partition); |
503 | 503 | ||
504 | lcd_clear_display(); | 504 | lcd_clear_display(); |
505 | snprintf(buf, sizeof buf, "P%d: S:%x", partition, p->start); | 505 | snprintf(buf, sizeof buf, "P%d: S:%lx", partition, p->start); |
506 | lcd_puts(0, 0, buf); | 506 | lcd_puts(0, 0, buf); |
507 | snprintf(buf, sizeof buf, "T:%x %d MB", p->type, p->size / 2048); | 507 | snprintf(buf, sizeof buf, "T:%x %ld MB", p->type, p->size / 2048); |
508 | lcd_puts(0, 1, buf); | 508 | lcd_puts(0, 1, buf); |
509 | lcd_update(); | 509 | lcd_update(); |
510 | 510 | ||
@@ -1031,7 +1031,7 @@ bool dbg_mas_info(void) | |||
1031 | case 0: | 1031 | case 0: |
1032 | mas_readmem(MAS_BANK_D1, 0xff7, &val, 1); | 1032 | mas_readmem(MAS_BANK_D1, 0xff7, &val, 1); |
1033 | lcd_puts(0, 0, "Design Code"); | 1033 | lcd_puts(0, 0, "Design Code"); |
1034 | snprintf(buf, 32, "%05x ", val); | 1034 | snprintf(buf, 32, "%05lx ", val); |
1035 | break; | 1035 | break; |
1036 | case 1: | 1036 | case 1: |
1037 | lcd_puts(0, 0, "DC/DC mode "); | 1037 | lcd_puts(0, 0, "DC/DC mode "); |
@@ -1064,72 +1064,72 @@ bool dbg_mas_info(void) | |||
1064 | case 8: | 1064 | case 8: |
1065 | mas_readmem(MAS_BANK_D0, MAS_D0_MPEG_FRAME_COUNT, &val, 1); | 1065 | mas_readmem(MAS_BANK_D0, MAS_D0_MPEG_FRAME_COUNT, &val, 1); |
1066 | lcd_puts(0, 0, "Frame Count"); | 1066 | lcd_puts(0, 0, "Frame Count"); |
1067 | snprintf(buf, 32, "0/300: %04x", val & 0xffff); | 1067 | snprintf(buf, 32, "0/300: %04x", (unsigned int)(val & 0xffff)); |
1068 | break; | 1068 | break; |
1069 | case 9: | 1069 | case 9: |
1070 | mas_readmem(MAS_BANK_D0, MAS_D0_MPEG_STATUS_1, &val, 1); | 1070 | mas_readmem(MAS_BANK_D0, MAS_D0_MPEG_STATUS_1, &val, 1); |
1071 | lcd_puts(0, 0, "Status1 "); | 1071 | lcd_puts(0, 0, "Status1 "); |
1072 | snprintf(buf, 32, "0/301: %04x", val & 0xffff); | 1072 | snprintf(buf, 32, "0/301: %04x", (unsigned int)(val & 0xffff)); |
1073 | break; | 1073 | break; |
1074 | case 10: | 1074 | case 10: |
1075 | mas_readmem(MAS_BANK_D0, MAS_D0_MPEG_STATUS_2, &val, 1); | 1075 | mas_readmem(MAS_BANK_D0, MAS_D0_MPEG_STATUS_2, &val, 1); |
1076 | lcd_puts(0, 0, "Status2 "); | 1076 | lcd_puts(0, 0, "Status2 "); |
1077 | snprintf(buf, 32, "0/302: %04x", val & 0xffff); | 1077 | snprintf(buf, 32, "0/302: %04x", (unsigned int)(val & 0xffff)); |
1078 | break; | 1078 | break; |
1079 | case 11: | 1079 | case 11: |
1080 | mas_readmem(MAS_BANK_D0, MAS_D0_CRC_ERROR_COUNT, &val, 1); | 1080 | mas_readmem(MAS_BANK_D0, MAS_D0_CRC_ERROR_COUNT, &val, 1); |
1081 | lcd_puts(0, 0, "CRC Count "); | 1081 | lcd_puts(0, 0, "CRC Count "); |
1082 | snprintf(buf, 32, "0/303: %04x", val & 0xffff); | 1082 | snprintf(buf, 32, "0/303: %04x", (unsigned int)(val & 0xffff)); |
1083 | break; | 1083 | break; |
1084 | case 12: | 1084 | case 12: |
1085 | mas_readmem(MAS_BANK_D0, 0x36d, &val, 1); | 1085 | mas_readmem(MAS_BANK_D0, 0x36d, &val, 1); |
1086 | lcd_puts(0, 0, "PLLOffset48"); | 1086 | lcd_puts(0, 0, "PLLOffset48"); |
1087 | snprintf(buf, 32, "0/36d %05x", val & 0xfffff); | 1087 | snprintf(buf, 32, "0/36d %05lx", val & 0xfffff); |
1088 | break; | 1088 | break; |
1089 | case 13: | 1089 | case 13: |
1090 | mas_readmem(MAS_BANK_D0, 0x32d, &val, 1); | 1090 | mas_readmem(MAS_BANK_D0, 0x32d, &val, 1); |
1091 | lcd_puts(0, 0, "PLLOffset48"); | 1091 | lcd_puts(0, 0, "PLLOffset48"); |
1092 | snprintf(buf, 32, "0/32d %05x", val & 0xfffff); | 1092 | snprintf(buf, 32, "0/32d %05lx", val & 0xfffff); |
1093 | break; | 1093 | break; |
1094 | case 14: | 1094 | case 14: |
1095 | mas_readmem(MAS_BANK_D0, 0x36e, &val, 1); | 1095 | mas_readmem(MAS_BANK_D0, 0x36e, &val, 1); |
1096 | lcd_puts(0, 0, "PLLOffset44"); | 1096 | lcd_puts(0, 0, "PLLOffset44"); |
1097 | snprintf(buf, 32, "0/36e %05x", val & 0xfffff); | 1097 | snprintf(buf, 32, "0/36e %05lx", val & 0xfffff); |
1098 | break; | 1098 | break; |
1099 | case 15: | 1099 | case 15: |
1100 | mas_readmem(MAS_BANK_D0, 0x32e, &val, 1); | 1100 | mas_readmem(MAS_BANK_D0, 0x32e, &val, 1); |
1101 | lcd_puts(0, 0, "PLLOffset44"); | 1101 | lcd_puts(0, 0, "PLLOffset44"); |
1102 | snprintf(buf, 32, "0/32e %05x", val & 0xfffff); | 1102 | snprintf(buf, 32, "0/32e %05lx", val & 0xfffff); |
1103 | break; | 1103 | break; |
1104 | case 16: | 1104 | case 16: |
1105 | mas_readmem(MAS_BANK_D0, 0x36f, &val, 1); | 1105 | mas_readmem(MAS_BANK_D0, 0x36f, &val, 1); |
1106 | lcd_puts(0, 0, "OutputConf "); | 1106 | lcd_puts(0, 0, "OutputConf "); |
1107 | snprintf(buf, 32, "0/36f %05x", val & 0xfffff); | 1107 | snprintf(buf, 32, "0/36f %05lx", val & 0xfffff); |
1108 | break; | 1108 | break; |
1109 | case 17: | 1109 | case 17: |
1110 | mas_readmem(MAS_BANK_D0, 0x32f, &val, 1); | 1110 | mas_readmem(MAS_BANK_D0, 0x32f, &val, 1); |
1111 | lcd_puts(0, 0, "OutputConf "); | 1111 | lcd_puts(0, 0, "OutputConf "); |
1112 | snprintf(buf, 32, "0/32f %05x", val & 0xfffff); | 1112 | snprintf(buf, 32, "0/32f %05lx", val & 0xfffff); |
1113 | break; | 1113 | break; |
1114 | case 18: | 1114 | case 18: |
1115 | mas_readmem(MAS_BANK_D1, 0x7f8, &val, 1); | 1115 | mas_readmem(MAS_BANK_D1, 0x7f8, &val, 1); |
1116 | lcd_puts(0, 0, "LL Gain "); | 1116 | lcd_puts(0, 0, "LL Gain "); |
1117 | snprintf(buf, 32, "1/7f8 %05x", val & 0xfffff); | 1117 | snprintf(buf, 32, "1/7f8 %05lx", val & 0xfffff); |
1118 | break; | 1118 | break; |
1119 | case 19: | 1119 | case 19: |
1120 | mas_readmem(MAS_BANK_D1, 0x7f9, &val, 1); | 1120 | mas_readmem(MAS_BANK_D1, 0x7f9, &val, 1); |
1121 | lcd_puts(0, 0, "LR Gain "); | 1121 | lcd_puts(0, 0, "LR Gain "); |
1122 | snprintf(buf, 32, "1/7f9 %05x", val & 0xfffff); | 1122 | snprintf(buf, 32, "1/7f9 %05lx", val & 0xfffff); |
1123 | break; | 1123 | break; |
1124 | case 20: | 1124 | case 20: |
1125 | mas_readmem(MAS_BANK_D1, 0x7fa, &val, 1); | 1125 | mas_readmem(MAS_BANK_D1, 0x7fa, &val, 1); |
1126 | lcd_puts(0, 0, "RL Gain "); | 1126 | lcd_puts(0, 0, "RL Gain "); |
1127 | snprintf(buf, 32, "1/7fa %05x", val & 0xfffff); | 1127 | snprintf(buf, 32, "1/7fa %05lx", val & 0xfffff); |
1128 | break; | 1128 | break; |
1129 | case 21: | 1129 | case 21: |
1130 | mas_readmem(MAS_BANK_D1, 0x7fb, &val, 1); | 1130 | mas_readmem(MAS_BANK_D1, 0x7fb, &val, 1); |
1131 | lcd_puts(0, 0, "RR Gain "); | 1131 | lcd_puts(0, 0, "RR Gain "); |
1132 | snprintf(buf, 32, "1/7fb %05x", val & 0xfffff); | 1132 | snprintf(buf, 32, "1/7fb %05lx", val & 0xfffff); |
1133 | break; | 1133 | break; |
1134 | case 22: | 1134 | case 22: |
1135 | lcd_puts(0, 0, "L Trailbits"); | 1135 | lcd_puts(0, 0, "L Trailbits"); |
@@ -1269,7 +1269,7 @@ static bool view_runtime(void) | |||
1269 | 1269 | ||
1270 | #ifdef HAVE_MMC | 1270 | #ifdef HAVE_MMC |
1271 | /* value is 10 * real value */ | 1271 | /* value is 10 * real value */ |
1272 | static unsigned char prep_value_unit(unsigned int *value, | 1272 | static unsigned char prep_value_unit(unsigned long *value, |
1273 | const unsigned char *units) | 1273 | const unsigned char *units) |
1274 | { | 1274 | { |
1275 | int unit_no = 0; | 1275 | int unit_no = 0; |
@@ -1286,7 +1286,7 @@ bool dbg_mmc_info(void) | |||
1286 | { | 1286 | { |
1287 | bool done = false; | 1287 | bool done = false; |
1288 | int currval = 0; | 1288 | int currval = 0; |
1289 | unsigned int value; | 1289 | unsigned long value; |
1290 | tCardInfo *card; | 1290 | tCardInfo *card; |
1291 | unsigned char pbuf[32]; | 1291 | unsigned char pbuf[32]; |
1292 | unsigned char card_name[7]; | 1292 | unsigned char card_name[7]; |
@@ -1315,23 +1315,23 @@ bool dbg_mmc_info(void) | |||
1315 | { | 1315 | { |
1316 | strncpy(card_name, ((unsigned char*)card->cid) + 3, 6); | 1316 | strncpy(card_name, ((unsigned char*)card->cid) + 3, 6); |
1317 | snprintf(pbuf, sizeof(pbuf), "%s Rev %d.%d", card_name, | 1317 | snprintf(pbuf, sizeof(pbuf), "%s Rev %d.%d", card_name, |
1318 | mmc_extract_bits(card->cid, 72, 4), | 1318 | (int) mmc_extract_bits(card->cid, 72, 4), |
1319 | mmc_extract_bits(card->cid, 76, 4)); | 1319 | (int) mmc_extract_bits(card->cid, 76, 4)); |
1320 | lcd_puts(0, 1, pbuf); | 1320 | lcd_puts(0, 1, pbuf); |
1321 | snprintf(pbuf, sizeof(pbuf), "Prod: %d/%d", | 1321 | snprintf(pbuf, sizeof(pbuf), "Prod: %d/%d", |
1322 | mmc_extract_bits(card->cid, 112, 4), | 1322 | (int) mmc_extract_bits(card->cid, 112, 4), |
1323 | mmc_extract_bits(card->cid, 116, 4) + 1997); | 1323 | (int) mmc_extract_bits(card->cid, 116, 4) + 1997); |
1324 | lcd_puts(0, 2, pbuf); | 1324 | lcd_puts(0, 2, pbuf); |
1325 | snprintf(pbuf, sizeof(pbuf), "Ser#: 0x%08x", | 1325 | snprintf(pbuf, sizeof(pbuf), "Ser#: 0x%08lx", |
1326 | mmc_extract_bits(card->cid, 80, 32)); | 1326 | mmc_extract_bits(card->cid, 80, 32)); |
1327 | lcd_puts(0, 3, pbuf); | 1327 | lcd_puts(0, 3, pbuf); |
1328 | snprintf(pbuf, sizeof(pbuf), "M=%02x, O=%04x", | 1328 | snprintf(pbuf, sizeof(pbuf), "M=%02x, O=%04x", |
1329 | mmc_extract_bits(card->cid, 0, 8), | 1329 | (int) mmc_extract_bits(card->cid, 0, 8), |
1330 | mmc_extract_bits(card->cid, 8, 16)); | 1330 | (int) mmc_extract_bits(card->cid, 8, 16)); |
1331 | lcd_puts(0, 4, pbuf); | 1331 | lcd_puts(0, 4, pbuf); |
1332 | value = mmc_extract_bits(card->csd, 54, 12) | 1332 | value = mmc_extract_bits(card->csd, 54, 12) |
1333 | * (SECTOR_SIZE << (mmc_extract_bits(card->csd, 78, 3)+2)); | 1333 | * (SECTOR_SIZE << (mmc_extract_bits(card->csd, 78, 3)+2)); |
1334 | snprintf(pbuf, sizeof(pbuf), "Size: %d MB", | 1334 | snprintf(pbuf, sizeof(pbuf), "Size: %ld MB", |
1335 | value / (1024*1024)); | 1335 | value / (1024*1024)); |
1336 | lcd_puts(0, 5, pbuf); | 1336 | lcd_puts(0, 5, pbuf); |
1337 | } | 1337 | } |
@@ -1341,20 +1341,20 @@ bool dbg_mmc_info(void) | |||
1341 | unit = prep_value_unit(&value, "kMG"); | 1341 | unit = prep_value_unit(&value, "kMG"); |
1342 | if (value < 100) | 1342 | if (value < 100) |
1343 | snprintf(pbuf, sizeof(pbuf), "Speed: %d.%01d %cBit/s", | 1343 | snprintf(pbuf, sizeof(pbuf), "Speed: %d.%01d %cBit/s", |
1344 | value / 10, value % 10, unit); | 1344 | (int)(value / 10), (int)(value % 10), unit); |
1345 | else | 1345 | else |
1346 | snprintf(pbuf, sizeof(pbuf), "Speed: %d %cBit/s", | 1346 | snprintf(pbuf, sizeof(pbuf), "Speed: %d %cBit/s", |
1347 | value / 10, unit); | 1347 | (int)(value / 10), unit); |
1348 | lcd_puts(0, 1, pbuf); | 1348 | lcd_puts(0, 1, pbuf); |
1349 | 1349 | ||
1350 | value = card->tsac; | 1350 | value = card->tsac; |
1351 | unit = prep_value_unit(&value, "nµm"); | 1351 | unit = prep_value_unit(&value, "nµm"); |
1352 | if (value < 100) | 1352 | if (value < 100) |
1353 | snprintf(pbuf, sizeof(pbuf), "Tsac: %d.%01d %cs", | 1353 | snprintf(pbuf, sizeof(pbuf), "Tsac: %d.%01d %cs", |
1354 | value / 10, value % 10, unit); | 1354 | (int)(value / 10), (int)(value % 10), unit); |
1355 | else | 1355 | else |
1356 | snprintf(pbuf, sizeof(pbuf), "Tsac: %d %cs", | 1356 | snprintf(pbuf, sizeof(pbuf), "Tsac: %d %cs", |
1357 | value / 10, unit); | 1357 | (int)(value / 10), unit); |
1358 | lcd_puts(0, 2, pbuf); | 1358 | lcd_puts(0, 2, pbuf); |
1359 | 1359 | ||
1360 | snprintf(pbuf, sizeof(pbuf), "Nsac: %d clk", card->nsac); | 1360 | snprintf(pbuf, sizeof(pbuf), "Nsac: %d clk", card->nsac); |
@@ -1454,9 +1454,9 @@ static bool dbg_disk_info(void) | |||
1454 | break; | 1454 | break; |
1455 | 1455 | ||
1456 | case 3: { | 1456 | case 3: { |
1457 | unsigned int free; | 1457 | unsigned long free; |
1458 | fat_size( IF_MV2(0,) NULL, &free ); | 1458 | fat_size( IF_MV2(0,) NULL, &free ); |
1459 | snprintf(buf, sizeof buf, "%d MB", free / 1024 ); | 1459 | snprintf(buf, sizeof buf, "%ld MB", free / 1024 ); |
1460 | lcd_puts(0, y++, "Free"); | 1460 | lcd_puts(0, y++, "Free"); |
1461 | lcd_puts(0, y++, buf); | 1461 | lcd_puts(0, y++, buf); |
1462 | break; | 1462 | break; |
diff --git a/apps/main_menu.c b/apps/main_menu.c index 68e2a03048..3aef6264f9 100644 --- a/apps/main_menu.c +++ b/apps/main_menu.c | |||
@@ -144,7 +144,7 @@ bool show_info(void) | |||
144 | bool done = false; | 144 | bool done = false; |
145 | int key; | 145 | int key; |
146 | int state = 1; | 146 | int state = 1; |
147 | unsigned int size, free; | 147 | unsigned long size, free; |
148 | 148 | ||
149 | fat_size( IF_MV2(0,) &size, &free ); | 149 | fat_size( IF_MV2(0,) &size, &free ); |
150 | size /= 1024; | 150 | size /= 1024; |
diff --git a/apps/plugin.h b/apps/plugin.h index 89b9d290d5..380fa24c33 100644 --- a/apps/plugin.h +++ b/apps/plugin.h | |||
@@ -174,7 +174,7 @@ struct plugin_api { | |||
174 | int (*remove)(const char* pathname); | 174 | int (*remove)(const char* pathname); |
175 | int (*rename)(const char* path, const char* newname); | 175 | int (*rename)(const char* path, const char* newname); |
176 | int (*ftruncate)(int fd, off_t length); | 176 | int (*ftruncate)(int fd, off_t length); |
177 | int (*filesize)(int fd); | 177 | long (*filesize)(int fd); |
178 | int (*fprintf)(int fd, const char *fmt, ...); | 178 | int (*fprintf)(int fd, const char *fmt, ...); |
179 | int (*read_line)(int fd, char* buffer, int buffer_size); | 179 | int (*read_line)(int fd, char* buffer, int buffer_size); |
180 | bool (*settings_parseline)(char* line, char** name, char** value); | 180 | bool (*settings_parseline)(char* line, char** name, char** value); |
diff --git a/apps/settings.c b/apps/settings.c index 00ea560b40..0a369a49f0 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -1114,7 +1114,7 @@ static void save_cfg_table(const struct bit_entry* p_table, int count, int fd) | |||
1114 | 1114 | ||
1115 | if (p_run->cfg_val == NULL) /* write as number */ | 1115 | if (p_run->cfg_val == NULL) /* write as number */ |
1116 | { | 1116 | { |
1117 | fprintf(fd, "%s: %d\r\n", p_run->cfg_name, value); | 1117 | fprintf(fd, "%s: %ld\r\n", p_run->cfg_name, value); |
1118 | } | 1118 | } |
1119 | else /* write as item */ | 1119 | else /* write as item */ |
1120 | { | 1120 | { |