Changed some names and some spacing

Author: mateoconlechuga

CEdev/examples/library_examples/fileio/demo_3/bin/FILEIO3.8xp

@@ -32,7 +32,7 @@ void main(void) {
 	real_t	  real_3_5 = os_FloatToReal(3.5);
 
 	/* Store the value '1.5+2.5i' into the varaible B */
-	my_cplx = FloatToCplx(1.5, 2.5);
+	my_cplx = FloatsToCplx(1.5, 2.5);
 	ti_SetVar(TI_CPLX_TYPE, ti_B, &my_cplx);
 
 	/* Store the value '1.5' into the varaible A */
@@ -67,7 +67,7 @@ void main(void) {
 }
 
 /* Stores some ints to a complex variable type */
-cplx_t Int24ToCplx(int real, int imag) {
+cplx_t Int24sToCplx(int real, int imag) {
 	cplx_t res;
 	res.real = os_Int24ToReal(real);
 	res.real.sign |= TI_CPLX_TYPE;
@@ -77,7 +77,7 @@ cplx_t Int24ToCplx(int real, int imag) {
 }
 
 /* Stores some floats to a complex variable type */
-cplx_t FloatToCplx(float real, float imag) {
+cplx_t FloatsToCplx(float real, float imag) {
 	cplx_t res;
 	res.real = os_FloatToReal(real);
 	res.real.sign |= TI_CPLX_TYPE;
@@ -87,7 +87,7 @@ cplx_t FloatToCplx(float real, float imag) {
 }
 
 /* Converts a pair of reals to a complex number */
-cplx_t RealToCplx(real_t real, real_t imag) {
+cplx_t RealsToCplx(real_t real, real_t imag) {
 	cplx_t res;
 	res.real = real;
 	res.real.sign |= TI_CPLX_TYPE;
@@ -97,7 +97,7 @@ cplx_t RealToCplx(real_t real, real_t imag) {
 }
 
 /* Converts strings to a complex variable type */
-cplx_t StrToCplx(char *real, char **real_end, char *imag, char **imag_end) {
+cplx_t StrsToCplx(char *real, char **real_end, char *imag, char **imag_end) {
 	cplx_t res;
 	res.real = os_StrToReal(real, real_end);
 	res.real.sign |= TI_CPLX_TYPE;

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

@@ -21,7 +21,7 @@
 	define	.libs,space=ram
 	define	.startup,space=ram
 
-_errno     equ 0D008DCh
+_errno  equ 0D008DCh
 
 ;-------------------------------------------------------------------------------
 ; Standard CE startup module code
@@ -57,8 +57,8 @@ _init:
 	push	hl
 	ld	(__errsp+1),sp  ; save the stack from death
 	call	_main
-__exit:	ex	de,hl
-
+__exit:
+	ex	de,hl
 __errsp:
 	ld	sp,0
 	pop	hl
@@ -69,7 +69,8 @@ __errsp:
 	pop	iy              ; restore iy for OS
 	ex	de,hl		; program return value in hl
 	ret
-_exit:	pop	de
+_exit:
+	pop	de
 	pop	de
 	jr	__errsp
 ;-------------------------------------------------------------------------------

CEdev/include/asm/cstartup.asm

@@ -260,37 +260,37 @@ uint8_t ti_RclVar(const uint8_t var_type, const char *var_name, void **data_stru
  * Allocates space for a string variable
  */
 string_t *ti_AllocString(unsigned len, void (*malloc_routine)(size_t));
-#define ti_MallocString(len) ti_AllocString(len, (void*)malloc)
+#define ti_MallocString(len) ti_AllocString((len), ((void*)malloc))
 
 /**
  * Allocates space for a list variable
  */
 list_t *ti_AllocList(unsigned dim, void (*malloc_routine)(size_t));
-#define ti_MallocList(dim) ti_AllocList(dim, (void*)malloc)
+#define ti_MallocList(dim) ti_AllocList((dim), ((void*)malloc))
 
 /**
  * Allocates space for a matrix variable
  */
 matrix_t *ti_AllocMatrix(uint8_t rows, uint8_t cols, void (*malloc_routine)(size_t));
-#define ti_MallocMatrix(rows, cols) ti_AllocMatrix(rows, cols, (void*)malloc)
+#define ti_MallocMatrix(rows, cols) ti_AllocMatrix((rows), (cols), ((void*)malloc))
 
 /**
  * Allocates space for a complex list variable
  */
 cplx_list_t *ti_AllocCplxList(unsigned dim, void (*malloc_routine)(size_t));
-#define ti_MallocCplxList(dim) ti_AllocCplxList(dim, (void*)malloc)
+#define ti_MallocCplxList(dim) ti_AllocCplxList((dim), ((void*)malloc))
 
 /**
  * Allocates space for an equation variable
  */
 equ_t *ti_AllocEqu(unsigned len, void (*malloc_routine)(size_t));
-#define ti_MallocEqu(len) ti_AllocEqu(len, (void*)malloc)
+#define ti_MallocEqu(len) ti_AllocEqu((len), ((void*)malloc))
 
 /**
  * Some more definitions using Ans
  */
-#define TI_ANS_TYPE	0x00
-#define ti_Ans		("\x72\0")
+#define TI_ANS_TYPE (0x00)
+#define ti_Ans      ("\x72\0")
 
 /**
  * Some string definitions
@@ -304,6 +304,7 @@ equ_t *ti_AllocEqu(unsigned len, void (*malloc_routine)(size_t));
 #define ti_Str7     ("\xAA\x6\0")
 #define ti_Str8     ("\xAA\x7\0")
 #define ti_Str0     ("\xAA\x8\0")
+#define ti_StrT     ('\xAA')
 
 /**
  * Some equation definitions
@@ -318,6 +319,7 @@ equ_t *ti_AllocEqu(unsigned len, void (*malloc_routine)(size_t));
 #define ti_Y8       ("\x5E\x17\0")
 #define ti_Y9       ("\x5E\x18\0")
 #define ti_Y0       ("\x5E\x19\0")
+#define ti_EquT     ('\x5E')
 
 /**
  * Some real and complex defines
@@ -363,6 +365,7 @@ equ_t *ti_AllocEqu(unsigned len, void (*malloc_routine)(size_t));
 #define ti_MatH     ("\x5C\x7\0")
 #define ti_MatI     ("\x5C\x8\0")
 #define ti_MatJ     ("\x5C\x9\0")
+#define ti_MatT     ('\x5C')
 
 /**
  * Some list defines
@@ -373,6 +376,7 @@ equ_t *ti_AllocEqu(unsigned len, void (*malloc_routine)(size_t));
 #define ti_L4        ("\x5D\x3\0")
 #define ti_L5        ("\x5D\x4\0")
 #define ti_L6        ("\x5D\x5\0")
+#define ti_LT        ('\x5D')
 
 /**
  * For compatibility reasons

CEdev/include/lib/ce/fileioc.h

@@ -15,7 +15,7 @@
 
 
 /* Creates a random integer value */
-#define randInt(min, max)       (unsigned)rand() % ((max) - (min) + 1) + (min))
+#define randInt(min, max)       ((unsigned)rand() % ((max) - (min) + 1) + (min))
 
 /* RTC define -- useful for srand() */
 #define rtc_Time()              (*(volatile uint32_t*)0xF30044)
@@ -24,7 +24,7 @@
 #define RTC_UNFREEZE            (1<<7)
 #define RTC_FREEZE              (0<<7)
 #define RTC_LOAD                (1<<6)
-#define RTC_ENABLE              (1<<0)|RTC_UNFREEZE
+#define RTC_ENABLE              ((1<<0)|RTC_UNFREEZE)
 #define RTC_DISABLE             (0<<0)
 
 /* RTC registers */
@@ -104,6 +104,8 @@
 
 /* LCD defines */
 #define lcd_BacklightLevel       (*(uint8_t*)0xF60024)
+#define lcd_Width                (320)
+#define lcd_Height               (240)
 
 /* OS varaible type definitions */
 typedef struct { int8_t sign, exp; uint8_t mant[7]; } real_t;