diff options
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/formats/adam_cas.c | 12 | ||||
-rw-r--r-- | src/lib/formats/ap2_dsk.c | 68 | ||||
-rw-r--r-- | src/lib/formats/ap2_dsk.h | 8 | ||||
-rw-r--r-- | src/lib/softfloat/fyl2x.c | 6 |
4 files changed, 47 insertions, 47 deletions
diff --git a/src/lib/formats/adam_cas.c b/src/lib/formats/adam_cas.c index 376c95652be..521d2c9c1e1 100644 --- a/src/lib/formats/adam_cas.c +++ b/src/lib/formats/adam_cas.c @@ -90,7 +90,7 @@ casserr_t coladam_put_block(cassette_image *cass, int channel, double *time_inde header[2] = 0x57; header[9] = 0xe3; } - + for (i = 0; i < 10; i++) // header { err = coladam_put_byte(cass, channel, time_index, header[i], prev_sign); @@ -120,7 +120,7 @@ casserr_t coladam_put_block(cassette_image *cass, int channel, double *time_inde err = coladam_put_byte(cass, channel, time_index, 0x00, prev_sign); return err; } - + static casserr_t coladam_ddp_load( cassette_image *cass ) { @@ -131,9 +131,9 @@ static casserr_t coladam_ddp_load( cassette_image *cass ) // It would appear that data packs that originally had the type GW data layout and headers work fine when converted to type // HE. Thus we set all tapes to type HE. - + int layout_type = TYPE_HE; - + // Track 0 for ( i = 0; i < 2753; i++ ) // leading zero bytes { @@ -193,10 +193,10 @@ static casserr_t coladam_ddp_load( cassette_image *cass ) err = coladam_put_block(cass, 1, &time, &prev_sign, block, buffer, layout_type); } } - + if (err) return err; - + return CASSETTE_ERROR_SUCCESS; } diff --git a/src/lib/formats/ap2_dsk.c b/src/lib/formats/ap2_dsk.c index d120383e9b4..d895b402b04 100644 --- a/src/lib/formats/ap2_dsk.c +++ b/src/lib/formats/ap2_dsk.c @@ -1,8 +1,8 @@ /********************************************************************* - ap2_dsk.c + ap2_dsk.c - Apple II disk images + Apple II disk images *********************************************************************/ @@ -514,38 +514,38 @@ LEGACY_FLOPPY_OPTIONS_END /*************************************************************************** - New implementation + New implementation **************************************************************************** - Copyright Olivier Galibert, Lord Nightmare and Balrog - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - * Neither the name 'MAME' nor the names of its contributors may be - used to endorse or promote products derived from this software - without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY AARON GILES ''AS IS'' AND ANY EXPRESS OR - IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL AARON GILES BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. + Copyright Olivier Galibert, Lord Nightmare and Balrog + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + * Neither the name 'MAME' nor the names of its contributors may be + used to endorse or promote products derived from this software + without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY AARON GILES ''AS IS'' AND ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL AARON GILES BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. ****************************************************************************/ @@ -745,8 +745,8 @@ fprintf(stderr,"done.\n"); for(int i=0; i<0x156; i++) { data[i] = gcr6bw_tb[gb(buf, ts, pos, wrap)] ^ c; c = data[i]; - // printf("%02x ", c); - // if (((i&0xf)+1)==0x10) printf("\n"); + // printf("%02x ", c); + // if (((i&0xf)+1)==0x10) printf("\n"); } // read the checksum byte data[0x156] = gcr6bw_tb[gb(buf,ts,pos,wrap)]; @@ -819,4 +819,4 @@ fprintf(stderr,"done.\n"); return true; } -const floppy_format_type FLOPPY_A216S_FORMAT = &floppy_image_format_creator<a2_16sect_format>;
\ No newline at end of file +const floppy_format_type FLOPPY_A216S_FORMAT = &floppy_image_format_creator<a2_16sect_format>; diff --git a/src/lib/formats/ap2_dsk.h b/src/lib/formats/ap2_dsk.h index 6c3ad1fad42..c8bcc3025a5 100644 --- a/src/lib/formats/ap2_dsk.h +++ b/src/lib/formats/ap2_dsk.h @@ -1,8 +1,8 @@ /********************************************************************* - ap2_dsk.h + ap2_dsk.h - Apple II disk images + Apple II disk images *********************************************************************/ @@ -14,7 +14,7 @@ /*************************************************************************** - Constants + Constants ***************************************************************************/ @@ -55,4 +55,4 @@ private: extern const floppy_format_type FLOPPY_A216S_FORMAT; -#endif /* AP2_DISK_H */
\ No newline at end of file +#endif /* AP2_DISK_H */ diff --git a/src/lib/softfloat/fyl2x.c b/src/lib/softfloat/fyl2x.c index 084b6d10e52..fc41d125581 100644 --- a/src/lib/softfloat/fyl2x.c +++ b/src/lib/softfloat/fyl2x.c @@ -161,7 +161,7 @@ static const float128 float128_two = static const float128 float128_ln2inv2 = packFloat_128(U64(0x400071547652b82f), U64(0xe1777d0ffda0d23a)); -#define SQRT2_HALF_SIG U64(0xb504f333f9de6484) +#define SQRT2_HALF_SIG U64(0xb504f333f9de6484) extern float128 OddPoly(float128 x, float128 *arr, unsigned n); @@ -277,7 +277,7 @@ static floatx80 fyl2x(floatx80 a, floatx80 b) invalid: float_raise(float_flag_invalid); return floatx80_default_nan; - } + } else { if (bExp == 0) { if (bSig == 0) goto invalid; @@ -391,7 +391,7 @@ floatx80 fyl2xp1(floatx80 a, floatx80 b) invalid: float_raise(float_flag_invalid); return floatx80_default_nan; - } + } else { if (bExp == 0) { if (bSig == 0) goto invalid; |