Deleted commented out unused code
This commit is contained in:
parent
9de1789c4e
commit
6db79af58a
6 changed files with 4 additions and 44 deletions
|
@ -115,22 +115,10 @@ public:
|
||||||
inline unsigned TrackLength(unsigned track) const { return trackLengths[track]; }
|
inline unsigned TrackLength(unsigned track) const { return trackLengths[track]; }
|
||||||
|
|
||||||
inline bool IsD81() const { return diskType == D81; }
|
inline bool IsD81() const { return diskType == D81; }
|
||||||
|
inline bool IsD71() const { return diskType == D71; }
|
||||||
inline unsigned char GetD81Byte(unsigned track, unsigned headIndex, unsigned headPos) const { return tracksD81[track][headIndex][headPos]; }
|
inline unsigned char GetD81Byte(unsigned track, unsigned headIndex, unsigned headPos) const { return tracksD81[track][headIndex][headPos]; }
|
||||||
inline void SetD81Byte(unsigned track, unsigned headIndex, unsigned headPos, unsigned char data)
|
inline void SetD81Byte(unsigned track, unsigned headIndex, unsigned headPos, unsigned char data)
|
||||||
{
|
{
|
||||||
//unsigned headDataOffset;
|
|
||||||
//if (headPos > 0)
|
|
||||||
// headDataOffset = headPos - 1;
|
|
||||||
//else
|
|
||||||
// headDataOffset = trackLengths[track] - 1;
|
|
||||||
//if (tracksD81[track][headIndex][headDataOffset] != data)
|
|
||||||
//{
|
|
||||||
// tracksD81[track][headIndex][headDataOffset] = data;
|
|
||||||
// trackDirty[track] = true;
|
|
||||||
// trackUsed[track] = true;
|
|
||||||
// dirty = true;
|
|
||||||
//}
|
|
||||||
|
|
||||||
if (tracksD81[track][headIndex][headPos] != data)
|
if (tracksD81[track][headIndex][headPos] != data)
|
||||||
{
|
{
|
||||||
tracksD81[track][headIndex][headPos] = data;
|
tracksD81[track][headIndex][headPos] = data;
|
||||||
|
@ -138,20 +126,6 @@ public:
|
||||||
trackUsed[track] = true;
|
trackUsed[track] = true;
|
||||||
dirty = true;
|
dirty = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
//unsigned headDataOffset;
|
|
||||||
//if (headPos < trackLengths[track])
|
|
||||||
// headDataOffset = headPos + 1;
|
|
||||||
//else
|
|
||||||
// headDataOffset = 0;
|
|
||||||
//if (tracksD81[track][headIndex][headDataOffset] != data)
|
|
||||||
//{
|
|
||||||
// tracksD81[track][headIndex][headDataOffset] = data;
|
|
||||||
// trackDirty[track] = true;
|
|
||||||
// trackUsed[track] = true;
|
|
||||||
// dirty = true;
|
|
||||||
//}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
inline bool IsD81ByteASync(unsigned track, unsigned headIndex, unsigned headPos) const
|
inline bool IsD81ByteASync(unsigned track, unsigned headIndex, unsigned headPos) const
|
||||||
|
|
|
@ -212,7 +212,7 @@ private:
|
||||||
void RefreshFolderEntries();
|
void RefreshFolderEntries();
|
||||||
|
|
||||||
void UpdateInputFolders();
|
void UpdateInputFolders();
|
||||||
void UpdateInputDiskCaddy();
|
//void UpdateInputDiskCaddy();
|
||||||
|
|
||||||
void UpdateCurrentHighlight();
|
void UpdateCurrentHighlight();
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
#include "interrupt.h"
|
#include "interrupt.h"
|
||||||
#include "rpiHardware.h"
|
#include "rpiHardware.h"
|
||||||
#include "bcm2835int.h"
|
|
||||||
|
|
||||||
#define ARM_IC_IRQ_PENDING(irq) ( (irq) < ARM_IRQ2_BASE \
|
#define ARM_IC_IRQ_PENDING(irq) ( (irq) < ARM_IRQ2_BASE \
|
||||||
? ARM_IC_IRQ_PENDING_1 \
|
? ARM_IC_IRQ_PENDING_1 \
|
||||||
|
|
|
@ -6,6 +6,7 @@ extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "rpi-interrupts.h"
|
#include "rpi-interrupts.h"
|
||||||
|
#include "bcm2835int.h"
|
||||||
|
|
||||||
#define EnableInterrupts() __asm volatile ("cpsie i")
|
#define EnableInterrupts() __asm volatile ("cpsie i")
|
||||||
#define DisableInterrupts() __asm volatile ("cpsid i")
|
#define DisableInterrupts() __asm volatile ("cpsid i")
|
||||||
|
|
|
@ -206,7 +206,7 @@ private:
|
||||||
void BRK(void) {}
|
void BRK(void) {}
|
||||||
void CLC(void) { ClearC(); }
|
void CLC(void) { ClearC(); }
|
||||||
void CLD(void) { ClearD(); }
|
void CLD(void) { ClearD(); }
|
||||||
void CLI(void) { ClearI(); CLIMaskingInterrupt = true; } // Like the real hardware the flag will be cleared here (incase it is read by the next instruction) but needs to dely one more cycle (and let another instruction execute) before the IRQ handling will possibly trigger (CLIMaskingInterrupt is used to track and emulate this).
|
void CLI(void) { ClearI(); CLIMaskingInterrupt = true; } // Like the real hardware the flag will be cleared here (incase it is read by the next instruction) but needs to delay one more cycle (and let another instruction execute) before the IRQ handling will possibly trigger (CLIMaskingInterrupt is used to track and emulate this).
|
||||||
void CLV(void) { ClearV(); }
|
void CLV(void) { ClearV(); }
|
||||||
void CMP(void) { u16 result = a - value; SetC(a >= (u8)value); SetZ(a == (u8)value); EstablishN(result); }
|
void CMP(void) { u16 result = a - value; SetC(a >= (u8)value); SetZ(a == (u8)value); EstablishN(result); }
|
||||||
void CPX(void) { u16 result = x - value; SetC(x >= (u8)value); SetZ(x == (u8)value); EstablishN(result); }
|
void CPX(void) { u16 result = x - value; SetC(x >= (u8)value); SetZ(x == (u8)value); EstablishN(result); }
|
||||||
|
|
|
@ -36,25 +36,11 @@
|
||||||
|
|
||||||
#include "Pi1581.h"
|
#include "Pi1581.h"
|
||||||
|
|
||||||
extern Pi1581 pi1581;
|
|
||||||
|
|
||||||
// Clocks
|
// Clocks
|
||||||
// Master 16Mhz
|
// Master 16Mhz
|
||||||
// into 74ls93
|
// into 74ls93
|
||||||
// QB - 16Mhz / 2 = 8MHz (177x)
|
// QB - 16Mhz / 2 = 8MHz (177x)
|
||||||
// QD - 16Mhz / 8 = 2MHz (6502)
|
// QD - 16Mhz / 8 = 2MHz (6502)
|
||||||
// CS
|
|
||||||
// 8520
|
|
||||||
// $4000
|
|
||||||
//
|
|
||||||
// 1770
|
|
||||||
// $6000
|
|
||||||
//
|
|
||||||
// ROM
|
|
||||||
// $8000
|
|
||||||
//
|
|
||||||
// RAM
|
|
||||||
// 0-$1fff
|
|
||||||
|
|
||||||
// Disk spins at 300rpm = 5rps so to calculate how many 8Mhz cycles one rotation takes;-
|
// Disk spins at 300rpm = 5rps so to calculate how many 8Mhz cycles one rotation takes;-
|
||||||
// 8000000 / 5 = 1600000;
|
// 8000000 / 5 = 1600000;
|
||||||
|
|
Loading…
Reference in a new issue