CP/M-IDE - Pro IDE optimisation

Author: feilipu

ROMs/CPM-IDE/acia/cpm22bios.asm

@@ -1188,6 +1188,7 @@ putc_buffer_tx:
 
     ld de,__IO_PIO_IDE_COMMAND<<8|__IDE_CMD_READ
     call ide_write_byte_preset  ;ask the drive to read it
+
     call ide_wait_ready         ;make sure drive is ready to proceed
     call ide_wait_drq           ;wait until it's got the data
 
@@ -1219,18 +1220,17 @@ putc_buffer_tx:
 
     ld de,__IO_PIO_IDE_COMMAND<<8|__IDE_CMD_WRITE
     call ide_write_byte_preset  ;instruct drive to write a sector
+
     call ide_wait_ready         ;make sure drive is ready to proceed
     call ide_wait_drq           ;wait until it wants the data
 
     call ide_write_block        ;send the data to the drive from (HL++)
-    call ide_wait_ready
 
+;   call ide_wait_ready
 ;   ld de, __IO_PIO_IDE_COMMAND<<8|__IDE_CMD_CACHE_FLUSH
 ;   call ide_write_byte         ;tell drive to flush its hardware cache
-;   call ide_wait_ready         ;wait until the write is complete
 
-    scf                         ;carry = 1 on return = operation ok
-    ret
+    jp ide_wait_ready           ;wait until the write is complete
 
 PUBLIC  _cpm_bios_tail
 _cpm_bios_tail:             ;tail of the cpm bios

ROMs/CPM-IDE/acia/main.c

@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/compiler.h>
+#include <cpu.h>
 
 #include <arch.h>
 #include <arch/rc2014.h>
@@ -145,6 +146,7 @@ int8_t ya_mkcpm(char ** args)   /* initialise CP/M with up to 4 drives */
             i++;                // go to next file
         }
         fprintf(stdout,"Initialised CP/M\n");
+        cpu_delay_ms(1);        // output message before queue is flushed
         cpm_boot();
     }
     return 1;

ROMs/CPM-IDE/pro/cpm22bios.asm

@@ -1307,7 +1307,7 @@ siob_putc_buffer_tx:
     ret
 
 ;------------------------------------------------------------------------------
-; Routines that talk with the IDE drive, these should be called by
+; Routines that talk with the IDE drive, these should not be called by
 ; the main program.
 
 ; read a sector
@@ -1331,21 +1331,17 @@ siob_putc_buffer_tx:
     call ide_wait_drq           ;wait until it's got the data
 
     ;Read a block of 512 bytes (one sector) from the drive
-    ;16 bit data register and store it in memory at (HL++)
+    ;8 bit data register and store it in memory at (HL++)
 
-    ld b,0                      ;keep iterative count in b
-.ide_rdblk
-    in a,(__IO_CF_IDE_DATA)     ;read the data byte (hl++)
-    ld (hl+),a
-    in a,(__IO_CF_IDE_DATA)     ;read the data byte (hl++)
-    ld (hl+),a
-    djnz ide_rdblk              ;keep iterative count in b
+    ld bc,__IO_CF_IDE_DATA&0xFF ;keep iterative count in b, I/O port in c
+    inir
+    inir
 
     scf                         ;carry = 1 on return = operation ok
     ret
 
 ;------------------------------------------------------------------------------
-; Routines that talk with the IDE drive, these should be called by
+; Routines that talk with the IDE drive, these should not be called by
 ; the main program.
 
 ; write a sector
@@ -1369,15 +1365,11 @@ siob_putc_buffer_tx:
     call ide_wait_drq           ;wait until it wants the data
 
     ;Write a block of 512 bytes (one sector) from (HL++) to
-    ;the drive 16 bit data register
-
-    ld b,0                      ;keep iterative count in b
-.ide_wrblk
-    ld a,(hl+)
-    out (__IO_CF_IDE_DATA),a    ;write the data byte (hl++)
-    ld a,(hl+)
-    out (__IO_CF_IDE_DATA),a    ;write the data byte (hl++)
-    djnz ide_wrblk              ;keep iterative count in b
+    ;the drive 8 bit data register
+
+    ld bc,__IO_CF_IDE_DATA&0xFF ;keep iterative count in b, I/O port in c
+    otir
+    otir
 
 ;   call ide_wait_ready
 ;   ld a,__IDE_CMD_CACHE_FLUSH

ROMs/CPM-IDE/pro/main.c

@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/compiler.h>
+#include <cpu.h>
 
 #include <arch.h>
 #include <arch/rc2014.h>
@@ -158,6 +159,7 @@ int8_t ya_mkcpm(char ** args)   /* initialise CP/M with up to 4 drives */
             i++;                // go to next file
         }
         fprintf(output,"Initialised CP/M\n");
+        cpu_delay_ms(1);        // output message before queue is flushed
         cpm_boot();
     }
     return 1;