Fixes ramexp

kernal/files/files10.s

@@ -36,6 +36,15 @@
 .import ReadR9
 .endif
 
+.ifdef useRamExp
+.import RamExpRead
+.import RamExpGetStat
+.import CmpString
+.import DeskTopOpen
+.import DeskTopRecord
+.import DeskTopName
+.endif
+
 .global _AppendRecord
 .global _CloseRecordFile
 .global _WriteRecord

kernal/files/files6a.s

@@ -24,6 +24,11 @@
 .ifdef wheels
 .import GetBlock
 .endif
+.ifdef useRamExp
+.import DeskTopOpen
+.import DeskTopName
+.import CopyString
+.endif
 
 .global _FollowChain
 .global _FindFTypes

kernal/load/deskacc.s

@@ -35,6 +35,13 @@
 .import StashRAM
 .endif
 
+.ifdef useRamExp
+.import RamExpRead
+.import RamExpGetStat
+.import RamExpWrite
+.import RamExpPutStat
+.endif
+
 .global _LdDeskAcc
 .global _RstrAppl
 
@@ -198,11 +205,6 @@ _RstrAppl:
 	lda #0
 .elseif .defined(useRamExp)
 ; restore from other bank
-	ldx DeskAccSP
-	txs
-	tax
-	PushW DeskAccPC
-	rts
 	jsr RamExpGetStat
 	MoveW diskBlkBuf+DACC_ST_ADDR, r0
 	MoveB diskBlkBuf+DACC_LGH, r2H

kernal/load/load1a.s

@@ -33,6 +33,13 @@
 .import InitMachine
 .endif
 
+.ifdef useRamExp
+.import RamExpRead
+.import DeskTopStart
+.import DeskTopLgh
+.import DeskTopExec
+.endif
+
 .global _EnterDeskTop
 .global _StartAppl
 

kernal/ramexp/ramexp1.s

@@ -9,10 +9,35 @@
 .include "kernal.inc"
 .include "c64.inc"
 
+.ifdef useRamExp
+.import OpenRecordFile
+.import ReadRecord
+.import PointRecord
+.import NewDisk
+.import FindFile
+.import GetFHdrInfo
+.import ToBASIC
+.import DoDlgBox
+.import _EnterDT_DB
+.import DeskTopName
+.import RamExpGetStat
+.import RamExpPutStat
+.import RamExpWrite
+.import DeskTopOpen
+.import DeskTopStart
+.import DeskTopExec
+.import DeskTopLgh
+.endif
+
+.ifdef useRamExp
+.global LoadDeskTop
+.global DetectRamExp
+.endif
+
 .segment "ramexp1"
 
 .ifdef usePlus60K
-DetectPlus60K:
+DetectRamExp:
 ASSERT_NOT_BELOW_IO
 	LoadB CPU_DATA, IO_IN
 	ldx #0
@@ -49,7 +74,7 @@ Plus60KTestEnd:
 .endif
 
 .if .defined(useRamCart64) || .defined(useRamCart128)
-DetectRamCart:
+DetectRamExp:
 ASSERT_NOT_BELOW_IO
 	LoadB CPU_DATA, IO_IN
 	LoadW RAMC_BASE, 0
@@ -115,6 +140,7 @@ LoadDTLp:
 	jsr NewDisk
 	jmp LoadDTLp
 LoadDTCont:
+	MoveW r5, r9
 	jsr GetFHdrInfo
 	MoveW fileHeader+O_GHST_ADDR, DeskTopStart
 	MoveW fileHeader+O_GHST_VEC, DeskTopExec

kernal/ramexp/ramexp2.s

@@ -9,6 +9,19 @@
 .include "kernal.inc"
 .include "c64.inc"
 
+.ifdef useRamExp
+.global RamExpSetStat
+.global RamExpGetStat
+.global RamExpPutStat
+.global RamExpRead
+.global RamExpWrite
+.global DeskTopOpen
+.global DeskTopStart
+.global DeskTopExec
+.global DeskTopLgh
+.global DeskTopRecord
+.endif
+
 .segment "ramexp2"
 
 .ifdef useRamExp

kernal/start/start64.s

@@ -33,13 +33,8 @@
 ; used by header.s
 .global _ResetHandle
 
-.ifdef usePlus60K
-.import DetectPlus60K
-.endif
-.if .defined(useRamCart64) || .defined(useRamCart128)
-.import DetectRamCart
-.endif
 .ifdef useRamExp
+.import DetectRamExp
 .import LoadDeskTop
 .endif
 
@@ -149,11 +144,8 @@ OrigResetHandle:
 	ldx #$ff
 	jsr _DoFirstInitIO
 	jsr InitGEOEnv
-.ifdef usePlus60K
-	jsr DetectPlus60K
-.endif
-.if .defined(useRamCart64) || .defined(useRamCart128)
-	jsr DetectRamCart
+.ifdef useRamExp
+	jsr DetectRamExp
 .endif
 	jsr GetDirHead
 	MoveB bootSec, r1H