FS#10284 - "Sansa e200v2 & Fuze: Merge the button driver into 1 file" by Dustin Skoracki

Those two drivers were so similar, merging them is worth a few more #ifdefs.


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

1 files changed, 0 insertions, 284 deletions

diff --git a/firmware/target/arm/as3525/sansa-fuze/button-fuze.c b/firmware/target/arm/as3525/sansa-fuze/button-fuze.c
deleted file mode 100644
index 266ca79deb..0000000000
--- a/firmware/target/arm/as3525/sansa-fuze/button-fuze.c
+++ /dev/null
@@ -1,284 +0,0 @@
-/***************************************************************************
- *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
- *                     \/            \/     \/    \/            \/
- * $Id$
- *
- * Copyright (C) 2008 by Thomas Martitz
- * Copyright (C) 2008 by Dominik Wenger
- *
- * 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.
- *
- ****************************************************************************/
-
-
-/* Basic button driver for the Fuze
- *
- * TODO: - Get the wheel working with interrupts (seems to be impossible
- *              so far)
- */
-
-#include "system.h"
-#include "button.h"
-#include "button-target.h"
-#include "backlight.h"
-
-#define WHEEL_REPEAT_INTERVAL   (HZ/5)
-
-/* Buttons */
-static bool hold_button     = false;
-#ifndef BOOTLOADER
-static bool hold_button_old = false;
-#endif
-static unsigned short _dbop_din    = BUTTON_NONE;
-
-/* in the lcd driver */
-extern bool lcd_button_support(void);
-
-void button_init_device(void)
-{
-    GPIOA_DIR |= (1<<1); 	 
-    GPIOA_PIN(1) = (1<<1);
-}
-
-#if !defined(BOOTLOADER) && defined(HAVE_SCROLLWHEEL)
-static void scrollwheel(unsigned short dbop_din)
-{
-    /* current wheel values, parsed from dbop and the resulting button */
-    unsigned        wheel_value     = 0;
-    unsigned        btn             = BUTTON_NONE;
-    /* old wheel values */
-    static unsigned old_wheel_value = 0;
-    static unsigned old_btn         = BUTTON_NONE;
-
-    /*
-     * Getting BUTTON_REPEAT works like this: Remember when the btn value was
-     * posted to the button_queue last, and if it was recent enough, generate
-     * BUTTON_REPEAT
-     */
-    static long last_wheel_post = 0;
-
-    /*
-     *  Providing wheel acceleration works as follows: We increment accel
-     * by 2 if the wheel was turned, and decrement it by 1 each tick
-     * (no matter if it was turned), that means: the longer and faster you turn,
-     * the higher accel will be. accel>>2 will actually posted to the button_queue
-     */
-    static int accel = 0;
-    /* We only post every 4th action, as this matches better with the physical
-     * clicks of the wheel */
-    static int counter = 0;
-    /* Read wheel 
-     * Bits 13 and 14 of DBOP_DIN change as follows:
-     * Clockwise rotation   00 -> 01 -> 11 -> 10 -> 00
-     * Counter-clockwise    00 -> 10 -> 11 -> 01 -> 00
-     */
-    static const unsigned char wheel_tbl[2][4] =
-    {
-        { 2, 0, 3, 1 }, /* Clockwise rotation */
-        { 1, 3, 0, 2 }, /* Counter-clockwise  */ 
-    };
-
-    if(hold_button)
-    {
-        accel  =  counter  = 0;
-        return;
-    }
-
-    wheel_value = dbop_din & (1<<13|1<<14);
-    wheel_value >>= 13;
-
-    if (old_wheel_value == wheel_tbl[0][wheel_value])
-        btn = BUTTON_SCROLL_FWD;
-    else if (old_wheel_value == wheel_tbl[1][wheel_value])
-        btn = BUTTON_SCROLL_BACK;
-
-    if (btn != BUTTON_NONE)
-    {
-        if (btn != old_btn)
-        {
-            /* direction reversals nullify acceleration and counters */
-            old_btn =  btn;
-            accel  =  counter  = 0;
-        }
-        /* wheel_delta will cause lists to jump over items,
-         * we want this for fast scrolling, but we must keep it accurate
-         * for slow scrolling */
-        int wheel_delta = 0;
-        /* generate BUTTON_REPEAT if quick enough, scroll slightly faster too*/
-        if (TIME_BEFORE(current_tick, last_wheel_post + WHEEL_REPEAT_INTERVAL))
-        {
-            btn |= BUTTON_REPEAT;
-            wheel_delta = accel>>2;
-        }
-
-        accel += 2;
-
-        /* the wheel is more reliable if we don't send every change,
-         * every 4th is basically one "physical click" which should
-         * make up 1 item in lists */
-        if (++counter >= 4 && queue_empty(&button_queue))
-        {
-            buttonlight_on();
-            backlight_on();
-            queue_post(&button_queue, btn, ((wheel_delta+1)<<24));
-            /* message posted - reset count and remember post */
-            counter = 0;
-            last_wheel_post = current_tick;
-        }
-    }
-    if (accel > 0)
-        accel--;
-
-    old_wheel_value = wheel_value;
-}
-#endif /* !defined(BOOTLOADER) && defined(SCROLLWHEEL) */
-
-bool button_hold(void)
-{
-    return hold_button;
-}
-
-static void button_delay(void)
-{
-    int i = 50;
-    while(i--) asm volatile ("nop\n");
-}
-
-unsigned short button_read_dbop(void)
-{
-    /* skip home and power reading if lcd_button_support was blocked,
-     * since the dbop bit 15 is invalid then, and use the old value instead */
-    /* -20 (arbitary value) indicates valid home&power button read */
-    int old_home_power = -20;
-    if(!lcd_button_support())
-    {
-        old_home_power = (_dbop_din & (1<<15|1<<8));
-    }
-
-    /* Set up dbop for input */
-    DBOP_CTRL |= (1<<19);                /* Tri-state DBOP on read cycle */
-    DBOP_CTRL &= ~(1<<16);               /* disable output (1:write enabled) */
-    DBOP_TIMPOL_01 = 0xe167e167;         /* Set Timing & Polarity regs 0 & 1 */
-    DBOP_TIMPOL_23 = 0xe167006e;         /* Set Timing & Polarity regs 2 & 3 */
-
-    button_delay();
-    DBOP_CTRL |= (1<<15);                /* start read */
-    while (!(DBOP_STAT & (1<<16)));      /* wait for valid data */
-
-    _dbop_din = DBOP_DIN;                /* Read dbop data*/
-
-    /* Reset dbop for output */
-    DBOP_TIMPOL_01 = 0x6e167;            /* Set Timing & Polarity regs 0 & 1 */
-    DBOP_TIMPOL_23 = 0xa167e06f;         /* Set Timing & Polarity regs 2 & 3 */
-    DBOP_CTRL |= (1<<16);                /* Enable output (0:write disable)  */
-    DBOP_CTRL &= ~(1<<19);               /* Tri-state when no active write */
-
-    /* write back old values if blocked */
-    if (old_home_power != -20)
-    {
-        _dbop_din |= old_home_power & 1<<15;
-        _dbop_din &= 0xfeff|(old_home_power & 1<<8);
-    }
-#if defined(HAVE_SCROLLWHEEL) && !defined(BOOTLOADER)
-    /* read wheel on bit 13 & 14, but sent to the button queue seperately */
-        scrollwheel(_dbop_din);
-#endif
-    return _dbop_din;
-}
-
-/* for the debug menu */
-unsigned short button_dbop_data(void)
-{
-    return _dbop_din;
-}
-
-static int button_gpio(void)
-{
-    int btn = BUTTON_NONE;
-    if(hold_button)
-        return btn;
-    /* set afsel, so that we can read our buttons */
-    GPIOC_AFSEL &= ~(1<<2|1<<3|1<<4|1<<5|1<<6);
-    /* set dir so we can read our buttons (but reset the C pins first) */
-    GPIOB_DIR &= ~(1<<4);
-    GPIOC_DIR |= (1<<2|1<<3|1<<4|1<<5|1<<6);
-    GPIOC_PIN(2) = (1<<2);
-    GPIOC_PIN(3) = (1<<3);
-    GPIOC_PIN(4) = (1<<4);
-    GPIOC_PIN(5) = (1<<5);
-    GPIOC_PIN(6) = (1<<6);
-
-    GPIOC_DIR &= ~(1<<2|1<<3|1<<4|1<<5|1<<6);
-
-    /* small delay needed to read buttons correctly */
-    button_delay();
-
-    /* direct GPIO connections */
-    if (!GPIOC_PIN(3))
-        btn |= BUTTON_LEFT;
-    if (!GPIOC_PIN(2))
-        btn |= BUTTON_UP;
-    if (!GPIOC_PIN(6))
-        btn |= BUTTON_DOWN;
-    if (!GPIOC_PIN(5))
-        btn |= BUTTON_RIGHT;
-    if (!GPIOC_PIN(4))
-        btn |= BUTTON_SELECT;
-    /* return to settings needed for lcd */
-    GPIOC_DIR |= (1<<2|1<<3|1<<4|1<<5|1<<6);
-    GPIOC_AFSEL |= (1<<2|1<<3|1<<4|1<<5|1<<6);
-
-    return btn;
-}
-
-/*
- * Get button pressed from hardware
- */
-int button_read_device(void)
-{
-    int btn = BUTTON_NONE;
-    unsigned short dbop = button_read_dbop();
-    static unsigned power_counter = 0;
-    /* hold button */
-    if(dbop & (1<<12))
-    {
-        power_counter = HZ;
-        hold_button = true;
-    }
-    else
-    {
-        hold_button = false;
-    /* read power on bit 8, but not if hold button was just released, since
-     * you basically always hit power due to the slider mechanism after releasing
-     * hold (wait 1 sec) */
-        if (power_counter)
-            power_counter--;
-        if (!power_counter && dbop & (1<<8))
-            btn |= BUTTON_POWER;
-    /* read home on bit 15 */
-        if (!(dbop & (1<<15)))
-            btn |= BUTTON_HOME;
-        btn |= button_gpio();
-    }
-
-#ifndef BOOTLOADER
-    /* light handling */
-    if (hold_button != hold_button_old)
-    {
-        hold_button_old = hold_button;
-        backlight_hold_changed(hold_button);
-    }
-#endif /* BOOTLOADER */
-
-    return btn;
-}