merge a big part of the unofficial gigabeat cvs back. Includes working bootloader and rockbox with audio.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11850 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 6 insertions, 2 deletions

diff --git a/firmware/target/arm/gigabeat/meg-fx/wmcodec-meg-fx.c b/firmware/target/arm/gigabeat/meg-fx/wmcodec-meg-fx.c
index 3835ce6c05..fd023e1be0 100644
--- a/firmware/target/arm/gigabeat/meg-fx/wmcodec-meg-fx.c
+++ b/firmware/target/arm/gigabeat/meg-fx/wmcodec-meg-fx.c
@@ -36,7 +36,6 @@
 #include "file.h"
 #include "buffer.h"
 #include "audio.h"
-#include "i2s.h"
 #include "i2c.h"
 #include "i2c-meg-fx.h"
 /*
@@ -53,11 +52,16 @@ void i2s_reset(void)
 int audiohw_init(void) {
     /* reset I2C */
     i2c_init();
+    
+    /* GPC5 controls headphone output */
+    GPCCON &= ~(0x3 << 10);
+    GPCCON |= (1 << 10);
+    GPCDAT |= (1 << 5);
 
     return 0;
 }
 
 void wmcodec_write(int reg, int data)
 {
-    i2c_send(0x34, (reg<<1) | ((data&0x100)>>8),data&0xff);
+    i2c_send(0x34, (reg<<1) | ((data&0x100)>>8), data&0xff);
 }