summaryrefslogtreecommitdiff
path: root/apps/main.c
diff options
context:
space:
mode:
authorLinus Nielsen Feltzing <linus@haxx.se>2002-06-10 14:44:15 +0000
committerLinus Nielsen Feltzing <linus@haxx.se>2002-06-10 14:44:15 +0000
commit8c00b4c6fb7ba1c48d984d7d816defb1c3d058aa (patch)
tree43d4dcf6a39e848ca75daea550eb59337a7cde87 /apps/main.c
parentbd711ee5becd0493f48095a88ec3e405939ec0f6 (diff)
downloadrockbox-8c00b4c6fb7ba1c48d984d7d816defb1c3d058aa.tar.gz
rockbox-8c00b4c6fb7ba1c48d984d7d816defb1c3d058aa.zip
Initializations done in the correct order
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@943 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/main.c')
-rw-r--r--apps/main.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/main.c b/apps/main.c
index 203d8ca64b..93353e5e62 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -69,16 +69,15 @@ int init(void)
69 struct partinfo* pinfo; 69 struct partinfo* pinfo;
70 70
71 system_init(); 71 system_init();
72 kernel_init();
72 73
73 dmalloc_initialize(); 74 dmalloc_initialize();
74 bmalloc_add_pool(poolstart, poolend-poolstart); 75 bmalloc_add_pool(poolstart, poolend-poolstart);
75 lcd_init(); 76 lcd_init();
76 show_logo();
77 77
78#ifdef DEBUG 78#ifdef DEBUG
79 debug_init(); 79 debug_init();
80#endif 80#endif
81 kernel_init();
82 set_irq_level(0); 81 set_irq_level(0);
83 82
84 rc = ata_init(); 83 rc = ata_init();
@@ -96,6 +95,8 @@ int init(void)
96 button_init(); 95 button_init();
97 mpeg_init(); 96 mpeg_init();
98 97
98 show_logo();
99
99 return 0; 100 return 0;
100} 101}
101 102