diff options
author | Evan Lojewski <github@meklort.com> | 2020-02-17 20:47:13 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-17 20:47:13 -0700 |
commit | 23b478f335cd622049ad17f1f7ca4f0641200705 (patch) | |
tree | 2243e00ad65259233171f3fbc97eb898c806af3e /simulator | |
parent | d2419a287fc52929c351fb7fed54bae323fedc54 (diff) | |
download | bcm5719-ortega-23b478f335cd622049ad17f1f7ca4f0641200705.tar.gz bcm5719-ortega-23b478f335cd622049ad17f1f7ca4f0641200705.zip |
printf: Remove nvm access from the ape as it triggers a race condition when the rx cpu is restarted. (#35)
Rather than print directly, the APE now using the host debug console only for printf.
The RX cpu (function 0 only) uses the debug console and forwards it over SPI when new data is available.
Diffstat (limited to 'simulator')
-rw-r--r-- | simulator/bcm5719_SHM.cpp | 18 | ||||
-rw-r--r-- | simulator/bcm5719_SHM_sim.cpp | 53 |
2 files changed, 20 insertions, 51 deletions
diff --git a/simulator/bcm5719_SHM.cpp b/simulator/bcm5719_SHM.cpp index 8249bd1..7fb0d7d 100644 --- a/simulator/bcm5719_SHM.cpp +++ b/simulator/bcm5719_SHM.cpp @@ -10,7 +10,7 @@ /// //////////////////////////////////////////////////////////////////////////////// /// -/// @copyright Copyright (c) 2018, Evan Lojewski +/// @copyright Copyright (c) 2020, Evan Lojewski /// @cond /// /// All rights reserved. @@ -127,21 +127,13 @@ void init_bcm5719_SHM(void) /** @brief Bitmap for @ref SHM_t.ProtMac0Low. */ - /** @brief Bitmap for @ref SHM_t.NcsiSig. */ + /** @brief Bitmap for @ref SHM_t.RcpuWritePointer. */ - /** @brief Bitmap for @ref SHM_t.NcsiBuildTime. */ + /** @brief Bitmap for @ref SHM_t.RcpuHostReadPointer. */ - /** @brief Bitmap for @ref SHM_t.NcsiBuildTime2. */ + /** @brief Bitmap for @ref SHM_t.RcpuReadPointer. */ - /** @brief Bitmap for @ref SHM_t.NcsiBuildTime3. */ - - /** @brief Bitmap for @ref SHM_t.NcsiBuildDate. */ - - /** @brief Bitmap for @ref SHM_t.NcsiBuildDate2. */ - - /** @brief Bitmap for @ref SHM_t.NcsiBuildDate3. */ - - /** @brief Bitmap for @ref SHM_t.ChipId. */ + /** @brief Bitmap for @ref SHM_t.RcpuPrintfBuffer. */ } diff --git a/simulator/bcm5719_SHM_sim.cpp b/simulator/bcm5719_SHM_sim.cpp index fcddae5..32d8c69 100644 --- a/simulator/bcm5719_SHM_sim.cpp +++ b/simulator/bcm5719_SHM_sim.cpp @@ -10,7 +10,7 @@ /// //////////////////////////////////////////////////////////////////////////////// /// -/// @copyright Copyright (c) 2018, Evan Lojewski +/// @copyright Copyright (c) 2020, Evan Lojewski /// @cond /// /// All rights reserved. @@ -277,52 +277,29 @@ void init_bcm5719_SHM_sim(void *base) SHM.ProtMac0Low.r32.installReadCallback(read_from_ram, (uint8_t *)base); SHM.ProtMac0Low.r32.installWriteCallback(write_to_ram, (uint8_t *)base); - for(int i = 0; i < 313; i++) + for(int i = 0; i < 2; i++) { SHM.reserved_796[i].installReadCallback(read_from_ram, (uint8_t *)base); SHM.reserved_796[i].installWriteCallback(write_to_ram, (uint8_t *)base); } - /** @brief Bitmap for @ref SHM_t.NcsiSig. */ - SHM.NcsiSig.r32.installReadCallback(read_from_ram, (uint8_t *)base); - SHM.NcsiSig.r32.installWriteCallback(write_to_ram, (uint8_t *)base); - - for(int i = 0; i < 3; i++) - { - SHM.reserved_2052[i].installReadCallback(read_from_ram, (uint8_t *)base); - SHM.reserved_2052[i].installWriteCallback(write_to_ram, (uint8_t *)base); - } - /** @brief Bitmap for @ref SHM_t.NcsiBuildTime. */ - SHM.NcsiBuildTime.r32.installReadCallback(read_from_ram, (uint8_t *)base); - SHM.NcsiBuildTime.r32.installWriteCallback(write_to_ram, (uint8_t *)base); - - /** @brief Bitmap for @ref SHM_t.NcsiBuildTime2. */ - SHM.NcsiBuildTime2.r32.installReadCallback(read_from_ram, (uint8_t *)base); - SHM.NcsiBuildTime2.r32.installWriteCallback(write_to_ram, (uint8_t *)base); - - /** @brief Bitmap for @ref SHM_t.NcsiBuildTime3. */ - SHM.NcsiBuildTime3.r32.installReadCallback(read_from_ram, (uint8_t *)base); - SHM.NcsiBuildTime3.r32.installWriteCallback(write_to_ram, (uint8_t *)base); - - /** @brief Bitmap for @ref SHM_t.NcsiBuildDate. */ - SHM.NcsiBuildDate.r32.installReadCallback(read_from_ram, (uint8_t *)base); - SHM.NcsiBuildDate.r32.installWriteCallback(write_to_ram, (uint8_t *)base); + /** @brief Bitmap for @ref SHM_t.RcpuWritePointer. */ + SHM.RcpuWritePointer.r32.installReadCallback(read_from_ram, (uint8_t *)base); + SHM.RcpuWritePointer.r32.installWriteCallback(write_to_ram, (uint8_t *)base); - /** @brief Bitmap for @ref SHM_t.NcsiBuildDate2. */ - SHM.NcsiBuildDate2.r32.installReadCallback(read_from_ram, (uint8_t *)base); - SHM.NcsiBuildDate2.r32.installWriteCallback(write_to_ram, (uint8_t *)base); + /** @brief Bitmap for @ref SHM_t.RcpuHostReadPointer. */ + SHM.RcpuHostReadPointer.r32.installReadCallback(read_from_ram, (uint8_t *)base); + SHM.RcpuHostReadPointer.r32.installWriteCallback(write_to_ram, (uint8_t *)base); - /** @brief Bitmap for @ref SHM_t.NcsiBuildDate3. */ - SHM.NcsiBuildDate3.r32.installReadCallback(read_from_ram, (uint8_t *)base); - SHM.NcsiBuildDate3.r32.installWriteCallback(write_to_ram, (uint8_t *)base); + /** @brief Bitmap for @ref SHM_t.RcpuReadPointer. */ + SHM.RcpuReadPointer.r32.installReadCallback(read_from_ram, (uint8_t *)base); + SHM.RcpuReadPointer.r32.installWriteCallback(write_to_ram, (uint8_t *)base); - for(int i = 0; i < 26; i++) + /** @brief Bitmap for @ref SHM_t.RcpuPrintfBuffer. */ + for(int i = 0; i < 372; i++) { - SHM.reserved_2088[i].installReadCallback(read_from_ram, (uint8_t *)base); - SHM.reserved_2088[i].installWriteCallback(write_to_ram, (uint8_t *)base); + SHM.RcpuPrintfBuffer[i].r32.installReadCallback(read_from_ram, (uint8_t *)base); + SHM.RcpuPrintfBuffer[i].r32.installWriteCallback(write_to_ram, (uint8_t *)base); } - /** @brief Bitmap for @ref SHM_t.ChipId. */ - SHM.ChipId.r32.installReadCallback(read_from_ram, (uint8_t *)base); - SHM.ChipId.r32.installWriteCallback(write_to_ram, (uint8_t *)base); } |