Tag for Version 3.2

[avrcpm.git] / avr / avrcpm.asm

diff --git a/avr/avrcpm.asm b/avr/avrcpm.asm
index a04b58d3c77b688edd1e90da8c4bd9a692625c02..ba3b2544ea2dd4b2c4700c2aeacd6c9d1430c163 100644 (file)
--- a/avr/avrcpm.asm
+++ b/avr/avrcpm.asm
@@ -1,7 +1,7 @@
 ;    This is the main file, glueing all parts together.
 
 ;    Copyright (C) 2010 Sprite_tm
-;    Copyright (C) 2010 Leo C.
+;    Copyright (C) 2010,2012,2013 Leo C.
 ;
 ;    This file is part of avrcpm.
 ;
@@ -57,33 +57,37 @@
 
        .cseg
        .org 0
-       rjmp start              ; reset vector
+       ljmp start              ; reset vector
        
        .org INT_VECTORS_SIZE
 
-       .include "utils.asm"
-       .include "init.asm"
-       .include "dram-refresh.asm"
-       .include "timer.asm"
 #if DRAM_8BIT                  /* Implies software uart */
        .include "sw-uart.asm"
-       .include "i2c.asm"
-       .include "dram-8bit.asm"
 #else                          /* 4 bit RAM, hardware uart */
        .include "hw-uart.asm"
-       .include "dram-4bit.asm"
 #endif
+
+       .include "utils.asm"
+       .include "init.asm"
+       .include "timer.asm"
        .include "heap.asm"
        .include "mmc.asm"
-;      .include "mmc-old.asm"
 
+#if DRAM_8BIT                  /* Implies software uart */
+       .include "dram-8bit.asm"
+#else                          /* 4 bit RAM, hardware uart */
+       .include "dram-4bit.asm"
+#endif
+#if DRAM_8BIT                  /* Implies software uart */
+       .include "i2c.asm"
+#endif
 ; >>>-------------------------------------- File System Management
-       .include "dsk_fsys.asm"         ; Basic Filesystem definitions
-       .include "dsk_mgr.asm"          ; Disk- Manager
        .include "dsk_cpm.asm"          ; CPM- Disk Interaktion
        .include "dsk_fat16.asm"        ; FAT16-DISK Interaktion
        .include "dsk_ram.asm"          ; RAM- Disk Interaktion
-       .include "virt_ports.asm"       ; Virtual Ports for BIOS
+       .include "dsk_mgr.asm"          ; Disk- Manager
+       .include "dsk_fsys.asm"         ; Basic Filesystem definitions
+
 ; <<<-------------------------------------- File System Management
 
 ;      .include "8080int-orig.asm"     ;Old 8080 interpreter.
@@ -93,6 +97,9 @@
 ;      .include "8080int-jmp.asm"      ;
        .include "Z80int-jmp.asm"       ;
 
+       .include "virt_ports.asm"       ; Virtual Ports for BIOS
+       .include "dram-refresh.asm"
+
 
        .dseg
 ramtop:        .byte   0