Firebee/FireBee_SVN
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

enabled SD card routines in bas again.

Browse Source 
SD card detection seems to work.
This commit is contained in:
Markus Fröschle
2012-11-15 20:54:56 +00:00
parent 21874209b2
commit 5dba1976e9
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
BaS_GNU/BaS_GNU/sources/BaS.c
View File

@@ -104,19 +104,18 @@ void nvram_init(void)
/********************************************************************/ /********************************************************************/
void BaS(void) void BaS(void)
{ {
//int az_sectors; int az_sectors;
uint8_t *src; uint8_t *src;
uint8_t *dst = (uint8_t *)TOS; uint8_t *dst = (uint8_t *)TOS;
uint32_t *adr; uint32_t *adr;
/*
az_sectors = sd_card_init(); az_sectors = sd_card_init();
if (az_sectors > 0) if (az_sectors > 0)
{ {
sd_card_idle(); sd_card_idle();
} }
*/
pic_init(); pic_init();
nvram_init(); nvram_init();

8
BaS_GNU/BaS_GNU/sources/sd_card_asm.S
View File

@@ -378,15 +378,15 @@ sd_8M:
sd_ok: sd_ok:
move.l #LONGASC(' ', 'O', 'K', '!'),(a6) move.l #LONGASC(' ', 'O', 'K', '!'),(a6)
move.l #0x0a0d,(a6) move.l #0x0a0d,(a6)
halt //halt
halt //halt
rts rts
// subs ende ------------------------------- // subs ende -------------------------------
sd_V1: sd_V1:
move.l #LONGASC('n', 'o', 'n', '!'),(a6) move.l #LONGASC('n', 'o', 'n', '!'),(a6)
move.l #0x0a0d,(a6) move.l #0x0a0d,(a6)
halt //halt
halt //halt
rts rts
sd_error: sd_error:
move.l #LONGASC('E', 'r', 'r', 'o'),(a0) move.l #LONGASC('E', 'r', 'r', 'o'),(a0)

4
BaS_GNU/BaS_GNU/sources/sysinit.c
View File

@@ -494,7 +494,7 @@ void dvi_on(void) {
/* disable all i2c interrupt routing targets */ /* disable all i2c interrupt routing targets */
MCF_I2C_I2ICR = 0x0; //~(MCF_I2C_I2ICR_IE | MCF_I2C_I2ICR_RE | MCF_I2C_I2ICR_TE | MCF_I2C_I2ICR_BNBE); MCF_I2C_I2ICR = 0x0; //~(MCF_I2C_I2ICR_IE | MCF_I2C_I2ICR_RE | MCF_I2C_I2ICR_TE | MCF_I2C_I2ICR_BNBE);
/* disable i2c, disable i2c interrupts, slave, recieve, i2c = acknowledge, no repeat start */ /* disable i2c, disable i2c interrupts, slave, receive, i2c = acknowledge, no repeat start */
MCF_I2C_I2CR = 0x0; MCF_I2C_I2CR = 0x0;
/* repeat start, transmit acknowledge */ /* repeat start, transmit acknowledge */
@@ -509,8 +509,8 @@ void dvi_on(void) {
MCF_I2C_I2CR = MCF_I2C_I2CR_IEN | MCF_I2C_I2CR_MSTA | MCF_I2C_I2CR_MTX; MCF_I2C_I2CR = MCF_I2C_I2CR_IEN | MCF_I2C_I2CR_MSTA | MCF_I2C_I2CR_MTX;
MCF_I2C_I2DR = 0x7a; /* send data: address of TFP410 */ MCF_I2C_I2DR = 0x7a; /* send data: address of TFP410 */
wait_i2c_transfer_finished(); wait_i2c_transfer_finished();
if (MCF_I2C_I2SR & MCF_I2C_I2SR_RXAK) /* next try if no acknowledge */ if (MCF_I2C_I2SR & MCF_I2C_I2SR_RXAK) /* next try if no acknowledge */
continue; continue;