Improve build system, minor cleanup of interrupts and startup code

Author: mateoconlechuga

CEdev/examples/library_examples/keypad/demo_1/src/main.c

@@ -18,48 +18,48 @@ void printText(int8_t xpos, int8_t ypos, const char *text);
 
 /* Main Function */
 void main(void) {
-	/* Key varaible */
-	kb_key_t key;
-	const char *erase_string = "     ";
+    /* Key varaible */
+    kb_key_t key;
+    const char *erase_string = "     ";
 
     prgm_CleanUp();
 
-	/* Loop until 2nd is pressed */
-	do {
-		
-		/* Update kb_Data */
-		kb_Scan();
-		
-		key = kb_Data[kb_group_7];
+    /* Loop until 2nd is pressed */
+    do {
+        
+        /* Update kb_Data */
+        kb_Scan();
+        
+        key = kb_Data[kb_group_7];
 
-		/* Print the current arrow key input */
-		if(key & kb_Down) {
-			printText(0,0,"Down");
-		} else {
-			printText(0,0,erase_string);
-		}
-		if(key & kb_Up) {
-			printText(0,1,"Up");
-		} else {
-			printText(0,1,erase_string);
-		}
-		if(key & kb_Left) {
-			printText(0,2,"Left");
-		} else {
-			printText(0,2,erase_string);
-		}
-		if(key & kb_Right) {
-			printText(0,3,"Right");
-		} else {
-			printText(0,3,erase_string);
-		}
-	} while( kb_Data[kb_group_1] != kb_2nd );
+        /* Print the current arrow key input */
+        if(key & kb_Down) {
+            printText(0,0,"Down");
+        } else {
+            printText(0,0,erase_string);
+        }
+        if(key & kb_Up) {
+            printText(0,1,"Up");
+        } else {
+            printText(0,1,erase_string);
+        }
+        if(key & kb_Left) {
+            printText(0,2,"Left");
+        } else {
+            printText(0,2,erase_string);
+        }
+        if(key & kb_Right) {
+            printText(0,3,"Right");
+        } else {
+            printText(0,3,erase_string);
+        }
+    } while(kb_Data[kb_group_1] != kb_2nd);
 
-	prgm_CleanUp();
+    prgm_CleanUp();
 }
 
 /* Draw text on the homescreen at the given X/Y location */
 void printText(int8_t xpos, int8_t ypos, const char *text) {
-	os_SetCursorPos(ypos, xpos);
-	os_PutStrFull(text);
+    os_SetCursorPos(ypos, xpos);
+    os_PutStrFull(text);
 }

CEdev/examples/library_examples/keypad/demo_2/src/main.c

@@ -32,8 +32,8 @@ void main(void) {
     int_SetVector(ON_IVECT, isr_on);
     int_SetVector(KEYBOARD_IVECT, isr_keyboard);
 
-    /* Tell the interrupt controller that the ON flag should latch and be enabled */
-    int_LatchConfig = int_EnableConfig = INT_ON | INT_KEYBOARD;
+    /* Tell the interrupt controller that the ON flag to be enabled */
+    int_EnableConfig = INT_ON | INT_KEYBOARD;
     kb_EnableInt = KB_DATA_CHANGED;
 
     /* Configure the keypad to be continously scanning */
@@ -62,10 +62,10 @@ void interrupt isr_on(void) {
 
 void interrupt isr_keyboard(void) {
     /* Read the keypad data */
-    kb_key_t key = kb_DataArray[kb_group_6];
+    kb_key_t key = kb_Data[kb_group_6];
 
     /* If [enter] or [clear] are pressed, set the flag */
-    if(key & (kb_Enter | kb_KeyClear)) {
+    if(key & (kb_Enter | kb_Clear)) {
         exit_loop = true;
     }
 

CEdev/examples/library_examples/keypad/demo_3/bin/KEYPAD3.8xp

@@ -33,7 +33,7 @@ void main(void) {
     int_SetVector(KEYBOARD_IVECT, isr_keyboard);
 
     /* Tell the interrupt controller that the ON flag should latch and be enabled */
-    int_LatchConfig = int_EnableConfig = INT_ON | INT_KEYBOARD;
+    int_EnableConfig = INT_ON | INT_KEYBOARD;
     kb_EnableInt = KB_MODE_1_PRESS;
 
     /* Configure the keypad to be continously scanning */

CEdev/examples/library_examples/keypad/demo_3/src/main.c

@@ -53,12 +53,15 @@ _init:
 	ld	a,(hl)
 	push	af
 	ld	(hl),1          ; reduce flash wait states (because of rtl)
-	call	0004F4h         ; _usb_DisableTimer
+	call	0004F4h         ; usb_DisableTimers
 	ld	(__errsp+1),sp  ; save the stack from death
 	call	_main
 __exit:
 	ex	de,hl
 __errsp:
+	push	de
+	call	0004F0h         ; usb_ResetTimers
+	pop	de
 	ld	sp,0
 	pop	af
 	pop	hl

CEdev/include/asm/cstartup.asm

@@ -59,16 +59,16 @@ void usb_ResetChip(void);
 /**
  * Disables the usb timer interrupt (timer 3)
  */
-void usb_DisableTimer(void);
+void usb_DisableTimers(void);
 
 /**
  * Enables the usb timer interrupt (timer 3)
  */
-void usb_EnableTimer(void);
+void usb_EnableTimers(void);
 
 /**
  * Resets the usb timer interrupt (timer 3)
  */
-void usb_ResetTimer(void);
+void usb_ResetTimers(void);
 
 #endif

CEdev/include/lib/ce/usb.h

@@ -113,6 +113,19 @@ set C_SRC=%RTL_STATIC_C_SRC%
 set ASM_SRC=%RTL_STATIC_ASM_SRC%
 call buildlib.bat crt_static.lib
 
+echo -- Building Libraries...
+cd fileio
+call build.bat
+cd ..
+cd keypad
+call build.bat
+cd ..
+cd graphics/graphc
+call build.bat
+cd ../graphx
+call build.bat
+cd ../..
+
 echo -- Copying the libraries...
 
 REM -- copy the libraries --

CEdev/lib/src/buildall.bat

@@ -25,10 +25,6 @@ intRtc                  equ 1000h
 ;-------------------------------------------------------------------------------
 _int_Initialize:
 	di
-	ld	de,lconf
-	ld	hl,mpIntMask
-	ld	bc,16
-	ldir
 	ld	hl,cconf
 	ld	de,mpIntMask
 	ld	bc,16
@@ -129,14 +125,12 @@ _int_Reset:
 	ldir
 	im	1
 	ret
-	segment bss
-lconf:	ds	16
 	segment data
-cconf:	; Mask
-	db 000h,000h,000h,000h
-	; ACK
-	db 0FFh,0FFh,0FFh,0FFh
-	; Latch
-	db 000h,000h,000h,000h
-	; Invert
-	db 000h,000h,000h,000h
+lconf:	dw	intOnKey | intOsTimer | intRtc | 2000h, 0
+	dw	0FFFFh, 0FFFFh
+	dw	intOnKey | intOsTimer, 0
+	dw	0, 0
+cconf:	;dw	0, 0
+	dw	0FFFFh, 0FFFFh
+	dw	0, 0
+	dw	0, 0

CEdev/lib/src/ce/interrupts.asm

@@ -5,18 +5,18 @@
 	.def _usb_BusPowered
 	.def _usb_SelfPowered
 	.def _usb_ResetChip
-	.def _usb_DisableTimer
-	.def _usb_EnableTimer
-	.def _usb_ResetTimer
+	.def _usb_DisableTimers
+	.def _usb_EnableTimers
+	.def _usb_ResetTimers
 ; --------------------------------------------
 
 ; --- Location Equates -----------------------
 _usb_BusPowered                 equ 0003E4h
 _usb_SelfPowered                equ 0003E8h
 _usb_ResetChip                  equ 0003F4h
-_usb_DisableTimer               equ 0004F4h
-_usb_EnableTimer                equ 0004F8h
-_usb_ResetTimer                 equ 0004F0h
+_usb_DisableTimers              equ 0004F4h
+_usb_EnableTimers               equ 0004F8h
+_usb_ResetTimers                equ 0004F0h
 ; --------------------------------------------
 
 	end

CEdev/lib/src/ce/usb.asm

@@ -5,6 +5,7 @@
 
 set LIB_NAME=FILEIOC
 set LIB_SRC=fileio_lib.asm
+set SPASM_EXE=%CEDEV%\lib\src\include\spasm.exe
 
 echo Assembling Library...
 mkdir lib
@@ -17,7 +18,7 @@ set BIN=%CEDEV%\bin
 set ASM=%BIN%\ez80asm.exe
 set LIB=%BIN%\ez80lib.exe
 set ASM_FLG=-genobj -NOigcase -NOlist -NOlistmac -pagelen:56 -pagewidth:100 -quiet -sdiopt -cpu:EZ80F91 -NOdebug
-..\include\spasm -E %LIB_SRC% %LIB_NAME%.8xv
+%SPASM_EXE% -E %LIB_SRC% %LIB_NAME%.8xv
 echo Building library...
 if exist *.obj del *.obj
 if exist %LIB_LIB% del %LIB_LIB%
@@ -31,4 +32,7 @@ move /Y %LIB_ASM% lib > nul
 move /Y %LIB_8XV% lib > nul
 move /Y %LIB_JMP% lib > nul
 cd lib
-for /F %%a in ('dir /L /B') do rename %%a %%a
+for /F %%a in ('dir /L /B') do rename %%a %%a
+move /Y %LIB_LIB% %CEDEV%/lib/ce/%LIB_NAME% > nul
+move /Y %LIB_ASM% %CEDEV%/lib/ce/%LIB_NAME% > nul
+cd ..