Remove prgm_CleanUp

Author: mateoconlechuga

src/asm/cstartup.asm

@@ -63,10 +63,22 @@ __errsp:
 	pop	af
 	pop	hl
 	ld	(hl),a          ; restore flash wait states
-	pop	iy              ; restore iy for OS
 	push	de
 	call	0004F0h         ; usb_ResetTimers
+
+	ifdef	PRGM_CLEANUP
+	ld	iy,%D00080
+	res	4,(iy+9)        ; onInterrupt,(iy+onFlags)
+	call	%0020E5C        ; _DelRes
+	call	%0020818        ; _ClrTxtShd
+	call	%0020814        ; _ClrScrn
+	call	%0020828        ; _HomeUp
+	set	0,(iy+3)        ; graphDraw,(iy+graphFlags)
+	call	%0021A3C        ; _DrawStatusBar
+	endif
+
 	pop	hl              ; program return value in hl
+	pop	iy              ; restore previous iy
 	ret
 _exit:
 	pop	de
@@ -80,3 +92,4 @@ _exit:
 
 	endif
 	end
+

src/ce/prgmcleanup.src

@@ -186,11 +186,6 @@ typedef struct { uint16_t size; uint8_t data[1]; } var_t;
  */
 #define matrix_element(matrix, row, col) ((matrix)->items[(row)+(col)*(matrix)->rows])
 
-/** 
- * Cleans up everything and gets ready to enter back to the OS when you are ready to exit your program
- */
-void prgm_CleanUp(void);
-
 /**
  * A faster implementation of memset
  *
@@ -1892,6 +1887,8 @@ typedef enum {
 #define sk_Power            0x0E
 
 /* Compatibility defines */
-#define pgrm_CleanUp prgm_CleanUp
+#define prgm_CleanUp()
+#define pgrm_CleanUp()
 
 #endif
+

src/ce/tice.h

@@ -2,11 +2,12 @@
 # Makefile
 # Startup modules and LibLoad library setup
 #----------------------------
-CSTARTUP_ASM  := cstartup.asm
-LIBHEADER_ASM := libheader.asm
+CSTARTUP_ASM  ?= cstartup.asm
+LIBHEADER_ASM ?= libheader.asm
+CLEANUP       ?= YES
 #----------------------------
 
-VERSION := 7.0
+VERSION := 7.2
 
 #----------------------------
 # Try not to edit anything below these lines unless you know what you are doing
@@ -85,6 +86,9 @@ endif
 ifeq ($(COMPRESSED),YES)
 CVFLAGS       += -x
 endif
+ifeq ($(CLEANUP),YES)
+PRGM_CLEANUP  := 1
+endif
 
 #Find all of the available C and ASM files (Remember, you can create C <-> assembly routines easily this way)
 SOURCES       := $(call NATIVEPATH,$(foreach dir,$(ALLDIRS),$(wildcard $(dir)*.c)))
@@ -135,7 +139,7 @@ endif
 
 #Define the assembler flags used by the Zilog assembler
 ASM_FLAGS       := \
-	-define:_EZ80 -define:$(DEBUGMODE) -define:$(ICONC) -NOlist -NOlistmac \
+	-define:_EZ80 -define:$(DEBUGMODE) -define:$(PRGM_CLEANUP) -define:$(ICONC) -NOlist -NOlistmac \
 	-pagelen:250 -pagewidth:130 -quiet -sdiopt -warn -NOdebug -NOigcase -cpu:EZ80F91
 
 #Define the C flags used by the Zilog compiler
@@ -235,8 +239,8 @@ all: add_dirs $(BINDIR)/$(TARGET8XP)
 	@echo Finished.
 
 add_dirs:
-	$(WINCHKBINDIR) $(MKDIR) $(BINDIR)
-	$(WINCHKOBJDIR) $(MKDIR) $(OBJDIR)
+	@$(WINCHKBINDIR) $(MKDIR) $(BINDIR)
+	@$(WINCHKOBJDIR) $(MKDIR) $(OBJDIR)
 	@echo C CE SDK Version $(VERSION)
 	@echo Looking for changes...