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

Use __STRAM_END.

Browse Source
This commit is contained in:
Vincent Rivière
2012-11-07 21:54:21 +00:00
parent 97099dc581
commit 25b5df12b4
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sources/BaS.c
View File

@@ -24,6 +24,8 @@ extern void wait_10ms();
extern void wait_1ms(); extern void wait_1ms();
/* Symbols from the linker script */ /* Symbols from the linker script */
extern uint8_t _STRAM_END[];
#define STRAM_END ((uint32_t)_STRAM_END)
extern uint8_t _TOS[]; extern uint8_t _TOS[];
#define TOS ((uint32_t)_TOS) /* final TOS location */ #define TOS ((uint32_t)_TOS) /* final TOS location */
extern uint8_t _EMUTOS[]; extern uint8_t _EMUTOS[];
@@ -162,7 +164,7 @@ void BaS(void)
/* ST RAM */ /* ST RAM */
* (uint32_t *) 0x42e = 0xe00000; /* phystop TOS system variable */ * (uint32_t *) 0x42e = STRAM_END; /* phystop TOS system variable */
* (uint32_t *) 0x420 = 0x752019f3; /* memvalid TOS system variable */ * (uint32_t *) 0x420 = 0x752019f3; /* memvalid TOS system variable */
* (uint32_t *) 0x43a = 0x237698aa; /* memval2 TOS system variable */ * (uint32_t *) 0x43a = 0x237698aa; /* memval2 TOS system variable */
* (uint32_t *) 0x51a = 0x5555aaaa; /* memval3 TOS system variable */ * (uint32_t *) 0x51a = 0x5555aaaa; /* memval3 TOS system variable */

2
sources/exceptions.S
View File

@@ -817,7 +817,7 @@ video_chg_2page:
sub.l d1,d2 // differenz = anzahl zeilen sub.l d1,d2 // differenz = anzahl zeilen
mulu d2,d4 // maximal 480 zeilen mulu d2,d4 // maximal 480 zeilen
add.l d4,d0 // video gr<EFBFBD>sse add.l d4,d0 // video gr<EFBFBD>sse
cmp.l #0xe00000,d0 // maximale addresse cmp.l #__STRAM_END,d0 // maximale addresse
bge video_chg_end // wenn gleich oder gr<EFBFBD>sser -> fertig bge video_chg_end // wenn gleich oder gr<EFBFBD>sser -> fertig
moveq #20,d4 moveq #20,d4
move.l d0,d2 move.l d0,d2

5
sources/sysinit.c
View File

@@ -747,6 +747,9 @@ livo:
/* Symbols from the linker script */ /* Symbols from the linker script */
extern uint8_t _STRAM_END[];
#define STRAM_END ((uint32_t)_STRAM_END)
extern uint8_t _FIRETOS[]; extern uint8_t _FIRETOS[];
#define FIRETOS ((uint32_t)_FIRETOS) /* where FireTOS is stored in flash */ #define FIRETOS ((uint32_t)_FIRETOS) /* where FireTOS is stored in flash */
@@ -776,7 +779,7 @@ void initialize_hardware(void) {
/* FireTOS seems to have trouble to initialize the ST-RAM by itself, so... */ /* FireTOS seems to have trouble to initialize the ST-RAM by itself, so... */
/* Validate ST RAM */ /* Validate ST RAM */
* (volatile uint32_t *) 0x42e = 0x00e00000; /* phystop TOS system variable */ * (volatile uint32_t *) 0x42e = STRAM_END; /* phystop TOS system variable */
* (volatile uint32_t *) 0x420 = 0x752019f3; /* memvalid TOS system variable */ * (volatile uint32_t *) 0x420 = 0x752019f3; /* memvalid TOS system variable */
* (volatile uint32_t *) 0x43a = 0x237698aa; /* memval2 TOS system variable */ * (volatile uint32_t *) 0x43a = 0x237698aa; /* memval2 TOS system variable */
* (volatile uint32_t *) 0x51a = 0x5555aaaa; /* memval3 TOS system variable */ * (volatile uint32_t *) 0x51a = 0x5555aaaa; /* memval3 TOS system variable */