From e16ebf1a50b9692e93f44633138903418ef93526 Mon Sep 17 00:00:00 2001
From: Linus Nielsen Feltzing <linus@haxx.se>
Date: Fri, 18 Nov 2005 14:55:51 +0000
Subject: Moved the power_init() call to main(), removed unfinished inits for
 the H300

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7964 a1c6a512-1295-4272-9138-f99709370657
---
 apps/main.c          | 14 +++++++++++---
 firmware/powermgmt.c |  2 --
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/apps/main.c b/apps/main.c
index d84aa25d0f..43ce9f48b6 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -186,7 +186,9 @@ void init(void)
     buffer_init();
 
     settings_reset();
-    
+
+    power_init();
+
     lcd_init();
 #ifdef HAVE_REMOTE_LCD
     lcd_remote_init();
@@ -205,7 +207,10 @@ void init(void)
 #endif
 #endif
 
+#ifndef IRIVER_H300_SERIES
+    /* Not yet done on H300 */
     i2c_init();
+#endif
 
 #ifdef HAVE_RTC
     rtc_init();
@@ -214,8 +219,10 @@ void init(void)
 
     adc_init();
     
+#ifndef IRIVER_H300_SERIES
     usb_init();
-    
+#endif
+
     backlight_init();
 
     button_init();
@@ -258,6 +265,7 @@ void init(void)
         panicf("ata: %d", rc);
     }
 
+#ifndef IRIVER_H300_SERIES
     usb_start_monitoring();
     while (usb_detect())
     {   /* enter USB mode early, before trying to mount */
@@ -274,7 +282,7 @@ void init(void)
             break;
 #endif
     }
-
+#endif
     if (!mounted)
     {
         rc = disk_mount_all();
diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c
index 6d6aba523e..dd2fc9ffd8 100644
--- a/firmware/powermgmt.c
+++ b/firmware/powermgmt.c
@@ -873,8 +873,6 @@ static void power_thread(void)
 
 void powermgmt_init(void)
 {
-    power_init();
-    
     /* init history to 0 */
     memset(power_history, 0x00, sizeof(power_history));
     
-- 
cgit v1.2.3