diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/gui/gwps.c | 4 | ||||
-rw-r--r-- | apps/main.c | 2 | ||||
-rw-r--r-- | apps/settings.c | 6 |
3 files changed, 7 insertions, 5 deletions
diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c index 6e0551745a..05c33a0568 100644 --- a/apps/gui/gwps.c +++ b/apps/gui/gwps.c | |||
@@ -135,7 +135,7 @@ long gui_wps_show(void) | |||
135 | about to shut down. lets save the settings. */ | 135 | about to shut down. lets save the settings. */ |
136 | if (wps_state.paused) { | 136 | if (wps_state.paused) { |
137 | settings_save(); | 137 | settings_save(); |
138 | #if !defined(HAVE_RTC) && !defined(HAVE_SW_POWEROFF) | 138 | #if !defined(HAVE_RTC_RAM) && !defined(HAVE_SW_POWEROFF) |
139 | ata_flush(); | 139 | ata_flush(); |
140 | #endif | 140 | #endif |
141 | } | 141 | } |
@@ -293,7 +293,7 @@ long gui_wps_show(void) | |||
293 | else | 293 | else |
294 | audio_pause(); | 294 | audio_pause(); |
295 | settings_save(); | 295 | settings_save(); |
296 | #if !defined(HAVE_RTC) && !defined(HAVE_SW_POWEROFF) | 296 | #if !defined(HAVE_RTC_RAM) && !defined(HAVE_SW_POWEROFF) |
297 | ata_flush(); /* make sure resume info is saved */ | 297 | ata_flush(); /* make sure resume info is saved */ |
298 | #endif | 298 | #endif |
299 | } | 299 | } |
diff --git a/apps/main.c b/apps/main.c index f11706ef93..94d6f70577 100644 --- a/apps/main.c +++ b/apps/main.c | |||
@@ -228,6 +228,8 @@ void init(void) | |||
228 | 228 | ||
229 | #ifdef HAVE_RTC | 229 | #ifdef HAVE_RTC |
230 | rtc_init(); | 230 | rtc_init(); |
231 | #endif | ||
232 | #ifdef HAVE_RTC_RAM | ||
231 | settings_load(SETTINGS_RTC); /* early load parts of global_settings */ | 233 | settings_load(SETTINGS_RTC); /* early load parts of global_settings */ |
232 | #endif | 234 | #endif |
233 | 235 | ||
diff --git a/apps/settings.c b/apps/settings.c index 49423ab629..edcef4a271 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -574,7 +574,7 @@ static void init_config_buffer( void ) | |||
574 | static int save_config_buffer( void ) | 574 | static int save_config_buffer( void ) |
575 | { | 575 | { |
576 | unsigned short chksum; | 576 | unsigned short chksum; |
577 | #ifdef HAVE_RTC | 577 | #ifdef HAVE_RTC_RAM |
578 | unsigned int i; | 578 | unsigned int i; |
579 | #endif | 579 | #endif |
580 | 580 | ||
@@ -583,7 +583,7 @@ static int save_config_buffer( void ) | |||
583 | config_block[ RTC_BLOCK_SIZE - 2 ] = chksum >> 8; | 583 | config_block[ RTC_BLOCK_SIZE - 2 ] = chksum >> 8; |
584 | config_block[ RTC_BLOCK_SIZE - 1 ] = chksum & 0xff; | 584 | config_block[ RTC_BLOCK_SIZE - 1 ] = chksum & 0xff; |
585 | 585 | ||
586 | #ifdef HAVE_RTC | 586 | #ifdef HAVE_RTC_RAM |
587 | /* FIXME: okay, it _would_ be cleaner and faster to implement rtc_write so | 587 | /* FIXME: okay, it _would_ be cleaner and faster to implement rtc_write so |
588 | that it would write a number of bytes at a time since the RTC chip | 588 | that it would write a number of bytes at a time since the RTC chip |
589 | supports that, but this will have to do for now 8-) */ | 589 | supports that, but this will have to do for now 8-) */ |
@@ -637,7 +637,7 @@ static int load_config_buffer(int which) | |||
637 | } | 637 | } |
638 | } | 638 | } |
639 | 639 | ||
640 | #ifdef HAVE_RTC | 640 | #ifdef HAVE_RTC_RAM |
641 | if(!correct) | 641 | if(!correct) |
642 | { | 642 | { |
643 | /* If the disk sector was incorrect, reinit the buffer */ | 643 | /* If the disk sector was incorrect, reinit the buffer */ |