diff --git a/BaS_GNU/BaS_GNU/sources/BaS.c b/BaS_GNU/BaS_GNU/sources/BaS.c index 787f528..6d9effa 100644 --- a/BaS_GNU/BaS_GNU/sources/BaS.c +++ b/BaS_GNU/BaS_GNU/sources/BaS.c @@ -104,19 +104,18 @@ void nvram_init(void) /********************************************************************/ void BaS(void) { - //int az_sectors; + int az_sectors; uint8_t *src; uint8_t *dst = (uint8_t *)TOS; uint32_t *adr; -/* + az_sectors = sd_card_init(); if (az_sectors > 0) { sd_card_idle(); } - */ pic_init(); nvram_init(); diff --git a/BaS_GNU/BaS_GNU/sources/sd_card_asm.S b/BaS_GNU/BaS_GNU/sources/sd_card_asm.S index 901a2c5..fac7935 100644 --- a/BaS_GNU/BaS_GNU/sources/sd_card_asm.S +++ b/BaS_GNU/BaS_GNU/sources/sd_card_asm.S @@ -378,15 +378,15 @@ sd_8M: sd_ok: move.l #LONGASC(' ', 'O', 'K', '!'),(a6) move.l #0x0a0d,(a6) - halt - halt + //halt + //halt rts // subs ende ------------------------------- sd_V1: move.l #LONGASC('n', 'o', 'n', '!'),(a6) move.l #0x0a0d,(a6) - halt - halt + //halt + //halt rts sd_error: move.l #LONGASC('E', 'r', 'r', 'o'),(a0) diff --git a/BaS_GNU/BaS_GNU/sources/sysinit.c b/BaS_GNU/BaS_GNU/sources/sysinit.c index fb7ac40..515be71 100644 --- a/BaS_GNU/BaS_GNU/sources/sysinit.c +++ b/BaS_GNU/BaS_GNU/sources/sysinit.c @@ -494,7 +494,7 @@ void dvi_on(void) { /* 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); - /* 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; /* 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_I2DR = 0x7a; /* send data: address of TFP410 */ - wait_i2c_transfer_finished(); + if (MCF_I2C_I2SR & MCF_I2C_I2SR_RXAK) /* next try if no acknowledge */ continue;