From 3f75a0d398d7a28520dcd29d586ef1a1437ca919 Mon Sep 17 00:00:00 2001 From: Leo Date: Fri, 1 Oct 2010 20:21:38 +0000 Subject: [PATCH] * More rcall --> lcall changes. git-svn-id: svn://cu.loc/avr-cpm/trunk@112 57430480-672e-4586-8877-bcf8adbbf3b7 --- avrcpm/avr/config.inc | 5 +++-- avrcpm/avr/dram-4bit.inc | 10 +++++----- avrcpm/avr/macros.inc | 6 +++++- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/avrcpm/avr/config.inc b/avrcpm/avr/config.inc index 358e227..7035a43 100644 --- a/avrcpm/avr/config.inc +++ b/avrcpm/avr/config.inc @@ -41,8 +41,9 @@ ;#define RAMSIZE 256*K*4 /* 1 chip 256Kx4 */ #define RAMSIZE 4*M*4 * 2 /* 2 chips 4Mx4 */ -#define FAT16_SUPPORT 1 /* Include Support for FAT16 Partitions */ - /* which may contain CP/M image files. */ +#ifndef FAT16_SUPPORT + #define FAT16_SUPPORT 1 /* Include Support for FAT16 Partitions */ +#endif /* which may contain CP/M image files. */ #define RAMDISKCNT 0 /* Number of RAM disks */ #define RAMDISKNR 'I'-'A' /* Drive "letter" for first RAM disk */ diff --git a/avrcpm/avr/dram-4bit.inc b/avrcpm/avr/dram-4bit.inc index 2e08ae8..2deba3d 100644 --- a/avrcpm/avr/dram-4bit.inc +++ b/avrcpm/avr/dram-4bit.inc @@ -85,7 +85,7 @@ ; xh = memaddrh, xl = memaddrl .macro mem_read_d - rcall dram_read + lcall dram_read mov @0,temp .endm @@ -95,7 +95,7 @@ .macro mem_read_ds movw xl,@1l - rcall dram_read + lcall dram_read mov @0,temp .endm @@ -104,7 +104,7 @@ ; xh = memaddrh, xl = memaddrl, temp = srcreg .macro mem_write - rcall dram_write + lcall dram_write .endm ;---------------------------------------------- @@ -124,7 +124,7 @@ .macro mem_write_s mov temp,@0 - rcall dram_write + lcall dram_write .endm ;---------------------------------------------- @@ -134,7 +134,7 @@ .macro mem_write_ds movw x,@0l mov temp,@1 - rcall dram_write + lcall dram_write .endm diff --git a/avrcpm/avr/macros.inc b/avrcpm/avr/macros.inc index 669938e..0c88274 100644 --- a/avrcpm/avr/macros.inc +++ b/avrcpm/avr/macros.inc @@ -137,7 +137,11 @@ ; printstring "String" .macro printstring - call printstr + .if FLASHEND > 0x0fff + call printstr + .else + rcall printstr + .endif .if strlen(@0) % 2 .db @0,0 .else -- 2.39.2