mirror of
https://github.com/whscullin/apple2js.git
synced 2024-01-12 14:14:38 +00:00
41e0609f55
* Add `DiskMetada` to the `Disk` interface Before, metadata about the image, such as name, side, etc. was mixed in with actual disk image information. This change breaks that information into a separate structure called `DiskMetadata`. Currently, the only two fields are `name` and `side`, but the idea is that more fields could be added as necessary, like a description, a scan of the disk or label, etc. In a follow-on change, the default write-protection status will come from the metadata as well. The current implementation copies the metadata when saving/restoring state, loading disk images, etc. In the future, the metadata should passed around until the format is required to change (like saving one disk image format as another). Likewise, in the future, in may be desirable to be able to override the disk image metadata with user-supplied metadata. This could be use, for example, to temporarily add or remove write-protection from a disk image. All existing tests pass and the emulator builds with no errors. * Rename `writeMode` to `q7` Before, nibble disk emulation used the `writeMode` field to keep track of whether the drive should be read from or written to, but the WOZ emulation used `q7` to keep track of the same state. This change renames `writeMode` to `q7` because it more accurately reflects the state of the Disk II controller as specified in the manuals, DOS source, and, especially, _Understanding the Apple //e_ by Jim Sather. * Remove the coil state Before, `q` captured the state of the coils. But it was never read. This change just deletes it. * Use the bootstrap and sequencer ROMs with indirection Before, the contents of the bootstrap ROM and sequencer ROM were set directly on fields of the controller. These were not saved or restored with the state in `getState` and `setState`. (It would have been very space inefficient if they had). Now, these ROMs are used from constants indexed by the number of sectors the card supports. This, in turn, means that if the number of sectors is saved with the state, it can be easily restored. * Split out the Disk II controller state This change factors the emulated hardware state into a separate structure in the Disk II controller. The idea is that this hardware state will be able to be shared with the WOZ and nibble disk code instead of sharing _all_ of the controller state (like callbacks and so forth). * Factor out disk insertion Before, several places in the code essentially inserted a new disk image into the drive, which similar—but not always exactly the same—code. Now there is an `insertDisk` method that is responsible for inserting a new `FloppyDisk`. All tests pass, everything compiles, manually tested nibble disks and WOZ disks.
44 lines
1.5 KiB
TypeScript
44 lines
1.5 KiB
TypeScript
import { explodeSector16, PO } from './format_utils';
|
|
import { bytify } from '../util';
|
|
import type { byte } from '../types';
|
|
import { NibbleDisk, DiskOptions, ENCODING_NIBBLE } from './types';
|
|
|
|
/**
|
|
* Returns a `Disk` object from ProDOS-ordered image data.
|
|
* @param options the disk image and options
|
|
* @returns A nibblized disk
|
|
*/
|
|
export default function createDiskFromProDOS(options: DiskOptions) {
|
|
const { data, name, side, rawData, volume, readOnly } = options;
|
|
const disk: NibbleDisk = {
|
|
format: 'po',
|
|
encoding: ENCODING_NIBBLE,
|
|
metadata: { name, side },
|
|
volume: volume || 254,
|
|
tracks: [],
|
|
readOnly: readOnly || false,
|
|
};
|
|
|
|
for (let physical_track = 0; physical_track < 35; physical_track++) {
|
|
let track: byte[] = [];
|
|
for (let physical_sector = 0; physical_sector < 16; physical_sector++) {
|
|
const prodos_sector = PO[physical_sector];
|
|
let sector;
|
|
if (rawData) {
|
|
const off = (16 * physical_track + prodos_sector) * 256;
|
|
sector = new Uint8Array(rawData.slice(off, off + 256));
|
|
} else if (data) {
|
|
sector = data[physical_track][prodos_sector];
|
|
} else {
|
|
throw new Error('Requires data or rawData');
|
|
}
|
|
track = track.concat(
|
|
explodeSector16(volume, physical_track, physical_sector, sector)
|
|
);
|
|
}
|
|
disk.tracks[physical_track] = bytify(track);
|
|
}
|
|
|
|
return disk;
|
|
}
|