From 94003362a49d50e11402e526aac8fbd24dd1890f Mon Sep 17 00:00:00 2001
From: Stefan `Sec` Zehl <sec@42.org>
Date: Mon, 13 Jun 2011 23:09:37 +0200
Subject: [PATCH] set USB_CONNECT high on bootup to not confuse usb host.

Also remove adcInit and pmuInit from main.c because systemInit already calls them.
---
 basic/basic.c | 3 +++
 basic/basic.h | 2 ++
 main.c        | 6 ------
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/basic/basic.c b/basic/basic.c
index 51d8e69..1c7e43d 100644
--- a/basic/basic.c
+++ b/basic/basic.c
@@ -10,6 +10,9 @@ void rbInit() {
     gpioSetDir(RB_PWR_GOOD, gpioDirection_Output);
     gpioSetValue (RB_PWR_GOOD, 0); 
 
+    // Disable USB Connect (we don't want USB by default)
+    gpioSetDir(USB_CONNECT, gpioDirection_Output);
+    gpioSetValue(USB_CONNECT, 1);
 
     // prepare buttons
     gpioSetDir(RB_BTN0, gpioDirection_Input);
diff --git a/basic/basic.h b/basic/basic.h
index 5c5c29a..c6ba32e 100644
--- a/basic/basic.h
+++ b/basic/basic.h
@@ -114,6 +114,8 @@
 
 #define RB_EEPROM_ADDR 		0xA0
 
+#define USB_CONNECT 0,6
+
 void rbInit(void);
 
 // reinvoke_isp.c
diff --git a/main.c b/main.c
index 1aa0d35..3ec1e8e 100644
--- a/main.c
+++ b/main.c
@@ -17,16 +17,10 @@ int main(void) {
     // Configure cpu and mandatory peripherals
     systemInit();
 
-    //enable clocks to adc and watchdog
-    pmuInit();
-
-
     // initialise basic badge functions
     rbInit();
   
     lcdInit(); // display
-  
-    adcInit();
 
     lcdFill(0);
     lcdDisplay(0);