ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/BasiliskII/src/disk.cpp
(Generate patch)

Comparing BasiliskII/src/disk.cpp (file contents):
Revision 1.15 by cebix, 2004-01-12T15:29:21Z vs.
Revision 1.17 by gbeauche, 2005-07-24T14:05:16Z

# Line 1 | Line 1
1   /*
2   *  disk.cpp - Generic disk driver
3   *
4 < *  Basilisk II (C) 1997-2004 Christian Bauer
4 > *  Basilisk II (C) 1997-2005 Christian Bauer
5   *
6   *  This program is free software; you can redistribute it and/or modify
7   *  it under the terms of the GNU General Public License as published by
# Line 326 | Line 326 | int16 DiskPrime(uint32 pb, uint32 dce)
326          size_t length = ReadMacInt32(pb + ioReqCount);
327          loff_t position = ReadMacInt32(dce + dCtlPosition);
328          if (ReadMacInt16(pb + ioPosMode) & 0x100)       // 64 bit positioning
329 <                position = ((loff_t)ReadMacInt32(pb + ioWPosOffset) << 32) || ReadMacInt32(pb + ioWPosOffset + 4);
329 >                position = ((loff_t)ReadMacInt32(pb + ioWPosOffset) << 32) | ReadMacInt32(pb + ioWPosOffset + 4);
330          if ((length & 0x1ff) || (position & 0x1ff))
331                  return paramErr;
332  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines