Update NVM API to use words instead of bytes.

1 files changed, 5 insertions, 18 deletions

diff --git a/utils/bcmregtool/main.cpp b/utils/bcmregtool/main.cpp
index 19763f8..3718abd 100644
--- a/utils/bcmregtool/main.cpp
+++ b/utils/bcmregtool/main.cpp
@@ -63,14 +63,6 @@ int main(int argc, char const *argv[])
         return ERROR_NO_PCI_DEVS;
     }
 
-    // if ((memfd = open("/dev/mem", O_RDWR|O_SYNC)) < 0 )
-    // {
-    //     printf("Error /dev/mem file. \n");
-    //     close(memfd);
-    //     return (-1);
-    // }
-
-
     while ((pDirent = readdir(pDir)) != NULL)
     {
         const char* pPCIPath = pDirent->d_name;
@@ -139,27 +131,22 @@ int main(int argc, char const *argv[])
     // printf("\n\n=========\n\n");
 
 
-    // printf("DEVICE.SoftwareArbitration: %x\n", (uint32_t)DEVICE.SoftwareArbitration.r32);
     printf("Grab lock...\n");
     NVRam_acquireLock();
 
     NVRam_enable();
 
 
-    uint32_t length = NVRam_readByte(8); // current stage length
-    uint32_t offset = NVRam_readByte(0xc); // current stage offset
+    uint32_t length = NVRam_readWord(8); // current stage length
+    uint32_t offset = NVRam_readWord(0xc); // current stage offset
     printf("NVRam_read(8) = %x\n", length);
     printf("NVRam_read(C) = %x\n", offset);
     // uint32_t next_stage_hdr = offset + (length*4);
     // uint32_t next_stage_size = next_stage_hdr + 4;
-    // printf("NVRam_read(%x) = %x\n", next_stage_hdr, NVRam_readByte(next_stage_hdr));
-    // printf("NVRam_read(%x) = %x\n", next_stage_size, NVRam_readByte(next_stage_size));
+    // printf("NVRam_read(%x) = %x\n", next_stage_hdr, NVRam_readWord(next_stage_hdr));
+    // printf("NVRam_read(%x) = %x\n", next_stage_size, NVRam_readWord(next_stage_size));
 
-    // printf("DEVICE.SoftwareArbitration: %x\n", DEVICE.SoftwareArbitration.r32);
-
-    // printf("Release lock...\n");
     NVRam_releaseLock();
-    // printf("DEVICE.SoftwareArbitration: %x\n", DEVICE.SoftwareArbitration.r32);
 
     return 0;
-}
\ No newline at end of file
+}