Use full shared mem on PB2/BeaglePlay

FalconChristmas · Dec 13, 2024 · f739d63 · f739d63
1 parent 4b53c59
commit f739d63
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/src/non-gpl/BBB48String/BBB48String.cpp b/src/non-gpl/BBB48String/BBB48String.cpp
@@ -667,8 +667,8 @@ void BBB48StringOutput::sendData(FrameData& d, uint32_t* dptr) {
         }
         if (fullsize > 0) {
             int outsize = fullsize;
-            if (outsize > (12 * 1024)) {
-                outsize = 12 * 1024;
+            if (outsize > m_pru->shared_ram_size) {
+                outsize = m_pru->shared_ram_size;
             }
             m_pru->memcpyToPRU(m_pru->shared_ram, d.curData + 7624 + 7624, outsize);
         }

diff --git a/src/non-gpl/BBB48String/FalconWS281x.asm b/src/non-gpl/BBB48String/FalconWS281x.asm
@@ -369,7 +369,7 @@ USESHAREDRAM?:
         LDI32   r9, 0x00010000
         LBBO    &r10, r9, sram_offset, NUMOUTSTOREAD
         ADD     sram_offset, sram_offset, OUTPUTS
-        LDI     r8, 12188
+        LDI     r8, (SHM_SIZE-100)
         QBLT DATALOADED?, r8, sram_offset
             //reached the end of what we have in other sram, flip to DDR
             SET  bit_flags, bit_flags, 3

diff --git a/src/pru/FalconPRUDefs.hp b/src/pru/FalconPRUDefs.hp
@@ -58,6 +58,9 @@
 #define NSPERCLK  5
 #define NS2CLK(ns) ((ns) / 5)
 
+#define SHM_SIZE (12 * 1024)
+
+
 #elif defined(AM62X)
 
 // Refer to this mapping in the file - \prussdrv\include\pruss_intc_mapping.h
@@ -101,11 +104,10 @@
 #define CTPPR_1         0x2202C
 
 
-// There is currently a bug in the am62x device trees that are causing
-// the PRU to run at 250Mhz instead of 333Mhz.  When that is fixed,
-// change this to 3
-#define NSPERCLK  4
-#define NS2CLK(ns) ((ns) / 4)
+#define NSPERCLK  3
+#define NS2CLK(ns) ((ns) / 3)
+
+#define SHM_SIZE (32 * 1024)
 
 #else