diff options
-rw-r--r-- | bootloader/samsung_yps3.c | 28 | ||||
-rw-r--r-- | firmware/SOURCES | 2 | ||||
-rw-r--r-- | firmware/target/arm/mmu-arm.S | 2 | ||||
-rw-r--r-- | firmware/target/arm/s5l8700/system-s5l8700.c | 2 |
4 files changed, 23 insertions, 11 deletions
diff --git a/bootloader/samsung_yps3.c b/bootloader/samsung_yps3.c index d4eff81e01..b80fbf5421 100644 --- a/bootloader/samsung_yps3.c +++ b/bootloader/samsung_yps3.c | |||
@@ -74,10 +74,9 @@ void main(void) | |||
74 | { | 74 | { |
75 | char mystring[64]; | 75 | char mystring[64]; |
76 | int line, col; | 76 | int line, col; |
77 | unsigned char read_data[16]; | 77 | struct tm dt; |
78 | int i; | 78 | int i; |
79 | struct si4700_dbg_info si4700_info; | 79 | struct si4700_dbg_info si4700_info; |
80 | // unsigned int data; | ||
81 | int brightness = DEFAULT_BRIGHTNESS_SETTING; | 80 | int brightness = DEFAULT_BRIGHTNESS_SETTING; |
82 | unsigned int button; | 81 | unsigned int button; |
83 | unsigned int fm_frequency = 100700000; | 82 | unsigned int fm_frequency = 100700000; |
@@ -124,6 +123,7 @@ void main(void) | |||
124 | tuner_power(true); | 123 | tuner_power(true); |
125 | si4700_set(RADIO_SLEEP, 0); | 124 | si4700_set(RADIO_SLEEP, 0); |
126 | si4700_set(RADIO_MUTE, 0); | 125 | si4700_set(RADIO_MUTE, 0); |
126 | si4700_set(RADIO_REGION, 0); | ||
127 | si4700_set(RADIO_FREQUENCY, fm_frequency); | 127 | si4700_set(RADIO_FREQUENCY, fm_frequency); |
128 | 128 | ||
129 | lcd_puts_scroll(0,0,"+++ this is a very very long line to test scrolling. ---"); | 129 | lcd_puts_scroll(0,0,"+++ this is a very very long line to test scrolling. ---"); |
@@ -152,16 +152,16 @@ void main(void) | |||
152 | line = 1; | 152 | line = 1; |
153 | 153 | ||
154 | #if 1 /* enable to see GPIOs */ | 154 | #if 1 /* enable to see GPIOs */ |
155 | snprintf(mystring, 64, "%02X %02X %02X %02X %02X %02X %02X %02X", PDAT0, PDAT1, PDAT2, PDAT3, PDAT4, PDAT5, PDAT6, PDAT7); | 155 | snprintf(mystring, 64, "%02X %02X %02X %02X %02X %02X %02X %02X", |
156 | PDAT0, PDAT1, PDAT2, PDAT3, PDAT4, PDAT5, PDAT6, PDAT7); | ||
156 | lcd_puts(0, line++, mystring); | 157 | lcd_puts(0, line++, mystring); |
157 | #endif | 158 | #endif |
158 | 159 | ||
159 | #if 1 /* enable this to see info about the RTC */ | 160 | #if 1 /* enable this to see info about the RTC */ |
160 | rtc_read_datetime(read_data); | 161 | rtc_read_datetime(&dt); |
161 | snprintf(mystring, 64, "RTC:"); | 162 | snprintf(mystring, 64, "RTC: %04d-%02d-%02d %02d:%02d:%02d", |
162 | for (i = 0; i < 7; i++) { | 163 | dt.tm_year + 1900, dt.tm_mon+1, dt.tm_mday, |
163 | snprintf(mystring + 2 * i + 4, 64, "%02X", read_data[i]); | 164 | dt.tm_hour, dt.tm_min, dt.tm_sec); |
164 | } | ||
165 | lcd_puts(0, line++, mystring); | 165 | lcd_puts(0, line++, mystring); |
166 | #endif | 166 | #endif |
167 | 167 | ||
@@ -211,7 +211,8 @@ void main(void) | |||
211 | #endif | 211 | #endif |
212 | 212 | ||
213 | #if 1 /* enable this to see ADC info */ | 213 | #if 1 /* enable this to see ADC info */ |
214 | snprintf(mystring, 64, "%04X %04X %04X %04X", adc_read(0), adc_read(1), adc_read(2), adc_read(3)); | 214 | snprintf(mystring, 64, "ADC: %04X %04X %04X %04X", |
215 | adc_read(0), adc_read(1), adc_read(2), adc_read(3)); | ||
215 | lcd_puts(0, line++, mystring); | 216 | lcd_puts(0, line++, mystring); |
216 | snprintf(mystring, 64, "ADC:USB %4d mV BAT %4d mV", | 217 | snprintf(mystring, 64, "ADC:USB %4d mV BAT %4d mV", |
217 | (adc_read(0) * 6000) >> 10, (adc_read(2) * 4650) >> 10); | 218 | (adc_read(0) * 6000) >> 10, (adc_read(2) * 4650) >> 10); |
@@ -268,7 +269,7 @@ void main(void) | |||
268 | _backlight_set_brightness(brightness); | 269 | _backlight_set_brightness(brightness); |
269 | } | 270 | } |
270 | } | 271 | } |
271 | snprintf(mystring, 64, "bright %3d", brightness); | 272 | snprintf(mystring, 64, "brightness %3d", brightness); |
272 | lcd_puts(0, line++, mystring); | 273 | lcd_puts(0, line++, mystring); |
273 | #endif | 274 | #endif |
274 | 275 | ||
@@ -292,6 +293,13 @@ void main(void) | |||
292 | lcd_puts(0, line++, mystring); | 293 | lcd_puts(0, line++, mystring); |
293 | #endif | 294 | #endif |
294 | 295 | ||
296 | #if 1 | ||
297 | snprintf(mystring, 64, "TIMER A:%08X B:%08X", TACNT, TBCNT); | ||
298 | lcd_puts(0, line++, mystring); | ||
299 | snprintf(mystring, 64, "TIMER C:%08X D:%08X", TCCNT, TDCNT); | ||
300 | lcd_puts(0, line++, mystring); | ||
301 | #endif | ||
302 | |||
295 | lcd_update(); | 303 | lcd_update(); |
296 | } | 304 | } |
297 | } | 305 | } |
diff --git a/firmware/SOURCES b/firmware/SOURCES index 3012314ac2..cfc14a7274 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES | |||
@@ -1611,6 +1611,8 @@ target/arm/samsung/yh925/powermgmt-yh925.c | |||
1611 | 1611 | ||
1612 | #ifdef SAMSUNG_YPS3 | 1612 | #ifdef SAMSUNG_YPS3 |
1613 | /* TODO: currently including all files for the bootloader DFU test program */ | 1613 | /* TODO: currently including all files for the bootloader DFU test program */ |
1614 | tuner.c | ||
1615 | drivers/tuner/si4700.c | ||
1614 | target/arm/s5l8700/adc-s5l8700.c | 1616 | target/arm/s5l8700/adc-s5l8700.c |
1615 | target/arm/s5l8700/i2c-s5l8700.c | 1617 | target/arm/s5l8700/i2c-s5l8700.c |
1616 | target/arm/s5l8700/kernel-s5l8700.c | 1618 | target/arm/s5l8700/kernel-s5l8700.c |
diff --git a/firmware/target/arm/mmu-arm.S b/firmware/target/arm/mmu-arm.S index e8482a8d94..02f1454399 100644 --- a/firmware/target/arm/mmu-arm.S +++ b/firmware/target/arm/mmu-arm.S | |||
@@ -39,7 +39,7 @@ | |||
39 | #define USE_MMU | 39 | #define USE_MMU |
40 | #define CACHE_SIZE 16 | 40 | #define CACHE_SIZE 16 |
41 | 41 | ||
42 | #elif CONFIG_CPU == S5L8701 | 42 | #elif CONFIG_CPU == S5L8700 || CONFIG_CPU == S5L8701 |
43 | /* MMU not present */ | 43 | /* MMU not present */ |
44 | #define CACHE_SIZE 4 | 44 | #define CACHE_SIZE 4 |
45 | 45 | ||
diff --git a/firmware/target/arm/s5l8700/system-s5l8700.c b/firmware/target/arm/s5l8700/system-s5l8700.c index 68ec3826a8..0dad74031f 100644 --- a/firmware/target/arm/s5l8700/system-s5l8700.c +++ b/firmware/target/arm/s5l8700/system-s5l8700.c | |||
@@ -154,7 +154,9 @@ void fiq_dummy(void) | |||
154 | 154 | ||
155 | void system_init(void) | 155 | void system_init(void) |
156 | { | 156 | { |
157 | #ifdef IPOD_NANO2G | ||
157 | pmu_init(); | 158 | pmu_init(); |
159 | #endif | ||
158 | } | 160 | } |
159 | 161 | ||
160 | void system_reboot(void) | 162 | void system_reboot(void) |