From b80bade3f8e7a42e84aad759c0bcc145c623796a Mon Sep 17 00:00:00 2001
From: David Banks <dave@hoglet.com>
Date: Thu, 24 Oct 2019 15:54:58 +0100
Subject: [PATCH] Firmware: rd/wr cmds now use global memAddr

Change-Id: Ia345095fa4dbc6c3d700bf5704aa20cf5bcd911b
---
 firmware/AtomBusMon.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/firmware/AtomBusMon.c b/firmware/AtomBusMon.c
index 529f092..eeb2ea5 100644
--- a/firmware/AtomBusMon.c
+++ b/firmware/AtomBusMon.c
@@ -614,30 +614,29 @@ void genericDump(char *params, unsigned int (*readFunc)()) {
 }
 
 void genericWrite(char *params, void (*writeFunc)()) {
-  unsigned int addr;
   unsigned int data;
   long count = 1;
-  sscanf(params, "%x %x %ld", &addr, &data, &count);
+  sscanf(params, "%x %x %ld", &memAddr, &data, &count);
   log0("Wr: ");
-  log_addr_data(addr, data);
+  log_addr_data(memAddr, data);
   log0("\n");
   loadData(data);
-  loadAddr(addr);
+  loadAddr(memAddr);
   while (count-- > 0) {
     (*writeFunc)();
   }
+  memAddr++;
 }
 
 void genericRead(char *params, unsigned int (*readFunc)()) {
-  unsigned int addr;
   unsigned int data;
   unsigned int data2;
   long count = 1;
-  sscanf(params, "%x %ld", &addr, &count);
-  loadAddr(addr);
+  sscanf(params, "%x %ld", &memAddr, &count);
+  loadAddr(memAddr);
   data = (*readFunc)();
   log0("Rd: ");
-  log_addr_data(addr, data);
+  log_addr_data(memAddr, data);
   log0("\n");
   while (count-- > 1) {
     data2 = (*readFunc)();
@@ -646,6 +645,7 @@ void genericRead(char *params, unsigned int (*readFunc)()) {
     }
     data = data2;
   }
+  memAddr++;
 }
 
 #endif