From 0181bc42c942797b1e215e6f7861aa760207b8db Mon Sep 17 00:00:00 2001 From: Rafaël Carré Date: Thu, 18 Jun 2009 15:05:59 +0000 Subject: Sansa c200v2 : support more hardware Don't read the buttons from GPIOC but from DBOP_DIN (all directional buttons + select) Still missing hold, rec, volume up and volume down Read microsd Tuner is a si4700 but seems to suffer from the same problem than e200v2 Sound works TODO: missing buttons, lcd yuv, test lcd performance (the c200v1 lcd performance has decreased since r21321 : needs to be investigated) git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21330 a1c6a512-1295-4272-9138-f99709370657 --- .../target/arm/as3525/sansa-c200v2/button-c200v2.c | 54 ++++++---------------- 1 file changed, 15 insertions(+), 39 deletions(-) (limited to 'firmware/target/arm/as3525/sansa-c200v2/button-c200v2.c') diff --git a/firmware/target/arm/as3525/sansa-c200v2/button-c200v2.c b/firmware/target/arm/as3525/sansa-c200v2/button-c200v2.c index d3504c97e9..965006ce61 100644 --- a/firmware/target/arm/as3525/sansa-c200v2/button-c200v2.c +++ b/firmware/target/arm/as3525/sansa-c200v2/button-c200v2.c @@ -36,6 +36,12 @@ static bool hold_button = false; static bool hold_button_old = false; #endif +/* for the debug menu */ +unsigned short button_dbop_data(void) +{ + return _dbop_din; +} + void button_init_device(void) { GPIOA_DIR &= ~(1<<3); @@ -54,9 +60,6 @@ static void button_read_dbop(void) DBOP_TIMPOL_01 = 0xe167e167; /* Set Timing & Polarity regs 0 & 1 */ DBOP_TIMPOL_23 = 0xe167006e; /* Set Timing & Polarity regs 2 & 3 */ - int i = 50; - while(i--) asm volatile ("nop\n"); - DBOP_CTRL |= (1<<15); /* start read */ while (!(DBOP_STAT & (1<<16))); /* wait for valid data */ @@ -74,52 +77,25 @@ static void button_read_dbop(void) */ int button_read_device(void) { - int delay; - int dir_save_c = 0; - int afsel_save_c = 0; int btn = BUTTON_NONE; - /* Save the current direction and afsel */ - dir_save_c = GPIOC_DIR; - afsel_save_c = GPIOC_AFSEL; - - GPIOC_AFSEL &= ~(1<<6|1<<5|1<<4|1<<3); - GPIOC_DIR |= (1<<6|1<<5|1<<4|1<<3); - - /* These should not be needed with button event interupts */ - /* they are necessary now to clear out lcd data */ - - GPIOC_PIN(6) = (1<<6); - GPIOC_PIN(5) = (1<<5); - GPIOC_PIN(4) = (1<<4); - GPIOC_PIN(3) = (1<<3); - GPIOC_DIR &= ~(1<<6|1<<5|1<<4|1<<3); - - delay = 100; - while(delay--) - asm volatile("nop\n"); - /* direct GPIO connections */ if (GPIOA_PIN(3)) btn |= BUTTON_POWER; - if (!GPIOC_PIN(6)) - btn |= BUTTON_RIGHT; - if (!GPIOC_PIN(5)) - btn |= BUTTON_UP; - if (!GPIOC_PIN(4)) - btn |= BUTTON_SELECT; - if (!GPIOC_PIN(3)) - btn |= BUTTON_DOWN; - - /* return to settings needed for lcd */ - GPIOC_DIR = dir_save_c; - GPIOC_AFSEL = afsel_save_c; if(lcd_button_support()) button_read_dbop(); - if(_dbop_din & (1<<6)) + if(!(_dbop_din & (1<<2))) btn |= BUTTON_LEFT; + if(!(_dbop_din & (1<<3))) + btn |= BUTTON_DOWN; + if(!(_dbop_din & (1<<4))) + btn |= BUTTON_SELECT; + if(!(_dbop_din & (1<<5))) + btn |= BUTTON_UP; + if(!(_dbop_din & (1<<6))) + btn |= BUTTON_RIGHT; #ifndef BOOTLOADER /* light handling */ -- cgit v1.2.3