Thread: [Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx: [417] trunk/lib765

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 417
          http://svn.sourceforge.net/fuse-for-macosx/?rev=417&view=rev
Author:   fredm
Date:     2007-06-30 20:52:12 -0700 (Sat, 30 Jun 2007)

Log Message:
-----------
Merge up to vendorlib765-0.4.0

Modified Paths:
--------------
    trunk/lib765/Info.plist
    trunk/lib765/lib765/ChangeLog
    trunk/lib765/lib765/configure
    trunk/lib765/lib765/configure.in
    trunk/lib765/lib765/doc/765.txt
    trunk/lib765/lib765/doc/765.txt~
    trunk/lib765/lib765/lib/765fdc.c
    trunk/lib765/lib765/lib/Makefile.am
    trunk/lib765/lib765/lib/Makefile.in
    trunk/lib765/lib765.xcodeproj/project.pbxproj

Modified: trunk/lib765/Info.plist
===================================================================

--- trunk/lib765/Info.plist	2007-07-01 03:16:59 UTC (rev 416)
+++ trunk/lib765/Info.plist	2007-07-01 03:52:12 UTC (rev 417)
@@ -23,6 +23,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>0.3.4</string>
+	<string>0.4.0</string>
 </dict>
 </plist>

Modified: trunk/lib765/lib765/ChangeLog
===================================================================
--- trunk/lib765/lib765/ChangeLog	2007-07-01 03:16:59 UTC (rev 416)
+++ trunk/lib765/lib765/ChangeLog	2007-07-01 03:52:12 UTC (rev 417)
@@ -1,3 +1,11 @@
+
+2007-04-15 John Elliott
+
+	* lib765-0.4.0 released.
+
+	* Add basic support for multisector reads (no multisector writes yet).
+	 This should allow Speedlock protection to work.
+
 2006-03-29 John Elliott
 
 	* Don't segfault if fdc_get_st3() is called on a nonexistent drive 

Modified: trunk/lib765/lib765/configure
===================================================================
--- trunk/lib765/lib765/configure	2007-07-01 03:16:59 UTC (rev 416)
+++ trunk/lib765/lib765/configure	2007-07-01 03:52:12 UTC (rev 417)
@@ -1521,8 +1521,8 @@
 ac_config_sub="$SHELL $ac_aux_dir/config.sub"
 ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 
-VERSION=0.3.4
-UPDATED='1 April 2006'
+VERSION=0.4.0
+UPDATED='15 April 2007'
 am__api_version="1.6"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or

Modified: trunk/lib765/lib765/configure.in
===================================================================
--- trunk/lib765/lib765/configure.in	2007-07-01 03:16:59 UTC (rev 416)
+++ trunk/lib765/lib765/configure.in	2007-07-01 03:52:12 UTC (rev 417)
@@ -1,8 +1,8 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(lib/765fdc.c)
 AC_CONFIG_AUX_DIR(config)
-VERSION=0.3.4
-UPDATED='1 April 2006'
+VERSION=0.4.0
+UPDATED='15 April 2007'
 AM_INIT_AUTOMAKE(lib765, $VERSION)
 AM_CONFIG_HEADER(config.h)
 

Modified: trunk/lib765/lib765/doc/765.txt
===================================================================
--- trunk/lib765/lib765/doc/765.txt	2007-07-01 03:16:59 UTC (rev 416)
+++ trunk/lib765/lib765/doc/765.txt	2007-07-01 03:52:12 UTC (rev 417)
@@ -1,18 +1,19 @@
-765 FDC - 0.3.4                                      John Elliott, 1 April 2006
+765 FDC - 0.4.0                                     John Elliott, 15 April 2007
 ===============================================================================
 
   "765" is an emulation of the uPD765a (AKA Intel 8272) Floppy Disc Controller
 [FDC] as used in Amstrad computers such as the PCW, CPC and Spectrum +3. At 
 present it is not a "full" 765; features not used in the PCW BIOS (such as: 
-DMA; multisector reads/writes; multitrack mode) are either left unimplemented 
+DMA; multisector writes; multitrack mode) are either left unimplemented 
 or incomplete.
 
   "765" is released under the GNU Library GPL. 
 
 What's new
 ==========
-  Version 0.3.4 has been fixed so that it no longer crashes if fdc_get_st3()
-is called on a nonexistent drive.
+  Version 0.4.0 includes a simple implementation of multisector reading, 
+which is sufficient to support at least one Speedlock-protected Spectrum +3
+disc.
 
   For earlier versions, see ChangeLog.
 

Modified: trunk/lib765/lib765/doc/765.txt~
===================================================================
--- trunk/lib765/lib765/doc/765.txt~	2007-07-01 03:16:59 UTC (rev 416)
+++ trunk/lib765/lib765/doc/765.txt~	2007-07-01 03:52:12 UTC (rev 417)
@@ -1,4 +1,4 @@
-765 FDC - 0.3.3                                   John Elliott, 26 January 2005
+765 FDC - 0.3.4                                      John Elliott, 1 April 2006
 ===============================================================================
 
   "765" is an emulation of the uPD765a (AKA Intel 8272) Floppy Disc Controller
@@ -11,9 +11,8 @@
 
 What's new
 ==========
-  Version 0.3.3 incorporates a bugfix for writing sectors to disc formats 
-that distinguish between MFM and FM recording mode. LibDsk 1.1.2 and later
-make this distinction for .DSK files.
+  Version 0.3.4 has been fixed so that it no longer crashes if fdc_get_st3()
+is called on a nonexistent drive.
 
   For earlier versions, see ChangeLog.
 

Modified: trunk/lib765/lib765/lib/765fdc.c
===================================================================
--- trunk/lib765/lib765/lib/765fdc.c	2007-07-01 03:16:59 UTC (rev 416)
+++ trunk/lib765/lib765/lib/765fdc.c	2007-07-01 03:52:12 UTC (rev 417)
@@ -417,34 +417,53 @@
 
 static void fdc_read(FDC_765 *self, int deleted)
 {
-	int err;
+	int err = 0;
 	FLOPPY_DRIVE *fd;
+	int sector;
+	size_t lensector;
+	fdc_byte *buf = self->fdc_exec_buf;
 
 	self->fdc_st0 = self->fdc_st1 = self->fdc_st2 = 0;
 	self->fdc_lastidread = 0;
 	
 	fdc_get_drive(self);	
 
-	fd = self->fdc_dor_drive[self->fdc_curunit];
-        self->fdc_exec_len = (128 << self->fdc_cmd_buf[5]);
-        if (self->fdc_cmd_buf[8] < 255) 
-		self->fdc_exec_len = self->fdc_cmd_buf[8];
+	self->fdc_exec_len = 0;
+	/* 0.4.0: Support for multisector reads. Do it naively by reading
+	 * all the sectors in one go. */
+	for (sector = self->fdc_cmd_buf[4]; sector <= self->fdc_cmd_buf[6]; 
+			sector++)
+	{
+		fd = self->fdc_dor_drive[self->fdc_curunit];
+       		lensector = (128 << self->fdc_cmd_buf[5]);
+       		if (self->fdc_cmd_buf[8] < 255) 
+			lensector = self->fdc_cmd_buf[8];
 
-	memset(self->fdc_exec_buf, 0, self->fdc_exec_len);
+		memset(buf, 0, lensector);
 
-        if (!fdc_isready(self, fd)) err = FD_E_NOTRDY;
-	else err = fd_read_sector(fd, 
-		self->fdc_cmd_buf[2], self->fdc_cmd_buf[3],
-		self->fdc_curhead,
-		self->fdc_cmd_buf[4], self->fdc_exec_buf, 
-		self->fdc_exec_len, &deleted,
-		self->fdc_cmd_buf[0] & 0x20,
-		self->fdc_cmd_buf[0] & 0x40,
-		self->fdc_cmd_buf[0] & 0x80);
+		if (!fdc_isready(self, fd)) err = FD_E_NOTRDY;
+		else err = fd_read_sector(fd, 
+			self->fdc_cmd_buf[2], /* Cylinder expected */
+			self->fdc_cmd_buf[3], /* Head expected */
+			self->fdc_curhead,    /* Real head */
+			self->fdc_cmd_buf[4], /* Sector */
+			buf,
+			lensector, 
+			&deleted,
+			self->fdc_cmd_buf[0] & 0x20,
+			self->fdc_cmd_buf[0] & 0x40,
+			self->fdc_cmd_buf[0] & 0x80);
 
-	if (err) fdc_xlt_error(self, err);
-	if (deleted) self->fdc_st2 |= 0x40;
-
+		if (err) fdc_xlt_error(self, err);
+		if (deleted) self->fdc_st2 |= 0x40;
+		if (err && err != FD_E_DATAERR)
+		{
+			break;
+		}
+		buf += lensector;
+		self->fdc_exec_len += lensector;
+		++self->fdc_cmd_buf[4];		/* Next sector */
+	}
 	fdc_results_7(self);
 	if (err && err != FD_E_DATAERR)
 	{
@@ -460,6 +479,8 @@
 
 /* WRITE DATA
  * WRITE DELETED DATA 
+ *
+ * XXX Does not support multisector
  */
 
 static void fdc_write(FDC_765 *self, int deleted)

Modified: trunk/lib765/lib765/lib/Makefile.am
===================================================================
--- trunk/lib765/lib765/lib/Makefile.am	2007-07-01 03:16:59 UTC (rev 416)
+++ trunk/lib765/lib765/lib/Makefile.am	2007-07-01 03:52:12 UTC (rev 417)
@@ -12,6 +12,6 @@
 # If interfaces have been added increment the right-hand number.
 # If interfaces have been removed set the right-hand number to 0.
 #
-lib765_la_LDFLAGS = -version-info 4:0:1
+lib765_la_LDFLAGS = -version-info 4:1:1
 lib765_la_SOURCES = 765drive.c 765dsk.c 765fdc.c 765ldsk.c 765i.h error.c
 

Modified: trunk/lib765/lib765/lib/Makefile.in
===================================================================
--- trunk/lib765/lib765/lib/Makefile.in	2007-07-01 03:16:59 UTC (rev 416)
+++ trunk/lib765/lib765/lib/Makefile.in	2007-07-01 03:52:12 UTC (rev 417)
@@ -104,7 +104,7 @@
 # If interfaces have been added increment the right-hand number.
 # If interfaces have been removed set the right-hand number to 0.
 #
-lib765_la_LDFLAGS = -version-info 4:0:1
+lib765_la_LDFLAGS = -version-info 4:1:1
 lib765_la_SOURCES = 765drive.c 765dsk.c 765fdc.c 765ldsk.c 765i.h error.c
 subdir = lib
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs

Modified: trunk/lib765/lib765.xcodeproj/project.pbxproj
===================================================================
--- trunk/lib765/lib765.xcodeproj/project.pbxproj	2007-07-01 03:16:59 UTC (rev 416)
+++ trunk/lib765/lib765.xcodeproj/project.pbxproj	2007-07-01 03:52:12 UTC (rev 417)
@@ -539,7 +539,7 @@
 					"$(inherited)",
 					"$(SRCROOT)/../bzip2/build/Deployment",
 				);
-				FRAMEWORK_VERSION = 0.3.4;
+				FRAMEWORK_VERSION = 0.4.0;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx: [417] trunk/lib765

fuse-for-macosx-commits