Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Sansa AMS : remove mci_set_clock_divider()

Browse source 
Inline the 2 uses, and use a preprocessor sanity check for identification frequency

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20924 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Rafaël Carré 2009-05-13 08:27:33 +00:00
parent adb978a44d
commit 8033342d0f
2 changed files with 8 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
firmware/target/arm/as3525/ata_sd_as3525.c
View file

@ -117,32 +117,6 @@ static volatile bool retry;
static inline void mci_delay(void) { int i = 0xffff; while(i--) ; }
static void mci_set_clock_divider(const int drive, int divider)
{
int clock = MCI_CLOCK(drive);
if(divider > 1)
{
/* use divide logic */
clock &= ~MCI_CLOCK_BYPASS;
/* convert divider to MCI_CLOCK logic */
divider = (divider/2) - 1;
if(divider >= 256)
divider = 255;
}
else
{
/* bypass dividing logic */
clock |= MCI_CLOCK_BYPASS;
divider = 0;
}
MCI_CLOCK(drive) = clock | divider;
mci_delay();
}
#ifdef HAVE_HOTSWAP
#if defined(SANSA_E200V2) || defined(SANSA_FUZE)
static int sd1_oneshot_callback(struct timeout *tmo)
@ -348,7 +322,8 @@ static int sd_init_card(const int drive)
card_info[drive].initialized = 1;
mci_set_clock_divider(drive, 1); /* full speed */
MCI_CLOCK(drive) |= MCI_CLOCK_BYPASS; /* full speed */
mci_delay();
/*
* enable bank switching
@ -481,12 +456,9 @@ static void init_pl180_controller(const int drive)
MCI_SELECT(drive) = 0;
MCI_CLOCK(drive) = MCI_CLOCK_ENABLE;
MCI_CLOCK(drive) &= ~MCI_CLOCK_POWERSAVE;
/* set MCLK divider */
mci_set_clock_divider(drive,
CLK_DIV(AS3525_PCLK_FREQ, AS3525_SD_IDENT_FREQ));
MCI_CLOCK(drive) = MCI_CLOCK_ENABLE |
(((CLK_DIV(AS3525_PCLK_FREQ, AS3525_SD_IDENT_FREQ)) / 2) - 1);
mci_delay();
}
int sd_init(void)

3
firmware/target/arm/as3525/clock-target.h
View file

@ -63,5 +63,8 @@
#endif
#define AS3525_SD_IDENT_FREQ 400000 /* must be between 100 & 400 kHz */
#if ((CLK_DIV(AS3525_PCLK_FREQ, AS3525_SD_IDENT_FREQ) / 2) - 1) >= (1<<8) /* 8 bits */
#error SD IDENTIFICATION frequency is too low : clock divider will not fit !
#endif
#endif /* CLOCK_TARGET_H */