Fixed ti_Seek #23

Author: mateoconlechuga

CEdev/include/std/stdio.h

@@ -14,10 +14,10 @@
 #define BUFSIZ		128		/* buffer size */
 #define EOF		(-1)		/* end of file */
 #define L_tmpnam	12
-#define SEEK_CUR	0
-#define SEEK_END	1
-#define SEEK_SET	2
-#define SYS_OPEN	3		/* max open files */
+#define SEEK_CUR	1
+#define SEEK_END	2
+#define SEEK_SET	0
+#define SYS_OPEN	5		/* max open files */
 #define FOPEN_MAX	SYS_OPEN
 #define TMP_MAX 	50
 

CEdev/lib/ce/fileioc.h

@@ -151,9 +151,9 @@ int ti_GetC(const ti_var_t slot);
 
 /**
  * Seeks to an offset from the origin:
- * SEEK_SET (2) - Seek from beginning of file
- * SEEK_END (1) - Seek from end of file
- * SEEK_CUR (0) - Seek from current offset in file
+ * SEEK_SET (0) - Seek from beginning of file
+ * SEEK_CUR (1) - Seek from current offset in file
+ * SEEK_END (2) - Seek from end of file
  * slot:
  *  varaible slot seeking in
  */

CEdev/lib/src/libraries/fileio_src/v2/fileio_lib.asm

@@ -507,41 +507,38 @@ _Seek:
 	ld	iy,0
 	add	iy,sp
 	ld	de,(iy+3)
-	ld	c,(ix+9)
+	ld	c,(iy+9)
 	call	_CheckIfSlotOpen \.r
 	jp	z,_ReturnNEG1L \.r
 	ld	a,(iy+6)
 	or	a,a
-	jr	z,SeekCur
+	jr	z,SeekSet
 	dec	a
-	jr	z,SeekEnd
+	jr	z,SeekCur
 	dec	a
 	jp	nz,_ReturnNEG1L \.r
-_SeekHandler_ASM:
+SeekEnd:
+	push	de
+	call	_GetSlotSize_ASM \.r
+SeekSet_ASM:
+	pop	hl
+	add	hl,bc
+	ex	de,hl
+SeekSet:
 	call	_GetSlotSize_ASM \.r
 	push	bc
 	pop	hl
 	or	a,a
-	sbc	hl,de 
+	sbc	hl,de
 	push	de
 	pop	bc
 	jp	c,_ReturnNEG1L \.r
 	jp	_SetSlotOffset_ASM \.r
 SeekCur:
 	push	de
 	call	_GetSlotOffset_ASM \.r
-	pop	hl
-	add	hl,bc
-	ex	de,hl
-	jr	_SeekHandler_ASM
-SeekEnd:
-	push	de
-	call	_GetSlotSize_ASM \.r
-	pop	hl
-	add	hl,bc
-	ex	de,hl
-	jr	_SeekHandler_ASM
-
+	jr	SeekSet_ASM
+	
 ;-------------------------------------------------------------------------------
 _PutChar:
 ; Performs an fputc on an AppVar