Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-04 16:34:53 +03:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

bbc: preliminary support for FSD format.

Browse Source
This commit is contained in:
Nigel Barnes 2015-11-15 02:38:06 +00:00
parent 1c79e53fbc
commit 5d004af6c9
4 changed files with 237 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/src/lib.lua
View File

@ -261,6 +261,8 @@ project "formats"
MAME_DIR .. "src/lib/formats/fmsx_cas.h",
MAME_DIR .. "src/lib/formats/fmtowns_dsk.cpp",
MAME_DIR .. "src/lib/formats/fmtowns_dsk.h",
MAME_DIR .. "src/lib/formats/fsd_dsk.cpp",
MAME_DIR .. "src/lib/formats/fsd_dsk.h",
MAME_DIR .. "src/lib/formats/g64_dsk.cpp",
MAME_DIR .. "src/lib/formats/g64_dsk.h",
MAME_DIR .. "src/lib/formats/gtp_cas.cpp",

180
src/lib/formats/fsd_dsk.cpp Normal file
View File

@ -0,0 +1,180 @@
// license:BSD-3-Clause
// copyright-holders:Nigel Barnes
/***************************************************************************
BBC Micro 8271 protected disk image format
Disk image format
***************************************************************************/
#include "emu.h"
#include "fsd_dsk.h"
/*********************************************************************
BBC Micro 8271 protected disk image format
Header:
=======
Identifier: "FSD" string literal 3 bytes
Creator: 5 bytes; date of creation/author
Title: Character string (unlimited length; may contain any but null)
Title_End: 0x00 byte literal 1 byte
Num_Tr: xx 1 byte, number of tracks
For each track
==============
track_num: 1 byte
num_sec: 1 byte (00 == unformatted)
readable: 1 byte (00 == unreadable, ff ==readable)
If readable:
For each sector
===============
Track_ID: 1 byte
Head_number: 1 byte
Sector_ID: 1 byte
reported_size: 1 byte (2^{7+x}; 0 ==>128, 1 ==> 256, 2==>512, 3==>1024 etc)
real_size: 1 byte (2^{7+x})
error_code: 1 byte (0==No Error, &20==Deleted Data; &0E = Data CRC Error)
data: <real_size> bytes
Note that error_code matches the OSWORD &7F result byte
If unreadable:
Track_ID: 1 byte
Head_number: 1 byte
Sector_ID: 1 byte
reported_size: 1 byte
Decoding of the "creator" 5 byte field:
=======================================
(byte1 byte2 byte3 byte4 byte5)
Date_DD = (byte1 AND &F8)/8
Date_MM = (byte3 AND &0F)
Date_YYYY = (byte1 AND &07)*256+byte2
Creator_ID = (byte3 AND &F0)/16
Release_num = ((byte5 AND &C0)/64)*256 + byte4
*********************************************************************/
fsd_format::fsd_format()
{
}
const char *fsd_format::name() const
{
return "fsd";
}
const char *fsd_format::description() const
{
return "BBC Micro 8271 protected disk image";
}
const char *fsd_format::extensions() const
{
return "fsd";
}
bool fsd_format::supports_save() const
{
return false;
}
int fsd_format::identify(io_generic *io, UINT32 form_factor)
{
UINT8 h[3];
io_generic_read(io, h, 0, 3);
if (memcmp(h, "FSD", 3) == 0) {
return 100;
}
return 0;
}
bool fsd_format::load(io_generic *io, UINT32 form_factor, floppy_image *image)
{
UINT64 size = io_generic_size(io);
dynamic_buffer img(size);
io_generic_read(io, &img[0], 0, size);
UINT64 pos;
std::string title;
for(pos=8; pos < size && img[pos] != NULL; pos++)
title += char(img[pos]);
pos++;
if(pos >= size)
return false;
//popmessage("Loading image of '%s'\n", title);
desc_pc_sector sects[10];
UINT8 total_tracks = img[pos++];
UINT8 tnum, hnum, snum, ssize, error;
hnum = 0;
//osd_printf_verbose("%d Tracks\n", total_tracks+1);
//osd_printf_verbose("Tr.# No.S Sec.# Tr.ID Head# SecID IDsiz REsiz Error\n");
for(int curr_track=0; curr_track <= total_tracks; curr_track++)
{
UINT8 track = img[pos++];
UINT8 spt = img[pos++];
//osd_printf_verbose("%x %x\n", track, spt);
if (spt > 0) // formatted
{
UINT8 readable = img[pos++];
for (int i = 0; i < spt; i++)
{
tnum = img[pos++]; // logical track
hnum = img[pos++]; // head number
snum = img[pos++]; // logical sector
ssize = img[pos++]; // reported size
sects[i].track = tnum;
sects[i].head = hnum;
sects[i].sector = snum;
sects[i].size = ssize;
if (readable == 0xff)
{
sects[i].actual_size = 1 << (img[pos++] + 7);
error = img[pos++];
sects[i].deleted = (error & 0x20) == 0x20;
sects[i].bad_crc = (error & 0x0e) == 0x0e;
sects[i].data = &img[pos];
pos += sects[i].actual_size;
//osd_printf_verbose("Read %x %x %x %x %x %x %x\n", i, sects[i].track, sects[i].head, sects[i].sector, sects[i].size, sects[i].actual_size, error);
}
else
{
throw emu_fatalerror("fsd_format: Unsupported unreadable sector on track %d sector %d head %d", track, i, hnum);
// Unreadable sectors not supported!!
//sects[i].track = track;
//sects[i].head = 0;
//sects[i].sector = i;
//sects[i].size = 0;
//sects[i].actual_size = 0;
//sects[i].deleted = false;
//sects[i].bad_crc = false;
//sects[i].data = NULL;
//osd_printf_verbose("Unread %x %x %x %x %x %x %x\n", i, sects[i].track, sects[i].head, sects[i].sector, sects[i].size, sects[i].actual_size, 0);
}
}
}
else // unformatted
{
sects[0].track = curr_track;
sects[0].head = hnum;
sects[0].sector = 0;
sects[0].size = 0;
//osd_printf_verbose("Unform %x %x %x %x %x %x %x\n", 0, sects[0].track, sects[0].head, sects[0].sector, sects[0].size, sects[0].actual_size, 0);
}
build_wd_track_fm(curr_track, hnum, image, 50000, spt, sects, 10, 40, 10);
}
return true;
}
const floppy_format_type FLOPPY_FSD_FORMAT = &floppy_image_format_creator<fsd_format>;

43
src/lib/formats/fsd_dsk.h Normal file
View File

@ -0,0 +1,43 @@
// license:BSD-3-Clause
// copyright-holders:Nigel Barnes
/***************************************************************************
BBC Micro
Disk image formats
***************************************************************************/
#pragma once
#ifndef __FSD_DSK_H__
#define __FSD_DSK_H__
#include "flopimg.h"
#include "wd177x_dsk.h"
/**************************************************************************/
LEGACY_FLOPPY_OPTIONS_EXTERN(fsd);
/**************************************************************************/
class fsd_format : public floppy_image_format_t
{
public:
fsd_format();
virtual const char *name() const;
virtual const char *description() const;
virtual const char *extensions() const;
virtual bool supports_save() const;
virtual int identify(io_generic *io, UINT32 form_factor);
virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image);
};
extern const floppy_format_type FLOPPY_FSD_FORMAT;
#endif // __FSD_DSK_H__

24
src/mame/drivers/bbc.cpp
View File

@ -55,7 +55,7 @@
/* Devices */
#include "imagedev/flopdrv.h"
#include "formats/bbc_dsk.h"
//#include "formats/fsd_dsk.h"
#include "formats/fsd_dsk.h"
#include "imagedev/cassette.h"
#include "formats/uef_cas.h"
#include "formats/csw_cas.h"
@ -683,16 +683,16 @@ WRITE_LINE_MEMBER(bbc_state::bbcb_acia6850_irq_w)
FLOPPY_FORMATS_MEMBER( bbc_state::floppy_formats_bbc )
FLOPPY_BBC_DFS_FORMAT,
FLOPPY_BBC_CPM_FORMAT
//FLOPPY_FSD_FORMAT
FLOPPY_BBC_CPM_FORMAT,
FLOPPY_FSD_FORMAT
FLOPPY_FORMATS_END
FLOPPY_FORMATS_MEMBER( bbc_state::floppy_formats_bbcm )
FLOPPY_BBC_DFS_FORMAT,
FLOPPY_BBC_ADFS_FORMAT,
FLOPPY_BBC_CPM_FORMAT,
FLOPPY_BBC_DOS_FORMAT
//FLOPPY_FSD_FORMAT
FLOPPY_BBC_DOS_FORMAT,
FLOPPY_FSD_FORMAT
FLOPPY_FORMATS_END
FLOPPY_FORMATS_MEMBER( bbc_state::floppy_formats_bbcmc )
@ -882,7 +882,7 @@ static MACHINE_CONFIG_DERIVED( bbcb, bbca )
/* software lists */
MCFG_SOFTWARE_LIST_ADD("cass_ls_b", "bbcb_cass")
MCFG_SOFTWARE_LIST_ADD("flop_ls_b", "bbcb_flop")
//MCFG_SOFTWARE_LIST_ADD("flop_ls_b_orig", "bbcb_orig_flop")
MCFG_SOFTWARE_LIST_ADD("flop_ls_b_orig", "bbcb_orig_flop")
MCFG_SOFTWARE_LIST_ADD("flop_ls_z80", "bbc_z80_flop")
MCFG_SOFTWARE_LIST_ADD("flop_ls_32016", "bbc_32016_flop")
MACHINE_CONFIG_END
@ -978,7 +978,7 @@ static MACHINE_CONFIG_DERIVED( abc110, bbcbp )
MCFG_SOFTWARE_LIST_REMOVE("cass_ls_a")
MCFG_SOFTWARE_LIST_REMOVE("cass_ls_b")
MCFG_SOFTWARE_LIST_REMOVE("flop_ls_b")
//MCFG_SOFTWARE_LIST_REMOVE("flop_ls_b_orig")
MCFG_SOFTWARE_LIST_REMOVE("flop_ls_b_orig")
MCFG_SOFTWARE_LIST_REMOVE("flop_ls_32016")
MACHINE_CONFIG_END
@ -999,7 +999,7 @@ static MACHINE_CONFIG_DERIVED( acw443, bbcbp )
MCFG_SOFTWARE_LIST_REMOVE("cass_ls_a")
MCFG_SOFTWARE_LIST_REMOVE("cass_ls_b")
MCFG_SOFTWARE_LIST_REMOVE("flop_ls_b")
//MCFG_SOFTWARE_LIST_REMOVE("flop_ls_b_orig")
MCFG_SOFTWARE_LIST_REMOVE("flop_ls_b_orig")
MCFG_SOFTWARE_LIST_REMOVE("flop_ls_z80")
MACHINE_CONFIG_END
@ -1051,7 +1051,7 @@ static MACHINE_CONFIG_DERIVED( reutapm, bbcbp )
MCFG_SOFTWARE_LIST_REMOVE("cass_ls_a")
MCFG_SOFTWARE_LIST_REMOVE("cass_ls_b")
MCFG_SOFTWARE_LIST_REMOVE("flop_ls_b")
//MCFG_SOFTWARE_LIST_REMOVE("flop_ls_b_orig")
MCFG_SOFTWARE_LIST_REMOVE("flop_ls_b_orig")
MCFG_SOFTWARE_LIST_REMOVE("flop_ls_z80")
MCFG_SOFTWARE_LIST_REMOVE("flop_ls_32016")
MACHINE_CONFIG_END
@ -1140,7 +1140,7 @@ static MACHINE_CONFIG_START( bbcm, bbc_state )
MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("cass_ls_a", "bbca_cass")
MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("cass_ls_b", "bbcb_cass")
MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("flop_ls_b", "bbcb_flop")
//MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("flop_ls_b_orig", "bbcb_orig_flop")
MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("flop_ls_b_orig", "bbcb_orig_flop")
/* acia */
MCFG_DEVICE_ADD("acia6850", ACIA6850, 0)
@ -1230,7 +1230,7 @@ static MACHINE_CONFIG_DERIVED( bbcmet, bbcm )
MCFG_SOFTWARE_LIST_REMOVE("cass_ls_b")
MCFG_SOFTWARE_LIST_REMOVE("flop_ls_m")
MCFG_SOFTWARE_LIST_REMOVE("flop_ls_b")
//MCFG_SOFTWARE_LIST_REMOVE("flop_ls_b_orig")
MCFG_SOFTWARE_LIST_REMOVE("flop_ls_b_orig")
MCFG_SOFTWARE_LIST_REMOVE("flop_ls_z80")
MCFG_SOFTWARE_LIST_REMOVE("flop_ls_32016")
@ -1301,7 +1301,7 @@ static MACHINE_CONFIG_DERIVED( bbcmc, bbcm )
MCFG_SOFTWARE_LIST_REMOVE("cass_ls_b")
MCFG_SOFTWARE_LIST_REMOVE("flop_ls_m")
MCFG_SOFTWARE_LIST_REMOVE("flop_ls_b")
//MCFG_SOFTWARE_LIST_REMOVE("flop_ls_b_orig")
MCFG_SOFTWARE_LIST_REMOVE("flop_ls_b_orig")
MCFG_SOFTWARE_LIST_REMOVE("flop_ls_z80")
MCFG_SOFTWARE_LIST_REMOVE("flop_ls_32016")
MCFG_SOFTWARE_LIST_REMOVE("cart_ls_m")