fixed cecb dump (#39)

Added a partial _cecb_seek() to get cecb dump working.

Author: tlindner

build/unix/libcecb/Makefile

@@ -10,7 +10,8 @@ CFLAGS	+= -I../../../include -Wall
 	$(RANLIB) $@
 
 libcecb.a:	libcecbbulkerase.o libcebcopen.o libcecbgs.o libcecbwav.o \
-                libcecbcas.o libcecbread.o libcecbwrite.o libcecbtokenize.o
+                libcecbcas.o libcecbread.o libcecbwrite.o libcecbtokenize.o \
+                libcecbseek.o
 
 clean:
 	$(RM) *.o *.a

include/cecbpath.h

@@ -128,6 +128,7 @@ error_code _cecb_bulkerase(char *path, int sample_rate, int bits_per_sample, dou
 error_code _cecb_create(cecb_path_id *path, char *pathlist, int mode, int file_type, int data_type, int gap, int ml_load_address, int ml_exec_address);
 error_code _cecb_open(cecb_path_id *path, char *pathlist, int mode );
 error_code _cecb_close(cecb_path_id path);
+error_code _cecb_seek(cecb_path_id path, int pos, int mode);
 error_code _cecb_parse_cas( cecb_path_id path );
 error_code _cecb_parse_riff( cecb_path_id path );
 error_code _cecb_read( cecb_path_id path, void *buffer, u_int *size );

libcecb/libcecbseek.c

@@ -0,0 +1,83 @@
+/********************************************************************
+ * seek.c - Disk BASIC Seek routine
+ *
+ * $Id$
+ ********************************************************************/
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "cocotypes.h"
+#include "cecbpath.h"
+
+
+error_code _cecb_seek(cecb_path_id path, int pos, int mode)
+{
+	error_code ec = 0;
+
+
+	if (path->israw == 1)
+	{
+		ec = fseek(path->fd, pos, mode);
+	}
+	else
+	{
+		switch (mode)
+		{
+		case SEEK_SET:
+			if (pos != 0 )
+			{
+				fprintf( stderr,
+					"_cecb_seek(): SEEK_SET only implemented if pos is zero.\n");
+				ec = -1;
+			}
+			
+			if (path->filepos == 0 ) break;
+			
+			if ((path->tape_type == CAS) || (path->tape_type == C10))
+			{
+				path->cas_current_byte = path->cas_start_byte;
+				path->cas_current_bit = path->cas_start_bit;
+				fseek(path->fd, path->cas_current_byte, SEEK_SET);
+			}
+			else
+			{
+				fseek(path->fd, path->wav_data_start, SEEK_SET);
+				path->wav_current_sample = path->wav_start_sample;
+				if (path->wav_bits_per_sample == 8)
+				{
+					fseek(path->fd, path->wav_start_sample, SEEK_CUR);
+				}
+				else if (path->wav_bits_per_sample == 16)
+				{
+					fseek(path->fd, path->wav_start_sample*2, SEEK_CUR);
+				}
+				else
+				{
+					fprintf(stderr, "_cecb_seek: unknown bits per sample\n");
+					ec = -1;
+				}
+			}
+
+			path->filepos = pos;
+			path->eof_flag = 0;
+			break;
+
+		case SEEK_CUR:
+			fprintf(stderr,
+				"_cecb_seek(): SEEK_CUR not implemented.\n");
+			ec = -1;
+			break;
+
+		case SEEK_END:
+			fprintf(stderr,
+				"_cecb_seek(): SEEK_END not implemented.\n");
+			ec = -1;
+			break;
+		}
+	}
+
+
+	return ec;
+}
+

libcoco/libcocoseek.c

@@ -33,9 +33,7 @@ error_code _coco_seek(coco_path_id path, int pos, int mode)
 		break;
 
 	case CECB:
-		fprintf(stderr,
-			"_coco_seek not implemented in libcecb yet.\n");
-		ec = -1;
+		ec = _cecb_seek(path->path.cecb, pos, mode);
 		break;
 	}