3 files changed, 269 insertions, 0 deletions

diff --git a/bootloader/SOURCES b/bootloader/SOURCES
index c1771ff24f..c54d1e16b1 100644
--- a/bootloader/SOURCES
+++ b/bootloader/SOURCES
@@ -31,6 +31,10 @@ mrobe500.c
 telechips.c
 #elif defined(MEIZU_M6SL)
 meizu_m6sl.c
+#elif defined(MEIZU_M6SP)
+meizu_m6sp.c
+#elif defined(MEIZU_M3)
+meizu_m3.c
 #elif defined(ONDA_VX747) || defined(ONDA_VX767)
 ondavx747.c
 #elif defined(CREATIVE_ZVx)
diff --git a/bootloader/meizu_m3.c b/bootloader/meizu_m3.c
new file mode 100644
index 0000000000..cc9fbab88d
--- /dev/null
+++ b/bootloader/meizu_m3.c
@@ -0,0 +1,142 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2006 by Greg White
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+#include "config.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include "inttypes.h"
+#include "string.h"
+#include "cpu.h"
+#include "system.h"
+#include "lcd.h"
+#include "kernel.h"
+#include "thread.h"
+#include "ata.h"
+#include "fat.h"
+#include "disk.h"
+#include "font.h"
+#include "adc.h"
+#include "backlight.h"
+#include "backlight-target.h"
+#include "button.h"
+#include "panic.h"
+#include "power.h"
+#include "file.h"
+#include "common.h"
+#include "rbunicode.h"
+#include "usb.h"
+#include "qt1106.h"
+
+#include <stdarg.h>
+
+char version[] = APPSVERSION;
+#define LONG_DELAY  200000
+#define SHORT_DELAY  50000
+#define PAUSE_DELAY  50000
+
+static inline void delay(int duration)
+{
+    volatile int i;
+    for(i=0;i<duration;i++);
+}
+
+
+void bl_debug(bool bit)
+{
+    if (bit)
+    {
+        PDAT0 ^= (1 << 2); //Toggle backlight
+        delay(LONG_DELAY);
+        PDAT0 ^= (1 << 2); //Toggle backlight
+        delay(LONG_DELAY);
+    }
+    else
+    {
+        PDAT0 ^= (1 << 2); //Toggle backlight
+        delay(SHORT_DELAY);
+        PDAT0 ^= (1 << 2); //Toggle backlight
+        delay(SHORT_DELAY);
+    }
+}
+
+void bl_debug_count(unsigned int input)
+{
+    unsigned int i;
+    delay(SHORT_DELAY*3);
+    for (i = 0; i < input; i++)
+    {
+        PDAT0 ^= (1 << 2); //Toggle backlight
+        delay(SHORT_DELAY);
+        PDAT0 ^= (1 << 2); //Toggle backlight
+        delay(2*SHORT_DELAY);
+    }
+}
+void bl_debug_int(unsigned int input,unsigned int count)
+{
+    unsigned int i;
+    for (i = 0; i < count; i++)
+    {
+        bl_debug(input>>i & 1);
+    }
+    delay(SHORT_DELAY*6);
+}
+
+void main(void)
+{
+    //Set backlight pin to output and enable
+    int oldval = PCON0;
+    PCON0 = ((oldval & ~(3 << 4)) | (1 << 4));
+    PDAT0 |= (1 << 2);
+
+    //Set PLAY to input
+    oldval = PCON1;
+    PCON1 = ((oldval & ~(0xf << 16)) | (0 << 16));
+
+    init_qt1106();
+
+    // Wait for play to be pressed
+    while(!(PDAT1 & (1 << 4)));
+    // Wait for play to be released
+    while((PDAT1 & (1 << 4)));
+    PDAT0 ^= (1 << 2); //Toggle backlight
+    delay(LONG_DELAY);
+
+    /* Calibrate the lot */
+    qt1106_io(QT1106_MODE_FREE | QT1106_MOD_INF | QT1106_DI \
+       | QT1106_SLD_SLIDER | QT1106_CAL_WHEEL | QT1106_CAL_KEYS | QT1106_RES_4);
+
+    /* Set to maximum sensitivity */
+    qt1106_io(QT1106_CT | (0x00 << 8) );
+
+    while(true)
+    {
+        qt1106_wait();
+
+        int slider = qt1106_io(QT1106_MODE_FREE | QT1106_MOD_INF \
+            | QT1106_DI | QT1106_SLD_SLIDER | QT1106_RES_4);
+        if(slider & 0x008000)
+            bl_debug_count(((slider&0xff)) + 1);
+    }
+
+    //power off
+    PDAT1&=~(1<<3);
+}
+
diff --git a/bootloader/meizu_m6sp.c b/bootloader/meizu_m6sp.c
new file mode 100644
index 0000000000..7608c9bd30
--- /dev/null
+++ b/bootloader/meizu_m6sp.c
@@ -0,0 +1,123 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2006 by Greg White
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+#include "config.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include "inttypes.h"
+#include "string.h"
+#include "cpu.h"
+#include "system.h"
+#include "lcd.h"
+#include "kernel.h"
+#include "thread.h"
+#include "ata.h"
+#include "fat.h"
+#include "disk.h"
+#include "font.h"
+#include "adc.h"
+#include "backlight.h"
+#include "backlight-target.h"
+#include "button.h"
+#include "panic.h"
+#include "power.h"
+#include "file.h"
+#include "common.h"
+#include "rbunicode.h"
+#include "usb.h"
+#include "qt1106.h"
+
+#include <stdarg.h>
+
+char version[] = APPSVERSION;
+#define LONG_DELAY  200000
+#define SHORT_DELAY  50000
+#define PAUSE_DELAY  50000
+
+static inline void delay(int duration)
+{
+    volatile int i;
+    for(i=0;i<duration;i++);
+}
+
+
+void bl_debug(bool bit)
+{
+    if (bit)
+    {
+        PDAT0 ^= (1 << 2); //Toggle backlight
+        delay(LONG_DELAY);
+        PDAT0 ^= (1 << 2); //Toggle backlight
+        delay(LONG_DELAY);
+    }
+    else
+    {
+        PDAT0 ^= (1 << 2); //Toggle backlight
+        delay(SHORT_DELAY);
+        PDAT0 ^= (1 << 2); //Toggle backlight
+        delay(SHORT_DELAY);
+    }
+}
+
+void bl_debug_count(unsigned int input)
+{
+    unsigned int i;
+    delay(SHORT_DELAY*3);
+    for (i = 0; i < input; i++)
+    {
+        PDAT0 ^= (1 << 2); //Toggle backlight
+        delay(SHORT_DELAY);
+        PDAT0 ^= (1 << 2); //Toggle backlight
+        delay(2*SHORT_DELAY);
+    }
+}
+void bl_debug_int(unsigned int input,unsigned int count)
+{
+    unsigned int i;
+    for (i = 0; i < count; i++)
+    {
+        bl_debug(input>>i & 1);
+    }
+    delay(SHORT_DELAY*6);
+}
+
+void main(void)
+{
+    //Set backlight pin to output and enable
+    int oldval = PCON0;
+    PCON0 = ((oldval & ~(3 << 4)) | (1 << 4));
+    PDAT0 |= (1 << 2);
+
+    //Set PLAY to input
+    oldval = PCON1;
+    PCON1 = ((oldval & ~(0xf << 16)) | (0 << 16));
+
+    // Wait for play to be pressed
+    while(!(PDAT1 & (1 << 4)));
+    // Wait for play to be released
+    while((PDAT1 & (1 << 4)));
+    PDAT0 ^= (1 << 2); //Toggle backlight
+    delay(LONG_DELAY);
+
+    //power off
+    PDAT1&=~(1<<3);
+}
+