From: Marco van den Heuvel Date: Wed, 2 Dec 2015 08:30:30 +0000 (-0800) Subject: Renamed MMU_CFG_INT_FROM -> MMU_CFG_IFROM and MMU_CFG_EXT_FROM -> MMU_CFG_EFROM X-Git-Tag: V2.16~179^2 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=433eeb1bc79e4292d63a75e268e9e15c1cc104ad;p=cc65 Renamed MMU_CFG_INT_FROM -> MMU_CFG_IFROM and MMU_CFG_EXT_FROM -> MMU_CFG_EFROM --- diff --git a/asminc/c128.inc b/asminc/c128.inc index 124552647..e6c89b07b 100644 --- a/asminc/c128.inc +++ b/asminc/c128.inc @@ -198,14 +198,14 @@ CIA2_CRB := $DD0F ; --------------------------------------------------------------------------- ; I/O: MMU -MMU_CR := $FF00 -MMU_CFG_CC65 := %00001110 ; Bank 0 with kernal ROM -MMU_CFG_RAM0 := %00111111 ; Bank 0 full RAM -MMU_CFG_RAM1 := %01111111 ; Bank 1 full RAM -MMU_CFG_RAM2 := %10111111 ; Bank 2 full RAM -MMU_CFG_RAM3 := %11111111 ; Bank 3 full RAM -MMU_CFG_INT_FROM := %01010111 ; Bank 1 with Internal Function RAM/ROM -MMU_CFG_EXT_FROM := %01101011 ; Bank 1 with External Function RAM/ROM +MMU_CR := $FF00 +MMU_CFG_CC65 := %00001110 ; Bank 0 with kernal ROM +MMU_CFG_RAM0 := %00111111 ; Bank 0 full RAM +MMU_CFG_RAM1 := %01111111 ; Bank 1 full RAM +MMU_CFG_RAM2 := %10111111 ; Bank 2 full RAM +MMU_CFG_RAM3 := %11111111 ; Bank 3 full RAM +MMU_CFG_IFROM := %01010111 ; Bank 1 with Internal Function RAM/ROM +MMU_CFG_EFROM := %01101011 ; Bank 1 with External Function RAM/ROM ; --------------------------------------------------------------------------- ; Super CPU diff --git a/libsrc/c128/emd/c128-efnram.s b/libsrc/c128/emd/c128-efnram.s index 78882fa6e..788c73e0f 100755 --- a/libsrc/c128/emd/c128-efnram.s +++ b/libsrc/c128/emd/c128-efnram.s @@ -72,17 +72,17 @@ INSTALL: stx FETVEC stx STAVEC ldy #0 - ldx #MMU_CFG_EXT_FROM + ldx #MMU_CFG_EFROM sei jsr FETCH tax inx txa sta tmp1 - ldx #MMU_CFG_EXT_FROM + ldx #MMU_CFG_EFROM sei jsr STASH - ldx #MMU_CFG_EXT_FROM + ldx #MMU_CFG_EFROM jsr FETCH cli cmp tmp1 @@ -138,7 +138,7 @@ MAP: sta curpage ; Transfer one page -@L1: ldx #MMU_CFG_EXT_FROM +@L1: ldx #MMU_CFG_EFROM jsr FETCH sta window,y iny @@ -180,7 +180,7 @@ COMMIT: lda curpage ; Get the current page ; Transfer one page. Y must be zero on entry @L1: lda window,y - ldx #MMU_CFG_EXT_FROM + ldx #MMU_CFG_EFROM jsr STASH iny bne @L1 @@ -228,7 +228,7 @@ COPYFROM: ldy #$00 sei -@L1: ldx #MMU_CFG_EXT_FROM +@L1: ldx #MMU_CFG_EFROM jsr FETCH sta (ptr2),y iny @@ -246,7 +246,7 @@ COPYFROM: sta tmp1 ldy #$00 -@L3: ldx #MMU_CFG_EXT_FROM +@L3: ldx #MMU_CFG_EFROM jsr FETCH sta (ptr2),y iny @@ -295,7 +295,7 @@ COPYTO: sta ptr3 sei ldy #$00 @L1: lda (ptr2),y - ldx #MMU_CFG_EXT_FROM + ldx #MMU_CFG_EFROM jsr STASH iny bne @L1 @@ -313,7 +313,7 @@ COPYTO: sta ptr3 ldy #$00 @L3: lda (ptr2),y - ldx #MMU_CFG_EXT_FROM + ldx #MMU_CFG_EFROM jsr STASH iny dec tmp1 diff --git a/libsrc/c128/emd/c128-ifnram.s b/libsrc/c128/emd/c128-ifnram.s index 7cdbb8818..01a4fdf8e 100755 --- a/libsrc/c128/emd/c128-ifnram.s +++ b/libsrc/c128/emd/c128-ifnram.s @@ -72,17 +72,17 @@ INSTALL: stx FETVEC stx STAVEC ldy #0 - ldx #MMU_CFG_INT_FROM + ldx #MMU_CFG_IFROM sei jsr FETCH tax inx txa sta tmp1 - ldx #MMU_CFG_INT_FROM + ldx #MMU_CFG_IFROM sei jsr STASH - ldx #MMU_CFG_INT_FROM + ldx #MMU_CFG_IFROM jsr FETCH cli cmp tmp1 @@ -138,7 +138,7 @@ MAP: sta curpage ; Transfer one page -@L1: ldx #MMU_CFG_INT_FROM +@L1: ldx #MMU_CFG_IFROM jsr FETCH sta window,y iny @@ -180,7 +180,7 @@ COMMIT: lda curpage ; Get the current page ; Transfer one page. Y must be zero on entry @L1: lda window,y - ldx #MMU_CFG_INT_FROM + ldx #MMU_CFG_IFROM jsr STASH iny bne @L1 @@ -228,7 +228,7 @@ COPYFROM: ldy #$00 sei -@L1: ldx #MMU_CFG_INT_FROM +@L1: ldx #MMU_CFG_IFROM jsr FETCH sta (ptr2),y iny @@ -246,7 +246,7 @@ COPYFROM: sta tmp1 ldy #$00 -@L3: ldx #MMU_CFG_INT_FROM +@L3: ldx #MMU_CFG_IFROM jsr FETCH sta (ptr2),y iny @@ -295,7 +295,7 @@ COPYTO: sta ptr3 sei ldy #$00 @L1: lda (ptr2),y - ldx #MMU_CFG_INT_FROM + ldx #MMU_CFG_IFROM jsr STASH iny bne @L1 @@ -313,7 +313,7 @@ COPYTO: sta ptr3 ldy #$00 @L3: lda (ptr2),y - ldx #MMU_CFG_INT_FROM + ldx #MMU_CFG_IFROM jsr STASH iny dec tmp1