diff options
Diffstat (limited to 'apps/main.c')
-rw-r--r-- | apps/main.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/apps/main.c b/apps/main.c index 816df5c10f..2062efa347 100644 --- a/apps/main.c +++ b/apps/main.c | |||
@@ -41,6 +41,7 @@ | |||
41 | #include "thread.h" | 41 | #include "thread.h" |
42 | #include "settings.h" | 42 | #include "settings.h" |
43 | #include "backlight.h" | 43 | #include "backlight.h" |
44 | #include "debug_menu.h" | ||
44 | 45 | ||
45 | #include "version.h" | 46 | #include "version.h" |
46 | 47 | ||
@@ -63,7 +64,7 @@ void init(void) | |||
63 | init_threads(); | 64 | init_threads(); |
64 | lcd_init(); | 65 | lcd_init(); |
65 | show_logo(); | 66 | show_logo(); |
66 | reset_settings(&global_settings); | 67 | settings_reset(); |
67 | sleep(HZ/2); | 68 | sleep(HZ/2); |
68 | } | 69 | } |
69 | 70 | ||
@@ -81,7 +82,7 @@ void init(void) | |||
81 | system_init(); | 82 | system_init(); |
82 | kernel_init(); | 83 | kernel_init(); |
83 | 84 | ||
84 | reset_settings(&global_settings); | 85 | settings_reset(); |
85 | 86 | ||
86 | dmalloc_initialize(); | 87 | dmalloc_initialize(); |
87 | bmalloc_add_pool(poolstart, poolend-poolstart); | 88 | bmalloc_add_pool(poolstart, poolend-poolstart); |
@@ -114,12 +115,12 @@ void init(void) | |||
114 | lcd_puts(0, 1, str); | 115 | lcd_puts(0, 1, str); |
115 | lcd_puts(0, 3, "Press ON to debug"); | 116 | lcd_puts(0, 3, "Press ON to debug"); |
116 | lcd_update(); | 117 | lcd_update(); |
117 | while(button_get(true) != BUTTON_ON) {}; | 118 | while(button_get(true) != BUTTON_ON); |
118 | dbg_ports(); | 119 | dbg_ports(); |
119 | #endif | 120 | #endif |
120 | panicf("ata: %d", rc); | 121 | panicf("ata: %d", rc); |
121 | } | 122 | } |
122 | 123 | ||
123 | pinfo = disk_init(); | 124 | pinfo = disk_init(); |
124 | if (!pinfo) | 125 | if (!pinfo) |
125 | panicf("disk: NULL"); | 126 | panicf("disk: NULL"); |
@@ -128,6 +129,10 @@ void init(void) | |||
128 | if(rc) | 129 | if(rc) |
129 | panicf("mount: %d",rc); | 130 | panicf("mount: %d",rc); |
130 | 131 | ||
132 | settings_load(); | ||
133 | global_settings.total_boots++; | ||
134 | settings_save(); | ||
135 | |||
131 | mpeg_init( global_settings.volume, | 136 | mpeg_init( global_settings.volume, |
132 | global_settings.bass, | 137 | global_settings.bass, |
133 | global_settings.treble ); | 138 | global_settings.treble ); |