* More rcall --> lcall changes.

git-svn-id: svn://cu.loc/avr-cpm/trunk@112 57430480-672e-4586-8877-bcf8adbbf3b7

diff --git a/avrcpm/avr/config.inc b/avrcpm/avr/config.inc
index 358e2273dc1e426d91167ea23750ad4f1f706533..7035a43b78fce1cbc6f662acb8b37f6eadbf2fd5 100644 (file)
--- 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 2e08ae8aa757f9f58df996f6e289e842093c83ad..2deba3da5d75ecd1734fb2693897afce1bef85fa 100644 (file)
--- 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 669938ebbc7c03eef14ce20bfc5fef895a1de7a4..0c882744240da65d5f060f994ed2394071e800e0 100644 (file)
--- 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