diff options
author | Barry Wardell <rockbox@barrywardell.net> | 2007-11-05 16:12:13 +0000 |
---|---|---|
committer | Barry Wardell <rockbox@barrywardell.net> | 2007-11-05 16:12:13 +0000 |
commit | 4ef3e821cbb57903c0236241490f1ee28c7c28f4 (patch) | |
tree | 1f2ca0ed5d96a0f0b0a91b7a1ff42d4d50358f0a /firmware/target/arm/sandisk | |
parent | 1df1e7b0c7f1932f45cfb189b43e873db1a85410 (diff) | |
download | rockbox-4ef3e821cbb57903c0236241490f1ee28c7c28f4.tar.gz rockbox-4ef3e821cbb57903c0236241490f1ee28c7c28f4.zip |
Fix red.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15476 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm/sandisk')
-rw-r--r-- | firmware/target/arm/sandisk/ata-c200_e200.c | 10 | ||||
-rw-r--r-- | firmware/target/arm/sandisk/sansa-e200/lcd-e200.c | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/firmware/target/arm/sandisk/ata-c200_e200.c b/firmware/target/arm/sandisk/ata-c200_e200.c index c9f97c0d48..91ff1d9365 100644 --- a/firmware/target/arm/sandisk/ata-c200_e200.c +++ b/firmware/target/arm/sandisk/ata-c200_e200.c | |||
@@ -25,7 +25,7 @@ | |||
25 | #include "thread.h" | 25 | #include "thread.h" |
26 | #include "led.h" | 26 | #include "led.h" |
27 | #include "disk.h" | 27 | #include "disk.h" |
28 | #include "pp5024.h" | 28 | #include "cpu.h" |
29 | #include "panic.h" | 29 | #include "panic.h" |
30 | #include "usb.h" | 30 | #include "usb.h" |
31 | 31 | ||
@@ -529,7 +529,7 @@ static void sd_card_mux(int card_no) | |||
529 | #ifdef SANSA_E200 | 529 | #ifdef SANSA_E200 |
530 | if (card_no == 0) | 530 | if (card_no == 0) |
531 | { | 531 | { |
532 | GPO32 |= 0x4; | 532 | GPO32_VAL |= 0x4; |
533 | 533 | ||
534 | GPIOA_ENABLE &= ~0x7a; | 534 | GPIOA_ENABLE &= ~0x7a; |
535 | GPIOA_OUTPUT_EN &= ~0x7a; | 535 | GPIOA_OUTPUT_EN &= ~0x7a; |
@@ -541,7 +541,7 @@ static void sd_card_mux(int card_no) | |||
541 | } | 541 | } |
542 | else | 542 | else |
543 | { | 543 | { |
544 | GPO32 &= ~0x4; | 544 | GPO32_VAL &= ~0x4; |
545 | 545 | ||
546 | GPIOD_ENABLE &= ~0x1f; | 546 | GPIOD_ENABLE &= ~0x1f; |
547 | GPIOD_OUTPUT_EN &= ~0x1f; | 547 | GPIOD_OUTPUT_EN &= ~0x1f; |
@@ -554,7 +554,7 @@ static void sd_card_mux(int card_no) | |||
554 | #else /* SANSA_C200 */ | 554 | #else /* SANSA_C200 */ |
555 | if (card_no == 0) | 555 | if (card_no == 0) |
556 | { | 556 | { |
557 | GPO32 |= 0x4; | 557 | GPO32_VAL |= 0x4; |
558 | 558 | ||
559 | GPIOD_ENABLE &= ~0x1f; | 559 | GPIOD_ENABLE &= ~0x1f; |
560 | GPIOD_OUTPUT_EN &= ~0x1f; | 560 | GPIOD_OUTPUT_EN &= ~0x1f; |
@@ -566,7 +566,7 @@ static void sd_card_mux(int card_no) | |||
566 | } | 566 | } |
567 | else | 567 | else |
568 | { | 568 | { |
569 | GPO32 &= ~0x4; | 569 | GPO32_VAL &= ~0x4; |
570 | 570 | ||
571 | GPIOA_ENABLE &= ~0x7a; | 571 | GPIOA_ENABLE &= ~0x7a; |
572 | GPIOA_OUTPUT_EN &= ~0x7a; | 572 | GPIOA_OUTPUT_EN &= ~0x7a; |
diff --git a/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c b/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c index 5bd14c2ece..3a26c47376 100644 --- a/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c +++ b/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c | |||
@@ -24,7 +24,7 @@ | |||
24 | #include "system.h" | 24 | #include "system.h" |
25 | #include <string.h> | 25 | #include <string.h> |
26 | #include "backlight-target.h" | 26 | #include "backlight-target.h" |
27 | #include "pp5024.h" | 27 | #include "cpu.h" |
28 | 28 | ||
29 | /* Power and display status */ | 29 | /* Power and display status */ |
30 | static bool power_on = false; /* Is the power turned on? */ | 30 | static bool power_on = false; /* Is the power turned on? */ |
@@ -371,7 +371,7 @@ void lcd_init_device(void) | |||
371 | lcd_init_gpio(); | 371 | lcd_init_gpio(); |
372 | /* Controller init */ | 372 | /* Controller init */ |
373 | outl((inl(0x70000084) | (1 << 28)), 0x70000084); | 373 | outl((inl(0x70000084) | (1 << 28)), 0x70000084); |
374 | GPO32 &= ~(1 << 28); | 374 | GPO32_VAL &= ~(1 << 28); |
375 | DEV_INIT1 = ( (DEV_INIT1 & 0x03ffffff) | (0x15 << 26) ); | 375 | DEV_INIT1 = ( (DEV_INIT1 & 0x03ffffff) | (0x15 << 26) ); |
376 | outl(((inl(0x70000014) & (0x0fffffff)) | (0x5 << 28)), 0x70000014); | 376 | outl(((inl(0x70000014) & (0x0fffffff)) | (0x5 << 28)), 0x70000014); |
377 | outl((inl(0x70000020) & ~(0x3 << 10)), 0x70000020); | 377 | outl((inl(0x70000020) & ~(0x3 << 10)), 0x70000020); |
@@ -419,9 +419,9 @@ void lcd_init_device(void) | |||
419 | 419 | ||
420 | /* LCD init */ | 420 | /* LCD init */ |
421 | /* Pull RESET low, then high to reset driver IC */ | 421 | /* Pull RESET low, then high to reset driver IC */ |
422 | GPO32 &= ~(1 << 28); | 422 | GPO32_VAL &= ~(1 << 28); |
423 | udelay(10000); | 423 | udelay(10000); |
424 | GPO32 |= (1 << 28); | 424 | GPO32_VAL |= (1 << 28); |
425 | udelay(10000); | 425 | udelay(10000); |
426 | 426 | ||
427 | lcd_display_on(); | 427 | lcd_display_on(); |