Apple-2-Tools/apple2js
1
0
Fork 0
mirror of https://github.com/whscullin/apple2js.git synced 2024-01-12 14:14:38 +00:00
Code Issues Projects Releases Wiki Activity

Naming cleanup

Browse Source
This commit is contained in:
Will Scullin 2021-07-03 15:39:45 -07:00
parent ac4a7cfaf2
commit d050e637d1
No known key found for this signature in database
GPG Key ID: 26DCD1042C6638CD
10 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/cards/cffa.ts
View File

@ -14,7 +14,7 @@ import { debug, toHex } from '../util';
import { rom as readOnlyRom } from '../roms/cards/cffa';
import { read2MGHeader } from '../formats/2mg';
import { ProDOSVolume } from '../formats/prodos';
import BlockVolume from '../formats/block';
import createBlockDisk from '../formats/block';
import { dump } from '../formats/prodos/utils';
import {
BlockDisk,
@ -475,7 +475,7 @@ export default class CFFA implements Card, MassStorage, Restorable<CFFAState> {
volume,
readOnly
};
const disk = BlockVolume(options);
const disk = createBlockDisk(options);
return this.setBlockVolume(drive, disk);
}

4
js/cards/smartport.ts
View File

@ -15,7 +15,7 @@ import { Card, Restorable, byte, word, rom } from '../types';
import { MassStorage, BlockDisk, ENCODING_BLOCK } from '../formats/types';
import CPU6502, { CpuState, flags } from '../cpu6502';
import { read2MGHeader } from '../formats/2mg';
import BlockVolume from '../formats/block';
import createBlockDisk from '../formats/block';
export interface SmartPortState {
disks: BlockDisk[]
@ -468,7 +468,7 @@ export default class SmartPort implements Card, MassStorage, Restorable<SmartPor
readOnly,
volume,
};
const disk = BlockVolume(options);
const disk = createBlockDisk(options);
this.disks[drive] = disk;
return true;

2
js/formats/2mg.ts
View File

@ -64,7 +64,7 @@ export function read2MGHeader(rawData: ArrayBuffer) {
* Returns a `Disk` object from a 2mg image.
* @param options the disk image and options
*/
export default function _2MG(options: DiskOptions) {
export default function createDiskFrom2MG(options: DiskOptions) {
let { rawData } = options;
let disk;

2
js/formats/block.ts
View File

@ -15,7 +15,7 @@ import { DiskOptions, BlockDisk, ENCODING_BLOCK } from './types';
* Returns a `Disk` object for a block volume with block-ordered data.
* @param options the disk image and options
*/
export default function BlockVolume(options: DiskOptions): BlockDisk {
export default function createBlockDisk(options: DiskOptions): BlockDisk {
const { rawData, readOnly, name } = options;
if (!rawData) {

24
js/formats/create_disk.ts
View File

@ -1,35 +1,35 @@
import { includes, memory } from '../types';
import { base64_decode } from '../base64';
import { Disk, NibbleFormat, DiskOptions, JSONDisk, NIBBLE_FORMATS } from './types';
import _2MG from './2mg';
import D13 from './d13';
import DOS from './do';
import ProDOS from './po';
import Woz from './woz';
import Nibble from './nib';
import createDiskFrom2MG from './2mg';
import createDiskFromD13 from './d13';
import createDiskFromDOS from './do';
import createDiskFromProDOS from './po';
import createDiskFromWoz from './woz';
import createDiskFromNibble from './nib';
export function createDisk(fmt: NibbleFormat, options: DiskOptions) {
let disk: Disk | null = null;
switch (fmt) {
case '2mg':
disk = _2MG(options) as Disk;
disk = createDiskFrom2MG(options) as Disk;
break;
case 'd13':
disk = D13(options);
disk = createDiskFromD13(options);
break;
case 'do':
case 'dsk':
disk = DOS(options);
disk = createDiskFromDOS(options);
break;
case 'nib':
disk = Nibble(options);
disk = createDiskFromNibble(options);
break;
case 'po':
disk = ProDOS(options);
disk = createDiskFromProDOS(options);
break;
case 'woz':
disk = Woz(options);
disk = createDiskFromWoz(options);
break;
}

2
js/formats/d13.ts
View File

@ -16,7 +16,7 @@ import { NibbleDisk, DiskOptions, ENCODING_NIBBLE } from './types';
* Returns a `Disk` object from DOS 3.2-ordered image data.
* @param options the disk image and options
*/
export default function DOS13(options: DiskOptions) {
export default function createDiskFromDOS13(options: DiskOptions) {
const { data, name, rawData, volume, readOnly } = options;
const disk: NibbleDisk = {
format: 'd13',

2
js/formats/do.ts
View File

@ -18,7 +18,7 @@ import { NibbleDisk, DiskOptions, ENCODING_NIBBLE } from './types';
* Returns a `Disk` object from DOS-ordered image data.
* @param options the disk image and options
*/
export default function DOS(options: DiskOptions): NibbleDisk {
export default function createDiskFromDOS(options: DiskOptions): NibbleDisk {
const { data, name, rawData, volume, readOnly } = options;
const disk: NibbleDisk = {
format: 'dsk',

2
js/formats/nib.ts
View File

@ -16,7 +16,7 @@ import { memory } from '../types';
* Returns a `Disk` object from raw nibble image data.
* @param options the disk image and options
*/
export default function Nibble(options: DiskOptions): NibbleDisk {
export default function createDiskFromNibble(options: DiskOptions): NibbleDisk {
const { data, name, rawData, volume, readOnly } = options;
const disk: NibbleDisk = {
format: 'nib',

2
js/formats/po.ts
View File

@ -18,7 +18,7 @@ import { NibbleDisk, DiskOptions, ENCODING_NIBBLE } from './types';
* Returns a `Disk` object from ProDOS-ordered image data.
* @param options the disk image and options
*/
export default function ProDOS(options: DiskOptions) {
export default function createDiskFromNProDOS(options: DiskOptions) {
const { data, name, rawData, volume, readOnly } = options;
const disk: NibbleDisk = {
format: 'nib',

2
js/formats/woz.js
View File

@ -189,7 +189,7 @@ function MetaChunk(data) {
* @param {*} options the disk image and options
* @returns {import('./format_utils').Disk}
*/
export default function Woz(options) {
export default function createDiskFromWoz(options) {
const { rawData } = options;
const dv = new DataView(rawData, 0);
let dvOffset = 0;