diff options
Diffstat (limited to 'firmware/target/arm/as3525/sd-as3525v2.c')
-rw-r--r-- | firmware/target/arm/as3525/sd-as3525v2.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/firmware/target/arm/as3525/sd-as3525v2.c b/firmware/target/arm/as3525/sd-as3525v2.c index 836981f321..3f78a61bbd 100644 --- a/firmware/target/arm/as3525/sd-as3525v2.c +++ b/firmware/target/arm/as3525/sd-as3525v2.c | |||
@@ -45,7 +45,7 @@ | |||
45 | #include "disk.h" | 45 | #include "disk.h" |
46 | #endif | 46 | #endif |
47 | 47 | ||
48 | #ifdef SANSA_FUZEV2 | 48 | #if defined(SANSA_FUZEV2) || defined(SANSA_CLIPPLUS) |
49 | #include "backlight-target.h" | 49 | #include "backlight-target.h" |
50 | #endif | 50 | #endif |
51 | 51 | ||
@@ -403,8 +403,8 @@ static bool send_cmd(const int drive, const int cmd, const int arg, const int fl | |||
403 | 403 | ||
404 | MCI_ARGUMENT = arg; | 404 | MCI_ARGUMENT = arg; |
405 | 405 | ||
406 | #ifdef SANSA_FUZEV2 | 406 | #if defined(SANSA_FUZEV2) || defined(SANSA_CLIPPLUS) |
407 | if (fuzev2_variant == 1) | 407 | if (amsv2_variant == 1) |
408 | card_no = 1 << 16; | 408 | card_no = 1 << 16; |
409 | else | 409 | else |
410 | #endif | 410 | #endif |
@@ -429,8 +429,8 @@ static bool send_cmd(const int drive, const int cmd, const int arg, const int fl | |||
429 | /*b23 | CMD_CCS_EXPECTED unused */ | 429 | /*b23 | CMD_CCS_EXPECTED unused */ |
430 | /*b31 */ | CMD_DONE_BIT; | 430 | /*b31 */ | CMD_DONE_BIT; |
431 | 431 | ||
432 | #ifdef SANSA_FUZEV2 | 432 | #if defined(SANSA_FUZEV2) |
433 | if (fuzev2_variant == 0) | 433 | if (amsv2_variant == 0) |
434 | { | 434 | { |
435 | extern int buttonlight_is_on; | 435 | extern int buttonlight_is_on; |
436 | if(buttonlight_is_on) | 436 | if(buttonlight_is_on) |
@@ -594,8 +594,8 @@ static int sd_init_card(const int drive) | |||
594 | return -17; | 594 | return -17; |
595 | 595 | ||
596 | /* Now that card is widebus make controller aware */ | 596 | /* Now that card is widebus make controller aware */ |
597 | #ifdef SANSA_FUZEV2 | 597 | #if defined(SANSA_FUZEV2) || defined(SANSA_CLIPPLUS) |
598 | if (fuzev2_variant == 1) | 598 | if (amsv2_variant == 1) |
599 | MCI_CTYPE |= 1<<1; | 599 | MCI_CTYPE |= 1<<1; |
600 | else | 600 | else |
601 | #endif | 601 | #endif |
@@ -604,8 +604,8 @@ static int sd_init_card(const int drive) | |||
604 | #endif /* ! BOOTLOADER */ | 604 | #endif /* ! BOOTLOADER */ |
605 | 605 | ||
606 | /* Set low power mode */ | 606 | /* Set low power mode */ |
607 | #ifdef SANSA_FUZEV2 | 607 | #if defined(SANSA_FUZEV2) || defined(SANSA_CLIPPLUS) |
608 | if (fuzev2_variant == 1) | 608 | if (amsv2_variant == 1) |
609 | MCI_CLKENA |= 1<<16; | 609 | MCI_CLKENA |= 1<<16; |
610 | else | 610 | else |
611 | #endif | 611 | #endif |
@@ -709,8 +709,8 @@ static void init_controller(void) | |||
709 | int card_mask = (1 << hcon_numcards) - 1; | 709 | int card_mask = (1 << hcon_numcards) - 1; |
710 | int pwr_mask; | 710 | int pwr_mask; |
711 | 711 | ||
712 | #ifdef SANSA_FUZEV2 | 712 | #if defined(SANSA_FUZEV2) || defined(SANSA_CLIPPLUS) |
713 | if (fuzev2_variant == 1) | 713 | if (amsv2_variant == 1) |
714 | pwr_mask = 1 << 1; | 714 | pwr_mask = 1 << 1; |
715 | else | 715 | else |
716 | #endif | 716 | #endif |
@@ -774,8 +774,8 @@ int sd_init(void) | |||
774 | wakeup_init(&transfer_completion_signal); | 774 | wakeup_init(&transfer_completion_signal); |
775 | wakeup_init(&command_completion_signal); | 775 | wakeup_init(&command_completion_signal); |
776 | 776 | ||
777 | #ifdef SANSA_FUZEV2 | 777 | #if defined(SANSA_FUZEV2) || defined(SANSA_CLIPPLUS) |
778 | if (fuzev2_variant == 1) | 778 | if (amsv2_variant == 1) |
779 | GPIOB_DIR |= 1 << 5; | 779 | GPIOB_DIR |= 1 << 5; |
780 | #endif | 780 | #endif |
781 | 781 | ||