diff --git a/cfg/sym1-32k.cfg b/cfg/sym1-32k.cfg index 14ddfb98f..0665c8cf2 100644 --- a/cfg/sym1-32k.cfg +++ b/cfg/sym1-32k.cfg @@ -22,10 +22,10 @@ SYMBOLS { } MEMORY { - ZP: start = $0000, size = $00F7, define = yes, file = %O; + ZP: start = $0000, size = $00F7, define = yes, file = %O; CPUSTACK: start = $0100, size = $0100, define = yes; RAM: start = %S, size = $8000 - %S - __STACKSIZE__, define = yes, file = %O; - MONROM: start = $8000, size = $1000, define = yes; + MONROM: start = $8000, size = $1000, define = yes; EXT: start = $9000, size = $1000, define = yes; IO: start = $A000, size = $1000, define = yes; RAE1: start = $B000, size = $1000, define = yes; @@ -35,8 +35,8 @@ MEMORY { } SEGMENTS { - ZEROPAGE: load = ZP, type = zp, define = yes; - STARTUP: load = RAM, type = ro, define = yes; + ZEROPAGE: load = ZP, type = zp, define = yes; + STARTUP: load = RAM, type = ro, define = yes; CODE: load = RAM, type = ro, define = yes; RODATA: load = RAM, type = ro, define = yes; ONCE: load = RAM, type = ro, define = yes; diff --git a/cfg/sym1-4k.cfg b/cfg/sym1-4k.cfg index 240d7bc82..de1be0b8a 100644 --- a/cfg/sym1-4k.cfg +++ b/cfg/sym1-4k.cfg @@ -22,10 +22,10 @@ SYMBOLS { } MEMORY { - ZP: start = $0000, size = $00F7, define = yes, file = %O; + ZP: start = $0000, size = $00F7, define = yes, file = %O; CPUSTACK: start = $0100, size = $0100, define = yes; RAM: start = %S, size = $1000 - %S - __STACKSIZE__, define = yes, file = %O; - MONROM: start = $8000, size = $1000, define = yes; + MONROM: start = $8000, size = $1000, define = yes; EXT: start = $9000, size = $1000, define = yes; IO: start = $A000, size = $1000, define = yes; RAE1: start = $B000, size = $1000, define = yes; @@ -35,8 +35,8 @@ MEMORY { } SEGMENTS { - ZEROPAGE: load = ZP, type = zp, define = yes; - STARTUP: load = RAM, type = ro, define = yes; + ZEROPAGE: load = ZP, type = zp, define = yes; + STARTUP: load = RAM, type = ro, define = yes; CODE: load = RAM, type = ro, define = yes; RODATA: load = RAM, type = ro, define = yes; ONCE: load = RAM, type = ro, define = yes; diff --git a/cfg/sym1.cfg b/cfg/sym1.cfg index 240d7bc82..de1be0b8a 100644 --- a/cfg/sym1.cfg +++ b/cfg/sym1.cfg @@ -22,10 +22,10 @@ SYMBOLS { } MEMORY { - ZP: start = $0000, size = $00F7, define = yes, file = %O; + ZP: start = $0000, size = $00F7, define = yes, file = %O; CPUSTACK: start = $0100, size = $0100, define = yes; RAM: start = %S, size = $1000 - %S - __STACKSIZE__, define = yes, file = %O; - MONROM: start = $8000, size = $1000, define = yes; + MONROM: start = $8000, size = $1000, define = yes; EXT: start = $9000, size = $1000, define = yes; IO: start = $A000, size = $1000, define = yes; RAE1: start = $B000, size = $1000, define = yes; @@ -35,8 +35,8 @@ MEMORY { } SEGMENTS { - ZEROPAGE: load = ZP, type = zp, define = yes; - STARTUP: load = RAM, type = ro, define = yes; + ZEROPAGE: load = ZP, type = zp, define = yes; + STARTUP: load = RAM, type = ro, define = yes; CODE: load = RAM, type = ro, define = yes; RODATA: load = RAM, type = ro, define = yes; ONCE: load = RAM, type = ro, define = yes; diff --git a/samples/symDisplay.c b/samples/symDisplay.c index 41eaf8b49..8a72d5863 100644 --- a/samples/symDisplay.c +++ b/samples/symDisplay.c @@ -43,7 +43,7 @@ void main (void) { if( (c >= '0') && (c <= '9') ) { // between 1 and 9 loops allowed z = 1; // a number was pressed t = c - '0'; // convert char to int - puts( "\n\nLook at the front panel.\n" ); + puts( "\n\nLook at the front panel.\n" ); } else { puts( "\nWhat?" ); @@ -185,7 +185,7 @@ void main (void) { set_D3( get_D4() ); set_D4( get_D5() ); set_D5( get_D6() ); - set_D6( DISP_M_1 ); + set_D6( DISP_M_1 ); for( d = 0; d < flashes ; d++ ) { fdisp(); // Display } @@ -198,7 +198,7 @@ void main (void) { set_D3( get_D4() ); set_D4( get_D5() ); set_D5( get_D6() ); - set_D6( DISP_M_1 ); + set_D6( DISP_M_1 ); for( d = 0; d < flashes ; d++ ) { fdisp(); // Display } @@ -259,7 +259,7 @@ void main (void) { set_D3( get_D4() ); set_D4( get_D5() ); set_D5( get_D6() ); - set_D6( DISP_M_1 ); + set_D6( DISP_M_1 ); for( d = 0; d < flashes ; d++ ) { fdisp(); // Display } @@ -272,7 +272,7 @@ void main (void) { set_D3( get_D4() ); set_D4( get_D5() ); set_D5( get_D6() ); - set_D6( DISP_M_1 ); + set_D6( DISP_M_1 ); for( d = 0; d < flashes ; d++ ) { fdisp(); // Display } @@ -285,7 +285,7 @@ void main (void) { set_D3( get_D4() ); set_D4( get_D5() ); set_D5( get_D6() ); - set_D6( DISP_M_1 ); + set_D6( DISP_M_1 ); for( d = 0; d < flashes ; d++ ) { fdisp(); // Display } @@ -298,7 +298,7 @@ void main (void) { set_D3( get_D4() ); set_D4( get_D5() ); set_D5( get_D6() ); - set_D6( DISP_M_1 ); + set_D6( DISP_M_1 ); for( d = 0; d < flashes ; d++ ) { fdisp(); // Display } @@ -344,10 +344,10 @@ void main (void) { set_D6( DISP_BACKSLASH ); break; default: - displayable = 0; // Character not mapped + displayable = 0; // Character not mapped } - if( displayable ) { + if( displayable ) { putchar( buffer[l] ); // Send it to the console @@ -382,3 +382,4 @@ void main (void) { return; } + diff --git a/samples/symIO.c b/samples/symIO.c index c52a71b11..d887c18b9 100644 --- a/samples/symIO.c +++ b/samples/symIO.c @@ -66,7 +66,7 @@ void main(void) { puts( "instructions again and type 'stop' to end the program.\n"); puts( "Available registers: DDR1A, IOR1A, DDR1B, IOR1B, DDR2A" ); puts( "IOR2A, DDR2B, IOR2B, DDR3A, IOR3A, DDR3B and IOR3B." ); - instr = 0; + instr = 0; } printf( "\n Command: " ); diff --git a/samples/symNotepad.c b/samples/symNotepad.c index e9866e526..bc28ef4b5 100644 --- a/samples/symNotepad.c +++ b/samples/symNotepad.c @@ -99,21 +99,21 @@ void main(void) { p--; } } - else if( c == 0x13 ) { // Save + else if( c == 0x13 ) { // Save puts( "\n========================= Save =========================" ); puts( "\nPress any key to save." ); c = getchar(); for( l = 0; l <= p; l++ ) { tapio[l] = buffer[l]; } - l++; + l++; tapio[l] = 0x00; puts( "Saving to tape." ); error = dumpt( 'N', (int) tapio, (int) tapio+p ); if( error ) { puts( "\nTape error." ); } - else + else { putchar( '\r' ); for( l = 0; l < 25; l++ ) { @@ -196,3 +196,4 @@ void main(void) { return; } + diff --git a/samples/tutorial/sym1/symDisplay.c b/samples/tutorial/sym1/symDisplay.c index 41eaf8b49..8a72d5863 100644 --- a/samples/tutorial/sym1/symDisplay.c +++ b/samples/tutorial/sym1/symDisplay.c @@ -43,7 +43,7 @@ void main (void) { if( (c >= '0') && (c <= '9') ) { // between 1 and 9 loops allowed z = 1; // a number was pressed t = c - '0'; // convert char to int - puts( "\n\nLook at the front panel.\n" ); + puts( "\n\nLook at the front panel.\n" ); } else { puts( "\nWhat?" ); @@ -185,7 +185,7 @@ void main (void) { set_D3( get_D4() ); set_D4( get_D5() ); set_D5( get_D6() ); - set_D6( DISP_M_1 ); + set_D6( DISP_M_1 ); for( d = 0; d < flashes ; d++ ) { fdisp(); // Display } @@ -198,7 +198,7 @@ void main (void) { set_D3( get_D4() ); set_D4( get_D5() ); set_D5( get_D6() ); - set_D6( DISP_M_1 ); + set_D6( DISP_M_1 ); for( d = 0; d < flashes ; d++ ) { fdisp(); // Display } @@ -259,7 +259,7 @@ void main (void) { set_D3( get_D4() ); set_D4( get_D5() ); set_D5( get_D6() ); - set_D6( DISP_M_1 ); + set_D6( DISP_M_1 ); for( d = 0; d < flashes ; d++ ) { fdisp(); // Display } @@ -272,7 +272,7 @@ void main (void) { set_D3( get_D4() ); set_D4( get_D5() ); set_D5( get_D6() ); - set_D6( DISP_M_1 ); + set_D6( DISP_M_1 ); for( d = 0; d < flashes ; d++ ) { fdisp(); // Display } @@ -285,7 +285,7 @@ void main (void) { set_D3( get_D4() ); set_D4( get_D5() ); set_D5( get_D6() ); - set_D6( DISP_M_1 ); + set_D6( DISP_M_1 ); for( d = 0; d < flashes ; d++ ) { fdisp(); // Display } @@ -298,7 +298,7 @@ void main (void) { set_D3( get_D4() ); set_D4( get_D5() ); set_D5( get_D6() ); - set_D6( DISP_M_1 ); + set_D6( DISP_M_1 ); for( d = 0; d < flashes ; d++ ) { fdisp(); // Display } @@ -344,10 +344,10 @@ void main (void) { set_D6( DISP_BACKSLASH ); break; default: - displayable = 0; // Character not mapped + displayable = 0; // Character not mapped } - if( displayable ) { + if( displayable ) { putchar( buffer[l] ); // Send it to the console @@ -382,3 +382,4 @@ void main (void) { return; } + diff --git a/samples/tutorial/sym1/symIO.c b/samples/tutorial/sym1/symIO.c index c52a71b11..d887c18b9 100644 --- a/samples/tutorial/sym1/symIO.c +++ b/samples/tutorial/sym1/symIO.c @@ -66,7 +66,7 @@ void main(void) { puts( "instructions again and type 'stop' to end the program.\n"); puts( "Available registers: DDR1A, IOR1A, DDR1B, IOR1B, DDR2A" ); puts( "IOR2A, DDR2B, IOR2B, DDR3A, IOR3A, DDR3B and IOR3B." ); - instr = 0; + instr = 0; } printf( "\n Command: " ); diff --git a/samples/tutorial/sym1/symNotepad.c b/samples/tutorial/sym1/symNotepad.c index e9866e526..bc28ef4b5 100644 --- a/samples/tutorial/sym1/symNotepad.c +++ b/samples/tutorial/sym1/symNotepad.c @@ -99,21 +99,21 @@ void main(void) { p--; } } - else if( c == 0x13 ) { // Save + else if( c == 0x13 ) { // Save puts( "\n========================= Save =========================" ); puts( "\nPress any key to save." ); c = getchar(); for( l = 0; l <= p; l++ ) { tapio[l] = buffer[l]; } - l++; + l++; tapio[l] = 0x00; puts( "Saving to tape." ); error = dumpt( 'N', (int) tapio, (int) tapio+p ); if( error ) { puts( "\nTape error." ); } - else + else { putchar( '\r' ); for( l = 0; l < 25; l++ ) { @@ -196,3 +196,4 @@ void main(void) { return; } +