--- Frodo4/Src/IEC.h	2003/07/01 17:51:17	1.2
+++ Frodo4/Src/IEC.h	2004/01/11 00:09:51	1.3
@@ -39,20 +39,60 @@ enum {
 // 1541 error codes
 enum {
 	ERR_OK,				// 00 OK
-	ERR_WRITEERROR,		// 25 WRITE ERROR
+	ERR_SCRATCHED,		// 01 FILES SCRATCHED
+	ERR_UNIMPLEMENTED,	// 03 UNIMPLEMENTED
+	ERR_READ20,			// 20 READ ERROR (block header not found)
+	ERR_READ21,			// 21 READ ERROR (no sync character)
+	ERR_READ22,			// 22 READ ERROR (data block not present)
+	ERR_READ23,			// 23 READ ERROR (checksum error in data block)
+	ERR_READ24,			// 24 READ ERROR (byte decoding error)
+	ERR_WRITE25,		// 25 WRITE ERROR (write-verify error)
 	ERR_WRITEPROTECT,	// 26 WRITE PROTECT ON
-	ERR_SYNTAX30,		// 30 SYNTAX ERROR (unknown command)
+	ERR_READ27,			// 27 READ ERROR (checksum error in header)
+	ERR_WRITE28,		// 28 WRITE ERROR (long data block)
+	ERR_DISKID,			// 29 DISK ID MISMATCH
+	ERR_SYNTAX30,		// 30 SYNTAX ERROR (general syntax)
+	ERR_SYNTAX31,		// 31 SYNTAX ERROR (invalid command)
+	ERR_SYNTAX32,		// 32 SYNTAX ERROR (command too long)
 	ERR_SYNTAX33,		// 33 SYNTAX ERROR (wildcards on writing)
+	ERR_SYNTAX34,		// 34 SYNTAX ERROR (missing file name)
 	ERR_WRITEFILEOPEN,	// 60 WRITE FILE OPEN
 	ERR_FILENOTOPEN,	// 61 FILE NOT OPEN
 	ERR_FILENOTFOUND,	// 62 FILE NOT FOUND
-	ERR_ILLEGALTS,		// 67 ILLEGAL TRACK OR SECTOR
+	ERR_FILEEXISTS,		// 63 FILE EXISTS
+	ERR_FILETYPE,		// 64 FILE TYPE MISMATCH
+	ERR_NOBLOCK,		// 65 NO BLOCK
+	ERR_ILLEGALTS,		// 66 ILLEGAL TRACK OR SECTOR
 	ERR_NOCHANNEL,		// 70 NO CHANNEL
+	ERR_DIRERROR,		// 71 DIR ERROR
+	ERR_DISKFULL,		// 72 DISK FULL
 	ERR_STARTUP,		// 73 Power-up message
 	ERR_NOTREADY		// 74 DRIVE NOT READY
 };
 
 
+// 1541 file types
+enum {
+	FTYPE_DEL,			// Deleted
+	FTYPE_SEQ,			// Sequential
+	FTYPE_PRG,			// Program
+	FTYPE_USR,			// User
+	FTYPE_REL,			// Relative
+	FTYPE_UNKNOWN
+};
+
+static const char ftype_char[9] = "DSPUL   ";
+
+
+// 1541 file access modes
+enum {
+	FMODE_READ,			// Read
+	FMODE_WRITE,		// Write
+	FMODE_APPEND,		// Append
+	FMODE_M				// Read open file
+};
+
+
 // IEC command codes
 enum {
 	CMD_DATA = 0x60,	// Data transfer
@@ -114,8 +154,8 @@ private:
 
 	C64Display *the_display;	// Pointer to display object (for drive LEDs)
 
-	char name_buf[NAMEBUF_LENGTH];	// Buffer for file names and command strings
-	char *name_ptr;			// Pointer for reception of file name
+	uint8 name_buf[NAMEBUF_LENGTH];	// Buffer for file names and command strings
+	uint8 *name_ptr;		// Pointer for reception of file name
 	int name_len;			// Received length of file name
 
 	Drive *drive[4];		// 4 drives (8..11)
@@ -138,7 +178,7 @@ public:
 	Drive(IEC *iec);
 	virtual ~Drive() {}
 
-	virtual uint8 Open(int channel, char *filename)=0;
+	virtual uint8 Open(int channel, const uint8 *name, int name_len)=0;
 	virtual uint8 Close(int channel)=0;
 	virtual uint8 Read(int channel, uint8 *byte)=0;
 	virtual uint8 Write(int channel, uint8 byte, bool eoi)=0;
@@ -148,13 +188,51 @@ public:
 	bool Ready;			// Drive is ready for operation
 
 protected:
-	void set_error(int error);
+	void set_error(int error, int track = 0, int sector = 0);
+
+	void parse_file_name(const uint8 *src, int src_len, uint8 *dest, int &dest_len, int &mode, int &type, int &rec_len, bool convert_charset = false);
 
-	char *error_ptr;	// Pointer within error message	
-	int error_len;		// Remaining length of error message
+	void execute_cmd(const uint8 *cmd, int cmd_len);
+	virtual void block_read_cmd(int channel, int track, int sector, bool user_cmd = false);
+	virtual void block_write_cmd(int channel, int track, int sector, bool user_cmd = false);
+	virtual void block_execute_cmd(int channel, int track, int sector);
+	virtual void block_allocate_cmd(int track, int sector);
+	virtual void block_free_cmd(int track, int sector);
+	virtual void buffer_pointer_cmd(int channel, int pos);
+	virtual void mem_read_cmd(uint16 adr, uint8 len);
+	virtual void mem_write_cmd(uint16 adr, uint8 len, uint8 *p);
+	virtual void mem_execute_cmd(uint16 adr);
+	virtual void copy_cmd(const uint8 *new_file, int new_file_len, const uint8 *old_files, int old_files_len);
+	virtual void rename_cmd(const uint8 *new_file, int new_file_len, const uint8 *old_file, int old_file_len);
+	virtual void scratch_cmd(const uint8 *files, int files_len);
+	virtual void position_cmd(const uint8 *cmd, int cmd_len);
+	virtual void initialize_cmd(void);
+	virtual void new_cmd(const uint8 *name, int name_len, const uint8 *comma);
+	virtual void validate_cmd(void);
+	void unsupp_cmd(void);
+
+	char error_buf[256];	// Buffer with current error message
+	char *error_ptr;		// Pointer within error message	
+	int error_len;			// Remaining length of error message
+
+	uint8 cmd_buf[64];		// Buffer for incoming command strings
+	int cmd_len;			// Length of received command
 
 private:
-	IEC *the_iec;		// Pointer to IEC object
+	IEC *the_iec;			// Pointer to IEC object
 };
 
+
+// Convert ASCII character to PETSCII character
+extern char ascii2petscii(char c);
+
+// Convert ASCII string to PETSCII string
+extern void ascii2petscii(char *dest, const char *src, int max);
+
+// Convert PETSCII character to ASCII character
+extern char petscii2ascii(uint8 c);
+
+// Convert PETSCII string to ASCII string
+extern void petscii2ascii(char *dest, const char *src, int max);
+
 #endif