Meizu M6SP: add stubs so the meizu m6sp binary compiles and links

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

apps/SOURCES

@@ -231,6 +231,8 @@ keymaps/keymap-mr100.c
 keymaps/keymap-cowond2.c
 #elif CONFIG_KEYPAD == MEIZU_M6SL_PAD
 keymaps/keymap-meizu-m6sl.c
+#elif CONFIG_KEYPAD == MEIZU_M6SP_PAD
+keymaps/keymap-meizu-m6sp.c
 #elif CONFIG_KEYPAD == CREATIVEZVM_PAD
 keymaps/keymap-creativezvm.c
 #elif CONFIG_KEYPAD == CREATIVEZV_PAD

apps/keymaps/keymap-meizu-m6sp.c

@@ -0,0 +1,76 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2006 Jonathan Gordon
+ *
+ * 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.
+ *
+ ****************************************************************************/
+
+/* Button Code Definitions for the toshiba gigabeat target */
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "config.h"
+#include "action.h"
+#include "button.h"
+#include "settings.h"
+
+/*
+ * The format of the list is as follows
+ * { Action Code,   Button code,    Prereq button code }
+ * if there's no need to check the previous button's value, use BUTTON_NONE
+ * Insert LAST_ITEM_IN_LIST at the end of each mapping
+ */
+
+/* CONTEXT_CUSTOM's used in this file...
+
+CONTEXT_CUSTOM|CONTEXT_TREE = the standard list/tree defines (without directions)
+CONTEXT_CUSTOM|CONTEXT_SETTINGS = the direction keys for the eq/col picker screens
+                                  i.e where up/down is inc/dec
+               CONTEXT_SETTINGS = up/down is prev/next, l/r is inc/dec
+
+*/
+
+/* copied from Meizu M6SP keymap */
+static const struct button_mapping button_context_standard[]  = {
+#if 0 /* disabled for now, there is no BUTTON_UP/DOWN yet */
+    { ACTION_STD_PREV,          BUTTON_UP,                  BUTTON_NONE },
+    { ACTION_STD_PREVREPEAT,    BUTTON_UP|BUTTON_REPEAT,    BUTTON_NONE },
+    { ACTION_STD_NEXT,          BUTTON_DOWN,                BUTTON_NONE },
+    { ACTION_STD_NEXTREPEAT,    BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
+#endif 
+    { ACTION_STD_CANCEL,        BUTTON_LEFT,                BUTTON_NONE },
+
+    { ACTION_STD_CONTEXT,       BUTTON_SELECT|BUTTON_REPEAT,BUTTON_SELECT },
+
+    { ACTION_STD_QUICKSCREEN,   BUTTON_MENU|BUTTON_REPEAT,  BUTTON_MENU },
+    { ACTION_STD_MENU,          BUTTON_MENU|BUTTON_REL,     BUTTON_MENU },
+
+    { ACTION_STD_OK,            BUTTON_SELECT|BUTTON_REL,   BUTTON_SELECT },
+    { ACTION_STD_OK,            BUTTON_RIGHT,               BUTTON_NONE },
+
+    LAST_ITEM_IN_LIST
+}; /* button_context_standard */
+
+
+const struct button_mapping* get_context_mapping(int context)
+{
+    (void)context;
+
+    /* TODO add more button contexts */
+    return button_context_standard;
+}

firmware/SOURCES

@@ -1351,9 +1351,26 @@ drivers/qt1106.c
 #endif /* MEIZU_M6SL */
 
 #ifdef MEIZU_M6SP
+target/arm/s5l8700/backlight-meizu.c
+target/arm/s5l8700/power-meizu.c
+target/arm/s5l8700/kernel-s5l8700.c
+target/arm/s5l8700/meizu-m6sp/button-m6sp.c
 target/arm/s5l8700/meizu-m6sp/lcd-m6sp.c
 #ifndef SIMULATOR
 #ifndef BOOTLOADER
+drivers/generic_i2c.c
+drivers/rtc/rtc_s35390a.c
+target/arm/s5l8700/adc-s5l8700.c
+target/arm/s5l8700/audio-meizu.c
+target/arm/s5l8700/debug-s5l8700.c
+target/arm/s5l8700/dma-s5l8700.c
+target/arm/s5l8700/ftl-meizu.c
+target/arm/s5l8700/nand-meizu.c
+target/arm/s5l8700/fmradio-i2c-meizu.c
+target/arm/s5l8700/pcm-s5l8700.c
+target/arm/s5l8700/powermgmt-meizu.c
+target/arm/s5l8700/usb-s5l8700.c
+target/arm/s5l8700/wmcodec-s5l8700.c
 #endif /* BOOTLOADER */
 #endif /* SIMULATOR */
 #endif /* MEIZU_M6SP */

firmware/export/config/meizum6sp.h

@@ -18,6 +18,12 @@
 /* define the bitmask of hardware sample rates */
 #define HW_SAMPR_CAPS   (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11)
 
+/* FIXME: define actual rates applicable for M6SP */
+#define CODEC_SRCTRL_11025HZ     (0x19 << 1)
+#define CODEC_SRCTRL_22050HZ     (0x1b << 1)
+#define CODEC_SRCTRL_44100HZ     (0x11 << 1)
+#define CODEC_SRCTRL_88200HZ     (0x1f << 1)
+
 /* define the bitmask of recording sample rates */
 #define REC_SAMPR_CAPS  (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11)
 

firmware/target/arm/s5l8700/audio-meizu.c

@@ -0,0 +1,68 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2009 by Bertrik Sikken
+ *
+ * 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 "system.h"
+#include "cpu.h"
+#include "audio.h"
+#include "audiohw.h"
+#include "sound.h"
+
+int audio_channels = 2;
+int audio_output_source = AUDIO_SRC_PLAYBACK;
+
+void audio_set_output_source(int source)
+{
+    if ((unsigned)source >= AUDIO_NUM_SOURCES)
+        source = AUDIO_SRC_PLAYBACK;
+
+    audio_output_source = source;
+} /* audio_set_output_source */
+
+void audio_input_mux(int source, unsigned flags)
+{
+    static int last_source = AUDIO_SRC_PLAYBACK;
+
+    (void)flags;
+
+    switch (source)
+    {
+        default:                        /* playback - no recording */
+            source = AUDIO_SRC_PLAYBACK;
+        case AUDIO_SRC_PLAYBACK:
+            audio_channels = 2;
+            if (source != last_source)
+            {
+//                audiohw_set_monitor(false);
+            }
+            break;
+
+        case AUDIO_SRC_FMRADIO:         /* recording and playback */
+            audio_channels = 2;
+            if (source == last_source)
+                break;
+
+//            audiohw_set_monitor(true);
+            break;
+    } /* end switch */
+
+    last_source = source;
+} /* audio_input_mux */
+

firmware/target/arm/s5l8700/ftl-meizu.c

@@ -0,0 +1,48 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2010 by Bertrik Sikken
+ *
+ * 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 "ftl-target.h"
+
+uint32_t ftl_init(void)
+{
+    /* TODO implement */
+    return 0;
+}
+
+uint32_t ftl_read(uint32_t sector, uint32_t count, void* buffer)
+{
+    /* TODO implement */
+    return 0;
+}
+
+uint32_t ftl_write(uint32_t sector, uint32_t count, const void* buffer)
+{
+    /* TODO implement */
+    return 0;
+}
+
+uint32_t ftl_sync(void)
+{
+    /* TODO implement */
+    return 0;
+}
+

firmware/target/arm/s5l8700/meizu-m6sp/lcd-m6sp.c

@@ -56,6 +56,7 @@
 #define LCD_TYPE1_ID        0x139   /* id for LCD type S6D0139 */
 
 static int lcd_type = 0;
+static bool lcd_is_active = false;
 
 /* simple and crude delay */
 static void lcd_delay(int count)
@@ -357,6 +358,13 @@ void lcd_enable(bool on)
         /* disable controller clock */
         PWRCON |= (1 << 18);
     }
+    
+    lcd_is_active = on;
+}
+
+bool lcd_active(void)
+{
+    return lcd_is_active;
 }
 
 /* initialise the lcd controller inside the s5l8700 */
@@ -468,3 +476,18 @@ void lcd_update(void)
     lcd_update_rect(0, 0, LCD_WIDTH, LCD_HEIGHT);
 }
 
+void lcd_blit_yuv(unsigned char * const src[3],
+                  int src_x, int src_y, int stride,
+                  int x, int y, int width, int height)
+{
+    (void)src;
+    (void)src_x;
+    (void)src_y;
+    (void)stride;
+    (void)x;
+    (void)y;
+    (void)width;
+    (void)height;
+    /* TODO: not implemented yet */
+}
+

firmware/target/arm/s5l8700/meizu-m6sp/nand-target.h

@@ -49,6 +49,8 @@ uint32_t nand_block_erase(uint32_t bank, uint32_t page);
 const struct nand_device_info_type* nand_get_device_type(uint32_t bank);
 uint32_t nand_reset(uint32_t bank);
 uint32_t nand_device_init(void);
+void nand_set_active(void);
+long nand_last_activity(void);
 void nand_power_up(void);
 void nand_power_down(void);
 

firmware/target/arm/s5l8700/meizu-m6sp/powermgmt-m6sp.c

@@ -0,0 +1,64 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright © 2008 Rafaël Carré
+ *
+ * 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 "powermgmt.h"
+#include "adc.h"
+#include "adc-target.h"
+
+const unsigned short battery_level_dangerous[BATTERY_TYPES_COUNT] =
+{
+    /* TODO: this is just an initial guess */
+    3400
+};
+
+const unsigned short battery_level_shutoff[BATTERY_TYPES_COUNT] =
+{
+    /* TODO: this is just an initial guess */
+    3300
+};
+
+/* voltages (millivolt) of 0%, 10%, ... 100% when charging disabled */
+const unsigned short percent_to_volt_discharge[BATTERY_TYPES_COUNT][11] =
+{
+    /* TODO: simple uncalibrated curve, linear except for first 10% */
+    { 3300, 3390, 3480, 3570, 3660, 3750, 3840, 3930, 4020, 4110, 4200 }
+};
+
+#if CONFIG_CHARGING
+/* voltages (millivolt) of 0%, 10%, ... 100% when charging enabled */
+const unsigned short percent_to_volt_charge[11] =
+{
+    /* TODO: simple uncalibrated curve, linear except for first 10% */
+    3300, 3390, 3480, 3570, 3660, 3750, 3840, 3930, 4020, 4110, 4200
+};
+#endif /* CONFIG_CHARGING */
+
+/* ADC should read 0x3ff=6.00V */
+#define BATTERY_SCALE_FACTOR 6000
+/* full-scale ADC readout (2^10) in millivolt */
+
+
+/* Returns battery voltage from ADC [millivolts] */
+unsigned int battery_adc_voltage(void)
+{
+    return (adc_read(ADC_BATTERY) * BATTERY_SCALE_FACTOR) >> 10;
+}

firmware/target/arm/s5l8700/nand-meizu.c

@@ -0,0 +1,81 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2010 by Bertrik Sikken
+ *
+ * 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 "nand-target.h"
+
+const struct nand_device_info_type* nand_get_device_type(uint32_t bank);
+
+
+uint32_t nand_read_page(uint32_t bank, uint32_t page, void* databuffer,
+                        void* sparebuffer, uint32_t doecc,
+                        uint32_t checkempty)
+{
+    /* TODO implement */
+    return 0;
+}
+
+uint32_t nand_write_page(uint32_t bank, uint32_t page, void* databuffer,
+                         void* sparebuffer, uint32_t doecc)
+{
+    /* TODO implement */
+    return 0;
+}
+
+uint32_t nand_block_erase(uint32_t bank, uint32_t page)
+{
+    /* TODO implement */
+    return 0;
+}
+
+uint32_t nand_reset(uint32_t bank)
+{
+    /* TODO implement */
+    return 0;
+}
+
+uint32_t nand_device_init(void)
+{
+    /* TODO implement */
+    return 0;
+}
+
+void nand_power_up(void)
+{
+    /* TODO implement */
+}
+
+void nand_power_down(void)
+{
+    /* TODO implement */
+}
+
+void nand_set_active(void)
+{
+    /* TODO implement */
+}
+
+long nand_last_activity(void)
+{
+    /* TODO implement */
+    return 0;
+}
+

firmware/target/arm/s5l8700/usb-s5l8700.c

@@ -0,0 +1,45 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2010 by Bertrik Sikken
+ *
+ * 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 "s5l8700.h"
+#include "usb.h"
+#include "usb-target.h"
+
+void usb_init_device(void)
+{
+    /* TODO implement */
+    
+    /* enable USB2.0 function controller to allow VBUS monitoring */
+    PWRCON &= ~(1 << 15);
+}
+
+void usb_enable(bool on)
+{
+    (void)on;
+    /* TODO implement */
+}
+
+int usb_detect(void)
+{
+    return (USB_TR & (1 << 15)) ? USB_INSERTED : USB_EXTRACTED;
+}
+

firmware/target/arm/s5l8700/usb-target.h

@@ -0,0 +1,24 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2010 by Bertrik Sikken
+ *
+ * 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.
+ *
+ ****************************************************************************/
+ 
+ void usb_init_device(void);
+
+