From - Wed Aug 7 08:35:15 1996 Received: from pelleas.netcom.net.uk (pelleas.netcom.net.uk [194.42.224.145]) by horten.vingmed.no (8.6.9/8.6.9) with ESMTP id RAA26441 for ; Tue, 6 Aug 1996 17:19:12 +0200 Received: (from majordom@localhost) by pelleas.netcom.net.uk (8.7.4/8.7.3) id QAA24904 for xbeeb-outgoing; Tue, 6 Aug 1996 16:21:09 +0100 (BST) Received: from gatekeeper.corp.netcom.net.uk (firewall-user@gatekeeper.corp.netcom.net.uk [194.42.224.25]) by pelleas.netcom.net.uk (8.7.4/8.7.3) with SMTP id QAA24893 for ; Tue, 6 Aug 1996 16:21:07 +0100 (BST) Received: by gatekeeper.corp.netcom.net.uk; id QAA20699; Tue, 6 Aug 1996 16:21:05 +0100 Received: from Netcom by gatekeeper.corp.netcom.net.uk via smap (V3.1) id xma020682; Tue, 6 Aug 96 16:20:33 +0100 From: James Fidell Message-Id: <199608061520.QAA03226@corp.netcom.net.uk> Subject: [Xbeeb] patch-0.3.4 To: xbeeb@netcom.net.uk Date: Tue, 6 Aug 1996 16:20:32 +0100 (BST) X-Mailer: ELM [version 2.4 PL25] MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: owner-xbeeb@netcom.net.uk Precedence: bulk X-UIDL: 82dc952f3f76d3f10c69060bd85b4a5f Status: RO X-Mozilla-Status: 0001 diff -N -r -c xbeeb-0.3.3/doc/Changes xbeeb-0.3.4/doc/Changes *** xbeeb-0.3.3/doc/Changes Mon Mar 18 23:34:41 1996 --- xbeeb-0.3.4/doc/Changes Fri Jul 26 21:54:35 1996 *************** *** 481,483 **** --- 481,496 ---- Win32/eXceed port. Patch created for v0.3.3 + + + o Mon Mar 18 23:54:24 GMT 1996 + + Various bug-fixes in EFS.c + + + o Mon Mar 18 23:56:08 GMT 1996 + + Added code to allow F12 to be used as the BREAK key if there is no + Pause key. + + Patch created for v0.3.4 diff -N -r -c xbeeb-0.3.3/src/EFS.c xbeeb-0.3.4/src/EFS.c *** xbeeb-0.3.3/src/EFS.c Mon Mar 18 23:36:45 1996 --- xbeeb-0.3.4/src/EFS.c Mon Mar 18 23:54:03 1996 *************** *** 721,727 **** * fields when we're copying information into them. */ ! for ( i = 8; i < 256; i++ ) { WriteByte ( XDFS_CATWS1 + i, ' ' ); WriteByte ( XDFS_CATWS2 + i, 0x00 ); --- 721,727 ---- * fields when we're copying information into them. */ ! for ( i = 0; i < 256; i++ ) { WriteByte ( XDFS_CATWS1 + i, ' ' ); WriteByte ( XDFS_CATWS2 + i, 0x00 ); *************** *** 759,768 **** WriteByte( XDFS_SECTBASE + off, Catalog [ i ].StartSector & 0xff ); ! byte = Catalog [ i ].ExeAddress >> 10; ! byte &= Catalog [ i ].FileLength >> 12; ! byte &= Catalog [ i ].LoadAddress >> 14; ! byte &= ( Catalog [ i ].StartSector & 0xbff ) >> 8; WriteByte ( fptr, byte ); } --- 759,768 ---- WriteByte( XDFS_SECTBASE + off, Catalog [ i ].StartSector & 0xff ); ! byte = ( Catalog [ i ].ExeAddress & 0x30000 ) >> 10; ! byte &= ( Catalog [ i ].FileLength & 0x30000 ) >> 12; ! byte &= ( Catalog [ i ].LoadAddress & 0x30000 ) >> 14; ! byte &= ( Catalog [ i ].StartSector & 0x300 ) >> 8; WriteByte ( fptr, byte ); } *************** *** 1137,1142 **** --- 1137,1144 ---- ( void ) strcat ( catalog, CAT_NAME ); #ifdef XDFS + + ( void ) memset ( DiskName, 0, MAX_DISKNAME ); if (( n = strrchr ( new, '/' ))) n++; else *************** *** 1144,1150 **** if (( l = strlen ( n )) > MAX_DISKNAME ) l = MAX_DISKNAME; ( void ) strncpy ( DiskName, n, l ); - DiskName [ l + 1 ] = '\0'; #endif /* XDFS */ --- 1146,1151 ---- *************** *** 1488,1494 **** * Write the new catalogue */ ! sprintf ( catbuf, "%2.2d %1.1d", CatalogWrites, BootOption ); if ( fputs ( catbuf, fp ) < 0 ) { fprintf ( stderr, "error writing %s\n", cat ); --- 1489,1495 ---- * Write the new catalogue */ ! sprintf ( catbuf, "%2.2d %1.1d\n", CatalogWrites, BootOption ); if ( fputs ( catbuf, fp ) < 0 ) { fprintf ( stderr, "error writing %s\n", cat ); diff -N -r -c xbeeb-0.3.3/src/KeymapLegend.c xbeeb-0.3.4/src/KeymapLegend.c *** xbeeb-0.3.3/src/KeymapLegend.c Mon Mar 18 22:55:54 1996 --- xbeeb-0.3.4/src/KeymapLegend.c Mon Mar 18 23:55:29 1996 *************** *** 371,377 **** --- 371,381 ---- QuitEmulator = 1; break; + #ifdef XK_Pause case XK_Pause : + #else + case XK_F12 : + #endif BreakKeypress = 1 - BreakKeypress; break; diff -N -r -c xbeeb-0.3.3/src/KeymapStrict.c xbeeb-0.3.4/src/KeymapStrict.c *** xbeeb-0.3.3/src/KeymapStrict.c Mon Mar 18 22:55:54 1996 --- xbeeb-0.3.4/src/KeymapStrict.c Mon Mar 18 23:55:54 1996 *************** *** 342,348 **** --- 342,352 ---- SnapshotRequested = 1; break; + #ifdef XK_Pause case XK_Pause : /* Pause */ + #else + case XK_F12 : + #endif BreakKeypress = 1 - BreakKeypress; break; diff -N -r -c xbeeb-0.3.3/src/Patchlevel.h xbeeb-0.3.4/src/Patchlevel.h *** xbeeb-0.3.3/src/Patchlevel.h Mon Mar 18 23:33:39 1996 --- xbeeb-0.3.4/src/Patchlevel.h Tue Mar 19 00:03:11 1996 *************** *** 28,33 **** #define VERSION 0 #define RELEASE 3 ! #define PATCHLEVEL 3 #endif /* PATCHLEVEL_H */ --- 28,33 ---- #define VERSION 0 #define RELEASE 3 ! #define PATCHLEVEL 4 #endif /* PATCHLEVEL_H */