diff options
Diffstat (limited to 'apps/settings.c')
-rw-r--r-- | apps/settings.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/apps/settings.c b/apps/settings.c index 4bda34b53b..6bc7e96dcf 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -82,7 +82,7 @@ const char rec_base_directory[] = REC_BASE_DIR; | |||
82 | #endif | 82 | #endif |
83 | 83 | ||
84 | long lasttime = 0; | 84 | long lasttime = 0; |
85 | static int config_sector = 0; /* mark uninitialized */ | 85 | static long config_sector = 0; /* mark uninitialized */ |
86 | static unsigned char config_block[CONFIG_BLOCK_SIZE]; | 86 | static unsigned char config_block[CONFIG_BLOCK_SIZE]; |
87 | 87 | ||
88 | 88 | ||
@@ -629,8 +629,9 @@ void settings_calc_config_sector(void) | |||
629 | #ifdef SIMULATOR | 629 | #ifdef SIMULATOR |
630 | config_sector = 61; | 630 | config_sector = 61; |
631 | #else | 631 | #else |
632 | int i, partition_start; | 632 | int i; |
633 | int sector = 0; | 633 | long partition_start; |
634 | long sector = 0; | ||
634 | 635 | ||
635 | if (fat_startsector(IF_MV(0)) != 0) /* There is a partition table */ | 636 | if (fat_startsector(IF_MV(0)) != 0) /* There is a partition table */ |
636 | { | 637 | { |
@@ -1333,7 +1334,7 @@ bool set_int(const char* string, | |||
1333 | bool done = false; | 1334 | bool done = false; |
1334 | int button; | 1335 | int button; |
1335 | int org_value=*variable; | 1336 | int org_value=*variable; |
1336 | int last_value = 0x7FFFFFFF; /* out of range init */ | 1337 | int last_value = __INT_MAX__; /* out of range init */ |
1337 | 1338 | ||
1338 | #ifdef HAVE_LCD_BITMAP | 1339 | #ifdef HAVE_LCD_BITMAP |
1339 | if(global_settings.statusbar) | 1340 | if(global_settings.statusbar) |
@@ -1538,7 +1539,7 @@ bool set_option(const char* string, void* variable, enum optiontype type, | |||
1538 | /* This array holds the record timer interval lengths, in seconds */ | 1539 | /* This array holds the record timer interval lengths, in seconds */ |
1539 | static const unsigned long rec_timer_seconds[] = | 1540 | static const unsigned long rec_timer_seconds[] = |
1540 | { | 1541 | { |
1541 | 24*60*60, /* OFF really means 24 hours, to avoid >2Gbyte files */ | 1542 | 24L*60*60, /* OFF really means 24 hours, to avoid >2Gbyte files */ |
1542 | 5*60, /* 00:05 */ | 1543 | 5*60, /* 00:05 */ |
1543 | 10*60, /* 00:10 */ | 1544 | 10*60, /* 00:10 */ |
1544 | 15*60, /* 00:15 */ | 1545 | 15*60, /* 00:15 */ |
@@ -1550,10 +1551,10 @@ static const unsigned long rec_timer_seconds[] = | |||
1550 | 4*60*60, /* 04:00 */ | 1551 | 4*60*60, /* 04:00 */ |
1551 | 6*60*60, /* 06:00 */ | 1552 | 6*60*60, /* 06:00 */ |
1552 | 8*60*60, /* 08:00 */ | 1553 | 8*60*60, /* 08:00 */ |
1553 | 10*60*60, /* 10:00 */ | 1554 | 10L*60*60, /* 10:00 */ |
1554 | 12*60*60, /* 12:00 */ | 1555 | 12L*60*60, /* 12:00 */ |
1555 | 18*60*60, /* 18:00 */ | 1556 | 18L*60*60, /* 18:00 */ |
1556 | 24*60*60 /* 24:00 */ | 1557 | 24L*60*60 /* 24:00 */ |
1557 | }; | 1558 | }; |
1558 | 1559 | ||
1559 | unsigned int rec_timesplit_seconds(void) | 1560 | unsigned int rec_timesplit_seconds(void) |