new: BD500 DOS70 support

Author: iss

ChangeLog.txt

@@ -3,6 +3,7 @@ Oricutron ChangeLog
 
 pre-release changes (work in progress)
 --------------------------------------
+* Updated BD500 for DOS70
 * Added option to disable menu color scheme
 * Updated BD500 support
 * Fixed crash with visual keyboard on/off

disk.c

@@ -1503,8 +1503,9 @@ void microdisc_write( struct microdisc *md, unsigned short addr, unsigned char d
 //                     the BD interface but it is safer to switch it
 //                     on in the boot sector (page 4) code.
 //
-// 0x312 DSTATS  R   on read (BIT instruction) to obtain the
-//                   FDC's DRQ in bit 7 and IRQ in bit 6.
+// 0x312 DSTATS  R   bit 7 - DRQ
+//                   bit 6 - IRQ
+//                   bit 0 - motor status (): b0=0 ON, b0=1 OFF (NOTE: DOS7 only).
 //
 // 0x313 MAPOFF  R/W enables the ORIC ROM and disables the overlay RAM.
 //
@@ -1525,6 +1526,11 @@ void microdisc_write( struct microdisc *md, unsigned short addr, unsigned char d
 //                   and therefore enables the overlay RAM when MAPON
 //                   has been accessed.
 //
+// 0x31a DRVSEL  R   bit 7,6 - current drive
+//                   bit 5   - current side
+//               W   bit 7,6 - select drive
+//                   bit 1   - select side
+//
 // 0x0380        R/W disables the BD interface ROM which covers addresses
 //                   0xE000 to 0xFFFF but before that is done, it takes
 //                   precedence over the above for that memory space.
@@ -1569,6 +1575,7 @@ void bd500_init( struct bd500 *bd, struct wd17xx *wd, struct machine *oric )
   bd->wd      = wd;
   bd->oric    = oric;
   bd->diskrom = SDL_TRUE;
+  bd->motor   = SDL_FALSE;
 }
 
 void bd500_free( struct bd500 *bd )
@@ -1580,6 +1587,8 @@ void bd500_free( struct bd500 *bd )
 
 unsigned char bd500_read( struct bd500 *bd, unsigned short addr )
 {
+  unsigned char ret = 0xff;
+
 //  dbg_printf( "DISK: (%04X) Read from %04X", bd->oric->cpu.pc-1, addr );
 
   if( ( addr >= 0x320 ) && ( addr < 0x324 ) )
@@ -1588,7 +1597,8 @@ unsigned char bd500_read( struct bd500 *bd, unsigned short addr )
   switch( addr )
   {
     case 0x312:
-      return (bd->drq | bd->intrq);
+      ret = bd->drq | bd->intrq;
+      if( bd->oric->dos70 ) ret |= bd->motor? 0:1;
       break;
 
     case 0x313:
@@ -1600,10 +1610,12 @@ unsigned char bd500_read( struct bd500 *bd, unsigned short addr )
       break;
 
     case 0x310:
-    case 0x311:
       // MOTOFF = 0
+      bd->motor = SDL_FALSE;
+      break;
+    case 0x311:
       // MOTON  = 1
-      // or MOTOR = addr & 1;
+      bd->motor = SDL_TRUE;
       break;
 
     case 0x315:
@@ -1621,6 +1633,12 @@ unsigned char bd500_read( struct bd500 *bd, unsigned short addr )
       bd->diskrom = bd->oric->rom16? SDL_FALSE : SDL_TRUE;
       break;
 
+    case 0x31a:
+      // bits 7,6 current drive
+      // bit 5 current side
+      ret = ((bd->wd->c_drive&3)<<6) | ((bd->wd->c_side&1)<<5);
+      break;
+
     case 0x0380:
       bd->diskrom = SDL_FALSE;
       break;
@@ -1629,7 +1647,7 @@ unsigned char bd500_read( struct bd500 *bd, unsigned short addr )
       break;
   }
 
-  return 0xff;
+  return ret;
 }
 
 void bd500_write( struct bd500 *bd, unsigned short addr, unsigned char data )

disk.h

@@ -178,6 +178,7 @@ struct bd500
   struct wd17xx *wd;      // Pointer to the WD17xx structure
   struct machine *oric;   // Pointer to the Oric structure
   SDL_bool diskrom;       // TRUE if the diskrom is enabled
+  SDL_bool motor;
 };
 
 // Current state of the Jasmin hardware

machine.c

@@ -315,7 +315,7 @@ void atmoswrite( struct m6502 *cpu, unsigned short addr, unsigned char data )
   struct machine *oric = (struct machine *)cpu->userdata;
 
 
-  if (oric->twilighteboard_activated &&  addr >= 0xc000  ) 
+  if (oric->twilighteboard_activated &&  addr >= 0xc000  )
     twilighteboard_oric_ROM_RAM_write(oric->twilighte,addr-0xc000,data);
   else
   if( ( !oric->romdis ) && ( addr >= 0xc000 ) ) return;  // Can't write to ROM!
@@ -327,7 +327,7 @@ void atmoswrite( struct m6502 *cpu, unsigned short addr, unsigned char data )
 
     else if( oric->ch376_activated && ( 0x340 <= addr ) && ( addr < 0x342 ) )
       ch376_oric_write(oric->ch376, addr, data);
-    
+
     else if(oric->twilighteboard_activated && ((0x342 <= addr && addr < 0x344 ) || (0x320 <= addr && addr < 0x330 )))
      twilighteboard_oric_write(oric->twilighte,addr,0x00,data);
 
@@ -407,7 +407,7 @@ void telestratwrite( struct m6502 *cpu, unsigned short addr, unsigned char data
             ch376_oric_write(oric->ch376, addr, data);
           break;
         }
-        
+
 
       default:
         via_write( &oric->via, addr, data );
@@ -1137,6 +1137,7 @@ void preinit_machine( struct machine *oric )
   oric->tapenoise = SDL_FALSE;
   oric->rawtape = SDL_FALSE;
   oric->rom16 = SDL_TRUE;
+  oric->dos70 = SDL_FALSE;
 
   oric->joy_iface = JOYIFACE_NONE;
   oric->joymode_a = JOYMODE_KB1;
@@ -1378,7 +1379,7 @@ SDL_bool emu_event( SDL_Event *ev, struct machine *oric, SDL_bool *needrender )
             if (oric->ch376 != NULL)
               ch376_oric_config(oric->ch376);
           }
-          
+
 
 
           break;

machine.h

@@ -136,7 +136,7 @@ struct machine
   int vsync;
 
   SDL_bool vid_double;
-  SDL_bool romdis, romon, rom16;
+  SDL_bool romdis, romon, rom16, dos70;
   SDL_bool vsynchack;
 
   unsigned short vid_addr;

main.c

@@ -423,6 +423,7 @@ static void load_config( struct start_opts *sto, struct machine *oric )
     if( read_config_bool(   &sto->lctmp[i], "hstretch",     &oric->hstretch ) ) continue;
     if( read_config_bool(   &sto->lctmp[i], "palghosting",  &oric->palghost ) ) continue;
     if( read_config_bool(   &sto->lctmp[i], "rom16",        &oric->rom16 ) ) continue;
+    if( read_config_bool(   &sto->lctmp[i], "dos70",        &oric->dos70 ) ) continue;
     if( read_config_string( &sto->lctmp[i], "diskimage",    sto->start_disk, 1024 ) ) continue;
     if( read_config_string( &sto->lctmp[i], "tapeimage",    sto->start_tape, 1024 ) ) continue;
     if( read_config_string( &sto->lctmp[i], "symbols",      sto->start_syms, 1024 ) ) continue;
@@ -1399,7 +1400,7 @@ void frameloop_normal( struct machine *oric, SDL_bool *framedone, SDL_bool *need
 
       if (!oric->twilighteboard_activated)
       tape_patches( oric );
-        
+
       via_clock( &oric->via, oric->cpu.icycles );
       ay_ticktock( &oric->ay, oric->cpu.icycles );
 

oricutron.cfg

@@ -101,6 +101,10 @@ debug = no
 ; rom16 = no  - 56k mode
 ;rom16 = yes
 
+; Support BD500/DOS70
+; dos70 = no (default)
+;dos70 = no
+
 ;                 ----------------------------------
 
 ; Render mode (soft, opengl)