From ff4e3433fd16d7ec230bcb716d2aeaaee6ee8a2d Mon Sep 17 00:00:00 2001 From: Oliver Lehmann Date: Sun, 21 Apr 2013 00:40:52 +0000 Subject: [PATCH] update to Atmel Studio 6.1 --- P8000_WDC_Emulator/P8000_WDC_Emulator.atsuo | Bin 34304 -> 51712 bytes .../P8000_WDC_Emulator/wdc_main.c | 34 +++++++++--------- .../P8000_WDC_Emulator/wdc_par.c | 4 +-- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/P8000_WDC_Emulator/P8000_WDC_Emulator.atsuo b/P8000_WDC_Emulator/P8000_WDC_Emulator.atsuo index e0604323680e7275e89f5cd838504913e81d347d..bb999be7e8e765842034a5cb1d95e06ab6c03068 100755 GIT binary patch delta 7401 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 delta 3126 zcmZvedr*^C7Qnw7K0-hu3516dBq(5@K!f0r@bW`mu0;ciC`c_7%EN|$kSr0g1S{$a zRLBwW!BnYsbp$Il#aiojaiLYWYIXl`W_M?-PTO^~wkvM1v+h>*+z&!O?cU)>&OP_s z$2sSI_g?E>7i))T=!VF55=#QZF!c8s{f8wHz7qw*w>nvO$wM1!aMLIbb)}_Wvp2A< z#OB5N+Gk-0EYzOjf^sTI#erJd;3;VF63E^t`yh&Gou8l$O2o=26)Hjm%21TUrt3oj zJ)IIxh;!9TP{|=_$WkO7$v`rZEF>FQhJeZ~N|}$s8l(VOi>yNmks<`D+_Wv#C~QRD zL<~p`Vnk|@I%E@4k2D}A#EkqFX+$i@W~2$(f^0>s$XiGY@*y(kKxXfwe;?yc{#|wB zPP;*hDq(@H(GcJy9B^JN2?b;SE0DX_2iTsVqgDyAd1Oce(A*V);Fu85ux?#vM6n(=FU8CsnnpRh*ksG#vQHFP(bOW#kw|dxaKXgjkm=nC z=53Ph2&V(Y7tHb&;tvz@NpUkalzYNc@8xVFwb3t#0+Wv(M%h>~^?ZW}n!I+LQE)C` z^;gL2Fc-CazNjNuAi_5gM*P*F4hV2t_Z5u<1Fc!UP_#4@tN{&j{lmW|evsRrckA-e z&rUKGCU20%DB!(x^mooC`F8{V(cau#6LxAcyZ`shvYR5l_12tvHi!;19da@s%yU;x zdEzh7gJZ6hEC6%hN=R3x*p%roDoX*Y(nP{xLfJwVf;ngJUw_ll1^#gH}4d2CDbVz0-^@9s)afHyM z2z(s&Fq`v$8*vKzOA+}*e)cVuT71d(_UWx9;~^=QVRz_?)VLT_tD*mhFZ^qN4p@5& zh?Y(PrG0+z+R1o$c1R4D5BQ_36<1fhR##oiPy6+OgSP0+ZeJ=V)_Hdaf;Dab(aW2b)*?{M<8*?61=M%*IDmiHFO@*o>J}`7L4_6cr+lu;a z$lJ(vqz&1D>_m1Uze9E-?MMf51Y)%dJolm0i}1&Bi8hKoh85`22DA*IKm&9N`2abM zoI#xTg&pOOkYVI3@-cD_`2;zSe2QE^{(yXj{0SLBE+SWvQDhAH9Qgvdgj`1G_G=#5lhY$W$Z)|_ zk~Bk+q+zF_LD!a|OeQBRj zwCWb56?Jf8SW0M)I%j6aJ(uyq)=)l`ZPf4uUp~zfYA%f26lKzk(ON z;4X50%ba#h$jEw>>0JC+5ipWD0^?ofeBh|5ZN`*gj-wn&O$8A^8(-YHGbI!ydN46S z+JeBE*eLHTxO70Nj(!xF+@WUTei~r;6I+=SdgeDH1eO(-tyExvl^%7fR3fJWr0Q|6IUOluW^?yi&ilVVzMuOvZi%DKR%{|Yc5`vN3p`r4msp^6 zX(ilCl))Eo$J@D5iI~+2A_S(&eEOWQJ1Vad7;4XftnGf_-BAUDMo;_owvEJQNOva* z*kzWW8~Gm02L6@>hap!&Z(6#WXR=|c$!C)Vidola1))C)JFmdthEzy3CIYwI0<~{Q zU{PT_ozYg80b{JjsT5Z`Dc(_7hziL@T&SW2)-n|xk#nx{{zfSO-=K{G;5TQk) zX=gg%Z?)l|Hig3SmzRUlBnHtQ3sMIUc5j1i?OpJAcRkGRl)&~;?zuGy*EcQy4{~S; A+yDRo diff --git a/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_main.c b/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_main.c index 17bb54e..fb8d919 100644 --- a/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_main.c +++ b/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_main.c @@ -29,7 +29,7 @@ /* * P8000 WDC Emulator * - * $Id: wdc_main.c,v 1.31 2013/04/20 23:22:47 olivleh1 Exp $ + * $Id: wdc_main.c,v 1.32 2013/04/21 00:40:52 olivleh1 Exp $ * * TODO: - right now, BTT entries are not taken into account */ @@ -90,12 +90,12 @@ main ( void ) data_counter = WDC_BLOCKLEN; wdc_read_sector ( blockno, data_buffer ); if ( data_buffer[0] == 'W' && - data_buffer[1] == 'D' && - data_buffer[2] == 'C' && - data_buffer[3] == '_' && - data_buffer[4] == '4' && - data_buffer[5] == '.' && - data_buffer[6] == '2' ) { + data_buffer[1] == 'D' && + data_buffer[2] == 'C' && + data_buffer[3] == '_' && + data_buffer[4] == '4' && + data_buffer[5] == '.' && + data_buffer[6] == '2' ) { wdc_write_par_table ( data_buffer, data_counter ); wdc_set_disk_valid(); } else { @@ -132,7 +132,7 @@ main ( void ) /* no drive attached */ if ( wdc_get_initialized() && wdc_get_num_of_drvs() == 0 ) { if ( cmd_buffer[0] == CMD_WR_WDC_RAM - || cmd_buffer[0] == CMD_RD_BLOCK ) { + || cmd_buffer[0] == CMD_RD_BLOCK ) { wdc_send_errorcode ( 0xc1 ); } else if ( cmd_buffer[0] == CMD_RD_WDC_RAM ) { wdc_send_errorcode ( ERR_NO_DRIVE_READY ); @@ -293,9 +293,9 @@ main ( void ) memset ( &data_buffer[0], 0x00, data_counter ); blockno = wdc_sector2diskblock ( cmd_buffer[2] | ( cmd_buffer[3] << 8 ) - , cmd_buffer[4] - , cmd_buffer[5] - ); + , cmd_buffer[4] + , cmd_buffer[5] + ); errorcode = 1; for ( i8 = 0; i8 < wdc_get_hdd_sectors(); i8++ ) { @@ -351,9 +351,9 @@ main ( void ) data_counter = WDC_BLOCKLEN; blockno = wdc_sector2diskblock ( cmd_buffer[2] | ( cmd_buffer[3] << 8 ) - , cmd_buffer[4] - , cmd_buffer[5] - ); + , cmd_buffer[4] + , cmd_buffer[5] + ); errorcode = 1; for ( i8 = 0; i8 < wdc_get_hdd_sectors(); i8++ ) { errorcode = wdc_read_sector ( blockno, data_buffer ); @@ -368,9 +368,9 @@ main ( void ) data_counter = ( cmd_buffer[7] << 8 ) | cmd_buffer[6]; blockno = wdc_sector2diskblock ( cmd_buffer[2] | ( cmd_buffer[3] << 8 ) - , cmd_buffer[4] - , cmd_buffer[5] - ); + , cmd_buffer[4] + , cmd_buffer[5] + ); errorcode = 1; if ( data_counter == WDC_BLOCKLEN ) { diff --git a/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_par.c b/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_par.c index ba67db8..c93bfe9 100644 --- a/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_par.c +++ b/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_par.c @@ -26,7 +26,7 @@ */ /* - * $Id: wdc_par.c,v 1.7 2013/04/20 23:22:47 olivleh1 Exp $ + * $Id: wdc_par.c,v 1.8 2013/04/21 00:40:52 olivleh1 Exp $ */ #include @@ -218,7 +218,7 @@ void wdc_set_disk_valid() uint16_t zw0, zw1; blocks = (uint32_t)wdc_get_hdd_sectors() * (uint32_t)wdc_get_hdd_heads() * (uint32_t) wdc_get_hdd_cylinder() - - (uint32_t)wdc_get_hdd_sectors() * (uint32_t)wdc_get_hdd_heads(); + - (uint32_t)wdc_get_hdd_sectors() * (uint32_t)wdc_get_hdd_heads(); zw0 = blocks / 65536; zw1 = ( blocks % 65536 ) - 1;