Macintosh-SW/mac-rom-simm-programmer
1
0
Fork 0
mirror of https://github.com/dougg3/mac-rom-simm-programmer.git synced 2024-06-26 00:29:27 +00:00
Code Issues Projects Releases Wiki Activity

Optimized some of my routines and fixed a nasty, nasty bug that was causing the board to crash because of multiple things being outputs simultaneously.

Browse Source
This commit is contained in:
Doug Brown 2011-12-13 21:56:20 -08:00
parent 4adb0c4980
commit 4f0d1a894c
3 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.settings/de.innot.avreclipse.core.prefs
View File

@ -1,4 +1,4 @@
#Wed Dec 07 17:06:43 PST 2011
#Tue Dec 13 21:30:45 PST 2011
avrtarget/ClockFrequency=16000000
avrtarget/ExtRAMSize=0
avrtarget/ExtendedRAM=false

27
external_mem.c
View File

@ -124,8 +124,8 @@ void ExternalMem_Read(uint32_t startAddress, uint32_t *buf, uint32_t len)
//ExternalMem_AssertCS();
//ExternalMem_AssertOE();
ExternalMem_Deassert(SIMM_WE);
ExternalMem_Assert(SIMM_CS | SIMM_OE);
ExternalMem_SetDataAsInput();
ExternalMem_Assert(SIMM_CS | SIMM_OE);
while (len--)
{
@ -166,9 +166,10 @@ uint32_t ExternalMem_ReadCycle(uint32_t address)
//ExternalMem_DeassertWE();
//ExternalMem_AssertCS();
//ExternalMem_AssertOE();
ExternalMem_Deassert(SIMM_WE);
ExternalMem_Assert(SIMM_CS | SIMM_OE);
ExternalMem_SetDataAsInput();
ExternalMem_Assert(SIMM_CS | SIMM_OE);
ExternalMem_SetAddress(address);
uint32_t tmp = ExternalMem_ReadData();
//ExternalMem_DeassertOE();
@ -268,18 +269,18 @@ void ExternalMem_WaitCompletion(uint8_t chipsMask)
uint8_t doneChipsMask = ~chipsMask & 0x0F;
// Prime the loop...
//union
//{
// uint32_t word;
// uint8_t bytes[4];
//} lastBits, tmp;
union
{
uint32_t word;
uint8_t bytes[4];
} lastBits, tmp;
uint32_t lastBits = ExternalMem_ReadCycle(0);
//uint32_t lastBits = ExternalMem_ReadCycle(0);
//lastBits.word = ExternalMem_ReadCycle(0);
lastBits.word = ExternalMem_ReadCycle(0);
while (doneChipsMask != 0x0F)
{
/*#define TOGGLE_BIT 0x40
#define TOGGLE_BIT 0x40
tmp.word = ExternalMem_ReadCycle(0);
@ -323,9 +324,9 @@ void ExternalMem_WaitCompletion(uint8_t chipsMask)
}
}
lastBits.word = tmp.word;*/
lastBits.word = tmp.word;
// Compare the toggle bit to see if it didn't toggle
/*// Compare the toggle bit to see if it didn't toggle
uint32_t tmp = ExternalMem_ReadCycle(0);
uint32_t mask = 0x00000040UL;
uint8_t x;
@ -342,7 +343,7 @@ void ExternalMem_WaitCompletion(uint8_t chipsMask)
lastBits = tmp;
// Keep going until all four chips have gone
// without toggling
// without toggling*/
}
//#endif
}

8
main.c
View File

@ -19,6 +19,14 @@ int main(void)
DDRD |= (1 << 7);
PORTD &= ~(1 << 7);
if (MCUSR & (1 << BORF))
{
MCUSR = 0;
PORTD |= (1 << 7);
_delay_ms(500);
PORTD &= ~(1 << 7);
}
ExternalMem_Init();
ExternalMem_SetAddress(0);
ExternalMem_Assert(SIMM_CS | SIMM_OE);