From e319f6f7f487d4ef27bf89c26e04646aa3b9b4db Mon Sep 17 00:00:00 2001
From: Uri Shaked
Date: Thu, 16 Jul 2020 20:39:27 +0300
Subject: fix(eeprom): EEPROM write fails after first attempt

close #54
---
 src/peripherals/eeprom.spec.ts | 32 ++++++++++++++++++++++++++++++++
 src/peripherals/eeprom.ts      |  2 +-
 2 files changed, 33 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/peripherals/eeprom.spec.ts b/src/peripherals/eeprom.spec.ts
index ba66100..75cd5ea 100644
--- a/src/peripherals/eeprom.spec.ts
+++ b/src/peripherals/eeprom.spec.ts
@@ -160,6 +160,38 @@ describe('EEPROM', () => {
       expect(eepromBackend.memory[15]).toEqual(0x55);
       expect(eepromBackend.memory[16]).toEqual(0xff);
     });
+
+    it('should write two bytes sucessfully', () => {
+      const cpu = new CPU(new Uint16Array(0x1000));
+      const eepromBackend = new EEPROMMemoryBackend(1024);
+      const eeprom = new AVREEPROM(cpu, eepromBackend);
+
+      // Write 0x55 to address 15
+      cpu.writeData(EEDR, 0x55);
+      cpu.writeData(EEARL, 15);
+      cpu.writeData(EEARH, 0);
+      cpu.writeData(EECR, EEMPE);
+      cpu.writeData(EECR, EEPE);
+      eeprom.tick();
+      expect(cpu.cycles).toEqual(2);
+
+      // wait long enough time for the first write to finish
+      cpu.cycles += 10000000;
+      eeprom.tick();
+
+      // Write 0x66 to address 16
+      cpu.writeData(EEDR, 0x66);
+      cpu.writeData(EEARL, 16);
+      cpu.writeData(EEARH, 0);
+      cpu.writeData(EECR, EEMPE);
+      cpu.writeData(EECR, EEPE);
+      eeprom.tick();
+
+      // Ensure both writes took place
+      expect(cpu.cycles).toEqual(10000004);
+      expect(eepromBackend.memory[15]).toEqual(0x55);
+      expect(eepromBackend.memory[16]).toEqual(0x66);
+    });
   });
 
   describe('EEPROM erase', () => {
diff --git a/src/peripherals/eeprom.ts b/src/peripherals/eeprom.ts
index 97ca178..0301701 100644
--- a/src/peripherals/eeprom.ts
+++ b/src/peripherals/eeprom.ts
@@ -101,7 +101,7 @@ export class AVREEPROM {
           return true;
         }
         // Check for write-in-progress
-        if (this.writeCompleteCycles) {
+        if (this.cpu.cycles < this.writeCompleteCycles) {
           return true;
         }
 
-- 
cgit v1.2.3