Thank you to anyone who has already donated - your generous donations helped make three months of treatment possible.
My brother Nate continues to fight stage IV Hodgkin's lymphoma. He's just 31, with a wife and baby girl. They have no active income (since he's been unable to return to work), no insurance, and cannot afford the treatment he needs. Nate and his family need your help. Please consider a donation, every dollar helps. Thanks.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 |
Index: rockbox-c240v2/firmware/target/arm/as3525/system-as3525.c =================================================================== --- rockbox-c240v2.orig/firmware/target/arm/as3525/system-as3525.c 2010-04-07 01:47:32.500448422 +0900 +++ rockbox-c240v2/firmware/target/arm/as3525/system-as3525.c 2010-04-07 02:20:39.552631265 +0900 @@ -163,6 +163,41 @@ ); } +#if defined(SANSA_C200V2) +#include "dbop-as3525.h" + +int c200v2_variant = 0; + +static void check_model_variant(void) +{ + unsigned int i; + unsigned int saved_dir = GPIOA_DIR; + + /* Make A7 input */ + GPIOA_DIR &= ~(1<<7); + /* wait a little to allow the pullup/pulldown resistor + * to charge the input capacitance */ + for (i=0; i<1000; i++) asm volatile ("nop\n"); + /* read the pullup/pulldown value on A7 to determine the variant */ + if (GPIOA_PIN(7) == 0) { + /* + * Backlight on A7. + */ + c200v2_variant = 1; + } else { + /* + * Backlight on A5. + */ + c200v2_variant = 0; + } + GPIOA_DIR = saved_dir; +} +#else +static inline void check_model_variant(void) +{ +} +#endif /* SANSA_C200V2*/ + #if defined(BOOTLOADER) static void sdram_delay(void) { @@ -319,6 +354,7 @@ fmradio_i2c_init(); #endif #endif /* !BOOTLOADER */ + check_model_variant(); } void system_reboot(void) Index: rockbox-c240v2/firmware/target/arm/as3525/system-target.h =================================================================== --- rockbox-c240v2.orig/firmware/target/arm/as3525/system-target.h 2010-04-07 01:47:32.464446370 +0900 +++ rockbox-c240v2/firmware/target/arm/as3525/system-target.h 2010-04-07 02:22:42.660376620 +0900 @@ -32,4 +32,10 @@ #define UNCACHED_ADDR(a) ((typeof(a)) ((uintptr_t)(a) + 0x10000000)) #endif + +#ifdef SANSA_C200V2 +/* 0: Backlight on A5, 1: Backlight on A7 */ +extern int c200v2_variant; +#endif + #endif /* SYSTEM_TARGET_H */ Index: rockbox-c240v2/firmware/target/arm/as3525/debug-as3525.c =================================================================== --- rockbox-c240v2.orig/firmware/target/arm/as3525/debug-as3525.c 2010-04-07 01:47:32.484448955 +0900 +++ rockbox-c240v2/firmware/target/arm/as3525/debug-as3525.c 2010-04-07 02:20:52.669452702 +0900 @@ -256,6 +256,21 @@ { while(1) { +#ifdef SANSA_C200V2 + lcd_clear_display(); + line = 0; + lcd_puts(0, line++, "[Submodel:]"); + lcd_putsf(0, line++, "C200v2 variant %d", c200v2_variant); + lcd_update(); + int btn = button_get(1); + if(btn == (DEBUG_CANCEL|BUTTON_REL)) + goto end; + else if(btn == (BUTTON_DOWN|BUTTON_REL)) + break; + } + while(1) + { +#endif lcd_clear_display(); line = 0; lcd_puts(0, line++, "[Clock Frequencies:]"); Index: rockbox-c240v2/firmware/target/arm/as3525/sansa-c200v2/backlight-c200v2.c =================================================================== --- rockbox-c240v2.orig/firmware/target/arm/as3525/sansa-c200v2/backlight-c200v2.c 2010-04-07 01:47:32.476446845 +0900 +++ rockbox-c240v2/firmware/target/arm/as3525/sansa-c200v2/backlight-c200v2.c 2010-04-07 01:47:44.781215996 +0900 @@ -37,26 +37,45 @@ static void _ll_backlight_on(void) { - GPIOA_PIN(5) = 1<<5; + if (c200v2_variant == 0) { + GPIOA_PIN(5) = 1<<5; + } else { + GPIOA_PIN(7) = 1<<7; + } } static void _ll_backlight_off(void) { - GPIOA_PIN(5) = 0; + if (c200v2_variant == 0) { + GPIOA_PIN(5) = 0; + } else { + GPIOA_PIN(7) = 0; + } } void _backlight_pwm(int on) { if (on) { _ll_backlight_on(); + if (c200v2_variant == 1) { + GPIOA_PIN(5) = 1<<5; + } } else { _ll_backlight_off(); + if (c200v2_variant == 1) { + GPIOA_PIN(5) = 0; + } } } bool _backlight_init(void) { GPIOA_DIR |= 1<<5; + if (c200v2_variant == 1) { + /* On this variant A7 is the backlight and + * A5 is the buttonlight */ + GPIOA_DIR |= 1<<7; + } return true; } @@ -93,20 +112,30 @@ void _buttonlight_on(void) { - /* Needed for buttonlight and MicroSD to work at the same time */ - /* Turn ROD control on, as the OF does */ - GPIOD_DIR |= (1<<7); - SD_MCI_POWER |= (1<<7); - GPIOD_PIN(7) = (1<<7); + if (c200v2_variant == 0) { + /* Needed for buttonlight and MicroSD to work at the same time */ + /* Turn ROD control on, as the OF does */ + GPIOD_DIR |= (1<<7); + SD_MCI_POWER |= (1<<7); + GPIOD_PIN(7) = (1<<7); + } else { + GPIOA_PIN(5) = 1<<5; + } buttonlight_is_on = 1; } void _buttonlight_off(void) { - /* Needed for buttonlight and MicroSD to work at the same time */ - /* Turn ROD control off, as the OF does */ - SD_MCI_POWER &= ~(1<<7); - GPIOD_PIN(7) = 0; - GPIOD_DIR &= ~(1<<7); + if (c200v2_variant == 0) { + /* Needed for buttonlight and MicroSD to work at the same time */ + /* Turn ROD control off, as the OF does */ + SD_MCI_POWER &= ~(1<<7); + GPIOD_PIN(7) = 0; + GPIOD_DIR &= ~(1<<7); + } else { + GPIOA_PIN(5) = 0; + } buttonlight_is_on = 0; } + +/* vim:set ts=4 sw=4 et: */ |
