From ec117e4d9eedbcc96e843f684c896c03a9a76e2d Mon Sep 17 00:00:00 2001 From: Egan Ford Date: Sun, 2 Apr 2017 10:42:50 -0600 Subject: [PATCH] minor cleanup --- README.md | 2 +- bin/c2d | Bin 156864 -> 156864 bytes bin/c2d.exe | Bin 182986 -> 182986 bytes c2d.c | 12 +++++++----- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index e155e5b..9fee3d7 100644 --- a/README.md +++ b/README.md @@ -87,7 +87,7 @@ Examples: ### The Ugly Stuff -c2d, Code to Disk, Version 0.3, Sat Apr 1 19:57:16 MDT 2017 +c2d, Code to Disk, Version 0.31, Sun Apr 2 16:33:28 UTC 2017 (c) 2012,2017 All Rights Reserved, Egan Ford (egan@sense.net) diff --git a/bin/c2d b/bin/c2d index ce46e09498dd00be7880b52cf2681e91cba7252e..2a0b6abdc9692d78644951bb66d522a3f21fdf8e 100755 GIT binary patch delta 1269 zcmX|AacCP=9DbMNY}zfp)GRJ7+NSl?={ilEkx4VQ;Kjab#3^%SuA-nTjCGbuI#7Zs zCSiFyZra^H{Y!=@OdL8bW@XHpRJ+;zS3wknxeW&|idF-wF=U4oBX?(X}3-|zRm z-}_y8xxKvHem3M%nAPPP>YVK%L?MKPamh7nO}ch<&bLq|DXjUqit7`X|Kqg}R{TH2 zw!LRwy}7&Z^H=7k)ssFou`d~2vo;6r>FIAHgz+mnUlluUAtYC~Y5rZvbM+%Mf806{ z=u&Q2Q-PNl1kBhW7F9wL{OjtowrwXCWUcBD9{Cb8)PaqJ==}Gs5&lO`C;;35m=U2T z-t-XiWe0-A<5u^kQue-e+h&FGFkebPz|2@4Ng2N+P9v;PrunyAcsFB{fKxCw(}E96 z*vM#JaHB9Q;vkx7Xnxu)N%bdGVWuwxI@Jmd;2GAVG)4$t=Jzy83M`LGS;5jBZ)1(aybEs7CjzA9}Gb zX+nqla80KJqDK7=+3C>`5qujF33L2GyRz=pi`%BrV>7A9EJgJVyofuXhGwIt^Ivce zjzNHq?SrEl9Vpl6Xch(ct0TaR>QU?r&^Nd)gRT_SLvpW%I@>O9Xq&j=^j$p$K<5o! zMY63(R%v*f`~vu7VQv19O~^&{3CL3ks$WVLe%7geRpfWNN zH48=lFLcx?q-%au@W}?6qwYF02E~XZ3T4KZX#Nb21oj%uUAYlPOTJIh-;}XIrzQ0x zc>vNk!>M>hzm&EPa)Cr#@-(xrqNKPNOtf4b`4_WjX0+YsakeD7Cbk3Tn1JeYa!Ol6 z^e37sR%B^sY-v8|*gyq%ErCo%5vv|_T=^~nX!hoP8HRBiH5cs@s|g_4zMATK%FS zHyl95gtZuoDH*FC>T9dZW{9V)YoXhN87(dzmLE!KT#Hw3c=h)6YX97mU4BK0S_isc z@PU)-se?x*UVD9Rq5C$Evc+2I$tv^KGrip%FiLI>op5_pYpVCK;0eYeiJA>}2%l8icu`>eIW^*w!Ugy`&y#xC$pt%PLj4$U2fd$#^0%}rVl z2D_zm*8bo_N!{GUD+(bA_Cqt+FjrOd#x6xMYfkx;4fA;xW8s zC)BWGzN^ka9?k7U7+TWQu)b?C#i}Png?e#we5KevX(ItbM%f%c12afVNay*7IGWqk zFsnvw-Q4_$D zH@v7zh|r)uT+`?PuhD=@c6d}+bRC98qL|+3l$X6);o2;ETue$LNuhLEm!Zb_jY2>vt;Wm0cs1W*wRiUR?to;C zuiM#r@1whnr}oXxty}GpBG!*RnST2c{vEJx#z*Kb4}_BTz>Bg6UpHwFO|^Jr>tOF5 gU!ZBZ#=5(8BpV4&M#9qZNLZeZNY5NEZD{3IG5A diff --git a/bin/c2d.exe b/bin/c2d.exe index e603eccdcbed31a60cab39dd268b4dd76b735834..d0e8d12f1db912f9ab7359240106ec676925e093 100755 GIT binary patch delta 1498 zcmXX^ZERCz6u#&5ZtFhSTwr$C$@+1NMeDZ0Ob8Bgw{>F>7B|_Pg&P+epnB#QhoW+Orj(k2@DVPcWN^}KESqv!iM&w1`U zdpv*kcz!sbn_6)v5^C1XxOI`a(@@P0!Aszc{tSD?Jh#72=!<#G!|v$D?1%^+HlMc_ z2BVwuHv`1jse&o^hwWT+L+|ac6Q)GT%jCj!U}6Ug%jy5~!V)k=&lg@o3f#p#V2l1; z+zYUpxfg#4ozapdeuMz~_{q~S&Sb*|_$fMIST90?-85>D6TMlc;mcJ5{ia-!gWFI; z0lE6d-Z~-ZlEhGhJ}64@(MOu*OKL^_F>3K8cNh7Ok<(M{OTOcI-Iv_oHO+@s(GXct zW>(X#TJloJ1mj4^nx^pt&{$#>1qA$Dmcv~qG!3^6*9kq$7nA9{JgW1(&bjz?cFpwO zK_^WN`K4Z-Cn7KWp=rU%zF3ieEfx5(X3mrrid_Vonr-8=9#$WsTw|bK8=&5rMV`Yo zd0o?qZjy-Yv6R{$J|ucB$(|T{tZB}<#9w3xWh)mca}B?~iG6KxuASx0M2p*$tRbQ^ z)FB5wQbEuw={c1Mr$XAi$$Pg-Vn+1%9#&?x=62F^yhYW0tjSujY$rt{w`*l#s1Zi) zk>#Zd8stD{wS2peckHC`OCH1LIbRchtWj4J^Mbf28@bI+#EsdU#mtI?! zo=&&ZA&yX+OdgsPT4W)yg1&x6A`ae>`EH4SIoS-yY(nR1)Dp@?{z4K)_M*)! zHdD+dY-R8~`@mL#kCW^xn+fLGk2XtXxIK8+_h)I`c87!zrQXG|5Kr9Jw3*3p`bXbR z6IRNECJ36Q##Tcuu&U*e!}cR~IAg~u*rY%QJ_A+iiViG6a4PGzU{5Z!H}BZJcVD;q z{T5u4b74EaZvd0x?M5Rw)RWyfk_&caq7SXgYd&0n8t#`V@A~l}ZW1HrB}$+V3$xm@ z2}glJEP)o@5rxk5P~ZrL;XvB2=_h|M<*WDmF$r02Q4n-W@c=GU@&|AOoJuzy7{F_A zF70m*;W?O2`)dYqA>YGih_(*K6tfSP!hE{eGeq?6r~S`9q)nn)c@*mbOLG)CgcjvQ z7{lmD2kOQMngHcgWK{btMGL9#CaDN;vS&~H% zfb%veH!h*5Y&(J??o7`qn9LFzk>G`{SQAhG|&J5 delta 1504 zcmXX^ZERCz6u#&5Zj|n$EZf|0m96ca*0Ic0Q4xxit%I>Z+}I`)7hO=2p))MfY0)t@ z+ivZ;LFXH|sQ9rd8i+BQ74C!?OQsAVF^Gu)Ckey=Z6I+!jOk=}J#TOCk9*F0&hwm) z=Y7u~%s78ABOK7(d;Z!;XtS>A0*=fc1&Q^+GvJB*0=q;*hp$TTN8RSpj!0elhzOnR z55q19L^fqK0!*<_GG}0pwP#(_dj_h68By{uXZF*ugzd{NrvJy;`LHB%BKs7AiFM}m zfI0G4PA|X;)|vYmv_)bDxv2CZ`4U^87R;D*=J+F zvY$)d+E+%5VV~5?<21mUo2nX|_D7ArCn&+2Y~mAA=1Cfj1T5sSdLA=LF>5kr^cx6! znzv3>;+UosZxLaFGrZz+I$GOxq?TuQ@~lhBWHaW1)yEg8^sLc0Nfqp~_J0UqqZQO) zm(XoFoak^Ws z4pD4Vjqj$Z?6X{{z;xfVQ12At<#g96iFom?+6Cz2>3s9ljM%5C zQBPGS`J0KCvAR;T*h*&>Ej59I4V6}4);yakErHwYYN@57Ie5c+r!e;Tb<#nUdUKsZ zZ2p?6{xludKK@wd>`p2s2&$??SHe1A&Id=|vGv>Fa~oDdtqd*r5R@nnw_rZXYqw!f zdgG3l+`C>^&Thk1i$*HNliTs_0$3t<@4+H4DTnvq*kX|62|rrp7reLtE4goy-}K>K ztQAMhd2+yy*=g(31!1!cLzoYnI3faV8Y$3^VQ_1{V}SfX(pTmNFac>Dq9EwxoIzYB zXAI&-IHCbPgLoFkHGg{uzkwe#f7K8!WOQ;4?Wlv}ve}DE;j)(O8K&{>X#Pk0sgs~Q zasaCV^A^d@5L)CzVGN^9J1BJ{SOVxso{E%#cdh^DbAVYwjsP< zes&xW^TXUYTGH|?f&hH(0{P-86y>&lOaqN3H%{O&@W}Tja04k=^EDO&c$6Ix{E%DS t2@H{y51hmwN#|yT8>MKHM@`BX-(mw&cK$SlJ@WTcXoU{t&ndi>^*;xwIzj*d diff --git a/c2d.c b/c2d.c index b63f25f..7ba62f0 100644 --- a/c2d.c +++ b/c2d.c @@ -1,6 +1,6 @@ /* -c2d, Code to Disk, Version 0.3, Sat Apr 1 19:57:16 MDT 2017 +c2d, Code to Disk, Version 0.31, Sun Apr 2 16:33:28 UTC 2017 (c) 2012,2017 All Rights Reserved, Egan Ford (egan@sense.net) @@ -53,7 +53,7 @@ Bugs: #include #include "c2d.h" -#define VERSION "Version 0.3" +#define VERSION "Version 0.31" #define INFILE argv[argc-2] #define OUTFILE argv[argc-1] #define BINARY 0 @@ -81,7 +81,8 @@ int main(int argc, char **argv) return 1; break; case 's': // override rate for -1/-2 only - start_override = (int)strtol(optarg, (char **)NULL, 16); + warm = 0; + start_override = (int)strtol(optarg, (char **)NULL, 16); // todo: input check break; case 'h': // help case '?': @@ -113,7 +114,7 @@ int main(int argc, char **argv) if(k == 0) start = -1; else - start = (int)strtol(load_address, (char **)NULL, 16); + start = (int)strtol(load_address, (char **)NULL, 16); // todo: input check if((ext = getext(filename)) != NULL) if(strcmp(ext,"mon") == 0 || strcmp(ext,"MON") == 0) @@ -147,6 +148,7 @@ int main(int argc, char **argv) fread(&blank.track[1].sector[0].byte[start & 0xFF], filesize, 1, ifp); } + // todo: lots of input checking if(inputtype == MONITOR) { int byte, naddr; char addrs[8], s; @@ -183,7 +185,7 @@ int main(int argc, char **argv) blank.track[0].sector[1].byte[0x1A] = ceil((filesize + (start & 0xFF))/ 256.0) - 16*(ceil((filesize + (start & 0xFF)) / 4096.0) - 1) - 1; fprintf(stderr,"Number of sectors: %d\n",(int)ceil((filesize + (start & 0xFF)) / 256.0)); - fprintf(stderr,"Sector page range: $%02X - $%02X\n",start >> 8,(start + filesize - 1) >> 8); + fprintf(stderr,"Memory page range: $%02X - $%02X\n",start >> 8,(start + filesize - 1) >> 8); if(warm) start = 0xFF69;