From 66d3d22a3790c31b98c3837a021d5e20e68de124 Mon Sep 17 00:00:00 2001 From: Christopher Mosher Date: Sat, 21 Apr 2012 22:10:39 -0400 Subject: [PATCH] fix paths in config files --- conf/epple2.a2bare.conf.in | 6 +++--- conf/epple2.a2dos31.conf.in | 10 +++++----- conf/epple2.a2dos33.conf.in | 10 +++++----- conf/epple2.a2loaded.conf.in | 19 ++++++++++--------- conf/epple2.a2pbare.conf.in | 4 ++-- conf/epple2.a2pdos33.conf.in | 8 ++++---- conf/epple2.a2ploaded.conf.in | 18 +++++++++--------- conf/epple2.conf.in | 24 ++++++++++++------------ conf/epple2.rev0bare.conf.in | 6 +++--- 9 files changed, 53 insertions(+), 52 deletions(-) diff --git a/conf/epple2.a2bare.conf.in b/conf/epple2.a2bare.conf.in index 37c087f..9ec439b 100644 --- a/conf/epple2.a2bare.conf.in +++ b/conf/epple2.a2bare.conf.in @@ -6,6 +6,6 @@ -import motherboard rom 1000 $(PREFIX)lib/apple2/system/intbasic/intbasic.a65 -import motherboard rom 2425 $(PREFIX)lib/apple2/system/other/other.a65 -import motherboard rom 2800 $(PREFIX)lib/apple2/system/monitor/apple2/monitor.a65 +import motherboard rom 1000 $(PREFIX)lib/apple2/system/a2/intbasic.a65 +import motherboard rom 2425 $(PREFIX)lib/apple2/system/a2/other.a65 +import motherboard rom 2800 $(PREFIX)lib/apple2/system/a2/monitor.a65 diff --git a/conf/epple2.a2dos31.conf.in b/conf/epple2.a2dos31.conf.in index 91ffed1..5f918ad 100644 --- a/conf/epple2.a2dos31.conf.in +++ b/conf/epple2.a2dos31.conf.in @@ -10,15 +10,15 @@ # Integer BASIC and old Monitor ROMs -import motherboard rom 1000 $(PREFIX)lib/apple2/system/intbasic/intbasic.a65 -import motherboard rom 2425 $(PREFIX)lib/apple2/system/other/other.a65 -import motherboard rom 2800 $(PREFIX)lib/apple2/system/monitor/apple2/monitor.a65 +import motherboard rom 1000 $(PREFIX)lib/apple2/system/a2/intbasic.a65 +import motherboard rom 2425 $(PREFIX)lib/apple2/system/a2/other.a65 +import motherboard rom 2800 $(PREFIX)lib/apple2/system/a2/monitor.a65 # Disk ][ card with 13-sector ROMs slot 6 disk -import slot 6 rom 0 $(PREFIX)lib/apple2/dos3x/13sector/controller/disk2.a65 +import slot 6 rom 0 $(PREFIX)lib/apple2/dos/13sector/disk2.a65 # Insert DOS 3.1 System Master disk into drive 1 -load slot 6 drive 1 $(PREFIX)lib/apple2/dos3x/13sector/disks/dos310/clean31sysmas_stock_rawdos.nib +load slot 6 drive 1 $(PREFIX)lib/apple2/dos/13sector/dos310/clean31sysmas_stock_rawdos.nib diff --git a/conf/epple2.a2dos33.conf.in b/conf/epple2.a2dos33.conf.in index 0175567..89afc7c 100644 --- a/conf/epple2.a2dos33.conf.in +++ b/conf/epple2.a2dos33.conf.in @@ -10,9 +10,9 @@ # Integer BASIC and old Monitor ROMs -import motherboard rom 1000 $(PREFIX)lib/apple2/system/intbasic/intbasic.a65 -import motherboard rom 2425 $(PREFIX)lib/apple2/system/other/other.a65 -import motherboard rom 2800 $(PREFIX)lib/apple2/system/monitor/apple2/monitor.a65 +import motherboard rom 1000 $(PREFIX)lib/apple2/system/a2/intbasic.a65 +import motherboard rom 2425 $(PREFIX)lib/apple2/system/a2/other.a65 +import motherboard rom 2800 $(PREFIX)lib/apple2/system/a2/monitor.a65 @@ -23,7 +23,7 @@ slot 0 language # Disk ][ controller card in slot 6, with 16-sector ROMs slot 6 disk -import slot 6 rom 0 $(PREFIX)lib/apple2/dos3x/16sector/controller/disk2.a65 +import slot 6 rom 0 $(PREFIX)lib/apple2/dos/16sector/disk2.a65 # Insert DOS 3.3 System Master disk (original version) in drive 1 -load slot 6 drive 1 $(PREFIX)lib/apple2/dos3x/16sector/disks/dos330/clean330sysmas.nib +load slot 6 drive 1 $(PREFIX)lib/apple2/dos/16sector/dos330/clean330sysmas.nib diff --git a/conf/epple2.a2loaded.conf.in b/conf/epple2.a2loaded.conf.in index 94b79ec..1d2e828 100644 --- a/conf/epple2.a2loaded.conf.in +++ b/conf/epple2.a2loaded.conf.in @@ -10,9 +10,9 @@ # Integer BASIC and old Monitor ROMs -import motherboard rom 1000 $(PREFIX)lib/apple2/system/intbasic/intbasic.a65 -import motherboard rom 2425 $(PREFIX)lib/apple2/system/other/other.a65 -import motherboard rom 2800 $(PREFIX)lib/apple2/system/monitor/apple2/monitor.a65 +import motherboard rom 1000 $(PREFIX)lib/apple2/system/a2/intbasic.a65 +import motherboard rom 2425 $(PREFIX)lib/apple2/system/a2/other.a65 +import motherboard rom 2800 $(PREFIX)lib/apple2/system/a2/monitor.a65 @@ -46,23 +46,24 @@ import slot 4 rom 0 $(PREFIX)lib/epple2/cards/clock.a65 # This will read (DOS 3.1, 3.2, and 3.2.1) disks, which # have 13 sectors per track. slot 5 disk -import slot 5 rom 0 $(PREFIX)lib/apple2/dos3x/13sector/controller/disk2.a65 +import slot 5 rom 0 $(PREFIX)lib/apple2/dos/13sector/disk2.a65 # Insert the DOS 3.1 System Master disk into drive 1 of slot 5 -load slot 5 drive 1 $(PREFIX)lib/apple2/dos3x/13sector/disks/dos310/clean31sysmas_stock_rawdos.nib +load slot 5 drive 1 $(PREFIX)lib/apple2/dos/13sector/dos310/clean31sysmas_stock_rawdos.nib # Disk ][ controller card in slot 6, with 16-sector ROMs. # This will read (DOS 3.3) disks, which have 16 sectors per track. slot 6 disk -import slot 6 rom 0 $(PREFIX)lib/apple2/dos3x/16sector/controller/disk2.a65 +import slot 6 rom 0 $(PREFIX)lib/apple2/dos/16sector/disk2.a65 # Insert the DOS 3.3 System Master disk (original version) into slot 6 -load slot 6 drive 1 $(PREFIX)lib/apple2/dos3x/16sector/disks/dos330/clean330sysmas.nib +load slot 6 drive 1 $(PREFIX)lib/apple2/dos/16sector/dos330/clean330sysmas.nib # Firmware card with Applesoft and Autostart Monitor. # DOS will not use this firmware card, because it is not in slot 0. slot 7 firmware -import slot 7 rombank 0000 $(PREFIX)lib/apple2/system/applesoft/applesoft.a65 -import slot 7 rombank 2800 $(PREFIX)lib/apple2/system/monitor/apple2plus/monitor.a65 +import slot 7 rombank 0000 $(PREFIX)lib/apple2/system/a2p/applesoft.a65 +import slot 7 rombank 2800 $(PREFIX)lib/apple2/system/a2p/monitor.a65 + diff --git a/conf/epple2.a2pbare.conf.in b/conf/epple2.a2pbare.conf.in index 3365db4..bd55c2e 100644 --- a/conf/epple2.a2pbare.conf.in +++ b/conf/epple2.a2pbare.conf.in @@ -6,5 +6,5 @@ -import motherboard rom 0000 $(PREFIX)lib/apple2/system/applesoft/applesoft.a65 -import motherboard rom 2800 $(PREFIX)lib/apple2/system/monitor/apple2plus/monitor.a65 +import motherboard rom 0000 $(PREFIX)lib/apple2/system/a2p/applesoft.a65 +import motherboard rom 2800 $(PREFIX)lib/apple2/system/a2p/monitor.a65 diff --git a/conf/epple2.a2pdos33.conf.in b/conf/epple2.a2pdos33.conf.in index c7efaf9..df8e88a 100644 --- a/conf/epple2.a2pdos33.conf.in +++ b/conf/epple2.a2pdos33.conf.in @@ -10,8 +10,8 @@ # Applesoft BASIC and Autostart Monitor ROMs -import motherboard rom 0000 $(PREFIX)lib/apple2/system/applesoft/applesoft.a65 -import motherboard rom 2800 $(PREFIX)lib/apple2/system/monitor/apple2plus/monitor.a65 +import motherboard rom 0000 $(PREFIX)lib/apple2/system/a2p/applesoft.a65 +import motherboard rom 2800 $(PREFIX)lib/apple2/system/a2p/monitor.a65 @@ -22,7 +22,7 @@ slot 0 language # Disk ][ controller card in slot 6, with 16-sector ROMs slot 6 disk -import slot 6 rom 0 $(PREFIX)lib/apple2/dos3x/16sector/controller/disk2.a65 +import slot 6 rom 0 $(PREFIX)lib/apple2/dos/16sector/disk2.a65 # Insert DOS 3.3 System Master disk (original version) in drive 1 -load slot 6 drive 1 $(PREFIX)lib/apple2/dos3x/16sector/disks/dos330/clean330sysmas.nib +load slot 6 drive 1 $(PREFIX)lib/apple2/dos/16sector/disks/dos330/clean330sysmas.nib diff --git a/conf/epple2.a2ploaded.conf.in b/conf/epple2.a2ploaded.conf.in index 8097a93..5f6b9da 100644 --- a/conf/epple2.a2ploaded.conf.in +++ b/conf/epple2.a2ploaded.conf.in @@ -10,8 +10,8 @@ # Applesoft BASIC and Autostart Monitor ROMs -import motherboard rom 0000 $(PREFIX)lib/apple2/system/applesoft/applesoft.a65 -import motherboard rom 2800 $(PREFIX)lib/apple2/system/monitor/apple2plus/monitor.a65 +import motherboard rom 0000 $(PREFIX)lib/apple2/system/a2p/applesoft.a65 +import motherboard rom 2800 $(PREFIX)lib/apple2/system/a2p/monitor.a65 @@ -45,24 +45,24 @@ import slot 4 rom 0 $(PREFIX)lib/epple2/cards/clock.a65 # This will read (DOS 3.1, 3.2, and 3.2.1) disks, which # have 13 sectors per track. slot 5 disk -import slot 5 rom 0 $(PREFIX)lib/apple2/dos3x/13sector/controller/disk2.a65 +import slot 5 rom 0 $(PREFIX)lib/apple2/dos/13sector/disk2.a65 # Insert the DOS 3.1 System Master disk into drive 1 of slot 5 -load slot 5 drive 1 $(PREFIX)lib/apple2/dos3x/13sector/disks/dos310/clean31sysmas_stock_rawdos.nib +load slot 5 drive 1 $(PREFIX)lib/apple2/dos/13sector/dos310/clean31sysmas_stock_rawdos.nib # Disk ][ controller card in slot 6, with 16-sector ROMs. # This will read (DOS 3.3) disks, which have 16 sectors per track. slot 6 disk -import slot 6 rom 0 $(PREFIX)lib/apple2/dos3x/16sector/controller/disk2.a65 +import slot 6 rom 0 $(PREFIX)lib/apple2/dos/16sector/disk2.a65 # Insert the DOS 3.3 System Master disk (original version) into slot 6 -load slot 6 drive 1 $(PREFIX)lib/apple2/dos3x/16sector/disks/dos330/clean330sysmas.nib +load slot 6 drive 1 $(PREFIX)lib/apple2/dos/16sector/dos330/clean330sysmas.nib # Firmware card with Integer BASIC and the old Monitor. # DOS will not use this firmware card, because it is not in slot 0. slot 7 firmware -import slot 7 rombank 1000 $(PREFIX)lib/apple2/system/intbasic/intbasic.a65 -import slot 7 rombank 2425 $(PREFIX)lib/apple2/system/other/other.a65 -import slot 7 rombank 2800 $(PREFIX)lib/apple2/system/monitor/apple2/monitor.a65 +import slot 7 rombank 1000 $(PREFIX)lib/apple2/system/a2/intbasic.a65 +import slot 7 rombank 2425 $(PREFIX)lib/apple2/system/a2/other.a65 +import slot 7 rombank 2800 $(PREFIX)lib/apple2/system/a2/monitor.a65 diff --git a/conf/epple2.conf.in b/conf/epple2.conf.in index cf69618..d77d615 100644 --- a/conf/epple2.conf.in +++ b/conf/epple2.conf.in @@ -20,12 +20,12 @@ import motherboard rom 2C00 $(PREFIX)lib/epple2/system/epple2sys.a65 # These are how to load the real (proprietary) Apple ROMs. # There ROMs are not distributed with the Epple 2 emulator. # These two lines are for an Apple ][ plus: -#import motherboard rom 0000 $(PREFIX)lib/apple2/system/applesoft/applesoft.a65 -#import motherboard rom 2800 $(PREFIX)lib/apple2/system/monitor/apple2plus/monitor.a65 +#import motherboard rom 0000 $(PREFIX)lib/apple2/system/a2p/applesoft.a65 +#import motherboard rom 2800 $(PREFIX)lib/apple2/system/a2p/monitor.a65 # or instead, use these three lines are for an Apple ][: -#import motherboard rom 1000 $(PREFIX)lib/apple2/system/intbasic/intbasic.a65 -#import motherboard rom 2425 $(PREFIX)lib/apple2/system/other/other.a65 -#import motherboard rom 2800 $(PREFIX)lib/apple2/system/monitor/apple2/monitor.a65 +#import motherboard rom 1000 $(PREFIX)lib/apple2/system/a2/intbasic.a65 +#import motherboard rom 2425 $(PREFIX)lib/apple2/system/a2/other.a65 +#import motherboard rom 2800 $(PREFIX)lib/apple2/system/a2/monitor.a65 slot 0 language @@ -39,17 +39,17 @@ slot 4 clock import slot 4 rom 0 $(PREFIX)lib/epple2/cards/clock.a65 #slot 5 disk -#import slot 5 rom 0 $(PREFIX)lib/apple2/dos3x/13sector/controller/disk2.a65 -#load slot 5 drive 1 $(PREFIX)lib/apple2/dos3x/13sector/disks/dos310/clean31sysmas_stock_rawdos.nib +#import slot 5 rom 0 $(PREFIX)lib/apple2/dos/13sector/disk2.a65 +#load slot 5 drive 1 $(PREFIX)lib/apple2/dos/13sector/dos310/clean31sysmas_stock_rawdos.nib #slot 6 disk -#import slot 6 rom 0 $(PREFIX)lib/apple2/dos3x/16sector/controller/disk2.a65 -#load slot 6 drive 1 $(PREFIX)lib/apple2/dos3x/16sector/disks/dos330/clean330sysmas.nib +#import slot 6 rom 0 $(PREFIX)lib/apple2/dos/16sector/disk2.a65 +#load slot 6 drive 1 $(PREFIX)lib/apple2/dos/16sector/dos330/clean330sysmas.nib #slot 7 firmware -#import slot 7 rombank 1000 $(PREFIX)lib/apple2/system/intbasic/intbasic.a65 -#import slot 7 rombank 2425 $(PREFIX)lib/apple2/system/other/other.a65 -#import slot 7 rombank 2800 $(PREFIX)lib/apple2/system/monitor/apple2/monitor.a65 +#import slot 7 rombank 1000 $(PREFIX)lib/apple2/system/a2/intbasic.a65 +#import slot 7 rombank 2425 $(PREFIX)lib/apple2/system/a2/other.a65 +#import slot 7 rombank 2800 $(PREFIX)lib/apple2/system/a2/monitor.a65 #revision 0 revision 1 diff --git a/conf/epple2.rev0bare.conf.in b/conf/epple2.rev0bare.conf.in index bd1efd9..85db98e 100644 --- a/conf/epple2.rev0bare.conf.in +++ b/conf/epple2.rev0bare.conf.in @@ -11,9 +11,9 @@ # Load Integer BASIC and old Monitor ROMs -import motherboard rom 1000 $(PREFIX)lib/apple2/system/intbasic/intbasic.a65 -import motherboard rom 2425 $(PREFIX)lib/apple2/system/other/other.a65 -import motherboard rom 2800 $(PREFIX)lib/apple2/system/monitor/apple2/monitor.a65 +import motherboard rom 1000 $(PREFIX)lib/apple2/system/a2/intbasic.a65 +import motherboard rom 2425 $(PREFIX)lib/apple2/system/a2/other.a65 +import motherboard rom 2800 $(PREFIX)lib/apple2/system/a2/monitor.a65