Made Olivers devnum patch (r4588) work with the PET-II models. On these

machines, the program runs in a separate 64K bank, and zeropage variables need
to be copied from the system bank into the execution bank to read by a simple
load operation. The change is currently untested!

git-svn-id: svn://svn.cc65.org/cc65/trunk@4597 b7a2c559-68d2-44c3-8de9-860c34a00d81

diff --git a/asminc/cbm510.inc b/asminc/cbm510.inc
index e98ed4a143eb263f1d4e048866c5b8d798d3b833..c4476c2e14b6a0353020e7ff8a40a116a84759f9 100644 (file)
--- a/asminc/cbm510.inc
+++ b/asminc/cbm510.inc
@@ -11,7 +11,6 @@
 
 ExecReg                = $00
 IndReg         = $01
-DEVNUM         = $9F
 
 ; ---------------------------------------------------------------------------
 ; Screen size

diff --git a/asminc/cbm610.inc b/asminc/cbm610.inc
index 62d0c6a42eaef1dfc52658139a723c01d79ba0d4..14bbb3d6952c696a89453d2802cc724ae337e1ff 100644 (file)
--- a/asminc/cbm610.inc
+++ b/asminc/cbm610.inc
@@ -11,7 +11,6 @@
 
 ExecReg                = $00
 IndReg         = $01
-DEVNUM         = $9F
 
 ; ---------------------------------------------------------------------------
 ; Screen size

diff --git a/libsrc/cbm510/crt0.s b/libsrc/cbm510/crt0.s
index fc8acee74cb4119a45859fad2ffc36d12fafebab..e89bae74f9532cdf46ea07c5c64aa0a8fd7f3354 100644 (file)
--- a/libsrc/cbm510/crt0.s
+++ b/libsrc/cbm510/crt0.s
@@ -64,6 +64,7 @@
 
 .proc   transfer_table
 
+        .byte   $9F, DEVNUM
         .byte   $CA, CURS_Y
         .byte   $CB, CURS_X
         .byte   $EC, CHARCOLOR

diff --git a/libsrc/cbm510/devnum.s b/libsrc/cbm510/devnum.s
index 0c6bf21302eb56c9a4e222d58218238222eb97bc..a10004e852b762ab6f6f27c459edb38d4df06d87 100644 (file)
--- a/libsrc/cbm510/devnum.s
+++ b/libsrc/cbm510/devnum.s
@@ -2,6 +2,6 @@
 ; Oliver Schmidt, 2010-02-14
 ;
 
-       .include        "cbm510.inc"
+       .include        "extzp.inc"
 
        .exportzp       devnum := DEVNUM

diff --git a/libsrc/cbm510/extzp.inc b/libsrc/cbm510/extzp.inc
index be0cba71f411d827c108c397e9df72889ebc6b41..f500c9bca919721ebdb1087a9965570838d6e44b 100644 (file)
--- a/libsrc/cbm510/extzp.inc
+++ b/libsrc/cbm510/extzp.inc
@@ -11,7 +11,7 @@
 
         .globalzp       sysp0, time, segsave, ktmp, CURS_X, CURS_Y, CURS_FLAG
         .globalzp       CURS_STATE, CURS_BLINK, CURS_COLOR, CHARCOLOR, RVS
-        .globalzp       SCREEN_PTR, CRAM_PTR
+        .globalzp       DEVNUM, SCREEN_PTR, CRAM_PTR
         .globalzp       keyidx, keybuf, keyscanbuf, keysave, modkey
         .globalzp       norkey, graphmode, lastidx, rptdelay, rptcount
 

diff --git a/libsrc/cbm510/extzp.s b/libsrc/cbm510/extzp.s
index 8402a00a81733bce14b1d348598167958549ad01..abbfd2c4354ee8bab649e219dab38eb5668c989e 100644 (file)
--- a/libsrc/cbm510/extzp.s
+++ b/libsrc/cbm510/extzp.s
@@ -43,6 +43,7 @@ CURS_BLINK:     .byte   0
 CURS_COLOR:     .byte   0
 CHARCOLOR:      .byte   0
 RVS:            .byte   0
+DEVNUM:         .byte   0
 SCREEN_PTR:     .word   0
 CRAM_PTR:       .word   0
 ; Stuff for our own kbd polling routine

diff --git a/libsrc/cbm610/crt0.s b/libsrc/cbm610/crt0.s
index c63bdfdb5a89c7f8cebd12c19cd86047f5ff03e7..21874438a46d66a3e2e356264ea922ccc030f56e 100644 (file)
--- a/libsrc/cbm610/crt0.s
+++ b/libsrc/cbm610/crt0.s
@@ -63,6 +63,7 @@
 
 .proc   transfer_table
 
+        .byte   $9F, DEVNUM
         .byte   $CA, CURS_Y
         .byte   $CB, CURS_X
         .byte   $CC, graphmode

diff --git a/libsrc/cbm610/devnum.s b/libsrc/cbm610/devnum.s
index 75fa4cd2aa2fb4fa2390e714a27d923366bf981a..a10004e852b762ab6f6f27c459edb38d4df06d87 100644 (file)
--- a/libsrc/cbm610/devnum.s
+++ b/libsrc/cbm610/devnum.s
@@ -2,6 +2,6 @@
 ; Oliver Schmidt, 2010-02-14
 ;
 
-       .include        "cbm610.inc"
+       .include        "extzp.inc"
 
        .exportzp       devnum := DEVNUM

diff --git a/libsrc/cbm610/extzp.inc b/libsrc/cbm610/extzp.inc
index bb46a185b8d7aa1a57d80cbe360b5ba445e97a9e..59eb824eb9eee1874d012643939227a42112c96b 100644 (file)
--- a/libsrc/cbm610/extzp.inc
+++ b/libsrc/cbm610/extzp.inc
@@ -9,8 +9,8 @@
         .globalzp       sysp1, sysp3, crtc, sid, ipccia, cia, acia, tpi1, tpi2
         .globalzp       ktab1, ktab2, ktab3, ktab4
 
-        .globalzp       sysp0, time, segsave, ktmp, CURS_X, CURS_Y, RVS, config
-        .globalzp       CharPtr, keyidx, keybuf, keyscanbuf, keysave
+        .globalzp       sysp0, time, segsave, ktmp, CURS_X, CURS_Y, RVS, DEVNUM
+        .globalzp       config, CharPtr, keyidx, keybuf, keyscanbuf, keysave
         .globalzp       modkey, norkey, graphmode, lastidx, rptdelay, rptcount
 
 

diff --git a/libsrc/cbm610/extzp.s b/libsrc/cbm610/extzp.s
index be7e096df6eff6a08b7fa614cc5d39985f94379a..b0f3e76882afcf708cd768b9065bb3504c5595c2 100644 (file)
--- a/libsrc/cbm610/extzp.s
+++ b/libsrc/cbm610/extzp.s
@@ -37,6 +37,7 @@ ktmp:           .byte   0
 CURS_X:         .byte   0
 CURS_Y:         .byte   0
 RVS:            .byte   0
+DEVNUM:         .byte   0
 config:         .byte   0
 CharPtr:        .word   0
 ; Stuff for our own kbd polling routine