From c3fff87822db83c5ae29119a0a90c7735e4b1965 Mon Sep 17 00:00:00 2001 From: Marcio T Date: Fri, 26 Nov 2021 15:03:29 -0700 Subject: [PATCH] Adjusted text strings; enabled full testing. --- ...{Iomega Zip Tester.cpp => Iomega Tester.cpp} | 10 +++++----- mac-cpp-source/Iomega Tester.rsrc.bin | Bin 0 -> 896 bytes mac-cpp-source/Iomega Tester.µ.bin | Bin 0 -> 17280 bytes mac-cpp-source/Iomega Zip Tester.rsrc.sit.bin | Bin 896 -> 0 bytes mac-cpp-source/tip/tip_aspi.cpp | 6 ++---- mac-cpp-source/utils/.rsrc/FileLib.c | Bin 410 -> 0 bytes mac-cpp-source/utils/.rsrc/FileLib.h | Bin 410 -> 0 bytes mac-cpp-source/utils/.rsrc/LaunchLib.c | Bin 410 -> 0 bytes mac-cpp-source/utils/.rsrc/LaunchLib.h | Bin 410 -> 0 bytes mac-cpp-source/utils/.rsrc/PascalLib.c | Bin 410 -> 0 bytes mac-cpp-source/utils/.rsrc/PascalLib.h | Bin 410 -> 0 bytes mac-cpp-source/utils/.rsrc/TrapAvail.c | Bin 410 -> 0 bytes mac-cpp-source/utils/.rsrc/TrapAvail.h | Bin 410 -> 0 bytes mac-cpp-source/utils/.rsrc/pstring.h | Bin 410 -> 0 bytes 14 files changed, 7 insertions(+), 9 deletions(-) rename mac-cpp-source/{Iomega Zip Tester.cpp => Iomega Tester.cpp} (93%) create mode 100644 mac-cpp-source/Iomega Tester.rsrc.bin create mode 100644 mac-cpp-source/Iomega Tester.µ.bin delete mode 100644 mac-cpp-source/Iomega Zip Tester.rsrc.sit.bin delete mode 100644 mac-cpp-source/utils/.rsrc/FileLib.c delete mode 100644 mac-cpp-source/utils/.rsrc/FileLib.h delete mode 100644 mac-cpp-source/utils/.rsrc/LaunchLib.c delete mode 100644 mac-cpp-source/utils/.rsrc/LaunchLib.h delete mode 100644 mac-cpp-source/utils/.rsrc/PascalLib.c delete mode 100644 mac-cpp-source/utils/.rsrc/PascalLib.h delete mode 100644 mac-cpp-source/utils/.rsrc/TrapAvail.c delete mode 100644 mac-cpp-source/utils/.rsrc/TrapAvail.h delete mode 100644 mac-cpp-source/utils/.rsrc/pstring.h diff --git a/mac-cpp-source/Iomega Zip Tester.cpp b/mac-cpp-source/Iomega Tester.cpp similarity index 93% rename from mac-cpp-source/Iomega Zip Tester.cpp rename to mac-cpp-source/Iomega Tester.cpp index adb4cb3..e4843e2 100644 --- a/mac-cpp-source/Iomega Zip Tester.cpp +++ b/mac-cpp-source/Iomega Tester.cpp @@ -21,11 +21,10 @@ void main() { SIOUXSettings.asktosaveonclose = FALSE; SIOUXSettings.standalone = FALSE; - printf( "SCSI and Iomega Zip/Jaz Toolkit V0.1\n" ); - printf( "(c) 2021 Marcio Teixeira\n\n" ); - printf( "TIP based on source code provided by Steve Gibson (http://grc.com)\n" ); + printf( "This Mac port (c) 2021 Marcio Teixeira http://github.com/marciot/mac-tip\n" ); + printf( "Based on code (c) 2006 Gibson Research Corp http://grc.com/tip/clickdeath.htm\n" ); - SIOUXSetTitle("\pCommand Console"); + SIOUXSetTitle("\pIomega Tester (Beta) V0.1"); print_help(); @@ -42,7 +41,7 @@ void main() { bool process_command() { short int arg_val = 0; char cmd[80]; - printf( "\n> " ); + printf( "\nCmd> " ); gets( cmd ); printf("\n"); @@ -62,6 +61,7 @@ bool process_command() { case 't': run_tip(arg_val); break; case 'q': return false; case 'o': SetRichEditText(arg_str); break; + default: printf("Unknown command, type 'h' for help\n"); } return true; } diff --git a/mac-cpp-source/Iomega Tester.rsrc.bin b/mac-cpp-source/Iomega Tester.rsrc.bin new file mode 100644 index 0000000000000000000000000000000000000000..044c49e1a2d96c627af942540af436a85bdd71b4 GIT binary patch literal 896 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 literal 0 HcmV?d00001 diff --git a/mac-cpp-source/Iomega Zip Tester.rsrc.sit.bin b/mac-cpp-source/Iomega Zip Tester.rsrc.sit.bin deleted file mode 100644 index 84dace820b27d9ba9d7a2defb0a314f6b017c6f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 896 zcmZRO^32aoO;1#a$}CU_Ni8l(Ez&D0E=txb&MaXd1_XPCm;$jPvRbCqAl}_$bJIZ> z$jo)}^g~tvVmCF)2rw`Nmz1WZd6p<>Bx@R4TAJ$u2@3_soWzur%shqQN}zjki**z{ z^OE&+6f#Om3as??%gf945+N#zD~t7#^KNinbjO$9rkh=CDkO;L&zuX|2v zUY>$uX>mzr9>Y=~07|$49eC6(=I*gxQxunpiEyFt8L)>B1LKs%pl}Kbc6DK7U~B-} zg{l$AV>-jYz{3jwl2vv!-&yaX*-z%$UrYAQD_wT@I*T~7t7%ekX|kkEx98hby-NoR?@CKgKM|?g znO?QKC%nb%0$;3cRj|G1!MV*Ay(vk_?>UlZx)oYXvJ{y9I(BtTOw8|p6&mLcH7n1| zj40BXdpS`s+Su1^^inMQ@L)JYzYlT(p5b z!T5^dwaYsnzp*{%DC=Hbb$!;{-*Q`2bBv9zm+WEYZO=`&ns(++9cv78Y(P%VnPn!% zzb(QS2=zI4e^vQ>^X{pD>u>U|**8D$jn}lg8mPg;H08p|>=T))s@wQWiz--qimI4< zdLQ<_YsmGP?k=0lmcuP=dCOe3S2z1#{){sIoa8P1*0<(vSbH(9Xv^M0=G#GTt}3dY b9D1L4=TvrnJ@=P`dG1ZAovawKOAP@4FDe=D diff --git a/mac-cpp-source/tip/tip_aspi.cpp b/mac-cpp-source/tip/tip_aspi.cpp index c40ddec..ef5f527 100644 --- a/mac-cpp-source/tip/tip_aspi.cpp +++ b/mac-cpp-source/tip/tip_aspi.cpp @@ -748,8 +748,6 @@ long PerformRegionTransfer(short XferCmd, void *pBuffer) { BumpErrorCounts(eax); // given eax, count the errors GetSpareSectorCounts(false); // update the Cart's Condition UpdateRunTimeDisplay(); - - if(UserInterrupt) break; } LocalBuffer += BYTES_PER_SECTOR; SingleTransferLBA++; @@ -844,7 +842,7 @@ void TestTheDisk() { long eax = PerformRegionTransfer(SCSI_Cmd_ReadMany, pUserDataBuffer); - /*if(eax == 0) { + if(eax == 0) { // ------------------------------- TestingPhase = WRITING_PATT; UpdateRunPhaseDisplay(); @@ -864,7 +862,7 @@ void TestTheDisk() { } if (CartridgeStatus != DISK_TEST_UNDERWAY) { break; - }*/ + } // bump the FirstLBASector up for the next transfer FirstLBASector += NumberOfLBAs; } while(!UserInterrupt); diff --git a/mac-cpp-source/utils/.rsrc/FileLib.c b/mac-cpp-source/utils/.rsrc/FileLib.c deleted file mode 100644 index 090b269ca75390df673276ac52174fbfec6fd83e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 410 zcmZQzU}RumUQDg|1$uA2Lq>XeqLg7K8S+@Ffp(&L2N{rGOwQNBX$fZB*Wmwz~~zg90X(w`Gz|=0cknrw-9Fl*$m7dz-%878vu~= BU=RQR diff --git a/mac-cpp-source/utils/.rsrc/FileLib.h b/mac-cpp-source/utils/.rsrc/FileLib.h deleted file mode 100644 index 1b2c2f58bfa12afe723c607187d212170042b530..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 410 zcmZvYu}T9$5QhJ|4IT*x5kZV7$s0((#?B;?!@wQn^dwed6u|>AVx^64k%tI^Pmsnc zty{%X5Zl1jLSW0SGR|EPB4l9Z`)3FK-C4i_U`1Tg^em!85GjYV$htzL_le9i%_Hx{ zH&=dqv2$(1M$|lw4mzzSd#KE4=^6Vj#AN*V3D_gP^@Vc)I3K{~y+Ze^3c0ZgSt&uS zl#pN##xnRW8pJ0C4?~TBG-|j*yRQ)z-VnMo=DQ4CQp|*@nR=1+0wr~qWUW6#mHk{N zfglN-XU{rBKIq+cFMC24az0E33(ds9!Z3|dmgyYxO&ERm*o5s2 z3@$T(_!k3%^evE!fU1B20rVM=i3n5X)pLEsjsb;afZ@yN8xR}>WDEI*J2?SqIp((r NS22G8vweW#3;^qZI0FCx diff --git a/mac-cpp-source/utils/.rsrc/LaunchLib.h b/mac-cpp-source/utils/.rsrc/LaunchLib.h deleted file mode 100644 index 8178a026103ae5b5ce6f02a089470645690c0704..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 410 zcmZQzU}RumU@AOP4-6Cla%?BeRizyKy0!K8gSSOh{cFnBO< z`sU{)Cg-C#6P3fnz{1eTn8oyx`6P_Kd#vdV0|T=?5bp*l28AO~6)+$mY($tcub%58 o#s!p>VQ^z$^bH6O0fx>|3J4x0P_bh+Xuu0010%O3IG5A diff --git a/mac-cpp-source/utils/.rsrc/PascalLib.c b/mac-cpp-source/utils/.rsrc/PascalLib.c deleted file mode 100644 index 845a8374a5d9959ab2232c98d8efcc175a687fc2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 410 zcmZQzU}RumUp#c_lxB%mS?tsMNJCI%*k5Z8zh=WtI~puPr% zMg}Y*aLrK0-D8!J3=9%nKwD=qFaXUyv|dqwfx&@+`#J*yi_d=`fU5LB(n`o(KY?oD zW-%~u-$FCX3%6Mw44l6Cd5OvSNJ`L|Objdxg^V^#-I1{9KEaARQf4G0bbvW0xZot%KQ9P?YahZ&eZfZ0AkaRva+3O8o} diff --git a/mac-cpp-source/utils/.rsrc/PascalLib.h b/mac-cpp-source/utils/.rsrc/PascalLib.h deleted file mode 100644 index a806bdcc91418f12dbd38c44a1e16c5587351bd3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 410 zcmZQzU}RumU5_XIvDRU%d*(QXrMoUE&=%ign_;R5iCFo$N;esVamLEu8-I;ppXnOd>MTM ef`fo;A>VK(Cm=1y{PzEUAPol0AHZxM5C;GhqB@fR diff --git a/mac-cpp-source/utils/.rsrc/TrapAvail.c b/mac-cpp-source/utils/.rsrc/TrapAvail.c deleted file mode 100644 index e7f16a029d944b984d68dff8bd10f78c2b5ccbf9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 410 zcmZQzU}RumUzKv1$_r24;Sst+SBj_$*a{T&-9kztnPtfW*wa5(Ps& z0|j3o3t1VE&8G`i*@PyHh0EsvR=EO;6hg>@fzvlXFEKeEA%wwVVqjs&XH;Rj&fE;6 zf&MUu_ygn@pl?6~3y=abP{WjY^;{oukZWat;mhb75F7+#3;BjSIRR-o=C`15g8=3a JV73p42LRodIBNg^ diff --git a/mac-cpp-source/utils/.rsrc/TrapAvail.h b/mac-cpp-source/utils/.rsrc/TrapAvail.h deleted file mode 100644 index a296974a98e80d7ccec8a3b6f45baf47e6a5b1c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 410 zcmZQzU}RumU71Wel9-uSY{lu8pOcbWq~M#Fmzd5SQj}QW zSeBTXqnE+Nz{C*Z8WG|g?&-=1G6#q-MS!NFfV;=4rU3XeqLg7K8iC@IZO;J4B3oVm>F1%Vf5W&)hi+X0Qm*%c?O^=SU@0!Df8;N qJ|Z80N@N(^7#Mv6f`fo;A>VK(Cm=1y{PzEUAPol0AHZxM5C;HSHC0Fe diff --git a/mac-cpp-source/utils/.rsrc/pstring.h b/mac-cpp-source/utils/.rsrc/pstring.h deleted file mode 100644 index dcb17c372786871a4ab7aa8093e9d6df3ced50f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 410 zcmZQzU}RumU5_XA{bbh-ZCY_=)1>SzXAQR4uXNc0jXvIQa}cXjR;fb)pLDhS%5+^ j!0=`C4G0bbvW0xZot%KQ9P``%|A90ZFn<8EeLx%lJ9<1T